From 1105ee3d4171122f0265f0ba7117d15c82e8b064 Mon Sep 17 00:00:00 2001 From: Claire Peta Date: Thu, 26 Sep 2019 15:54:05 +1000 Subject: [PATCH] Fix max players to 8 Fix crystal and boulder prefab and loss of life --- Assets/Prefabs/Traps/CrushingBoulder.prefab | 314 ++++++------------ Assets/Prefabs/Traps/CubeWithCrystals.prefab | 79 ++--- Assets/Scenes/Client Scenes/ClientScene.unity | 4 +- Assets/Scripts/Traps/CrushingBoulder.cs | 2 +- Assets/Scripts/Traps/CubeWithCrystals.cs | 2 +- Assets/Scripts/UI/Client/LoginUIManager.cs | 2 +- 6 files changed, 136 insertions(+), 267 deletions(-) diff --git a/Assets/Prefabs/Traps/CrushingBoulder.prefab b/Assets/Prefabs/Traps/CrushingBoulder.prefab index a802d05..c50b3c4 100644 --- a/Assets/Prefabs/Traps/CrushingBoulder.prefab +++ b/Assets/Prefabs/Traps/CrushingBoulder.prefab @@ -1,5 +1,82 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &223503848283704956 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 221223356523270764} + - component: {fileID: 245025289801813402} + - component: {fileID: 237300289793462750} + m_Layer: 0 + m_Name: Cube_GroundWGrass + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 4294967295 + m_IsActive: 1 +--- !u!4 &221223356523270764 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 223503848283704956} + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6745622317302131140} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &245025289801813402 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 223503848283704956} + m_Mesh: {fileID: 4300000, guid: d73f25ac0bcef5b469863e30ce33634b, type: 3} +--- !u!23 &237300289793462750 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 223503848283704956} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a12203d8d2df33d4f814e1a381ba565f, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 --- !u!1 &6745622315908332764 GameObject: m_ObjectHideFlags: 0 @@ -36,7 +113,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 18.470001, y: -90.00001, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0.354, y: 1.4} + m_AnchoredPosition: {x: 0.354, y: 3.409} m_SizeDelta: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!23 &6745622315908332752 @@ -217,6 +294,7 @@ GameObject: m_Component: - component: {fileID: 6745622317302131140} - component: {fileID: 4087432991862725476} + - component: {fileID: 8065136616699866336} m_Layer: 0 m_Name: CrushingBoulder m_TagString: Untagged @@ -237,7 +315,7 @@ Transform: m_Children: - {fileID: 6741087515541790872} - {fileID: 6745622315908332759} - - {fileID: 7212950232714103513} + - {fileID: 221223356523270764} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -253,8 +331,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 87ae70f1ec0c67743923bd4a83ee85d8, type: 3} m_Name: m_EditorClassIdentifier: - VisualOffset: {x: 0, y: 0, z: 0} - is_Walkable: 0 + VisualOffset: {x: 0, y: 0.5, z: 0} + is_Walkable: 1 isWater: 0 isPit: 0 isCrystals: 0 @@ -263,128 +341,19 @@ MonoBehaviour: SpawnDirection: 2 countdowntimer: 3 counter: {fileID: 6745622315908332755} ---- !u!1001 &1839697205776302118 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 7212950232714103513} - m_Modifications: - - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_Name - value: Cube_GroundU - objectReference: {fileID: 0} - - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalPosition.y - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e5fac62723232674aa487c9073f1ca07, type: 3} ---- !u!1001 &2825495671297622863 -PrefabInstance: +--- !u!65 &8065136616699866336 +BoxCollider: m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6745622317302131141} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 7212950232714103513} - m_Modifications: - - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_Name - value: Cube_GroundL - objectReference: {fileID: 0} - - target: {fileID: 1133981147424236, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalPosition.y - value: -2 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4721099042904524, guid: e5fac62723232674aa487c9073f1ca07, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e5fac62723232674aa487c9073f1ca07, type: 3} + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!1001 &6745622316608603784 PrefabInstance: m_ObjectHideFlags: 0 @@ -392,21 +361,13 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6745622317302131140} m_Modifications: - - target: {fileID: 1252527896654764, guid: d2a34a5082f5c524b845ab11a78a7214, type: 3} - propertyPath: m_Name - value: Rock_2 (2) - objectReference: {fileID: 0} - - target: {fileID: 1252527896654764, guid: d2a34a5082f5c524b845ab11a78a7214, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4614242176542224, guid: d2a34a5082f5c524b845ab11a78a7214, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - target: {fileID: 4614242176542224, guid: d2a34a5082f5c524b845ab11a78a7214, type: 3} propertyPath: m_LocalPosition.y - value: 1 + value: 3 objectReference: {fileID: 0} - target: {fileID: 4614242176542224, guid: d2a34a5082f5c524b845ab11a78a7214, type: 3} propertyPath: m_LocalPosition.z @@ -452,90 +413,19 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 1.2289 objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: d2a34a5082f5c524b845ab11a78a7214, type: 3} ---- !u!4 &6741087515541790872 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4614242176542224, guid: d2a34a5082f5c524b845ab11a78a7214, - type: 3} - m_PrefabInstance: {fileID: 6745622316608603784} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &7212084370745998701 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 6745622317302131140} - m_Modifications: - - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3} + - target: {fileID: 1252527896654764, guid: d2a34a5082f5c524b845ab11a78a7214, type: 3} propertyPath: m_Name - value: Cube_GroundWGrass (11) - objectReference: {fileID: 0} - - target: {fileID: 1141756196039588, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_TagString - value: Coloured - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalPosition.y - value: -2 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalRotation.y - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalRotation.w - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: Rock_2 (2) objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalEulerAnglesHint.z + - target: {fileID: 1252527896654764, guid: d2a34a5082f5c524b845ab11a78a7214, type: 3} + propertyPath: m_StaticEditorFlags value: 0 objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: d7698c69246c64044ab2a94628bf0291, type: 3} ---- !u!4 &7212950232714103513 stripped + m_SourcePrefab: {fileID: 100100000, guid: d2a34a5082f5c524b845ab11a78a7214, type: 3} +--- !u!4 &6741087515541790872 stripped Transform: - m_CorrespondingSourceObject: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, + m_CorrespondingSourceObject: {fileID: 4614242176542224, guid: d2a34a5082f5c524b845ab11a78a7214, type: 3} - m_PrefabInstance: {fileID: 7212084370745998701} + m_PrefabInstance: {fileID: 6745622316608603784} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Traps/CubeWithCrystals.prefab b/Assets/Prefabs/Traps/CubeWithCrystals.prefab index d5620d2..c9a5ed1 100644 --- a/Assets/Prefabs/Traps/CubeWithCrystals.prefab +++ b/Assets/Prefabs/Traps/CubeWithCrystals.prefab @@ -46,7 +46,6 @@ GameObject: - component: {fileID: 9119206199061355250} - component: {fileID: 2280553813620852594} - component: {fileID: 1952366153} - - component: {fileID: 1952366152} m_Layer: 0 m_Name: CubeWithCrystals m_TagString: Untagged @@ -82,7 +81,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 80f123a8ae7c42549bd1daccb6fe61e0, type: 3} m_Name: m_EditorClassIdentifier: - VisualOffset: {x: 0, y: 0, z: 0} + VisualOffset: {x: 0, y: 0.5, z: 0} is_Walkable: 1 isWater: 0 isPit: 0 @@ -104,26 +103,6 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} ---- !u!114 &1952366152 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9119206199061355249} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1a69d64be9f9e8543b4278d7f139f6f1, type: 3} - m_Name: - m_EditorClassIdentifier: - VisualOffset: {x: 0, y: 0.5, z: 0} - is_Walkable: 1 - isWater: 0 - isPit: 0 - isCrystals: 0 - isRock: 0 - isSpawnable: 0 - SpawnDirection: 2 --- !u!1001 &9119206197491717339 PrefabInstance: m_ObjectHideFlags: 0 @@ -131,14 +110,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6222932897940046940} m_Modifications: - - target: {fileID: 1351645074694886, guid: 01b136a21d4d344429b829a7b1a12661, type: 3} - propertyPath: m_Name - value: Crystal2_Blue - objectReference: {fileID: 0} - - target: {fileID: 1351645074694886, guid: 01b136a21d4d344429b829a7b1a12661, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4025485266255164, guid: 01b136a21d4d344429b829a7b1a12661, type: 3} propertyPath: m_LocalPosition.x value: -0.234 @@ -183,6 +154,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1351645074694886, guid: 01b136a21d4d344429b829a7b1a12661, type: 3} + propertyPath: m_Name + value: Crystal2_Blue + objectReference: {fileID: 0} + - target: {fileID: 1351645074694886, guid: 01b136a21d4d344429b829a7b1a12661, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 01b136a21d4d344429b829a7b1a12661, type: 3} --- !u!4 &9116306614291212775 stripped @@ -198,14 +177,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6222932897940046940} m_Modifications: - - target: {fileID: 1582377522939474, guid: acb4f5240f8cf0b4e911b555cd7d8b60, type: 3} - propertyPath: m_Name - value: Crystal2 - objectReference: {fileID: 0} - - target: {fileID: 1582377522939474, guid: acb4f5240f8cf0b4e911b555cd7d8b60, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4461811097192420, guid: acb4f5240f8cf0b4e911b555cd7d8b60, type: 3} propertyPath: m_LocalPosition.x value: 0.276 @@ -250,6 +221,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1582377522939474, guid: acb4f5240f8cf0b4e911b555cd7d8b60, type: 3} + propertyPath: m_Name + value: Crystal2 + objectReference: {fileID: 0} + - target: {fileID: 1582377522939474, guid: acb4f5240f8cf0b4e911b555cd7d8b60, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: acb4f5240f8cf0b4e911b555cd7d8b60, type: 3} --- !u!4 &9115906075035381432 stripped @@ -332,14 +311,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6222932897940046940} m_Modifications: - - target: {fileID: 1834177709595652, guid: a9e26077c8fe35b40ab9e16a6e6d5294, type: 3} - propertyPath: m_Name - value: Crystal2_Orange - objectReference: {fileID: 0} - - target: {fileID: 1834177709595652, guid: a9e26077c8fe35b40ab9e16a6e6d5294, type: 3} - propertyPath: m_StaticEditorFlags - value: 0 - objectReference: {fileID: 0} - target: {fileID: 4315419121807260, guid: a9e26077c8fe35b40ab9e16a6e6d5294, type: 3} propertyPath: m_LocalPosition.x value: -0.208 @@ -384,6 +355,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1834177709595652, guid: a9e26077c8fe35b40ab9e16a6e6d5294, type: 3} + propertyPath: m_Name + value: Crystal2_Orange + objectReference: {fileID: 0} + - target: {fileID: 1834177709595652, guid: a9e26077c8fe35b40ab9e16a6e6d5294, type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a9e26077c8fe35b40ab9e16a6e6d5294, type: 3} --- !u!4 &9116052424124833850 stripped @@ -399,10 +378,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 9119206199061355250} m_Modifications: - - target: {fileID: 1681195754145498, guid: a44f9b5b803069b4ba7b244f59aac09c, type: 3} - propertyPath: m_Name - value: Cube_GroundWGrass_6 - objectReference: {fileID: 0} - target: {fileID: 4128166634420518, guid: a44f9b5b803069b4ba7b244f59aac09c, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -447,6 +422,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1681195754145498, guid: a44f9b5b803069b4ba7b244f59aac09c, type: 3} + propertyPath: m_Name + value: Cube_GroundWGrass_6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a44f9b5b803069b4ba7b244f59aac09c, type: 3} --- !u!4 &9116208357191883012 stripped diff --git a/Assets/Scenes/Client Scenes/ClientScene.unity b/Assets/Scenes/Client Scenes/ClientScene.unity index 145fb25..e360dbd 100644 --- a/Assets/Scenes/Client Scenes/ClientScene.unity +++ b/Assets/Scenes/Client Scenes/ClientScene.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e55348964c1073b8e4e4df12713bbc057b4f46974790e00d2983c9c1485aa82 -size 15370 +oid sha256:6f9bab5981d9aec0c41b47d22c880ffd7140bcc1090173d418dedbc506cb2d2d +size 15738 diff --git a/Assets/Scripts/Traps/CrushingBoulder.cs b/Assets/Scripts/Traps/CrushingBoulder.cs index 4e03ded..ab188f6 100644 --- a/Assets/Scripts/Traps/CrushingBoulder.cs +++ b/Assets/Scripts/Traps/CrushingBoulder.cs @@ -27,7 +27,7 @@ public class CrushingBoulder : ActiveBlock if (countdown == 0) { StartCoroutine(FallRaiseCoroutine(-2.0f)); - yield return new WaitForSeconds(0.5f); + yield return new WaitForSeconds(1.5f); StartCoroutine(FallRaiseCoroutine(2.0f)); countdown = countdowntimer; } diff --git a/Assets/Scripts/Traps/CubeWithCrystals.cs b/Assets/Scripts/Traps/CubeWithCrystals.cs index 28ba596..f6384d7 100644 --- a/Assets/Scripts/Traps/CubeWithCrystals.cs +++ b/Assets/Scripts/Traps/CubeWithCrystals.cs @@ -14,7 +14,7 @@ public class CubeWithCrystals : ActiveBlock public override IEnumerator OnRoundEnd(PlayerData[] allPlayers) { StartCoroutine(GrowCoroutine()); - yield return new WaitForSeconds(0.5f); + yield return new WaitForSeconds(1.0f); StartCoroutine(ShrinkCoroutine()); isFinished = true; //yield break; diff --git a/Assets/Scripts/UI/Client/LoginUIManager.cs b/Assets/Scripts/UI/Client/LoginUIManager.cs index 89669e1..a836fa9 100644 --- a/Assets/Scripts/UI/Client/LoginUIManager.cs +++ b/Assets/Scripts/UI/Client/LoginUIManager.cs @@ -7,7 +7,7 @@ using TMPro; public class LoginUIManager : MonoBehaviour { public int conn; - public int maxPlayers = 8; + int maxPlayers = 8; public ConnectedClients clients; [Header("References")] [SerializeField]