diff --git a/.idea/.idea.HALLUCINATE/.idea/workspace.xml b/.idea/.idea.HALLUCINATE/.idea/workspace.xml index 5a086632..6cb15fd2 100644 --- a/.idea/.idea.HALLUCINATE/.idea/workspace.xml +++ b/.idea/.idea.HALLUCINATE/.idea/workspace.xml @@ -6,34 +6,8 @@ - - - + - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Assets/Prefabs/Shooter/Weapon/_weapons_WITH_Inventory/_collectables/vCollectableHandgun.prefab b/Assets/Prefabs/Shooter/Weapon/_weapons_WITH_Inventory/_collectables/vCollectableHandgun.prefab index b17e7b8b..eab8329d 100644 --- a/Assets/Prefabs/Shooter/Weapon/_weapons_WITH_Inventory/_collectables/vCollectableHandgun.prefab +++ b/Assets/Prefabs/Shooter/Weapon/_weapons_WITH_Inventory/_collectables/vCollectableHandgun.prefab @@ -31,7 +31,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22430624} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -101,13 +100,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 117034} + serializedVersion: 2 m_LocalRotation: {x: -0.2588187, y: 0, z: 0, w: 0.96592593} m_LocalPosition: {x: -0.0133, y: 0.5573, z: -0.0121} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 405752} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3352832 MeshFilter: @@ -134,6 +133,11 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -156,9 +160,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &125278 GameObject: @@ -194,7 +200,6 @@ RectTransform: m_Children: - {fileID: 22430624} m_Father: {fileID: 405752} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -218,7 +223,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -310,7 +317,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22430624} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -390,7 +396,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 22430624} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -470,7 +475,6 @@ RectTransform: - {fileID: 22490896} - {fileID: 22451678} m_Father: {fileID: 22475414} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -611,6 +615,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 199660} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.39214686, y: 0.2389014, z: -20.878284} m_LocalScale: {x: 1, y: 1, z: 1} @@ -619,7 +624,6 @@ Transform: - {fileID: 463598} - {fileID: 22475414} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!136 &13694850 CapsuleCollider: @@ -629,8 +633,17 @@ CapsuleCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 199660} 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: 2 m_Radius: 0.35 m_Height: 1.08 m_Direction: 1 @@ -648,7 +661,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: openCloseEvents: 0 - openCloseWindow: 0 + openCloseWindow: 1 selectedToolbar: 0 inputType: 0 actionInput: @@ -867,11 +880,15 @@ MonoBehaviour: name: amount: 1 attributes: - - name: 0 - value: 1 + - name: 2 + value: 36 isOpen: 0 isBool: 0 - changeAttributes: 0 + - name: 6 + value: 8 + isOpen: 0 + isBool: 0 + changeAttributes: 1 autoEquip: 1 addToEquipArea: 1 indexArea: 0 diff --git a/Assets/Presets/vShooterMelee_ItemListData.asset b/Assets/Presets/vShooterMelee_ItemListData.asset index cae72d2c..31109560 100644 --- a/Assets/Presets/vShooterMelee_ItemListData.asset +++ b/Assets/Presets/vShooterMelee_ItemListData.asset @@ -12,12 +12,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1adabc1ae49fd3c44a36cc9152ebb0f9, type: 3} m_Name: Fragment Grenade m_EditorClassIdentifier: - itemsToCraft: - - item: {fileID: 0} - amount: 3 - - item: {fileID: 0} - amount: 1 - price: 0 id: 26 description: Fragment Grenade type: 0 @@ -27,8 +21,7 @@ MonoBehaviour: maxStack: 6 amount: 0 originalObject: {fileID: 170736, guid: c221411e499bdd94f90413254abf7860, type: 3} - dropObject: {fileID: 4018256157275831458, guid: a04c9098c7a452447912f6c5069bd095, - type: 3} + dropObject: {fileID: 4018256157275831458, guid: a04c9098c7a452447912f6c5069bd095, type: 3} attributes: [] isInEquipArea: 0 isEquiped: 0 @@ -58,12 +51,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1adabc1ae49fd3c44a36cc9152ebb0f9, type: 3} m_Name: Molotov m_EditorClassIdentifier: - itemsToCraft: - - item: {fileID: 0} - amount: 3 - - item: {fileID: 0} - amount: 1 - price: 0 id: 27 description: Molotov type: 0 @@ -72,10 +59,8 @@ MonoBehaviour: createNewItem: 1 maxStack: 6 amount: 0 - originalObject: {fileID: 4687494058105681854, guid: 356e6f81e6f18534ba6b80a6d008642a, - type: 3} - dropObject: {fileID: 4018256157275831458, guid: c37d3b92b2a9da3468bc2a821919c0ca, - type: 3} + originalObject: {fileID: 4687494058105681854, guid: 356e6f81e6f18534ba6b80a6d008642a, type: 3} + dropObject: {fileID: 4018256157275831458, guid: c37d3b92b2a9da3468bc2a821919c0ca, type: 3} attributes: [] isInEquipArea: 0 isEquiped: 0 @@ -150,8 +135,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1adabc1ae49fd3c44a36cc9152ebb0f9, type: 3} m_Name: Sniper Ammo m_EditorClassIdentifier: - itemsToCraft: [] - price: 0 id: 19 description: type: 3 @@ -191,8 +174,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1adabc1ae49fd3c44a36cc9152ebb0f9, type: 3} m_Name: RPG Ammo m_EditorClassIdentifier: - itemsToCraft: [] - price: 0 id: 18 description: type: 3 @@ -232,8 +213,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1adabc1ae49fd3c44a36cc9152ebb0f9, type: 3} m_Name: Handgun Ammo m_EditorClassIdentifier: - itemsToCraft: [] - price: 0 id: 14 description: type: 3 @@ -273,8 +252,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1adabc1ae49fd3c44a36cc9152ebb0f9, type: 3} m_Name: RPG m_EditorClassIdentifier: - itemsToCraft: [] - price: 0 id: 16 description: Very destructive type: 2 @@ -322,8 +299,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1adabc1ae49fd3c44a36cc9152ebb0f9, type: 3} m_Name: Sniper m_EditorClassIdentifier: - itemsToCraft: [] - price: 0 id: 15 description: Attached with a scope type: 2 @@ -371,8 +346,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1adabc1ae49fd3c44a36cc9152ebb0f9, type: 3} m_Name: Shotgun Shells m_EditorClassIdentifier: - itemsToCraft: [] - price: 0 id: 17 description: Shotgun Ammo type: 3 @@ -412,8 +385,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1adabc1ae49fd3c44a36cc9152ebb0f9, type: 3} m_Name: Shotgun m_EditorClassIdentifier: - itemsToCraft: [] - price: 0 id: 12 description: Tactical Shotgun type: 2 @@ -461,8 +432,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1adabc1ae49fd3c44a36cc9152ebb0f9, type: 3} m_Name: Rifle Ammo m_EditorClassIdentifier: - itemsToCraft: [] - price: 0 id: 13 description: type: 3 @@ -502,8 +471,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1adabc1ae49fd3c44a36cc9152ebb0f9, type: 3} m_Name: Great Shield m_EditorClassIdentifier: - itemsToCraft: [] - price: 0 id: 9 description: 'Great Shield @@ -516,10 +483,8 @@ MonoBehaviour: createNewItem: 1 maxStack: 1 amount: 0 - originalObject: {fileID: 1000012874595254, guid: d4ca9135af96d5142987a1f1427b099a, - type: 3} - dropObject: {fileID: 8587624101741613191, guid: e26f928aabf2af048b7def78ec83a486, - type: 3} + originalObject: {fileID: 1000012874595254, guid: d4ca9135af96d5142987a1f1427b099a, type: 3} + dropObject: {fileID: 8587624101741613191, guid: e26f928aabf2af048b7def78ec83a486, type: 3} attributes: - name: 3 value: 0 @@ -561,8 +526,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1adabc1ae49fd3c44a36cc9152ebb0f9, type: 3} m_Name: Short Katana m_EditorClassIdentifier: - itemsToCraft: [] - price: 0 id: 1 description: Melee Weapon type: 1 @@ -571,10 +534,8 @@ MonoBehaviour: createNewItem: 1 maxStack: 1 amount: 0 - originalObject: {fileID: 1000011247033104, guid: 43ec053b9c111644e80b4ddb5f535508, - type: 3} - dropObject: {fileID: 3314097323225006234, guid: 0f2c84cd3287333448744ce0451196cd, - type: 3} + originalObject: {fileID: 1000011247033104, guid: 43ec053b9c111644e80b4ddb5f535508, type: 3} + dropObject: {fileID: 3314097323225006234, guid: 0f2c84cd3287333448744ce0451196cd, type: 3} attributes: - name: 2 value: 25 @@ -620,8 +581,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1adabc1ae49fd3c44a36cc9152ebb0f9, type: 3} m_Name: Great Sword m_EditorClassIdentifier: - itemsToCraft: [] - price: 0 id: 7 description: Melee Weapon type: 1 @@ -630,10 +589,8 @@ MonoBehaviour: createNewItem: 1 maxStack: 1 amount: 0 - originalObject: {fileID: 1000014209087140, guid: d03b45803e637bb4fb00a1ca9030d66e, - type: 3} - dropObject: {fileID: 4500584118820961459, guid: eca1e51be6676704dbb7f23b4947883b, - type: 3} + originalObject: {fileID: 1000014209087140, guid: d03b45803e637bb4fb00a1ca9030d66e, type: 3} + dropObject: {fileID: 4500584118820961459, guid: eca1e51be6676704dbb7f23b4947883b, type: 3} attributes: - name: 2 value: 30 @@ -679,8 +636,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1adabc1ae49fd3c44a36cc9152ebb0f9, type: 3} m_Name: Great Katana m_EditorClassIdentifier: - itemsToCraft: [] - price: 0 id: 8 description: Melee Weapon type: 1 @@ -689,10 +644,8 @@ MonoBehaviour: createNewItem: 1 maxStack: 1 amount: 0 - originalObject: {fileID: 1000013423493360, guid: 6bbee781522ce5243a02bf72cd914cf5, - type: 3} - dropObject: {fileID: 2197774501603174495, guid: 7dcfb29ec0c968041b99dd41d13cec28, - type: 3} + originalObject: {fileID: 1000013423493360, guid: 6bbee781522ce5243a02bf72cd914cf5, type: 3} + dropObject: {fileID: 2197774501603174495, guid: 7dcfb29ec0c968041b99dd41d13cec28, type: 3} attributes: - name: 2 value: 25 @@ -738,8 +691,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1adabc1ae49fd3c44a36cc9152ebb0f9, type: 3} m_Name: Assault Rifle m_EditorClassIdentifier: - itemsToCraft: [] - price: 0 id: 11 description: Attached with a Scope type: 2 @@ -795,8 +746,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1adabc1ae49fd3c44a36cc9152ebb0f9, type: 3} m_Name: Small Shield m_EditorClassIdentifier: - itemsToCraft: [] - price: 0 id: 6 description: 'Small Shield @@ -807,10 +756,8 @@ MonoBehaviour: createNewItem: 1 maxStack: 1 amount: 0 - originalObject: {fileID: 1000010116632662, guid: 2232bbcc5a195274c9744c2c6352e910, - type: 3} - dropObject: {fileID: 862192267840601332, guid: d07ef1bfe3f5bf4469394a9c723bbbc1, - type: 3} + originalObject: {fileID: 1000010116632662, guid: 2232bbcc5a195274c9744c2c6352e910, type: 3} + dropObject: {fileID: 862192267840601332, guid: d07ef1bfe3f5bf4469394a9c723bbbc1, type: 3} attributes: - name: 3 value: 0 @@ -852,8 +799,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1adabc1ae49fd3c44a36cc9152ebb0f9, type: 3} m_Name: Handgun m_EditorClassIdentifier: - itemsToCraft: [] - price: 0 id: 10 description: Semi-Automatic Pistol type: 2 @@ -901,12 +846,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1adabc1ae49fd3c44a36cc9152ebb0f9, type: 3} m_Name: Health Up Potion m_EditorClassIdentifier: - itemsToCraft: - - item: {fileID: 0} - amount: 3 - - item: {fileID: 0} - amount: 1 - price: 0 id: 5 description: Increases the MaxHealth type: 0 @@ -950,8 +889,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1adabc1ae49fd3c44a36cc9152ebb0f9, type: 3} m_Name: Axe m_EditorClassIdentifier: - itemsToCraft: [] - price: 0 id: 0 description: Melee Weapon type: 1 @@ -960,10 +897,8 @@ MonoBehaviour: createNewItem: 1 maxStack: 1 amount: 0 - originalObject: {fileID: 1000010725870802, guid: 0cf98a7633e41834ba19e8626f1ceadc, - type: 3} - dropObject: {fileID: 880292917891664030, guid: 4ce32edaf6024884898e95f24f9f763a, - type: 3} + originalObject: {fileID: 1000010725870802, guid: 0cf98a7633e41834ba19e8626f1ceadc, type: 3} + dropObject: {fileID: 880292917891664030, guid: 4ce32edaf6024884898e95f24f9f763a, type: 3} attributes: - name: 3 value: 35 @@ -1009,12 +944,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1adabc1ae49fd3c44a36cc9152ebb0f9, type: 3} m_Name: Stamina Up Potion m_EditorClassIdentifier: - itemsToCraft: - - item: {fileID: 0} - amount: 1 - - item: {fileID: 0} - amount: 3 - price: 0 id: 4 description: Increases the MaxStamina type: 0 @@ -1058,8 +987,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1adabc1ae49fd3c44a36cc9152ebb0f9, type: 3} m_Name: Short Sword m_EditorClassIdentifier: - itemsToCraft: [] - price: 0 id: 3 description: Melee Weapon type: 1 @@ -1068,10 +995,8 @@ MonoBehaviour: createNewItem: 1 maxStack: 1 amount: 0 - originalObject: {fileID: 1000012884940116, guid: 5dc53aa14e78ec54fbf2281c1abb7f47, - type: 3} - dropObject: {fileID: 819158048279699071, guid: 0f25b0bc9b7934840b324072cedb3325, - type: 3} + originalObject: {fileID: 1000012884940116, guid: 5dc53aa14e78ec54fbf2281c1abb7f47, type: 3} + dropObject: {fileID: 819158048279699071, guid: 0f25b0bc9b7934840b324072cedb3325, type: 3} attributes: - name: 2 value: 15 @@ -1117,12 +1042,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1adabc1ae49fd3c44a36cc9152ebb0f9, type: 3} m_Name: Health Potion m_EditorClassIdentifier: - itemsToCraft: - - item: {fileID: 0} - amount: 3 - - item: {fileID: 0} - amount: 1 - price: 0 id: 2 description: Recover Health type: 0 @@ -1166,8 +1085,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1adabc1ae49fd3c44a36cc9152ebb0f9, type: 3} m_Name: vRifle Shooter Edition m_EditorClassIdentifier: - itemsToCraft: [] - price: 0 id: 22 description: Special Edition attached with Grenade Launcher type: 2 @@ -1176,8 +1093,7 @@ MonoBehaviour: createNewItem: 1 maxStack: 1 amount: 0 - originalObject: {fileID: 1262530654451378, guid: 33cb40cfd0904344d8306765a5600135, - type: 3} + originalObject: {fileID: 1262530654451378, guid: 33cb40cfd0904344d8306765a5600135, type: 3} dropObject: {fileID: 1530631430177172, guid: 1e6c72f3eacde6c4fa1f5824e22ce56c, type: 3} attributes: - name: 2 @@ -1224,8 +1140,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1adabc1ae49fd3c44a36cc9152ebb0f9, type: 3} m_Name: KeyCard Red m_EditorClassIdentifier: - itemsToCraft: [] - price: 0 id: 23 description: Open Red Doors type: 0 @@ -1265,8 +1179,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1adabc1ae49fd3c44a36cc9152ebb0f9, type: 3} m_Name: Dual Swords m_EditorClassIdentifier: - itemsToCraft: [] - price: 0 id: 24 description: Melee Weapon type: 1 @@ -1275,10 +1187,8 @@ MonoBehaviour: createNewItem: 1 maxStack: 1 amount: 0 - originalObject: {fileID: 1000012884940116, guid: f0df66e0950da4642afce9f6382ab231, - type: 3} - dropObject: {fileID: 5960025752436353048, guid: 25e7bf6c702446e47bbc7ce3a6aaaeb5, - type: 3} + originalObject: {fileID: 1000012884940116, guid: f0df66e0950da4642afce9f6382ab231, type: 3} + dropObject: {fileID: 5960025752436353048, guid: 25e7bf6c702446e47bbc7ce3a6aaaeb5, type: 3} attributes: - name: 2 value: 10 @@ -1324,8 +1234,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1adabc1ae49fd3c44a36cc9152ebb0f9, type: 3} m_Name: Arrows m_EditorClassIdentifier: - itemsToCraft: [] - price: 0 id: 21 description: Arrows to use with Bow type: 3 @@ -1365,8 +1273,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1adabc1ae49fd3c44a36cc9152ebb0f9, type: 3} m_Name: vBow m_EditorClassIdentifier: - itemsToCraft: [] - price: 0 id: 20 description: Bow and Arrow type: 4 @@ -1375,8 +1281,7 @@ MonoBehaviour: createNewItem: 0 maxStack: 1 amount: 0 - originalObject: {fileID: 1112735122421166, guid: adec6ca436555694f9b67251716d6768, - type: 3} + originalObject: {fileID: 1112735122421166, guid: adec6ca436555694f9b67251716d6768, type: 3} dropObject: {fileID: 1000012655258636, guid: cf28841817afdab4c8060f470a322c37, type: 3} attributes: - name: 6 @@ -1411,8 +1316,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1adabc1ae49fd3c44a36cc9152ebb0f9, type: 3} m_Name: Buletproof Vest m_EditorClassIdentifier: - itemsToCraft: [] - price: 0 id: 25 description: Buletproof Vest type: 6 @@ -1452,12 +1355,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1adabc1ae49fd3c44a36cc9152ebb0f9, type: 3} m_Name: Smoke Grenade m_EditorClassIdentifier: - itemsToCraft: - - item: {fileID: 0} - amount: 3 - - item: {fileID: 0} - amount: 1 - price: 0 id: 28 description: Smoke Grenade type: 0 @@ -1466,10 +1363,8 @@ MonoBehaviour: createNewItem: 1 maxStack: 6 amount: 0 - originalObject: {fileID: 2275447201054405111, guid: e82c600a04131f842b97ae50bebfd25d, - type: 3} - dropObject: {fileID: 4018256157275831458, guid: 83a0af047816b1e44b48e9b37982ccba, - type: 3} + originalObject: {fileID: 2275447201054405111, guid: e82c600a04131f842b97ae50bebfd25d, type: 3} + dropObject: {fileID: 4018256157275831458, guid: 83a0af047816b1e44b48e9b37982ccba, type: 3} attributes: [] isInEquipArea: 0 isEquiped: 0 @@ -1499,12 +1394,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1adabc1ae49fd3c44a36cc9152ebb0f9, type: 3} m_Name: Stun Grenade m_EditorClassIdentifier: - itemsToCraft: - - item: {fileID: 0} - amount: 3 - - item: {fileID: 0} - amount: 1 - price: 0 id: 29 description: Stun Grenade type: 0 @@ -1513,10 +1402,8 @@ MonoBehaviour: createNewItem: 1 maxStack: 6 amount: 0 - originalObject: {fileID: 2275447201054405111, guid: df29a1ce804661b4d91e53c7c6e7e384, - type: 3} - dropObject: {fileID: 4018256157275831458, guid: 092023529ae5aa0488c373ee62d54549, - type: 3} + originalObject: {fileID: 2275447201054405111, guid: df29a1ce804661b4d91e53c7c6e7e384, type: 3} + dropObject: {fileID: 4018256157275831458, guid: 092023529ae5aa0488c373ee62d54549, type: 3} attributes: [] isInEquipArea: 0 isEquiped: 0 diff --git a/Assets/Scenes/Cho môn AI/Only AI.unity b/Assets/Scenes/Cho môn AI/Only AI.unity index 824ec507..6f77789d 100644 --- a/Assets/Scenes/Cho môn AI/Only AI.unity +++ b/Assets/Scenes/Cho môn AI/Only AI.unity @@ -46940,403 +46940,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 303159406} m_CullTransparentMesh: 1 ---- !u!1001 &310459319 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1730236067} - m_Modifications: - - target: {fileID: 687530158533285018, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 3381350595760429543, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 5687887011233860168, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 6192986059782212342, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_LocalPosition.x - value: -4.90416 - objectReference: {fileID: 0} - - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_LocalPosition.y - value: 0.7508502 - objectReference: {fileID: 0} - - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_LocalPosition.z - value: 26.521872 - objectReference: {fileID: 0} - - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7522161431095319480, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Name - value: xNPC (5) - objectReference: {fileID: 0} - - target: {fileID: 7522161431095319480, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7522161431095319480, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372480, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372482, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372484, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372486, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372490, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372494, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372496, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372498, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372500, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372502, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372504, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372506, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372508, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372510, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372512, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372514, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372516, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372520, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372522, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372524, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372528, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372530, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372532, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372536, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372538, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372540, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372588, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372590, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372864, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372866, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372868, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372870, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372872, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372874, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372878, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372880, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372884, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372886, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372888, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372892, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372894, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372928, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372930, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372932, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372934, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372936, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372938, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372940, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372942, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372944, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372946, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372948, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372952, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372954, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372956, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372960, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372964, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372966, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372968, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372972, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372974, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372976, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372980, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372982, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372984, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372988, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372990, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 8272839718325411334, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: player - value: - objectReference: {fileID: 1042553198} - - target: {fileID: 8272839718325411334, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: npcName - value: Guard5 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 7522161431095319480, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - insertIndex: -1 - addedObject: {fileID: 310459321} - m_SourcePrefab: {fileID: 100100000, guid: 15df559ce497e104a81254e0adf3107e, type: 3} ---- !u!1 &310459320 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7522161431095319480, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - m_PrefabInstance: {fileID: 310459319} - m_PrefabAsset: {fileID: 0} ---- !u!54 &310459321 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 310459320} - serializedVersion: 5 - m_Mass: 1 - m_LinearDamping: 0 - m_AngularDamping: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 112 - m_CollisionDetection: 0 ---- !u!4 &310459322 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - m_PrefabInstance: {fileID: 310459319} - m_PrefabAsset: {fileID: 0} --- !u!1 &333057065 GameObject: m_ObjectHideFlags: 0 @@ -90413,403 +90016,6 @@ Transform: m_Children: [] m_Father: {fileID: 333057066} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &570772201 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1730236067} - m_Modifications: - - target: {fileID: 687530158533285018, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 3381350595760429543, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 5687887011233860168, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 6192986059782212342, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_LocalPosition.x - value: -16.40416 - objectReference: {fileID: 0} - - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_LocalPosition.y - value: -2.69915 - objectReference: {fileID: 0} - - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_LocalPosition.z - value: 20.521872 - objectReference: {fileID: 0} - - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7522161431095319480, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Name - value: xNPC (6) - objectReference: {fileID: 0} - - target: {fileID: 7522161431095319480, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7522161431095319480, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372480, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372482, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372484, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372486, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372490, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372494, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372496, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372498, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372500, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372502, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372504, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372506, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372508, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372510, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372512, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372514, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372516, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372520, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372522, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372524, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372528, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372530, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372532, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372536, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372538, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372540, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372588, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372590, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372864, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372866, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372868, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372870, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372872, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372874, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372878, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372880, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372884, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372886, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372888, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372892, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372894, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372928, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372930, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372932, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372934, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372936, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372938, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372940, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372942, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372944, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372946, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372948, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372952, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372954, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372956, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372960, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372964, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372966, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372968, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372972, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372974, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372976, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372980, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372982, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372984, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372988, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372990, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 8272839718325411334, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: player - value: - objectReference: {fileID: 1042553198} - - target: {fileID: 8272839718325411334, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: npcName - value: Guard6 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 7522161431095319480, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - insertIndex: -1 - addedObject: {fileID: 570772203} - m_SourcePrefab: {fileID: 100100000, guid: 15df559ce497e104a81254e0adf3107e, type: 3} ---- !u!1 &570772202 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7522161431095319480, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - m_PrefabInstance: {fileID: 570772201} - m_PrefabAsset: {fileID: 0} ---- !u!54 &570772203 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 570772202} - serializedVersion: 5 - m_Mass: 1 - m_LinearDamping: 0 - m_AngularDamping: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 112 - m_CollisionDetection: 0 ---- !u!4 &570772204 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - m_PrefabInstance: {fileID: 570772201} - m_PrefabAsset: {fileID: 0} --- !u!1001 &572767392 PrefabInstance: m_ObjectHideFlags: 0 @@ -91423,7 +90629,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} propertyPath: m_LocalPosition.y - value: -2.69915 + value: 6.98 objectReference: {fileID: 0} - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} propertyPath: m_LocalPosition.z @@ -93792,403 +92998,6 @@ Mesh: - serializedVersion: 1 m_IndexStart: 0 m_IndexCount: 0 ---- !u!1001 &640822033 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1730236067} - m_Modifications: - - target: {fileID: 687530158533285018, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 3381350595760429543, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 5687887011233860168, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 6192986059782212342, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_LocalPosition.x - value: 9.92584 - objectReference: {fileID: 0} - - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_LocalPosition.y - value: 8.29085 - objectReference: {fileID: 0} - - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_LocalPosition.z - value: 14.507872 - objectReference: {fileID: 0} - - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7522161431095319480, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Name - value: xNPC (8) - objectReference: {fileID: 0} - - target: {fileID: 7522161431095319480, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7522161431095319480, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372480, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372482, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372484, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372486, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372490, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372494, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372496, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372498, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372500, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372502, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372504, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372506, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372508, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372510, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372512, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372514, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372516, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372520, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372522, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372524, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372528, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372530, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372532, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372536, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372538, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372540, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372588, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372590, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372864, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372866, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372868, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372870, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372872, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372874, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372878, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372880, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372884, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372886, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372888, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372892, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372894, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372928, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372930, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372932, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372934, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372936, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372938, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372940, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372942, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372944, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372946, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372948, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372952, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372954, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372956, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372960, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372964, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372966, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372968, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372972, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372974, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372976, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372980, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372982, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372984, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372988, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372990, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 8272839718325411334, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: player - value: - objectReference: {fileID: 1042553198} - - target: {fileID: 8272839718325411334, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: npcName - value: Guard8 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 7522161431095319480, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - insertIndex: -1 - addedObject: {fileID: 640822035} - m_SourcePrefab: {fileID: 100100000, guid: 15df559ce497e104a81254e0adf3107e, type: 3} ---- !u!1 &640822034 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7522161431095319480, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - m_PrefabInstance: {fileID: 640822033} - m_PrefabAsset: {fileID: 0} ---- !u!54 &640822035 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 640822034} - serializedVersion: 5 - m_Mass: 1 - m_LinearDamping: 0 - m_AngularDamping: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 112 - m_CollisionDetection: 0 ---- !u!4 &640822036 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - m_PrefabInstance: {fileID: 640822033} - m_PrefabAsset: {fileID: 0} --- !u!43 &643120550 Mesh: m_ObjectHideFlags: 0 @@ -95326,15 +94135,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} propertyPath: m_LocalPosition.x - value: 1.26 + value: -8.68 objectReference: {fileID: 0} - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} propertyPath: m_LocalPosition.y - value: -2.69915 + value: 2.08 objectReference: {fileID: 0} - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} propertyPath: m_LocalPosition.z - value: -8.928129 + value: 26.88 objectReference: {fileID: 0} - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} propertyPath: m_LocalRotation.w @@ -136504,7 +135313,7 @@ MonoBehaviour: apiKeys: - AIzaSyC4DRm2dffDuDogYkY0Ag86p-EYLu67bDo - AQ.Ab8RN6JvwHD9tZXWlO7eb22ahV0rxUh5cAjB3-XfKW5H_KLiyQ - - AIzaSyC4DRm2dffDuDogYkY0Ag86p-EYLu67bDo + - AQ.Ab8RN6KPhgovavkOhBD2w-3JhWh1EeT_c6ny11IGK_HAKJoACw geminiURL: https://generativelanguage.googleapis.com/v1beta/models/gemini-flash-latest:generateContent --- !u!1 &1143870345 GameObject: @@ -147938,403 +146747,6 @@ Transform: - {fileID: 1730236067} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1645920186 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1730236067} - m_Modifications: - - target: {fileID: 687530158533285018, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 3381350595760429543, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 5687887011233860168, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 6192986059782212342, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_LocalPosition.x - value: 6.7958403 - objectReference: {fileID: 0} - - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_LocalPosition.y - value: -2.69915 - objectReference: {fileID: 0} - - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_LocalPosition.z - value: 10.421869 - objectReference: {fileID: 0} - - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7522161431095319480, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Name - value: xNPC (7) - objectReference: {fileID: 0} - - target: {fileID: 7522161431095319480, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7522161431095319480, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372480, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372482, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372484, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372486, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372490, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372494, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372496, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372498, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372500, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372502, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372504, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372506, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372508, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372510, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372512, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372514, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372516, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372520, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372522, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372524, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372528, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372530, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372532, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372536, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372538, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372540, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372588, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372590, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372864, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372866, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372868, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372870, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372872, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372874, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372878, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372880, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372884, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372886, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372888, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372892, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372894, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372928, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372930, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372932, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372934, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372936, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372938, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372940, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372942, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372944, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372946, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372948, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372952, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372954, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372956, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372960, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372964, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372966, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372968, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372972, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372974, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372976, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372980, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372982, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372984, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372988, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 7561534673732372990, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: m_Layer - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 8272839718325411334, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: player - value: - objectReference: {fileID: 1042553198} - - target: {fileID: 8272839718325411334, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - propertyPath: npcName - value: Guard7 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 7522161431095319480, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - insertIndex: -1 - addedObject: {fileID: 1645920188} - m_SourcePrefab: {fileID: 100100000, guid: 15df559ce497e104a81254e0adf3107e, type: 3} ---- !u!1 &1645920187 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7522161431095319480, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - m_PrefabInstance: {fileID: 1645920186} - m_PrefabAsset: {fileID: 0} ---- !u!54 &1645920188 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1645920187} - serializedVersion: 5 - m_Mass: 1 - m_LinearDamping: 0 - m_AngularDamping: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 112 - m_CollisionDetection: 0 ---- !u!4 &1645920189 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6442306242859885696, guid: 15df559ce497e104a81254e0adf3107e, type: 3} - m_PrefabInstance: {fileID: 1645920186} - m_PrefabAsset: {fileID: 0} --- !u!43 &1649158037 Mesh: m_ObjectHideFlags: 0 @@ -148894,10 +147306,6 @@ Transform: - {fileID: 2145701570} - {fileID: 1004365739} - {fileID: 626847832} - - {fileID: 310459322} - - {fileID: 570772204} - - {fileID: 1645920189} - - {fileID: 640822036} - {fileID: 676160207} m_Father: {fileID: 1625646592} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scripts/AI NPC/LaserProjectile.cs b/Assets/Scripts/AI NPC/LaserProjectile.cs index 56c58ae1..3ca067cd 100644 --- a/Assets/Scripts/AI NPC/LaserProjectile.cs +++ b/Assets/Scripts/AI NPC/LaserProjectile.cs @@ -28,35 +28,27 @@ public class LaserProjectile : MonoBehaviour // Debug: Log tên và tag của bất cứ thứ gì đạn chạm vào Debug.Log($"Laser collided with: {other.name} | Tag: {other.tag} | Layer: {LayerMask.LayerToName(other.gameObject.layer)}"); - // Kiểm tra nếu trúng Player - if (other.CompareTag("Player") || other.GetComponentInParent() != null) + // 1. Kiểm tra nếu trúng Player hoặc đối tượng có Health + var healthController = other.GetComponentInParent(); + if (other.CompareTag("Player") || healthController != null) { - var healthController = other.GetComponentInParent(); - if (healthController != null) { - Debug.Log($"HIT PLAYER! Found health controller on {healthController.gameObject.name}. Applying {damageAmount} damage."); + Debug.Log($"HIT PLAYER! Applying {damageAmount} damage."); var damage = new vDamage(damageAmount); damage.sender = transform; damage.hitPosition = transform.position; healthController.TakeDamage(damage); } - // Luôn phá hủy đạn khi trúng Player Impact(); return; } -// KIỂM TRA LAYER "GROUND" - if (other.gameObject.layer == LayerMask.NameToLayer("Ground")) - { - Debug.Log("Laser hit GROUND layer."); - Impact(); - return; - } - // Phá hủy đạn nếu trúng tường, sàn nhà (mọi thứ không phải trigger khác) + + // 2. Phá hủy đạn nếu trúng Ground, Tường, hoặc bất kỳ vật thể đặc nào (không phải Trigger) if (!other.isTrigger) { - Debug.Log("Laser hit an obstacle (Wall/Floor)."); + Debug.Log($"Laser hit solid object: {other.name} (Ground/Obstacle). Destroying."); Impact(); } } diff --git a/Assets/Scripts/Player/FootStep/Materials/ParticleSmokeVertlit 3.mat b/Assets/Scripts/Player/FootStep/Materials/ParticleSmokeVertlit 3.mat index 239d66ce..8978c724 100644 --- a/Assets/Scripts/Player/FootStep/Materials/ParticleSmokeVertlit 3.mat +++ b/Assets/Scripts/Player/FootStep/Materials/ParticleSmokeVertlit 3.mat @@ -13,19 +13,24 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _COLOROVERLAY_ON + - _DISTORTION_ON + - _FADING_ON + - _FLIPBOOKBLENDING_ON + - _SOFTPARTICLES_ON - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: - EFFECT_BUMP - _ALPHABLEND_ON - - _FLIPBOOKBLENDING_OFF - _REQUIRE_UV2 m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: - RenderType: Opaque - disabledShaderPasses: [] + RenderType: Transparent + disabledShaderPasses: + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -88,8 +93,8 @@ Material: - _DistortionEnabled: 1 - _DistortionStrength: 1 - _DistortionStrengthScaled: 0.1 - - _DstBlend: 0 - - _DstBlendAlpha: 0 + - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EmissionEnabled: 1 - _FlipbookBlending: 1 - _FlipbookMode: 1 @@ -108,11 +113,11 @@ Material: - _SoftParticlesFarFadeDistance: 1 - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - - _ZWrite: 1 + - _ZWrite: 0 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} @@ -121,7 +126,7 @@ Material: - _ColorAddSubDiff: {r: 1, g: 0, b: 0, a: 0} - _EmisColor: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0.31132078, g: 0.31132078, b: 0.31132078, a: 1} - - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} + - _SoftParticleFadeParams: {r: 0, g: 1, b: 0, a: 0} - _TintColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] m_AllowLocking: 1