Skip to content

Commit 89b83d1

Browse files
peeweekpeeweek
committed
Added Some more options in the Sample Loader Menu
1 parent 6649ad8 commit 89b83d1

2 files changed

Lines changed: 252 additions & 5 deletions

File tree

‎Assets/SampleLoader/SampleLoader.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ void Update()
219219
if(m_DemoMode)
220220
UpdateDemoMode();
221221

222-
if (!m_Loading && (Input.GetButton(ChangeButtonName) || Input.touchCount != 0))
222+
if ((Input.GetButton(ChangeButtonName) || Input.touchCount != 0))
223223
{
224224
NextScene();
225225
}
@@ -229,6 +229,9 @@ void Update()
229229

230230
public void NextScene()
231231
{
232+
if (m_Loading || m_Fading)
233+
return;
234+
232235
int previous = currentScene;
233236
currentScene = (currentScene + 1) % (SceneManager.sceneCountInBuildSettings - 1);
234237

‎Assets/VisualEffectSamples.unity‎

Lines changed: 248 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3081,6 +3081,83 @@ RectTransform:
30813081
type: 3}
30823082
m_PrefabInstance: {fileID: 928735226}
30833083
m_PrefabAsset: {fileID: 0}
3084+
--- !u!1 &996468510
3085+
GameObject:
3086+
m_ObjectHideFlags: 0
3087+
m_CorrespondingSourceObject: {fileID: 0}
3088+
m_PrefabInstance: {fileID: 0}
3089+
m_PrefabAsset: {fileID: 0}
3090+
serializedVersion: 6
3091+
m_Component:
3092+
- component: {fileID: 996468511}
3093+
- component: {fileID: 996468513}
3094+
- component: {fileID: 996468512}
3095+
m_Layer: 5
3096+
m_Name: TakeScreenshot
3097+
m_TagString: Untagged
3098+
m_Icon: {fileID: 0}
3099+
m_NavMeshLayer: 0
3100+
m_StaticEditorFlags: 0
3101+
m_IsActive: 1
3102+
--- !u!224 &996468511
3103+
RectTransform:
3104+
m_ObjectHideFlags: 0
3105+
m_CorrespondingSourceObject: {fileID: 0}
3106+
m_PrefabInstance: {fileID: 0}
3107+
m_PrefabAsset: {fileID: 0}
3108+
m_GameObject: {fileID: 996468510}
3109+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
3110+
m_LocalPosition: {x: 0, y: 0, z: 0}
3111+
m_LocalScale: {x: 1, y: 1, z: 1}
3112+
m_Children: []
3113+
m_Father: {fileID: 2021809021}
3114+
m_RootOrder: 5
3115+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3116+
m_AnchorMin: {x: 0, y: 0}
3117+
m_AnchorMax: {x: 1, y: 1}
3118+
m_AnchoredPosition: {x: 16.599903, y: 287}
3119+
m_SizeDelta: {x: -136.20001, y: -1049}
3120+
m_Pivot: {x: 0.5, y: 0.5}
3121+
--- !u!114 &996468512
3122+
MonoBehaviour:
3123+
m_ObjectHideFlags: 0
3124+
m_CorrespondingSourceObject: {fileID: 0}
3125+
m_PrefabInstance: {fileID: 0}
3126+
m_PrefabAsset: {fileID: 0}
3127+
m_GameObject: {fileID: 996468510}
3128+
m_Enabled: 1
3129+
m_EditorHideFlags: 0
3130+
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
3131+
m_Name:
3132+
m_EditorClassIdentifier:
3133+
m_Material: {fileID: 0}
3134+
m_Color: {r: 1, g: 1, b: 1, a: 1}
3135+
m_RaycastTarget: 1
3136+
m_OnCullStateChanged:
3137+
m_PersistentCalls:
3138+
m_Calls: []
3139+
m_FontData:
3140+
m_Font: {fileID: 12800000, guid: 5d586a3aeda737f40b3904197903b045, type: 3}
3141+
m_FontSize: 24
3142+
m_FontStyle: 0
3143+
m_BestFit: 0
3144+
m_MinSize: 1
3145+
m_MaxSize: 128
3146+
m_Alignment: 0
3147+
m_AlignByGeometry: 0
3148+
m_RichText: 1
3149+
m_HorizontalOverflow: 0
3150+
m_VerticalOverflow: 0
3151+
m_LineSpacing: 1
3152+
m_Text: Take Screenshot (F10)
3153+
--- !u!222 &996468513
3154+
CanvasRenderer:
3155+
m_ObjectHideFlags: 0
3156+
m_CorrespondingSourceObject: {fileID: 0}
3157+
m_PrefabInstance: {fileID: 0}
3158+
m_PrefabAsset: {fileID: 0}
3159+
m_GameObject: {fileID: 996468510}
3160+
m_CullTransparentMesh: 0
30843161
--- !u!1 &1061831870
30853162
GameObject:
30863163
m_ObjectHideFlags: 0
@@ -3154,6 +3231,171 @@ CanvasRenderer:
31543231
m_PrefabAsset: {fileID: 0}
31553232
m_GameObject: {fileID: 1061831870}
31563233
m_CullTransparentMesh: 0
3234+
--- !u!1001 &1080105746
3235+
PrefabInstance:
3236+
m_ObjectHideFlags: 0
3237+
serializedVersion: 2
3238+
m_Modification:
3239+
m_TransformParent: {fileID: 2021809021}
3240+
m_Modifications:
3241+
- target: {fileID: 7953774776606052989, guid: 3f146363112f3fa4bb4dd8aa542bae38,
3242+
type: 3}
3243+
propertyPath: m_Text
3244+
value: Next Scene (Return)
3245+
objectReference: {fileID: 0}
3246+
- target: {fileID: 7953774777616601664, guid: 3f146363112f3fa4bb4dd8aa542bae38,
3247+
type: 3}
3248+
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
3249+
value: 1
3250+
objectReference: {fileID: 0}
3251+
- target: {fileID: 7953774777616601664, guid: 3f146363112f3fa4bb4dd8aa542bae38,
3252+
type: 3}
3253+
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
3254+
value: 1
3255+
objectReference: {fileID: 0}
3256+
- target: {fileID: 7953774777616601664, guid: 3f146363112f3fa4bb4dd8aa542bae38,
3257+
type: 3}
3258+
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
3259+
value: 2
3260+
objectReference: {fileID: 0}
3261+
- target: {fileID: 7953774777616601664, guid: 3f146363112f3fa4bb4dd8aa542bae38,
3262+
type: 3}
3263+
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
3264+
value:
3265+
objectReference: {fileID: 792070312}
3266+
- target: {fileID: 7953774777616601664, guid: 3f146363112f3fa4bb4dd8aa542bae38,
3267+
type: 3}
3268+
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
3269+
value: NextScene
3270+
objectReference: {fileID: 0}
3271+
- target: {fileID: 7953774777616601664, guid: 3f146363112f3fa4bb4dd8aa542bae38,
3272+
type: 3}
3273+
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
3274+
value: UnityEngine.Object, UnityEngine
3275+
objectReference: {fileID: 0}
3276+
- target: {fileID: 7953774777616601664, guid: 3f146363112f3fa4bb4dd8aa542bae38,
3277+
type: 3}
3278+
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_BoolArgument
3279+
value: 1
3280+
objectReference: {fileID: 0}
3281+
- target: {fileID: 7953774777616601666, guid: 3f146363112f3fa4bb4dd8aa542bae38,
3282+
type: 3}
3283+
propertyPath: m_Name
3284+
value: Button Next Scene
3285+
objectReference: {fileID: 0}
3286+
- target: {fileID: 7953774777616601667, guid: 3f146363112f3fa4bb4dd8aa542bae38,
3287+
type: 3}
3288+
propertyPath: m_LocalPosition.x
3289+
value: 0
3290+
objectReference: {fileID: 0}
3291+
- target: {fileID: 7953774777616601667, guid: 3f146363112f3fa4bb4dd8aa542bae38,
3292+
type: 3}
3293+
propertyPath: m_LocalPosition.y
3294+
value: 0
3295+
objectReference: {fileID: 0}
3296+
- target: {fileID: 7953774777616601667, guid: 3f146363112f3fa4bb4dd8aa542bae38,
3297+
type: 3}
3298+
propertyPath: m_LocalPosition.z
3299+
value: 0
3300+
objectReference: {fileID: 0}
3301+
- target: {fileID: 7953774777616601667, guid: 3f146363112f3fa4bb4dd8aa542bae38,
3302+
type: 3}
3303+
propertyPath: m_LocalRotation.x
3304+
value: 0
3305+
objectReference: {fileID: 0}
3306+
- target: {fileID: 7953774777616601667, guid: 3f146363112f3fa4bb4dd8aa542bae38,
3307+
type: 3}
3308+
propertyPath: m_LocalRotation.y
3309+
value: 0
3310+
objectReference: {fileID: 0}
3311+
- target: {fileID: 7953774777616601667, guid: 3f146363112f3fa4bb4dd8aa542bae38,
3312+
type: 3}
3313+
propertyPath: m_LocalRotation.z
3314+
value: 0
3315+
objectReference: {fileID: 0}
3316+
- target: {fileID: 7953774777616601667, guid: 3f146363112f3fa4bb4dd8aa542bae38,
3317+
type: 3}
3318+
propertyPath: m_LocalRotation.w
3319+
value: 1
3320+
objectReference: {fileID: 0}
3321+
- target: {fileID: 7953774777616601667, guid: 3f146363112f3fa4bb4dd8aa542bae38,
3322+
type: 3}
3323+
propertyPath: m_RootOrder
3324+
value: 6
3325+
objectReference: {fileID: 0}
3326+
- target: {fileID: 7953774777616601667, guid: 3f146363112f3fa4bb4dd8aa542bae38,
3327+
type: 3}
3328+
propertyPath: m_LocalEulerAnglesHint.x
3329+
value: 0
3330+
objectReference: {fileID: 0}
3331+
- target: {fileID: 7953774777616601667, guid: 3f146363112f3fa4bb4dd8aa542bae38,
3332+
type: 3}
3333+
propertyPath: m_LocalEulerAnglesHint.y
3334+
value: 0
3335+
objectReference: {fileID: 0}
3336+
- target: {fileID: 7953774777616601667, guid: 3f146363112f3fa4bb4dd8aa542bae38,
3337+
type: 3}
3338+
propertyPath: m_LocalEulerAnglesHint.z
3339+
value: 0
3340+
objectReference: {fileID: 0}
3341+
- target: {fileID: 7953774777616601667, guid: 3f146363112f3fa4bb4dd8aa542bae38,
3342+
type: 3}
3343+
propertyPath: m_AnchoredPosition.x
3344+
value: -4.6000977
3345+
objectReference: {fileID: 0}
3346+
- target: {fileID: 7953774777616601667, guid: 3f146363112f3fa4bb4dd8aa542bae38,
3347+
type: 3}
3348+
propertyPath: m_AnchoredPosition.y
3349+
value: 192
3350+
objectReference: {fileID: 0}
3351+
- target: {fileID: 7953774777616601667, guid: 3f146363112f3fa4bb4dd8aa542bae38,
3352+
type: 3}
3353+
propertyPath: m_SizeDelta.x
3354+
value: -72.7
3355+
objectReference: {fileID: 0}
3356+
- target: {fileID: 7953774777616601667, guid: 3f146363112f3fa4bb4dd8aa542bae38,
3357+
type: 3}
3358+
propertyPath: m_SizeDelta.y
3359+
value: 61.4
3360+
objectReference: {fileID: 0}
3361+
- target: {fileID: 7953774777616601667, guid: 3f146363112f3fa4bb4dd8aa542bae38,
3362+
type: 3}
3363+
propertyPath: m_AnchorMin.x
3364+
value: 0
3365+
objectReference: {fileID: 0}
3366+
- target: {fileID: 7953774777616601667, guid: 3f146363112f3fa4bb4dd8aa542bae38,
3367+
type: 3}
3368+
propertyPath: m_AnchorMin.y
3369+
value: 0.5
3370+
objectReference: {fileID: 0}
3371+
- target: {fileID: 7953774777616601667, guid: 3f146363112f3fa4bb4dd8aa542bae38,
3372+
type: 3}
3373+
propertyPath: m_AnchorMax.x
3374+
value: 1
3375+
objectReference: {fileID: 0}
3376+
- target: {fileID: 7953774777616601667, guid: 3f146363112f3fa4bb4dd8aa542bae38,
3377+
type: 3}
3378+
propertyPath: m_AnchorMax.y
3379+
value: 0.5
3380+
objectReference: {fileID: 0}
3381+
- target: {fileID: 7953774777616601667, guid: 3f146363112f3fa4bb4dd8aa542bae38,
3382+
type: 3}
3383+
propertyPath: m_Pivot.x
3384+
value: 0.5
3385+
objectReference: {fileID: 0}
3386+
- target: {fileID: 7953774777616601667, guid: 3f146363112f3fa4bb4dd8aa542bae38,
3387+
type: 3}
3388+
propertyPath: m_Pivot.y
3389+
value: 0.5
3390+
objectReference: {fileID: 0}
3391+
m_RemovedComponents: []
3392+
m_SourcePrefab: {fileID: 100100000, guid: 3f146363112f3fa4bb4dd8aa542bae38, type: 3}
3393+
--- !u!224 &1080105747 stripped
3394+
RectTransform:
3395+
m_CorrespondingSourceObject: {fileID: 7953774777616601667, guid: 3f146363112f3fa4bb4dd8aa542bae38,
3396+
type: 3}
3397+
m_PrefabInstance: {fileID: 1080105746}
3398+
m_PrefabAsset: {fileID: 0}
31573399
--- !u!1 &1090678041
31583400
GameObject:
31593401
m_ObjectHideFlags: 0
@@ -4071,7 +4313,7 @@ PrefabInstance:
40714313
- target: {fileID: 7953774777616601667, guid: 3f146363112f3fa4bb4dd8aa542bae38,
40724314
type: 3}
40734315
propertyPath: m_RootOrder
4074-
value: 6
4316+
value: 8
40754317
objectReference: {fileID: 0}
40764318
- target: {fileID: 7953774777616601667, guid: 3f146363112f3fa4bb4dd8aa542bae38,
40774319
type: 3}
@@ -4096,7 +4338,7 @@ PrefabInstance:
40964338
- target: {fileID: 7953774777616601667, guid: 3f146363112f3fa4bb4dd8aa542bae38,
40974339
type: 3}
40984340
propertyPath: m_AnchoredPosition.y
4099-
value: 184
4341+
value: 37.400024
41004342
objectReference: {fileID: 0}
41014343
- target: {fileID: 7953774777616601667, guid: 3f146363112f3fa4bb4dd8aa542bae38,
41024344
type: 3}
@@ -5511,6 +5753,8 @@ RectTransform:
55115753
- {fileID: 134737607}
55125754
- {fileID: 1432135428}
55135755
- {fileID: 1238599955}
5756+
- {fileID: 996468511}
5757+
- {fileID: 1080105747}
55145758
- {fileID: 430133329}
55155759
- {fileID: 1384128335}
55165760
m_Father: {fileID: 223951092}
@@ -5983,7 +6227,7 @@ PrefabInstance:
59836227
- target: {fileID: 7953774777616601667, guid: 3f146363112f3fa4bb4dd8aa542bae38,
59846228
type: 3}
59856229
propertyPath: m_RootOrder
5986-
value: 5
6230+
value: 7
59876231
objectReference: {fileID: 0}
59886232
- target: {fileID: 7953774777616601667, guid: 3f146363112f3fa4bb4dd8aa542bae38,
59896233
type: 3}
@@ -6008,7 +6252,7 @@ PrefabInstance:
60086252
- target: {fileID: 7953774777616601667, guid: 3f146363112f3fa4bb4dd8aa542bae38,
60096253
type: 3}
60106254
propertyPath: m_AnchoredPosition.y
6011-
value: 261.3
6255+
value: 114.70001
60126256
objectReference: {fileID: 0}
60136257
- target: {fileID: 7953774777616601667, guid: 3f146363112f3fa4bb4dd8aa542bae38,
60146258
type: 3}

0 commit comments

Comments
 (0)