From 2c1c80660c01e84d7306350ed3dba2a33dbec625 Mon Sep 17 00:00:00 2001 From: Nam Tae Gun Date: Sat, 29 Jun 2024 00:35:10 +0900 Subject: [PATCH] =?UTF-8?q?=EC=88=98=EC=A0=95=EC=82=AC=ED=95=AD=20?= =?UTF-8?q?=EB=82=B4=EC=9A=A9=20=EC=B0=B8=EA=B3=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit + 타이탄 슬라임 젬스톤 드랍 추가 (관련 excel, json, so 추가) + 아이템 프리팹 각도 수정 + GroundFog Queue 2999 + FlashAndShadowSeeThroughLit Queue 3001 + SandMole 가시 던지기 애니메이션 변경 + SandMole 맵에 부서지는 오브젝트 Spike 배치 --- Assets/01.Scenes/02.Combat.unity | 121 +- .../Character/Enemy/Boss/SandMole/SandMole.cs | 5 +- .../Enemy/Boss/TitanSlime/TitanSlime.cs | 1 - Assets/02.Scripts/Item/ItemManager.cs | 32 +- .../ScriptableObject/Item/ItemDataTable.asset | 9 + .../ScriptableObject/Item/ItemDropTable.asset | 6 +- .../Enemy/Boss/SandMole/MultiThrowSpikes.cs | 24 +- .../Bosses/TitanSlime/GemstoneGreen.png.meta | 6 +- .../FlashAndShadowSeeThroughLit.mat | 4 +- Assets/04.Materials/Maps/GroundFog.mat | 4 +- Assets/04.Materials/OpaqueUnlit.mat | 4 +- Assets/04.Materials/TransparentLit.mat | 1 - .../Enemies/Bosses/TitanSlime.prefab | 4 +- Assets/05.Prefabs/Items/Item.prefab | 8 +- .../SandMoleMapController.prefab | 1945 +++++++++++------ .../05.Prefabs/Particles/LeafParticle.prefab | 4 +- .../BaseDamageableProps.prefab | 100 +- .../Props/DamageableProps/Rockfall.prefab | 111 +- .../Props/DamageableProps/Spike.prefab | 136 ++ .../Spike.prefab.meta} | 2 +- .../05.Prefabs/Props/Environment/Ice.prefab | 75 - .../Bosses/Sandmole/SandMole_spine.skel.bytes | Bin 26870 -> 28164 bytes Assets/Resources/Excel/CharacterData.xlsx | Bin 10582 -> 10588 bytes Assets/Resources/Excel/ItemDataTable.xlsx | Bin 12363 -> 12397 bytes Assets/Resources/Excel/ItemDropTable.xlsx | Bin 10768 -> 10793 bytes Assets/Resources/JSON/CharacterData.json | 2 +- Assets/Resources/JSON/ItemDataTable.json | 9 + Assets/Resources/JSON/ItemDropTable.json | 7 + Packages/manifest.json | 1 + Packages/packages-lock.json | 10 + 30 files changed, 1722 insertions(+), 909 deletions(-) create mode 100644 Assets/05.Prefabs/Props/DamageableProps/Spike.prefab rename Assets/05.Prefabs/Props/{Environment/Ice.prefab.meta => DamageableProps/Spike.prefab.meta} (74%) delete mode 100644 Assets/05.Prefabs/Props/Environment/Ice.prefab diff --git a/Assets/01.Scenes/02.Combat.unity b/Assets/01.Scenes/02.Combat.unity index 489c11f9a..db94f48a6 100644 --- a/Assets/01.Scenes/02.Combat.unity +++ b/Assets/01.Scenes/02.Combat.unity @@ -1289,7 +1289,7 @@ Camera: m_Depth: 0 m_CullingMask: serializedVersion: 2 - m_Bits: 65495 + m_Bits: 131031 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 @@ -2214,6 +2214,63 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 305420765} m_CullTransparentMesh: 0 +--- !u!1001 &345789251 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 115998474870636236, guid: e9c7980309400054090fd241ac425802, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 115998474870636236, guid: e9c7980309400054090fd241ac425802, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 115998474870636236, guid: e9c7980309400054090fd241ac425802, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 115998474870636236, guid: e9c7980309400054090fd241ac425802, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 115998474870636236, guid: e9c7980309400054090fd241ac425802, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 115998474870636236, guid: e9c7980309400054090fd241ac425802, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 115998474870636236, guid: e9c7980309400054090fd241ac425802, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 115998474870636236, guid: e9c7980309400054090fd241ac425802, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 115998474870636236, guid: e9c7980309400054090fd241ac425802, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 115998474870636236, guid: e9c7980309400054090fd241ac425802, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2252586209868520252, guid: e9c7980309400054090fd241ac425802, type: 3} + propertyPath: m_Name + value: ItemManager + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e9c7980309400054090fd241ac425802, type: 3} --- !u!1 &349901980 GameObject: m_ObjectHideFlags: 0 @@ -7147,7 +7204,8 @@ PrefabInstance: value: objectReference: {fileID: 370354195} m_RemovedComponents: [] - m_RemovedGameObjects: [] + m_RemovedGameObjects: + - {fileID: 3768980608318584728, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 39e32b91cc570794e9e843b39f89e400, type: 3} @@ -18841,63 +18899,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1001 &4401038241568057119 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 115998474870636236, guid: e9c7980309400054090fd241ac425802, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 115998474870636236, guid: e9c7980309400054090fd241ac425802, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 115998474870636236, guid: e9c7980309400054090fd241ac425802, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 115998474870636236, guid: e9c7980309400054090fd241ac425802, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 115998474870636236, guid: e9c7980309400054090fd241ac425802, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 115998474870636236, guid: e9c7980309400054090fd241ac425802, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 115998474870636236, guid: e9c7980309400054090fd241ac425802, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 115998474870636236, guid: e9c7980309400054090fd241ac425802, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 115998474870636236, guid: e9c7980309400054090fd241ac425802, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 115998474870636236, guid: e9c7980309400054090fd241ac425802, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2252586209868520252, guid: e9c7980309400054090fd241ac425802, type: 3} - propertyPath: m_Name - value: ItemManager - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e9c7980309400054090fd241ac425802, type: 3} --- !u!1 &4401505251626188150 GameObject: m_ObjectHideFlags: 0 @@ -23754,8 +23755,8 @@ SceneRoots: - {fileID: 7155618029629697249} - {fileID: 6180071462390754576} - {fileID: 7398549143365133110} - - {fileID: 4401038241568057119} - {fileID: 7461294560137099736} + - {fileID: 345789251} - {fileID: 1597727070} - {fileID: 1461902905} - {fileID: 549059392} diff --git a/Assets/02.Scripts/Character/Enemy/Boss/SandMole/SandMole.cs b/Assets/02.Scripts/Character/Enemy/Boss/SandMole/SandMole.cs index ce8542bbf..1f4e18495 100644 --- a/Assets/02.Scripts/Character/Enemy/Boss/SandMole/SandMole.cs +++ b/Assets/02.Scripts/Character/Enemy/Boss/SandMole/SandMole.cs @@ -36,7 +36,10 @@ namespace BlueWater.Enemies.Bosses.SandMole Spin, SpinReady, SpinReady2, - Stun + Stun, + ShootingStart, + ShootingIdle, + ShootingEnd } public class SandMole : SpineBoss diff --git a/Assets/02.Scripts/Character/Enemy/Boss/TitanSlime/TitanSlime.cs b/Assets/02.Scripts/Character/Enemy/Boss/TitanSlime/TitanSlime.cs index fa415b08e..544363542 100644 --- a/Assets/02.Scripts/Character/Enemy/Boss/TitanSlime/TitanSlime.cs +++ b/Assets/02.Scripts/Character/Enemy/Boss/TitanSlime/TitanSlime.cs @@ -1,6 +1,5 @@ using BlueWater.Items; using BlueWater.Maps; -using BlueWater.Uis; using Sirenix.OdinInspector; using UnityEngine; diff --git a/Assets/02.Scripts/Item/ItemManager.cs b/Assets/02.Scripts/Item/ItemManager.cs index 1a174195f..20c47b7c3 100644 --- a/Assets/02.Scripts/Item/ItemManager.cs +++ b/Assets/02.Scripts/Item/ItemManager.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using System.Linq; using Sirenix.OdinInspector; using UnityEngine; @@ -16,6 +17,15 @@ namespace BlueWater.Items [SerializeField, Required] private ItemDropTableSo _itemDropTableSo; private Dictionary _itemDropTableDictionary; + + [Title("드롭 아이템 설정")] + [SerializeField] + private float _randomDropRadius = 3f; + + [SerializeField] + private float _minSeparationDistance = 1.5f; + + private const int MaxAttempts = 1000; protected override void OnAwake() { @@ -45,23 +55,37 @@ namespace BlueWater.Items if (itemDropTable == null) return; var droppedItemList = itemDropTable.GetDroppedItemList(); + var droppedPositions = new List(); foreach (var element in droppedItemList) { - var newDropPositionX = Random.Range(dropPosition.x - 1f, dropPosition.x + 1f); - var newDropPositionZ = Random.Range(dropPosition.z - 1f, dropPosition.z + 1f); - var newDropPosition = new Vector3(newDropPositionX, dropPosition.y, newDropPositionZ); + Vector3 newDropPosition; + var attempts = 0; + do + { + attempts++; + var newDropPositionX = Random.Range(dropPosition.x - _randomDropRadius, dropPosition.x + _randomDropRadius); + var newDropPositionZ = Random.Range(dropPosition.z - _randomDropRadius, dropPosition.z + _randomDropRadius); + newDropPosition = new Vector3(newDropPositionX, dropPosition.y, newDropPositionZ); + } while (!IsDropPositionAvailable(newDropPosition, droppedPositions) && attempts < MaxAttempts); + droppedPositions.Add(newDropPosition); + var itemPrefab = _itemDictionary[element.Idx].ItemPrefab; if (!itemPrefab) { itemPrefab = _defaultItemPrefab; } - var instantiateItem = Instantiate(itemPrefab, newDropPosition, Quaternion.identity); + var instantiateItem = Instantiate(itemPrefab, newDropPosition, itemPrefab.transform.rotation); instantiateItem.Initialize(element); instantiateItem.AddForce(Vector3.up * 20f, ForceMode.Impulse); } } + private bool IsDropPositionAvailable(Vector3 position, List positions) + { + return positions.Any(pos => Vector3.Distance(position, pos) > _minSeparationDistance); + } + public ItemData GetItemDataByIdx(int idx) { if (_itemDictionary.TryGetValue(idx, out var itemData)) return itemData; diff --git a/Assets/02.Scripts/ScriptableObject/Item/ItemDataTable.asset b/Assets/02.Scripts/ScriptableObject/Item/ItemDataTable.asset index 03dd1d242..089948286 100644 --- a/Assets/02.Scripts/ScriptableObject/Item/ItemDataTable.asset +++ b/Assets/02.Scripts/ScriptableObject/Item/ItemDataTable.asset @@ -418,3 +418,12 @@ MonoBehaviour: k__BackingField: k__BackingField: {fileID: 21300000, guid: 4e2159443b5aedf43849ec062f4f8016, type: 3} k__BackingField: {fileID: 8962896418303621511, guid: 0dc7ed0facf2fca4b80244d0d95e2557, type: 3} + - k__BackingField: 60001 + k__BackingField: "\uC82C\uC2A4\uD1A4" + k__BackingField: 6 + k__BackingField: 0 + k__BackingField: 1000 + k__BackingField: 100 + k__BackingField: + k__BackingField: {fileID: 21300000, guid: 1ddf647b8857bff45a83e009dbb9ec8c, type: 3} + k__BackingField: {fileID: 0} diff --git a/Assets/02.Scripts/ScriptableObject/Item/ItemDropTable.asset b/Assets/02.Scripts/ScriptableObject/Item/ItemDropTable.asset index 374ba1cc7..9662508ae 100644 --- a/Assets/02.Scripts/ScriptableObject/Item/ItemDropTable.asset +++ b/Assets/02.Scripts/ScriptableObject/Item/ItemDropTable.asset @@ -29,6 +29,10 @@ MonoBehaviour: k__BackingField: 100 k__BackingField: 1 k__BackingField: 1 + - k__BackingField: 60001 + k__BackingField: 100 + k__BackingField: 1 + k__BackingField: 1 - k__BackingField: k__BackingField: 2 k__BackingField: "\uCF54\uBFD4\uC18C" @@ -63,7 +67,7 @@ MonoBehaviour: k__BackingField: 1 - k__BackingField: k__BackingField: 4 - k__BackingField: "\uC720\uB839 \uC220\uD1B5" + k__BackingField: "\uC220\uD1B5 \uC720\uB839" k__BackingField: - k__BackingField: 50002 k__BackingField: 100 diff --git a/Assets/02.Scripts/Skill/Enemy/Boss/SandMole/MultiThrowSpikes.cs b/Assets/02.Scripts/Skill/Enemy/Boss/SandMole/MultiThrowSpikes.cs index 112009598..5fb6dd72a 100644 --- a/Assets/02.Scripts/Skill/Enemy/Boss/SandMole/MultiThrowSpikes.cs +++ b/Assets/02.Scripts/Skill/Enemy/Boss/SandMole/MultiThrowSpikes.cs @@ -36,22 +36,14 @@ namespace BlueWater.Enemies.Bosses.SandMole.Skills { EnableSkill = false; _spineController.SetSkin(SandMoleSkin.Idle.ToString()); - var spinReady2Track = _spineController.PlayAnimation(SandMoleAnimation.SpinReady2.ToString(), false); - if (spinReady2Track == null) + var shootingStartTrack = _spineController.PlayAnimation(SandMoleAnimation.ShootingStart.ToString(), false); + if (shootingStartTrack == null) { EndSkill(0, actions[0]); yield break; } - yield return new WaitUntil(() => spinReady2Track.IsComplete); - - _spineController.SetSkin(SandMoleSkin.Spin.ToString()); - var spinTrack = _spineController.PlayAnimation(SandMoleAnimation.Spin.ToString(), true); - if (spinTrack == null || !SkillUser) - { - EndSkill(0, actions[0]); - yield break; - } + yield return new WaitUntil(() => shootingStartTrack.IsComplete); IsUsingSkill = true; var startPosition = SkillUser.transform.position; @@ -64,6 +56,7 @@ namespace BlueWater.Enemies.Bosses.SandMole.Skills yield break; } + _spineController.PlayAnimation(SandMoleAnimation.ShootingIdle.ToString(), false); var targetCenterPosition = _targetCollider.bounds.center; startPosition.y = targetCenterPosition.y; var targetVector = targetCenterPosition - startPosition; @@ -77,6 +70,15 @@ namespace BlueWater.Enemies.Bosses.SandMole.Skills yield return waitForSeconds; } + + var shootingEndTrack = _spineController.PlayAnimation(SandMoleAnimation.ShootingEnd.ToString(), true); + if (shootingEndTrack == null || !SkillUser) + { + EndSkill(0, actions[0]); + yield break; + } + + yield return new WaitUntil(() => shootingEndTrack.IsComplete); EndSkill(SkillData.Cooldown, actions[0]); } diff --git a/Assets/03.Images/Characters/Enemies/Bosses/TitanSlime/GemstoneGreen.png.meta b/Assets/03.Images/Characters/Enemies/Bosses/TitanSlime/GemstoneGreen.png.meta index 9541c88ec..0cdd94904 100644 --- a/Assets/03.Images/Characters/Enemies/Bosses/TitanSlime/GemstoneGreen.png.meta +++ b/Assets/03.Images/Characters/Enemies/Bosses/TitanSlime/GemstoneGreen.png.meta @@ -46,8 +46,8 @@ TextureImporter: spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} + alignment: 9 + spritePivot: {x: 0.5, y: 0.02} spritePixelsToUnits: 512 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 @@ -127,7 +127,7 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: [] diff --git a/Assets/04.Materials/FlashAndShadowSeeThroughLit.mat b/Assets/04.Materials/FlashAndShadowSeeThroughLit.mat index 393a227ab..636f994e6 100644 --- a/Assets/04.Materials/FlashAndShadowSeeThroughLit.mat +++ b/Assets/04.Materials/FlashAndShadowSeeThroughLit.mat @@ -16,7 +16,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3001 stringTagMap: {} disabledShaderPasses: - MOTIONVECTORS @@ -110,7 +110,7 @@ Material: - _Opacity: 0.7 - _Parallax: 0.005 - _QueueControl: 0 - - _QueueOffset: 0 + - _QueueOffset: 1 - _ReceiveShadows: 1 - _Size: 0 - _Smoothness: 0.8 diff --git a/Assets/04.Materials/Maps/GroundFog.mat b/Assets/04.Materials/Maps/GroundFog.mat index eef40f5d6..a82e6b938 100644 --- a/Assets/04.Materials/Maps/GroundFog.mat +++ b/Assets/04.Materials/Maps/GroundFog.mat @@ -20,7 +20,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 + m_CustomRenderQueue: 2999 stringTagMap: RenderType: Transparent disabledShaderPasses: @@ -121,7 +121,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.005 - - _QueueOffset: 0 + - _QueueOffset: -1 - _ReceiveShadows: 1 - _SampleGI: 0 - _Smoothness: 0.5 diff --git a/Assets/04.Materials/OpaqueUnlit.mat b/Assets/04.Materials/OpaqueUnlit.mat index 4ac69ff7b..ddca0e622 100644 --- a/Assets/04.Materials/OpaqueUnlit.mat +++ b/Assets/04.Materials/OpaqueUnlit.mat @@ -29,7 +29,7 @@ Material: m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 + m_DoubleSidedGI: 1 m_CustomRenderQueue: 2450 stringTagMap: RenderType: TransparentCutout @@ -106,7 +106,7 @@ Material: - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 - - _Cull: 2 + - _Cull: 0 - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 diff --git a/Assets/04.Materials/TransparentLit.mat b/Assets/04.Materials/TransparentLit.mat index 51dbce48c..4497ef2c0 100644 --- a/Assets/04.Materials/TransparentLit.mat +++ b/Assets/04.Materials/TransparentLit.mat @@ -40,7 +40,6 @@ Material: disabledShaderPasses: - MOTIONVECTORS - DepthOnly - - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 diff --git a/Assets/05.Prefabs/Characters/Enemies/Bosses/TitanSlime.prefab b/Assets/05.Prefabs/Characters/Enemies/Bosses/TitanSlime.prefab index 42a171970..edafffdea 100644 --- a/Assets/05.Prefabs/Characters/Enemies/Bosses/TitanSlime.prefab +++ b/Assets/05.Prefabs/Characters/Enemies/Bosses/TitanSlime.prefab @@ -26,7 +26,7 @@ Transform: m_GameObject: {fileID: 1016303419742354216} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: -0.258819, w: 0.9659259} - m_LocalPosition: {x: 0, y: 0.22, z: 0} + m_LocalPosition: {x: -0.035, y: 0.12, z: -0} m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} m_ConstrainProportionsScale: 1 m_Children: [] @@ -75,7 +75,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 5 m_Sprite: {fileID: 21300000, guid: 1ddf647b8857bff45a83e009dbb9ec8c, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 diff --git a/Assets/05.Prefabs/Items/Item.prefab b/Assets/05.Prefabs/Items/Item.prefab index ac10cb922..45305c81e 100644 --- a/Assets/05.Prefabs/Items/Item.prefab +++ b/Assets/05.Prefabs/Items/Item.prefab @@ -60,7 +60,7 @@ Canvas: m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 - m_SortingOrder: 0 + m_SortingOrder: 5 m_TargetDisplay: 0 --- !u!114 &3466664881830510074 MonoBehaviour: @@ -127,13 +127,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1513751791682743921} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3930562537327335166} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} --- !u!212 &7437393363680573610 SpriteRenderer: m_ObjectHideFlags: 0 @@ -177,7 +177,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 5 m_Sprite: {fileID: 21300000, guid: 4e2159443b5aedf43849ec062f4f8016, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 diff --git a/Assets/05.Prefabs/Maps/MapControllers/SandMoleMapController.prefab b/Assets/05.Prefabs/Maps/MapControllers/SandMoleMapController.prefab index aa7c3f858..681140907 100644 --- a/Assets/05.Prefabs/Maps/MapControllers/SandMoleMapController.prefab +++ b/Assets/05.Prefabs/Maps/MapControllers/SandMoleMapController.prefab @@ -838,48 +838,6 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} ---- !u!1 &3768980608318584728 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5933999541716381340} - m_Layer: 0 - m_Name: Ice - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5933999541716381340 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3768980608318584728} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5640689970083871717} - - {fileID: 3715336505770412280} - - {fileID: 3040376804757275235} - - {fileID: 4790279114619559516} - - {fileID: 469252743578023862} - - {fileID: 5518607813858218394} - - {fileID: 1787658907048053380} - - {fileID: 5985051552628300740} - - {fileID: 2584068484972573625} - - {fileID: 6745017140210057398} - - {fileID: 8208579617023687680} - m_Father: {fileID: 1886555746222503566} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4197925836723393272 GameObject: m_ObjectHideFlags: 0 @@ -1373,6 +1331,61 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &7173303773333707162 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3480099525846227001} + m_Layer: 0 + m_Name: Spikes + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3480099525846227001 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7173303773333707162} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2272737979922566520} + - {fileID: 5827047486669477615} + - {fileID: 3687784860786713649} + - {fileID: 8610125282022338173} + - {fileID: 5181836447897113399} + - {fileID: 2611845135308718461} + - {fileID: 1525705687064967557} + - {fileID: 2082272977939062717} + - {fileID: 8353482373432592924} + - {fileID: 6169800246413142122} + - {fileID: 8756971001412715870} + - {fileID: 3171826619477571923} + - {fileID: 3217880000568976945} + - {fileID: 4798409868118643522} + - {fileID: 3949916293407210204} + - {fileID: 99800809047617488} + - {fileID: 4907507663175451307} + - {fileID: 6020286381167630111} + - {fileID: 4195957431859857403} + - {fileID: 3607812121244875521} + - {fileID: 6662251463093864288} + - {fileID: 6519871009861658782} + - {fileID: 167902262859589018} + - {fileID: 1850584702858105022} + m_Father: {fileID: 1886555746222503566} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7225845442489806937 GameObject: m_ObjectHideFlags: 0 @@ -2064,79 +2077,129 @@ Transform: m_CorrespondingSourceObject: {fileID: 1012316818468953382, guid: f8cb4efe6ab794f4589d73b6409c0805, type: 3} m_PrefabInstance: {fileID: 430790682124632704} m_PrefabAsset: {fileID: 0} ---- !u!1001 &536872584065678040 +--- !u!1001 &447110856120859301 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 5933999541716381340} + m_TransformParent: {fileID: 3480099525846227001} m_Modifications: - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalScale.x - value: 2.3369434 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalScale.y - value: 2.3369434 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalScale.z - value: 2.3369434 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalPosition.x - value: -8.610004 + value: 4 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalPosition.y - value: 0.000000029802322 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalPosition.z - value: 4.589994 + value: -2 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7032941376133530959, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 8132169685942340323, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_Name - value: Ice (5) + value: Spike (5) objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: debf7b76b0478c84595259122f220b1a, type: 3} ---- !u!4 &5985051552628300740 stripped + m_SourcePrefab: {fileID: 100100000, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} +--- !u!4 &3171826619477571923 stripped Transform: - m_CorrespondingSourceObject: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - m_PrefabInstance: {fileID: 536872584065678040} + m_CorrespondingSourceObject: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + m_PrefabInstance: {fileID: 447110856120859301} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &475366956948792775 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3480099525846227001} + m_Modifications: + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8132169685942340323, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_Name + value: Spike (6) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} +--- !u!4 &3217880000568976945 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + m_PrefabInstance: {fileID: 475366956948792775} m_PrefabAsset: {fileID: 0} --- !u!1001 &620486034323729313 PrefabInstance: @@ -2212,80 +2275,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 4102716385745821080, guid: 8b81c4a5f8141c34581ba28db7d3a7ba, type: 3} m_PrefabInstance: {fileID: 620486034323729313} m_PrefabAsset: {fileID: 0} ---- !u!1001 &713656929327145386 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 5933999541716381340} - m_Modifications: - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalScale.x - value: 2.3369434 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalScale.y - value: 2.3369434 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalScale.z - value: 2.3369434 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalPosition.x - value: -6.53 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalPosition.y - value: 0.000000029802322 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalPosition.z - value: 5.78 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7032941376133530959, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_Name - value: Ice (10) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: debf7b76b0478c84595259122f220b1a, type: 3} ---- !u!4 &6745017140210057398 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - m_PrefabInstance: {fileID: 713656929327145386} - m_PrefabAsset: {fileID: 0} --- !u!1001 &715579826805508059 PrefabInstance: m_ObjectHideFlags: 0 @@ -2410,6 +2399,130 @@ Transform: m_CorrespondingSourceObject: {fileID: 1012316818468953382, guid: f8cb4efe6ab794f4589d73b6409c0805, type: 3} m_PrefabInstance: {fileID: 857085457073716068} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1013239799998562955 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3480099525846227001} + m_Modifications: + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.x + value: -2 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.z + value: -3 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8132169685942340323, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_Name + value: Spike (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} +--- !u!4 &2611845135308718461 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + m_PrefabInstance: {fileID: 1013239799998562955} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1156275533419480077 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3480099525846227001} + m_Modifications: + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.x + value: -2 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.z + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8132169685942340323, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_Name + value: Spike (10) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} +--- !u!4 &4195957431859857403 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + m_PrefabInstance: {fileID: 1156275533419480077} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1243108125754688829 PrefabInstance: m_ObjectHideFlags: 0 @@ -2846,227 +2959,129 @@ Transform: m_CorrespondingSourceObject: {fileID: 4102716385745821080, guid: 8b81c4a5f8141c34581ba28db7d3a7ba, type: 3} m_PrefabInstance: {fileID: 1532326202246358986} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1586968088684871488 +--- !u!1001 &1738782494703843575 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 5933999541716381340} + m_TransformParent: {fileID: 3480099525846227001} m_Modifications: - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalScale.x - value: 2.3369434 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalScale.y - value: 2.3369434 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalScale.z - value: 2.3369434 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalPosition.x - value: -8.76 + value: -3 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalPosition.y - value: 0.000000029802322 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalPosition.z - value: -7.29 + value: 2.5 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7032941376133530959, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 8132169685942340323, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_Name - value: Ice (1) + value: Spike (20) objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: debf7b76b0478c84595259122f220b1a, type: 3} ---- !u!4 &4790279114619559516 stripped + m_SourcePrefab: {fileID: 100100000, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} +--- !u!4 &3607812121244875521 stripped Transform: - m_CorrespondingSourceObject: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - m_PrefabInstance: {fileID: 1586968088684871488} + m_CorrespondingSourceObject: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + m_PrefabInstance: {fileID: 1738782494703843575} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1795387010942824582 +--- !u!1001 &1809681515200260039 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 5933999541716381340} + m_TransformParent: {fileID: 3480099525846227001} m_Modifications: - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalScale.x - value: 2.3369434 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalScale.y - value: 2.3369434 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalScale.z - value: 2.3369434 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalPosition.x - value: -4.36 + value: -4.5 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalPosition.y - value: 0.000000029802322 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalPosition.z - value: 6.37 + value: -1 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7032941376133530959, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 8132169685942340323, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_Name - value: Ice (7) + value: Spike (13) objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: debf7b76b0478c84595259122f220b1a, type: 3} ---- !u!4 &5518607813858218394 stripped + m_SourcePrefab: {fileID: 100100000, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} +--- !u!4 &3687784860786713649 stripped Transform: - m_CorrespondingSourceObject: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - m_PrefabInstance: {fileID: 1795387010942824582} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &1890306557038238457 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 5933999541716381340} - m_Modifications: - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalScale.x - value: 2.3369434 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalScale.y - value: 2.3369434 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalScale.z - value: 2.3369434 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalPosition.x - value: -9.69 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalPosition.z - value: -6.48 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7032941376133530959, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_Name - value: Ice - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: debf7b76b0478c84595259122f220b1a, type: 3} ---- !u!4 &5640689970083871717 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - m_PrefabInstance: {fileID: 1890306557038238457} + m_CorrespondingSourceObject: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + m_PrefabInstance: {fileID: 1809681515200260039} m_PrefabAsset: {fileID: 0} --- !u!1001 &1949953815591425131 PrefabInstance: @@ -3208,6 +3223,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 2332225084991166375, guid: 3770065ecdd9c6348989031b36c5324d, type: 3} m_PrefabInstance: {fileID: 1950947222804708063} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2080672398596323626 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3480099525846227001} + m_Modifications: + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.x + value: 4.5 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.z + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8132169685942340323, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_Name + value: Spike (19) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} +--- !u!4 &3949916293407210204 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + m_PrefabInstance: {fileID: 2080672398596323626} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2177596797855863602 PrefabInstance: m_ObjectHideFlags: 0 @@ -3450,6 +3527,10 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5483604360458066655, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} + propertyPath: m_LocalPosition.z + value: -6 + objectReference: {fileID: 0} - target: {fileID: 5711256728325704458, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} propertyPath: m_LocalScale.y value: 25 @@ -3574,7 +3655,7 @@ PrefabInstance: addedObject: {fileID: 8406193528259525156} - targetCorrespondingSourceObject: {fileID: 4291237925026304783, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} insertIndex: -1 - addedObject: {fileID: 5933999541716381340} + addedObject: {fileID: 3480099525846227001} - targetCorrespondingSourceObject: {fileID: 7798505859049167048, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3} insertIndex: -1 addedObject: {fileID: 1634167220817088965} @@ -3994,80 +4075,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 4102716385745821080, guid: 8b81c4a5f8141c34581ba28db7d3a7ba, type: 3} m_PrefabInstance: {fileID: 2699877412113136699} m_PrefabAsset: {fileID: 0} ---- !u!1001 &2708578466350718236 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 5933999541716381340} - m_Modifications: - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalScale.x - value: 2.3369434 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalScale.y - value: 2.3369434 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalScale.z - value: 2.3369434 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalPosition.x - value: -3.9400063 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalPosition.y - value: 0.000000029802322 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalPosition.z - value: 7.0999885 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7032941376133530959, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_Name - value: Ice (8) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: debf7b76b0478c84595259122f220b1a, type: 3} ---- !u!4 &8208579617023687680 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - m_PrefabInstance: {fileID: 2708578466350718236} - m_PrefabAsset: {fileID: 0} --- !u!1001 &2782104329412674630 PrefabInstance: m_ObjectHideFlags: 0 @@ -4290,6 +4297,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 4102716385745821080, guid: 8b81c4a5f8141c34581ba28db7d3a7ba, type: 3} m_PrefabInstance: {fileID: 2803916087141365462} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2910558198972917356 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3480099525846227001} + m_Modifications: + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.z + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8132169685942340323, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_Name + value: Spike (23) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} +--- !u!4 &167902262859589018 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + m_PrefabInstance: {fileID: 2910558198972917356} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2932923206388532556 PrefabInstance: m_ObjectHideFlags: 0 @@ -4352,6 +4421,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 1012316818468953382, guid: f8cb4efe6ab794f4589d73b6409c0805, type: 3} m_PrefabInstance: {fileID: 2932923206388532556} m_PrefabAsset: {fileID: 0} +--- !u!1001 &3121684191894252582 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3480099525846227001} + m_Modifications: + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.x + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8132169685942340323, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_Name + value: Spike (7) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} +--- !u!4 &99800809047617488 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + m_PrefabInstance: {fileID: 3121684191894252582} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3184446615736922754 PrefabInstance: m_ObjectHideFlags: 0 @@ -4714,6 +4845,130 @@ Transform: m_CorrespondingSourceObject: {fileID: 2332225084991166375, guid: 3770065ecdd9c6348989031b36c5324d, type: 3} m_PrefabInstance: {fileID: 3576881600954932687} m_PrefabAsset: {fileID: 0} +--- !u!1001 &3719546195123262280 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3480099525846227001} + m_Modifications: + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.x + value: -4 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8132169685942340323, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_Name + value: Spike (11) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} +--- !u!4 &1850584702858105022 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + m_PrefabInstance: {fileID: 3719546195123262280} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &3871547926023605902 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3480099525846227001} + m_Modifications: + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.x + value: -4.5 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8132169685942340323, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_Name + value: Spike + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} +--- !u!4 &2272737979922566520 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + m_PrefabInstance: {fileID: 3871547926023605902} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3931661529961866685 PrefabInstance: m_ObjectHideFlags: 0 @@ -4846,6 +5101,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 4102716385745821080, guid: 8b81c4a5f8141c34581ba28db7d3a7ba, type: 3} m_PrefabInstance: {fileID: 3938426874121646024} m_PrefabAsset: {fileID: 0} +--- !u!1001 &3951164615066950731 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3480099525846227001} + m_Modifications: + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.z + value: -3.5 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8132169685942340323, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_Name + value: Spike (16) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} +--- !u!4 &2082272977939062717 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + m_PrefabInstance: {fileID: 3951164615066950731} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3964459503121128796 PrefabInstance: m_ObjectHideFlags: 0 @@ -5138,6 +5455,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 1012316818468953382, guid: f8cb4efe6ab794f4589d73b6409c0805, type: 3} m_PrefabInstance: {fileID: 4340333647615901414} m_PrefabAsset: {fileID: 0} +--- !u!1001 &4547657367803116147 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3480099525846227001} + m_Modifications: + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.x + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.z + value: -3.5 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8132169685942340323, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_Name + value: Spike (15) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} +--- !u!4 &1525705687064967557 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + m_PrefabInstance: {fileID: 4547657367803116147} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4697273806317759204 PrefabInstance: m_ObjectHideFlags: 0 @@ -5792,80 +6171,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 4102716385745821080, guid: 8b81c4a5f8141c34581ba28db7d3a7ba, type: 3} m_PrefabInstance: {fileID: 5432808424673447832} m_PrefabAsset: {fileID: 0} ---- !u!1001 &5526897670163508120 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 5933999541716381340} - m_Modifications: - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalScale.x - value: 2.3369434 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalScale.y - value: 2.3369434 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalScale.z - value: 2.3369434 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalPosition.x - value: -8.34 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalPosition.y - value: 0.000000029802322 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalPosition.z - value: -6.56 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7032941376133530959, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_Name - value: Ice (2) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: debf7b76b0478c84595259122f220b1a, type: 3} ---- !u!4 &1787658907048053380 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - m_PrefabInstance: {fileID: 5526897670163508120} - m_PrefabAsset: {fileID: 0} --- !u!1001 &5543988308792355966 PrefabInstance: m_ObjectHideFlags: 0 @@ -6512,79 +6817,67 @@ Transform: m_CorrespondingSourceObject: {fileID: 4102716385745821080, guid: 8b81c4a5f8141c34581ba28db7d3a7ba, type: 3} m_PrefabInstance: {fileID: 5911210887699214463} m_PrefabAsset: {fileID: 0} ---- !u!1001 &5980613773444404906 +--- !u!1001 &6032538507254253224 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 5933999541716381340} + m_TransformParent: {fileID: 3480099525846227001} m_Modifications: - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalScale.x - value: 2.3369434 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalScale.y - value: 2.3369434 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalScale.z - value: 2.3369434 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalPosition.x - value: -9.03 + value: 2 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalPosition.y - value: 0.000000029802322 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalPosition.z - value: 3.86 + value: -3 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7032941376133530959, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 8132169685942340323, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_Name - value: Ice (4) + value: Spike (4) objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: debf7b76b0478c84595259122f220b1a, type: 3} ---- !u!4 &469252743578023862 stripped + m_SourcePrefab: {fileID: 100100000, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} +--- !u!4 &8756971001412715870 stripped Transform: - m_CorrespondingSourceObject: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - m_PrefabInstance: {fileID: 5980613773444404906} + m_CorrespondingSourceObject: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + m_PrefabInstance: {fileID: 6032538507254253224} m_PrefabAsset: {fileID: 0} --- !u!1001 &6082679717671672372 PrefabInstance: @@ -6944,6 +7237,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 4102716385745821080, guid: 8b81c4a5f8141c34581ba28db7d3a7ba, type: 3} m_PrefabInstance: {fileID: 6381815746718958884} m_PrefabAsset: {fileID: 0} +--- !u!1001 &6475442344252705258 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3480099525846227001} + m_Modifications: + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.z + value: -2.5 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8132169685942340323, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_Name + value: Spike (17) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} +--- !u!4 &8353482373432592924 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + m_PrefabInstance: {fileID: 6475442344252705258} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6503044352849334625 PrefabInstance: m_ObjectHideFlags: 0 @@ -7166,6 +7521,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 1012316818468953382, guid: f8cb4efe6ab794f4589d73b6409c0805, type: 3} m_PrefabInstance: {fileID: 6594240975430032370} m_PrefabAsset: {fileID: 0} +--- !u!1001 &6723219099819077003 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3480099525846227001} + m_Modifications: + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.x + value: -4 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.z + value: -2 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8132169685942340323, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_Name + value: Spike (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} +--- !u!4 &8610125282022338173 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + m_PrefabInstance: {fileID: 6723219099819077003} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6735394313693877442 PrefabInstance: m_ObjectHideFlags: 0 @@ -7972,79 +8389,67 @@ Transform: m_CorrespondingSourceObject: {fileID: 2332225084991166375, guid: 3770065ecdd9c6348989031b36c5324d, type: 3} m_PrefabInstance: {fileID: 7485458454818661229} m_PrefabAsset: {fileID: 0} ---- !u!1001 &7490595269811284452 +--- !u!1001 &7541140339724882100 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 5933999541716381340} + m_TransformParent: {fileID: 3480099525846227001} m_Modifications: - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalScale.x - value: 2.3369434 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalScale.y - value: 2.3369434 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalScale.z - value: 2.3369434 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalPosition.x - value: -9.960004 + value: 4.5 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalPosition.z - value: 4.669994 + value: 1 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7032941376133530959, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 8132169685942340323, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_Name - value: Ice (3) + value: Spike (18) objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: debf7b76b0478c84595259122f220b1a, type: 3} ---- !u!4 &3715336505770412280 stripped + m_SourcePrefab: {fileID: 100100000, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} +--- !u!4 &4798409868118643522 stripped Transform: - m_CorrespondingSourceObject: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - m_PrefabInstance: {fileID: 7490595269811284452} + m_CorrespondingSourceObject: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + m_PrefabInstance: {fileID: 7541140339724882100} m_PrefabAsset: {fileID: 0} --- !u!1001 &7583758775408199678 PrefabInstance: @@ -8302,6 +8707,130 @@ Transform: m_CorrespondingSourceObject: {fileID: 1012316818468953382, guid: f8cb4efe6ab794f4589d73b6409c0805, type: 3} m_PrefabInstance: {fileID: 7895543197092169668} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7915489479288099009 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3480099525846227001} + m_Modifications: + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.x + value: -3 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.z + value: -2.5 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8132169685942340323, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_Name + value: Spike (14) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} +--- !u!4 &5181836447897113399 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + m_PrefabInstance: {fileID: 7915489479288099009} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &7938187266718941533 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3480099525846227001} + m_Modifications: + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.z + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8132169685942340323, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_Name + value: Spike (8) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} +--- !u!4 &4907507663175451307 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + m_PrefabInstance: {fileID: 7938187266718941533} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7945425234005582338 PrefabInstance: m_ObjectHideFlags: 0 @@ -8453,6 +8982,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 4102716385745821080, guid: 8b81c4a5f8141c34581ba28db7d3a7ba, type: 3} m_PrefabInstance: {fileID: 8003492573905704357} m_PrefabAsset: {fileID: 0} +--- !u!1001 &8091806720012102504 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3480099525846227001} + m_Modifications: + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.z + value: 3.5 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8132169685942340323, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_Name + value: Spike (22) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} +--- !u!4 &6519871009861658782 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + m_PrefabInstance: {fileID: 8091806720012102504} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8162545417958466146 PrefabInstance: m_ObjectHideFlags: 0 @@ -8531,6 +9122,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 2332225084991166375, guid: 3770065ecdd9c6348989031b36c5324d, type: 3} m_PrefabInstance: {fileID: 8162545417958466146} m_PrefabAsset: {fileID: 0} +--- !u!1001 &8522482978391196822 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3480099525846227001} + m_Modifications: + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.x + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.z + value: 3.5 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8132169685942340323, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_Name + value: Spike (21) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} +--- !u!4 &6662251463093864288 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + m_PrefabInstance: {fileID: 8522482978391196822} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8616586122782188520 PrefabInstance: m_ObjectHideFlags: 0 @@ -8687,79 +9340,67 @@ Transform: m_CorrespondingSourceObject: {fileID: 4102716385745821080, guid: 8b81c4a5f8141c34581ba28db7d3a7ba, type: 3} m_PrefabInstance: {fileID: 8616904565614743056} m_PrefabAsset: {fileID: 0} ---- !u!1001 &8619892919156626085 +--- !u!1001 &8772090563899233513 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 5933999541716381340} + m_TransformParent: {fileID: 3480099525846227001} m_Modifications: - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalScale.x - value: 2.3369434 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalScale.y - value: 2.3369434 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalScale.z - value: 2.3369434 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalPosition.x - value: -6.69 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalPosition.y - value: 0.000000029802322 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalPosition.z value: 4 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7032941376133530959, guid: debf7b76b0478c84595259122f220b1a, type: 3} + - target: {fileID: 8132169685942340323, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} propertyPath: m_Name - value: Ice (9) + value: Spike (9) objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: debf7b76b0478c84595259122f220b1a, type: 3} ---- !u!4 &2584068484972573625 stripped + m_SourcePrefab: {fileID: 100100000, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} +--- !u!4 &6020286381167630111 stripped Transform: - m_CorrespondingSourceObject: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - m_PrefabInstance: {fileID: 8619892919156626085} + m_CorrespondingSourceObject: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + m_PrefabInstance: {fileID: 8772090563899233513} m_PrefabAsset: {fileID: 0} --- !u!1001 &8830330357174706309 PrefabInstance: @@ -8835,6 +9476,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 9107462169778091155, guid: 2061eac14338dc44bb46d8dec959f333, type: 3} m_PrefabInstance: {fileID: 8830330357174706309} m_PrefabAsset: {fileID: 0} +--- !u!1001 &8857797227559458073 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3480099525846227001} + m_Modifications: + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.x + value: -5 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8132169685942340323, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_Name + value: Spike (12) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} +--- !u!4 &5827047486669477615 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + m_PrefabInstance: {fileID: 8857797227559458073} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8868623991718495346 PrefabInstance: m_ObjectHideFlags: 0 @@ -9157,80 +9860,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 5867124902333675868, guid: 91640f45549eea64a99d8d8951397387, type: 3} m_PrefabInstance: {fileID: 9067056808483166498} m_PrefabAsset: {fileID: 0} ---- !u!1001 &9101177745073447807 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 5933999541716381340} - m_Modifications: - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalScale.x - value: 2.3369434 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalScale.y - value: 2.3369434 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalScale.z - value: 2.3369434 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalPosition.x - value: -6.1 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalPosition.z - value: 7.88 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7032941376133530959, guid: debf7b76b0478c84595259122f220b1a, type: 3} - propertyPath: m_Name - value: Ice (6) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: debf7b76b0478c84595259122f220b1a, type: 3} ---- !u!4 &3040376804757275235 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6087870985383321884, guid: debf7b76b0478c84595259122f220b1a, type: 3} - m_PrefabInstance: {fileID: 9101177745073447807} - m_PrefabAsset: {fileID: 0} --- !u!1001 &9109499625811234521 PrefabInstance: m_ObjectHideFlags: 0 @@ -9293,3 +9922,65 @@ Transform: m_CorrespondingSourceObject: {fileID: 4102716385745821080, guid: 8b81c4a5f8141c34581ba28db7d3a7ba, type: 3} m_PrefabInstance: {fileID: 9109499625811234521} m_PrefabAsset: {fileID: 0} +--- !u!1001 &9200691137651272604 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3480099525846227001} + m_Modifications: + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalPosition.z + value: -4 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8132169685942340323, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + propertyPath: m_Name + value: Spike (3) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} +--- !u!4 &6169800246413142122 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3040179841020937206, guid: 2bb9f657adfee8c4aa182f51c1821988, type: 3} + m_PrefabInstance: {fileID: 9200691137651272604} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/05.Prefabs/Particles/LeafParticle.prefab b/Assets/05.Prefabs/Particles/LeafParticle.prefab index 4bfdb4074..38f1dbeea 100644 --- a/Assets/05.Prefabs/Particles/LeafParticle.prefab +++ b/Assets/05.Prefabs/Particles/LeafParticle.prefab @@ -1460,8 +1460,8 @@ ParticleSystem: startFrame: serializedVersion: 2 minMaxState: 3 - scalar: 0.75 - minScalar: 0 + scalar: 0.9999 + minScalar: 0.5 maxCurve: serializedVersion: 2 m_Curve: diff --git a/Assets/05.Prefabs/Props/DamageableProps/BaseDamageableProps.prefab b/Assets/05.Prefabs/Props/DamageableProps/BaseDamageableProps.prefab index 1b2f49ec6..91405f409 100644 --- a/Assets/05.Prefabs/Props/DamageableProps/BaseDamageableProps.prefab +++ b/Assets/05.Prefabs/Props/DamageableProps/BaseDamageableProps.prefab @@ -13,7 +13,7 @@ GameObject: - component: {fileID: 1772409705626034443} m_Layer: 16 m_Name: BaseDamageableProps - m_TagString: DamageableProps + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -56,8 +56,8 @@ Rigidbody: m_Bits: 0 m_ImplicitCom: 1 m_ImplicitTensor: 1 - m_UseGravity: 1 - m_IsKinematic: 0 + m_UseGravity: 0 + m_IsKinematic: 1 m_Interpolate: 0 m_Constraints: 112 m_CollisionDetection: 0 @@ -82,6 +82,93 @@ SphereCollider: serializedVersion: 3 m_Radius: 0.5 m_Center: {x: 0, y: 0.5, z: 0} +--- !u!1 &6089626013294030450 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7989795650755209638} + - component: {fileID: 5075219968660412138} + m_Layer: 16 + m_Name: Shadow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7989795650755209638 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6089626013294030450} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7438534416270888028} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &5075219968660412138 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6089626013294030450} + m_Enabled: 1 + m_CastShadows: 3 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: ee61efd036130b847b41f878f20ddf33, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &7835622629792856689 GameObject: m_ObjectHideFlags: 0 @@ -92,7 +179,7 @@ GameObject: m_Component: - component: {fileID: 7438534416270888028} - component: {fileID: 3580758810857167321} - m_Layer: 0 + m_Layer: 16 m_Name: VisualLook m_TagString: Untagged m_Icon: {fileID: 0} @@ -111,7 +198,8 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 7989795650755209638} m_Father: {fileID: 7986070582027999988} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &3580758810857167321 @@ -137,7 +225,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: cc9b0fce917bc9548bd1bf66aa23a269, type: 2} + - {fileID: 2100000, guid: 33fe0716974723b4db51774fcb38b8c7, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/05.Prefabs/Props/DamageableProps/Rockfall.prefab b/Assets/05.Prefabs/Props/DamageableProps/Rockfall.prefab index 51f073956..a0c6ba881 100644 --- a/Assets/05.Prefabs/Props/DamageableProps/Rockfall.prefab +++ b/Assets/05.Prefabs/Props/DamageableProps/Rockfall.prefab @@ -1,92 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &2120541508449996527 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6229300703101880482} - - component: {fileID: 5119753316800573436} - m_Layer: 0 - m_Name: Shadow - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6229300703101880482 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2120541508449996527} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 6241053207180088262} - m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0} ---- !u!212 &5119753316800573436 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2120541508449996527} - m_Enabled: 1 - m_CastShadows: 3 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: d3c87e7ec1e83654cb2bff3178900c99, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 5 - m_Sprite: {fileID: 21300000, guid: 27e9d61a31b61aa40ad14805e0c184eb, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &8995215974275723360 GameObject: m_ObjectHideFlags: 0 @@ -155,14 +68,6 @@ PrefabInstance: propertyPath: m_ExcludeLayers.m_Bits value: 1024 objectReference: {fileID: 0} - - target: {fileID: 2892108968249248585, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3} - propertyPath: m_UseGravity - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2892108968249248585, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3} - propertyPath: m_IsKinematic - value: 1 - objectReference: {fileID: 0} - target: {fileID: 3580758810857167321, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3} propertyPath: m_Sprite value: @@ -183,6 +88,14 @@ PrefabInstance: propertyPath: m_Layer value: 16 objectReference: {fileID: 0} + - target: {fileID: 5075219968660412138, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 27e9d61a31b61aa40ad14805e0c184eb, type: 3} + - target: {fileID: 5075219968660412138, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7438534416270888028, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3} propertyPath: m_LocalScale.x value: 2 @@ -277,9 +190,6 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 7986070582027999988, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3} insertIndex: -1 addedObject: {fileID: 1426941151981288099} - - targetCorrespondingSourceObject: {fileID: 7438534416270888028, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3} - insertIndex: -1 - addedObject: {fileID: 6229300703101880482} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3} insertIndex: -1 @@ -328,11 +238,6 @@ SphereCollider: m_CorrespondingSourceObject: {fileID: 1772409705626034443, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3} m_PrefabInstance: {fileID: 3577643095578124186} m_PrefabAsset: {fileID: 0} ---- !u!4 &6241053207180088262 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7438534416270888028, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3} - m_PrefabInstance: {fileID: 3577643095578124186} - m_PrefabAsset: {fileID: 0} --- !u!1 &6709217980892358123 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7835622629792856689, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3} diff --git a/Assets/05.Prefabs/Props/DamageableProps/Spike.prefab b/Assets/05.Prefabs/Props/DamageableProps/Spike.prefab new file mode 100644 index 000000000..b59601dfa --- /dev/null +++ b/Assets/05.Prefabs/Props/DamageableProps/Spike.prefab @@ -0,0 +1,136 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &4964334121554974978 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3580758810857167321, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 27e9d61a31b61aa40ad14805e0c184eb, type: 3} + - target: {fileID: 3580758810857167321, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3764902268943045601, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3} + propertyPath: m_Name + value: Spike + objectReference: {fileID: 0} + - target: {fileID: 5075219968660412138, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 27e9d61a31b61aa40ad14805e0c184eb, type: 3} + - target: {fileID: 5075219968660412138, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7438534416270888028, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3} + propertyPath: m_LocalScale.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7438534416270888028, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3} + propertyPath: m_LocalScale.y + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 7438534416270888028, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3} + propertyPath: m_LocalPosition.z + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 7438534416270888028, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9396927 + objectReference: {fileID: 0} + - target: {fileID: 7438534416270888028, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3} + propertyPath: m_LocalRotation.x + value: 0.3420201 + objectReference: {fileID: 0} + - target: {fileID: 7438534416270888028, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3} + propertyPath: m_LocalScale.x + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3} + propertyPath: m_LocalScale.y + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3} + propertyPath: m_LocalScale.z + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7986070582027999988, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3764902268943045601, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3} + insertIndex: -1 + addedObject: {fileID: 2012343921927033206} + m_SourcePrefab: {fileID: 100100000, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3} +--- !u!1 &8132169685942340323 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3764902268943045601, guid: bfc5c806b2fa3ba40850df302d3db0b7, type: 3} + m_PrefabInstance: {fileID: 4964334121554974978} + m_PrefabAsset: {fileID: 0} +--- !u!114 &2012343921927033206 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8132169685942340323} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 57e5dbde2eb0d2b419d7f0ae58106bb3, type: 3} + m_Name: + m_EditorClassIdentifier: + k__BackingField: 1 + k__BackingField: 0 + k__BackingField: 0 + DieSfxName: SpikeAttacked + DieParticle: {fileID: 1732485757689188744, guid: 3f54769ccfa54f64eb074ce5dc9786a3, type: 3} diff --git a/Assets/05.Prefabs/Props/Environment/Ice.prefab.meta b/Assets/05.Prefabs/Props/DamageableProps/Spike.prefab.meta similarity index 74% rename from Assets/05.Prefabs/Props/Environment/Ice.prefab.meta rename to Assets/05.Prefabs/Props/DamageableProps/Spike.prefab.meta index 86154de16..f33c2f143 100644 --- a/Assets/05.Prefabs/Props/Environment/Ice.prefab.meta +++ b/Assets/05.Prefabs/Props/DamageableProps/Spike.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: debf7b76b0478c84595259122f220b1a +guid: 2bb9f657adfee8c4aa182f51c1821988 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/05.Prefabs/Props/Environment/Ice.prefab b/Assets/05.Prefabs/Props/Environment/Ice.prefab deleted file mode 100644 index 41cbf9a75..000000000 --- a/Assets/05.Prefabs/Props/Environment/Ice.prefab +++ /dev/null @@ -1,75 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &8368194104949569211 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1566068327986459636, guid: 3770065ecdd9c6348989031b36c5324d, type: 3} - propertyPath: m_Name - value: Ice - objectReference: {fileID: 0} - - target: {fileID: 2332225084991166375, guid: 3770065ecdd9c6348989031b36c5324d, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2332225084991166375, guid: 3770065ecdd9c6348989031b36c5324d, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2332225084991166375, guid: 3770065ecdd9c6348989031b36c5324d, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2332225084991166375, guid: 3770065ecdd9c6348989031b36c5324d, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2332225084991166375, guid: 3770065ecdd9c6348989031b36c5324d, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2332225084991166375, guid: 3770065ecdd9c6348989031b36c5324d, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2332225084991166375, guid: 3770065ecdd9c6348989031b36c5324d, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2332225084991166375, guid: 3770065ecdd9c6348989031b36c5324d, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2332225084991166375, guid: 3770065ecdd9c6348989031b36c5324d, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2332225084991166375, guid: 3770065ecdd9c6348989031b36c5324d, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6478899538119308729, guid: 3770065ecdd9c6348989031b36c5324d, type: 3} - propertyPath: m_LocalRotation.w - value: 0.9396927 - objectReference: {fileID: 0} - - target: {fileID: 6478899538119308729, guid: 3770065ecdd9c6348989031b36c5324d, type: 3} - propertyPath: m_LocalRotation.x - value: 0.3420201 - objectReference: {fileID: 0} - - target: {fileID: 6478899538119308729, guid: 3770065ecdd9c6348989031b36c5324d, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 40 - objectReference: {fileID: 0} - - target: {fileID: 6749177542453196807, guid: 3770065ecdd9c6348989031b36c5324d, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 27e9d61a31b61aa40ad14805e0c184eb, type: 3} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 3770065ecdd9c6348989031b36c5324d, type: 3} diff --git a/Assets/08.Spines/Characters/Enemies/Bosses/Sandmole/SandMole_spine.skel.bytes b/Assets/08.Spines/Characters/Enemies/Bosses/Sandmole/SandMole_spine.skel.bytes index d451391aafb4c71052147390b593a2cfe8e18667..fd2d5d53e0f369abf0ceedab9c2bdd46382e1823 100644 GIT binary patch delta 1369 zcmZXUOK1~O6o&7ei6pj7?Ndc6b)ix>u{1@bn3>5Kt%6{nx)BtVl(wLW)*vFtbfFX(cVn#2N&N=rx_wk?mr}{*mc_X{4 znO_4R_DoHM`(u5vc;EeJ(a*E*8x~UgT$vi_`f;cG`R+(lC^a^`I;>ynO?OVWq?1vn zX=pT;%a3J8wq-MIa;X&3*fsZ1GsPOXDyxeN`^PY0yWm%O<%aim&;mQXH{VaDVAP{kjPpf=NxOQeYMQ`ng~JlrV4 z)Il|;I!L7$+$WOWPmuJauopmKJRyZbN0Q46AQ!1p3(C5#0@@$<^;hR>h4c`XFekh} zBl~^9EUlV1_pbei}6Rh%@<-K!7IkW+~7Qp;A)?q}UodL@4Z;(Qt1C-zR z|ERJ@L4UkY!piUi4n-Q19dzH0NI(WWlfcUA-FUwqYyoimh7^klERQ7Qf(_Jm}1 U6f6F|GHm1>fXpzR-haLE559HTwPY4MF XL}_Im2LqEZP!+QfP(cl|Ut*;TOTicR diff --git a/Assets/Resources/Excel/CharacterData.xlsx b/Assets/Resources/Excel/CharacterData.xlsx index 3662884ac33d7398b14beb881a61bced54453ff7..71f6f7120928525b393ec0c70d73a7223e7c090a 100644 GIT binary patch delta 2483 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 C(SpeU diff --git a/Assets/Resources/Excel/ItemDataTable.xlsx b/Assets/Resources/Excel/ItemDataTable.xlsx index 0db2de0995ac7606d1dcd5e9fdda0764c47c7b0e..a0502d10c5b8eecee10a29299262002b9ef8f4c6 100644 GIT binary patch delta 2778 zcmY+Gc{J3E8^*szmMO9{glQuCIy3e?WJwstG9!v?Su$C#Ww`lf-)*nw8iwwU_sKQPAQPHsW{Q5Bc_P<>qC$K(Q!j-s*%E}IPlI#bKZaEiE zswD3H^9@XBgZ<=rx89Nxz2+|y#>w~YJRF(PT-Hw9n7)Z~RJV{tuEORN&N@_;i7xNq zQY@|Z*V!G+K(dxpX}Lp+U+$&n+QNDSR9tI2Y<>cA*RiyGwB^dV%Wqv?-pKa~IbIe_xE- zRSn=HeYovzYpn_d_M6xEYhyidD)f%Zc<~1kO>M8D!G`-=oO6jz0Ak@t=4DiZ+%MQ zuWBZGdqobLhc;%`7*m$++DY0x0y!z}pp8`hB`Ob|wNn&MuZQXp>UUr;-$mQMExLS5%vQFk-)iyC7gK>5gx+2li?K zYKzb0(wU%&)5*vxe6|cloc31eM5J`Ly-5QFQPplfoIX(Stt{j?n3>Jp2grxG_m zuP5K?_e?&D^@FN*1&9dA^*mmFKw_F#`qDrI%S%~CzP}yG$afE7rb94`T-~i)Upiw` zDFY{NOc_7f?0rjcTOjGx{jk<~(rYkF*VuX?e~#_VDCgHMK|x8o4E$NHOXyLVZx`0! zWhf8&wK{6O4pI6$?*rO!+#s4V)WdZPaFmOmh7lxi1aBxBj}< zmEYyv(JfLGB+nix1sKLf7b z>_SsL7m#^NPMJsPX%je$v5pds!5Gs!qR_Sk`$-;ZdNSlk$XD&ovx}3oPzJbh#6o@} z03)j*Pt){I%0o^oOok7Zu>(N88~_Lal!q_;$;WdGst!)*^n0Cy?P-7MIlwC{km&y_Dr zuy$OAap?ZVGNYKYLdj+zrF5lFB_gK{RG&6)c*Ek}!*r?C)=t1yO2F3{BwbH40eNXQ@cW3AMX#EaZy;E1=%^ zGkUDd#b)QP-%ne+qj$?xyr63s@RDt&B~ck5Ix z@@FJfUcQ%8*86ho@q-azT~g8&KHV~T!4{!xJkFMK51i^atAsI|b(-cdhnm?MIH(mv zRV#AbP0ZfU^%s#WWnsq_y*HJ!@L4&zSRCbgrW7RFN3+7a#i*#~spZQtj-!F6HEj;~ zcn!R9SIN-pn8NY_)4< zHr=fzsPXS^L#_?(Fw+V-0u`Ypz}>#XqmNa28ZthdOh7Qt=Y2Rdo(xv5BF1&OhO#=O zg&pUq!dv6UJb+6DvbD=@tJ`@=x5%p!(jewM*Ku(d+0Y_0S;Tet^R$T|tCx~#CoQa8 zi=*%UjW-gg`V5WqXp7!?2l;%TPI~l(u((BKW)02?>f?8L2f}-e z$MreQpZIU5il!KDuP& z)v+Ch?o6Gm%&FSg3o3UzDJA9|Bo)gxcRN)bb@{>oj`TzRh0BGl!0MrDY|l@fIB4j~ z)?SxZ+a8J=9Zm-mR$o6FY=2mwWt*5q{v-)!A7M1nS6e>zlbNIx!Ro0@7C}4#Z<3*( zpDDtVtF(SYbS5@$jaASP1!Nor^N*=jPICuaewU8hL3-HCU(TCQBX%~13a4?W*((>v z#bS6_)aO#2gI^(KvCv3r!?jnzdan0{gaewzN>2xClFWRq-xUU)57YbxA!;hA$7CJz z68)SzZ~af`j{co8JjGhUcI~4v|x>`SO@ScfmxIe zZuaA80@6}Upj9jy7C(bI;wst1x@dSY%Li+nS>Qk8pwh0ofe^c7J~7-3`bTp*sBAwu zco?O-T(-UYST@fJ+maz_5WOtMc7oi>O^g|*zsM80442hVD7||Ep*&Ndxv%drHWp0G6g1;cAG}WSJ}Og?m7bMa`F{w=Kt^*)6ss0 zCoR%y*|jYQPrLaSILJQ{y3*H)pr-tRupC(Pj(VVg6=Jw9GNR%C%LNUKpvf-|miB1h zF#~>Bgz}O3x#x4@r$mE7Fh}0{I!t3~2Ztl39ZbK@OUsvaWQP7mM=}Iy$s|IyMk<{9 zZ{hvJlfTE2VA|4uMI0D%3r{901Ug(xZbzwcxM b08a=2@cc)YBrl*YGSSGQXfalj!Y}FnK05}O delta 2786 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 diff --git a/Assets/Resources/Excel/ItemDropTable.xlsx b/Assets/Resources/Excel/ItemDropTable.xlsx index 5f73198605d511f41df577dd1640fb8625075b3a..1fa30f94a750979ba057ec251b9f71c9a8060973 100644 GIT binary patch delta 2484 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 delta 2460 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 a00000007IA!6`lgR+1_s1~exC0000zr;u3y diff --git a/Assets/Resources/JSON/CharacterData.json b/Assets/Resources/JSON/CharacterData.json index 791c97e5e..b0ffbaf26 100644 --- a/Assets/Resources/JSON/CharacterData.json +++ b/Assets/Resources/JSON/CharacterData.json @@ -13,6 +13,6 @@ }, { "CharacterIdx": 4, - "Name": "유령 술통" + "Name": "술통 유령" } ] \ No newline at end of file diff --git a/Assets/Resources/JSON/ItemDataTable.json b/Assets/Resources/JSON/ItemDataTable.json index aa77d9457..7d3cdb19e 100644 --- a/Assets/Resources/JSON/ItemDataTable.json +++ b/Assets/Resources/JSON/ItemDataTable.json @@ -403,5 +403,14 @@ "Price": 0, "Weight": 0, "Desciption": "" + }, + { + "Idx": 60001, + "Name": "젬스톤", + "Category": 6, + "Type": 0, + "Price": 1000, + "Weight": 100, + "Desciption": "" } ] \ No newline at end of file diff --git a/Assets/Resources/JSON/ItemDropTable.json b/Assets/Resources/JSON/ItemDropTable.json index 8fa6b6ae8..49facab99 100644 --- a/Assets/Resources/JSON/ItemDropTable.json +++ b/Assets/Resources/JSON/ItemDropTable.json @@ -20,6 +20,13 @@ "QuantityMin": 1, "QuantityMax": 1 }, + { + "CharacterIdx": 1, + "ItemIdx": 60001, + "DropRate": 100, + "QuantityMin": 1, + "QuantityMax": 1 + }, { "CharacterIdx": 2, "ItemIdx": 50002, diff --git a/Packages/manifest.json b/Packages/manifest.json index 15307ba72..b91ad63d8 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -4,6 +4,7 @@ "com.esotericsoftware.spine.spine-csharp": "https://github.com/EsotericSoftware/spine-runtimes.git?path=spine-csharp/src#4.2", "com.esotericsoftware.spine.spine-unity": "https://github.com/EsotericSoftware/spine-runtimes.git?path=spine-unity/Assets/Spine#4.2", "com.esotericsoftware.spine.spine-unity-examples": "https://github.com/EsotericSoftware/spine-runtimes.git?path=spine-unity/Assets/Spine Examples#4.2", + "com.esotericsoftware.spine.timeline": "https://github.com/EsotericSoftware/spine-runtimes.git?path=spine-unity/Modules/com.esotericsoftware.spine.timeline#4.2", "com.esotericsoftware.spine.urp-shaders": "https://github.com/EsotericSoftware/spine-runtimes.git?path=spine-unity/Modules/com.esotericsoftware.spine.urp-shaders#4.2", "com.github-glitchenzo.nugetforunity": "https://github.com/GlitchEnzo/NuGetForUnity.git?path=/src/NuGetForUnity", "com.unity.cinemachine": "3.1.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 46a3c35af..a49ae4f28 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -71,6 +71,16 @@ }, "hash": "c79f89b1eb0fcacaab3b3ff9b10f4338699d8152" }, + "com.esotericsoftware.spine.timeline": { + "version": "https://github.com/EsotericSoftware/spine-runtimes.git?path=spine-unity/Modules/com.esotericsoftware.spine.timeline#4.2", + "depth": 0, + "source": "git", + "dependencies": { + "com.unity.timeline": "1.2.10", + "com.esotericsoftware.spine.spine-unity": "4.2.13" + }, + "hash": "82cb7f5cad3e33b11094a7f52c8fdfa70c7c1787" + }, "com.esotericsoftware.spine.urp-shaders": { "version": "https://github.com/EsotericSoftware/spine-runtimes.git?path=spine-unity/Modules/com.esotericsoftware.spine.urp-shaders#4.2", "depth": 0,