From 86065e52a9212892c1a513f50667e9ff1f488cd9 Mon Sep 17 00:00:00 2001 From: NTG_Lenovo Date: Wed, 9 Aug 2023 16:44:09 +0900 Subject: [PATCH] #10 Testing long range ai (arrow attack system) Additional commit content 1. Modified ObjectPool Function(OnReleaseArrow and naming). 2. Modified hitBox tag in aiPrefab. 3. Modified Physics layer. 4. Modified TargetInfo variable from TargetTransform variable in FieldOfView script. 5. Added GetCurrentHp() in IAiStat script. --- BlueWater/Assets/01.Scenes/02.Main_TG2.unity | 2499 ++++++++++++++++- .../Assets/02.Scripts/Ai/AiController.cs | 27 +- BlueWater/Assets/02.Scripts/Ai/AiMover.cs | 6 +- BlueWater/Assets/02.Scripts/Ai/FieldOfView.cs | 91 +- BlueWater/Assets/02.Scripts/Ai/Type/Archer.cs | 31 +- BlueWater/Assets/02.Scripts/Arrow.cs | 141 +- .../Assets/02.Scripts/Interface/IAiStat.cs | 1 + BlueWater/Assets/05.Prefabs/Arrow_01.prefab | 5 +- .../Character/Enemy/Archer_E.prefab | 11 +- .../Character/Enemy/SpearKight_E.prefab | 2 +- .../Character/Enemy/Spearman_E.prefab | 2 +- .../Character/Enemy/SwordKnight_E.prefab | 2 +- .../Character/Enemy/Swordman_E.prefab | 2 +- .../Character/Pirate/Archer_P.prefab | 11 +- .../Character/Pirate/Axeman_P.prefab | 2 +- .../Character/Pirate/Spearman_P.prefab | 2 +- .../Character/Pirate/SwordKnight_P.prefab | 2 +- .../Character/Pirate/Swordman_P.prefab | 2 +- ...ender Pipeline] Built-In.unitypackage.meta | 7 - ...ipeline] Universal (URP).unitypackage.meta | 7 - ...emple-BuiltInRP-UModeler.unitypackage.meta | 7 - ...LostTemple-HDRP-UModeler.unitypackage.meta | 7 - .../LostTemple-HDRP.unitypackage.meta | 7 - .../LostTemple-URP-UModeler.unitypackage.meta | 7 - .../LostTemple-URP.unitypackage.meta | 7 - ...tom Attribute Processors.unitypackage.meta | 7 - .../Demos/Custom Drawers.unitypackage.meta | 7 - .../Demos/Editor Windows.unitypackage.meta | 7 - .../Sample - RPG Editor.unitypackage.meta | 7 - .../ProjectSettings/DynamicsManager.asset | 2 +- BlueWater/ProjectSettings/TagManager.asset | 3 + 31 files changed, 2648 insertions(+), 273 deletions(-) delete mode 100644 BlueWater/Assets/FlatKit/[Render Pipeline] Built-In.unitypackage.meta delete mode 100644 BlueWater/Assets/FlatKit/[Render Pipeline] Universal (URP).unitypackage.meta delete mode 100644 BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-BuiltInRP-UModeler.unitypackage.meta delete mode 100644 BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP-UModeler.unitypackage.meta delete mode 100644 BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP.unitypackage.meta delete mode 100644 BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP-UModeler.unitypackage.meta delete mode 100644 BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta delete mode 100644 BlueWater/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta diff --git a/BlueWater/Assets/01.Scenes/02.Main_TG2.unity b/BlueWater/Assets/01.Scenes/02.Main_TG2.unity index bda03996d..05ec722f9 100644 --- a/BlueWater/Assets/01.Scenes/02.Main_TG2.unity +++ b/BlueWater/Assets/01.Scenes/02.Main_TG2.unity @@ -188,7 +188,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1250598640848458, guid: 52281544c43043b489bc324c9ff2a02f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1908133766} m_SourcePrefab: {fileID: 100100000, guid: 52281544c43043b489bc324c9ff2a02f, type: 3} --- !u!1001 &4011161 PrefabInstance: @@ -245,7 +249,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1719033733064216, guid: 78f9d456945b4f04ab3091da37bf7c99, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1716361547} m_SourcePrefab: {fileID: 100100000, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} --- !u!1001 &6175305 PrefabInstance: @@ -361,12 +369,24 @@ Transform: type: 3} m_PrefabInstance: {fileID: 6953860} m_PrefabAsset: {fileID: 0} +--- !u!1 &9762356 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1250598640848458, guid: 52281544c43043b489bc324c9ff2a02f, + type: 3} + m_PrefabInstance: {fileID: 1945008516} + m_PrefabAsset: {fileID: 0} --- !u!4 &9784358 stripped Transform: m_CorrespondingSourceObject: {fileID: 4636189598413550, guid: 43e607b75d000744c895dd18e77b4763, type: 3} m_PrefabInstance: {fileID: 1313426507} m_PrefabAsset: {fileID: 0} +--- !u!1 &13087557 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1228147706756960, guid: 47cfcb607ea85c941ab9d31ebc12a786, + type: 3} + m_PrefabInstance: {fileID: 544131514} + m_PrefabAsset: {fileID: 0} --- !u!1001 &13928582 PrefabInstance: m_ObjectHideFlags: 0 @@ -528,7 +548,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1322786914769362, guid: b63cc02ab2a559b4cb9944fbe4feea36, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2093678723} m_SourcePrefab: {fileID: 100100000, guid: b63cc02ab2a559b4cb9944fbe4feea36, type: 3} --- !u!1001 &24360197 PrefabInstance: @@ -595,6 +619,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 382780350} m_PrefabAsset: {fileID: 0} +--- !u!1 &35591432 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1911758058257032, guid: 721db2327c7b5124086e533e7c238426, + type: 3} + m_PrefabInstance: {fileID: 1421969413} + m_PrefabAsset: {fileID: 0} --- !u!1 &36233810 GameObject: m_ObjectHideFlags: 0 @@ -867,7 +897,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1719033733064216, guid: 78f9d456945b4f04ab3091da37bf7c99, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1643686202} m_SourcePrefab: {fileID: 100100000, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} --- !u!1001 &53127510 PrefabInstance: @@ -1160,7 +1194,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1719033733064216, guid: 78f9d456945b4f04ab3091da37bf7c99, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2078748142} m_SourcePrefab: {fileID: 100100000, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} --- !u!1001 &104568671 PrefabInstance: @@ -1217,7 +1255,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1719033733064216, guid: 78f9d456945b4f04ab3091da37bf7c99, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1008568438} m_SourcePrefab: {fileID: 100100000, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} --- !u!1001 &114445926 PrefabInstance: @@ -1284,6 +1326,12 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 10b092378cc9a7241a26643a4284c5c0, type: 3} +--- !u!1 &122144456 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1250598640848458, guid: 52281544c43043b489bc324c9ff2a02f, + type: 3} + m_PrefabInstance: {fileID: 1713323010} + m_PrefabAsset: {fileID: 0} --- !u!1001 &123474936 PrefabInstance: m_ObjectHideFlags: 0 @@ -1339,7 +1387,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1662942903224860, guid: 831fcc86213c0c442be644380a4818d3, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2036493868} m_SourcePrefab: {fileID: 100100000, guid: 831fcc86213c0c442be644380a4818d3, type: 3} --- !u!1001 &129311089 PrefabInstance: @@ -1451,6 +1503,34 @@ Transform: type: 3} m_PrefabInstance: {fileID: 130220003} m_PrefabAsset: {fileID: 0} +--- !u!1 &131103964 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1228147706756960, guid: 47cfcb607ea85c941ab9d31ebc12a786, + type: 3} + m_PrefabInstance: {fileID: 873140623} + m_PrefabAsset: {fileID: 0} +--- !u!64 &131103967 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 131103964} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300074, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!1001 &135727001 PrefabInstance: m_ObjectHideFlags: 0 @@ -1571,7 +1651,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 492527186} + m_TransformParent: {fileID: 2045055142} m_Modifications: - target: {fileID: 1719033733064216, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} propertyPath: m_Name @@ -1579,11 +1659,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1719033733064216, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} propertyPath: m_Layer - value: 3 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1719033733064216, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} propertyPath: m_TagString - value: Ground + value: Untagged objectReference: {fileID: 0} - target: {fileID: 4396769751283928, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} propertyPath: m_RootOrder @@ -1591,23 +1671,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4396769751283928, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} propertyPath: m_LocalScale.y - value: 5 + value: 0.8333334 objectReference: {fileID: 0} - target: {fileID: 4396769751283928, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} propertyPath: m_LocalPosition.x - value: -2.6999996 + value: 5 objectReference: {fileID: 0} - target: {fileID: 4396769751283928, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 0.085 objectReference: {fileID: 0} - target: {fileID: 4396769751283928, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} propertyPath: m_LocalPosition.z - value: 1.899999 + value: 0.96000004 objectReference: {fileID: 0} - target: {fileID: 4396769751283928, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 4396769751283928, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} propertyPath: m_LocalRotation.x @@ -1615,7 +1695,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4396769751283928, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: -0.70710677 objectReference: {fileID: 0} - target: {fileID: 4396769751283928, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} propertyPath: m_LocalRotation.z @@ -1685,7 +1765,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1765556987529750, guid: a1df6ef10c859f14abc209c1a36892be, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1410265415} m_SourcePrefab: {fileID: 100100000, guid: a1df6ef10c859f14abc209c1a36892be, type: 3} --- !u!1001 &157380001 PrefabInstance: @@ -1902,6 +1986,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1120453869} m_PrefabAsset: {fileID: 0} +--- !u!1 &190179881 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1250598640848458, guid: 52281544c43043b489bc324c9ff2a02f, + type: 3} + m_PrefabInstance: {fileID: 870686290} + m_PrefabAsset: {fileID: 0} --- !u!1001 &191120567 PrefabInstance: m_ObjectHideFlags: 0 @@ -1916,15 +2006,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 438990, guid: 2b7bae11d5e723b4597e4a3c1fd139b1, type: 3} propertyPath: m_LocalPosition.x - value: 42.1 + value: 28.79 objectReference: {fileID: 0} - target: {fileID: 438990, guid: 2b7bae11d5e723b4597e4a3c1fd139b1, type: 3} propertyPath: m_LocalPosition.y - value: 1.8 + value: 7.52 objectReference: {fileID: 0} - target: {fileID: 438990, guid: 2b7bae11d5e723b4597e4a3c1fd139b1, type: 3} propertyPath: m_LocalPosition.z - value: 14.31 + value: 4.13 objectReference: {fileID: 0} - target: {fileID: 438990, guid: 2b7bae11d5e723b4597e4a3c1fd139b1, type: 3} propertyPath: m_LocalRotation.w @@ -2096,8 +2186,18 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1228147706756960, guid: 47cfcb607ea85c941ab9d31ebc12a786, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2002189492} m_SourcePrefab: {fileID: 100100000, guid: 47cfcb607ea85c941ab9d31ebc12a786, type: 3} +--- !u!1 &211720928 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1765556987529750, guid: a1df6ef10c859f14abc209c1a36892be, + type: 3} + m_PrefabInstance: {fileID: 142492138} + m_PrefabAsset: {fileID: 0} --- !u!1001 &218312906 PrefabInstance: m_ObjectHideFlags: 0 @@ -2483,11 +2583,11 @@ MeshCollider: serializedVersion: 2 m_Bits: 0 m_LayerOverridePriority: 0 - m_IsTrigger: 0 + m_IsTrigger: 1 m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 5 - m_Convex: 0 + m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &234522409 @@ -2540,6 +2640,12 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 234522406} m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &234936946 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1250598640848458, guid: 52281544c43043b489bc324c9ff2a02f, + type: 3} + m_PrefabInstance: {fileID: 1423588409} + m_PrefabAsset: {fileID: 0} --- !u!4 &236513986 stripped Transform: m_CorrespondingSourceObject: {fileID: 4396769751283928, guid: 78f9d456945b4f04ab3091da37bf7c99, @@ -2686,6 +2792,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 247288633} m_PrefabAsset: {fileID: 0} +--- !u!1 &251109698 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1710985167981108, guid: 8a61e59c2480da542ab03b6d843bb8fc, + type: 3} + m_PrefabInstance: {fileID: 595233699} + m_PrefabAsset: {fileID: 0} --- !u!1001 &252779221 PrefabInstance: m_ObjectHideFlags: 0 @@ -2818,6 +2930,28 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1423588409} m_PrefabAsset: {fileID: 0} +--- !u!64 &260673956 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 234936946} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300010, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!1001 &262512457 PrefabInstance: m_ObjectHideFlags: 0 @@ -3170,7 +3304,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1838707090497380, guid: b5dd2df567293ee489d08983ea20caa2, + type: 3} + insertIndex: -1 + addedObject: {fileID: 701840355} m_SourcePrefab: {fileID: 100100000, guid: b5dd2df567293ee489d08983ea20caa2, type: 3} --- !u!1 &301003105 GameObject: @@ -3363,7 +3501,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1719033733064216, guid: 78f9d456945b4f04ab3091da37bf7c99, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1916071493} m_SourcePrefab: {fileID: 100100000, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} --- !u!1 &324097017 GameObject: @@ -3465,7 +3607,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1228147706756960, guid: 47cfcb607ea85c941ab9d31ebc12a786, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1751674229} m_SourcePrefab: {fileID: 100100000, guid: 47cfcb607ea85c941ab9d31ebc12a786, type: 3} --- !u!1001 &332601735 PrefabInstance: @@ -3591,6 +3737,12 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7a07403c17a4db144b938f3f3a271b45, type: 3} +--- !u!1 &343234002 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1636153586716238, guid: 6517a1d59b4e39e4ab1eeb8706964884, + type: 3} + m_PrefabInstance: {fileID: 1691679347} + m_PrefabAsset: {fileID: 0} --- !u!1 &345283315 GameObject: m_ObjectHideFlags: 0 @@ -3646,6 +3798,18 @@ Transform: - {fileID: 1964933775} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &356579451 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1719033733064216, guid: 78f9d456945b4f04ab3091da37bf7c99, + type: 3} + m_PrefabInstance: {fileID: 1080108212} + m_PrefabAsset: {fileID: 0} +--- !u!1 &361416449 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1250598640848458, guid: 52281544c43043b489bc324c9ff2a02f, + type: 3} + m_PrefabInstance: {fileID: 1281132869} + m_PrefabAsset: {fileID: 0} --- !u!1001 &366093845 PrefabInstance: m_ObjectHideFlags: 0 @@ -3823,6 +3987,12 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} +--- !u!1 &375933015 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1228147706756960, guid: 47cfcb607ea85c941ab9d31ebc12a786, + type: 3} + m_PrefabInstance: {fileID: 1567668050} + m_PrefabAsset: {fileID: 0} --- !u!1001 &378515505 PrefabInstance: m_ObjectHideFlags: 0 @@ -4411,12 +4581,24 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} +--- !u!1 &397085568 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1719033733064216, guid: 78f9d456945b4f04ab3091da37bf7c99, + type: 3} + m_PrefabInstance: {fileID: 748646056} + m_PrefabAsset: {fileID: 0} --- !u!4 &397455689 stripped Transform: m_CorrespondingSourceObject: {fileID: 4364478739488696, guid: b63cc02ab2a559b4cb9944fbe4feea36, type: 3} m_PrefabInstance: {fileID: 1988049797} m_PrefabAsset: {fileID: 0} +--- !u!1 &397763594 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1719033733064216, guid: 78f9d456945b4f04ab3091da37bf7c99, + type: 3} + m_PrefabInstance: {fileID: 766648020} + m_PrefabAsset: {fileID: 0} --- !u!850595691 &401704708 LightingSettings: m_ObjectHideFlags: 0 @@ -4536,6 +4718,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 402504815} m_PrefabAsset: {fileID: 0} +--- !u!1 &403668426 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1250598640848458, guid: 52281544c43043b489bc324c9ff2a02f, + type: 3} + m_PrefabInstance: {fileID: 1133313077} + m_PrefabAsset: {fileID: 0} --- !u!4 &404972750 stripped Transform: m_CorrespondingSourceObject: {fileID: 4687491176583728, guid: 7a07403c17a4db144b938f3f3a271b45, @@ -4601,6 +4789,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 413407270} m_PrefabAsset: {fileID: 0} +--- !u!1 &415683603 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1228147706756960, guid: 47cfcb607ea85c941ab9d31ebc12a786, + type: 3} + m_PrefabInstance: {fileID: 2085955387} + m_PrefabAsset: {fileID: 0} --- !u!1001 &419791315 PrefabInstance: m_ObjectHideFlags: 0 @@ -4711,8 +4905,18 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1228147706756960, guid: 47cfcb607ea85c941ab9d31ebc12a786, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2129835305} m_SourcePrefab: {fileID: 100100000, guid: 47cfcb607ea85c941ab9d31ebc12a786, type: 3} +--- !u!1 &423905882 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1693903836913636, guid: e59407eba2e5c71418f3e3dcc89dc2bb, + type: 3} + m_PrefabInstance: {fileID: 1980486993} + m_PrefabAsset: {fileID: 0} --- !u!4 &424080140 stripped Transform: m_CorrespondingSourceObject: {fileID: 4080215375727188, guid: 6bd7097e2f036d14c88f9ac04fae2f76, @@ -5000,6 +5204,18 @@ Transform: type: 3} m_PrefabInstance: {fileID: 446205391} m_PrefabAsset: {fileID: 0} +--- !u!1 &448455021 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1719033733064216, guid: 78f9d456945b4f04ab3091da37bf7c99, + type: 3} + m_PrefabInstance: {fileID: 1221063218} + m_PrefabAsset: {fileID: 0} +--- !u!1 &451479851 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1719033733064216, guid: 78f9d456945b4f04ab3091da37bf7c99, + type: 3} + m_PrefabInstance: {fileID: 566810608} + m_PrefabAsset: {fileID: 0} --- !u!1001 &452376191 PrefabInstance: m_ObjectHideFlags: 0 @@ -5055,7 +5271,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1719033733064216, guid: 78f9d456945b4f04ab3091da37bf7c99, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1396342276} m_SourcePrefab: {fileID: 100100000, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} --- !u!1001 &452623945 PrefabInstance: @@ -5283,6 +5503,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 462725283} m_PrefabAsset: {fileID: 0} +--- !u!1 &470384419 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1838707090497380, guid: b5dd2df567293ee489d08983ea20caa2, + type: 3} + m_PrefabInstance: {fileID: 298893684} + m_PrefabAsset: {fileID: 0} --- !u!4 &473181046 stripped Transform: m_CorrespondingSourceObject: {fileID: 4151524407520180, guid: 831fcc86213c0c442be644380a4818d3, @@ -5329,6 +5555,28 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1713323010} m_PrefabAsset: {fileID: 0} +--- !u!64 &481636075 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 122144456} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300010, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!4 &483449238 stripped Transform: m_CorrespondingSourceObject: {fileID: 4892447333738632, guid: 47cfcb607ea85c941ab9d31ebc12a786, @@ -5453,8 +5701,6 @@ Transform: - {fileID: 755736062} - {fileID: 1410265412} - {fileID: 244527903} - - {fileID: 236513986} - - {fileID: 879342246} - {fileID: 1076059276} - {fileID: 701840352} - {fileID: 1032405594} @@ -5563,6 +5809,18 @@ Transform: - {fileID: 488483154} m_Father: {fileID: 979588904} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &501150258 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1719033733064216, guid: 78f9d456945b4f04ab3091da37bf7c99, + type: 3} + m_PrefabInstance: {fileID: 695691676} + m_PrefabAsset: {fileID: 0} +--- !u!1 &504563338 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1719033733064216, guid: 78f9d456945b4f04ab3091da37bf7c99, + type: 3} + m_PrefabInstance: {fileID: 43710472} + m_PrefabAsset: {fileID: 0} --- !u!1001 &507901844 PrefabInstance: m_ObjectHideFlags: 0 @@ -5626,7 +5884,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1922665799419548, guid: 635b75387ff8e5847bdde4cc22d324e4, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1868998575} m_SourcePrefab: {fileID: 100100000, guid: 635b75387ff8e5847bdde4cc22d324e4, type: 3} --- !u!1 &509484610 GameObject: @@ -5960,6 +6222,34 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 475dfb6c860c72b44b5700f907e48b6f, type: 3} +--- !u!1 &533323678 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1250598640848458, guid: 52281544c43043b489bc324c9ff2a02f, + type: 3} + m_PrefabInstance: {fileID: 630009824} + m_PrefabAsset: {fileID: 0} +--- !u!64 &533323681 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 533323678} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300010, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!1001 &534930261 PrefabInstance: m_ObjectHideFlags: 0 @@ -6133,7 +6423,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1228147706756960, guid: 47cfcb607ea85c941ab9d31ebc12a786, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1778797169} m_SourcePrefab: {fileID: 100100000, guid: 47cfcb607ea85c941ab9d31ebc12a786, type: 3} --- !u!1001 &549303007 PrefabInstance: @@ -6190,6 +6484,40 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1468043405} m_PrefabAsset: {fileID: 0} +--- !u!1 &558340485 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1250598640848458, guid: 52281544c43043b489bc324c9ff2a02f, + type: 3} + m_PrefabInstance: {fileID: 1558984554} + m_PrefabAsset: {fileID: 0} +--- !u!1 &560126412 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1250598640848458, guid: 52281544c43043b489bc324c9ff2a02f, + type: 3} + m_PrefabInstance: {fileID: 1605616410} + m_PrefabAsset: {fileID: 0} +--- !u!64 &560126415 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 560126412} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300010, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!4 &563999077 stripped Transform: m_CorrespondingSourceObject: {fileID: 4396769751283928, guid: 78f9d456945b4f04ab3091da37bf7c99, @@ -6300,8 +6628,40 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1719033733064216, guid: 78f9d456945b4f04ab3091da37bf7c99, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1364099832} m_SourcePrefab: {fileID: 100100000, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} +--- !u!1 &582661238 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1719033733064216, guid: 78f9d456945b4f04ab3091da37bf7c99, + type: 3} + m_PrefabInstance: {fileID: 1176673710} + m_PrefabAsset: {fileID: 0} +--- !u!64 &582661241 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 582661238} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300012, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!4 &588445230 stripped Transform: m_CorrespondingSourceObject: {fileID: 4567959282733974, guid: 635b75387ff8e5847bdde4cc22d324e4, @@ -6436,7 +6796,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1710985167981108, guid: 8a61e59c2480da542ab03b6d843bb8fc, + type: 3} + insertIndex: -1 + addedObject: {fileID: 859257172} m_SourcePrefab: {fileID: 100100000, guid: 8a61e59c2480da542ab03b6d843bb8fc, type: 3} --- !u!4 &604290734 stripped Transform: @@ -6517,7 +6881,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1250598640848458, guid: 52281544c43043b489bc324c9ff2a02f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 533323681} m_SourcePrefab: {fileID: 100100000, guid: 52281544c43043b489bc324c9ff2a02f, type: 3} --- !u!1001 &635656551 PrefabInstance: @@ -6625,6 +6993,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 642153552} m_PrefabAsset: {fileID: 0} +--- !u!1 &651496820 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1510339036937058, guid: d10cac1523a5cf444b696c59032c765d, + type: 3} + m_PrefabInstance: {fileID: 869490807} + m_PrefabAsset: {fileID: 0} --- !u!1001 &652055446 PrefabInstance: m_ObjectHideFlags: 0 @@ -6688,6 +7062,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 652055446} m_PrefabAsset: {fileID: 0} +--- !u!1 &659421743 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1719033733064216, guid: 78f9d456945b4f04ab3091da37bf7c99, + type: 3} + m_PrefabInstance: {fileID: 104229440} + m_PrefabAsset: {fileID: 0} --- !u!1001 &659920089 PrefabInstance: m_ObjectHideFlags: 0 @@ -6747,7 +7127,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1228147706756960, guid: 47cfcb607ea85c941ab9d31ebc12a786, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1505054440} m_SourcePrefab: {fileID: 100100000, guid: 47cfcb607ea85c941ab9d31ebc12a786, type: 3} --- !u!1001 &662394838 PrefabInstance: @@ -6804,6 +7188,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 662394838} m_PrefabAsset: {fileID: 0} +--- !u!1 &665809782 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1765556987529750, guid: a1df6ef10c859f14abc209c1a36892be, + type: 3} + m_PrefabInstance: {fileID: 1041413651} + m_PrefabAsset: {fileID: 0} --- !u!1001 &668133075 PrefabInstance: m_ObjectHideFlags: 0 @@ -6863,7 +7253,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1293276938858838, guid: 4da60a47c8581094d96d1c185a1d8f2c, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1068232101} m_SourcePrefab: {fileID: 100100000, guid: 4da60a47c8581094d96d1c185a1d8f2c, type: 3} --- !u!4 &681707073 stripped Transform: @@ -6871,12 +7265,62 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1290178922} m_PrefabAsset: {fileID: 0} +--- !u!1 &683670406 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1250598640848458, guid: 52281544c43043b489bc324c9ff2a02f, + type: 3} + m_PrefabInstance: {fileID: 1290178922} + m_PrefabAsset: {fileID: 0} +--- !u!64 &683670409 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 683670406} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300010, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!4 &687906009 stripped Transform: m_CorrespondingSourceObject: {fileID: 4396769751283928, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} m_PrefabInstance: {fileID: 748646056} m_PrefabAsset: {fileID: 0} +--- !u!64 &687906012 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 397085568} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300012, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!4 &688976909 stripped Transform: m_CorrespondingSourceObject: {fileID: 4396769751283928, guid: 78f9d456945b4f04ab3091da37bf7c99, @@ -6944,7 +7388,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1719033733064216, guid: 78f9d456945b4f04ab3091da37bf7c99, + type: 3} + insertIndex: -1 + addedObject: {fileID: 821546714} m_SourcePrefab: {fileID: 100100000, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} --- !u!4 &698904179 stripped Transform: @@ -6958,6 +7406,94 @@ Transform: type: 3} m_PrefabInstance: {fileID: 298893684} m_PrefabAsset: {fileID: 0} +--- !u!64 &701840355 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 470384419} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300028, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} +--- !u!1001 &702572029 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 155132, guid: 2b7bae11d5e723b4597e4a3c1fd139b1, type: 3} + propertyPath: m_Name + value: SwordKnight_E (1) + objectReference: {fileID: 0} + - target: {fileID: 155132, guid: 2b7bae11d5e723b4597e4a3c1fd139b1, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 438990, guid: 2b7bae11d5e723b4597e4a3c1fd139b1, type: 3} + propertyPath: m_LocalPosition.x + value: 42.01 + objectReference: {fileID: 0} + - target: {fileID: 438990, guid: 2b7bae11d5e723b4597e4a3c1fd139b1, type: 3} + propertyPath: m_LocalPosition.y + value: 1.8 + objectReference: {fileID: 0} + - target: {fileID: 438990, guid: 2b7bae11d5e723b4597e4a3c1fd139b1, type: 3} + propertyPath: m_LocalPosition.z + value: 9.4 + objectReference: {fileID: 0} + - target: {fileID: 438990, guid: 2b7bae11d5e723b4597e4a3c1fd139b1, type: 3} + propertyPath: m_LocalRotation.w + value: 0.71326315 + objectReference: {fileID: 0} + - target: {fileID: 438990, guid: 2b7bae11d5e723b4597e4a3c1fd139b1, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 438990, guid: 2b7bae11d5e723b4597e4a3c1fd139b1, type: 3} + propertyPath: m_LocalRotation.y + value: -0.70089644 + objectReference: {fileID: 0} + - target: {fileID: 438990, guid: 2b7bae11d5e723b4597e4a3c1fd139b1, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 438990, guid: 2b7bae11d5e723b4597e4a3c1fd139b1, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 438990, guid: 2b7bae11d5e723b4597e4a3c1fd139b1, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -88.998 + objectReference: {fileID: 0} + - target: {fileID: 438990, guid: 2b7bae11d5e723b4597e4a3c1fd139b1, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8188970957291078347, guid: 2b7bae11d5e723b4597e4a3c1fd139b1, + type: 3} + propertyPath: colliderWithinRange.Array.size + value: 21 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2b7bae11d5e723b4597e4a3c1fd139b1, type: 3} --- !u!1001 &712801220 PrefabInstance: m_ObjectHideFlags: 0 @@ -7013,6 +7549,18 @@ Transform: type: 3} m_PrefabInstance: {fileID: 712801220} m_PrefabAsset: {fileID: 0} +--- !u!1 &730373112 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1228147706756960, guid: 47cfcb607ea85c941ab9d31ebc12a786, + type: 3} + m_PrefabInstance: {fileID: 193305729} + m_PrefabAsset: {fileID: 0} +--- !u!1 &732158040 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1922665799419548, guid: 635b75387ff8e5847bdde4cc22d324e4, + type: 3} + m_PrefabInstance: {fileID: 1521429322} + m_PrefabAsset: {fileID: 0} --- !u!1001 &737270723 PrefabInstance: m_ObjectHideFlags: 0 @@ -7125,7 +7673,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1719033733064216, guid: 78f9d456945b4f04ab3091da37bf7c99, + type: 3} + insertIndex: -1 + addedObject: {fileID: 687906012} m_SourcePrefab: {fileID: 100100000, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} --- !u!4 &755736062 stripped Transform: @@ -7234,7 +7786,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1719033733064216, guid: 78f9d456945b4f04ab3091da37bf7c99, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1009380121} m_SourcePrefab: {fileID: 100100000, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} --- !u!4 &771996368 stripped Transform: @@ -7401,6 +7957,28 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1567668050} m_PrefabAsset: {fileID: 0} +--- !u!64 &802915609 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 375933015} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300074, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!1001 &805317138 PrefabInstance: m_ObjectHideFlags: 0 @@ -7631,7 +8209,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1250598640848458, guid: 52281544c43043b489bc324c9ff2a02f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1253131160} m_SourcePrefab: {fileID: 100100000, guid: 52281544c43043b489bc324c9ff2a02f, type: 3} --- !u!4 &821546711 stripped Transform: @@ -7639,6 +8221,34 @@ Transform: type: 3} m_PrefabInstance: {fileID: 695691676} m_PrefabAsset: {fileID: 0} +--- !u!64 &821546714 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 501150258} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300012, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} +--- !u!1 &824054198 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1905415275743904, guid: 9a0cf1227a4efe442977c0837bb18c53, + type: 3} + m_PrefabInstance: {fileID: 1591074544} + m_PrefabAsset: {fileID: 0} --- !u!1001 &825098397 PrefabInstance: m_ObjectHideFlags: 0 @@ -7747,6 +8357,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 832880644} m_PrefabAsset: {fileID: 0} +--- !u!1 &840154976 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1250598640848458, guid: 52281544c43043b489bc324c9ff2a02f, + type: 3} + m_PrefabInstance: {fileID: 1170849520} + m_PrefabAsset: {fileID: 0} --- !u!1001 &845631641 PrefabInstance: m_ObjectHideFlags: 0 @@ -7880,12 +8496,62 @@ Transform: - {fileID: 244304639} m_Father: {fileID: 1235062062} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &855347880 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1693903836913636, guid: e59407eba2e5c71418f3e3dcc89dc2bb, + type: 3} + m_PrefabInstance: {fileID: 1262108060} + m_PrefabAsset: {fileID: 0} +--- !u!64 &855347883 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 855347880} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300044, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!4 &859257169 stripped Transform: m_CorrespondingSourceObject: {fileID: 4778482749584620, guid: 8a61e59c2480da542ab03b6d843bb8fc, type: 3} m_PrefabInstance: {fileID: 595233699} m_PrefabAsset: {fileID: 0} +--- !u!64 &859257172 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 251109698} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300072, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!1001 &860638634 PrefabInstance: m_ObjectHideFlags: 0 @@ -8014,6 +8680,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 863229841} m_PrefabAsset: {fileID: 0} +--- !u!1 &863487761 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1719033733064216, guid: 78f9d456945b4f04ab3091da37bf7c99, + type: 3} + m_PrefabInstance: {fileID: 1497194362} + m_PrefabAsset: {fileID: 0} --- !u!1001 &865460511 PrefabInstance: m_ObjectHideFlags: 0 @@ -8256,7 +8928,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1510339036937058, guid: d10cac1523a5cf444b696c59032c765d, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1520992972} m_SourcePrefab: {fileID: 100100000, guid: d10cac1523a5cf444b696c59032c765d, type: 3} --- !u!1001 &870686290 PrefabInstance: @@ -8321,7 +8997,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1250598640848458, guid: 52281544c43043b489bc324c9ff2a02f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 918273881} m_SourcePrefab: {fileID: 100100000, guid: 52281544c43043b489bc324c9ff2a02f, type: 3} --- !u!1001 &873140623 PrefabInstance: @@ -8378,7 +9058,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1228147706756960, guid: 47cfcb607ea85c941ab9d31ebc12a786, + type: 3} + insertIndex: -1 + addedObject: {fileID: 131103967} m_SourcePrefab: {fileID: 100100000, guid: 47cfcb607ea85c941ab9d31ebc12a786, type: 3} --- !u!4 &879342246 stripped Transform: @@ -8386,6 +9070,34 @@ Transform: type: 3} m_PrefabInstance: {fileID: 140956082} m_PrefabAsset: {fileID: 0} +--- !u!1 &881700929 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1878298747281992, guid: fd96fcba1a1bfd644800982dcbe3e1ce, + type: 3} + m_PrefabInstance: {fileID: 917240342} + m_PrefabAsset: {fileID: 0} +--- !u!64 &881700932 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 881700929} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300038, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!1001 &882890933 PrefabInstance: m_ObjectHideFlags: 0 @@ -8435,6 +9147,12 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} +--- !u!1 &894869667 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1719033733064216, guid: 78f9d456945b4f04ab3091da37bf7c99, + type: 3} + m_PrefabInstance: {fileID: 452376191} + m_PrefabAsset: {fileID: 0} --- !u!1 &896918810 GameObject: m_ObjectHideFlags: 0 @@ -8504,7 +9222,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 438990, guid: 45b324ec0934e8040876c8641587ffe2, type: 3} propertyPath: m_LocalPosition.y - value: 7.318819 + value: 7.477 objectReference: {fileID: 0} - target: {fileID: 438990, guid: 45b324ec0934e8040876c8641587ffe2, type: 3} propertyPath: m_LocalPosition.z @@ -8712,7 +9430,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1878298747281992, guid: fd96fcba1a1bfd644800982dcbe3e1ce, + type: 3} + insertIndex: -1 + addedObject: {fileID: 881700932} m_SourcePrefab: {fileID: 100100000, guid: fd96fcba1a1bfd644800982dcbe3e1ce, type: 3} --- !u!4 &917539644 stripped Transform: @@ -8720,12 +9442,56 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1281132869} m_PrefabAsset: {fileID: 0} +--- !u!64 &917539647 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 361416449} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300010, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!4 &918273878 stripped Transform: m_CorrespondingSourceObject: {fileID: 4731899312788336, guid: 52281544c43043b489bc324c9ff2a02f, type: 3} m_PrefabInstance: {fileID: 870686290} m_PrefabAsset: {fileID: 0} +--- !u!64 &918273881 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 190179881} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300010, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!1001 &918793609 PrefabInstance: m_ObjectHideFlags: 0 @@ -8785,7 +9551,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1250598640848458, guid: 52281544c43043b489bc324c9ff2a02f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1801959199} m_SourcePrefab: {fileID: 100100000, guid: 52281544c43043b489bc324c9ff2a02f, type: 3} --- !u!1001 &923241489 PrefabInstance: @@ -9047,6 +9817,34 @@ Transform: type: 3} m_PrefabInstance: {fileID: 221937774} m_PrefabAsset: {fileID: 0} +--- !u!1 &951002544 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1719033733064216, guid: 78f9d456945b4f04ab3091da37bf7c99, + type: 3} + m_PrefabInstance: {fileID: 1489050912} + m_PrefabAsset: {fileID: 0} +--- !u!64 &951002547 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 951002544} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300012, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!1001 &953800513 PrefabInstance: m_ObjectHideFlags: 0 @@ -9173,6 +9971,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 954320798} m_PrefabAsset: {fileID: 0} +--- !u!1 &954382271 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1719033733064216, guid: 78f9d456945b4f04ab3091da37bf7c99, + type: 3} + m_PrefabInstance: {fileID: 1974349984} + m_PrefabAsset: {fileID: 0} --- !u!1001 &956714967 PrefabInstance: m_ObjectHideFlags: 0 @@ -9335,7 +10139,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1922665799419548, guid: 635b75387ff8e5847bdde4cc22d324e4, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1762046001} m_SourcePrefab: {fileID: 100100000, guid: 635b75387ff8e5847bdde4cc22d324e4, type: 3} --- !u!4 &966063442 stripped Transform: @@ -9343,6 +10151,28 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1080108212} m_PrefabAsset: {fileID: 0} +--- !u!64 &966063445 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 356579451} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300012, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!4 &974318547 stripped Transform: m_CorrespondingSourceObject: {fileID: 4396769751283928, guid: 78f9d456945b4f04ab3091da37bf7c99, @@ -9515,7 +10345,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1250598640848458, guid: 52281544c43043b489bc324c9ff2a02f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1940694948} m_SourcePrefab: {fileID: 100100000, guid: 52281544c43043b489bc324c9ff2a02f, type: 3} --- !u!1001 &992927323 PrefabInstance: @@ -9617,12 +10451,62 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1003094742} m_PrefabAsset: {fileID: 0} +--- !u!1 &1008568435 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1719033733064216, guid: 78f9d456945b4f04ab3091da37bf7c99, + type: 3} + m_PrefabInstance: {fileID: 104568671} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1008568438 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1008568435} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300012, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!4 &1009380118 stripped Transform: m_CorrespondingSourceObject: {fileID: 4396769751283928, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} m_PrefabInstance: {fileID: 766648020} m_PrefabAsset: {fileID: 0} +--- !u!64 &1009380121 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 397763594} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300012, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!1001 &1009660437 PrefabInstance: m_ObjectHideFlags: 0 @@ -9674,7 +10558,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1250598640848458, guid: 52281544c43043b489bc324c9ff2a02f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1641887024} m_SourcePrefab: {fileID: 100100000, guid: 52281544c43043b489bc324c9ff2a02f, type: 3} --- !u!1001 &1014228467 PrefabInstance: @@ -9879,6 +10767,28 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1974349984} m_PrefabAsset: {fileID: 0} +--- !u!64 &1032405597 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 954382271} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300012, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!1001 &1041052115 PrefabInstance: m_ObjectHideFlags: 0 @@ -9989,7 +10899,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1765556987529750, guid: a1df6ef10c859f14abc209c1a36892be, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1345819647} m_SourcePrefab: {fileID: 100100000, guid: a1df6ef10c859f14abc209c1a36892be, type: 3} --- !u!4 &1042338084 stripped Transform: @@ -10052,6 +10966,34 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1048057790} m_PrefabAsset: {fileID: 0} +--- !u!1 &1068232098 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1293276938858838, guid: 4da60a47c8581094d96d1c185a1d8f2c, + type: 3} + m_PrefabInstance: {fileID: 668133075} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1068232101 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1068232098} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300016, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!1001 &1068775964 PrefabInstance: m_ObjectHideFlags: 0 @@ -10125,6 +11067,28 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1691679347} m_PrefabAsset: {fileID: 0} +--- !u!64 &1076059279 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 343234002} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300036, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!1001 &1080108212 PrefabInstance: m_ObjectHideFlags: 0 @@ -10184,7 +11148,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1719033733064216, guid: 78f9d456945b4f04ab3091da37bf7c99, + type: 3} + insertIndex: -1 + addedObject: {fileID: 966063445} m_SourcePrefab: {fileID: 100100000, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} --- !u!1001 &1084154786 PrefabInstance: @@ -10432,6 +11400,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1244098594} m_PrefabAsset: {fileID: 0} +--- !u!1 &1111010171 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1719033733064216, guid: 78f9d456945b4f04ab3091da37bf7c99, + type: 3} + m_PrefabInstance: {fileID: 1223395170} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1115946653 PrefabInstance: m_ObjectHideFlags: 0 @@ -10779,7 +11753,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1250598640848458, guid: 52281544c43043b489bc324c9ff2a02f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1266958231} m_SourcePrefab: {fileID: 100100000, guid: 52281544c43043b489bc324c9ff2a02f, type: 3} --- !u!1 &1139380295 GameObject: @@ -10994,7 +11972,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1386817837360002, guid: b45d9606204c13849807fa46ea7231a6, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1938878503} m_SourcePrefab: {fileID: 100100000, guid: b45d9606204c13849807fa46ea7231a6, type: 3} --- !u!1001 &1142740374 PrefabInstance: @@ -11216,6 +12198,12 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d10cac1523a5cf444b696c59032c765d, type: 3} +--- !u!1 &1159851481 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1719033733064216, guid: 78f9d456945b4f04ab3091da37bf7c99, + type: 3} + m_PrefabInstance: {fileID: 4011161} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1168149015 PrefabInstance: m_ObjectHideFlags: 0 @@ -11354,7 +12342,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1250598640848458, guid: 52281544c43043b489bc324c9ff2a02f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1282916239} m_SourcePrefab: {fileID: 100100000, guid: 52281544c43043b489bc324c9ff2a02f, type: 3} --- !u!1001 &1171234637 PrefabInstance: @@ -11411,6 +12403,34 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1171234637} m_PrefabAsset: {fileID: 0} +--- !u!1 &1176526825 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1228147706756960, guid: 47cfcb607ea85c941ab9d31ebc12a786, + type: 3} + m_PrefabInstance: {fileID: 1182035433} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1176526828 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1176526825} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300074, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!1001 &1176673710 PrefabInstance: m_ObjectHideFlags: 0 @@ -11466,7 +12486,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1719033733064216, guid: 78f9d456945b4f04ab3091da37bf7c99, + type: 3} + insertIndex: -1 + addedObject: {fileID: 582661241} m_SourcePrefab: {fileID: 100100000, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} --- !u!1001 &1182035433 PrefabInstance: @@ -11527,7 +12551,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1228147706756960, guid: 47cfcb607ea85c941ab9d31ebc12a786, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1176526828} m_SourcePrefab: {fileID: 100100000, guid: 47cfcb607ea85c941ab9d31ebc12a786, type: 3} --- !u!1001 &1182197409 PrefabInstance: @@ -11863,7 +12891,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1719033733064216, guid: 78f9d456945b4f04ab3091da37bf7c99, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1369695170} m_SourcePrefab: {fileID: 100100000, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} --- !u!1001 &1223395170 PrefabInstance: @@ -11920,7 +12952,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1719033733064216, guid: 78f9d456945b4f04ab3091da37bf7c99, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1528256485} m_SourcePrefab: {fileID: 100100000, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} --- !u!1001 &1227261089 PrefabInstance: @@ -11989,6 +13025,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1227261089} m_PrefabAsset: {fileID: 0} +--- !u!1 &1227365734 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1922665799419548, guid: 635b75387ff8e5847bdde4cc22d324e4, + type: 3} + m_PrefabInstance: {fileID: 507901844} + m_PrefabAsset: {fileID: 0} --- !u!4 &1233766556 stripped Transform: m_CorrespondingSourceObject: {fileID: 4214483030478258, guid: 71e2c9f4ac6ef3c448bfa589003b7db4, @@ -12254,6 +13296,34 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2b953b190cb9c00419c8b7d8fc191c6b, type: 3} +--- !u!1 &1253131157 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1250598640848458, guid: 52281544c43043b489bc324c9ff2a02f, + type: 3} + m_PrefabInstance: {fileID: 818004226} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1253131160 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1253131157} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300010, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!1001 &1254074560 PrefabInstance: m_ObjectHideFlags: 0 @@ -12368,7 +13438,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1693903836913636, guid: e59407eba2e5c71418f3e3dcc89dc2bb, + type: 3} + insertIndex: -1 + addedObject: {fileID: 855347883} m_SourcePrefab: {fileID: 100100000, guid: e59407eba2e5c71418f3e3dcc89dc2bb, type: 3} --- !u!4 &1264165470 stripped Transform: @@ -12376,6 +13450,28 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1980486993} m_PrefabAsset: {fileID: 0} +--- !u!64 &1264165473 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 423905882} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300044, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!1001 &1264585820 PrefabInstance: m_ObjectHideFlags: 0 @@ -12433,6 +13529,28 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1133313077} m_PrefabAsset: {fileID: 0} +--- !u!64 &1266958231 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 403668426} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300010, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!1001 &1276440118 PrefabInstance: m_ObjectHideFlags: 0 @@ -12549,7 +13667,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1250598640848458, guid: 52281544c43043b489bc324c9ff2a02f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 917539647} m_SourcePrefab: {fileID: 100100000, guid: 52281544c43043b489bc324c9ff2a02f, type: 3} --- !u!4 &1282916236 stripped Transform: @@ -12557,6 +13679,28 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1170849520} m_PrefabAsset: {fileID: 0} +--- !u!64 &1282916239 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 840154976} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300010, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!4 &1283636567 stripped Transform: m_CorrespondingSourceObject: {fileID: 4420849769968008, guid: cb0eb0bc425481e4f8ca694100ac35af, @@ -12622,7 +13766,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1250598640848458, guid: 52281544c43043b489bc324c9ff2a02f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 683670409} m_SourcePrefab: {fileID: 100100000, guid: 52281544c43043b489bc324c9ff2a02f, type: 3} --- !u!1001 &1292606503 PrefabInstance: @@ -12683,6 +13831,34 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1292606503} m_PrefabAsset: {fileID: 0} +--- !u!1 &1307102914 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1250598640848458, guid: 52281544c43043b489bc324c9ff2a02f, + type: 3} + m_PrefabInstance: {fileID: 1599518772} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1307102917 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1307102914} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300010, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!1001 &1313426507 PrefabInstance: m_ObjectHideFlags: 0 @@ -13047,12 +14223,40 @@ Transform: - {fileID: 1670999862} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1337711728 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1250598640848458, guid: 52281544c43043b489bc324c9ff2a02f, + type: 3} + m_PrefabInstance: {fileID: 991516669} + m_PrefabAsset: {fileID: 0} --- !u!4 &1345819644 stripped Transform: m_CorrespondingSourceObject: {fileID: 4509221021099962, guid: a1df6ef10c859f14abc209c1a36892be, type: 3} m_PrefabInstance: {fileID: 1041413651} m_PrefabAsset: {fileID: 0} +--- !u!64 &1345819647 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 665809782} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300030, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!1 &1349325480 GameObject: m_ObjectHideFlags: 0 @@ -13202,6 +14406,28 @@ Transform: type: 3} m_PrefabInstance: {fileID: 566810608} m_PrefabAsset: {fileID: 0} +--- !u!64 &1364099832 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 451479851} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300012, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!4 &1369394022 stripped Transform: m_CorrespondingSourceObject: {fileID: 4731899312788336, guid: 52281544c43043b489bc324c9ff2a02f, @@ -13214,6 +14440,28 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1221063218} m_PrefabAsset: {fileID: 0} +--- !u!64 &1369695170 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 448455021} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300012, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!4 &1373237811 stripped Transform: m_CorrespondingSourceObject: {fileID: 4567959282733974, guid: 635b75387ff8e5847bdde4cc22d324e4, @@ -13226,6 +14474,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 422168499} m_PrefabAsset: {fileID: 0} +--- !u!1 &1382419714 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1922665799419548, guid: 635b75387ff8e5847bdde4cc22d324e4, + type: 3} + m_PrefabInstance: {fileID: 1591105762} + m_PrefabAsset: {fileID: 0} --- !u!4 &1394963983 stripped Transform: m_CorrespondingSourceObject: {fileID: 4401225624340112, guid: 8e3b3057cc450824aa5f9cca4a0e38a8, @@ -13238,6 +14492,28 @@ Transform: type: 3} m_PrefabInstance: {fileID: 452376191} m_PrefabAsset: {fileID: 0} +--- !u!64 &1396342276 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 894869667} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300012, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!1001 &1397733103 PrefabInstance: m_ObjectHideFlags: 0 @@ -13411,8 +14687,24 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1458100915126704, guid: 9c4f3d29cac14fb4ab9e202645a065a4, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1924359575} m_SourcePrefab: {fileID: 100100000, guid: 9c4f3d29cac14fb4ab9e202645a065a4, type: 3} +--- !u!1 &1403954817 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1710985167981108, guid: 8a61e59c2480da542ab03b6d843bb8fc, + type: 3} + m_PrefabInstance: {fileID: 1813637755} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1405858200 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1458100915126704, guid: 9c4f3d29cac14fb4ab9e202645a065a4, + type: 3} + m_PrefabInstance: {fileID: 1402468658} + m_PrefabAsset: {fileID: 0} --- !u!1 &1408815578 GameObject: m_ObjectHideFlags: 0 @@ -13463,6 +14755,28 @@ Transform: type: 3} m_PrefabInstance: {fileID: 142492138} m_PrefabAsset: {fileID: 0} +--- !u!64 &1410265415 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 211720928} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300030, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!1 &1413696920 GameObject: m_ObjectHideFlags: 0 @@ -13555,7 +14869,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1911758058257032, guid: 721db2327c7b5124086e533e7c238426, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2117296368} m_SourcePrefab: {fileID: 100100000, guid: 721db2327c7b5124086e533e7c238426, type: 3} --- !u!1001 &1423588409 PrefabInstance: @@ -13612,7 +14930,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1250598640848458, guid: 52281544c43043b489bc324c9ff2a02f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 260673956} m_SourcePrefab: {fileID: 100100000, guid: 52281544c43043b489bc324c9ff2a02f, type: 3} --- !u!1001 &1423632807 PrefabInstance: @@ -14168,7 +15490,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1538355803486680, guid: 8826ea9e300809d4d8028c8707b4cdc3, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2121908349} m_SourcePrefab: {fileID: 100100000, guid: 8826ea9e300809d4d8028c8707b4cdc3, type: 3} --- !u!1001 &1479192563 PrefabInstance: @@ -14406,7 +15732,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1719033733064216, guid: 78f9d456945b4f04ab3091da37bf7c99, + type: 3} + insertIndex: -1 + addedObject: {fileID: 951002547} m_SourcePrefab: {fileID: 100100000, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} --- !u!1001 &1497194362 PrefabInstance: @@ -14463,7 +15793,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1719033733064216, guid: 78f9d456945b4f04ab3091da37bf7c99, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1841546156} m_SourcePrefab: {fileID: 100100000, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} --- !u!1001 &1502875054 PrefabInstance: @@ -14516,6 +15850,34 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1502875054} m_PrefabAsset: {fileID: 0} +--- !u!1 &1505054437 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1228147706756960, guid: 47cfcb607ea85c941ab9d31ebc12a786, + type: 3} + m_PrefabInstance: {fileID: 659920089} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1505054440 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1505054437} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300074, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!4 &1520210424 stripped Transform: m_CorrespondingSourceObject: {fileID: 4420849769968008, guid: cb0eb0bc425481e4f8ca694100ac35af, @@ -14528,6 +15890,28 @@ Transform: type: 3} m_PrefabInstance: {fileID: 869490807} m_PrefabAsset: {fileID: 0} +--- !u!64 &1520992972 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 651496820} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300056, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!1001 &1521429322 PrefabInstance: m_ObjectHideFlags: 0 @@ -14583,7 +15967,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1922665799419548, guid: 635b75387ff8e5847bdde4cc22d324e4, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2115358974} m_SourcePrefab: {fileID: 100100000, guid: 635b75387ff8e5847bdde4cc22d324e4, type: 3} --- !u!4 &1525119993 stripped Transform: @@ -14668,6 +16056,28 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1223395170} m_PrefabAsset: {fileID: 0} +--- !u!64 &1528256485 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1111010171} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300012, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!1001 &1532999476 PrefabInstance: m_ObjectHideFlags: 0 @@ -15065,7 +16475,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1250598640848458, guid: 52281544c43043b489bc324c9ff2a02f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2129916438} m_SourcePrefab: {fileID: 100100000, guid: 52281544c43043b489bc324c9ff2a02f, type: 3} --- !u!1001 &1559665687 PrefabInstance: @@ -15073,15 +16487,15 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 492527186} + m_TransformParent: {fileID: 2045055142} m_Modifications: - target: {fileID: 1719033733064216, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} propertyPath: m_Layer - value: 3 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1719033733064216, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} propertyPath: m_TagString - value: Ground + value: Untagged objectReference: {fileID: 0} - target: {fileID: 4396769751283928, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} propertyPath: m_RootOrder @@ -15089,23 +16503,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4396769751283928, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} propertyPath: m_LocalScale.y - value: 5 + value: 0.8333334 objectReference: {fileID: 0} - target: {fileID: 4396769751283928, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} propertyPath: m_LocalPosition.x - value: -2.6999996 + value: 4 objectReference: {fileID: 0} - target: {fileID: 4396769751283928, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 0.085 objectReference: {fileID: 0} - target: {fileID: 4396769751283928, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} propertyPath: m_LocalPosition.z - value: 2.8999991 + value: 0.96000004 objectReference: {fileID: 0} - target: {fileID: 4396769751283928, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 4396769751283928, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} propertyPath: m_LocalRotation.x @@ -15113,7 +16527,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4396769751283928, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: -0.70710677 objectReference: {fileID: 0} - target: {fileID: 4396769751283928, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} propertyPath: m_LocalRotation.z @@ -15238,7 +16652,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1228147706756960, guid: 47cfcb607ea85c941ab9d31ebc12a786, + type: 3} + insertIndex: -1 + addedObject: {fileID: 802915609} m_SourcePrefab: {fileID: 100100000, guid: 47cfcb607ea85c941ab9d31ebc12a786, type: 3} --- !u!1 &1567681075 GameObject: @@ -15536,7 +16954,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1905415275743904, guid: 9a0cf1227a4efe442977c0837bb18c53, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1678517379} m_SourcePrefab: {fileID: 100100000, guid: 9a0cf1227a4efe442977c0837bb18c53, type: 3} --- !u!1001 &1591105762 PrefabInstance: @@ -15597,7 +17019,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1922665799419548, guid: 635b75387ff8e5847bdde4cc22d324e4, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2114418025} m_SourcePrefab: {fileID: 100100000, guid: 635b75387ff8e5847bdde4cc22d324e4, type: 3} --- !u!1001 &1594330344 PrefabInstance: @@ -15654,6 +17080,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1594330344} m_PrefabAsset: {fileID: 0} +--- !u!1 &1595849711 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1386817837360002, guid: b45d9606204c13849807fa46ea7231a6, + type: 3} + m_PrefabInstance: {fileID: 1142541931} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1599518772 PrefabInstance: m_ObjectHideFlags: 0 @@ -15713,7 +17145,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1250598640848458, guid: 52281544c43043b489bc324c9ff2a02f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1307102917} m_SourcePrefab: {fileID: 100100000, guid: 52281544c43043b489bc324c9ff2a02f, type: 3} --- !u!1001 &1605616410 PrefabInstance: @@ -15774,7 +17210,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1250598640848458, guid: 52281544c43043b489bc324c9ff2a02f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 560126415} m_SourcePrefab: {fileID: 100100000, guid: 52281544c43043b489bc324c9ff2a02f, type: 3} --- !u!1001 &1606945232 PrefabInstance: @@ -16114,12 +17554,62 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1628492556} m_PrefabAsset: {fileID: 0} +--- !u!1 &1641887021 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1250598640848458, guid: 52281544c43043b489bc324c9ff2a02f, + type: 3} + m_PrefabInstance: {fileID: 1009660437} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1641887024 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1641887021} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300010, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!4 &1643686199 stripped Transform: m_CorrespondingSourceObject: {fileID: 4396769751283928, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} m_PrefabInstance: {fileID: 43710472} m_PrefabAsset: {fileID: 0} +--- !u!64 &1643686202 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 504563338} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300012, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!1001 &1652887670 PrefabInstance: m_ObjectHideFlags: 0 @@ -16234,6 +17724,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1654757641} m_PrefabAsset: {fileID: 0} +--- !u!1 &1654887967 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1250598640848458, guid: 52281544c43043b489bc324c9ff2a02f, + type: 3} + m_PrefabInstance: {fileID: 2051907} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1655049736 PrefabInstance: m_ObjectHideFlags: 0 @@ -16387,6 +17883,28 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1591074544} m_PrefabAsset: {fileID: 0} +--- !u!64 &1678517379 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 824054198} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300078, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!1001 &1682005839 PrefabInstance: m_ObjectHideFlags: 0 @@ -16501,7 +18019,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1636153586716238, guid: 6517a1d59b4e39e4ab1eeb8706964884, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1076059279} m_SourcePrefab: {fileID: 100100000, guid: 6517a1d59b4e39e4ab1eeb8706964884, type: 3} --- !u!1001 &1698233325 PrefabInstance: @@ -16666,7 +18188,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1250598640848458, guid: 52281544c43043b489bc324c9ff2a02f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 481636075} m_SourcePrefab: {fileID: 100100000, guid: 52281544c43043b489bc324c9ff2a02f, type: 3} --- !u!4 &1716361544 stripped Transform: @@ -16674,6 +18200,28 @@ Transform: type: 3} m_PrefabInstance: {fileID: 4011161} m_PrefabAsset: {fileID: 0} +--- !u!64 &1716361547 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1159851481} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300012, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!1001 &1721645115 PrefabInstance: m_ObjectHideFlags: 0 @@ -17034,6 +18582,34 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1749993150} m_PrefabAsset: {fileID: 0} +--- !u!1 &1751674226 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1228147706756960, guid: 47cfcb607ea85c941ab9d31ebc12a786, + type: 3} + m_PrefabInstance: {fileID: 332261091} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1751674229 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1751674226} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300074, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!1001 &1755604105 PrefabInstance: m_ObjectHideFlags: 0 @@ -17097,6 +18673,68 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1755604105} m_PrefabAsset: {fileID: 0} +--- !u!1 &1758634210 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1676856912612224, guid: c6b0259b9ef5c494d94b1062361118c4, + type: 3} + m_PrefabInstance: {fileID: 1913755643} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1758634213 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1758634210} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300068, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} +--- !u!1 &1759912004 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1922665799419548, guid: 635b75387ff8e5847bdde4cc22d324e4, + type: 3} + m_PrefabInstance: {fileID: 2093510289} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1762045998 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1922665799419548, guid: 635b75387ff8e5847bdde4cc22d324e4, + type: 3} + m_PrefabInstance: {fileID: 965802589} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1762046001 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1762045998} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300008, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!4 &1766758637 stripped Transform: m_CorrespondingSourceObject: {fileID: 4691123970454664, guid: d10cac1523a5cf444b696c59032c765d, @@ -17158,6 +18796,34 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1770862540} m_PrefabAsset: {fileID: 0} +--- !u!1 &1773587031 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1250598640848458, guid: 52281544c43043b489bc324c9ff2a02f, + type: 3} + m_PrefabInstance: {fileID: 1793245292} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1773587034 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1773587031} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300010, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!1001 &1773713233 PrefabInstance: m_ObjectHideFlags: 0 @@ -17241,6 +18907,28 @@ Transform: type: 3} m_PrefabInstance: {fileID: 544131514} m_PrefabAsset: {fileID: 0} +--- !u!64 &1778797169 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 13087557} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300074, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!1001 &1793245292 PrefabInstance: m_ObjectHideFlags: 0 @@ -17300,8 +18988,68 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1250598640848458, guid: 52281544c43043b489bc324c9ff2a02f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1773587034} m_SourcePrefab: {fileID: 100100000, guid: 52281544c43043b489bc324c9ff2a02f, type: 3} +--- !u!1 &1801959196 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1250598640848458, guid: 52281544c43043b489bc324c9ff2a02f, + type: 3} + m_PrefabInstance: {fileID: 918793609} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1801959199 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1801959196} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300010, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} +--- !u!1 &1802993150 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1228147706756960, guid: 47cfcb607ea85c941ab9d31ebc12a786, + type: 3} + m_PrefabInstance: {fileID: 1999476315} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1802993153 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1802993150} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300074, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!1001 &1813637755 PrefabInstance: m_ObjectHideFlags: 0 @@ -17357,7 +19105,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1710985167981108, guid: 8a61e59c2480da542ab03b6d843bb8fc, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1983914877} m_SourcePrefab: {fileID: 100100000, guid: 8a61e59c2480da542ab03b6d843bb8fc, type: 3} --- !u!1001 &1818981988 PrefabInstance: @@ -17642,6 +19394,28 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1497194362} m_PrefabAsset: {fileID: 0} +--- !u!64 &1841546156 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 863487761} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300012, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!1001 &1852236250 PrefabInstance: m_ObjectHideFlags: 0 @@ -17766,6 +19540,28 @@ Transform: type: 3} m_PrefabInstance: {fileID: 507901844} m_PrefabAsset: {fileID: 0} +--- !u!64 &1868998575 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1227365734} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300008, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!4 &1870503158 stripped Transform: m_CorrespondingSourceObject: {fileID: 4778165394439842, guid: 8955fc9a331d6964daed71bdeddeb61a, @@ -18124,7 +19920,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1922665799419548, guid: 635b75387ff8e5847bdde4cc22d324e4, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2099929017} m_SourcePrefab: {fileID: 100100000, guid: 635b75387ff8e5847bdde4cc22d324e4, type: 3} --- !u!4 &1908133763 stripped Transform: @@ -18132,6 +19932,28 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2051907} m_PrefabAsset: {fileID: 0} +--- !u!64 &1908133766 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1654887967} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300010, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!1001 &1908833879 PrefabInstance: m_ObjectHideFlags: 0 @@ -18399,8 +20221,40 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1676856912612224, guid: c6b0259b9ef5c494d94b1062361118c4, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1758634213} m_SourcePrefab: {fileID: 100100000, guid: c6b0259b9ef5c494d94b1062361118c4, type: 3} +--- !u!1 &1916071490 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1719033733064216, guid: 78f9d456945b4f04ab3091da37bf7c99, + type: 3} + m_PrefabInstance: {fileID: 321742810} + m_PrefabAsset: {fileID: 0} +--- !u!64 &1916071493 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1916071490} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300012, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!1001 &1917371670 PrefabInstance: m_ObjectHideFlags: 0 @@ -18466,6 +20320,28 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1402468658} m_PrefabAsset: {fileID: 0} +--- !u!64 &1924359575 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1405858200} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300026, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!4 &1924755965 stripped Transform: m_CorrespondingSourceObject: {fileID: 4431418503134908, guid: 2930f5c87d1e61e4ca32a50fc4cac4f7, @@ -18478,12 +20354,56 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1945008516} m_PrefabAsset: {fileID: 0} +--- !u!64 &1937544107 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9762356} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300010, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!4 &1938878500 stripped Transform: m_CorrespondingSourceObject: {fileID: 4257082327266492, guid: b45d9606204c13849807fa46ea7231a6, type: 3} m_PrefabInstance: {fileID: 1142541931} m_PrefabAsset: {fileID: 0} +--- !u!64 &1938878503 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1595849711} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300034, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!4 &1939634756 stripped Transform: m_CorrespondingSourceObject: {fileID: 4364478739488696, guid: b63cc02ab2a559b4cb9944fbe4feea36, @@ -18496,6 +20416,28 @@ Transform: type: 3} m_PrefabInstance: {fileID: 991516669} m_PrefabAsset: {fileID: 0} +--- !u!64 &1940694948 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1337711728} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300010, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!1001 &1943882975 PrefabInstance: m_ObjectHideFlags: 0 @@ -18610,7 +20552,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1250598640848458, guid: 52281544c43043b489bc324c9ff2a02f, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1937544107} m_SourcePrefab: {fileID: 100100000, guid: 52281544c43043b489bc324c9ff2a02f, type: 3} --- !u!1001 &1948806442 PrefabInstance: @@ -18921,7 +20867,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1719033733064216, guid: 78f9d456945b4f04ab3091da37bf7c99, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1032405597} m_SourcePrefab: {fileID: 100100000, guid: 78f9d456945b4f04ab3091da37bf7c99, type: 3} --- !u!1001 &1977736197 PrefabInstance: @@ -19044,7 +20994,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1693903836913636, guid: e59407eba2e5c71418f3e3dcc89dc2bb, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1264165473} m_SourcePrefab: {fileID: 100100000, guid: e59407eba2e5c71418f3e3dcc89dc2bb, type: 3} --- !u!4 &1983914874 stripped Transform: @@ -19052,6 +21006,28 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1813637755} m_PrefabAsset: {fileID: 0} +--- !u!64 &1983914877 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1403954817} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300072, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!1001 &1987385167 PrefabInstance: m_ObjectHideFlags: 0 @@ -19211,7 +21187,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1228147706756960, guid: 47cfcb607ea85c941ab9d31ebc12a786, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1802993153} m_SourcePrefab: {fileID: 100100000, guid: 47cfcb607ea85c941ab9d31ebc12a786, type: 3} --- !u!4 &2002189489 stripped Transform: @@ -19219,6 +21199,28 @@ Transform: type: 3} m_PrefabInstance: {fileID: 193305729} m_PrefabAsset: {fileID: 0} +--- !u!64 &2002189492 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 730373112} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300074, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!1001 &2006830726 PrefabInstance: m_ObjectHideFlags: 0 @@ -19337,6 +21339,28 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2093510289} m_PrefabAsset: {fileID: 0} +--- !u!64 &2021551681 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1759912004} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300008, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!1001 &2027834312 PrefabInstance: m_ObjectHideFlags: 0 @@ -19396,6 +21420,34 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2027834312} m_PrefabAsset: {fileID: 0} +--- !u!1 &2036493865 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1662942903224860, guid: 831fcc86213c0c442be644380a4818d3, + type: 3} + m_PrefabInstance: {fileID: 123474936} + m_PrefabAsset: {fileID: 0} +--- !u!64 &2036493868 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2036493865} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300018, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!1 &2045055141 GameObject: m_ObjectHideFlags: 0 @@ -19432,6 +21484,8 @@ Transform: - {fileID: 1107795439} - {fileID: 392464324} - {fileID: 974318547} + - {fileID: 236513986} + - {fileID: 879342246} m_Father: {fileID: 979588904} m_LocalEulerAnglesHint: {x: 0, y: 90.00001, z: 0} --- !u!1001 &2054665190 @@ -19562,6 +21616,28 @@ Transform: type: 3} m_PrefabInstance: {fileID: 104229440} m_PrefabAsset: {fileID: 0} +--- !u!64 &2078748142 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 659421743} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300012, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!4 &2080715354 stripped Transform: m_CorrespondingSourceObject: {fileID: 4396769751283928, guid: 78f9d456945b4f04ab3091da37bf7c99, @@ -19627,7 +21703,11 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1228147706756960, guid: 47cfcb607ea85c941ab9d31ebc12a786, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2107750385} m_SourcePrefab: {fileID: 100100000, guid: 47cfcb607ea85c941ab9d31ebc12a786, type: 3} --- !u!1001 &2091531728 PrefabInstance: @@ -19743,8 +21823,40 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1922665799419548, guid: 635b75387ff8e5847bdde4cc22d324e4, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2021551681} m_SourcePrefab: {fileID: 100100000, guid: 635b75387ff8e5847bdde4cc22d324e4, type: 3} +--- !u!1 &2093678720 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1322786914769362, guid: b63cc02ab2a559b4cb9944fbe4feea36, + type: 3} + m_PrefabInstance: {fileID: 21234224} + m_PrefabAsset: {fileID: 0} +--- !u!64 &2093678723 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2093678720} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300006, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!1 &2095906524 GameObject: m_ObjectHideFlags: 0 @@ -19841,12 +21953,62 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2099738049} m_PrefabAsset: {fileID: 0} +--- !u!1 &2099929014 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1922665799419548, guid: 635b75387ff8e5847bdde4cc22d324e4, + type: 3} + m_PrefabInstance: {fileID: 1907064595} + m_PrefabAsset: {fileID: 0} +--- !u!64 &2099929017 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2099929014} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300008, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!4 &2107750382 stripped Transform: m_CorrespondingSourceObject: {fileID: 4892447333738632, guid: 47cfcb607ea85c941ab9d31ebc12a786, type: 3} m_PrefabInstance: {fileID: 2085955387} m_PrefabAsset: {fileID: 0} +--- !u!64 &2107750385 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 415683603} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300074, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!1001 &2111810398 PrefabInstance: m_ObjectHideFlags: 0 @@ -19904,18 +22066,84 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1591105762} m_PrefabAsset: {fileID: 0} +--- !u!64 &2114418025 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1382419714} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300008, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!4 &2115358971 stripped Transform: m_CorrespondingSourceObject: {fileID: 4567959282733974, guid: 635b75387ff8e5847bdde4cc22d324e4, type: 3} m_PrefabInstance: {fileID: 1521429322} m_PrefabAsset: {fileID: 0} +--- !u!64 &2115358974 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 732158040} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300008, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!4 &2117296365 stripped Transform: m_CorrespondingSourceObject: {fileID: 4689383043033452, guid: 721db2327c7b5124086e533e7c238426, type: 3} m_PrefabInstance: {fileID: 1421969413} m_PrefabAsset: {fileID: 0} +--- !u!64 &2117296368 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 35591432} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300066, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!1001 &2120119942 PrefabInstance: m_ObjectHideFlags: 0 @@ -19967,6 +22195,34 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2120119942} m_PrefabAsset: {fileID: 0} +--- !u!1 &2121908346 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1538355803486680, guid: 8826ea9e300809d4d8028c8707b4cdc3, + type: 3} + m_PrefabInstance: {fileID: 1468043405} + m_PrefabAsset: {fileID: 0} +--- !u!64 &2121908349 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2121908346} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300042, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!1001 &2125140315 PrefabInstance: m_ObjectHideFlags: 0 @@ -20022,12 +22278,62 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2125140315} m_PrefabAsset: {fileID: 0} +--- !u!1 &2129835302 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1228147706756960, guid: 47cfcb607ea85c941ab9d31ebc12a786, + type: 3} + m_PrefabInstance: {fileID: 422168499} + m_PrefabAsset: {fileID: 0} +--- !u!64 &2129835305 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2129835302} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300074, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!4 &2129916435 stripped Transform: m_CorrespondingSourceObject: {fileID: 4731899312788336, guid: 52281544c43043b489bc324c9ff2a02f, type: 3} m_PrefabInstance: {fileID: 1558984554} m_PrefabAsset: {fileID: 0} +--- !u!64 &2129916438 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 558340485} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 4300010, guid: b45fc979bd405964a94ec6fb70cab52f, type: 3} --- !u!4 &2134044085 stripped Transform: m_CorrespondingSourceObject: {fileID: 4567959282733974, guid: 635b75387ff8e5847bdde4cc22d324e4, @@ -20052,6 +22358,7 @@ SceneRoots: - {fileID: 345283316} - {fileID: 301003107} - {fileID: 191120567} + - {fileID: 702572029} - {fileID: 905060430} - {fileID: 1332541640} - {fileID: 929776521} diff --git a/BlueWater/Assets/02.Scripts/Ai/AiController.cs b/BlueWater/Assets/02.Scripts/Ai/AiController.cs index 843224536..1731ca5f7 100644 --- a/BlueWater/Assets/02.Scripts/Ai/AiController.cs +++ b/BlueWater/Assets/02.Scripts/Ai/AiController.cs @@ -6,12 +6,21 @@ using Random = UnityEngine.Random; // ReSharper disable once CheckNamespace namespace BlueWaterProject { + public enum AttackerType + { + NONE, + PLAYER, + PIRATE, + ENEMY + } + [Serializable] public abstract class AiController : MonoBehaviour, IDamageable { #region Property and variable protected bool isAttacking; + protected AttackerType attackerType; protected Animator aiAnimator; protected AiMover aiMover; @@ -19,7 +28,7 @@ namespace BlueWaterProject protected NavMeshAgent navMeshAgent; public static readonly int SpeedHash = Animator.StringToHash("Speed"); - public static readonly int AttackHash = Animator.StringToHash("TakeDamage"); + public static readonly int AttackHash = Animator.StringToHash("Attack"); public static readonly int DamageHash = Animator.StringToHash("TakeDamage"); public static readonly int DeathTypeHash = Animator.StringToHash("DeathType"); public static readonly int DeathHash = Animator.StringToHash("Death"); @@ -40,6 +49,19 @@ namespace BlueWaterProject aiMover = Utils.GetComponentAndAssert(transform); fieldOfView = Utils.GetComponentAndAssert(transform); navMeshAgent = Utils.GetComponentAndAssert(transform); + + if (gameObject.layer == LayerMask.NameToLayer("Player")) + { + attackerType = AttackerType.PLAYER; + } + else if (gameObject.layer == LayerMask.NameToLayer("Pirate")) + { + attackerType = AttackerType.PIRATE; + } + else if (gameObject.layer == LayerMask.NameToLayer("Enemy")) + { + attackerType = AttackerType.ENEMY; + } } private void Start() @@ -57,7 +79,8 @@ namespace BlueWaterProject #region interface property and function [field: SerializeField] public AiStat AiStat { get; set; } = new(); - + public float GetCurrentHp() => AiStat.currentHp; + public void TakeDamage(AiStat attacker, AiStat defender) { // 회피 성공 체크 diff --git a/BlueWater/Assets/02.Scripts/Ai/AiMover.cs b/BlueWater/Assets/02.Scripts/Ai/AiMover.cs index 4ef72d6fc..27573329d 100644 --- a/BlueWater/Assets/02.Scripts/Ai/AiMover.cs +++ b/BlueWater/Assets/02.Scripts/Ai/AiMover.cs @@ -43,9 +43,9 @@ namespace BlueWaterProject } else { - if (!GetTarget() || moveType is MoveType.NONE or MoveType.FIXED) return; + if (!GetTargetInfo().transform || moveType is MoveType.NONE or MoveType.FIXED) return; - GetNavMeshAgent().SetDestination(GetTarget().position); + GetNavMeshAgent().SetDestination(GetTargetInfo().transform.position); } } @@ -54,7 +54,7 @@ namespace BlueWaterProject #region Custom function public bool GetIsCommanded() => isCommanded; - private Transform GetTarget() => aiController.GetFieldOfView().GetTargetTransform(); + private TargetInfo GetTargetInfo() => aiController.GetFieldOfView().GetTargetInfo(); private NavMeshAgent GetNavMeshAgent() => aiController.GetNavMeshAgent(); #endregion diff --git a/BlueWater/Assets/02.Scripts/Ai/FieldOfView.cs b/BlueWater/Assets/02.Scripts/Ai/FieldOfView.cs index 396816c5f..3ac0a7f44 100644 --- a/BlueWater/Assets/02.Scripts/Ai/FieldOfView.cs +++ b/BlueWater/Assets/02.Scripts/Ai/FieldOfView.cs @@ -4,6 +4,42 @@ using UnityEngine; // ReSharper disable once CheckNamespace namespace BlueWaterProject { + [Serializable] + public class TargetInfo + { + public Transform transform; + public Collider collider; + public IAiStat iAiStat; + + public TargetInfo() + { + transform = null; + collider = null; + iAiStat = null; + } + + public TargetInfo(Transform transform, Collider collider, IAiStat iAiStat) + { + this.transform = transform; + this.collider = collider; + this.iAiStat = iAiStat; + } + + public void SetTargetInfo(Transform targetTransform, Collider collider, IAiStat targetIAiStat) + { + transform = targetTransform; + this.collider = collider; + iAiStat = targetIAiStat; + } + + public void DefaultSetting() + { + transform = null; + collider = null; + iAiStat = null; + } + } + public class FieldOfView : MonoBehaviour { #region Property and variable @@ -23,8 +59,11 @@ namespace BlueWaterProject [Header("시야 내 타겟 정보")] [SerializeField] private Collider[] colliderWithinRange = new Collider[TARGET_MAX_SIZE]; - [SerializeField] private Transform targetTransform; + [SerializeField] private TargetInfo targetInfo = new(); + private Collider targetCollider; + private IAiStat iAiStat; + private const int TARGET_MAX_SIZE = 20; #endregion @@ -41,9 +80,9 @@ namespace BlueWaterProject Gizmos.color = Color.green; Gizmos.DrawWireSphere(myPos, viewRadius); - if (targetTransform == null) return; + if (targetInfo.transform == null) return; - Debug.DrawLine(myPos, targetTransform.position, Color.red); + Debug.DrawLine(myPos, targetInfo.transform.position, Color.red); } #endif @@ -57,12 +96,25 @@ namespace BlueWaterProject if (maxColliderCount <= 0) { - targetTransform = null; + targetInfo.DefaultSetting(); return; } + + iAiStat = colliderWithinRange[0].GetComponent(); - var nearestDistance = Vector3.Distance(colliderWithinRange[0].transform.position, myPos); - var nearestTargetTransform = colliderWithinRange[0].transform; + float nearestDistance; + Transform nearestTargetTransform; + + if (iAiStat.GetCurrentHp() <= 0) + { + nearestDistance = float.PositiveInfinity; + nearestTargetTransform = null; + } + else + { + nearestDistance = Vector3.Distance(colliderWithinRange[0].transform.position, myPos); + nearestTargetTransform = colliderWithinRange[0].transform; + } for (var i = 1; i < maxColliderCount; i++) { @@ -70,17 +122,28 @@ namespace BlueWaterProject if (nearestDistance < distance) continue; + iAiStat = colliderWithinRange[i].GetComponent(); + + if (iAiStat.GetCurrentHp() <= 0) continue; + nearestDistance = distance; nearestTargetTransform = colliderWithinRange[i].transform; } - targetTransform = nearestTargetTransform; - - if (!targetTransform) return; - - var targetPos = targetTransform.position; - targetPos.y = transform.position.y; - transform.LookAt(targetPos); + if (nearestTargetTransform) + { + targetCollider = nearestTargetTransform.GetComponent(); + iAiStat = nearestTargetTransform.GetComponent(); + targetInfo.SetTargetInfo(nearestTargetTransform, targetCollider, iAiStat); + + var targetPos = targetInfo.transform.position; + targetPos.y = transform.position.y; + transform.LookAt(targetPos); + } + else + { + targetInfo.DefaultSetting(); + } } #endregion @@ -88,7 +151,7 @@ namespace BlueWaterProject #region Custom Function public int GetTargetLayer() => targetLayer; - public Transform GetTargetTransform() => targetTransform; + public TargetInfo GetTargetInfo() => targetInfo; #endregion } diff --git a/BlueWater/Assets/02.Scripts/Ai/Type/Archer.cs b/BlueWater/Assets/02.Scripts/Ai/Type/Archer.cs index 2cc728bfb..d466b0011 100644 --- a/BlueWater/Assets/02.Scripts/Ai/Type/Archer.cs +++ b/BlueWater/Assets/02.Scripts/Ai/Type/Archer.cs @@ -24,6 +24,10 @@ namespace BlueWaterProject [Tooltip("화살 발사 후 오브젝트 저장될 위치")] [SerializeField] private Transform arrowsPoolLocation; + + [Tooltip("화살이 타겟에 도달하는 오차 범위(부정확함)")] + [Range(0f, 2f)] + [SerializeField] private float inaccuracy; private IEnumerator shootArrowCoroutine; @@ -36,13 +40,11 @@ namespace BlueWaterProject protected override void Awake() { base.Awake(); - - shootArrowTime = AiStat.atkCooldown; - + shootLocation = Utils.GetComponentAndAssert(transform. Find("Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 L Clavicle/Bip001 L UpperArm/Bip001 L Forearm/Bip001 L Hand/L_hand_container")); arrowsPoolLocation = GameObject.Find("ObjectPoolManager/Arrows").transform; - arrowPool = new ObjectPool(CreateArrow, OnGetBullet, OnReleaseBullet, OnDestroyBullet, maxSize:arrowMaxSize); + arrowPool = new ObjectPool(CreateArrow, OnGetArrow, OnReleaseArrow, OnDestroyArrow, maxSize:arrowMaxSize); } #endregion @@ -61,13 +63,12 @@ namespace BlueWaterProject } else { - if (shootArrowCoroutine != null || !fieldOfView.GetTargetTransform() || - AiStat.atkRange < Vector3.Distance(transform.position, fieldOfView.GetTargetTransform().position)) return; + if (shootArrowCoroutine != null || !fieldOfView.GetTargetInfo().transform || + AiStat.atkRange < Vector3.Distance(transform.position, fieldOfView.GetTargetInfo().transform.position)) return; isAttacking = true; shootArrowCoroutine = ShootArrowAnimation(); StartCoroutine(shootArrowCoroutine); - print("1"); } } @@ -75,14 +76,18 @@ namespace BlueWaterProject { while (true) { + if (!fieldOfView.GetTargetInfo().transform) yield break; + aiAnimator.SetTrigger(AttackHash); - print(shootArrowTime + "초 대기"); yield return new WaitForSeconds(shootArrowTime); + if (!fieldOfView.GetTargetInfo().transform) yield break; + var arrow = arrowPool.Get(); - arrow.SetShootingArrow(fieldOfView.GetTargetTransform().position, AiStat, fieldOfView.GetTargetLayer()); + arrow.SetShootingArrow(shootLocation.position, + fieldOfView.GetTargetInfo().collider.bounds.center, AiStat, attackerType, inaccuracy); StartCoroutine(arrow.Shoot()); - print("2"); + yield return new WaitForSeconds(AiStat.atkCooldown); } } @@ -97,9 +102,9 @@ namespace BlueWaterProject return arrow; } - private void OnGetBullet(Arrow arrow) => arrow.gameObject.SetActive(true); - private void OnReleaseBullet(Arrow arrow) => arrow.gameObject.SetActive(false); - private void OnDestroyBullet(Arrow arrow) => Destroy(arrow.gameObject); + private void OnGetArrow(Arrow arrow) => arrow.gameObject.SetActive(true); + private void OnReleaseArrow(Arrow arrow) => arrow.ReleaseArrowSetting(); + private void OnDestroyArrow(Arrow arrow) => Destroy(arrow.gameObject); #endregion } diff --git a/BlueWater/Assets/02.Scripts/Arrow.cs b/BlueWater/Assets/02.Scripts/Arrow.cs index fd0d33d14..fe95b5de5 100644 --- a/BlueWater/Assets/02.Scripts/Arrow.cs +++ b/BlueWater/Assets/02.Scripts/Arrow.cs @@ -1,7 +1,7 @@ +using System; using System.Collections; using UnityEngine; using UnityEngine.Pool; -using Random = UnityEngine.Random; // ReSharper disable once CheckNamespace namespace BlueWaterProject @@ -10,22 +10,22 @@ namespace BlueWaterProject { #region Property and variable - [Tooltip("화살 발사 시작할 때의 속도")] - [SerializeField] private float initialVelocity; - - [Tooltip("화살이 타겟에 도달하는 오차 범위(부정확함)")] - [Range(0f, 1f)] - [SerializeField] private float inaccuracy; - [Tooltip("발사 이후 자동으로 사라지는데 까지 걸리는 시간")] [Range(0f, 10f)] [SerializeField] private float autoDestroyTime; + [Tooltip("화살이 날아가는 속도")] + [SerializeField] private float arrowSpeed = 15f; + + private float g = Mathf.Abs(Physics.gravity.y); private Vector3 targetPos; + private AttackerType attackerType; + private float inaccuracy; + + private Transform attackerTransform; private AiStat attackerStat; - private LayerMask targetLayer; - private IObjectPool managedArrowPool; private Rigidbody arrowRigidbody; + private IObjectPool managedArrowPool; #endregion @@ -38,11 +38,45 @@ namespace BlueWaterProject private void OnTriggerEnter(Collider other) { - if (other.gameObject.layer != targetLayer) return; + print(other.gameObject.name); + if (other.gameObject.layer == LayerMask.NameToLayer("Ground") || + other.gameObject.layer == LayerMask.NameToLayer("Water")) + { + DestroyObject(); + } + else if (other.gameObject.layer == LayerMask.NameToLayer("HitBox")) + { + switch (attackerType) + { + case AttackerType.NONE: + break; + case AttackerType.PLAYER: + if (!other.gameObject.CompareTag("Enemy")) + { + return; + } + break; + case AttackerType.PIRATE: + if (!other.gameObject.CompareTag("Enemy")) + { + return; + } + break; + case AttackerType.ENEMY: + if (!other.gameObject.CompareTag("Player") || !other.gameObject.CompareTag("Pirate")) + { + return; + } + break; + default: + throw new ArgumentOutOfRangeException(); + } + var iDamageable = other.transform.parent.GetComponent(); + print(iDamageable); - var iDamageable = other.GetComponent(); - - iDamageable.TakeDamage(attackerStat, iDamageable.AiStat); + iDamageable.TakeDamage(attackerStat, iDamageable.AiStat); + DestroyObject(); + } } #endregion @@ -51,58 +85,53 @@ namespace BlueWaterProject public IEnumerator Shoot() { - // TODO : 화살 발사 기능 구현 var time = 0f; + var inaccuracyOffset = new Vector3( + UnityEngine.Random.Range(-inaccuracy, inaccuracy), + UnityEngine.Random.Range(-inaccuracy, inaccuracy), + UnityEngine.Random.Range(-inaccuracy, inaccuracy) + ); + var inaccurateTargetPos = targetPos + inaccuracyOffset; + transform.rotation = Quaternion.LookRotation(inaccurateTargetPos); + transform.rotation *= Quaternion.Euler(0f, -90f, 0f); + + while (time < autoDestroyTime) { - time += Time.deltaTime; - - var toTarget = targetPos - transform.position; - var angle = CalcLaunchAngle(toTarget); - - angle += Random.Range(-inaccuracy, inaccuracy); + var myPos = transform.position; + var toTargetFlat = new Vector3(inaccurateTargetPos.x - myPos.x, 0, inaccurateTargetPos.z - myPos.z); + var horizontalDistance = toTargetFlat.magnitude; + var timeToTarget = horizontalDistance / arrowSpeed; - var velocity = Quaternion.Euler(0, 0, angle) * Vector3.right * initialVelocity; - - arrowRigidbody.velocity = velocity; + var yOffset = targetPos.y - myPos.y; + + var initialVerticalSpeed = (yOffset + (0.5f * g * timeToTarget * timeToTarget)) / timeToTarget; + var launchVelocity = toTargetFlat.normalized * arrowSpeed + Vector3.up * initialVerticalSpeed; + arrowRigidbody.velocity = launchVelocity; + + transform.rotation = Quaternion.LookRotation(arrowRigidbody.velocity); + transform.rotation *= Quaternion.Euler(0f, -90f, 0f); + + yield return null; } - DestroyObject(); - } - - private float CalcLaunchAngle(Vector3 toTarget) - { - var distance = Vector3.Distance(toTarget, Vector3.zero); - var heightDifference = toTarget.y; - - var gravity = Physics.gravity.magnitude; - var velocitySqr = initialVelocity * initialVelocity; - var underSqrt = (velocitySqr * velocitySqr) - (gravity * ((gravity * distance * distance) + (2 * heightDifference * velocitySqr))); - - if (underSqrt >= 0) + if (gameObject.activeSelf) { - var angle1 = Mathf.Atan((velocitySqr + Mathf.Sqrt(underSqrt)) / (gravity * distance)); - var angle2 = Mathf.Atan((velocitySqr - Mathf.Sqrt(underSqrt)) / (gravity * distance)); - - return Mathf.Min(angle1, angle2) * Mathf.Rad2Deg; - } - else - { - return 45f; + DestroyObject(); } } - public void SetShootingArrow(Vector3 targetPosition, AiStat attacker, int targetLayerMask) + public void SetShootingArrow(Vector3 shootPos, Vector3 targetPosition, AiStat attackerAiStat, AttackerType type, float inaccuracyValue) { + transform.position = shootPos; targetPos = targetPosition; - attackerStat = attacker; - targetLayer = targetLayerMask; + attackerStat = attackerAiStat; + attackerType = type; + inaccuracy = inaccuracyValue; } - //public void SetAiStat(AiStat attacker) => attackerStat = attacker; - //public void SetTargetLayer(int targetLayerMask) => targetLayer = targetLayerMask; #endregion @@ -114,5 +143,17 @@ namespace BlueWaterProject public void SetManagedPool(IObjectPool pool) => managedArrowPool = pool; #endregion + + #region Custom function + + public void ReleaseArrowSetting() + { + StopAllCoroutines(); + gameObject.SetActive(false); + arrowRigidbody.velocity = Vector3.zero; + arrowRigidbody.angularVelocity = Vector3.zero; + } + + #endregion } } \ No newline at end of file diff --git a/BlueWater/Assets/02.Scripts/Interface/IAiStat.cs b/BlueWater/Assets/02.Scripts/Interface/IAiStat.cs index 265cde5fa..bde2e4e4b 100644 --- a/BlueWater/Assets/02.Scripts/Interface/IAiStat.cs +++ b/BlueWater/Assets/02.Scripts/Interface/IAiStat.cs @@ -4,5 +4,6 @@ namespace BlueWaterProject public interface IAiStat : IAiBase { public AiStat AiStat { get; set; } + public float GetCurrentHp(); } } diff --git a/BlueWater/Assets/05.Prefabs/Arrow_01.prefab b/BlueWater/Assets/05.Prefabs/Arrow_01.prefab index 81e3d0bc9..a18ef849f 100644 --- a/BlueWater/Assets/05.Prefabs/Arrow_01.prefab +++ b/BlueWater/Assets/05.Prefabs/Arrow_01.prefab @@ -146,6 +146,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b92a5d3b88920fb49a3f6cbb978d4256, type: 3} m_Name: m_EditorClassIdentifier: - initialVelocity: 10 inaccuracy: 0.2 autoDestroyTime: 5 + targetLayer: + serializedVersion: 2 + m_Bits: 0 + arrowSpeed: 15 diff --git a/BlueWater/Assets/05.Prefabs/Character/Enemy/Archer_E.prefab b/BlueWater/Assets/05.Prefabs/Character/Enemy/Archer_E.prefab index 294113fdf..883802055 100644 --- a/BlueWater/Assets/05.Prefabs/Character/Enemy/Archer_E.prefab +++ b/BlueWater/Assets/05.Prefabs/Character/Enemy/Archer_E.prefab @@ -9062,7 +9062,9 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} - {fileID: 0} - targetTransform: {fileID: 0} + targetInfo: + transform: {fileID: 0} + collider: {fileID: 0} --- !u!114 &7718871607120422351 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9103,9 +9105,10 @@ MonoBehaviour: arrowPrefab: {fileID: 3190292116200820221, guid: 09f461c60481dea4b975222675a2682f, type: 3} arrowMaxSize: 100 - shootArrowTime: 0.2 - shootLocation: {fileID: 0} + shootArrowTime: 0.45 + shootLocation: {fileID: 461634} arrowsPoolLocation: {fileID: 0} + inaccuracy: 1.5 --- !u!1 &156456 GameObject: m_ObjectHideFlags: 0 @@ -19358,7 +19361,7 @@ GameObject: - component: {fileID: 8182090084654357926} m_Layer: 12 m_Name: HitBox - m_TagString: Untagged + m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/BlueWater/Assets/05.Prefabs/Character/Enemy/SpearKight_E.prefab b/BlueWater/Assets/05.Prefabs/Character/Enemy/SpearKight_E.prefab index f285c2659..9a678ecea 100644 --- a/BlueWater/Assets/05.Prefabs/Character/Enemy/SpearKight_E.prefab +++ b/BlueWater/Assets/05.Prefabs/Character/Enemy/SpearKight_E.prefab @@ -19352,7 +19352,7 @@ GameObject: - component: {fileID: 5959726075807422171} m_Layer: 12 m_Name: HitBox - m_TagString: Untagged + m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/BlueWater/Assets/05.Prefabs/Character/Enemy/Spearman_E.prefab b/BlueWater/Assets/05.Prefabs/Character/Enemy/Spearman_E.prefab index 8c3ed0ca0..f1fe49265 100644 --- a/BlueWater/Assets/05.Prefabs/Character/Enemy/Spearman_E.prefab +++ b/BlueWater/Assets/05.Prefabs/Character/Enemy/Spearman_E.prefab @@ -18820,7 +18820,7 @@ GameObject: - component: {fileID: 3275332057743206174} m_Layer: 12 m_Name: HitBox - m_TagString: Untagged + m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/BlueWater/Assets/05.Prefabs/Character/Enemy/SwordKnight_E.prefab b/BlueWater/Assets/05.Prefabs/Character/Enemy/SwordKnight_E.prefab index 0862081c9..a31501b63 100644 --- a/BlueWater/Assets/05.Prefabs/Character/Enemy/SwordKnight_E.prefab +++ b/BlueWater/Assets/05.Prefabs/Character/Enemy/SwordKnight_E.prefab @@ -18520,7 +18520,7 @@ GameObject: - component: {fileID: 5295021211657267008} m_Layer: 12 m_Name: HitBox - m_TagString: Untagged + m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/BlueWater/Assets/05.Prefabs/Character/Enemy/Swordman_E.prefab b/BlueWater/Assets/05.Prefabs/Character/Enemy/Swordman_E.prefab index 0c7064895..8cf60ea46 100644 --- a/BlueWater/Assets/05.Prefabs/Character/Enemy/Swordman_E.prefab +++ b/BlueWater/Assets/05.Prefabs/Character/Enemy/Swordman_E.prefab @@ -8847,7 +8847,7 @@ GameObject: - component: {fileID: 1001412064052513076} m_Layer: 10 m_Name: Swordman_E - m_TagString: Untagged + m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/BlueWater/Assets/05.Prefabs/Character/Pirate/Archer_P.prefab b/BlueWater/Assets/05.Prefabs/Character/Pirate/Archer_P.prefab index 259887f52..28220086e 100644 --- a/BlueWater/Assets/05.Prefabs/Character/Pirate/Archer_P.prefab +++ b/BlueWater/Assets/05.Prefabs/Character/Pirate/Archer_P.prefab @@ -9062,7 +9062,9 @@ MonoBehaviour: - {fileID: 0} - {fileID: 0} - {fileID: 0} - targetTransform: {fileID: 0} + targetInfo: + transform: {fileID: 0} + collider: {fileID: 0} --- !u!114 &-4856147847642951458 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9103,9 +9105,10 @@ MonoBehaviour: arrowPrefab: {fileID: 3190292116200820221, guid: 09f461c60481dea4b975222675a2682f, type: 3} arrowMaxSize: 100 - shootArrowTime: 0.2 - shootLocation: {fileID: 0} + shootArrowTime: 0.45 + shootLocation: {fileID: 449662} arrowsPoolLocation: {fileID: 0} + inaccuracy: 1.5 --- !u!1 &156456 GameObject: m_ObjectHideFlags: 0 @@ -19358,7 +19361,7 @@ GameObject: - component: {fileID: 1931168354309611384} m_Layer: 12 m_Name: HitBox - m_TagString: Untagged + m_TagString: Pirate m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/BlueWater/Assets/05.Prefabs/Character/Pirate/Axeman_P.prefab b/BlueWater/Assets/05.Prefabs/Character/Pirate/Axeman_P.prefab index f66b76dd3..2a2ee9606 100644 --- a/BlueWater/Assets/05.Prefabs/Character/Pirate/Axeman_P.prefab +++ b/BlueWater/Assets/05.Prefabs/Character/Pirate/Axeman_P.prefab @@ -18520,7 +18520,7 @@ GameObject: - component: {fileID: 5546785881875289881} m_Layer: 12 m_Name: HitBox - m_TagString: Untagged + m_TagString: Pirate m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/BlueWater/Assets/05.Prefabs/Character/Pirate/Spearman_P.prefab b/BlueWater/Assets/05.Prefabs/Character/Pirate/Spearman_P.prefab index c244ff003..ada1e700d 100644 --- a/BlueWater/Assets/05.Prefabs/Character/Pirate/Spearman_P.prefab +++ b/BlueWater/Assets/05.Prefabs/Character/Pirate/Spearman_P.prefab @@ -17889,7 +17889,7 @@ GameObject: - component: {fileID: 5714371243005721170} m_Layer: 12 m_Name: HitBox - m_TagString: Untagged + m_TagString: Pirate m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/BlueWater/Assets/05.Prefabs/Character/Pirate/SwordKnight_P.prefab b/BlueWater/Assets/05.Prefabs/Character/Pirate/SwordKnight_P.prefab index 78714639b..08cdf0584 100644 --- a/BlueWater/Assets/05.Prefabs/Character/Pirate/SwordKnight_P.prefab +++ b/BlueWater/Assets/05.Prefabs/Character/Pirate/SwordKnight_P.prefab @@ -18820,7 +18820,7 @@ GameObject: - component: {fileID: 2829027457767136232} m_Layer: 12 m_Name: HitBox - m_TagString: Untagged + m_TagString: Pirate m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/BlueWater/Assets/05.Prefabs/Character/Pirate/Swordman_P.prefab b/BlueWater/Assets/05.Prefabs/Character/Pirate/Swordman_P.prefab index 9db1dd3a3..88b5c4ba6 100644 --- a/BlueWater/Assets/05.Prefabs/Character/Pirate/Swordman_P.prefab +++ b/BlueWater/Assets/05.Prefabs/Character/Pirate/Swordman_P.prefab @@ -18720,7 +18720,7 @@ GameObject: - component: {fileID: 6546119915803687715} m_Layer: 12 m_Name: HitBox - m_TagString: Untagged + m_TagString: Pirate m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/BlueWater/Assets/FlatKit/[Render Pipeline] Built-In.unitypackage.meta b/BlueWater/Assets/FlatKit/[Render Pipeline] Built-In.unitypackage.meta deleted file mode 100644 index be555027e..000000000 --- a/BlueWater/Assets/FlatKit/[Render Pipeline] Built-In.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: f4227764308e84f89a765fbf315e2945 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/FlatKit/[Render Pipeline] Universal (URP).unitypackage.meta b/BlueWater/Assets/FlatKit/[Render Pipeline] Universal (URP).unitypackage.meta deleted file mode 100644 index 350ee4c64..000000000 --- a/BlueWater/Assets/FlatKit/[Render Pipeline] Universal (URP).unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 41e59f562b69648719f2424c438758f3 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-BuiltInRP-UModeler.unitypackage.meta b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-BuiltInRP-UModeler.unitypackage.meta deleted file mode 100644 index d7e559c52..000000000 --- a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-BuiltInRP-UModeler.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: b044a2387a61dac41bdf204adffdce9d -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP-UModeler.unitypackage.meta b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP-UModeler.unitypackage.meta deleted file mode 100644 index 8ac8bbf10..000000000 --- a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP-UModeler.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: cd287c84e887ea24a8679e67aac7c074 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP.unitypackage.meta b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP.unitypackage.meta deleted file mode 100644 index 589ee74d0..000000000 --- a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-HDRP.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 5f3f53ee059b45a4d9a5b9fc75e8aea9 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP-UModeler.unitypackage.meta b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP-UModeler.unitypackage.meta deleted file mode 100644 index e22c323d5..000000000 --- a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP-UModeler.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: f211254f5bfad224ba88868f2c75432c -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP.unitypackage.meta b/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP.unitypackage.meta deleted file mode 100644 index ea9dafacc..000000000 --- a/BlueWater/Assets/LostTemple-BuiltInRP/UnityPackages/LostTemple-URP.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 4368c9be31b3c174dbfd80f2caf98889 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta b/BlueWater/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta deleted file mode 100644 index 1eadf09a3..000000000 --- a/BlueWater/Assets/Plugins/Sirenix/Demos/Custom Attribute Processors.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: f597f19f656ba56eae4f6a3a7cc528f4 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta b/BlueWater/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta deleted file mode 100644 index f073d2ab4..000000000 --- a/BlueWater/Assets/Plugins/Sirenix/Demos/Custom Drawers.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 48e08dc33330d11e9d4a1b246c52e4f6 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta b/BlueWater/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta deleted file mode 100644 index 130722af7..000000000 --- a/BlueWater/Assets/Plugins/Sirenix/Demos/Editor Windows.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: ed09910c0094cb27be8f3ca264680da3 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta b/BlueWater/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta deleted file mode 100644 index f9b8ed82b..000000000 --- a/BlueWater/Assets/Plugins/Sirenix/Demos/Sample - RPG Editor.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: cc355dd4cf1e6173beaeb22c2858cbe1 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/ProjectSettings/DynamicsManager.asset b/BlueWater/ProjectSettings/DynamicsManager.asset index 448c18ee8..2910632a9 100644 --- a/BlueWater/ProjectSettings/DynamicsManager.asset +++ b/BlueWater/ProjectSettings/DynamicsManager.asset @@ -18,7 +18,7 @@ PhysicsManager: m_ClothInterCollisionDistance: 0.1 m_ClothInterCollisionStiffness: 0.2 m_ContactsGeneration: 1 - m_LayerCollisionMatrix: 0000000000000000000000000007000000000000000000000000000000000000080700000807000008070000001000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_LayerCollisionMatrix: 000000000000000000000000000f000000080000000000000000000000000000080700000807000008070000181000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 m_SimulationMode: 0 m_AutoSyncTransforms: 0 m_ReuseCollisionCallbacks: 0 diff --git a/BlueWater/ProjectSettings/TagManager.asset b/BlueWater/ProjectSettings/TagManager.asset index 019282ed2..bdce17464 100644 --- a/BlueWater/ProjectSettings/TagManager.asset +++ b/BlueWater/ProjectSettings/TagManager.asset @@ -6,6 +6,9 @@ TagManager: tags: - Ship - Ground + - Stair + - Enemy + - Pirate layers: - Default - TransparentFX