fix myriad bugs, finish freeze env and also baz

This commit is contained in:
Cat Flynn 2021-05-17 03:29:00 +01:00
parent 67eab1c2ba
commit eda57b9234
18 changed files with 178192 additions and 17017 deletions

View File

@ -14,37 +14,37 @@ AnimatorController:
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_Controller: {fileID: 0}
- m_Name: punch
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_Controller: {fileID: 0}
- m_Name: fall_over
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_Controller: {fileID: 0}
- m_Name: get_up
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_Controller: {fileID: 0}
- m_Name: drink
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_Controller: {fileID: 0}
- m_Name: die
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
@ -426,7 +426,7 @@ AnimatorState:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Armature|FallOver
m_Speed: 1
m_Speed: 0.1
m_CycleOffset: 0
m_Transitions:
- {fileID: 1101580070399927610}

File diff suppressed because one or more lines are too long

View File

@ -29,6 +29,7 @@ Transform:
m_Children:
- {fileID: 130506617757981692}
- {fileID: 1586266293021856741}
- {fileID: 8131353336321872272}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -44,6 +45,184 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c3ce05717d7828b418026c43e7583aac, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &2746843440818194377
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5406415478468741166}
- component: {fileID: 674679289525883294}
- component: {fileID: 1111023479599713047}
m_Layer: 0
m_Name: Dialogue 0
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5406415478468741166
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2746843440818194377}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1586266293021856741}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &674679289525883294
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2746843440818194377}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &1111023479599713047
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2746843440818194377}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bf23d7e814442a54888e34f51cbf3cc3, type: 3}
m_Name:
m_EditorClassIdentifier:
_dialogue: {fileID: 11400000, guid: 56369c4e83cc59e44bf55cd16fafc4e8, type: 2}
_speaker: 1
_key:
_keys:
- BAZ_0
- BAZ_1
- BAZ_2
- BAZ_3
_log: 0
--- !u!1 &3469962957253597051
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2726912772811747172}
- component: {fileID: 1875087054162059017}
- component: {fileID: 2345015075621106163}
m_Layer: 0
m_Name: 0
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2726912772811747172
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3469962957253597051}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8131353336321872272}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1875087054162059017
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3469962957253597051}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0a5de09a27d949d4db67034f55c57e6b, type: 3}
m_Name:
m_EditorClassIdentifier:
_event: {fileID: 11400000, guid: 40893a35c2567d6428e07341d4251694, type: 2}
_response:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 3469962957253597051}
m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
m_MethodName: SetActive
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 6398376923643260654}
m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
m_MethodName: SetActive
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 1
m_CallState: 2
--- !u!114 &2345015075621106163
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3469962957253597051}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0a5de09a27d949d4db67034f55c57e6b, type: 3}
m_Name:
m_EditorClassIdentifier:
_event: {fileID: 11400000, guid: 457e90257ef8a6f49932f88c57125e91, type: 2}
_response:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 3469962957253597051}
m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
m_MethodName: SetActive
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 6398376923643260654}
m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
m_MethodName: SetActive
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 1
m_CallState: 2
--- !u!1 &4834652411730270464
GameObject:
m_ObjectHideFlags: 0
@ -57,7 +236,6 @@ GameObject:
- component: {fileID: 1133689826456565642}
- component: {fileID: 7832287278292193660}
- component: {fileID: 5495210607016545391}
- component: {fileID: 3482902643679057418}
m_Layer: 0
m_Name: Trigger
m_TagString: Untagged
@ -75,7 +253,9 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.34, y: 1.72, z: -2.36}
m_LocalScale: {x: 3.7642562, y: 3.7642562, z: 8.093151}
m_Children: []
m_Children:
- {fileID: 5406415478468741166}
- {fileID: 7405030880719477844}
m_Father: {fileID: 130506617589700112}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -175,13 +355,202 @@ MonoBehaviour:
unity:
m_PersistentCalls:
m_Calls: []
--- !u!114 &3482902643679057418
--- !u!1 &6398376923643260654
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 104882825574427883}
- component: {fileID: 8843830677624255212}
- component: {fileID: 5683541449734186427}
m_Layer: 0
m_Name: 1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &104882825574427883
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6398376923643260654}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8131353336321872272}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &8843830677624255212
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4834652411730270464}
m_GameObject: {fileID: 6398376923643260654}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0a5de09a27d949d4db67034f55c57e6b, type: 3}
m_Name:
m_EditorClassIdentifier:
_event: {fileID: 11400000, guid: 40893a35c2567d6428e07341d4251694, type: 2}
_response:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 2746843440818194377}
m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
m_MethodName: SetActive
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 7312917423007848975}
m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
m_MethodName: SetActive
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 1
m_CallState: 2
--- !u!114 &5683541449734186427
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6398376923643260654}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0a5de09a27d949d4db67034f55c57e6b, type: 3}
m_Name:
m_EditorClassIdentifier:
_event: {fileID: 11400000, guid: 457e90257ef8a6f49932f88c57125e91, type: 2}
_response:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 2746843440818194377}
m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
m_MethodName: SetActive
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 7312917423007848975}
m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
m_MethodName: SetActive
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 1
m_CallState: 2
--- !u!1 &6586931565496961934
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8131353336321872272}
m_Layer: 0
m_Name: Listeners
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8131353336321872272
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6586931565496961934}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 2726912772811747172}
- {fileID: 104882825574427883}
m_Father: {fileID: 130506617589700112}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &7312917423007848975
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7405030880719477844}
- component: {fileID: 2633890821370003827}
- component: {fileID: 5158584944850172470}
m_Layer: 0
m_Name: Dialogue 1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &7405030880719477844
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7312917423007848975}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1586266293021856741}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &2633890821370003827
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7312917423007848975}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &5158584944850172470
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7312917423007848975}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bf23d7e814442a54888e34f51cbf3cc3, type: 3}
@ -191,10 +560,10 @@ MonoBehaviour:
_speaker: 1
_key:
_keys:
- BAZ_0
- BAZ_1
- BAZ_2
- BAZ_3
- BAZ_4
- BAZ_5
- BAZ_6
- BAZ_7
_log: 0
--- !u!1001 &130506617757843784
PrefabInstance:

View File

@ -186,7 +186,6 @@ GameObject:
m_Component:
- component: {fileID: 889410586990417773}
- component: {fileID: 8044731510911618503}
- component: {fileID: 2033609833314563782}
m_Layer: 0
m_Name: Door
m_TagString: Untagged
@ -222,34 +221,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c79d6b66286a2ac41b41321a95dfcc00, type: 3}
m_Name:
m_EditorClassIdentifier:
_graphics: {fileID: 6996056622029946206}
_graphics: {fileID: 4335103919425867979}
_endpoint: {fileID: 7967059043073895829}
_animTime: 1.2
--- !u!114 &2033609833314563782
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7857540940252484938}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0a5de09a27d949d4db67034f55c57e6b, type: 3}
m_Name:
m_EditorClassIdentifier:
_event: {fileID: 11400000, guid: 6e31084a96bb93a44a85563a6208d0da, type: 2}
_response:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 8044731510911618503}
m_TargetAssemblyTypeName: Door, Assembly-CSharp
m_MethodName: Reset
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2

View File

@ -6124,6 +6124,7 @@ Transform:
- {fileID: 3125292288373860869}
- {fileID: 1062590479080364071}
- {fileID: 2875601136776945961}
- {fileID: 5669141791888520616}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -15320,10 +15321,6 @@ PrefabInstance:
propertyPath: m_Name
value: Temple
objectReference: {fileID: 0}
- target: {fileID: 2459802978564044542, guid: 539c60fd7808c9f479250b070d605c38, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2734962257757404181, guid: 539c60fd7808c9f479250b070d605c38, type: 3}
propertyPath: m_IsActive
value: 0
@ -15354,6 +15351,11 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 539c60fd7808c9f479250b070d605c38, type: 3}
--- !u!1 &2751226988317436797 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2459802978564044542, guid: 539c60fd7808c9f479250b070d605c38, type: 3}
m_PrefabInstance: {fileID: 291796746367999363}
m_PrefabAsset: {fileID: 0}
--- !u!4 &2751226988317436798 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 2459802978564044541, guid: 539c60fd7808c9f479250b070d605c38, type: 3}
@ -15364,11 +15366,6 @@ Transform:
m_CorrespondingSourceObject: {fileID: 2459802979327059716, guid: 539c60fd7808c9f479250b070d605c38, type: 3}
m_PrefabInstance: {fileID: 291796746367999363}
m_PrefabAsset: {fileID: 0}
--- !u!1 &2751226988317436797 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2459802978564044542, guid: 539c60fd7808c9f479250b070d605c38, type: 3}
m_PrefabInstance: {fileID: 291796746367999363}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &306742707821876137
PrefabInstance:
m_ObjectHideFlags: 0
@ -16848,9 +16845,9 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 539c60fd7808c9f479250b070d605c38, type: 3}
--- !u!1 &4120508371854579886 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2734962257757404181, guid: 539c60fd7808c9f479250b070d605c38, type: 3}
--- !u!4 &4537531520206852678 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 2459802978564044541, guid: 539c60fd7808c9f479250b070d605c38, type: 3}
m_PrefabInstance: {fileID: 2079102987037353147}
m_PrefabAsset: {fileID: 0}
--- !u!1 &4537531520206852677 stripped
@ -16858,11 +16855,6 @@ GameObject:
m_CorrespondingSourceObject: {fileID: 2459802978564044542, guid: 539c60fd7808c9f479250b070d605c38, type: 3}
m_PrefabInstance: {fileID: 2079102987037353147}
m_PrefabAsset: {fileID: 0}
--- !u!4 &4537531520206852678 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 2459802978564044541, guid: 539c60fd7808c9f479250b070d605c38, type: 3}
m_PrefabInstance: {fileID: 2079102987037353147}
m_PrefabAsset: {fileID: 0}
--- !u!4 &4537531518766285957 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 2459802978197217342, guid: 539c60fd7808c9f479250b070d605c38, type: 3}
@ -16873,6 +16865,11 @@ Transform:
m_CorrespondingSourceObject: {fileID: 3716559117116650351, guid: 539c60fd7808c9f479250b070d605c38, type: 3}
m_PrefabInstance: {fileID: 2079102987037353147}
m_PrefabAsset: {fileID: 0}
--- !u!1 &4120508371854579886 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2734962257757404181, guid: 539c60fd7808c9f479250b070d605c38, type: 3}
m_PrefabInstance: {fileID: 2079102987037353147}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &2484159269834703740
PrefabInstance:
m_ObjectHideFlags: 0
@ -17396,16 +17393,16 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9dc0ffd7f5e4855429cfdf90601da8ce, type: 3}
--- !u!4 &8657027508073715767 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6613058589667321331, guid: 9dc0ffd7f5e4855429cfdf90601da8ce, type: 3}
m_PrefabInstance: {fileID: 2586681476711169476}
m_PrefabAsset: {fileID: 0}
--- !u!4 &8657027508209180344 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6613058589800293244, guid: 9dc0ffd7f5e4855429cfdf90601da8ce, type: 3}
m_PrefabInstance: {fileID: 2586681476711169476}
m_PrefabAsset: {fileID: 0}
--- !u!4 &8657027508073715767 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6613058589667321331, guid: 9dc0ffd7f5e4855429cfdf90601da8ce, type: 3}
m_PrefabInstance: {fileID: 2586681476711169476}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &2586681477062813136
PrefabInstance:
m_ObjectHideFlags: 0
@ -17619,9 +17616,9 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: bc071165ad2d3c14288cf13ac0ff6537, type: 3}
--- !u!1 &3428812824805658496 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 896262512660999311, guid: bc071165ad2d3c14288cf13ac0ff6537, type: 3}
--- !u!4 &1170184304258922646 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3735992581812067225, guid: bc071165ad2d3c14288cf13ac0ff6537, type: 3}
m_PrefabInstance: {fileID: 2586681477197472527}
m_PrefabAsset: {fileID: 0}
--- !u!1 &5616010760734805323 stripped
@ -17634,9 +17631,9 @@ GameObject:
m_CorrespondingSourceObject: {fileID: 8232209414600665074, guid: bc071165ad2d3c14288cf13ac0ff6537, type: 3}
m_PrefabInstance: {fileID: 2586681477197472527}
m_PrefabAsset: {fileID: 0}
--- !u!4 &1170184304258922646 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3735992581812067225, guid: bc071165ad2d3c14288cf13ac0ff6537, type: 3}
--- !u!1 &3428812824805658496 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 896262512660999311, guid: bc071165ad2d3c14288cf13ac0ff6537, type: 3}
m_PrefabInstance: {fileID: 2586681477197472527}
m_PrefabAsset: {fileID: 0}
--- !u!1 &421827026364041194 stripped
@ -17653,7 +17650,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 6613058589454542448, guid: 9dc0ffd7f5e4855429cfdf90601da8ce, type: 3}
propertyPath: m_LocalPosition.x
value: 12.941532
value: 12.941505
objectReference: {fileID: 0}
- target: {fileID: 6613058589454542448, guid: 9dc0ffd7f5e4855429cfdf90601da8ce, type: 3}
propertyPath: m_LocalPosition.y
@ -17661,7 +17658,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6613058589454542448, guid: 9dc0ffd7f5e4855429cfdf90601da8ce, type: 3}
propertyPath: m_LocalPosition.z
value: 10.754539
value: 10.754522
objectReference: {fileID: 0}
- target: {fileID: 6613058589454542448, guid: 9dc0ffd7f5e4855429cfdf90601da8ce, type: 3}
propertyPath: m_LocalRotation.y
@ -17801,16 +17798,16 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9dc0ffd7f5e4855429cfdf90601da8ce, type: 3}
--- !u!4 &8657027507322362388 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6613058589667321331, guid: 9dc0ffd7f5e4855429cfdf90601da8ce, type: 3}
m_PrefabInstance: {fileID: 2586681477597724647}
m_PrefabAsset: {fileID: 0}
--- !u!4 &8657027507187293339 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6613058589800293244, guid: 9dc0ffd7f5e4855429cfdf90601da8ce, type: 3}
m_PrefabInstance: {fileID: 2586681477597724647}
m_PrefabAsset: {fileID: 0}
--- !u!4 &8657027507322362388 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6613058589667321331, guid: 9dc0ffd7f5e4855429cfdf90601da8ce, type: 3}
m_PrefabInstance: {fileID: 2586681477597724647}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &2586681477875501226
PrefabInstance:
m_ObjectHideFlags: 0
@ -18545,16 +18542,16 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2784d88b6334dc143a910f3d252aa5df, type: 3}
--- !u!1 &4515224116292451270 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 2784d88b6334dc143a910f3d252aa5df, type: 3}
m_PrefabInstance: {fileID: 3632194575318009495}
m_PrefabAsset: {fileID: 0}
--- !u!4 &3882838201459745148 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 2784d88b6334dc143a910f3d252aa5df, type: 3}
m_PrefabInstance: {fileID: 3632194575318009495}
m_PrefabAsset: {fileID: 0}
--- !u!1 &4515224116292451270 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 2784d88b6334dc143a910f3d252aa5df, type: 3}
m_PrefabInstance: {fileID: 3632194575318009495}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &3716639497179111755
PrefabInstance:
m_ObjectHideFlags: 0
@ -20783,39 +20780,39 @@ PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 4537531520206852678}
m_TransformParent: {fileID: 2586681477282854764}
m_Modifications:
- target: {fileID: 130506617589700112, guid: b69832890ed8a6d4d94f96406e56bdba, type: 3}
propertyPath: m_RootOrder
value: 3
value: 11
objectReference: {fileID: 0}
- target: {fileID: 130506617589700112, guid: b69832890ed8a6d4d94f96406e56bdba, type: 3}
propertyPath: m_LocalPosition.x
value: -0.57
value: 23.461958
objectReference: {fileID: 0}
- target: {fileID: 130506617589700112, guid: b69832890ed8a6d4d94f96406e56bdba, type: 3}
propertyPath: m_LocalPosition.y
value: -0.15
value: 9.870001
objectReference: {fileID: 0}
- target: {fileID: 130506617589700112, guid: b69832890ed8a6d4d94f96406e56bdba, type: 3}
propertyPath: m_LocalPosition.z
value: -1.74
value: -32.23212
objectReference: {fileID: 0}
- target: {fileID: 130506617589700112, guid: b69832890ed8a6d4d94f96406e56bdba, type: 3}
propertyPath: m_LocalRotation.w
value: -0.9914449
value: -0.69341505
objectReference: {fileID: 0}
- target: {fileID: 130506617589700112, guid: b69832890ed8a6d4d94f96406e56bdba, type: 3}
propertyPath: m_LocalRotation.x
value: -0.13052648
value: -0.09129002
objectReference: {fileID: 0}
- target: {fileID: 130506617589700112, guid: b69832890ed8a6d4d94f96406e56bdba, type: 3}
propertyPath: m_LocalRotation.y
value: -0.0000059604636
value: 0.70861727
objectReference: {fileID: 0}
- target: {fileID: 130506617589700112, guid: b69832890ed8a6d4d94f96406e56bdba, type: 3}
propertyPath: m_LocalRotation.z
value: 0.00000077486027
value: -0.093291454
objectReference: {fileID: 0}
- target: {fileID: 130506617589700112, guid: b69832890ed8a6d4d94f96406e56bdba, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@ -20833,8 +20830,45 @@ PrefabInstance:
propertyPath: m_Name
value: baz
objectReference: {fileID: 0}
- target: {fileID: 1586266293021856741, guid: b69832890ed8a6d4d94f96406e56bdba, type: 3}
propertyPath: m_LocalPosition.x
value: 0.34
objectReference: {fileID: 0}
- target: {fileID: 1586266293021856741, guid: b69832890ed8a6d4d94f96406e56bdba, type: 3}
propertyPath: m_LocalPosition.y
value: 2.19
objectReference: {fileID: 0}
- target: {fileID: 1586266293021856741, guid: b69832890ed8a6d4d94f96406e56bdba, type: 3}
propertyPath: m_LocalPosition.z
value: -0.49
objectReference: {fileID: 0}
- target: {fileID: 1586266293021856741, guid: b69832890ed8a6d4d94f96406e56bdba, type: 3}
propertyPath: m_LocalRotation.w
value: 0.9925765
objectReference: {fileID: 0}
- target: {fileID: 1586266293021856741, guid: b69832890ed8a6d4d94f96406e56bdba, type: 3}
propertyPath: m_LocalRotation.x
value: -0.121621996
objectReference: {fileID: 0}
- target: {fileID: 1586266293021856741, guid: b69832890ed8a6d4d94f96406e56bdba, type: 3}
propertyPath: m_LocalRotation.y
value: 0.000000029802319
objectReference: {fileID: 0}
- target: {fileID: 1586266293021856741, guid: b69832890ed8a6d4d94f96406e56bdba, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 1586266293021856741, guid: b69832890ed8a6d4d94f96406e56bdba, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -13.971
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b69832890ed8a6d4d94f96406e56bdba, type: 3}
--- !u!4 &5669141791888520616 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 130506617589700112, guid: b69832890ed8a6d4d94f96406e56bdba, type: 3}
m_PrefabInstance: {fileID: 5720540744525259704}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &5804067414495682297
PrefabInstance:
m_ObjectHideFlags: 0

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -157,6 +157,22 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 10801030015982629, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2362147618001096390, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4129658102321030235, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5313754573944975580, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: e4f49cf734350df4688ffaad41d3ff33, type: 2}
- target: {fileID: 6378198502367496824, guid: d145f0e5906f91a4fad7f384f1b2a6ec, type: 3}
propertyPath: m_Materials.Array.data[0]
value:

View File

@ -0,0 +1,63 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &9011105936604993996
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2360318115280080638, guid: c29d29d651393794b86f3ba52ef1bf5a, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2360318115280080638, guid: c29d29d651393794b86f3ba52ef1bf5a, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2360318115280080638, guid: c29d29d651393794b86f3ba52ef1bf5a, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2360318115280080638, guid: c29d29d651393794b86f3ba52ef1bf5a, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2360318115280080638, guid: c29d29d651393794b86f3ba52ef1bf5a, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2360318115280080638, guid: c29d29d651393794b86f3ba52ef1bf5a, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2360318115280080638, guid: c29d29d651393794b86f3ba52ef1bf5a, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2360318115280080638, guid: c29d29d651393794b86f3ba52ef1bf5a, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2360318115280080638, guid: c29d29d651393794b86f3ba52ef1bf5a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2360318115280080638, guid: c29d29d651393794b86f3ba52ef1bf5a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -36.672
objectReference: {fileID: 0}
- target: {fileID: 2360318115280080638, guid: c29d29d651393794b86f3ba52ef1bf5a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2885477517492203739, guid: c29d29d651393794b86f3ba52ef1bf5a, type: 3}
propertyPath: m_Name
value: FallawayColumnNoDelay
objectReference: {fileID: 0}
- target: {fileID: 6652674350596631292, guid: c29d29d651393794b86f3ba52ef1bf5a, type: 3}
propertyPath: fallAwayTime
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c29d29d651393794b86f3ba52ef1bf5a, type: 3}

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: c536df2627d7e10428c786194a7db600
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -228,7 +228,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 8
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &117513429
PrefabInstance:
@ -243,7 +243,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4758515821597276433, guid: 945ea28269e140942b344f627851a0eb, type: 3}
propertyPath: m_RootOrder
value: 7
value: 6
objectReference: {fileID: 0}
- target: {fileID: 4758515821597276433, guid: 945ea28269e140942b344f627851a0eb, type: 3}
propertyPath: m_LocalPosition.x
@ -364,7 +364,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2586681477282854764, guid: 7c3d972ffcb805146afc5aa612f9a45b, type: 3}
propertyPath: m_RootOrder
value: 3
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2586681477282854764, guid: 7c3d972ffcb805146afc5aa612f9a45b, type: 3}
propertyPath: m_LocalPosition.x
@ -590,6 +590,14 @@ PrefabInstance:
propertyPath: m_RootOrder
value: 121
objectReference: {fileID: 0}
- target: {fileID: 6440426423557419101, guid: 7c3d972ffcb805146afc5aa612f9a45b, type: 3}
propertyPath: m_LocalScale.z
value: 8.739794
objectReference: {fileID: 0}
- target: {fileID: 6440426423557419101, guid: 7c3d972ffcb805146afc5aa612f9a45b, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -15.083
objectReference: {fileID: 0}
- target: {fileID: 6900594089853467736, guid: 7c3d972ffcb805146afc5aa612f9a45b, type: 3}
propertyPath: m_RootOrder
value: 115
@ -779,67 +787,6 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 72.036, y: -87.054, z: -55.734}
--- !u!1001 &764968436
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 506f92c064b9c494f981ac4216e033a8, type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 506f92c064b9c494f981ac4216e033a8, type: 3}
propertyPath: m_LocalScale.y
value: 1.9781767
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 506f92c064b9c494f981ac4216e033a8, type: 3}
propertyPath: m_LocalPosition.x
value: 18.61421
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 506f92c064b9c494f981ac4216e033a8, type: 3}
propertyPath: m_LocalPosition.y
value: 34.95
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 506f92c064b9c494f981ac4216e033a8, type: 3}
propertyPath: m_LocalPosition.z
value: -70.16564
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 506f92c064b9c494f981ac4216e033a8, type: 3}
propertyPath: m_LocalRotation.w
value: -0.00000035762784
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 506f92c064b9c494f981ac4216e033a8, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 506f92c064b9c494f981ac4216e033a8, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 506f92c064b9c494f981ac4216e033a8, type: 3}
propertyPath: m_LocalRotation.z
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 506f92c064b9c494f981ac4216e033a8, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 506f92c064b9c494f981ac4216e033a8, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 506f92c064b9c494f981ac4216e033a8, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 180
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 506f92c064b9c494f981ac4216e033a8, type: 3}
propertyPath: m_Name
value: Pillar_A
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 506f92c064b9c494f981ac4216e033a8, type: 3}
--- !u!1 &809442898
GameObject:
m_ObjectHideFlags: 0
@ -942,7 +889,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 1238586029389447280, guid: cbce53412fdfae24f9ab541fceb1f61d, type: 3}
propertyPath: m_RootOrder
value: 6
value: 5
objectReference: {fileID: 0}
- target: {fileID: 1238586029389447280, guid: cbce53412fdfae24f9ab541fceb1f61d, type: 3}
propertyPath: m_LocalPosition.x
@ -1015,7 +962,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6808448287154422776, guid: 8a3f2b3b16275e540b349897292a42ac, type: 3}
propertyPath: m_RootOrder
value: 4
value: 3
objectReference: {fileID: 0}
- target: {fileID: 6808448287154422776, guid: 8a3f2b3b16275e540b349897292a42ac, type: 3}
propertyPath: m_AnchorMax.x
@ -1091,6 +1038,101 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8a3f2b3b16275e540b349897292a42ac, type: 3}
--- !u!1 &1655656940
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1655656944}
- component: {fileID: 1655656943}
- component: {fileID: 1655656942}
- component: {fileID: 1655656941}
m_Layer: 0
m_Name: Cube
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!65 &1655656941
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1655656940}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!23 &1655656942
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1655656940}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &1655656943
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1655656940}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &1655656944
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1655656940}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 14.61, y: 1.93, z: -17.1644}
m_LocalScale: {x: 5.9994, y: 1, z: 9.579828}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1656312782
PrefabInstance:
m_ObjectHideFlags: 0
@ -1104,7 +1146,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6189151121097661531, guid: 1c743cd25da7f2e4991d052bf248b59d, type: 3}
propertyPath: m_RootOrder
value: 5
value: 4
objectReference: {fileID: 0}
- target: {fileID: 6189151121097661531, guid: 1c743cd25da7f2e4991d052bf248b59d, type: 3}
propertyPath: m_LocalPosition.x
@ -1188,7 +1230,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.x
value: -0.17408861
value: -0.17408858
objectReference: {fileID: 0}
- target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.y
@ -1212,19 +1254,19 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.w
value: 0.49880767
value: 0.4988077
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.x
value: -0.342424
value: -0.34242404
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.y
value: 0.6564143
value: 0.6564142
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.z
value: 0.4506186
value: 0.45061862
objectReference: {fileID: 0}
- target: {fileID: 4676633831414007564, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_Name
@ -1232,7 +1274,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_RootOrder
value: 2
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.x
@ -1332,31 +1374,31 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.x
value: 0
value: -0.07074076
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.y
value: 0
value: 0.6215874
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.z
value: 0
value: 0.4963915
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.w
value: 0.8137647
value: 0.7362309
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.x
value: 0.014304773
value: 0.3469614
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.y
value: 0.44927052
value: 0.5608836
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.z
value: 0.36842707
value: 0.15162987
objectReference: {fileID: 0}
- target: {fileID: 4676633832858914730, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_XAxis.Value
@ -1400,7 +1442,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.x
value: -0.08267866
value: -0.082678676
objectReference: {fileID: 0}
- target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.y
@ -1440,19 +1482,19 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.w
value: 0.49880764
value: 0.4988078
objectReference: {fileID: 0}
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.x
value: -0.34242404
value: -0.34242406
objectReference: {fileID: 0}
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.y
value: 0.6564142
value: 0.65641415
objectReference: {fileID: 0}
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.z
value: 0.45061862
value: 0.45061857
objectReference: {fileID: 0}
- target: {fileID: 7693506703464935808, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_IsActive

View File

@ -1049,6 +1049,10 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 4294967295
objectReference: {fileID: 0}
- target: {fileID: 990960014642394775, guid: 2d949926f63a2554584336b07085202b, type: 3}
propertyPath: m_LocalPosition.y
value: -6.72
objectReference: {fileID: 0}
- target: {fileID: 1096881820510102642, guid: 2d949926f63a2554584336b07085202b, type: 3}
propertyPath: m_RootOrder
value: 87
@ -1129,6 +1133,10 @@ PrefabInstance:
propertyPath: m_RootOrder
value: 46
objectReference: {fileID: 0}
- target: {fileID: 1745921595078626386, guid: 2d949926f63a2554584336b07085202b, type: 3}
propertyPath: m_RootOrder
value: 398
objectReference: {fileID: 0}
- target: {fileID: 1775509337953727403, guid: 2d949926f63a2554584336b07085202b, type: 3}
propertyPath: m_RootOrder
value: 63
@ -1161,6 +1169,10 @@ PrefabInstance:
propertyPath: m_RootOrder
value: 114
objectReference: {fileID: 0}
- target: {fileID: 2411929114833342197, guid: 2d949926f63a2554584336b07085202b, type: 3}
propertyPath: m_RootOrder
value: 397
objectReference: {fileID: 0}
- target: {fileID: 2480059483430624370, guid: 2d949926f63a2554584336b07085202b, type: 3}
propertyPath: m_RootOrder
value: 62
@ -1928,47 +1940,47 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.w
value: -0.07573024
value: -0.07711634
objectReference: {fileID: 0}
- target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.x
value: 0.015192904
value: -0.0044174194
objectReference: {fileID: 0}
- target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.y
value: 0.6178624
value: 0.7953869
objectReference: {fileID: 0}
- target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.z
value: 0.78248334
value: 0.60115993
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.x
value: 0.060943604
value: 0.0680275
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.y
value: -1.1262684
value: -0.4675033
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.z
value: -0.0051705837
value: 0.077101946
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.w
value: -0.16586861
value: -0.12363493
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.x
value: 0.09480724
value: 0.00071378204
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.y
value: 0.8521943
value: 0.992311
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.z
value: 0.48709753
value: 0.005728913
objectReference: {fileID: 0}
- target: {fileID: 4676633831414007564, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_Name
@ -1980,15 +1992,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.x
value: -316.47
value: -20.85
objectReference: {fileID: 0}
- target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.y
value: -20.75
value: 3.8
objectReference: {fileID: 0}
- target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.z
value: 24.89
value: -15.45
objectReference: {fileID: 0}
- target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.w
@ -2020,43 +2032,47 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.x
value: 0
value: -0.006910866
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.y
value: 0
value: 0.051522966
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.z
value: 0
value: 0.09331022
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.w
value: 0.08988383
value: 0.07660127
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.x
value: 0.009841472
value: 0.048075832
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.y
value: 0.8245487
value: 0.9856011
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.z
value: 0.55851907
value: 0.14286841
objectReference: {fileID: 0}
- target: {fileID: 4676633832858914730, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_YAxis.Value
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.x
value: 0.06265259
value: 0.0680275
objectReference: {fileID: 0}
- target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.y
value: -1.2534504
value: -0.4675033
objectReference: {fileID: 0}
- target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.z
value: 0.014013529
value: 0.077101946
objectReference: {fileID: 0}
- target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.x
@ -2072,47 +2088,47 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.w
value: 0.009317794
value: 0.008630581
objectReference: {fileID: 0}
- target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.x
value: -0.00025513026
value: 0.0031156428
objectReference: {fileID: 0}
- target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.y
value: 0.7439389
value: 0.9365646
objectReference: {fileID: 0}
- target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.z
value: 0.6681827
value: 0.35037506
objectReference: {fileID: 0}
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.x
value: 0.060943604
value: 0.0680275
objectReference: {fileID: 0}
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.y
value: -1.1262684
value: -0.4675033
objectReference: {fileID: 0}
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.z
value: -0.0051705837
value: 0.077101946
objectReference: {fileID: 0}
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.w
value: -0.16586861
value: -0.12363492
objectReference: {fileID: 0}
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.x
value: 0.09480724
value: 0.00071378256
objectReference: {fileID: 0}
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.y
value: 0.8521943
value: 0.992311
objectReference: {fileID: 0}
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.z
value: 0.48709753
value: 0.0057289177
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}

View File

@ -209,43 +209,47 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.w
value: -0.075407095
value: -0.075745225
objectReference: {fileID: 0}
- target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.x
value: 0.016738322
value: 0.015136961
objectReference: {fileID: 0}
- target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.y
value: 0.6017397
value: 0.6184476
objectReference: {fileID: 0}
- target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.z
value: 0.79494846
value: 0.78202057
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.x
value: 0.06264305
value: 0.05932522
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.y
value: -1.0966835
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.z
value: 0.014015436
value: -0.024871588
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.w
value: -0.1637206
value: -0.16597112
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.x
value: 0.09855233
value: 0.09471433
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.y
value: 0.84096485
value: 0.85252213
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.z
value: 0.5062225
value: 0.48650673
objectReference: {fileID: 0}
- target: {fileID: 4676633831414007564, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_Name
@ -297,31 +301,31 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.x
value: -0.025595546
value: -0.06544554
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.y
value: 0.6426343
value: 0.67223704
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.z
value: 0.7295891
value: 1.0403286
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.w
value: 0.07485429
value: 0.071618244
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.x
value: 0.050753333
value: 0.055225387
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.y
value: 0.990035
value: 0.99477625
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.z
value: 0.1079433
value: 0.047341496
objectReference: {fileID: 0}
- target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.x
@ -337,43 +341,47 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.w
value: 0.009158134
value: 0.009172648
objectReference: {fileID: 0}
- target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.x
value: -0.00057248026
value: -0.0002348125
objectReference: {fileID: 0}
- target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.y
value: 0.7200643
value: 0.74512845
objectReference: {fileID: 0}
- target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.z
value: 0.6938467
value: 0.6668579
objectReference: {fileID: 0}
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.x
value: 0.06264305
value: 0.05932522
objectReference: {fileID: 0}
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.y
value: -1.0966835
objectReference: {fileID: 0}
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.z
value: 0.014015436
value: -0.024871588
objectReference: {fileID: 0}
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.w
value: -0.16372055
value: -0.16597113
objectReference: {fileID: 0}
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.x
value: 0.09855232
value: 0.094714314
objectReference: {fileID: 0}
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.y
value: 0.8409648
value: 0.8525222
objectReference: {fileID: 0}
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.z
value: 0.50622255
value: 0.48650664
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}

View File

@ -434,23 +434,23 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.w
value: -0.6984136
value: -0.698415
objectReference: {fileID: 0}
- target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.x
value: 0.43160498
value: 0.43160576
objectReference: {fileID: 0}
- target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.y
value: 0.4751017
value: 0.47509998
objectReference: {fileID: 0}
- target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.z
value: 0.31656584
value: 0.3165646
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.x
value: 0.06263733
value: 0.062641144
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.y
@ -462,19 +462,19 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.w
value: -0.16371734
value: -0.16371956
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.x
value: 0.09855039
value: 0.0985517
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.y
value: 0.84096545
value: 0.8409651
objectReference: {fileID: 0}
- target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.z
value: 0.50622296
value: 0.50622255
objectReference: {fileID: 0}
- target: {fileID: 4676633831414007564, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_Name
@ -486,15 +486,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.x
value: 231.21
value: 61.14
objectReference: {fileID: 0}
- target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.y
value: 47.41
value: 43.81
objectReference: {fileID: 0}
- target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.z
value: 3.85
value: 0.75
objectReference: {fileID: 0}
- target: {fileID: 4676633831414007565, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.w
@ -526,35 +526,35 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.x
value: 0
value: 0.1053955
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.y
value: 0
value: 0.8931259
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.z
value: 0
value: 0.02848567
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.w
value: -0.6888841
value: -0.69538385
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.x
value: 0.1880002
value: -0.16232629
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.y
value: 0.66866755
value: 0.68678325
objectReference: {fileID: 0}
- target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.z
value: 0.20731217
value: -0.13572155
objectReference: {fileID: 0}
- target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.x
value: 0.06263733
value: 0.062641144
objectReference: {fileID: 0}
- target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.y
@ -562,7 +562,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.z
value: 0.0140144825
value: 0.014014363
objectReference: {fileID: 0}
- target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.w
@ -582,23 +582,23 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.w
value: -0.7086875
value: -0.708689
objectReference: {fileID: 0}
- target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.x
value: 0.29756904
value: 0.2975697
objectReference: {fileID: 0}
- target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.y
value: 0.5809957
value: 0.5809939
objectReference: {fileID: 0}
- target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.z
value: 0.2676917
value: 0.26769084
objectReference: {fileID: 0}
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.x
value: 0.06263733
value: 0.062641144
objectReference: {fileID: 0}
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalPosition.y
@ -610,19 +610,19 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.w
value: -0.16371734
value: -0.16371952
objectReference: {fileID: 0}
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.x
value: 0.09855039
value: 0.09855168
objectReference: {fileID: 0}
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.y
value: 0.84096545
value: 0.8409651
objectReference: {fileID: 0}
- target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
propertyPath: m_LocalRotation.z
value: 0.50622296
value: 0.5062226
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}

View File

@ -76,7 +76,10 @@ public class ScriptedDialogueTrigger : MonoBehaviour
if (elapsed > _durations[idx])
{
elapsed = 0;
idx++;
if (idx >= _keys.Length) break;
PlayLine(_keys[idx]);
}

View File

@ -48,12 +48,15 @@ public class TimeAndPlate : MonoBehaviour
public void Trigger()
{
if (_triggered) return;
for (int i = 0; i < _plates.Length; i++)
{
_plates[i].gameObject.SetActive(false);
}
_onTrigger.Invoke();
_triggered = true;
}
public void Reset()

View File

@ -1,15 +1,17 @@
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEditor;
using UnityEngine;
using UnityEngine.Events;
#if UNITY_EDITOR
using UnityEditor;
#endif
namespace Ktyl.Util
{
[RequireComponent(typeof(BoxCollider))]
public class GameEventTrigger : MonoBehaviour
public partial class GameEventTrigger : MonoBehaviour
{
[Serializable]
private struct Event
@ -34,12 +36,47 @@ namespace Ktyl.Util
private void OnTriggerEnter(Collider other)
{
_onEnter.Raise();
if (!other.CompareTag("Player")) return;
Trigger();
}
private void Trigger()
{
_onEnter.Raise();
}
private void OnTriggerExit(Collider other)
{
_onExit.Raise();
}
}
#if UNITY_EDITOR
public partial class GameEventTrigger
{
public void EDITOR_Trigger() => Trigger();
}
[CustomEditor(typeof(GameEventListener))]
public class GameEventTriggerEditor : Editor
{
private GameEventTrigger _data;
private void OnEnable()
{
_data = target as GameEventTrigger;
}
public override void OnInspectorGUI()
{
base.OnInspectorGUI();
if (GUILayout.Button("Trigger"))
{
_data.EDITOR_Trigger();
}
}
}
#endif
}