From 51437264fcc7e81a235b7f3224d7e7349d5e61ba Mon Sep 17 00:00:00 2001 From: Cat Flynn Date: Mon, 26 Apr 2021 19:12:54 +0100 Subject: [PATCH] wip --- game/Assets/Prefabs/Environment/Temple.prefab | 109 ++++++++-- game/Assets/Prefabs/Glitch/Glitches.prefab | 45 ---- .../Prefabs/Glitch/Glitches.prefab.meta | 7 - game/Assets/Scenes/Environment/Temple.unity | 54 ++++- game/Assets/Scenes/Main.unity | 196 +++++++++--------- 5 files changed, 238 insertions(+), 173 deletions(-) delete mode 100644 game/Assets/Prefabs/Glitch/Glitches.prefab delete mode 100644 game/Assets/Prefabs/Glitch/Glitches.prefab.meta diff --git a/game/Assets/Prefabs/Environment/Temple.prefab b/game/Assets/Prefabs/Environment/Temple.prefab index 55250ec..25fd436 100644 --- a/game/Assets/Prefabs/Environment/Temple.prefab +++ b/game/Assets/Prefabs/Environment/Temple.prefab @@ -33,6 +33,39 @@ Transform: m_Father: {fileID: 827033889852126475} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &643837366848713604 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3540232316517503763} + m_Layer: 0 + m_Name: Glitch + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3540232316517503763 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 643837366848713604} + 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: 1548711752682761592} + - {fileID: 3941883070318840641} + - {fileID: 827033889852126475} + m_Father: {fileID: 2459802978564044541} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &690787523563945642 GameObject: m_ObjectHideFlags: 0 @@ -157,6 +190,38 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 +--- !u!1 &2402544981480724549 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3441540937267448070} + m_Layer: 0 + m_Name: Geometry + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3441540937267448070 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2402544981480724549} + 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: 2713489949863000383} + - {fileID: 2459802979390781182} + m_Father: {fileID: 2459802978564044541} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2459802977631528096 GameObject: m_ObjectHideFlags: 0 @@ -913,12 +978,9 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 2713489949863000383} - - {fileID: 2459802979390781182} - - {fileID: 1548711752682761592} - - {fileID: 3941883070318840641} - - {fileID: 827033889852126475} - {fileID: 2282991440033275342} + - {fileID: 3441540937267448070} + - {fileID: 3540232316517503763} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1273,7 +1335,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2459802979390781183} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -0.51, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -1281,7 +1343,7 @@ Transform: - {fileID: 2459802978069778533} - {fileID: 2459802977631528127} - {fileID: 2459802978111442620} - m_Father: {fileID: 2459802978564044541} + m_Father: {fileID: 3441540937267448070} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2459802979390781181 @@ -1624,8 +1686,8 @@ Transform: - {fileID: 7485031033927829115} - {fileID: 1314516680849476762} - {fileID: 1977438302730584871} - m_Father: {fileID: 2459802978564044541} - m_RootOrder: 3 + m_Father: {fileID: 3540232316517503763} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &3941883070318840642 MonoBehaviour: @@ -1662,13 +1724,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4141142506425197656} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 2459802979327059716} - m_Father: {fileID: 2459802978564044541} - m_RootOrder: 2 + m_Father: {fileID: 3540232316517503763} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5317958019843067266 GameObject: @@ -1903,6 +1965,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 827033889852126475} + - component: {fileID: 2424929568506498894} m_Layer: 0 m_Name: Glitch 2 m_TagString: Untagged @@ -1917,16 +1980,28 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7989482804360446501} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 2459802978197217342} - {fileID: 3170229935005527731} - {fileID: 5071941421930793655} - m_Father: {fileID: 2459802978564044541} - m_RootOrder: 4 + m_Father: {fileID: 3540232316517503763} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2424929568506498894 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7989482804360446501} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c3ce05717d7828b418026c43e7583aac, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &8682473764997751396 GameObject: m_ObjectHideFlags: 0 @@ -1957,7 +2032,7 @@ Transform: - {fileID: 3194196418266156156} - {fileID: 2392897904615731006} m_Father: {fileID: 2459802978564044541} - m_RootOrder: 5 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8899403112866622252 GameObject: @@ -3552,7 +3627,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 2459802978564044541} + m_TransformParent: {fileID: 3441540937267448070} m_Modifications: - target: {fileID: -8679921383154817045, guid: 41f93c9892597e7438da812cafe993d4, type: 3} propertyPath: m_RootOrder diff --git a/game/Assets/Prefabs/Glitch/Glitches.prefab b/game/Assets/Prefabs/Glitch/Glitches.prefab deleted file mode 100644 index 08f062b..0000000 --- a/game/Assets/Prefabs/Glitch/Glitches.prefab +++ /dev/null @@ -1,45 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &1483540264806960793 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1483540264806960792} - - component: {fileID: 1483540264806960795} - m_Layer: 0 - m_Name: Glitches - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1483540264806960792 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1483540264806960793} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -25.9, y: 1.53, z: 85.54} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1483540264806960795 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1483540264806960793} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c3ce05717d7828b418026c43e7583aac, type: 3} - m_Name: - m_EditorClassIdentifier: diff --git a/game/Assets/Prefabs/Glitch/Glitches.prefab.meta b/game/Assets/Prefabs/Glitch/Glitches.prefab.meta deleted file mode 100644 index a8d7306..0000000 --- a/game/Assets/Prefabs/Glitch/Glitches.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 40ef159c1bceef943a8d359ccf994cc7 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/game/Assets/Scenes/Environment/Temple.unity b/game/Assets/Scenes/Environment/Temple.unity index a17e90d..fc1ee08 100644 --- a/game/Assets/Scenes/Environment/Temple.unity +++ b/game/Assets/Scenes/Environment/Temple.unity @@ -427,7 +427,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.w - value: -0.30009583 + value: -0.30009586 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x @@ -435,11 +435,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: -0.9448075 + value: -0.94480765 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: -0.039560962 + value: -0.039560948 objectReference: {fileID: 0} - target: {fileID: 4676633832858914730, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_XAxis.Value @@ -705,6 +705,23 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 86901b2bd0d14094b9622786541aec87, type: 3} +--- !u!1 &1780555419 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8899403112866622252, guid: 539c60fd7808c9f479250b070d605c38, type: 3} + m_PrefabInstance: {fileID: 2459802978887480815} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1780555421 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1780555419} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c3ce05717d7828b418026c43e7583aac, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2012904769 GameObject: m_ObjectHideFlags: 0 @@ -809,6 +826,10 @@ PrefabInstance: propertyPath: m_Layer value: 6 objectReference: {fileID: 0} + - target: {fileID: 2459802977631528125, guid: 539c60fd7808c9f479250b070d605c38, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2459802977689352578, guid: 539c60fd7808c9f479250b070d605c38, type: 3} propertyPath: m_Type value: 2 @@ -825,6 +846,14 @@ PrefabInstance: propertyPath: m_Lightmapping value: 2 objectReference: {fileID: 0} + - target: {fileID: 2459802978069778531, guid: 539c60fd7808c9f479250b070d605c38, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2459802978111442618, guid: 539c60fd7808c9f479250b070d605c38, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2459802978163721161, guid: 539c60fd7808c9f479250b070d605c38, type: 3} propertyPath: m_Type value: 2 @@ -901,6 +930,10 @@ PrefabInstance: propertyPath: m_Layer value: 6 objectReference: {fileID: 0} + - target: {fileID: 2459802979111966838, guid: 539c60fd7808c9f479250b070d605c38, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2459802979226294102, guid: 539c60fd7808c9f479250b070d605c38, type: 3} propertyPath: m_Layer value: 6 @@ -909,6 +942,10 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 2459802979390781181, guid: 539c60fd7808c9f479250b070d605c38, type: 3} + propertyPath: _showWhenEditing + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2927742952714257244, guid: 539c60fd7808c9f479250b070d605c38, type: 3} propertyPath: m_Layer value: 6 @@ -919,7 +956,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3941883070318840640, guid: 539c60fd7808c9f479250b070d605c38, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4141142506425197656, guid: 539c60fd7808c9f479250b070d605c38, type: 3} + propertyPath: m_IsActive + value: 0 objectReference: {fileID: 0} - target: {fileID: 5317958019843067266, guid: 539c60fd7808c9f479250b070d605c38, type: 3} propertyPath: m_Layer @@ -931,7 +972,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7989482804360446501, guid: 539c60fd7808c9f479250b070d605c38, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8918307942217334976, guid: 539c60fd7808c9f479250b070d605c38, type: 3} propertyPath: m_Layer @@ -953,5 +994,6 @@ PrefabInstance: propertyPath: m_Layer value: 6 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 2424929568506498894, guid: 539c60fd7808c9f479250b070d605c38, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 539c60fd7808c9f479250b070d605c38, type: 3} diff --git a/game/Assets/Scenes/Main.unity b/game/Assets/Scenes/Main.unity index 443dd98..f760bfc 100644 --- a/game/Assets/Scenes/Main.unity +++ b/game/Assets/Scenes/Main.unity @@ -5058,7 +5058,7 @@ Light: m_Type: 1 m_Shape: 0 m_Color: {r: 1, g: 0.9430511, b: 0.7877358, a: 1} - m_Intensity: 2 + m_Intensity: 1 m_Range: 10 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 @@ -7616,19 +7616,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.w - value: 0.034527905 + value: 0.034527943 objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: 0.0035469886 + value: 0.0035469937 objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: -0.8971782 + value: -0.89717823 objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: 0.44030273 + value: 0.44030282 objectReference: {fileID: 0} - target: {fileID: 4676633831388223330, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_RendererIndex @@ -8332,7 +8332,7 @@ Transform: m_LocalScale: {x: 3.4038975, y: 0.3957815, z: 2.525135} m_Children: [] m_Father: {fileID: 3060674078936265690} - m_RootOrder: 88 + m_RootOrder: 55 m_LocalEulerAnglesHint: {x: 0, y: -24.159, z: 0} --- !u!1001 &3060674077607865608 PrefabInstance: @@ -9177,7 +9177,7 @@ Transform: m_LocalScale: {x: 18.67433, y: 15.275213, z: 0.297192} m_Children: [] m_Father: {fileID: 3060674078936265690} - m_RootOrder: 289 + m_RootOrder: 104 m_LocalEulerAnglesHint: {x: 0, y: 53.169, z: 0} --- !u!64 &3060674077664276452 MeshCollider: @@ -9749,7 +9749,7 @@ Transform: m_LocalScale: {x: 18.759104, y: 15.275213, z: 0.297192} m_Children: [] m_Father: {fileID: 3060674078936265690} - m_RootOrder: 288 + m_RootOrder: 103 m_LocalEulerAnglesHint: {x: 0, y: 53.169, z: 0} --- !u!1 &3060674077685655758 GameObject: @@ -10900,7 +10900,7 @@ Transform: m_LocalScale: {x: 3.4038975, y: 0.3957815, z: 2.525135} m_Children: [] m_Father: {fileID: 3060674078936265690} - m_RootOrder: 86 + m_RootOrder: 53 m_LocalEulerAnglesHint: {x: 0, y: -24.159, z: 0} --- !u!65 &3060674077787526818 BoxCollider: @@ -12084,7 +12084,7 @@ Transform: m_LocalScale: {x: 4.8673344, y: 4.8673344, z: 4.8673344} m_Children: [] m_Father: {fileID: 3060674078936265690} - m_RootOrder: 222 + m_RootOrder: 60 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &3060674077833396182 PrefabInstance: @@ -12529,7 +12529,7 @@ Transform: m_LocalScale: {x: 12.028755, y: 5.0553513, z: 0.330996} m_Children: [] m_Father: {fileID: 3060674078936265690} - m_RootOrder: 338 + m_RootOrder: 112 m_LocalEulerAnglesHint: {x: 90, y: 0, z: -5.961} --- !u!1001 &3060674077852482997 PrefabInstance: @@ -12760,7 +12760,7 @@ Transform: m_LocalScale: {x: 12.028756, y: 5.055351, z: 0.33099604} m_Children: [] m_Father: {fileID: 3060674078936265690} - m_RootOrder: 337 + m_RootOrder: 111 m_LocalEulerAnglesHint: {x: 0, y: -83.184, z: 0} --- !u!1001 &3060674077864918168 PrefabInstance: @@ -15411,7 +15411,7 @@ Transform: m_LocalScale: {x: 19.112549, y: 7.306658, z: 0.29719204} m_Children: [] m_Father: {fileID: 3060674078936265690} - m_RootOrder: 290 + m_RootOrder: 105 m_LocalEulerAnglesHint: {x: 89.914, y: 0, z: -53.098} --- !u!1 &3060674078018155788 GameObject: @@ -15913,7 +15913,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3060674078936265690} - m_RootOrder: 332 + m_RootOrder: 106 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &3060674078070329457 BoxCollider: @@ -16488,7 +16488,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3060674078936265690} - m_RootOrder: 333 + m_RootOrder: 107 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3060674078116465198 GameObject: @@ -17358,7 +17358,7 @@ Transform: m_LocalScale: {x: 3.4038975, y: 0.3957815, z: 2.525135} m_Children: [] m_Father: {fileID: 3060674078936265690} - m_RootOrder: 89 + m_RootOrder: 56 m_LocalEulerAnglesHint: {x: 0, y: -24.159, z: 0} --- !u!1001 &3060674078177317627 PrefabInstance: @@ -17801,7 +17801,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3060674078936265690} - m_RootOrder: 200 + m_RootOrder: 58 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &3060674078205303058 PrefabInstance: @@ -18289,7 +18289,7 @@ Transform: m_LocalScale: {x: 3.4038975, y: 0.3957815, z: 2.525135} m_Children: [] m_Father: {fileID: 3060674078936265690} - m_RootOrder: 83 + m_RootOrder: 49 m_LocalEulerAnglesHint: {x: 0, y: -24.159, z: 0} --- !u!1 &3060674078234113564 GameObject: @@ -18465,7 +18465,7 @@ Transform: m_LocalScale: {x: 0.17633517, y: 17.731216, z: 19.020555} m_Children: [] m_Father: {fileID: 3060674078936265690} - m_RootOrder: 223 + m_RootOrder: 61 m_LocalEulerAnglesHint: {x: 0, y: -24.588, z: 0} --- !u!1001 &3060674078240460638 PrefabInstance: @@ -19114,7 +19114,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3060674078936265690} - m_RootOrder: 334 + m_RootOrder: 108 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &3060674078272906232 BoxCollider: @@ -19403,7 +19403,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3060674078936265690} - m_RootOrder: 45 + m_RootOrder: 38 m_LocalEulerAnglesHint: {x: 0, y: 92.133, z: 0} --- !u!65 &3060674078293327445 BoxCollider: @@ -20374,7 +20374,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3060674078936265690} - m_RootOrder: 275 + m_RootOrder: 101 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &3060674078369666540 BoxCollider: @@ -20826,7 +20826,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3060674078936265690} - m_RootOrder: 276 + m_RootOrder: 102 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!64 &3060674078417536959 MeshCollider: @@ -22440,7 +22440,7 @@ Transform: m_Children: - {fileID: 3060674078484264472} m_Father: {fileID: 3060674078936265690} - m_RootOrder: 44 + m_RootOrder: 37 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3060674078532712722 GameObject: @@ -22535,7 +22535,7 @@ Transform: m_LocalScale: {x: 12.028755, y: 5.055351, z: 0.33099604} m_Children: [] m_Father: {fileID: 3060674078936265690} - m_RootOrder: 339 + m_RootOrder: 113 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 85.174} --- !u!1001 &3060674078535495884 PrefabInstance: @@ -23032,7 +23032,7 @@ Transform: m_LocalScale: {x: 3.4038975, y: 0.3957815, z: 2.525135} m_Children: [] m_Father: {fileID: 3060674078936265690} - m_RootOrder: 82 + m_RootOrder: 43 m_LocalEulerAnglesHint: {x: 0, y: -24.159, z: 0} --- !u!1 &3060674078584807548 GameObject: @@ -23230,7 +23230,7 @@ Transform: m_LocalScale: {x: 9.612416, y: 10.62028, z: 0.33099604} m_Children: [] m_Father: {fileID: 3060674078936265690} - m_RootOrder: 343 + m_RootOrder: 117 m_LocalEulerAnglesHint: {x: 92.09, y: -87.97699, z: 0} --- !u!1 &3060674078597481340 GameObject: @@ -24452,7 +24452,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3060674078936265690} - m_RootOrder: 335 + m_RootOrder: 109 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!64 &3060674078658428202 MeshCollider: @@ -24498,7 +24498,7 @@ Transform: - {fileID: 1293096076} - {fileID: 3060674077762991053} m_Father: {fileID: 3060674078936265690} - m_RootOrder: 42 + m_RootOrder: 35 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3060674078664412584 GameObject: @@ -24593,7 +24593,7 @@ Transform: m_LocalScale: {x: 3.4038975, y: 0.83830476, z: 2.525135} m_Children: [] m_Father: {fileID: 3060674078936265690} - m_RootOrder: 81 + m_RootOrder: 42 m_LocalEulerAnglesHint: {x: 0, y: -24.159, z: 0} --- !u!65 &3060674078668154925 BoxCollider: @@ -25051,7 +25051,7 @@ Transform: m_LocalScale: {x: 0.17633519, y: 17.731216, z: 10.207762} m_Children: [] m_Father: {fileID: 3060674078936265690} - m_RootOrder: 225 + m_RootOrder: 63 m_LocalEulerAnglesHint: {x: 0, y: -113.034, z: 0} --- !u!1 &3060674078694181391 GameObject: @@ -25823,7 +25823,7 @@ Transform: - {fileID: 31300440} - {fileID: 3060674078580939573} m_Father: {fileID: 3060674078936265690} - m_RootOrder: 43 + m_RootOrder: 36 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &3060674078778426327 PrefabInstance: @@ -27125,7 +27125,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3060674078936265690} - m_RootOrder: 247 + m_RootOrder: 99 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &3060674078843295286 PrefabInstance: @@ -27721,7 +27721,7 @@ Transform: m_LocalScale: {x: 3.4038975, y: 0.3957815, z: 3.1940432} m_Children: [] m_Father: {fileID: 3060674078936265690} - m_RootOrder: 227 + m_RootOrder: 97 m_LocalEulerAnglesHint: {x: 0, y: -24.159, z: 0} --- !u!1 &3060674078881012430 GameObject: @@ -28090,7 +28090,7 @@ Transform: m_LocalScale: {x: 12.028756, y: 10.620281, z: 0.33099604} m_Children: [] m_Father: {fileID: 3060674078936265690} - m_RootOrder: 340 + m_RootOrder: 114 m_LocalEulerAnglesHint: {x: 0, y: -83.184, z: 0} --- !u!1001 &3060674078891147457 PrefabInstance: @@ -28625,7 +28625,7 @@ Transform: m_LocalScale: {x: 9.612419, y: 10.620281, z: 0.33099604} m_Children: [] m_Father: {fileID: 3060674078936265690} - m_RootOrder: 341 + m_RootOrder: 115 m_LocalEulerAnglesHint: {x: 0, y: -87.976, z: 0} --- !u!1 &3060674078915362621 GameObject: @@ -28985,6 +28985,7 @@ Transform: - {fileID: 1670117308} - {fileID: 670002207} - {fileID: 693401421} + - {fileID: 3060674079221835677} - {fileID: 778654273} - {fileID: 115292560} - {fileID: 759044753} @@ -28998,18 +28999,36 @@ Transform: - {fileID: 857064674} - {fileID: 2096386820} - {fileID: 2041288472} + - {fileID: 3060674078660162076} + - {fileID: 3060674078777976296} + - {fileID: 3060674078529749497} + - {fileID: 3060674078285794637} - {fileID: 929941401} + - {fileID: 3060674079451124777} + - {fileID: 3060674079049649284} + - {fileID: 3060674078664412588} + - {fileID: 3060674078584807536} - {fileID: 740688128} - {fileID: 1706006811} - {fileID: 526800909} - {fileID: 1241011630} - {fileID: 1886318618} + - {fileID: 3060674078234113552} - {fileID: 1545499889} - - {fileID: 3060674079221835677} - - {fileID: 3060674078660162076} - - {fileID: 3060674078777976296} - - {fileID: 3060674078529749497} - - {fileID: 3060674078285794637} + - {fileID: 3060674079290087136} + - {fileID: 3060674079560587691} + - {fileID: 3060674077783971642} + - {fileID: 3060674079550468833} + - {fileID: 3060674077605175352} + - {fileID: 3060674078171512007} + - {fileID: 3060674079295312680} + - {fileID: 3060674078201080439} + - {fileID: 3060674079586451602} + - {fileID: 3060674077831899517} + - {fileID: 3060674078239613614} + - {fileID: 3060674079170570531} + - {fileID: 3060674078694181379} + - {fileID: 3060674079248974272} - {fileID: 1983473733} - {fileID: 1283468423} - {fileID: 881097182} @@ -29042,20 +29061,30 @@ Transform: - {fileID: 1558867252} - {fileID: 1328094807} - {fileID: 510290831} + - {fileID: 3060674078881012418} + - {fileID: 3060674079372015567} + - {fileID: 3060674078841084111} + - {fileID: 3060674079448771056} + - {fileID: 3060674078367301418} + - {fileID: 3060674078416553093} + - {fileID: 3060674077685655746} + - {fileID: 3060674077650139348} + - {fileID: 3060674078018155776} + - {fileID: 3060674078059650260} + - {fileID: 3060674078116465184} + - {fileID: 3060674078265220249} + - {fileID: 3060674078657020348} + - {fileID: 3060674079116082621} + - {fileID: 3060674077864496724} + - {fileID: 3060674077851231087} + - {fileID: 3060674078532712726} + - {fileID: 3060674078887164011} + - {fileID: 3060674078915362609} + - {fileID: 3060674079198349836} + - {fileID: 3060674078597481328} + - {fileID: 5824896951086468296} - {fileID: 2024131716} - - {fileID: 3060674079451124777} - - {fileID: 3060674079049649284} - - {fileID: 3060674078664412588} - - {fileID: 3060674078584807536} - - {fileID: 3060674078234113552} - - {fileID: 3060674079290087136} - - {fileID: 3060674079560587691} - - {fileID: 3060674077783971642} - - {fileID: 3060674079550468833} - - {fileID: 3060674077605175352} - - {fileID: 3060674078171512007} - {fileID: 473505578} - - {fileID: 3060674079295312680} - {fileID: 2030236751} - {fileID: 293209112} - {fileID: 1746912636} @@ -29164,7 +29193,6 @@ Transform: - {fileID: 1607452922} - {fileID: 524476512} - {fileID: 721166739} - - {fileID: 3060674078201080439} - {fileID: 2131057277} - {fileID: 1209138703} - {fileID: 1038938626} @@ -29185,13 +29213,6 @@ Transform: - {fileID: 854461836} - {fileID: 778121016} - {fileID: 681612374} - - {fileID: 3060674079586451602} - - {fileID: 3060674077831899517} - - {fileID: 3060674078239613614} - - {fileID: 3060674079170570531} - - {fileID: 3060674078694181379} - - {fileID: 3060674079248974272} - - {fileID: 3060674078881012418} - {fileID: 1575274761} - {fileID: 500543224} - {fileID: 1841795329} @@ -29210,10 +29231,8 @@ Transform: - {fileID: 670385829} - {fileID: 373007293} - {fileID: 1846556917} - - {fileID: 3060674079372015567} - - {fileID: 3060674078841084111} + - {fileID: 6562875948616111524} - {fileID: 354242631} - - {fileID: 3060674079448771056} - {fileID: 546581302} - {fileID: 1592013723} - {fileID: 1900120866} @@ -29239,8 +29258,6 @@ Transform: - {fileID: 1208793311} - {fileID: 46778680} - {fileID: 1015284890} - - {fileID: 3060674078367301418} - - {fileID: 3060674078416553093} - {fileID: 1166040833} - {fileID: 1212656056} - {fileID: 332132159} @@ -29252,9 +29269,6 @@ Transform: - {fileID: 1618043265} - {fileID: 1898174074} - {fileID: 1279051647} - - {fileID: 3060674077685655746} - - {fileID: 3060674077650139348} - - {fileID: 3060674078018155776} - {fileID: 1811413494} - {fileID: 452246000} - {fileID: 1566644412} @@ -29296,19 +29310,6 @@ Transform: - {fileID: 637196316} - {fileID: 213802560} - {fileID: 1560597747} - - {fileID: 3060674078059650260} - - {fileID: 3060674078116465184} - - {fileID: 3060674078265220249} - - {fileID: 3060674078657020348} - - {fileID: 3060674079116082621} - - {fileID: 3060674077864496724} - - {fileID: 3060674077851231087} - - {fileID: 3060674078532712726} - - {fileID: 3060674078887164011} - - {fileID: 3060674078915362609} - - {fileID: 3060674079198349836} - - {fileID: 3060674078597481328} - - {fileID: 5824896951086468296} - {fileID: 1373173486} - {fileID: 430242697} - {fileID: 196980274} @@ -29329,7 +29330,6 @@ Transform: - {fileID: 1400798126} - {fileID: 1586477272} - {fileID: 1046253862} - - {fileID: 6562875948616111524} m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -30989,7 +30989,7 @@ Transform: m_LocalScale: {x: 3.4038975, y: 0.3957815, z: 2.525135} m_Children: [] m_Father: {fileID: 3060674078936265690} - m_RootOrder: 80 + m_RootOrder: 41 m_LocalEulerAnglesHint: {x: 0, y: -24.159, z: 0} --- !u!65 &3060674079063364444 BoxCollider: @@ -31797,7 +31797,7 @@ Transform: m_LocalScale: {x: 12.028754, y: 5.055351, z: 0.33099604} m_Children: [] m_Father: {fileID: 3060674078936265690} - m_RootOrder: 336 + m_RootOrder: 110 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &3060674079122294802 PrefabInstance: @@ -32512,7 +32512,7 @@ Transform: m_LocalScale: {x: 0.17633517, y: 17.731216, z: 19.020555} m_Children: [] m_Father: {fileID: 3060674078936265690} - m_RootOrder: 224 + m_RootOrder: 62 m_LocalEulerAnglesHint: {x: 0, y: -24.588, z: 0} --- !u!1 &3060674079170570543 GameObject: @@ -33141,7 +33141,7 @@ Transform: m_LocalScale: {x: 7.748283, y: 5.5746913, z: 0.33099604} m_Children: [] m_Father: {fileID: 3060674078936265690} - m_RootOrder: 342 + m_RootOrder: 116 m_LocalEulerAnglesHint: {x: 0, y: -177.461, z: 0} --- !u!1001 &3060674079199215503 PrefabInstance: @@ -33530,7 +33530,7 @@ Transform: - {fileID: 3060674078723830672} - {fileID: 1047937899} m_Father: {fileID: 3060674078936265690} - m_RootOrder: 41 + m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &3060674079224540258 BoxCollider: @@ -33985,7 +33985,7 @@ Transform: m_LocalScale: {x: 0.17633517, y: 17.731216, z: 10.207762} m_Children: [] m_Father: {fileID: 3060674078936265690} - m_RootOrder: 226 + m_RootOrder: 64 m_LocalEulerAnglesHint: {x: 0, y: -115.949, z: 0} --- !u!1 &3060674079248974284 GameObject: @@ -35097,7 +35097,7 @@ Transform: m_LocalScale: {x: 3.4038975, y: 0.3957815, z: 2.525135} m_Children: [] m_Father: {fileID: 3060674078936265690} - m_RootOrder: 84 + m_RootOrder: 51 m_LocalEulerAnglesHint: {x: 0, y: -24.159, z: 0} --- !u!1 &3060674079290087148 GameObject: @@ -35372,7 +35372,7 @@ Transform: m_LocalScale: {x: 3.4038975, y: 0.3957815, z: 2.525135} m_Children: [] m_Father: {fileID: 3060674078936265690} - m_RootOrder: 91 + m_RootOrder: 57 m_LocalEulerAnglesHint: {x: 0, y: -24.159, z: 0} --- !u!1001 &3060674079296691206 PrefabInstance: @@ -36723,7 +36723,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3060674078936265690} - m_RootOrder: 246 + m_RootOrder: 98 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &3060674079375666087 BoxCollider: @@ -37491,7 +37491,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3060674078936265690} - m_RootOrder: 249 + m_RootOrder: 100 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3060674079448771070 GameObject: @@ -37665,7 +37665,7 @@ Transform: m_LocalScale: {x: 20.047117, y: 0.90051717, z: 20.047117} m_Children: [] m_Father: {fileID: 3060674078936265690} - m_RootOrder: 79 + m_RootOrder: 40 m_LocalEulerAnglesHint: {x: 0, y: -24.159, z: 0} --- !u!1001 &3060674079452830228 PrefabInstance: @@ -38890,7 +38890,7 @@ Transform: m_LocalScale: {x: 3.4038975, y: 0.3957815, z: 2.525135} m_Children: [] m_Father: {fileID: 3060674078936265690} - m_RootOrder: 87 + m_RootOrder: 54 m_LocalEulerAnglesHint: {x: 0, y: -24.159, z: 0} --- !u!1 &3060674079550468845 GameObject: @@ -39180,7 +39180,7 @@ Transform: m_LocalScale: {x: 3.4038975, y: 3.387632, z: 2.9955678} m_Children: [] m_Father: {fileID: 3060674078936265690} - m_RootOrder: 85 + m_RootOrder: 52 m_LocalEulerAnglesHint: {x: 0, y: -24.159, z: 0} --- !u!1001 &3060674079565805682 PrefabInstance: @@ -39531,7 +39531,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3060674078936265690} - m_RootOrder: 221 + m_RootOrder: 59 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &3060674079594593172 PrefabInstance: @@ -41626,7 +41626,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3060674078936265690} - m_RootOrder: 344 + m_RootOrder: 118 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &6189151121458120280 PrefabInstance: