From b316b6b24d7aa933f85ca46893955dc7193d617a Mon Sep 17 00:00:00 2001 From: JSleekXD Date: Sun, 21 Feb 2016 21:09:56 +0000 Subject: [PATCH 01/39] Testing git/slack integration Added in an empty notepad into assets->art to test out the Slack/Github integration (seeing if it notifies Slack). --- Assets/Art/Test notepad for git slack integration.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Assets/Art/Test notepad for git slack integration.txt diff --git a/Assets/Art/Test notepad for git slack integration.txt b/Assets/Art/Test notepad for git slack integration.txt new file mode 100644 index 0000000..e69de29 From 0447eaceb5084f897c0d836f2693d8282bee6c93 Mon Sep 17 00:00:00 2001 From: SilentSupernova Date: Sun, 21 Feb 2016 22:09:12 +0000 Subject: [PATCH 02/39] Timer has been re done to be super simple with the correct format of 00.00. Timer can also pause. Signed-off-by: SilentSupernova --- Assets/Scenes/Prototype.unity | 9 ++--- Assets/Scripts/UI/TimerAndWin.cs | 62 +++++++++++--------------------- 2 files changed, 24 insertions(+), 47 deletions(-) diff --git a/Assets/Scenes/Prototype.unity b/Assets/Scenes/Prototype.unity index efb3d45..bc522ca 100644 --- a/Assets/Scenes/Prototype.unity +++ b/Assets/Scenes/Prototype.unity @@ -454,12 +454,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c1353a536c9d8c746b42a5ac419d21c2, type: 3} m_Name: m_EditorClassIdentifier: - timer: 0 - timepassed: 0 - TimerFormat: {fileID: 1833327629} - startTimer: 0 - GameOver: 0 - WinText: {fileID: 0} + roundLength: 60 + timerText: {fileID: 1833327629} + gamePaused: 0 --- !u!4 &713839869 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/UI/TimerAndWin.cs b/Assets/Scripts/UI/TimerAndWin.cs index cb4d7f7..f8caaf1 100644 --- a/Assets/Scripts/UI/TimerAndWin.cs +++ b/Assets/Scripts/UI/TimerAndWin.cs @@ -4,59 +4,39 @@ public class TimerAndWin : MonoBehaviour { - - - public float timer; - - public float timepassed; - - public Text TimerFormat; - - public bool startTimer = false; - - public bool GameOver = false; - - public Text WinText; + public float roundLength = 60f; + public Text timerText; + public bool gamePaused; + // Use this for initialization void Start() { - startTimer = true; + } // Update is called once per frame void Update() { - - - if (startTimer == true) - { - - timer = 60.0f; - timepassed += Time.deltaTime; - - - System.TimeSpan t = (System.TimeSpan.FromSeconds(timer)) - (System.TimeSpan.FromSeconds(timepassed)); - TimerFormat.text = string.Format("{0:D2}", t.Seconds); - - - if (t.Seconds <= 0) - { - TimerFormat.text = "00"; - GameOver = true; - timepassed = 60; - - } - } - - - if (GameOver == true) - { - // WinText.gameObject.SetActive(true); - } + if (gamePaused == false) + { + roundLength -= Time.deltaTime; + } + timerText.text = roundLength.ToString("F2") ; + + if (roundLength <= 0) + { + EndGame(); + } + } + + void EndGame() + { + //Call appropriate function (); + } } From 37b80b70757281ad791e2a16aedb073a1c42317d Mon Sep 17 00:00:00 2001 From: SilentSupernova Date: Sun, 21 Feb 2016 22:12:37 +0000 Subject: [PATCH 03/39] Re did timer so now it is super simple and in the correct format of 00:00. The timer can also pause. Signed-off-by: SilentSupernova --- Assets/Art/Test notepad for git slack integration.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Assets/Art/Test notepad for git slack integration.txt diff --git a/Assets/Art/Test notepad for git slack integration.txt b/Assets/Art/Test notepad for git slack integration.txt deleted file mode 100644 index e69de29..0000000 From 7f8b0ecb13f84d837565881f01c8df11c112cffe Mon Sep 17 00:00:00 2001 From: David Greedy Date: Mon, 22 Feb 2016 14:59:49 +0000 Subject: [PATCH 04/39] Testing Slack integration --- Test.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Test.txt diff --git a/Test.txt b/Test.txt new file mode 100644 index 0000000..e69de29 From 38b11cb6fc2fa5d5d6706a6e37059eccbcb466cc Mon Sep 17 00:00:00 2001 From: JSleekXD Date: Mon, 22 Feb 2016 15:03:34 +0000 Subject: [PATCH 05/39] Testing Github/Slack Integration v2 Testing to see if a notification pops up now that David has added his repository into the Slack integration. Removing the test notepad/ --- Test.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Test.txt diff --git a/Test.txt b/Test.txt deleted file mode 100644 index e69de29..0000000 From 0cf763be3dcd034f9a87c5831539ca77ebfba86c Mon Sep 17 00:00:00 2001 From: JSleekXD Date: Tue, 23 Feb 2016 10:48:05 +0000 Subject: [PATCH 06/39] New PlayerHUD Prototype 1. Added all required scene objects to the canvas in order to attach the HUD to the player. This does not effect the physics or gameplay in any way, it is merely a simple change within the inspector. 2. Added a working ammo slider, which decreases in real time in accordance with the player's remaining ammo for their currently held weapon. --- Assets/Scenes/Prototype.unity | 3107 ++++++++++++++++++++++++++----- Assets/Scripts/Player/Player.cs | 9 +- 2 files changed, 2628 insertions(+), 488 deletions(-) diff --git a/Assets/Scenes/Prototype.unity b/Assets/Scenes/Prototype.unity index bc522ca..0f4ceca 100644 --- a/Assets/Scenes/Prototype.unity +++ b/Assets/Scenes/Prototype.unity @@ -85,6 +85,195 @@ NavMeshSettings: cellSize: .166666672 manualCellSize: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &9843159 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 152130, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 9843160} + m_Layer: 5 + m_Name: Fill Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9843160 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22400796, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 9843159} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1676407023} + m_Father: {fileID: 866842711} + m_RootOrder: 1 + m_AnchorMin: {x: 0, y: .25} + m_AnchorMax: {x: 1, y: .75} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -20, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!1 &29733465 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 162242, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 29733466} + - 222: {fileID: 29733468} + - 114: {fileID: 29733467} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &29733466 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22404222, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 29733465} + 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: 1766389763} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: .25} + m_AnchorMax: {x: 1, y: .75} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -10, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &29733467 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11447958, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 29733465} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &29733468 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22261544, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 29733465} +--- !u!1 &58277922 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 120336, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 58277923} + - 114: {fileID: 58277924} + m_Layer: 5 + m_Name: PlayerHP3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &58277923 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22449632, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 58277922} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 13, z: 1} + m_Children: + - {fileID: 1234335049} + - {fileID: 2067420757} + m_Father: {fileID: 2050290495} + m_RootOrder: 1 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: 373, y: -265.99942} + m_SizeDelta: {x: 100, y: 20} + m_Pivot: {x: .5, y: .5} +--- !u!114 &58277924 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11405694, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 58277922} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -113659843, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} + m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} + m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_ColorMultiplier: 1 + m_FadeDuration: .100000001 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + m_FillRect: {fileID: 1204689827} + m_HandleRect: {fileID: 0} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 1 + m_WholeNumbers: 0 + m_Value: 1 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Slider+SliderEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!4 &91229491 stripped Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} @@ -94,7 +283,7 @@ Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 653857878} m_Modifications: - target: {fileID: 409436, guid: f89e011de36c1124e97bf9847d797ad1, type: 2} propertyPath: m_LocalPosition.x @@ -106,7 +295,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 409436, guid: f89e011de36c1124e97bf9847d797ad1, type: 2} propertyPath: m_LocalPosition.z - value: 0 + value: 323.855438 objectReference: {fileID: 0} - target: {fileID: 409436, guid: f89e011de36c1124e97bf9847d797ad1, type: 2} propertyPath: m_LocalRotation.x @@ -126,22 +315,133 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 409436, guid: f89e011de36c1124e97bf9847d797ad1, type: 2} propertyPath: m_RootOrder - value: 15 + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 409436, guid: f89e011de36c1124e97bf9847d797ad1, type: 2} + propertyPath: m_LocalScale.x + value: 35.9839363 + objectReference: {fileID: 0} + - target: {fileID: 409436, guid: f89e011de36c1124e97bf9847d797ad1, type: 2} + propertyPath: m_LocalScale.y + value: 35.9839363 + objectReference: {fileID: 0} + - target: {fileID: 409436, guid: f89e011de36c1124e97bf9847d797ad1, type: 2} + propertyPath: m_LocalScale.z + value: 35.9839363 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: f89e011de36c1124e97bf9847d797ad1, type: 2} m_IsPrefabParent: 0 ---- !u!224 &143147948 stripped +--- !u!4 &133048276 stripped +Transform: + m_PrefabParentObject: {fileID: 471558, guid: cf3b36c1277b6914ca9531867d57d6e5, type: 2} + m_PrefabInternal: {fileID: 1422364005} +--- !u!224 &143147948 RectTransform: + m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 22442296, guid: b8af804de96124644898f0e89616d06a, type: 2} - m_PrefabInternal: {fileID: 2139830101} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 331099736} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: .152343303, z: 1} + m_Children: + - {fileID: 2025581861} + - {fileID: 1413660775} + - {fileID: 2050290495} + - {fileID: 1812589629} + m_Father: {fileID: 653857878} + m_RootOrder: 1 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 1, y: 458} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!1 &148433719 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 156284, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 148433720} + - 222: {fileID: 148433722} + - 114: {fileID: 148433721} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &148433720 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22473806, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 148433719} + 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: 866842711} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: .25} + m_AnchorMax: {x: 1, y: .75} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -10, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &148433721 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11492690, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 148433719} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &148433722 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22238542, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 148433719} +--- !u!4 &161115611 stripped +Transform: + m_PrefabParentObject: {fileID: 462742, guid: dcfaa153c5433dd478fabe3e62e3b353, type: 2} + m_PrefabInternal: {fileID: 748675610} +--- !u!4 &162690262 stripped +Transform: + m_PrefabParentObject: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} + m_PrefabInternal: {fileID: 1275274076} --- !u!1001 &179693061 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 653857878} m_Modifications: - target: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} propertyPath: m_LocalPosition.x @@ -153,7 +453,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} propertyPath: m_LocalPosition.z - value: 0 + value: 323.855438 objectReference: {fileID: 0} - target: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} propertyPath: m_LocalRotation.x @@ -173,17 +473,23 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} propertyPath: m_RootOrder - value: 11 + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} + propertyPath: m_LocalScale.x + value: 35.9839363 + objectReference: {fileID: 0} + - target: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} + propertyPath: m_LocalScale.y + value: 35.9839363 + objectReference: {fileID: 0} + - target: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} + propertyPath: m_LocalScale.z + value: 35.9839363 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} m_IsPrefabParent: 0 ---- !u!114 &190466646 stripped -MonoBehaviour: - m_PrefabParentObject: {fileID: 11444754, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, - type: 2} - m_PrefabInternal: {fileID: 1027524326} - m_Script: {fileID: 11500000, guid: 15ecbb6400f84ee4abc1ec2773807df8, type: 3} --- !u!1 &329086455 GameObject: m_ObjectHideFlags: 0 @@ -207,11 +513,11 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 329086455} 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_LocalPosition: {x: 0, y: 0, z: 323.855438} + m_LocalScale: {x: 35.9839363, y: 35.9839363, z: 35.9839363} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 9 + m_Father: {fileID: 653857878} + m_RootOrder: 4 --- !u!114 &329086457 MonoBehaviour: m_ObjectHideFlags: 0 @@ -225,22 +531,374 @@ MonoBehaviour: m_EditorClassIdentifier: DynamicWallsList: [] wallScript: {fileID: 0} +--- !u!1 &331099736 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 167086, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 143147948} + - 222: {fileID: 331099738} + - 114: {fileID: 331099737} + m_Layer: 5 + m_Name: HUDPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &331099737 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11484380, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 331099736} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: .411764711} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &331099738 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22261656, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 331099736} +--- !u!1 &365794303 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 125422, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 365794304} + - 222: {fileID: 365794307} + - 114: {fileID: 365794306} + - 114: {fileID: 365794305} + m_Layer: 5 + m_Name: PlayerAmmoCount3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &365794304 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22487364, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 365794303} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 6.56412172, z: 1} + m_Children: [] + m_Father: {fileID: 2050290495} + m_RootOrder: 2 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: 178, y: -207} + m_SizeDelta: {x: 250, y: 80} + m_Pivot: {x: .5, y: .5} +--- !u!114 &365794305 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11433524, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 365794303} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c88ea203cda48f3498c2583e23601830, type: 3} + m_Name: + m_EditorClassIdentifier: + ammoCount: {fileID: 2112786343} + playerID: 3 + player: {fileID: 1515989184} +--- !u!114 &365794306 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11442980, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 365794303} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: .956862748, g: 1, b: .235294119, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 45 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: AmmoCount +--- !u!222 &365794307 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22282648, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 365794303} +--- !u!1 &368835090 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 139944, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 368835091} + - 222: {fileID: 368835093} + - 114: {fileID: 368835092} + m_Layer: 5 + m_Name: PlayerIconThree + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &368835091 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22460964, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 368835090} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 6.56412172, z: 1} + m_Children: [] + m_Father: {fileID: 2050290495} + m_RootOrder: 0 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: 365, y: 208} + m_SizeDelta: {x: 250, y: 80} + m_Pivot: {x: .5, y: .5} +--- !u!114 &368835092 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11415172, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 368835090} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: .957809329, g: 1, b: .235294104, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 60 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Player 3 +--- !u!222 &368835093 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22202710, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 368835090} --- !u!4 &418995551 stripped Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_PrefabInternal: {fileID: 514880646} ---- !u!114 &444802006 stripped -MonoBehaviour: - m_PrefabParentObject: {fileID: 11481560, guid: f89e011de36c1124e97bf9847d797ad1, - type: 2} - m_PrefabInternal: {fileID: 127613653} - m_Script: {fileID: 11500000, guid: 83746ccf99afbe54b8a51230573316e0, type: 3} ---- !u!1001 &514880646 -Prefab: +--- !u!1 &440721514 +GameObject: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 754702397} + m_PrefabParentObject: {fileID: 176628, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 440721515} + m_Layer: 5 + m_Name: Fill Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &440721515 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22459160, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 440721514} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 441795666} + m_Father: {fileID: 469031883} + m_RootOrder: 1 + m_AnchorMin: {x: 0, y: .25} + m_AnchorMax: {x: 1, y: .75} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -20, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!1 &441795665 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 146222, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 441795666} + - 222: {fileID: 441795668} + - 114: {fileID: 441795667} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &441795666 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22446808, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 441795665} + 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: 440721515} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 10, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &441795667 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11430638, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 441795665} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &441795668 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22213036, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 441795665} +--- !u!1 &469031882 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 126314, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 469031883} + - 114: {fileID: 1117151108} + m_Layer: 5 + m_Name: PlayerHP1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &469031883 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22410752, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 469031882} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 13, z: 1} + m_Children: + - {fileID: 699073354} + - {fileID: 440721515} + m_Father: {fileID: 1102761632} + m_RootOrder: 1 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: -826, y: 451} + m_SizeDelta: {x: 100, y: 20} + m_Pivot: {x: .5, y: .5} +--- !u!1001 &514880646 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 754702397} m_Modifications: - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.x @@ -290,12 +948,20 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_IsPrefabParent: 0 +--- !u!4 &516090087 stripped +Transform: + m_PrefabParentObject: {fileID: 405082, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} + m_PrefabInternal: {fileID: 1903365224} +--- !u!4 &531871430 stripped +Transform: + m_PrefabParentObject: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + m_PrefabInternal: {fileID: 1287841312} --- !u!1001 &581025534 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 653857878} m_Modifications: - target: {fileID: 401230, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} propertyPath: m_LocalPosition.x @@ -307,7 +973,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 401230, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} propertyPath: m_LocalPosition.z - value: 0 + value: 323.855438 objectReference: {fileID: 0} - target: {fileID: 401230, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} propertyPath: m_LocalRotation.x @@ -327,15 +993,35 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 401230, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} propertyPath: m_RootOrder - value: 4 + value: 15 objectReference: {fileID: 0} - target: {fileID: 194862, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} propertyPath: m_Name value: Tunnel Container objectReference: {fileID: 0} + - target: {fileID: 401230, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + propertyPath: m_LocalScale.x + value: 35.9839363 + objectReference: {fileID: 0} + - target: {fileID: 401230, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + propertyPath: m_LocalScale.y + value: 35.9839363 + objectReference: {fileID: 0} + - target: {fileID: 401230, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + propertyPath: m_LocalScale.z + value: 35.9839363 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} m_IsPrefabParent: 0 +--- !u!4 &605769312 stripped +Transform: + m_PrefabParentObject: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} + m_PrefabInternal: {fileID: 1027524326} +--- !u!4 &613553048 stripped +Transform: + m_PrefabParentObject: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + m_PrefabInternal: {fileID: 1633521612} --- !u!1 &653857877 GameObject: m_ObjectHideFlags: 0 @@ -366,8 +1052,23 @@ RectTransform: m_Children: - {fileID: 713839869} - {fileID: 143147948} + - {fileID: 1515989185} + - {fileID: 754702397} + - {fileID: 329086456} + - {fileID: 1910995931} + - {fileID: 133048276} + - {fileID: 613553048} + - {fileID: 161115611} + - {fileID: 1860753582} + - {fileID: 605769312} + - {fileID: 516090087} + - {fileID: 1649534405} + - {fileID: 531871430} + - {fileID: 1726136059} + - {fileID: 1717947874} + - {fileID: 162690262} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 2 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} @@ -427,6 +1128,146 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingLayerID: -277524437 m_SortingOrder: 0 +--- !u!1 &692605456 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 123990, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 692605457} + - 222: {fileID: 692605459} + - 114: {fileID: 692605458} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &692605457 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22427428, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 692605456} + 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: 2021881325} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 10, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &692605458 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11422872, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 692605456} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: .709803939, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &692605459 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22254516, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 692605456} +--- !u!1 &699073353 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 138258, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 699073354} + - 222: {fileID: 699073356} + - 114: {fileID: 699073355} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &699073354 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22434492, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 699073353} + 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: 469031883} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: .25} + m_AnchorMax: {x: 1, y: .75} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -10, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &699073355 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11476748, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 699073353} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &699073356 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22250338, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 699073353} --- !u!1 &713839867 GameObject: m_ObjectHideFlags: 0 @@ -474,7 +1315,7 @@ Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 653857878} m_Modifications: - target: {fileID: 462742, guid: dcfaa153c5433dd478fabe3e62e3b353, type: 2} propertyPath: m_LocalPosition.x @@ -486,7 +1327,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 462742, guid: dcfaa153c5433dd478fabe3e62e3b353, type: 2} propertyPath: m_LocalPosition.z - value: 0 + value: 323.855438 objectReference: {fileID: 0} - target: {fileID: 462742, guid: dcfaa153c5433dd478fabe3e62e3b353, type: 2} propertyPath: m_LocalRotation.x @@ -506,7 +1347,19 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 462742, guid: dcfaa153c5433dd478fabe3e62e3b353, type: 2} propertyPath: m_RootOrder - value: 14 + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 462742, guid: dcfaa153c5433dd478fabe3e62e3b353, type: 2} + propertyPath: m_LocalScale.x + value: 35.9839363 + objectReference: {fileID: 0} + - target: {fileID: 462742, guid: dcfaa153c5433dd478fabe3e62e3b353, type: 2} + propertyPath: m_LocalScale.y + value: 35.9839363 + objectReference: {fileID: 0} + - target: {fileID: 462742, guid: dcfaa153c5433dd478fabe3e62e3b353, type: 2} + propertyPath: m_LocalScale.z + value: 35.9839363 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: dcfaa153c5433dd478fabe3e62e3b353, type: 2} @@ -591,8 +1444,8 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 754702396} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -.105000019, y: .0250000954, z: -1.5250001} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalPosition: {x: -3.77831411, y: .899601817, z: 268.979919} + m_LocalScale: {x: 35.9839363, y: 35.9839363, z: 35.9839363} m_Children: - {fileID: 752919346} - {fileID: 418995551} @@ -600,212 +1453,841 @@ Transform: - {fileID: 1724056570} - {fileID: 91229491} - {fileID: 1250928786} - m_Father: {fileID: 0} - m_RootOrder: 8 ---- !u!1001 &1027524326 -Prefab: + m_Father: {fileID: 653857878} + m_RootOrder: 3 +--- !u!1 &791464968 +GameObject: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} - propertyPath: m_RootOrder - value: 16 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} - m_IsPrefabParent: 0 ---- !u!114 &1103378176 stripped -MonoBehaviour: - m_PrefabParentObject: {fileID: 11473188, guid: dcfaa153c5433dd478fabe3e62e3b353, - type: 2} - m_PrefabInternal: {fileID: 748675610} - m_Script: {fileID: 11500000, guid: c97d4c18c9840f8429cae8f9878813b0, type: 3} ---- !u!114 &1106708548 stripped -MonoBehaviour: - m_PrefabParentObject: {fileID: 11420586, guid: 003cf19f83162bf49b315e76e2a9d43e, + m_PrefabParentObject: {fileID: 126314, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 791464969} + - 114: {fileID: 791464970} + m_Layer: 5 + m_Name: PlayerAmmoCountSlider1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &791464969 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22410752, guid: b8af804de96124644898f0e89616d06a, type: 2} - m_PrefabInternal: {fileID: 1903365224} - m_Script: {fileID: 11500000, guid: fa31381d48b75e94b91a02030ccb1791, type: 3} ---- !u!114 &1117151108 stripped + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 791464968} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 13, z: 1} + m_Children: + - {fileID: 956739893} + - {fileID: 1311763070} + m_Father: {fileID: 1102761632} + m_RootOrder: 3 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: -826.000183, y: -859} + m_SizeDelta: {x: 100, y: 20} + m_Pivot: {x: .5, y: .5} +--- !u!114 &791464970 MonoBehaviour: + m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11403244, guid: b8af804de96124644898f0e89616d06a, type: 2} - m_PrefabInternal: {fileID: 2139830101} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 791464968} + m_Enabled: 1 + m_EditorHideFlags: 0 m_Script: {fileID: -113659843, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} ---- !u!1001 &1168999058 -Prefab: + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} + m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} + m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_ColorMultiplier: 1 + m_FadeDuration: .100000001 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + m_FillRect: {fileID: 844530630} + m_HandleRect: {fileID: 0} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 1 + m_WholeNumbers: 0 + m_Value: 1 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Slider+SliderEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!1 &844530629 +GameObject: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 754702397} - m_Modifications: - - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} - propertyPath: m_LocalPosition.x - value: 6.0999999 - objectReference: {fileID: 0} - - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} - propertyPath: m_LocalPosition.y - value: 6.80000019 - objectReference: {fileID: 0} - - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} - propertyPath: m_Name - value: Block 2 - objectReference: {fileID: 0} - - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} - propertyPath: m_SortingOrder - value: -6 - objectReference: {fileID: 0} - - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, - type: 3} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} - m_IsPrefabParent: 0 ---- !u!4 &1250928786 stripped -Transform: - m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} - m_PrefabInternal: {fileID: 1757835289} ---- !u!1001 &1275274076 + m_PrefabParentObject: {fileID: 146222, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 844530630} + - 222: {fileID: 844530632} + - 114: {fileID: 844530631} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &844530630 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22446808, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 844530629} + 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: 1311763070} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 10, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &844530631 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11430638, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 844530629} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &844530632 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22213036, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 844530629} +--- !u!1 &866842710 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 110008, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 866842711} + - 114: {fileID: 866842712} + m_Layer: 5 + m_Name: PlayerHP4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &866842711 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22488818, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 866842710} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 13, z: 1} + m_Children: + - {fileID: 148433720} + - {fileID: 9843160} + m_Father: {fileID: 1812589629} + m_RootOrder: 1 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: 780.299988, y: -265.99942} + m_SizeDelta: {x: 100, y: 20} + m_Pivot: {x: .5, y: .5} +--- !u!114 &866842712 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11400070, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 866842710} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -113659843, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} + m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} + m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_ColorMultiplier: 1 + m_FadeDuration: .100000001 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + m_FillRect: {fileID: 1676407023} + m_HandleRect: {fileID: 0} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 1 + m_WholeNumbers: 0 + m_Value: 1 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Slider+SliderEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!1 &905662176 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 106350, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 905662177} + - 222: {fileID: 905662179} + - 114: {fileID: 905662178} + m_Layer: 5 + m_Name: PlayerIconOne + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &905662177 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22494668, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 905662176} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 6.56412172, z: 1} + m_Children: [] + m_Father: {fileID: 1102761632} + m_RootOrder: 0 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: -834, y: 208} + m_SizeDelta: {x: 250, y: 80} + m_Pivot: {x: .5, y: .5} +--- !u!114 &905662178 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11486622, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 905662176} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: .911764681, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 60 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Player 1 +--- !u!222 &905662179 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22253272, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 905662176} +--- !u!1 &956739892 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 138258, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 956739893} + - 222: {fileID: 956739895} + - 114: {fileID: 956739894} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &956739893 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22434492, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 956739892} + 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: 791464969} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: .25} + m_AnchorMax: {x: 1, y: .75} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -10, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &956739894 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11476748, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 956739892} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &956739895 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22250338, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 956739892} +--- !u!1001 &1027524326 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 653857878} m_Modifications: - - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} + - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} propertyPath: m_LocalPosition.x - value: 40 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} + - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} propertyPath: m_LocalPosition.y - value: 10 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} + - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} propertyPath: m_LocalPosition.z - value: 0 + value: 323.855438 objectReference: {fileID: 0} - - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} + - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} + - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} + - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} + - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} + - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} propertyPath: m_RootOrder - value: 5 + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} + propertyPath: m_LocalScale.x + value: 35.9839363 + objectReference: {fileID: 0} + - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} + propertyPath: m_LocalScale.y + value: 35.9839363 + objectReference: {fileID: 0} + - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} + propertyPath: m_LocalScale.z + value: 35.9839363 objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: f698b07087564614fbc3784bb72db068, type: 2} + m_ParentPrefab: {fileID: 100100000, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} m_IsPrefabParent: 0 ---- !u!1001 &1287841312 +--- !u!1 &1102761631 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 171048, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1102761632} + m_Layer: 5 + m_Name: Player1HUD + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1102761632 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22435106, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1102761631} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -9} + m_LocalScale: {x: .0277901795, y: .0042336476, z: .0277901795} + m_Children: + - {fileID: 905662177} + - {fileID: 469031883} + - {fileID: 2112786341} + - {fileID: 791464969} + m_Father: {fileID: 1515989185} + m_RootOrder: 3 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: 23.0102539, y: .1796875} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1117151108 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11403244, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 469031882} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -113659843, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} + m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} + m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_ColorMultiplier: 1 + m_FadeDuration: .100000001 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + m_FillRect: {fileID: 441795666} + m_HandleRect: {fileID: 0} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 1 + m_WholeNumbers: 0 + m_Value: 1 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Slider+SliderEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!1001 &1168999058 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 754702397} m_Modifications: - - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.x - value: -4.52220201 + value: 6.0999999 objectReference: {fileID: 0} - - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.y - value: -3.53296089 + value: 6.80000019 objectReference: {fileID: 0} - - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_RootOrder - value: 0 + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 2 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -6 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!1 &1204689826 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 169156, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1204689827} + - 222: {fileID: 1204689829} + - 114: {fileID: 1204689828} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1204689827 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22467270, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1204689826} + 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: 2067420757} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 10, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1204689828 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11452864, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1204689826} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: .956862748, g: 1, b: .235294119, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1204689829 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22297152, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1204689826} +--- !u!1 &1234335048 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 166112, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1234335049} + - 222: {fileID: 1234335051} + - 114: {fileID: 1234335050} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1234335049 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22479554, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1234335048} + 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: 58277923} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: .25} + m_AnchorMax: {x: 1, y: .75} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -10, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1234335050 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11476304, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1234335048} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1234335051 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22279058, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1234335048} +--- !u!4 &1250928786 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 1757835289} +--- !u!1001 &1275274076 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 653857878} + m_Modifications: + - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} + propertyPath: m_LocalPosition.x + value: 1439.35742 + objectReference: {fileID: 0} + - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} + propertyPath: m_LocalPosition.y + value: 359.839355 + objectReference: {fileID: 0} + - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} + propertyPath: m_LocalPosition.z + value: 323.855438 + objectReference: {fileID: 0} + - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} + propertyPath: m_RootOrder + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} + propertyPath: m_LocalScale.x + value: 35.9839363 + objectReference: {fileID: 0} + - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} + propertyPath: m_LocalScale.y + value: 35.9839363 + objectReference: {fileID: 0} + - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} + propertyPath: m_LocalScale.z + value: 35.9839363 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: f698b07087564614fbc3784bb72db068, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &1287841312 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 653857878} + m_Modifications: + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalPosition.x + value: -162.726624 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalPosition.y + value: -127.129837 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalPosition.z + value: 323.855438 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_RootOrder + value: 13 objectReference: {fileID: 0} - target: {fileID: 11419152, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: wallManager value: objectReference: {fileID: 329086457} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalScale.x + value: 35.9839363 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalScale.y + value: 35.9839363 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalScale.z + value: 35.9839363 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} m_IsPrefabParent: 0 @@ -868,12 +2350,82 @@ Prefab: Transform: m_PrefabParentObject: {fileID: 482952, guid: 928ea30b33b71cc4fa13515381e9662c, type: 2} m_PrefabInternal: {fileID: 1630575786} +--- !u!1 &1311763069 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 176628, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1311763070} + m_Layer: 5 + m_Name: Fill Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1311763070 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22459160, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1311763069} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 844530630} + m_Father: {fileID: 791464969} + m_RootOrder: 1 + m_AnchorMin: {x: 0, y: .25} + m_AnchorMax: {x: 1, y: .75} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -20, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!1 &1413660774 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 155084, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1413660775} + m_Layer: 5 + m_Name: Player2HUD + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1413660775 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22430850, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1413660774} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1898002833} + - {fileID: 1766389763} + - {fileID: 1667372849} + m_Father: {fileID: 143147948} + m_RootOrder: 1 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: 3.05175781e-05, y: -9.15527344e-05} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: .5, y: .5} --- !u!1001 &1422364005 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 653857878} m_Modifications: - target: {fileID: 471558, guid: cf3b36c1277b6914ca9531867d57d6e5, type: 2} propertyPath: m_LocalPosition.x @@ -885,7 +2437,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 471558, guid: cf3b36c1277b6914ca9531867d57d6e5, type: 2} propertyPath: m_LocalPosition.z - value: 0 + value: 323.855438 objectReference: {fileID: 0} - target: {fileID: 471558, guid: cf3b36c1277b6914ca9531867d57d6e5, type: 2} propertyPath: m_LocalRotation.x @@ -905,54 +2457,157 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 471558, guid: cf3b36c1277b6914ca9531867d57d6e5, type: 2} propertyPath: m_RootOrder - value: 12 + value: 6 objectReference: {fileID: 0} - target: {fileID: 11481414, guid: cf3b36c1277b6914ca9531867d57d6e5, type: 2} propertyPath: hasInfiniteAmmo - value: 1 + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 471558, guid: cf3b36c1277b6914ca9531867d57d6e5, type: 2} + propertyPath: m_LocalScale.x + value: 35.9839363 + objectReference: {fileID: 0} + - target: {fileID: 471558, guid: cf3b36c1277b6914ca9531867d57d6e5, type: 2} + propertyPath: m_LocalScale.y + value: 35.9839363 + objectReference: {fileID: 0} + - target: {fileID: 471558, guid: cf3b36c1277b6914ca9531867d57d6e5, type: 2} + propertyPath: m_LocalScale.z + value: 35.9839363 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: cf3b36c1277b6914ca9531867d57d6e5, type: 2} m_IsPrefabParent: 0 ---- !u!1 &1515989180 +--- !u!1 &1433083140 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_PrefabParentObject: {fileID: 158468, guid: b8af804de96124644898f0e89616d06a, type: 2} m_PrefabInternal: {fileID: 0} serializedVersion: 4 m_Component: - - 4: {fileID: 1515989185} - - 114: {fileID: 1515989182} - - 114: {fileID: 1515989181} - - 212: {fileID: 1515989186} - - 114: {fileID: 1515989187} - - 50: {fileID: 1515989188} - - 61: {fileID: 1515989189} - - 114: {fileID: 1515989184} - - 114: {fileID: 1515989183} - m_Layer: 0 - m_Name: Player - m_TagString: Player + - 224: {fileID: 1433083141} + - 222: {fileID: 1433083144} + - 114: {fileID: 1433083143} + - 114: {fileID: 1433083142} + m_Layer: 5 + m_Name: PlayerAmmoCount4 + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &1515989181 +--- !u!224 &1433083141 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22408268, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1433083140} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 6.56412172, z: 1} + m_Children: [] + m_Father: {fileID: 1812589629} + m_RootOrder: 2 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: 585, y: -207} + m_SizeDelta: {x: 250, y: 80} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1433083142 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_PrefabParentObject: {fileID: 11492744, guid: b8af804de96124644898f0e89616d06a, + type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1515989180} + m_GameObject: {fileID: 1433083140} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55891d2920542d641913a9d95d43c293, type: 3} + m_Script: {fileID: 11500000, guid: c88ea203cda48f3498c2583e23601830, type: 3} m_Name: m_EditorClassIdentifier: - spriteManager: {fileID: 1726136058} ---- !u!114 &1515989182 + ammoCount: {fileID: 2112786343} + playerID: 4 + player: {fileID: 1515989184} +--- !u!114 &1433083143 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_PrefabParentObject: {fileID: 11466586, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1433083140} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: .909803927, b: .23137255, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 45 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: AmmoCount +--- !u!222 &1433083144 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22259568, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1433083140} +--- !u!1 &1515989180 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1515989185} + - 114: {fileID: 1515989182} + - 114: {fileID: 1515989181} + - 212: {fileID: 1515989186} + - 114: {fileID: 1515989187} + - 50: {fileID: 1515989188} + - 61: {fileID: 1515989189} + - 114: {fileID: 1515989184} + - 114: {fileID: 1515989183} + m_Layer: 0 + m_Name: Player1 + m_TagString: Player + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1515989181 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1515989180} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55891d2920542d641913a9d95d43c293, type: 3} + m_Name: + m_EditorClassIdentifier: + spriteManager: {fileID: 1726136058} +--- !u!114 &1515989182 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1515989180} m_Enabled: 1 @@ -988,10 +2643,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3800ba1d4402403408247b3365ec08f5, type: 3} m_Name: m_EditorClassIdentifier: - mEquippedWeapon: {fileID: 1886781779} + mEquippedWeapon: {fileID: 1998640093} weaponList: [] mPlayerNumber: 1 - slider: {fileID: 1117151108} + HPSlider: {fileID: 1117151108} + ammoSlider: {fileID: 791464970} minigunParticleSystem: {fileID: 2099061889} --- !u!4 &1515989185 Transform: @@ -1000,14 +2656,15 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1515989180} 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_LocalPosition: {x: 0, y: 0, z: 323.855438} + m_LocalScale: {x: 35.9839363, y: 35.9839363, z: 35.9839363} m_Children: - {fileID: 2104331961} - {fileID: 749276103} - {fileID: 1307117390} - m_Father: {fileID: 0} - m_RootOrder: 7 + - {fileID: 1102761632} + m_Father: {fileID: 653857878} + m_RootOrder: 2 --- !u!212 &1515989186 SpriteRenderer: m_ObjectHideFlags: 0 @@ -1076,12 +2733,6 @@ BoxCollider2D: m_Offset: {x: -.12499994, y: -1.04278374} serializedVersion: 2 m_Size: {x: .861835837, y: .226932526} ---- !u!114 &1518142153 stripped -MonoBehaviour: - m_PrefabParentObject: {fileID: 11406788, guid: fb80daa749f26694dbd949ac8cd91e23, - type: 2} - m_PrefabInternal: {fileID: 179693061} - m_Script: {fileID: 11500000, guid: c5ecd6a541894464d8a1b8dc1d6ef09b, type: 3} --- !u!1001 &1540794253 Prefab: m_ObjectHideFlags: 0 @@ -1248,7 +2899,7 @@ Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 653857878} m_Modifications: - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} propertyPath: m_LocalPosition.x @@ -1260,7 +2911,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} propertyPath: m_LocalPosition.z - value: 0 + value: 323.855438 objectReference: {fileID: 0} - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} propertyPath: m_LocalRotation.x @@ -1280,12 +2931,28 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} propertyPath: m_RootOrder - value: 13 + value: 7 objectReference: {fileID: 0} - target: {fileID: 11440672, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} propertyPath: hasInfiniteAmmo value: 0 objectReference: {fileID: 0} + - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + propertyPath: m_LocalScale.x + value: 35.9839363 + objectReference: {fileID: 0} + - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + propertyPath: m_LocalScale.y + value: 35.9839363 + objectReference: {fileID: 0} + - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + propertyPath: m_LocalScale.z + value: 35.9839363 + objectReference: {fileID: 0} + - target: {fileID: 11440672, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + propertyPath: mAmmoRemaining + value: 200 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} m_IsPrefabParent: 0 @@ -1311,15 +2978,180 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1649534404} 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_LocalPosition: {x: 0, y: 0, z: 323.855438} + m_LocalScale: {x: 35.9839363, y: 35.9839363, z: 35.9839363} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 17 + m_Father: {fileID: 653857878} + m_RootOrder: 12 --- !u!4 &1667210046 stripped Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_PrefabInternal: {fileID: 1168999058} +--- !u!1 &1667372848 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 177432, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1667372849} + - 222: {fileID: 1667372852} + - 114: {fileID: 1667372851} + - 114: {fileID: 1667372850} + m_Layer: 5 + m_Name: PlayerAmmoCount2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1667372849 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22472610, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1667372848} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 6.56412172, z: 1} + m_Children: [] + m_Father: {fileID: 1413660775} + m_RootOrder: 2 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: -240, y: -207} + m_SizeDelta: {x: 250, y: 80} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1667372850 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11410990, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1667372848} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c88ea203cda48f3498c2583e23601830, type: 3} + m_Name: + m_EditorClassIdentifier: + ammoCount: {fileID: 2112786343} + playerID: 2 + player: {fileID: 1515989184} +--- !u!114 &1667372851 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11430702, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1667372848} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: .709803939, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 45 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: AmmoCount +--- !u!222 &1667372852 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22248206, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1667372848} +--- !u!1 &1676407022 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 188778, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1676407023} + - 222: {fileID: 1676407025} + - 114: {fileID: 1676407024} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1676407023 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22447970, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1676407022} + 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: 9843160} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 10, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1676407024 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11421190, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1676407022} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: .909803927, b: .23137255, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1676407025 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22272998, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1676407022} +--- !u!4 &1717947874 stripped +Transform: + m_PrefabParentObject: {fileID: 401230, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + m_PrefabInternal: {fileID: 581025534} --- !u!4 &1724056570 stripped Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} @@ -1369,11 +3201,11 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1726136057} 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_LocalPosition: {x: 0, y: 0, z: 323.855438} + m_LocalScale: {x: 35.9839363, y: 35.9839363, z: 35.9839363} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 1 + m_Father: {fileID: 653857878} + m_RootOrder: 14 --- !u!1001 &1757835289 Prefab: m_ObjectHideFlags: 0 @@ -1429,6 +3261,91 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_IsPrefabParent: 0 +--- !u!1 &1766389762 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 125282, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1766389763} + - 114: {fileID: 1766389764} + m_Layer: 5 + m_Name: PlayerHP2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1766389763 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22478556, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1766389762} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 13, z: 1} + m_Children: + - {fileID: 29733466} + - {fileID: 2021881325} + m_Father: {fileID: 1413660775} + m_RootOrder: 1 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: -407.700043, y: -265.99942} + m_SizeDelta: {x: 100, y: 20} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1766389764 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11429570, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1766389762} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -113659843, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} + m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} + m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_ColorMultiplier: 1 + m_FadeDuration: .100000001 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + m_FillRect: {fileID: 692605457} + m_HandleRect: {fileID: 0} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 1 + m_WholeNumbers: 0 + m_Value: 1 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Slider+SliderEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &1795214381 GameObject: m_ObjectHideFlags: 0 @@ -1460,7 +3377,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 0 --- !u!81 &1795214383 AudioListener: m_ObjectHideFlags: 0 @@ -1529,18 +3446,79 @@ MonoBehaviour: m_EditorClassIdentifier: shakeTimer: 0 shakeIntesity: 0 ---- !u!114 &1833327629 stripped +--- !u!1 &1812589628 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 136076, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1812589629} + m_Layer: 5 + m_Name: Player4HUD + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1812589629 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22409954, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1812589628} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2093644044} + - {fileID: 866842711} + - {fileID: 1433083141} + m_Father: {fileID: 143147948} + m_RootOrder: 3 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: 3.05175781e-05, y: -9.15527344e-05} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1833327629 MonoBehaviour: + m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11463138, guid: b8af804de96124644898f0e89616d06a, type: 2} - m_PrefabInternal: {fileID: 2139830101} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2025581860} + m_Enabled: 1 + m_EditorHideFlags: 0 m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} ---- !u!114 &1886781779 stripped -MonoBehaviour: - m_PrefabParentObject: {fileID: 11481414, guid: cf3b36c1277b6914ca9531867d57d6e5, - type: 2} - m_PrefabInternal: {fileID: 1422364005} - m_Script: {fileID: 11500000, guid: 684f389db4a8e194a89af18d0021af15, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: .895334721, b: .0514705777, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 80 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: Timer +--- !u!4 &1860753582 stripped +Transform: + m_PrefabParentObject: {fileID: 409436, guid: f89e011de36c1124e97bf9847d797ad1, type: 2} + m_PrefabInternal: {fileID: 127613653} --- !u!1001 &1890865682 Prefab: m_ObjectHideFlags: 0 @@ -1592,12 +3570,87 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_IsPrefabParent: 0 +--- !u!1 &1898002832 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 137228, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1898002833} + - 222: {fileID: 1898002835} + - 114: {fileID: 1898002834} + m_Layer: 5 + m_Name: PlayerIconTwo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1898002833 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22463086, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1898002832} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 6.56412172, z: 1} + m_Children: [] + m_Father: {fileID: 1413660775} + m_RootOrder: 0 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: -417.300018, y: 208} + m_SizeDelta: {x: 250, y: 80} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1898002834 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11489882, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1898002832} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: .710344791, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 60 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Player 2 +--- !u!222 &1898002835 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22223918, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1898002832} --- !u!1001 &1903365224 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 653857878} m_Modifications: - target: {fileID: 405082, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} propertyPath: m_LocalPosition.x @@ -1609,7 +3662,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 405082, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} propertyPath: m_LocalPosition.z - value: 0 + value: 323.855438 objectReference: {fileID: 0} - target: {fileID: 405082, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} propertyPath: m_LocalRotation.x @@ -1629,15 +3682,31 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 405082, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} propertyPath: m_RootOrder - value: 17 + value: 11 objectReference: {fileID: 0} - target: {fileID: 11420586, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} propertyPath: hasInfiniteAmmo value: 0 objectReference: {fileID: 0} + - target: {fileID: 405082, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} + propertyPath: m_LocalScale.x + value: 35.9839363 + objectReference: {fileID: 0} + - target: {fileID: 405082, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} + propertyPath: m_LocalScale.y + value: 35.9839363 + objectReference: {fileID: 0} + - target: {fileID: 405082, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} + propertyPath: m_LocalScale.z + value: 35.9839363 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} m_IsPrefabParent: 0 +--- !u!4 &1910995931 stripped +Transform: + m_PrefabParentObject: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} + m_PrefabInternal: {fileID: 179693061} --- !u!1001 &1975869167 Prefab: m_ObjectHideFlags: 0 @@ -1763,7 +3832,228 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 1 +--- !u!1 &2021881324 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 108916, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 2021881325} + m_Layer: 5 + m_Name: Fill Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2021881325 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22448182, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2021881324} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 692605457} + m_Father: {fileID: 1766389763} + m_RootOrder: 1 + m_AnchorMin: {x: 0, y: .25} + m_AnchorMax: {x: 1, y: .75} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -20, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!1 &2025581860 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 101426, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 2025581861} + - 222: {fileID: 2025581862} + - 114: {fileID: 1833327629} + m_Layer: 5 + m_Name: Timer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2025581861 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22422136, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2025581860} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 6.56412172, z: 1} + m_Children: [] + m_Father: {fileID: 143147948} + m_RootOrder: 0 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: -1, y: 29} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: .5, y: .5} +--- !u!222 &2025581862 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22235692, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2025581860} +--- !u!1 &2050290494 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 127588, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 2050290495} + m_Layer: 5 + m_Name: Player3HUD + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2050290495 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22445934, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2050290494} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 368835091} + - {fileID: 58277923} + - {fileID: 365794304} + m_Father: {fileID: 143147948} + m_RootOrder: 2 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: 3.05175781e-05, y: -9.15527344e-05} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: .5, y: .5} +--- !u!1 &2067420756 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 184230, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 2067420757} + m_Layer: 5 + m_Name: Fill Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2067420757 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22415808, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2067420756} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1204689827} + m_Father: {fileID: 58277923} + m_RootOrder: 1 + m_AnchorMin: {x: 0, y: .25} + m_AnchorMax: {x: 1, y: .75} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -20, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!1 &2093644043 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 180886, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 2093644044} + - 222: {fileID: 2093644046} + - 114: {fileID: 2093644045} + m_Layer: 5 + m_Name: PlayerIconFour + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2093644044 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22457602, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2093644043} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 6.56412172, z: 1} + m_Children: [] + m_Father: {fileID: 1812589629} + m_RootOrder: 0 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: 769.5, y: 208} + m_SizeDelta: {x: 250, y: 80} + m_Pivot: {x: .5, y: .5} +--- !u!114 &2093644045 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11418792, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2093644043} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: .911764681, b: .232657045, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 60 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Player 4 +--- !u!222 &2093644046 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22238116, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2093644043} --- !u!198 &2099061889 stripped ParticleSystem: m_PrefabParentObject: {fileID: 19842476, guid: 928ea30b33b71cc4fa13515381e9662c, @@ -1777,249 +4067,94 @@ GameObject: Transform: m_PrefabParentObject: {fileID: 406904, guid: c6cb8b851f962464c93bfa28f40064da, type: 2} m_PrefabInternal: {fileID: 1975869167} ---- !u!1001 &2139830101 -Prefab: +--- !u!1 &2112786340 +GameObject: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 653857878} - m_Modifications: - - target: {fileID: 22442296, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22442296, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22442296, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22442296, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22442296, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22442296, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22442296, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 22442296, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 22442296, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: m_AnchoredPosition.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 22442296, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: m_AnchoredPosition.y - value: 458 - objectReference: {fileID: 0} - - target: {fileID: 22442296, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22442296, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22442296, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22442296, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22442296, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 22442296, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 22442296, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: m_Pivot.x - value: .5 - objectReference: {fileID: 0} - - target: {fileID: 22442296, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: m_Pivot.y - value: .5 - objectReference: {fileID: 0} - - target: {fileID: 11492744, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: pistol - value: - objectReference: {fileID: 1518142153} - - target: {fileID: 11492744, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: assualtRifle - value: - objectReference: {fileID: 1886781779} - - target: {fileID: 11492744, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: shotgun - value: - objectReference: {fileID: 444802006} - - target: {fileID: 11492744, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: sniper - value: - objectReference: {fileID: 1103378176} - - target: {fileID: 11492744, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: minigun - value: - objectReference: {fileID: 1998640093} - - target: {fileID: 11492744, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: rocketLauncher - value: - objectReference: {fileID: 1106708548} - - target: {fileID: 11492744, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: grenadeLauncher - value: - objectReference: {fileID: 190466646} - - target: {fileID: 11492744, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: player - value: - objectReference: {fileID: 1515989184} - - target: {fileID: 11433524, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: pistol - value: - objectReference: {fileID: 1518142153} - - target: {fileID: 11433524, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: assualtRifle - value: - objectReference: {fileID: 1886781779} - - target: {fileID: 11433524, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: shotgun - value: - objectReference: {fileID: 444802006} - - target: {fileID: 11433524, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: sniper - value: - objectReference: {fileID: 1103378176} - - target: {fileID: 11433524, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: minigun - value: - objectReference: {fileID: 1998640093} - - target: {fileID: 11433524, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: rocketLauncher - value: - objectReference: {fileID: 1106708548} - - target: {fileID: 11433524, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: grenadeLauncher - value: - objectReference: {fileID: 190466646} - - target: {fileID: 11433524, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: player - value: - objectReference: {fileID: 1515989184} - - target: {fileID: 11428230, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: pistol - value: - objectReference: {fileID: 1518142153} - - target: {fileID: 11428230, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: assualtRifle - value: - objectReference: {fileID: 1886781779} - - target: {fileID: 11428230, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: shotgun - value: - objectReference: {fileID: 444802006} - - target: {fileID: 11428230, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: sniper - value: - objectReference: {fileID: 1103378176} - - target: {fileID: 11428230, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: minigun - value: - objectReference: {fileID: 1998640093} - - target: {fileID: 11428230, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: rocketLauncher - value: - objectReference: {fileID: 1106708548} - - target: {fileID: 11428230, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: grenadeLauncher - value: - objectReference: {fileID: 190466646} - - target: {fileID: 11428230, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: player - value: - objectReference: {fileID: 1515989184} - - target: {fileID: 11410990, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: pistol - value: - objectReference: {fileID: 1518142153} - - target: {fileID: 11410990, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: assualtRifle - value: - objectReference: {fileID: 1886781779} - - target: {fileID: 11410990, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: shotgun - value: - objectReference: {fileID: 444802006} - - target: {fileID: 11410990, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: sniper - value: - objectReference: {fileID: 1103378176} - - target: {fileID: 11410990, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: minigun - value: - objectReference: {fileID: 1998640093} - - target: {fileID: 11410990, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: rocketLauncher - value: - objectReference: {fileID: 1106708548} - - target: {fileID: 11410990, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: grenadeLauncher - value: - objectReference: {fileID: 190466646} - - target: {fileID: 11410990, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: player - value: - objectReference: {fileID: 1515989184} - - target: {fileID: 22446808, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22446808, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22427428, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22427428, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22467270, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22467270, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22447970, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22447970, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 11463138, guid: b8af804de96124644898f0e89616d06a, type: 2} - propertyPath: m_FontData.m_Font - value: - objectReference: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: b8af804de96124644898f0e89616d06a, type: 2} - m_IsPrefabParent: 0 + m_PrefabParentObject: {fileID: 188194, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 2112786341} + - 222: {fileID: 2112786344} + - 114: {fileID: 2112786343} + - 114: {fileID: 2112786342} + m_Layer: 5 + m_Name: PlayerAmmoCount1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2112786341 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22457208, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2112786340} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 6.56412172, z: 1} + m_Children: [] + m_Father: {fileID: 1102761632} + m_RootOrder: 2 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: -824, y: -519} + m_SizeDelta: {x: 250, y: 80} + m_Pivot: {x: .5, y: .5} +--- !u!114 &2112786342 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11428230, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2112786340} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c88ea203cda48f3498c2583e23601830, type: 3} + m_Name: + m_EditorClassIdentifier: + ammoCount: {fileID: 2112786343} + playerID: 1 + player: {fileID: 1515989184} +--- !u!114 &2112786343 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11415242, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2112786340} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: .911764681, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 45 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: AmmoCount +--- !u!222 &2112786344 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22240418, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2112786340} diff --git a/Assets/Scripts/Player/Player.cs b/Assets/Scripts/Player/Player.cs index 8b68979..464e1e0 100644 --- a/Assets/Scripts/Player/Player.cs +++ b/Assets/Scripts/Player/Player.cs @@ -15,7 +15,8 @@ public int PlayerNumber } } - public Slider slider; + public Slider HPSlider; + public Slider ammoSlider; int mHealth; int mMaxHealth; @@ -39,6 +40,9 @@ void Start() mReticlePosition = mEquippedWeapon.transform.position; mEquippedWeapon.transform.position = transform.position; mEquippedWeapon.transform.parent = transform; + ammoSlider.maxValue = mEquippedWeapon.mAmmoRemaining; + ammoSlider.value = ammoSlider.maxValue; + } void Update() @@ -49,6 +53,7 @@ void Update() { //if the fire button is pressed, fire the gun. if (Input.GetButton("Player_" + mPlayerNumber + "_Fire1")) { + ammoSlider.value--; //emit the bullet casing particle system minigunParticleSystem.Emit(1); @@ -65,7 +70,7 @@ void OnCollisionEnter2D(Collision2D coll) { if (coll.gameObject.tag == "Projectile") { - slider.value -= (float)coll.gameObject.GetComponent().Damage / 100; + HPSlider.value -= (float)coll.gameObject.GetComponent().Damage / 100; Destroy(coll.gameObject); } } From 40e9864e1794e083272b56df902be5c46fbc493f Mon Sep 17 00:00:00 2001 From: Paul Normington Date: Tue, 23 Feb 2016 20:36:30 +0000 Subject: [PATCH 07/39] Holes work + 2 players in --- Assets/Prefabs/Player.prefab | 2126 +++++++++++++++++++++++++++++ Assets/Prefabs/Player.prefab.meta | 8 + Assets/Scenes/Prototype.unity | 1427 ++++--------------- Assets/Scripts/Player/Player.cs | 2 + Assets/Scripts/tunnelScript.cs | 40 +- 5 files changed, 2424 insertions(+), 1179 deletions(-) create mode 100644 Assets/Prefabs/Player.prefab create mode 100644 Assets/Prefabs/Player.prefab.meta diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab new file mode 100644 index 0000000..b44705b --- /dev/null +++ b/Assets/Prefabs/Player.prefab @@ -0,0 +1,2126 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &103882 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22441718} + - 114: {fileID: 11434670} + m_Layer: 5 + m_Name: PlayerAmmoCountSlider1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &107548 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22408488} + - 222: {fileID: 22224336} + - 114: {fileID: 11404772} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &119466 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22498810} + m_Layer: 5 + m_Name: Fill Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &120392 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 4: {fileID: 490514} + - 198: {fileID: 19868204} + - 199: {fileID: 19911596} + m_Layer: 0 + m_Name: MiniGun Particle System + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &121534 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22434640} + m_Layer: 5 + m_Name: Player1HUD + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &133054 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 4: {fileID: 472642} + - 114: {fileID: 11491268} + - 114: {fileID: 11423510} + - 212: {fileID: 21264780} + - 114: {fileID: 11468964} + - 50: {fileID: 5019476} + - 61: {fileID: 6182250} + - 114: {fileID: 11438944} + - 114: {fileID: 11461038} + m_Layer: 0 + m_Name: Player + m_TagString: Player + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &137932 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22401764} + - 114: {fileID: 11483498} + m_Layer: 5 + m_Name: PlayerHP1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &143898 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22428368} + - 222: {fileID: 22295760} + - 114: {fileID: 11405038} + - 114: {fileID: 11492776} + m_Layer: 5 + m_Name: PlayerAmmoCount1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &150530 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 4: {fileID: 495372} + - 212: {fileID: 21230166} + - 58: {fileID: 5827044} + - 114: {fileID: 11476046} + m_Layer: 0 + m_Name: BallMode + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &168636 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22426558} + - 222: {fileID: 22246132} + - 114: {fileID: 11468980} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &170390 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22478268} + - 222: {fileID: 22230850} + - 114: {fileID: 11461712} + m_Layer: 5 + m_Name: PlayerIconOne + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!1 &172744 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22431700} + - 222: {fileID: 22200920} + - 114: {fileID: 11473472} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &183054 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 4: {fileID: 445210} + - 212: {fileID: 21206478} + m_Layer: 0 + m_Name: Reticle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &189848 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22474460} + m_Layer: 5 + m_Name: Fill Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &191010 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22492620} + - 222: {fileID: 22235334} + - 114: {fileID: 11446066} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &445210 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 183054} + 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: 472642} + m_RootOrder: 1 +--- !u!4 &472642 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 133054} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 323.855438} + m_LocalScale: {x: 35.9839363, y: 35.9839363, z: 35.9839363} + m_Children: + - {fileID: 495372} + - {fileID: 445210} + - {fileID: 490514} + - {fileID: 22434640} + m_Father: {fileID: 0} + m_RootOrder: 0 +--- !u!4 &490514 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 120392} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -.129999995, y: 0, z: .779999971} + m_LocalScale: {x: 5, y: 5, z: 5} + m_Children: [] + m_Father: {fileID: 472642} + m_RootOrder: 2 +--- !u!4 &495372 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 150530} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -1} + m_LocalScale: {x: .115264796, y: .115264796, z: .115264796} + m_Children: [] + m_Father: {fileID: 472642} + m_RootOrder: 0 +--- !u!50 &5019476 +Rigidbody2D: + serializedVersion: 2 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 133054} + m_Mass: 1 + m_LinearDrag: 100 + m_AngularDrag: .0500000007 + m_GravityScale: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 4 +--- !u!58 &5827044 +CircleCollider2D: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 150530} + m_Enabled: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 10 +--- !u!61 &6182250 +BoxCollider2D: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 133054} + m_Enabled: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_Offset: {x: -.12499994, y: -1.04278374} + serializedVersion: 2 + m_Size: {x: .861835837, y: .226932526} +--- !u!114 &11404772 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 107548} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!114 &11405038 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 143898} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: .911764681, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 45 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: AmmoCount +--- !u!114 &11423510 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 133054} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55891d2920542d641913a9d95d43c293, type: 3} + m_Name: + m_EditorClassIdentifier: + spriteManager: {fileID: 0} +--- !u!114 &11434670 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 103882} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -113659843, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} + m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} + m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_ColorMultiplier: 1 + m_FadeDuration: .100000001 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + m_FillRect: {fileID: 22426558} + m_HandleRect: {fileID: 0} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 1 + m_WholeNumbers: 0 + m_Value: 1 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Slider+SliderEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &11438944 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 133054} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3800ba1d4402403408247b3365ec08f5, type: 3} + m_Name: + m_EditorClassIdentifier: + mEquippedWeapon: {fileID: 0} + weaponList: [] + mPlayerNumber: 1 + HPSlider: {fileID: 11483498} + ammoSlider: {fileID: 11434670} + waitTime: 0 + minigunParticleSystem: {fileID: 19868204} +--- !u!114 &11446066 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 191010} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!114 &11461038 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 133054} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2064fcc622451c34086cbca807911795, type: 3} + m_Name: + m_EditorClassIdentifier: + ballObj: {fileID: 150530} + playerScript: {fileID: 11438944} + isBallin: 0 + weaponNumber: 0 +--- !u!114 &11461712 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 170390} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: .911764681, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 60 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Player 1 +--- !u!114 &11468964 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 133054} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9953f2ce208997f4590922eebec801a4, type: 3} + m_Name: + m_EditorClassIdentifier: + player: {fileID: 133054} + mReticle: {fileID: 183054} +--- !u!114 &11468980 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 168636} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!114 &11473472 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 172744} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!114 &11476046 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 150530} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 98209420a6d38b74bb9630d8cf0c9320, type: 3} + m_Name: + m_EditorClassIdentifier: + player: {fileID: 133054} +--- !u!114 &11483498 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 137932} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -113659843, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} + m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} + m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_ColorMultiplier: 1 + m_FadeDuration: .100000001 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + m_FillRect: {fileID: 22431700} + m_HandleRect: {fileID: 0} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 1 + m_WholeNumbers: 0 + m_Value: 1 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Slider+SliderEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &11491268 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 133054} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8d5cf19dc09fdeb428bccce2b3e7e0a0, type: 3} + m_Name: + m_EditorClassIdentifier: + mMovementSpeed: 1000 + _playerActions: {fileID: 11461038} +--- !u!114 &11492776 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 143898} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c88ea203cda48f3498c2583e23601830, type: 3} + m_Name: + m_EditorClassIdentifier: + ammoCount: {fileID: 11405038} + playerID: 1 + player: {fileID: 11438944} +--- !u!198 &19868204 +ParticleSystem: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 120392} + lengthInSec: 2 + startDelay: 0 + speed: 1 + randomSeed: 0 + looping: 1 + prewarm: 1 + playOnAwake: 0 + moveWithTransform: 1 + InitialModule: + enabled: 1 + startLifetime: + scalar: .200000003 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + startSpeed: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + startColor: + maxGradient: + key0: + serializedVersion: 2 + rgba: 4294967295 + key1: + serializedVersion: 2 + rgba: 4294967295 + key2: + serializedVersion: 2 + rgba: 0 + key3: + serializedVersion: 2 + rgba: 0 + key4: + serializedVersion: 2 + rgba: 0 + key5: + serializedVersion: 2 + rgba: 0 + key6: + serializedVersion: 2 + rgba: 0 + key7: + serializedVersion: 2 + rgba: 0 + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + minGradient: + key0: + serializedVersion: 2 + rgba: 4294967295 + key1: + serializedVersion: 2 + rgba: 4294967295 + key2: + serializedVersion: 2 + rgba: 0 + key3: + serializedVersion: 2 + rgba: 0 + key4: + serializedVersion: 2 + rgba: 0 + key5: + serializedVersion: 2 + rgba: 0 + key6: + serializedVersion: 2 + rgba: 0 + key7: + serializedVersion: 2 + rgba: 0 + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + minColor: + serializedVersion: 2 + rgba: 4294967295 + maxColor: + serializedVersion: 2 + rgba: 4294967295 + minMaxState: 0 + startSize: + scalar: .200000003 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + startRotation: + scalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + gravityModifier: 8 + inheritVelocity: 0 + maxNumParticles: 100 + ShapeModule: + serializedVersion: 2 + enabled: 1 + type: 10 + radius: .200000003 + angle: 25 + length: 5 + boxX: 1 + boxY: 1 + boxZ: 1 + arc: 10 + placementMode: 0 + m_Mesh: {fileID: 0} + randomDirection: 0 + EmissionModule: + enabled: 1 + m_Type: 0 + rate: + scalar: 10 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + cnt0: 30 + cnt1: 30 + cnt2: 30 + cnt3: 30 + time0: 0 + time1: 0 + time2: 0 + time3: 0 + m_BurstCount: 0 + SizeModule: + enabled: 0 + curve: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 1 + RotationModule: + enabled: 1 + curve: + scalar: 17.4532928 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + ColorModule: + enabled: 1 + gradient: + maxGradient: + key0: + serializedVersion: 2 + rgba: 4294967295 + key1: + serializedVersion: 2 + rgba: 83886079 + key2: + serializedVersion: 2 + rgba: 0 + key3: + serializedVersion: 2 + rgba: 0 + key4: + serializedVersion: 2 + rgba: 0 + key5: + serializedVersion: 2 + rgba: 0 + key6: + serializedVersion: 2 + rgba: 0 + key7: + serializedVersion: 2 + rgba: 0 + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 65535 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + minGradient: + key0: + serializedVersion: 2 + rgba: 4294967295 + key1: + serializedVersion: 2 + rgba: 4294967295 + key2: + serializedVersion: 2 + rgba: 0 + key3: + serializedVersion: 2 + rgba: 0 + key4: + serializedVersion: 2 + rgba: 0 + key5: + serializedVersion: 2 + rgba: 0 + key6: + serializedVersion: 2 + rgba: 0 + key7: + serializedVersion: 2 + rgba: 0 + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + minColor: + serializedVersion: 2 + rgba: 4294967295 + maxColor: + serializedVersion: 2 + rgba: 4294967295 + minMaxState: 1 + UVModule: + enabled: 0 + frameOverTime: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 1 + tilesX: 1 + tilesY: 1 + animationType: 0 + rowIndex: 0 + cycles: 1 + randomRow: 1 + VelocityModule: + enabled: 1 + x: + scalar: .100000001 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + y: + scalar: .100000001 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + z: + scalar: .100000001 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + inWorldSpace: 0 + ForceModule: + enabled: 0 + x: + scalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + y: + scalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + z: + scalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + inWorldSpace: 0 + randomizePerFrame: 0 + ExternalForcesModule: + enabled: 0 + multiplier: 10 + ClampVelocityModule: + enabled: 0 + x: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + y: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + z: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + magnitude: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + separateAxis: 0 + inWorldSpace: 0 + dampen: .899999976 + SizeBySpeedModule: + enabled: 0 + curve: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 1 + range: {x: 0, y: 1} + RotationBySpeedModule: + enabled: 0 + curve: + scalar: .785398126 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + range: {x: 0, y: 1} + ColorBySpeedModule: + enabled: 0 + gradient: + maxGradient: + key0: + serializedVersion: 2 + rgba: 4294967295 + key1: + serializedVersion: 2 + rgba: 4294967295 + key2: + serializedVersion: 2 + rgba: 0 + key3: + serializedVersion: 2 + rgba: 0 + key4: + serializedVersion: 2 + rgba: 0 + key5: + serializedVersion: 2 + rgba: 0 + key6: + serializedVersion: 2 + rgba: 0 + key7: + serializedVersion: 2 + rgba: 0 + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + minGradient: + key0: + serializedVersion: 2 + rgba: 4294967295 + key1: + serializedVersion: 2 + rgba: 4294967295 + key2: + serializedVersion: 2 + rgba: 0 + key3: + serializedVersion: 2 + rgba: 0 + key4: + serializedVersion: 2 + rgba: 0 + key5: + serializedVersion: 2 + rgba: 0 + key6: + serializedVersion: 2 + rgba: 0 + key7: + serializedVersion: 2 + rgba: 0 + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + minColor: + serializedVersion: 2 + rgba: 4294967295 + maxColor: + serializedVersion: 2 + rgba: 4294967295 + minMaxState: 1 + range: {x: 0, y: 1} + CollisionModule: + enabled: 0 + type: 0 + plane0: {fileID: 0} + plane1: {fileID: 0} + plane2: {fileID: 0} + plane3: {fileID: 0} + plane4: {fileID: 0} + plane5: {fileID: 0} + dampen: 0 + bounce: 1 + energyLossOnCollision: 0 + minKillSpeed: 0 + particleRadius: .00999999978 + collidesWith: + serializedVersion: 2 + m_Bits: 4294967295 + quality: 0 + voxelSize: .5 + collisionMessages: 0 + SubModule: + enabled: 0 + subEmitterBirth: {fileID: 0} + subEmitterBirth1: {fileID: 0} + subEmitterCollision: {fileID: 0} + subEmitterCollision1: {fileID: 0} + subEmitterDeath: {fileID: 0} + subEmitterDeath1: {fileID: 0} +--- !u!199 &19911596 +ParticleSystemRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 120392} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_Materials: + - {fileID: 2100000, guid: 1598bf38b0a98824b9c2b464eaf93fb7, type: 2} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 1 + m_ReflectionProbeUsage: 1 + m_ProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_ImportantGI: 0 + m_AutoUVMaxDistance: .5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_RenderMode: 0 + m_MaxParticleSize: .5 + m_CameraVelocityScale: 0 + m_VelocityScale: 0 + m_LengthScale: 2 + m_SortingFudge: 0 + m_NormalDirection: 1 + m_SortMode: 0 + m_Mesh: {fileID: 0} + m_Mesh1: {fileID: 0} + m_Mesh2: {fileID: 0} + m_Mesh3: {fileID: 0} +--- !u!212 &21206478 +SpriteRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 183054} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 1 + m_ReflectionProbeUsage: 1 + m_ProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_ImportantGI: 0 + m_AutoUVMaxDistance: .5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 1fd3c28ec5ebaef4d8511f68a1b521c2, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} +--- !u!212 &21230166 +SpriteRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 150530} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 1 + m_ReflectionProbeUsage: 1 + m_ProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_ImportantGI: 0 + m_AutoUVMaxDistance: .5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingOrder: 1 + m_Sprite: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} +--- !u!212 &21264780 +SpriteRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 133054} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 1 + m_ReflectionProbeUsage: 1 + m_ProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_ImportantGI: 0 + m_AutoUVMaxDistance: .5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: -755987041 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300006, guid: 8d5e240089c1c994291391e0a9631f95, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} +--- !u!222 &22200920 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 172744} +--- !u!222 &22224336 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 107548} +--- !u!222 &22230850 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 170390} +--- !u!222 &22235334 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 191010} +--- !u!222 &22246132 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 168636} +--- !u!222 &22295760 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 143898} +--- !u!224 &22401764 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 137932} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 13, z: 1} + m_Children: + - {fileID: 22492620} + - {fileID: 22474460} + m_Father: {fileID: 22434640} + m_RootOrder: 1 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: -826, y: 451} + m_SizeDelta: {x: 100, y: 20} + m_Pivot: {x: .5, y: .5} +--- !u!224 &22408488 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 107548} + 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: 22441718} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: .25} + m_AnchorMax: {x: 1, y: .75} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -10, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!224 &22426558 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 168636} + 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: 22498810} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 10, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!224 &22428368 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 143898} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 6.56412172, z: 1} + m_Children: [] + m_Father: {fileID: 22434640} + m_RootOrder: 2 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: -824, y: -519} + m_SizeDelta: {x: 250, y: 80} + m_Pivot: {x: .5, y: .5} +--- !u!224 &22431700 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 172744} + 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: 22474460} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 10, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!224 &22434640 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 121534} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -9} + m_LocalScale: {x: .0277901795, y: .0042336476, z: .0277901795} + m_Children: + - {fileID: 22478268} + - {fileID: 22401764} + - {fileID: 22428368} + - {fileID: 22441718} + m_Father: {fileID: 472642} + m_RootOrder: 3 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: 23.0102539, y: .1796875} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: .5, y: .5} +--- !u!224 &22441718 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 103882} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 13, z: 1} + m_Children: + - {fileID: 22408488} + - {fileID: 22498810} + m_Father: {fileID: 22434640} + m_RootOrder: 3 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: -826.000183, y: -859} + m_SizeDelta: {x: 100, y: 20} + m_Pivot: {x: .5, y: .5} +--- !u!224 &22474460 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 189848} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 22431700} + m_Father: {fileID: 22401764} + m_RootOrder: 1 + m_AnchorMin: {x: 0, y: .25} + m_AnchorMax: {x: 1, y: .75} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -20, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!224 &22478268 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 170390} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 6.56412172, z: 1} + m_Children: [] + m_Father: {fileID: 22434640} + m_RootOrder: 0 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: -834, y: 208} + m_SizeDelta: {x: 250, y: 80} + m_Pivot: {x: .5, y: .5} +--- !u!224 &22492620 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 191010} + 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: 22401764} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: .25} + m_AnchorMax: {x: 1, y: .75} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -10, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!224 &22498810 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 119466} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 22426558} + m_Father: {fileID: 22441718} + m_RootOrder: 1 + m_AnchorMin: {x: 0, y: .25} + m_AnchorMax: {x: 1, y: .75} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -20, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 133054} + m_IsPrefabParent: 1 diff --git a/Assets/Prefabs/Player.prefab.meta b/Assets/Prefabs/Player.prefab.meta new file mode 100644 index 0000000..6c71a04 --- /dev/null +++ b/Assets/Prefabs/Player.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 37b47e7042c5d694dbcf150debde834f +timeCreated: 1456259487 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Prototype.unity b/Assets/Scenes/Prototype.unity index 0f4ceca..2352317 100644 --- a/Assets/Scenes/Prototype.unity +++ b/Assets/Scenes/Prototype.unity @@ -274,6 +274,92 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Slider+SliderEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1001 &66076508 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 653857878} + m_Modifications: + - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_LocalPosition.x + value: 471.080963 + objectReference: {fileID: 0} + - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_LocalPosition.y + value: -15 + objectReference: {fileID: 0} + - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_LocalPosition.z + value: 11988.3662 + objectReference: {fileID: 0} + - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_RootOrder + value: 17 + objectReference: {fileID: 0} + - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_LocalScale.x + value: 36.0167351 + objectReference: {fileID: 0} + - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_LocalScale.y + value: 36.0167351 + objectReference: {fileID: 0} + - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_LocalScale.z + value: 36.0167351 + objectReference: {fileID: 0} + - target: {fileID: 133054, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_Name + value: Player 2 + objectReference: {fileID: 0} + - target: {fileID: 11438944, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: mPlayerNumber + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 11438944, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: mEquippedWeapon + value: + objectReference: {fileID: 1719456382} + - target: {fileID: 11423510, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: spriteManager + value: + objectReference: {fileID: 1726136058} + - target: {fileID: 22431700, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 22431700, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 22426558, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 22426558, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_IsPrefabParent: 0 --- !u!4 &91229491 stripped Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} @@ -753,146 +839,6 @@ CanvasRenderer: Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_PrefabInternal: {fileID: 514880646} ---- !u!1 &440721514 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 176628, guid: b8af804de96124644898f0e89616d06a, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 224: {fileID: 440721515} - m_Layer: 5 - m_Name: Fill Area - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &440721515 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22459160, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 440721514} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 441795666} - m_Father: {fileID: 469031883} - m_RootOrder: 1 - m_AnchorMin: {x: 0, y: .25} - m_AnchorMax: {x: 1, y: .75} - m_AnchoredPosition: {x: -5, y: 0} - m_SizeDelta: {x: -20, y: 0} - m_Pivot: {x: .5, y: .5} ---- !u!1 &441795665 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 146222, guid: b8af804de96124644898f0e89616d06a, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 224: {fileID: 441795666} - - 222: {fileID: 441795668} - - 114: {fileID: 441795667} - m_Layer: 5 - m_Name: Fill - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &441795666 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22446808, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 441795665} - 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: 440721515} - m_RootOrder: 0 - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 10, y: 0} - m_Pivot: {x: .5, y: .5} ---- !u!114 &441795667 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11430638, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 441795665} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 0, b: 0, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!222 &441795668 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22213036, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 441795665} ---- !u!1 &469031882 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 126314, guid: b8af804de96124644898f0e89616d06a, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 224: {fileID: 469031883} - - 114: {fileID: 1117151108} - m_Layer: 5 - m_Name: PlayerHP1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &469031883 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22410752, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 469031882} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2, y: 13, z: 1} - m_Children: - - {fileID: 699073354} - - {fileID: 440721515} - m_Father: {fileID: 1102761632} - m_RootOrder: 1 - m_AnchorMin: {x: .5, y: .5} - m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: -826, y: 451} - m_SizeDelta: {x: 100, y: 20} - m_Pivot: {x: .5, y: .5} --- !u!1001 &514880646 Prefab: m_ObjectHideFlags: 0 @@ -1011,6 +957,38 @@ Prefab: propertyPath: m_LocalScale.z value: 35.9839363 objectReference: {fileID: 0} + - target: {fileID: 6114202, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + propertyPath: m_Size.x + value: 1.79999995 + objectReference: {fileID: 0} + - target: {fileID: 6114202, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + propertyPath: m_Size.y + value: 1.79999995 + objectReference: {fileID: 0} + - target: {fileID: 6148676, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + propertyPath: m_Size.y + value: 1.79999995 + objectReference: {fileID: 0} + - target: {fileID: 6148676, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + propertyPath: m_Size.x + value: 1.79999995 + objectReference: {fileID: 0} + - target: {fileID: 6197000, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + propertyPath: m_Size.x + value: 1.79999995 + objectReference: {fileID: 0} + - target: {fileID: 6197000, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + propertyPath: m_Size.y + value: 1.79999995 + objectReference: {fileID: 0} + - target: {fileID: 6144322, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + propertyPath: m_Size.x + value: 1.79999995 + objectReference: {fileID: 0} + - target: {fileID: 6144322, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + propertyPath: m_Size.y + value: 1.79999995 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} m_IsPrefabParent: 0 @@ -1067,6 +1045,7 @@ RectTransform: - {fileID: 1726136059} - {fileID: 1717947874} - {fileID: 162690262} + - {fileID: 1456487450} m_Father: {fileID: 0} m_RootOrder: 2 m_AnchorMin: {x: 0, y: 0} @@ -1198,76 +1177,6 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 692605456} ---- !u!1 &699073353 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 138258, guid: b8af804de96124644898f0e89616d06a, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 224: {fileID: 699073354} - - 222: {fileID: 699073356} - - 114: {fileID: 699073355} - m_Layer: 5 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &699073354 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22434492, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 699073353} - 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: 469031883} - m_RootOrder: 0 - m_AnchorMin: {x: 0, y: .25} - m_AnchorMax: {x: 1, y: .75} - m_AnchoredPosition: {x: -5, y: 0} - m_SizeDelta: {x: -10, y: 0} - m_Pivot: {x: .5, y: .5} ---- !u!114 &699073355 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11476748, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 699073353} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!222 &699073356 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22250338, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 699073353} --- !u!1 &713839867 GameObject: m_ObjectHideFlags: 0 @@ -1364,60 +1273,6 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: dcfaa153c5433dd478fabe3e62e3b353, type: 2} m_IsPrefabParent: 0 ---- !u!1 &749276102 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 749276103} - - 212: {fileID: 749276104} - m_Layer: 0 - m_Name: Reticle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &749276103 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 749276102} - 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: 1515989185} - m_RootOrder: 1 ---- !u!212 &749276104 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 749276102} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} - m_SubsetIndices: - m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 - m_ProbeAnchor: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_ImportantGI: 0 - m_AutoUVMaxDistance: .5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 1fd3c28ec5ebaef4d8511f68a1b521c2, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} --- !u!4 &752919346 stripped Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} @@ -1455,198 +1310,43 @@ Transform: - {fileID: 1250928786} m_Father: {fileID: 653857878} m_RootOrder: 3 ---- !u!1 &791464968 +--- !u!1 &866842710 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 126314, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabParentObject: {fileID: 110008, guid: b8af804de96124644898f0e89616d06a, type: 2} m_PrefabInternal: {fileID: 0} serializedVersion: 4 m_Component: - - 224: {fileID: 791464969} - - 114: {fileID: 791464970} + - 224: {fileID: 866842711} + - 114: {fileID: 866842712} m_Layer: 5 - m_Name: PlayerAmmoCountSlider1 + m_Name: PlayerHP4 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &791464969 +--- !u!224 &866842711 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22410752, guid: b8af804de96124644898f0e89616d06a, + m_PrefabParentObject: {fileID: 22488818, guid: b8af804de96124644898f0e89616d06a, type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 791464968} + m_GameObject: {fileID: 866842710} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2, y: 13, z: 1} m_Children: - - {fileID: 956739893} - - {fileID: 1311763070} - m_Father: {fileID: 1102761632} - m_RootOrder: 3 + - {fileID: 148433720} + - {fileID: 9843160} + m_Father: {fileID: 1812589629} + m_RootOrder: 1 m_AnchorMin: {x: .5, y: .5} m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: -826.000183, y: -859} + m_AnchoredPosition: {x: 780.299988, y: -265.99942} m_SizeDelta: {x: 100, y: 20} m_Pivot: {x: .5, y: .5} ---- !u!114 &791464970 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11403244, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 791464968} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -113659843, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} - m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} - m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} - m_ColorMultiplier: 1 - m_FadeDuration: .100000001 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 0} - m_FillRect: {fileID: 844530630} - m_HandleRect: {fileID: 0} - m_Direction: 0 - m_MinValue: 0 - m_MaxValue: 1 - m_WholeNumbers: 0 - m_Value: 1 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Slider+SliderEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!1 &844530629 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 146222, guid: b8af804de96124644898f0e89616d06a, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 224: {fileID: 844530630} - - 222: {fileID: 844530632} - - 114: {fileID: 844530631} - m_Layer: 5 - m_Name: Fill - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &844530630 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22446808, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 844530629} - 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: 1311763070} - m_RootOrder: 0 - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 10, y: 0} - m_Pivot: {x: .5, y: .5} ---- !u!114 &844530631 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11430638, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 844530629} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 0, b: 0, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!222 &844530632 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22213036, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 844530629} ---- !u!1 &866842710 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 110008, guid: b8af804de96124644898f0e89616d06a, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 224: {fileID: 866842711} - - 114: {fileID: 866842712} - m_Layer: 5 - m_Name: PlayerHP4 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &866842711 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22488818, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 866842710} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2, y: 13, z: 1} - m_Children: - - {fileID: 148433720} - - {fileID: 9843160} - m_Father: {fileID: 1812589629} - m_RootOrder: 1 - m_AnchorMin: {x: .5, y: .5} - m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: 780.299988, y: -265.99942} - m_SizeDelta: {x: 100, y: 20} - m_Pivot: {x: .5, y: .5} ---- !u!114 &866842712 +--- !u!114 &866842712 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11400070, guid: b8af804de96124644898f0e89616d06a, @@ -1695,151 +1395,6 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Slider+SliderEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null ---- !u!1 &905662176 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 106350, guid: b8af804de96124644898f0e89616d06a, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 224: {fileID: 905662177} - - 222: {fileID: 905662179} - - 114: {fileID: 905662178} - m_Layer: 5 - m_Name: PlayerIconOne - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &905662177 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22494668, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 905662176} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 6.56412172, z: 1} - m_Children: [] - m_Father: {fileID: 1102761632} - m_RootOrder: 0 - m_AnchorMin: {x: .5, y: .5} - m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: -834, y: 208} - m_SizeDelta: {x: 250, y: 80} - m_Pivot: {x: .5, y: .5} ---- !u!114 &905662178 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11486622, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 905662176} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: .911764681, g: 0, b: 0, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 60 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Player 1 ---- !u!222 &905662179 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22253272, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 905662176} ---- !u!1 &956739892 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 138258, guid: b8af804de96124644898f0e89616d06a, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 224: {fileID: 956739893} - - 222: {fileID: 956739895} - - 114: {fileID: 956739894} - m_Layer: 5 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &956739893 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22434492, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 956739892} - 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: 791464969} - m_RootOrder: 0 - m_AnchorMin: {x: 0, y: .25} - m_AnchorMax: {x: 1, y: .75} - m_AnchoredPosition: {x: -5, y: 0} - m_SizeDelta: {x: -10, y: 0} - m_Pivot: {x: .5, y: .5} ---- !u!114 &956739894 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11476748, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 956739892} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!222 &956739895 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22250338, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 956739892} --- !u!1001 &1027524326 Prefab: m_ObjectHideFlags: 0 @@ -1894,92 +1449,6 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} m_IsPrefabParent: 0 ---- !u!1 &1102761631 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 171048, guid: b8af804de96124644898f0e89616d06a, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 224: {fileID: 1102761632} - m_Layer: 5 - m_Name: Player1HUD - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1102761632 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22435106, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1102761631} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -9} - m_LocalScale: {x: .0277901795, y: .0042336476, z: .0277901795} - m_Children: - - {fileID: 905662177} - - {fileID: 469031883} - - {fileID: 2112786341} - - {fileID: 791464969} - m_Father: {fileID: 1515989185} - m_RootOrder: 3 - m_AnchorMin: {x: .5, y: .5} - m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: 23.0102539, y: .1796875} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: .5, y: .5} ---- !u!114 &1117151108 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11403244, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 469031882} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -113659843, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} - m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} - m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} - m_ColorMultiplier: 1 - m_FadeDuration: .100000001 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 0} - m_FillRect: {fileID: 441795666} - m_HandleRect: {fileID: 0} - m_Direction: 0 - m_MinValue: 0 - m_MaxValue: 1 - m_WholeNumbers: 0 - m_Value: 1 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Slider+SliderEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!1001 &1168999058 Prefab: m_ObjectHideFlags: 0 @@ -2346,44 +1815,6 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_IsPrefabParent: 0 ---- !u!4 &1307117390 stripped -Transform: - m_PrefabParentObject: {fileID: 482952, guid: 928ea30b33b71cc4fa13515381e9662c, type: 2} - m_PrefabInternal: {fileID: 1630575786} ---- !u!1 &1311763069 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 176628, guid: b8af804de96124644898f0e89616d06a, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 224: {fileID: 1311763070} - m_Layer: 5 - m_Name: Fill Area - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1311763070 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22459160, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1311763069} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 844530630} - m_Father: {fileID: 791464969} - m_RootOrder: 1 - m_AnchorMin: {x: 0, y: .25} - m_AnchorMax: {x: 1, y: .75} - m_AnchoredPosition: {x: -5, y: 0} - m_SizeDelta: {x: -20, y: 0} - m_Pivot: {x: .5, y: .5} --- !u!1 &1413660774 GameObject: m_ObjectHideFlags: 0 @@ -2520,219 +1951,73 @@ MonoBehaviour: m_PrefabParentObject: {fileID: 11492744, guid: b8af804de96124644898f0e89616d06a, type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1433083140} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c88ea203cda48f3498c2583e23601830, type: 3} - m_Name: - m_EditorClassIdentifier: - ammoCount: {fileID: 2112786343} - playerID: 4 - player: {fileID: 1515989184} ---- !u!114 &1433083143 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11466586, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1433083140} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: .909803927, b: .23137255, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 45 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: AmmoCount ---- !u!222 &1433083144 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22259568, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1433083140} ---- !u!1 &1515989180 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 1515989185} - - 114: {fileID: 1515989182} - - 114: {fileID: 1515989181} - - 212: {fileID: 1515989186} - - 114: {fileID: 1515989187} - - 50: {fileID: 1515989188} - - 61: {fileID: 1515989189} - - 114: {fileID: 1515989184} - - 114: {fileID: 1515989183} - m_Layer: 0 - m_Name: Player1 - m_TagString: Player - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1515989181 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1515989180} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 55891d2920542d641913a9d95d43c293, type: 3} - m_Name: - m_EditorClassIdentifier: - spriteManager: {fileID: 1726136058} ---- !u!114 &1515989182 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1515989180} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8d5cf19dc09fdeb428bccce2b3e7e0a0, type: 3} - m_Name: - m_EditorClassIdentifier: - mMovementSpeed: 1000 - _playerActions: {fileID: 1515989183} ---- !u!114 &1515989183 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1515989180} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2064fcc622451c34086cbca807911795, type: 3} - m_Name: - m_EditorClassIdentifier: - ballObj: {fileID: 2104331960} - playerScript: {fileID: 1515989184} - isBallin: 0 - weaponNumber: 0 ---- !u!114 &1515989184 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1515989180} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3800ba1d4402403408247b3365ec08f5, type: 3} - m_Name: - m_EditorClassIdentifier: - mEquippedWeapon: {fileID: 1998640093} - weaponList: [] - mPlayerNumber: 1 - HPSlider: {fileID: 1117151108} - ammoSlider: {fileID: 791464970} - minigunParticleSystem: {fileID: 2099061889} ---- !u!4 &1515989185 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1515989180} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 323.855438} - m_LocalScale: {x: 35.9839363, y: 35.9839363, z: 35.9839363} - m_Children: - - {fileID: 2104331961} - - {fileID: 749276103} - - {fileID: 1307117390} - - {fileID: 1102761632} - m_Father: {fileID: 653857878} - m_RootOrder: 2 ---- !u!212 &1515989186 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1515989180} + m_GameObject: {fileID: 1433083140} m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} - m_SubsetIndices: - m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 - m_ProbeAnchor: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_ImportantGI: 0 - m_AutoUVMaxDistance: .5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -755987041 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300006, guid: 8d5e240089c1c994291391e0a9631f95, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} ---- !u!114 &1515989187 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c88ea203cda48f3498c2583e23601830, type: 3} + m_Name: + m_EditorClassIdentifier: + ammoCount: {fileID: 2112786343} + playerID: 4 + player: {fileID: 1515989184} +--- !u!114 &1433083143 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_PrefabParentObject: {fileID: 11466586, guid: b8af804de96124644898f0e89616d06a, + type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1515989180} + m_GameObject: {fileID: 1433083140} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9953f2ce208997f4590922eebec801a4, type: 3} + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - player: {fileID: 1515989180} - mReticle: {fileID: 749276102} ---- !u!50 &1515989188 -Rigidbody2D: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1515989180} - m_Mass: 1 - m_LinearDrag: 100 - m_AngularDrag: .0500000007 - m_GravityScale: 0 - m_IsKinematic: 0 - m_Interpolate: 0 - m_SleepingMode: 1 - m_CollisionDetection: 0 - m_Constraints: 4 ---- !u!61 &1515989189 -BoxCollider2D: + m_Material: {fileID: 0} + m_Color: {r: 0, g: .909803927, b: .23137255, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 45 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: AmmoCount +--- !u!222 &1433083144 +CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_PrefabParentObject: {fileID: 22259568, guid: b8af804de96124644898f0e89616d06a, + type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1515989180} - m_Enabled: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_Offset: {x: -.12499994, y: -1.04278374} - serializedVersion: 2 - m_Size: {x: .861835837, y: .226932526} + m_GameObject: {fileID: 1433083140} +--- !u!4 &1456487450 stripped +Transform: + m_PrefabParentObject: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 66076508} +--- !u!1 &1515989180 stripped +GameObject: + m_PrefabParentObject: {fileID: 133054, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 1800545368} +--- !u!114 &1515989184 stripped +MonoBehaviour: + m_PrefabParentObject: {fileID: 11438944, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 1800545368} + m_Script: {fileID: 11500000, guid: 3800ba1d4402403408247b3365ec08f5, type: 3} +--- !u!4 &1515989185 stripped +Transform: + m_PrefabParentObject: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 1800545368} --- !u!1001 &1540794253 Prefab: m_ObjectHideFlags: 0 @@ -2788,112 +2073,6 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_IsPrefabParent: 0 ---- !u!1001 &1630575786 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1515989185} - m_Modifications: - - target: {fileID: 482952, guid: 928ea30b33b71cc4fa13515381e9662c, type: 2} - propertyPath: m_LocalPosition.x - value: -.129999995 - objectReference: {fileID: 0} - - target: {fileID: 482952, guid: 928ea30b33b71cc4fa13515381e9662c, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 482952, guid: 928ea30b33b71cc4fa13515381e9662c, type: 2} - propertyPath: m_LocalPosition.z - value: .779999971 - objectReference: {fileID: 0} - - target: {fileID: 482952, guid: 928ea30b33b71cc4fa13515381e9662c, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 482952, guid: 928ea30b33b71cc4fa13515381e9662c, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 482952, guid: 928ea30b33b71cc4fa13515381e9662c, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 482952, guid: 928ea30b33b71cc4fa13515381e9662c, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 482952, guid: 928ea30b33b71cc4fa13515381e9662c, type: 2} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 19842476, guid: 928ea30b33b71cc4fa13515381e9662c, type: 2} - propertyPath: InitialModule.gravityModifier - value: 8 - objectReference: {fileID: 0} - - target: {fileID: 19842476, guid: 928ea30b33b71cc4fa13515381e9662c, type: 2} - propertyPath: ExternalForcesModule.enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 19842476, guid: 928ea30b33b71cc4fa13515381e9662c, type: 2} - propertyPath: ExternalForcesModule.multiplier - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 19842476, guid: 928ea30b33b71cc4fa13515381e9662c, type: 2} - propertyPath: lengthInSec - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 19842476, guid: 928ea30b33b71cc4fa13515381e9662c, type: 2} - propertyPath: InitialModule.startLifetime.scalar - value: .200000003 - objectReference: {fileID: 0} - - target: {fileID: 19842476, guid: 928ea30b33b71cc4fa13515381e9662c, type: 2} - propertyPath: InitialModule.startSize.scalar - value: .200000003 - objectReference: {fileID: 0} - - target: {fileID: 19842476, guid: 928ea30b33b71cc4fa13515381e9662c, type: 2} - propertyPath: ColorModule.gradient.maxGradient.ctime0 - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 19842476, guid: 928ea30b33b71cc4fa13515381e9662c, type: 2} - propertyPath: ColorModule.gradient.maxGradient.ctime1 - value: 65535 - objectReference: {fileID: 0} - - target: {fileID: 19842476, guid: 928ea30b33b71cc4fa13515381e9662c, type: 2} - propertyPath: ColorModule.gradient.maxGradient.atime1 - value: 65535 - objectReference: {fileID: 0} - - target: {fileID: 19842476, guid: 928ea30b33b71cc4fa13515381e9662c, type: 2} - propertyPath: ColorModule.gradient.maxGradient.key1.rgba - value: 83886079 - objectReference: {fileID: 0} - - target: {fileID: 19842476, guid: 928ea30b33b71cc4fa13515381e9662c, type: 2} - propertyPath: ColorModule.gradient.maxGradient.atime2 - value: 65535 - objectReference: {fileID: 0} - - target: {fileID: 19842476, guid: 928ea30b33b71cc4fa13515381e9662c, type: 2} - propertyPath: ColorModule.gradient.maxGradient.m_NumAlphaKeys - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 19842476, guid: 928ea30b33b71cc4fa13515381e9662c, type: 2} - propertyPath: ColorModule.gradient.maxGradient.atime0 - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 19842476, guid: 928ea30b33b71cc4fa13515381e9662c, type: 2} - propertyPath: ColorModule.gradient.maxGradient.key0.rgba - value: 4294967295 - objectReference: {fileID: 0} - - target: {fileID: 19842476, guid: 928ea30b33b71cc4fa13515381e9662c, type: 2} - propertyPath: looping - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 19975048, guid: 928ea30b33b71cc4fa13515381e9662c, type: 2} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 928ea30b33b71cc4fa13515381e9662c, type: 2} - m_IsPrefabParent: 0 --- !u!1001 &1633521612 Prefab: m_ObjectHideFlags: 0 @@ -3152,6 +2331,12 @@ CanvasRenderer: Transform: m_PrefabParentObject: {fileID: 401230, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} m_PrefabInternal: {fileID: 581025534} +--- !u!114 &1719456382 stripped +MonoBehaviour: + m_PrefabParentObject: {fileID: 11481414, guid: cf3b36c1277b6914ca9531867d57d6e5, + type: 2} + m_PrefabInternal: {fileID: 1422364005} + m_Script: {fileID: 11500000, guid: 684f389db4a8e194a89af18d0021af15, type: 3} --- !u!4 &1724056570 stripped Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} @@ -3446,6 +2631,76 @@ MonoBehaviour: m_EditorClassIdentifier: shakeTimer: 0 shakeIntesity: 0 +--- !u!1001 &1800545368 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 653857878} + m_Modifications: + - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_LocalPosition.z + value: 323.855438 + objectReference: {fileID: 0} + - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 11423510, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: spriteManager + value: + objectReference: {fileID: 1726136058} + - target: {fileID: 11438944, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: mEquippedWeapon + value: + objectReference: {fileID: 1998640093} + - target: {fileID: 22431700, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22431700, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22426558, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22426558, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 133054, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_Name + value: Player 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_IsPrefabParent: 0 --- !u!1 &1812589628 GameObject: m_ObjectHideFlags: 0 @@ -3707,52 +2962,6 @@ Prefab: Transform: m_PrefabParentObject: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} m_PrefabInternal: {fileID: 179693061} ---- !u!1001 &1975869167 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1515989185} - m_Modifications: - - target: {fileID: 406904, guid: c6cb8b851f962464c93bfa28f40064da, type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 406904, guid: c6cb8b851f962464c93bfa28f40064da, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 406904, guid: c6cb8b851f962464c93bfa28f40064da, type: 2} - propertyPath: m_LocalPosition.z - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 406904, guid: c6cb8b851f962464c93bfa28f40064da, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 406904, guid: c6cb8b851f962464c93bfa28f40064da, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 406904, guid: c6cb8b851f962464c93bfa28f40064da, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 406904, guid: c6cb8b851f962464c93bfa28f40064da, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 406904, guid: c6cb8b851f962464c93bfa28f40064da, type: 2} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 11457942, guid: c6cb8b851f962464c93bfa28f40064da, type: 2} - propertyPath: player - value: - objectReference: {fileID: 1515989180} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: c6cb8b851f962464c93bfa28f40064da, type: 2} - m_IsPrefabParent: 0 --- !u!114 &1998640093 stripped MonoBehaviour: m_PrefabParentObject: {fileID: 11440672, guid: 0d300e0327b70da49abe5b0e9498a7a7, @@ -4054,107 +3263,9 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2093644043} ---- !u!198 &2099061889 stripped -ParticleSystem: - m_PrefabParentObject: {fileID: 19842476, guid: 928ea30b33b71cc4fa13515381e9662c, - type: 2} - m_PrefabInternal: {fileID: 1630575786} ---- !u!1 &2104331960 stripped -GameObject: - m_PrefabParentObject: {fileID: 138052, guid: c6cb8b851f962464c93bfa28f40064da, type: 2} - m_PrefabInternal: {fileID: 1975869167} ---- !u!4 &2104331961 stripped -Transform: - m_PrefabParentObject: {fileID: 406904, guid: c6cb8b851f962464c93bfa28f40064da, type: 2} - m_PrefabInternal: {fileID: 1975869167} ---- !u!1 &2112786340 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 188194, guid: b8af804de96124644898f0e89616d06a, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 224: {fileID: 2112786341} - - 222: {fileID: 2112786344} - - 114: {fileID: 2112786343} - - 114: {fileID: 2112786342} - m_Layer: 5 - m_Name: PlayerAmmoCount1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2112786341 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22457208, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2112786340} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 6.56412172, z: 1} - m_Children: [] - m_Father: {fileID: 1102761632} - m_RootOrder: 2 - m_AnchorMin: {x: .5, y: .5} - m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: -824, y: -519} - m_SizeDelta: {x: 250, y: 80} - m_Pivot: {x: .5, y: .5} ---- !u!114 &2112786342 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11428230, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2112786340} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c88ea203cda48f3498c2583e23601830, type: 3} - m_Name: - m_EditorClassIdentifier: - ammoCount: {fileID: 2112786343} - playerID: 1 - player: {fileID: 1515989184} ---- !u!114 &2112786343 +--- !u!114 &2112786343 stripped MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11415242, guid: b8af804de96124644898f0e89616d06a, + m_PrefabParentObject: {fileID: 11405038, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2112786340} - m_Enabled: 1 - m_EditorHideFlags: 0 + m_PrefabInternal: {fileID: 1800545368} m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: .911764681, g: 0, b: 0, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 45 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: AmmoCount ---- !u!222 &2112786344 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22240418, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2112786340} diff --git a/Assets/Scripts/Player/Player.cs b/Assets/Scripts/Player/Player.cs index 464e1e0..3221680 100644 --- a/Assets/Scripts/Player/Player.cs +++ b/Assets/Scripts/Player/Player.cs @@ -23,6 +23,7 @@ public int PlayerNumber int mSheildDamageReduction; + public float waitTime; float mMaxSheildTime; float mRemainingSheidTime; Vector2 mReticlePosition; @@ -47,6 +48,7 @@ void Start() void Update() { + waitTime -= Time.deltaTime; if (mEquippedWeapon) { if (GetComponent().AimDirection.magnitude > 0.9) diff --git a/Assets/Scripts/tunnelScript.cs b/Assets/Scripts/tunnelScript.cs index 4cb13ff..526c547 100644 --- a/Assets/Scripts/tunnelScript.cs +++ b/Assets/Scripts/tunnelScript.cs @@ -1,12 +1,12 @@ -using UnityEngine; -using System.Collections; - -public class tunnelScript : MonoBehaviour { - - public GameObject tunnelMan; - - int tunnelNo; - +using UnityEngine; +using System.Collections; + +public class tunnelScript : MonoBehaviour { + + public GameObject tunnelMan; + + int tunnelNo; + int randTunnelLink; // Use this for initialization void Start () { @@ -14,22 +14,19 @@ void Start () { tunnelNo = tunnelMan.GetComponent().tunnelNo; tunnelMan.GetComponent().tunnelNo++; randTunnelLink = tunnelMan.GetComponent().randTunnel; - } - - // Update is called once per frame + } + + // Update is called once per frame void Update () { if (randTunnelLink >= 3) { randTunnelLink = 0; } - } - + } + void OnTriggerEnter2D(Collider2D coll) { - - randTunnelLink += 1; - Debug.Log(randTunnelLink); - if (coll.name == "Player") + if (coll.name == "Player" && coll.gameObject.GetComponentInParent().waitTime <= 0.0f) { if (randTunnelLink != tunnelNo) { @@ -52,7 +49,8 @@ void OnTriggerEnter2D(Collider2D coll) } //Problem is that you can teleport to random tunnels but you can also teleport to the same on you just walked into //Have to check whether you are colliding with the one you're teleporting to + randTunnelLink += 1; + coll.gameObject.GetComponentInParent().waitTime = 0.5f; } - //coll.gameObject.GetComponentInParent().wTime = 1.5f; - } -} + } +} From e7fcff57d89c3b90d9d4bd5d40f635caab30ba2f Mon Sep 17 00:00:00 2001 From: Paul Normington Date: Tue, 23 Feb 2016 20:41:01 +0000 Subject: [PATCH 08/39] Players now collide properly with holes --- Assets/Scenes/Prototype.unity | 16 ++++++++-------- Assets/Scripts/tunnelScript.cs | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Assets/Scenes/Prototype.unity b/Assets/Scenes/Prototype.unity index 2352317..3133da4 100644 --- a/Assets/Scenes/Prototype.unity +++ b/Assets/Scenes/Prototype.unity @@ -343,19 +343,19 @@ Prefab: objectReference: {fileID: 1726136058} - target: {fileID: 22431700, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 22431700, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 22426558, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 22426558, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} @@ -2680,19 +2680,19 @@ Prefab: objectReference: {fileID: 1998640093} - target: {fileID: 22431700, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 22431700, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 22426558, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 22426558, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 133054, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_Name diff --git a/Assets/Scripts/tunnelScript.cs b/Assets/Scripts/tunnelScript.cs index 526c547..b26c5c5 100644 --- a/Assets/Scripts/tunnelScript.cs +++ b/Assets/Scripts/tunnelScript.cs @@ -26,7 +26,7 @@ void Update () { void OnTriggerEnter2D(Collider2D coll) { - if (coll.name == "Player" && coll.gameObject.GetComponentInParent().waitTime <= 0.0f) + if (coll.GetComponent() && coll.gameObject.GetComponentInParent().waitTime <= 0.0f) { if (randTunnelLink != tunnelNo) { From 741a24a12b81378644fb94eacd5ba71d0d1e5ef6 Mon Sep 17 00:00:00 2001 From: JSleekXD Date: Tue, 23 Feb 2016 22:34:55 +0000 Subject: [PATCH 09/39] Allowed sprite swapping for multiple players Each player now has its own SpriteManager, allowing the sprites to swap (for different directional facing) for multiple players. A public reference of SpriteManager was made on Aiming, and ChangeSprite() is called via this reference. As Player is a prefab, this can all be hooked up via prefabs and therefore duplicated for extra players, without needing to change anything (in theory, yet to be tested). --- Assets/MovementISO.cs | 9 +- Assets/Prefabs/SpriteManager.prefab | 63 +++++++ Assets/Prefabs/SpriteManager.prefab.meta | 8 + Assets/Scenes/Prototype.unity | 229 +++++++++++++++++------ Assets/Scripts/Player/Aiming.cs | 5 +- Assets/Scripts/Player/Player.cs | 2 + 6 files changed, 256 insertions(+), 60 deletions(-) create mode 100644 Assets/Prefabs/SpriteManager.prefab create mode 100644 Assets/Prefabs/SpriteManager.prefab.meta diff --git a/Assets/MovementISO.cs b/Assets/MovementISO.cs index ef02e3f..0d3b23a 100644 --- a/Assets/MovementISO.cs +++ b/Assets/MovementISO.cs @@ -8,7 +8,7 @@ public class MovementISO : MonoBehaviour { // Use this for initialization void Start () { - spriteManager = GetComponent (); + //spriteManager = GetComponent (); } // Update is called once per frame @@ -16,13 +16,16 @@ void Update () { if (Input.GetKeyDown (KeyCode.Keypad1)) { spriteManager.ChangeSprite (1); + } if (Input.GetKeyDown (KeyCode.Keypad2)) { spriteManager.ChangeSprite (2); - } + + } if (Input.GetKeyDown (KeyCode.Keypad3)) { spriteManager.ChangeSprite (3); - } + + } if (Input.GetKeyDown (KeyCode.Keypad4)) { spriteManager.ChangeSprite (4); } diff --git a/Assets/Prefabs/SpriteManager.prefab b/Assets/Prefabs/SpriteManager.prefab new file mode 100644 index 0000000..ad6b185 --- /dev/null +++ b/Assets/Prefabs/SpriteManager.prefab @@ -0,0 +1,63 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &123852 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 4: {fileID: 459904} + - 114: {fileID: 11488472} + m_Layer: 0 + m_Name: SpriteManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &459904 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 123852} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -.0139017105} + m_LocalScale: {x: .998455405, y: .998455405, z: .998455405} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 +--- !u!114 &11488472 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 123852} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 72924532f27ef1a44a83a8354e4dcaa9, type: 3} + m_Name: + m_EditorClassIdentifier: + playerSprites: + - {fileID: 21300000, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300012, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300008, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300002, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300004, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300006, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300010, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300014, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300016, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + player: {fileID: 0} +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 123852} + m_IsPrefabParent: 1 diff --git a/Assets/Prefabs/SpriteManager.prefab.meta b/Assets/Prefabs/SpriteManager.prefab.meta new file mode 100644 index 0000000..e2f1487 --- /dev/null +++ b/Assets/Prefabs/SpriteManager.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 177f3aee218d5654f91c54c038b43ac9 +timeCreated: 1456264312 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Prototype.unity b/Assets/Scenes/Prototype.unity index 2352317..3cd988f 100644 --- a/Assets/Scenes/Prototype.unity +++ b/Assets/Scenes/Prototype.unity @@ -311,7 +311,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_RootOrder - value: 17 + value: 16 objectReference: {fileID: 0} - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_LocalScale.x @@ -340,23 +340,43 @@ Prefab: - target: {fileID: 11423510, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: spriteManager value: - objectReference: {fileID: 1726136058} + objectReference: {fileID: 1828806172} - target: {fileID: 22431700, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 22431700, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 22426558, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 22426558, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22434640, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 490514, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 445210, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 495372, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} + - target: {fileID: 11468964, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: spriteManager + value: + objectReference: {fileID: 1828806172} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} m_IsPrefabParent: 0 @@ -576,6 +596,68 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} m_IsPrefabParent: 0 +--- !u!1001 &256436919 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1515989185} + m_Modifications: + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 11488472, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: player + value: + objectReference: {fileID: 1515989180} + - target: {fileID: 123852, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_Name + value: SpriteManager1 + objectReference: {fileID: 0} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + m_IsPrefabParent: 0 --- !u!1 &329086455 GameObject: m_ObjectHideFlags: 0 @@ -939,7 +1021,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 401230, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} propertyPath: m_RootOrder - value: 15 + value: 14 objectReference: {fileID: 0} - target: {fileID: 194862, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} propertyPath: m_Name @@ -1042,7 +1124,6 @@ RectTransform: - {fileID: 516090087} - {fileID: 1649534405} - {fileID: 531871430} - - {fileID: 1726136059} - {fileID: 1717947874} - {fileID: 162690262} - {fileID: 1456487450} @@ -1685,7 +1766,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} propertyPath: m_RootOrder - value: 16 + value: 15 objectReference: {fileID: 0} - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} propertyPath: m_LocalScale.x @@ -2341,56 +2422,12 @@ MonoBehaviour: Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_PrefabInternal: {fileID: 1290932045} ---- !u!1 &1726136057 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 1726136059} - - 114: {fileID: 1726136058} - m_Layer: 0 - m_Name: SpriteManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1726136058 +--- !u!114 &1726136058 stripped MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1726136057} - m_Enabled: 1 - m_EditorHideFlags: 0 + m_PrefabParentObject: {fileID: 11488472, guid: 177f3aee218d5654f91c54c038b43ac9, + type: 2} + m_PrefabInternal: {fileID: 256436919} m_Script: {fileID: 11500000, guid: 72924532f27ef1a44a83a8354e4dcaa9, type: 3} - m_Name: - m_EditorClassIdentifier: - playerSprites: - - {fileID: 21300000, guid: d3661648c4213db4a83f88596f678fe0, type: 3} - - {fileID: 21300012, guid: d3661648c4213db4a83f88596f678fe0, type: 3} - - {fileID: 21300008, guid: d3661648c4213db4a83f88596f678fe0, type: 3} - - {fileID: 21300002, guid: d3661648c4213db4a83f88596f678fe0, type: 3} - - {fileID: 21300004, guid: d3661648c4213db4a83f88596f678fe0, type: 3} - - {fileID: 21300006, guid: d3661648c4213db4a83f88596f678fe0, type: 3} - - {fileID: 21300010, guid: d3661648c4213db4a83f88596f678fe0, type: 3} - - {fileID: 21300014, guid: d3661648c4213db4a83f88596f678fe0, type: 3} - - {fileID: 21300016, guid: d3661648c4213db4a83f88596f678fe0, type: 3} - player: {fileID: 1515989180} ---- !u!4 &1726136059 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1726136057} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 323.855438} - m_LocalScale: {x: 35.9839363, y: 35.9839363, z: 35.9839363} - m_Children: [] - m_Father: {fileID: 653857878} - m_RootOrder: 14 --- !u!1001 &1757835289 Prefab: m_ObjectHideFlags: 0 @@ -2698,9 +2735,79 @@ Prefab: propertyPath: m_Name value: Player 1 objectReference: {fileID: 0} + - target: {fileID: 11438944, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: mPlayerNumber + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11468964, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: spriteManager + value: + objectReference: {fileID: 1726136058} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} m_IsPrefabParent: 0 +--- !u!1001 &1805697436 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1456487450} + m_Modifications: + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_LocalPosition.x + value: -13.0795021 + objectReference: {fileID: 0} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_LocalPosition.y + value: .416473091 + objectReference: {fileID: 0} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_LocalPosition.z + value: -323.863647 + objectReference: {fileID: 0} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11488472, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: player + value: + objectReference: {fileID: 1870004477} + - target: {fileID: 123852, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_Name + value: SpriteManager2 + objectReference: {fileID: 0} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_LocalScale.x + value: .99908936 + objectReference: {fileID: 0} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_LocalScale.y + value: .99908936 + objectReference: {fileID: 0} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_LocalScale.z + value: .99908936 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + m_IsPrefabParent: 0 --- !u!1 &1812589628 GameObject: m_ObjectHideFlags: 0 @@ -2737,6 +2844,12 @@ RectTransform: m_AnchoredPosition: {x: 3.05175781e-05, y: -9.15527344e-05} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: .5, y: .5} +--- !u!114 &1828806172 stripped +MonoBehaviour: + m_PrefabParentObject: {fileID: 11488472, guid: 177f3aee218d5654f91c54c038b43ac9, + type: 2} + m_PrefabInternal: {fileID: 1805697436} + m_Script: {fileID: 11500000, guid: 72924532f27ef1a44a83a8354e4dcaa9, type: 3} --- !u!114 &1833327629 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2774,6 +2887,10 @@ MonoBehaviour: Transform: m_PrefabParentObject: {fileID: 409436, guid: f89e011de36c1124e97bf9847d797ad1, type: 2} m_PrefabInternal: {fileID: 127613653} +--- !u!1 &1870004477 stripped +GameObject: + m_PrefabParentObject: {fileID: 133054, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 66076508} --- !u!1001 &1890865682 Prefab: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Player/Aiming.cs b/Assets/Scripts/Player/Aiming.cs index e23de29..b74a758 100644 --- a/Assets/Scripts/Player/Aiming.cs +++ b/Assets/Scripts/Player/Aiming.cs @@ -6,6 +6,7 @@ public class Aiming : MonoBehaviour public GameObject player; private PlayerActions _playerActions; private SpriteRenderer reticleRenderer; + public SpriteManager spriteManager; Vector2 mDefaultPosition = new Vector2(0.0f, 0.0f); @@ -52,6 +53,7 @@ void Update() { Vector2 playerPosition = new Vector2(transform.position.x, transform.position.y); mAimDirection = new Vector2(Input.GetAxis("Player_" + GetComponent().PlayerNumber + "_RJoystickX"), Input.GetAxis("Player_" + GetComponent().PlayerNumber + "_RJoystickY")).normalized; + //mReticle.gameObject.SetActive(false); if (mAimDirection != mPreviousAimDirection && mAimDirection.magnitude > 0) @@ -69,7 +71,8 @@ void Update() mReticle.transform.position = mDefaultPosition + playerPosition - (mCorrectedAimDirection) * 1.5f; //Debug.DrawLine (playerPosition, playerPosition + mAimDirection * Range); - SpriteManager.instance.ChangeSprite(spriteNumber); + spriteManager.ChangeSprite(spriteNumber); + // SpriteManager.instance.ChangeSprite(spriteNumber); mPreviousAimDirection = mAimDirection; } } diff --git a/Assets/Scripts/Player/Player.cs b/Assets/Scripts/Player/Player.cs index 3221680..f33bf84 100644 --- a/Assets/Scripts/Player/Player.cs +++ b/Assets/Scripts/Player/Player.cs @@ -7,6 +7,8 @@ public class Player : MonoBehaviour public Weapon mEquippedWeapon; public Weapon[] weaponList; public int mPlayerNumber; + + public int PlayerNumber { get From 3f33b6c9714f6da5285c0715f140b0d1c3db19e3 Mon Sep 17 00:00:00 2001 From: JSleekXD Date: Tue, 23 Feb 2016 22:45:46 +0000 Subject: [PATCH 10/39] Re-attempting previous commit due to Scene conflict The last commit did not push due to conflicts with the Prototype scene. In this commit I have deleted the old master scene and added in the new master scene, along with the other modified assets. --- Assets/MovementISO.cs | 9 +- Assets/Prefabs/SpriteManager.prefab | 63 +++++++ Assets/Prefabs/SpriteManager.prefab.meta | 8 + Assets/Scenes/Prototype.unity | 229 +++++++++++++++++------ Assets/Scripts/Player/Aiming.cs | 5 +- Assets/Scripts/Player/Player.cs | 2 + 6 files changed, 256 insertions(+), 60 deletions(-) create mode 100644 Assets/Prefabs/SpriteManager.prefab create mode 100644 Assets/Prefabs/SpriteManager.prefab.meta diff --git a/Assets/MovementISO.cs b/Assets/MovementISO.cs index ef02e3f..0d3b23a 100644 --- a/Assets/MovementISO.cs +++ b/Assets/MovementISO.cs @@ -8,7 +8,7 @@ public class MovementISO : MonoBehaviour { // Use this for initialization void Start () { - spriteManager = GetComponent (); + //spriteManager = GetComponent (); } // Update is called once per frame @@ -16,13 +16,16 @@ void Update () { if (Input.GetKeyDown (KeyCode.Keypad1)) { spriteManager.ChangeSprite (1); + } if (Input.GetKeyDown (KeyCode.Keypad2)) { spriteManager.ChangeSprite (2); - } + + } if (Input.GetKeyDown (KeyCode.Keypad3)) { spriteManager.ChangeSprite (3); - } + + } if (Input.GetKeyDown (KeyCode.Keypad4)) { spriteManager.ChangeSprite (4); } diff --git a/Assets/Prefabs/SpriteManager.prefab b/Assets/Prefabs/SpriteManager.prefab new file mode 100644 index 0000000..ad6b185 --- /dev/null +++ b/Assets/Prefabs/SpriteManager.prefab @@ -0,0 +1,63 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &123852 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 4: {fileID: 459904} + - 114: {fileID: 11488472} + m_Layer: 0 + m_Name: SpriteManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &459904 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 123852} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -.0139017105} + m_LocalScale: {x: .998455405, y: .998455405, z: .998455405} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 +--- !u!114 &11488472 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 123852} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 72924532f27ef1a44a83a8354e4dcaa9, type: 3} + m_Name: + m_EditorClassIdentifier: + playerSprites: + - {fileID: 21300000, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300012, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300008, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300002, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300004, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300006, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300010, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300014, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300016, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + player: {fileID: 0} +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 123852} + m_IsPrefabParent: 1 diff --git a/Assets/Prefabs/SpriteManager.prefab.meta b/Assets/Prefabs/SpriteManager.prefab.meta new file mode 100644 index 0000000..e2f1487 --- /dev/null +++ b/Assets/Prefabs/SpriteManager.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 177f3aee218d5654f91c54c038b43ac9 +timeCreated: 1456264312 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Prototype.unity b/Assets/Scenes/Prototype.unity index 2352317..3cd988f 100644 --- a/Assets/Scenes/Prototype.unity +++ b/Assets/Scenes/Prototype.unity @@ -311,7 +311,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_RootOrder - value: 17 + value: 16 objectReference: {fileID: 0} - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_LocalScale.x @@ -340,23 +340,43 @@ Prefab: - target: {fileID: 11423510, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: spriteManager value: - objectReference: {fileID: 1726136058} + objectReference: {fileID: 1828806172} - target: {fileID: 22431700, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 22431700, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 22426558, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 22426558, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22434640, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 490514, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 445210, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 495372, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} + - target: {fileID: 11468964, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: spriteManager + value: + objectReference: {fileID: 1828806172} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} m_IsPrefabParent: 0 @@ -576,6 +596,68 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} m_IsPrefabParent: 0 +--- !u!1001 &256436919 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1515989185} + m_Modifications: + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 11488472, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: player + value: + objectReference: {fileID: 1515989180} + - target: {fileID: 123852, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_Name + value: SpriteManager1 + objectReference: {fileID: 0} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + m_IsPrefabParent: 0 --- !u!1 &329086455 GameObject: m_ObjectHideFlags: 0 @@ -939,7 +1021,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 401230, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} propertyPath: m_RootOrder - value: 15 + value: 14 objectReference: {fileID: 0} - target: {fileID: 194862, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} propertyPath: m_Name @@ -1042,7 +1124,6 @@ RectTransform: - {fileID: 516090087} - {fileID: 1649534405} - {fileID: 531871430} - - {fileID: 1726136059} - {fileID: 1717947874} - {fileID: 162690262} - {fileID: 1456487450} @@ -1685,7 +1766,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} propertyPath: m_RootOrder - value: 16 + value: 15 objectReference: {fileID: 0} - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} propertyPath: m_LocalScale.x @@ -2341,56 +2422,12 @@ MonoBehaviour: Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_PrefabInternal: {fileID: 1290932045} ---- !u!1 &1726136057 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 1726136059} - - 114: {fileID: 1726136058} - m_Layer: 0 - m_Name: SpriteManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1726136058 +--- !u!114 &1726136058 stripped MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1726136057} - m_Enabled: 1 - m_EditorHideFlags: 0 + m_PrefabParentObject: {fileID: 11488472, guid: 177f3aee218d5654f91c54c038b43ac9, + type: 2} + m_PrefabInternal: {fileID: 256436919} m_Script: {fileID: 11500000, guid: 72924532f27ef1a44a83a8354e4dcaa9, type: 3} - m_Name: - m_EditorClassIdentifier: - playerSprites: - - {fileID: 21300000, guid: d3661648c4213db4a83f88596f678fe0, type: 3} - - {fileID: 21300012, guid: d3661648c4213db4a83f88596f678fe0, type: 3} - - {fileID: 21300008, guid: d3661648c4213db4a83f88596f678fe0, type: 3} - - {fileID: 21300002, guid: d3661648c4213db4a83f88596f678fe0, type: 3} - - {fileID: 21300004, guid: d3661648c4213db4a83f88596f678fe0, type: 3} - - {fileID: 21300006, guid: d3661648c4213db4a83f88596f678fe0, type: 3} - - {fileID: 21300010, guid: d3661648c4213db4a83f88596f678fe0, type: 3} - - {fileID: 21300014, guid: d3661648c4213db4a83f88596f678fe0, type: 3} - - {fileID: 21300016, guid: d3661648c4213db4a83f88596f678fe0, type: 3} - player: {fileID: 1515989180} ---- !u!4 &1726136059 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1726136057} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 323.855438} - m_LocalScale: {x: 35.9839363, y: 35.9839363, z: 35.9839363} - m_Children: [] - m_Father: {fileID: 653857878} - m_RootOrder: 14 --- !u!1001 &1757835289 Prefab: m_ObjectHideFlags: 0 @@ -2698,9 +2735,79 @@ Prefab: propertyPath: m_Name value: Player 1 objectReference: {fileID: 0} + - target: {fileID: 11438944, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: mPlayerNumber + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11468964, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: spriteManager + value: + objectReference: {fileID: 1726136058} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} m_IsPrefabParent: 0 +--- !u!1001 &1805697436 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1456487450} + m_Modifications: + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_LocalPosition.x + value: -13.0795021 + objectReference: {fileID: 0} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_LocalPosition.y + value: .416473091 + objectReference: {fileID: 0} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_LocalPosition.z + value: -323.863647 + objectReference: {fileID: 0} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11488472, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: player + value: + objectReference: {fileID: 1870004477} + - target: {fileID: 123852, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_Name + value: SpriteManager2 + objectReference: {fileID: 0} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_LocalScale.x + value: .99908936 + objectReference: {fileID: 0} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_LocalScale.y + value: .99908936 + objectReference: {fileID: 0} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_LocalScale.z + value: .99908936 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + m_IsPrefabParent: 0 --- !u!1 &1812589628 GameObject: m_ObjectHideFlags: 0 @@ -2737,6 +2844,12 @@ RectTransform: m_AnchoredPosition: {x: 3.05175781e-05, y: -9.15527344e-05} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: .5, y: .5} +--- !u!114 &1828806172 stripped +MonoBehaviour: + m_PrefabParentObject: {fileID: 11488472, guid: 177f3aee218d5654f91c54c038b43ac9, + type: 2} + m_PrefabInternal: {fileID: 1805697436} + m_Script: {fileID: 11500000, guid: 72924532f27ef1a44a83a8354e4dcaa9, type: 3} --- !u!114 &1833327629 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2774,6 +2887,10 @@ MonoBehaviour: Transform: m_PrefabParentObject: {fileID: 409436, guid: f89e011de36c1124e97bf9847d797ad1, type: 2} m_PrefabInternal: {fileID: 127613653} +--- !u!1 &1870004477 stripped +GameObject: + m_PrefabParentObject: {fileID: 133054, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 66076508} --- !u!1001 &1890865682 Prefab: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Player/Aiming.cs b/Assets/Scripts/Player/Aiming.cs index e23de29..b74a758 100644 --- a/Assets/Scripts/Player/Aiming.cs +++ b/Assets/Scripts/Player/Aiming.cs @@ -6,6 +6,7 @@ public class Aiming : MonoBehaviour public GameObject player; private PlayerActions _playerActions; private SpriteRenderer reticleRenderer; + public SpriteManager spriteManager; Vector2 mDefaultPosition = new Vector2(0.0f, 0.0f); @@ -52,6 +53,7 @@ void Update() { Vector2 playerPosition = new Vector2(transform.position.x, transform.position.y); mAimDirection = new Vector2(Input.GetAxis("Player_" + GetComponent().PlayerNumber + "_RJoystickX"), Input.GetAxis("Player_" + GetComponent().PlayerNumber + "_RJoystickY")).normalized; + //mReticle.gameObject.SetActive(false); if (mAimDirection != mPreviousAimDirection && mAimDirection.magnitude > 0) @@ -69,7 +71,8 @@ void Update() mReticle.transform.position = mDefaultPosition + playerPosition - (mCorrectedAimDirection) * 1.5f; //Debug.DrawLine (playerPosition, playerPosition + mAimDirection * Range); - SpriteManager.instance.ChangeSprite(spriteNumber); + spriteManager.ChangeSprite(spriteNumber); + // SpriteManager.instance.ChangeSprite(spriteNumber); mPreviousAimDirection = mAimDirection; } } diff --git a/Assets/Scripts/Player/Player.cs b/Assets/Scripts/Player/Player.cs index 3221680..f33bf84 100644 --- a/Assets/Scripts/Player/Player.cs +++ b/Assets/Scripts/Player/Player.cs @@ -7,6 +7,8 @@ public class Player : MonoBehaviour public Weapon mEquippedWeapon; public Weapon[] weaponList; public int mPlayerNumber; + + public int PlayerNumber { get From be8aac7e1132a67fb94931973cf62ad8249f9d8b Mon Sep 17 00:00:00 2001 From: JSleekXD Date: Tue, 23 Feb 2016 22:54:30 +0000 Subject: [PATCH 11/39] Increased the size of the player's hitbox Before: the size of the player's feet After: Encapsulates the main rectangle that is the player's body. --- Assets/Prefabs/Player.prefab | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index b44705b..a7240b6 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -345,9 +345,9 @@ BoxCollider2D: m_Material: {fileID: 0} m_IsTrigger: 0 m_UsedByEffector: 0 - m_Offset: {x: -.12499994, y: -1.04278374} + m_Offset: {x: -.125, y: -.0320999995} serializedVersion: 2 - m_Size: {x: .861835837, y: .226932526} + m_Size: {x: .861835837, y: 2.24815989} --- !u!114 &11404772 MonoBehaviour: m_ObjectHideFlags: 1 @@ -571,6 +571,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: player: {fileID: 133054} + spriteManager: {fileID: 0} mReticle: {fileID: 183054} --- !u!114 &11468980 MonoBehaviour: @@ -2119,7 +2120,19 @@ Prefab: serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} - m_Modifications: [] + m_Modifications: + - target: {fileID: 0} + propertyPath: m_Offset.x + value: -.125 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_Offset.y + value: -.0320999995 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_Size.y + value: 2.24815989 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 0} m_RootGameObject: {fileID: 133054} From be6e859cb4f900f73233432e5d81636e9d56a8fc Mon Sep 17 00:00:00 2001 From: julianstopher Date: Wed, 24 Feb 2016 10:57:03 +0000 Subject: [PATCH 12/39] Added in a basic walled arena Added in four separate walls, and moved the tunnels to within the arena. --- Assets/Scenes/Prototype.unity | 7966 +++++++++++++++++++++++++++------ 1 file changed, 6512 insertions(+), 1454 deletions(-) diff --git a/Assets/Scenes/Prototype.unity b/Assets/Scenes/Prototype.unity index 3cd988f..ea5815f 100644 --- a/Assets/Scenes/Prototype.unity +++ b/Assets/Scenes/Prototype.unity @@ -85,6 +85,65 @@ NavMeshSettings: cellSize: .166666672 manualCellSize: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &8565797 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1900231291} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 4.0999999 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: 1.79999995 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 2 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 1573436195 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 --- !u!1 &9843159 GameObject: m_ObjectHideFlags: 0 @@ -119,6 +178,222 @@ RectTransform: m_AnchoredPosition: {x: -5, y: 0} m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: .5, y: .5} +--- !u!1001 &16837315 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1493915461} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: -1.90999997 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: 2.78999996 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 5 (1) + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 1573436195 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!1 &17652993 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 17652994} + m_Layer: 0 + m_Name: Block Holder (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &17652994 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 17652993} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -12.0053568, y: 6.03046846, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 230551779} + - {fileID: 341320002} + - {fileID: 469396362} + - {fileID: 110914826} + - {fileID: 1682221956} + - {fileID: 400934109} + m_Father: {fileID: 782908716} + m_RootOrder: 0 +--- !u!1 &18288707 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 18288708} + m_Layer: 0 + m_Name: Block Holder (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &18288708 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 18288707} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -24.0385036, y: 12.0331469, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1009705831} + - {fileID: 1057346872} + - {fileID: 1946142852} + - {fileID: 401081085} + - {fileID: 776247936} + - {fileID: 674225561} + m_Father: {fileID: 1070331672} + m_RootOrder: 1 +--- !u!1001 &22018156 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 17652994} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 10.1000004 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: -1.20000005 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 5 (1) + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 2015190895 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 --- !u!1 &29733465 GameObject: m_ObjectHideFlags: 0 @@ -189,6 +464,10 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 29733465} +--- !u!4 &47402629 stripped +Transform: + m_PrefabParentObject: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + m_PrefabInternal: {fileID: 820753070} --- !u!1 &58277922 GameObject: m_ObjectHideFlags: 0 @@ -311,7 +590,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_RootOrder - value: 16 + value: 15 objectReference: {fileID: 0} - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_LocalScale.x @@ -380,48 +659,148 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} m_IsPrefabParent: 0 ---- !u!4 &91229491 stripped -Transform: - m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} - m_PrefabInternal: {fileID: 1540794253} ---- !u!1001 &127613653 +--- !u!1001 &66406261 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 653857878} + m_TransformParent: {fileID: 1493915461} m_Modifications: - - target: {fileID: 409436, guid: f89e011de36c1124e97bf9847d797ad1, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.x - value: 0 + value: 4.0999999 objectReference: {fileID: 0} - - target: {fileID: 409436, guid: f89e011de36c1124e97bf9847d797ad1, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.y - value: 0 + value: 5.80000019 objectReference: {fileID: 0} - - target: {fileID: 409436, guid: f89e011de36c1124e97bf9847d797ad1, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.z - value: 323.855438 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 409436, guid: f89e011de36c1124e97bf9847d797ad1, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 409436, guid: f89e011de36c1124e97bf9847d797ad1, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 409436, guid: f89e011de36c1124e97bf9847d797ad1, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 409436, guid: f89e011de36c1124e97bf9847d797ad1, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 409436, guid: f89e011de36c1124e97bf9847d797ad1, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_RootOrder - value: 9 + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 5 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -9 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 2015190895 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &84567864 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 746160465} +--- !u!4 &110914826 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 1280317332} +--- !u!1 &123880525 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 123880526} + m_Layer: 0 + m_Name: Block Holder (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &123880526 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 123880525} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -61.2495499, y: -9.89330292, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2051898811} + - {fileID: 841423359} + - {fileID: 1229802055} + - {fileID: 689435033} + - {fileID: 1050190951} + - {fileID: 858629884} + m_Father: {fileID: 1660781286} + m_RootOrder: 1 +--- !u!1001 &127613653 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 653857878} + m_Modifications: + - target: {fileID: 409436, guid: f89e011de36c1124e97bf9847d797ad1, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 409436, guid: f89e011de36c1124e97bf9847d797ad1, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 409436, guid: f89e011de36c1124e97bf9847d797ad1, type: 2} + propertyPath: m_LocalPosition.z + value: 323.855438 + objectReference: {fileID: 0} + - target: {fileID: 409436, guid: f89e011de36c1124e97bf9847d797ad1, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 409436, guid: f89e011de36c1124e97bf9847d797ad1, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 409436, guid: f89e011de36c1124e97bf9847d797ad1, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 409436, guid: f89e011de36c1124e97bf9847d797ad1, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 409436, guid: f89e011de36c1124e97bf9847d797ad1, type: 2} + propertyPath: m_RootOrder + value: 8 objectReference: {fileID: 0} - target: {fileID: 409436, guid: f89e011de36c1124e97bf9847d797ad1, type: 2} propertyPath: m_LocalScale.x @@ -579,7 +958,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} propertyPath: m_RootOrder - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} propertyPath: m_LocalScale.x @@ -596,6 +975,152 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} m_IsPrefabParent: 0 +--- !u!1001 &181555470 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 123880526} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 2.08999991 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: 4.78999996 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 3 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 1573436195 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &187124212 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 799390284} +--- !u!1001 &200558077 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 123880526} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 4.0999999 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: 5.80000019 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 5 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -5 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 1573436195 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &221484448 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 1800017801} +--- !u!4 &226510263 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 1076453588} +--- !u!4 &230551779 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 673191866} +--- !u!4 &239526396 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 1346685846} +--- !u!4 &255717632 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 677909765} --- !u!1001 &256436919 Prefab: m_ObjectHideFlags: 0 @@ -658,50 +1183,113 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} m_IsPrefabParent: 0 ---- !u!1 &329086455 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 329086456} - - 114: {fileID: 329086457} - m_Layer: 0 - m_Name: Dynamic Walls Manager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &329086456 +--- !u!4 &266021868 stripped Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 309667062} +--- !u!4 &285329012 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 1746983353} +--- !u!4 &287251029 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 66406261} +--- !u!1001 &309667062 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1351565264} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: .0900000036 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: 3.78999996 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -66 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!1 &329086455 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 329086456} + - 114: {fileID: 329086457} + m_Layer: 0 + m_Name: Dynamic Walls Manager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &329086456 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 329086455} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 323.855438} + m_LocalScale: {x: 35.9839363, y: 35.9839363, z: 35.9839363} + m_Children: [] + m_Father: {fileID: 653857878} + m_RootOrder: 3 +--- !u!114 &329086457 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 329086455} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45f5ffb22ed7dfe4b9f0c2aa044d8f64, type: 3} + m_Name: + m_EditorClassIdentifier: + DynamicWallsList: [] + wallScript: {fileID: 0} +--- !u!1 &331099736 +GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 329086455} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 323.855438} - m_LocalScale: {x: 35.9839363, y: 35.9839363, z: 35.9839363} - m_Children: [] - m_Father: {fileID: 653857878} - m_RootOrder: 4 ---- !u!114 &329086457 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 329086455} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45f5ffb22ed7dfe4b9f0c2aa044d8f64, type: 3} - m_Name: - m_EditorClassIdentifier: - DynamicWallsList: [] - wallScript: {fileID: 0} ---- !u!1 &331099736 -GameObject: - m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 167086, guid: b8af804de96124644898f0e89616d06a, type: 2} m_PrefabInternal: {fileID: 0} serializedVersion: 4 @@ -751,6 +1339,81 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 331099736} +--- !u!4 &341320002 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 393398975} +--- !u!4 &342067655 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 1392678901} +--- !u!1001 &354443934 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1937374956} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 8.10000038 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: -.200000003 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 5 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -14 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 1573436195 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &360105793 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 911932576} --- !u!1 &365794303 GameObject: m_ObjectHideFlags: 0 @@ -917,24 +1580,24 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 368835090} ---- !u!4 &418995551 stripped +--- !u!4 &371945588 stripped Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} - m_PrefabInternal: {fileID: 514880646} ---- !u!1001 &514880646 + m_PrefabInternal: {fileID: 1052030047} +--- !u!1001 &393398975 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 754702397} + m_TransformParent: {fileID: 17652994} m_Modifications: - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.x - value: 8.10000038 + value: 2.0999999 objectReference: {fileID: 0} - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.y - value: 7.80000019 + value: 2.79999995 objectReference: {fileID: 0} - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.z @@ -966,238 +1629,4530 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_SortingOrder - value: -7 + value: -2 objectReference: {fileID: 0} - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_Sprite value: objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, type: 3} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 2015190895 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_IsPrefabParent: 0 ---- !u!4 &516090087 stripped -Transform: - m_PrefabParentObject: {fileID: 405082, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} - m_PrefabInternal: {fileID: 1903365224} ---- !u!4 &531871430 stripped -Transform: - m_PrefabParentObject: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} - m_PrefabInternal: {fileID: 1287841312} ---- !u!1001 &581025534 +--- !u!1001 &398347179 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 653857878} + m_TransformParent: {fileID: 1615139164} m_Modifications: - - target: {fileID: 401230, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.x - value: 0 + value: 4.0999999 objectReference: {fileID: 0} - - target: {fileID: 401230, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.y - value: 0 + value: 1.79999995 objectReference: {fileID: 0} - - target: {fileID: 401230, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.z - value: 323.855438 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 401230, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 401230, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 401230, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 401230, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 401230, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_RootOrder - value: 14 + value: 2 objectReference: {fileID: 0} - - target: {fileID: 194862, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_Name - value: Tunnel Container - objectReference: {fileID: 0} - - target: {fileID: 401230, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} - propertyPath: m_LocalScale.x - value: 35.9839363 - objectReference: {fileID: 0} - - target: {fileID: 401230, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} - propertyPath: m_LocalScale.y - value: 35.9839363 - objectReference: {fileID: 0} - - target: {fileID: 401230, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} - propertyPath: m_LocalScale.z - value: 35.9839363 - objectReference: {fileID: 0} - - target: {fileID: 6114202, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} - propertyPath: m_Size.x - value: 1.79999995 - objectReference: {fileID: 0} - - target: {fileID: 6114202, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} - propertyPath: m_Size.y - value: 1.79999995 - objectReference: {fileID: 0} - - target: {fileID: 6148676, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} - propertyPath: m_Size.y - value: 1.79999995 - objectReference: {fileID: 0} - - target: {fileID: 6148676, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} - propertyPath: m_Size.x - value: 1.79999995 - objectReference: {fileID: 0} - - target: {fileID: 6197000, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} - propertyPath: m_Size.x - value: 1.79999995 - objectReference: {fileID: 0} - - target: {fileID: 6197000, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} - propertyPath: m_Size.y - value: 1.79999995 + value: Block 2 objectReference: {fileID: 0} - - target: {fileID: 6144322, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} - propertyPath: m_Size.x - value: 1.79999995 + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -22 objectReference: {fileID: 0} - - target: {fileID: 6144322, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} - propertyPath: m_Size.y - value: 1.79999995 + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 2015190895 objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_IsPrefabParent: 0 ---- !u!4 &605769312 stripped +--- !u!4 &400934109 stripped Transform: - m_PrefabParentObject: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} - m_PrefabInternal: {fileID: 1027524326} ---- !u!4 &613553048 stripped + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 22018156} +--- !u!4 &401081085 stripped Transform: - m_PrefabParentObject: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} - m_PrefabInternal: {fileID: 1633521612} + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 673439712} +--- !u!4 &418995551 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 514880646} +--- !u!4 &469212889 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 1683437867} +--- !u!4 &469396362 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 1761661803} +--- !u!4 &499230965 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 728924225} +--- !u!4 &500239382 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 2061694409} +--- !u!1001 &514880646 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 754702397} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 8.10000038 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: 7.80000019 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 1 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 1573436195 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &516090087 stripped +Transform: + m_PrefabParentObject: {fileID: 405082, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} + m_PrefabInternal: {fileID: 1903365224} +--- !u!4 &531871430 stripped +Transform: + m_PrefabParentObject: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + m_PrefabInternal: {fileID: 1287841312} +--- !u!1001 &571052661 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1900231291} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 6.0999999 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: .800000012 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 3 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -9 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 1573436195 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &581025534 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 653857878} + m_Modifications: + - target: {fileID: 401230, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 401230, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 401230, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + propertyPath: m_LocalPosition.z + value: 323.855438 + objectReference: {fileID: 0} + - target: {fileID: 401230, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 401230, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 401230, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 401230, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 401230, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + propertyPath: m_RootOrder + value: 13 + objectReference: {fileID: 0} + - target: {fileID: 194862, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + propertyPath: m_Name + value: Tunnel Container + objectReference: {fileID: 0} + - target: {fileID: 401230, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + propertyPath: m_LocalScale.x + value: 35.9839363 + objectReference: {fileID: 0} + - target: {fileID: 401230, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + propertyPath: m_LocalScale.y + value: 35.9839363 + objectReference: {fileID: 0} + - target: {fileID: 401230, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + propertyPath: m_LocalScale.z + value: 35.9839363 + objectReference: {fileID: 0} + - target: {fileID: 6114202, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + propertyPath: m_Size.x + value: 1.79999995 + objectReference: {fileID: 0} + - target: {fileID: 6114202, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + propertyPath: m_Size.y + value: 1.79999995 + objectReference: {fileID: 0} + - target: {fileID: 6148676, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + propertyPath: m_Size.y + value: 1.79999995 + objectReference: {fileID: 0} + - target: {fileID: 6148676, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + propertyPath: m_Size.x + value: 1.79999995 + objectReference: {fileID: 0} + - target: {fileID: 6197000, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + propertyPath: m_Size.x + value: 1.79999995 + objectReference: {fileID: 0} + - target: {fileID: 6197000, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + propertyPath: m_Size.y + value: 1.79999995 + objectReference: {fileID: 0} + - target: {fileID: 6144322, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + propertyPath: m_Size.x + value: 1.79999995 + objectReference: {fileID: 0} + - target: {fileID: 6144322, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + propertyPath: m_Size.y + value: 1.79999995 + objectReference: {fileID: 0} + - target: {fileID: 453272, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + propertyPath: m_LocalPosition.y + value: -3.0999999 + objectReference: {fileID: 0} + - target: {fileID: 453272, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + propertyPath: m_LocalPosition.x + value: -20.2000008 + objectReference: {fileID: 0} + - target: {fileID: 492280, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + propertyPath: m_LocalPosition.x + value: 18.7999992 + objectReference: {fileID: 0} + - target: {fileID: 492280, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + propertyPath: m_LocalPosition.y + value: -3.29999995 + objectReference: {fileID: 0} + - target: {fileID: 427464, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + propertyPath: m_LocalPosition.x + value: -1.29999995 + objectReference: {fileID: 0} + - target: {fileID: 427464, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + propertyPath: m_LocalPosition.y + value: 8.60000038 + objectReference: {fileID: 0} + - target: {fileID: 494050, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + propertyPath: m_LocalPosition.y + value: -11.8000002 + objectReference: {fileID: 0} + - target: {fileID: 494050, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + propertyPath: m_LocalPosition.x + value: -.899999976 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &585508550 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 665245883} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 2.08999991 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: 4.78999996 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 3 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -35 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &585566761 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 123880526} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 6.0999999 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: 6.80000019 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 2 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -11 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 1573436195 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &594732355 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 1927696626} +--- !u!4 &600633117 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 1441736284} +--- !u!4 &605769312 stripped +Transform: + m_PrefabParentObject: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} + m_PrefabInternal: {fileID: 1027524326} +--- !u!4 &613553048 stripped +Transform: + m_PrefabParentObject: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + m_PrefabInternal: {fileID: 1633521612} +--- !u!4 &631245031 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 1876005340} +--- !u!4 &644217874 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 805432374} --- !u!1 &653857877 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 653857878} + - 223: {fileID: 653857881} + - 114: {fileID: 653857880} + - 114: {fileID: 653857879} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &653857878 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 653857877} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 713839869} + - {fileID: 143147948} + - {fileID: 1515989185} + - {fileID: 329086456} + - {fileID: 1910995931} + - {fileID: 133048276} + - {fileID: 613553048} + - {fileID: 161115611} + - {fileID: 1860753582} + - {fileID: 605769312} + - {fileID: 516090087} + - {fileID: 1649534405} + - {fileID: 531871430} + - {fileID: 1717947874} + - {fileID: 162690262} + - {fileID: 1456487450} + - {fileID: 2037202224} + - {fileID: 1866523315} + - {fileID: 47402629} + - {fileID: 1660781286} + - {fileID: 782908716} + - {fileID: 1070331672} + - {fileID: 1102166523} + m_Father: {fileID: 0} + m_RootOrder: 2 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!114 &653857879 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 653857877} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &653857880 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 653857877} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1920, y: 1080} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!223 &653857881 +Canvas: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 653857877} + m_Enabled: 1 + serializedVersion: 2 + m_RenderMode: 1 + m_Camera: {fileID: 1795214386} + m_PlaneDistance: 1 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingLayerID: -277524437 + m_SortingOrder: 0 +--- !u!1 &665245882 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 665245883} + m_Layer: 0 + m_Name: Block Holder (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &665245883 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 665245882} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -49.216404, y: -3.89062476, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1301313178} + - {fileID: 1468194533} + - {fileID: 644217874} + - {fileID: 1771636599} + - {fileID: 1420647217} + - {fileID: 1920822067} + m_Father: {fileID: 1102166523} + m_RootOrder: 0 +--- !u!1001 &669112603 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1764917752} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 6.0999999 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: .800000012 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 3 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 2015190895 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &673191866 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 17652994} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: .0900000036 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: 3.78999996 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 2015190895 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &673439712 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 18288708} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 6.0999999 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: .800000012 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 3 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -21 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 1573436195 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &674225561 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 1005894185} +--- !u!1001 &677909765 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1704268137} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: .0900000036 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: 3.78999996 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -29 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 1573436195 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &689435033 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 181555470} +--- !u!1 &692605456 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 123990, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 692605457} + - 222: {fileID: 692605459} + - 114: {fileID: 692605458} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &692605457 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22427428, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 692605456} + 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: 2021881325} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 10, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &692605458 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11422872, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 692605456} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: .709803939, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &692605459 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22254516, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 692605456} +--- !u!4 &708413713 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 886125205} +--- !u!1 &713839867 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 713839869} + - 114: {fileID: 713839868} + m_Layer: 5 + m_Name: Timer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &713839868 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 713839867} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c1353a536c9d8c746b42a5ac419d21c2, type: 3} + m_Name: + m_EditorClassIdentifier: + roundLength: 60 + timerText: {fileID: 1833327629} + gamePaused: 0 +--- !u!4 &713839869 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 713839867} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 220.453979, y: 123.72718, z: 252.967438} + m_LocalScale: {x: 36.0547905, y: 36.0547905, z: 36.0547905} + m_Children: [] + m_Father: {fileID: 653857878} + m_RootOrder: 0 +--- !u!1001 &728924225 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1937374956} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 6.0999999 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: .800000012 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 3 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -15 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 1573436195 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &746160465 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1351565264} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 4.0999999 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: 5.80000019 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 5 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -78 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &748675610 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 653857878} + m_Modifications: + - target: {fileID: 462742, guid: dcfaa153c5433dd478fabe3e62e3b353, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 462742, guid: dcfaa153c5433dd478fabe3e62e3b353, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 462742, guid: dcfaa153c5433dd478fabe3e62e3b353, type: 2} + propertyPath: m_LocalPosition.z + value: 323.855438 + objectReference: {fileID: 0} + - target: {fileID: 462742, guid: dcfaa153c5433dd478fabe3e62e3b353, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 462742, guid: dcfaa153c5433dd478fabe3e62e3b353, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 462742, guid: dcfaa153c5433dd478fabe3e62e3b353, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 462742, guid: dcfaa153c5433dd478fabe3e62e3b353, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 462742, guid: dcfaa153c5433dd478fabe3e62e3b353, type: 2} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 462742, guid: dcfaa153c5433dd478fabe3e62e3b353, type: 2} + propertyPath: m_LocalScale.x + value: 35.9839363 + objectReference: {fileID: 0} + - target: {fileID: 462742, guid: dcfaa153c5433dd478fabe3e62e3b353, type: 2} + propertyPath: m_LocalScale.y + value: 35.9839363 + objectReference: {fileID: 0} + - target: {fileID: 462742, guid: dcfaa153c5433dd478fabe3e62e3b353, type: 2} + propertyPath: m_LocalScale.z + value: 35.9839363 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: dcfaa153c5433dd478fabe3e62e3b353, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &752919346 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 1890865682} +--- !u!1 &754702396 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 754702397} + m_Layer: 0 + m_Name: Block Holder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &754702397 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 754702396} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -37.1832581, y: 2.11205339, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 752919346} + - {fileID: 418995551} + - {fileID: 1667210046} + - {fileID: 1724056570} + - {fileID: 1250928786} + - {fileID: 1276601521} + m_Father: {fileID: 1660781286} + m_RootOrder: 2 +--- !u!4 &762002932 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 16837315} +--- !u!1001 &776082158 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 18288708} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 8.10000038 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: -.200000003 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 5 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 1573436195 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &776247936 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 776082158} +--- !u!1001 &779553180 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 653857878} + m_Modifications: + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalPosition.x + value: 246 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalPosition.y + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalPosition.z + value: 323.855438 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_RootOrder + value: 17 + objectReference: {fileID: 0} + - target: {fileID: 11419152, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: wallManager + value: + objectReference: {fileID: 329086457} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalScale.x + value: 35.9839287 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalScale.y + value: 35.9839287 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalScale.z + value: 35.9839287 + objectReference: {fileID: 0} + - target: {fileID: 129564, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_Name + value: Dynamic Cover (2) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + m_IsPrefabParent: 0 +--- !u!1 &782908715 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 782908716} + m_Layer: 0 + m_Name: EastWall + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &782908716 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 782908715} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 832, y: -2, z: 268.979919} + m_LocalScale: {x: 35.9839363, y: 35.9839363, z: 35.9839363} + m_Children: + - {fileID: 17652994} + - {fileID: 1615139164} + - {fileID: 1764917752} + m_Father: {fileID: 653857878} + m_RootOrder: 20 +--- !u!1001 &799390284 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1351565264} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 6.0999999 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: 6.80000019 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 2 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -84 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &805432374 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 665245883} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 6.0999999 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: 6.80000019 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 2 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -47 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &815532423 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 1987559970} +--- !u!1001 &820753070 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 653857878} + m_Modifications: + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalPosition.x + value: 238 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalPosition.y + value: -268 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalPosition.z + value: 323.855438 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_RootOrder + value: 18 + objectReference: {fileID: 0} + - target: {fileID: 11419152, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: wallManager + value: + objectReference: {fileID: 329086457} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalScale.x + value: 35.9839287 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalScale.y + value: 35.9839287 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalScale.z + value: 35.9839287 + objectReference: {fileID: 0} + - target: {fileID: 129564, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_Name + value: Dynamic Cover (3) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &841423359 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 1145922393} +--- !u!1001 &846475841 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1351565264} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 2.08999991 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: 4.78999996 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 3 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -72 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &853747675 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 665245883} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 8.10000038 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: 7.80000019 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 1 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -53 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &856419494 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 665245883} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 4.0999999 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: 5.80000019 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 5 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -41 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &858629884 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 1677744541} +--- !u!1 &866842710 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 110008, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 866842711} + - 114: {fileID: 866842712} + m_Layer: 5 + m_Name: PlayerHP4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &866842711 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22488818, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 866842710} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 13, z: 1} + m_Children: + - {fileID: 148433720} + - {fileID: 9843160} + m_Father: {fileID: 1812589629} + m_RootOrder: 1 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: 780.299988, y: -265.99942} + m_SizeDelta: {x: 100, y: 20} + m_Pivot: {x: .5, y: .5} +--- !u!114 &866842712 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11400070, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 866842710} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -113659843, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} + m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} + m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_ColorMultiplier: 1 + m_FadeDuration: .100000001 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + m_FillRect: {fileID: 1676407023} + m_HandleRect: {fileID: 0} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 1 + m_WholeNumbers: 0 + m_Value: 1 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Slider+SliderEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!1001 &886125205 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1764917752} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: .0900000036 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: 3.78999996 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -53 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 2015190895 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &900741911 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1900231291} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 8.10000038 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: -.200000003 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 5 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -8 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 1573436195 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &911932576 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1900231291} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 10.1000004 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: -1.20000005 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 5 (1) + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -7 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 1573436195 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &920453864 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 1460317504} +--- !u!4 &951669876 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 1633478505} +--- !u!4 &988280011 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 354443934} +--- !u!1001 &1005894185 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 18288708} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 10.1000004 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: -1.20000005 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 5 (1) + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -19 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 1573436195 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &1008271825 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1764917752} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 4.0999999 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: 1.79999995 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 2 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -41 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 2015190895 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &1009705831 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 1570774786} +--- !u!1001 &1027524326 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 653857878} + m_Modifications: + - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} + propertyPath: m_LocalPosition.z + value: 323.855438 + objectReference: {fileID: 0} + - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} + propertyPath: m_LocalScale.x + value: 35.9839363 + objectReference: {fileID: 0} + - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} + propertyPath: m_LocalScale.y + value: 35.9839363 + objectReference: {fileID: 0} + - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} + propertyPath: m_LocalScale.z + value: 35.9839363 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &1050190951 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 200558077} +--- !u!1001 &1052030047 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1615139164} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 6.0999999 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: .800000012 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 3 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -16 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 2015190895 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &1057346872 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 1665901799} +--- !u!1 &1070331671 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1070331672} + m_Layer: 0 + m_Name: WestWall + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1070331672 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1070331671} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -393, y: -651, z: 268.979919} + m_LocalScale: {x: 35.9839363, y: 35.9839363, z: 35.9839363} + m_Children: + - {fileID: 1937374956} + - {fileID: 18288708} + - {fileID: 1900231291} + m_Father: {fileID: 653857878} + m_RootOrder: 21 +--- !u!1001 &1076453588 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1704268137} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 2.08999991 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: 4.78999996 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 3 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -35 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 1573436195 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &1077930569 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 17652994} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 8.10000038 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: -.200000003 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 5 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 2015190895 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!1 &1102166522 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1102166523} + m_Layer: 0 + m_Name: NorthWall + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1102166523 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1102166522} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1013, y: 236, z: 268.979919} + m_LocalScale: {x: 35.9839363, y: 35.9839363, z: 35.9839363} + m_Children: + - {fileID: 665245883} + - {fileID: 1493915461} + - {fileID: 1351565264} + m_Father: {fileID: 653857878} + m_RootOrder: 22 +--- !u!4 &1113430748 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 669112603} +--- !u!1001 &1138030137 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1493915461} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 2.08999991 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: 4.78999996 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 3 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 2015190895 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &1145922393 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 123880526} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 8.10000038 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: 7.80000019 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 1 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -17 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 1573436195 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &1168999058 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 754702397} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 6.0999999 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: 6.80000019 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 2 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -84 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 1573436195 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!1 &1204689826 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 169156, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1204689827} + - 222: {fileID: 1204689829} + - 114: {fileID: 1204689828} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1204689827 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22467270, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1204689826} + 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: 2067420757} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 10, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1204689828 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11452864, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1204689826} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: .956862748, g: 1, b: .235294119, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1204689829 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22297152, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1204689826} +--- !u!4 &1229802055 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 585566761} +--- !u!1 &1234335048 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 166112, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1234335049} + - 222: {fileID: 1234335051} + - 114: {fileID: 1234335050} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1234335049 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22479554, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1234335048} + 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: 58277923} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: .25} + m_AnchorMax: {x: 1, y: .75} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -10, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1234335050 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11476304, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1234335048} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1234335051 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22279058, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1234335048} +--- !u!4 &1250928786 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 1757835289} +--- !u!1001 &1259412688 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 653857878} + m_Modifications: + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalPosition.x + value: -397 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalPosition.y + value: -31 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalPosition.z + value: 323.855438 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_RootOrder + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 11419152, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: wallManager + value: + objectReference: {fileID: 329086457} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalScale.x + value: 35.9839325 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalScale.y + value: 35.9839325 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalScale.z + value: 35.9839325 + objectReference: {fileID: 0} + - target: {fileID: 129564, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_Name + value: Dynamic Cover (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &1272197842 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1704268137} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 8.10000038 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: 7.80000019 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 1 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -53 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 1573436195 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &1275274076 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 653857878} + m_Modifications: + - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} + propertyPath: m_LocalPosition.x + value: 1439.35742 + objectReference: {fileID: 0} + - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} + propertyPath: m_LocalPosition.y + value: 359.839355 + objectReference: {fileID: 0} + - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} + propertyPath: m_LocalPosition.z + value: 323.855438 + objectReference: {fileID: 0} + - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} + propertyPath: m_RootOrder + value: 14 + objectReference: {fileID: 0} + - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} + propertyPath: m_LocalScale.x + value: 35.9839363 + objectReference: {fileID: 0} + - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} + propertyPath: m_LocalScale.y + value: 35.9839363 + objectReference: {fileID: 0} + - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} + propertyPath: m_LocalScale.z + value: 35.9839363 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: f698b07087564614fbc3784bb72db068, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &1276601521 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 2097656179} +--- !u!1001 &1280317332 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 17652994} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 6.0999999 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: .800000012 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 3 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 2015190895 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &1287841312 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 653857878} + m_Modifications: + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalPosition.x + value: -405 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalPosition.y + value: -281 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalPosition.z + value: 323.855438 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_RootOrder + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 11419152, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: wallManager + value: + objectReference: {fileID: 329086457} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalScale.x + value: 35.9839363 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalScale.y + value: 35.9839363 + objectReference: {fileID: 0} + - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + propertyPath: m_LocalScale.z + value: 35.9839363 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &1290932045 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 754702397} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 2.08999991 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: 4.78999996 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 3 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -72 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 1573436195 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &1294094049 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 665245883} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: -1.90999997 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: 2.78999996 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 5 (1) + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -12 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 2015190895 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &1301313178 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 1583449085} +--- !u!1001 &1304065338 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1937374956} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 2.0999999 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: 2.79999995 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 1 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -17 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 1573436195 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &1310894361 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 1528351361} +--- !u!1001 &1346685846 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1615139164} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 2.0999999 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: 2.79999995 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 1 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -29 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 2015190895 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!1 &1351565263 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1351565264} + m_Layer: 0 + m_Name: Block Holder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1351565264 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1351565263} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -37.1832581, y: 2.11205339, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 266021868} + - {fileID: 594732355} + - {fileID: 187124212} + - {fileID: 1647328360} + - {fileID: 84567864} + - {fileID: 469212889} + m_Father: {fileID: 1102166523} + m_RootOrder: 2 +--- !u!1001 &1371076390 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1764917752} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 2.0999999 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: 2.79999995 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 1 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -47 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 2015190895 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &1392678901 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1615139164} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 10.1000004 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: -1.20000005 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 5 (1) + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -4 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 2015190895 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!1 &1413660774 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 155084, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1413660775} + m_Layer: 5 + m_Name: Player2HUD + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1413660775 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22430850, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1413660774} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1898002833} + - {fileID: 1766389763} + - {fileID: 1667372849} + m_Father: {fileID: 143147948} + m_RootOrder: 1 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: 3.05175781e-05, y: -9.15527344e-05} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: .5, y: .5} +--- !u!4 &1416243554 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 8565797} +--- !u!4 &1420647217 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 856419494} +--- !u!1001 &1422364005 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 653857878} + m_Modifications: + - target: {fileID: 471558, guid: cf3b36c1277b6914ca9531867d57d6e5, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 471558, guid: cf3b36c1277b6914ca9531867d57d6e5, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 471558, guid: cf3b36c1277b6914ca9531867d57d6e5, type: 2} + propertyPath: m_LocalPosition.z + value: 323.855438 + objectReference: {fileID: 0} + - target: {fileID: 471558, guid: cf3b36c1277b6914ca9531867d57d6e5, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 471558, guid: cf3b36c1277b6914ca9531867d57d6e5, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 471558, guid: cf3b36c1277b6914ca9531867d57d6e5, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 471558, guid: cf3b36c1277b6914ca9531867d57d6e5, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 471558, guid: cf3b36c1277b6914ca9531867d57d6e5, type: 2} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 11481414, guid: cf3b36c1277b6914ca9531867d57d6e5, type: 2} + propertyPath: hasInfiniteAmmo + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 471558, guid: cf3b36c1277b6914ca9531867d57d6e5, type: 2} + propertyPath: m_LocalScale.x + value: 35.9839363 + objectReference: {fileID: 0} + - target: {fileID: 471558, guid: cf3b36c1277b6914ca9531867d57d6e5, type: 2} + propertyPath: m_LocalScale.y + value: 35.9839363 + objectReference: {fileID: 0} + - target: {fileID: 471558, guid: cf3b36c1277b6914ca9531867d57d6e5, type: 2} + propertyPath: m_LocalScale.z + value: 35.9839363 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: cf3b36c1277b6914ca9531867d57d6e5, type: 2} + m_IsPrefabParent: 0 +--- !u!1 &1433083140 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 158468, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1433083141} + - 222: {fileID: 1433083144} + - 114: {fileID: 1433083143} + - 114: {fileID: 1433083142} + m_Layer: 5 + m_Name: PlayerAmmoCount4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1433083141 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22408268, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1433083140} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 6.56412172, z: 1} + m_Children: [] + m_Father: {fileID: 1812589629} + m_RootOrder: 2 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: 585, y: -207} + m_SizeDelta: {x: 250, y: 80} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1433083142 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11492744, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1433083140} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c88ea203cda48f3498c2583e23601830, type: 3} + m_Name: + m_EditorClassIdentifier: + ammoCount: {fileID: 2112786343} + playerID: 4 + player: {fileID: 1515989184} +--- !u!114 &1433083143 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11466586, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1433083140} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: .909803927, b: .23137255, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 45 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: AmmoCount +--- !u!222 &1433083144 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22259568, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1433083140} +--- !u!1001 &1434456278 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1900231291} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: .0900000036 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: 3.78999996 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -12 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 1573436195 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &1441736284 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1704268137} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 6.0999999 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: 6.80000019 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 2 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -47 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 1573436195 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &1448504151 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1764917752} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 8.10000038 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: -.200000003 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 5 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -28 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 1573436195 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &1448905500 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 1304065338} +--- !u!4 &1456487450 stripped +Transform: + m_PrefabParentObject: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 66076508} +--- !u!1001 &1460317504 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1493915461} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: .0900000036 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: 3.78999996 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 2015190895 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &1468194533 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 853747675} +--- !u!4 &1475970850 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 1008271825} +--- !u!1 &1493915460 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1493915461} + m_Layer: 0 + m_Name: Block Holder (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1493915461 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1493915460} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -61.2495499, y: -9.89330292, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 920453864} + - {fileID: 2138769919} + - {fileID: 1815943686} + - {fileID: 1814961501} + - {fileID: 287251029} + - {fileID: 762002932} + m_Father: {fileID: 1102166523} + m_RootOrder: 1 +--- !u!1 &1515989180 stripped +GameObject: + m_PrefabParentObject: {fileID: 133054, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 1800545368} +--- !u!114 &1515989184 stripped +MonoBehaviour: + m_PrefabParentObject: {fileID: 11438944, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 1800545368} + m_Script: {fileID: 11500000, guid: 3800ba1d4402403408247b3365ec08f5, type: 3} +--- !u!4 &1515989185 stripped +Transform: + m_PrefabParentObject: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 1800545368} +--- !u!1001 &1528351361 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1937374956} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: .0900000036 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: 3.78999996 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -18 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 1573436195 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &1558480073 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 1715199203} +--- !u!1001 &1570774786 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 18288708} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: .0900000036 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: 3.78999996 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -24 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 1573436195 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &1583449085 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 665245883} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: .0900000036 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: 3.78999996 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -29 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!1 &1615139163 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1615139164} + m_Layer: 0 + m_Name: Block Holder (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1615139164 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1615139163} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -24.0385036, y: 12.0331469, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 285329012} + - {fileID: 239526396} + - {fileID: 1932369583} + - {fileID: 371945588} + - {fileID: 1558480073} + - {fileID: 342067655} + m_Father: {fileID: 782908716} + m_RootOrder: 1 +--- !u!1001 &1633478505 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1900231291} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 2.0999999 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: 2.79999995 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 1 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -11 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 1573436195 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &1633521612 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 653857878} + m_Modifications: + - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + propertyPath: m_LocalPosition.z + value: 323.855438 + objectReference: {fileID: 0} + - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 11440672, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + propertyPath: hasInfiniteAmmo + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + propertyPath: m_LocalScale.x + value: 35.9839363 + objectReference: {fileID: 0} + - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + propertyPath: m_LocalScale.y + value: 35.9839363 + objectReference: {fileID: 0} + - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + propertyPath: m_LocalScale.z + value: 35.9839363 + objectReference: {fileID: 0} + - target: {fileID: 11440672, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + propertyPath: mAmmoRemaining + value: 200 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &1647328360 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 846475841} +--- !u!1 &1649534404 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1649534405} + m_Layer: 0 + m_Name: WallHolder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1649534405 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1649534404} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 323.855438} + m_LocalScale: {x: 35.9839363, y: 35.9839363, z: 35.9839363} + m_Children: [] + m_Father: {fileID: 653857878} + m_RootOrder: 11 +--- !u!1 &1660781285 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1660781286} + m_Layer: 0 + m_Name: SouthWall + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1660781286 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1660781285} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 2239, y: -449, z: 268.979919} + m_LocalScale: {x: 35.9839363, y: 35.9839363, z: 35.9839363} + m_Children: + - {fileID: 1704268137} + - {fileID: 123880526} + - {fileID: 754702397} + m_Father: {fileID: 653857878} + m_RootOrder: 19 +--- !u!1001 &1665901799 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 18288708} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 2.0999999 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: 2.79999995 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 1 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -23 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 1573436195 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &1667210046 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 1168999058} +--- !u!1 &1667372848 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 177432, guid: b8af804de96124644898f0e89616d06a, type: 2} m_PrefabInternal: {fileID: 0} serializedVersion: 4 m_Component: - - 224: {fileID: 653857878} - - 223: {fileID: 653857881} - - 114: {fileID: 653857880} - - 114: {fileID: 653857879} + - 224: {fileID: 1667372849} + - 222: {fileID: 1667372852} + - 114: {fileID: 1667372851} + - 114: {fileID: 1667372850} m_Layer: 5 - m_Name: Canvas + m_Name: PlayerAmmoCount2 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &653857878 +--- !u!224 &1667372849 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_PrefabParentObject: {fileID: 22472610, guid: b8af804de96124644898f0e89616d06a, + type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 653857877} + m_GameObject: {fileID: 1667372848} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_Children: - - {fileID: 713839869} - - {fileID: 143147948} - - {fileID: 1515989185} - - {fileID: 754702397} - - {fileID: 329086456} - - {fileID: 1910995931} - - {fileID: 133048276} - - {fileID: 613553048} - - {fileID: 161115611} - - {fileID: 1860753582} - - {fileID: 605769312} - - {fileID: 516090087} - - {fileID: 1649534405} - - {fileID: 531871430} - - {fileID: 1717947874} - - {fileID: 162690262} - - {fileID: 1456487450} - m_Father: {fileID: 0} + m_LocalScale: {x: 1, y: 6.56412172, z: 1} + m_Children: [] + m_Father: {fileID: 1413660775} m_RootOrder: 2 - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!114 &653857879 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: -240, y: -207} + m_SizeDelta: {x: 250, y: 80} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1667372850 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_PrefabParentObject: {fileID: 11410990, guid: b8af804de96124644898f0e89616d06a, + type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 653857877} + m_GameObject: {fileID: 1667372848} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1301386320, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 11500000, guid: c88ea203cda48f3498c2583e23601830, type: 3} m_Name: m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &653857880 + ammoCount: {fileID: 2112786343} + playerID: 2 + player: {fileID: 1515989184} +--- !u!114 &1667372851 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_PrefabParentObject: {fileID: 11430702, guid: b8af804de96124644898f0e89616d06a, + type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 653857877} + m_GameObject: {fileID: 1667372848} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 1 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 1920, y: 1080} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 ---- !u!223 &653857881 -Canvas: + m_Material: {fileID: 0} + m_Color: {r: 0, g: .709803939, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 45 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: AmmoCount +--- !u!222 &1667372852 +CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_PrefabParentObject: {fileID: 22248206, guid: b8af804de96124644898f0e89616d06a, + type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 653857877} - m_Enabled: 1 - serializedVersion: 2 - m_RenderMode: 1 - m_Camera: {fileID: 1795214386} - m_PlaneDistance: 1 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingLayerID: -277524437 - m_SortingOrder: 0 ---- !u!1 &692605456 + m_GameObject: {fileID: 1667372848} +--- !u!1 &1676407022 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 123990, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabParentObject: {fileID: 188778, guid: b8af804de96124644898f0e89616d06a, type: 2} m_PrefabInternal: {fileID: 0} serializedVersion: 4 m_Component: - - 224: {fileID: 692605457} - - 222: {fileID: 692605459} - - 114: {fileID: 692605458} + - 224: {fileID: 1676407023} + - 222: {fileID: 1676407025} + - 114: {fileID: 1676407024} m_Layer: 5 m_Name: Fill m_TagString: Untagged @@ -1205,38 +6160,38 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &692605457 +--- !u!224 &1676407023 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22427428, guid: b8af804de96124644898f0e89616d06a, + m_PrefabParentObject: {fileID: 22447970, guid: b8af804de96124644898f0e89616d06a, type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 692605456} + m_GameObject: {fileID: 1676407022} 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: 2021881325} + m_Father: {fileID: 9843160} m_RootOrder: 0 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: .5, y: .5} ---- !u!114 &692605458 +--- !u!114 &1676407024 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11422872, guid: b8af804de96124644898f0e89616d06a, + m_PrefabParentObject: {fileID: 11421190, guid: b8af804de96124644898f0e89616d06a, type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 692605456} + m_GameObject: {fileID: 1676407022} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: .709803939, b: 1, a: 1} + m_Color: {r: 0, g: .909803927, b: .23137255, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1251,299 +6206,293 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!222 &692605459 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22254516, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 692605456} ---- !u!1 &713839867 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 713839869} - - 114: {fileID: 713839868} - m_Layer: 5 - m_Name: Timer - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &713839868 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 713839867} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c1353a536c9d8c746b42a5ac419d21c2, type: 3} - m_Name: - m_EditorClassIdentifier: - roundLength: 60 - timerText: {fileID: 1833327629} - gamePaused: 0 ---- !u!4 &713839869 -Transform: +--- !u!222 &1676407025 +CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_PrefabParentObject: {fileID: 22272998, guid: b8af804de96124644898f0e89616d06a, + type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 713839867} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 220.453979, y: 123.72718, z: 252.967438} - m_LocalScale: {x: 36.0547905, y: 36.0547905, z: 36.0547905} - m_Children: [] - m_Father: {fileID: 653857878} - m_RootOrder: 0 ---- !u!1001 &748675610 + m_GameObject: {fileID: 1676407022} +--- !u!1001 &1677744541 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 653857878} + m_TransformParent: {fileID: 123880526} m_Modifications: - - target: {fileID: 462742, guid: dcfaa153c5433dd478fabe3e62e3b353, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.x - value: 0 + value: -1.90999997 objectReference: {fileID: 0} - - target: {fileID: 462742, guid: dcfaa153c5433dd478fabe3e62e3b353, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.y - value: 0 + value: 2.78999996 objectReference: {fileID: 0} - - target: {fileID: 462742, guid: dcfaa153c5433dd478fabe3e62e3b353, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.z - value: 323.855438 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 462742, guid: dcfaa153c5433dd478fabe3e62e3b353, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 462742, guid: dcfaa153c5433dd478fabe3e62e3b353, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 462742, guid: dcfaa153c5433dd478fabe3e62e3b353, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 462742, guid: dcfaa153c5433dd478fabe3e62e3b353, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 462742, guid: dcfaa153c5433dd478fabe3e62e3b353, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_RootOrder - value: 8 + value: 5 objectReference: {fileID: 0} - - target: {fileID: 462742, guid: dcfaa153c5433dd478fabe3e62e3b353, type: 2} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 5 (1) + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: 13 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalScale.x - value: 35.9839363 + value: 1 objectReference: {fileID: 0} - - target: {fileID: 462742, guid: dcfaa153c5433dd478fabe3e62e3b353, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalScale.y - value: 35.9839363 + value: 1 objectReference: {fileID: 0} - - target: {fileID: 462742, guid: dcfaa153c5433dd478fabe3e62e3b353, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalScale.z - value: 35.9839363 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 1573436195 objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: dcfaa153c5433dd478fabe3e62e3b353, type: 2} + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_IsPrefabParent: 0 ---- !u!4 &752919346 stripped +--- !u!4 &1682221956 stripped Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} - m_PrefabInternal: {fileID: 1890865682} ---- !u!1 &754702396 + m_PrefabInternal: {fileID: 1077930569} +--- !u!1001 &1683437867 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1351565264} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: -1.90999997 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: 2.78999996 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 5 (1) + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -59 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!1 &1704268136 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 4 m_Component: - - 4: {fileID: 754702397} + - 4: {fileID: 1704268137} m_Layer: 0 - m_Name: Block Holder + m_Name: Block Holder (1) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &754702397 +--- !u!4 &1704268137 Transform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 754702396} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3.77831411, y: .899601817, z: 268.979919} - m_LocalScale: {x: 35.9839363, y: 35.9839363, z: 35.9839363} - m_Children: - - {fileID: 752919346} - - {fileID: 418995551} - - {fileID: 1667210046} - - {fileID: 1724056570} - - {fileID: 91229491} - - {fileID: 1250928786} - m_Father: {fileID: 653857878} - m_RootOrder: 3 ---- !u!1 &866842710 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 110008, guid: b8af804de96124644898f0e89616d06a, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 224: {fileID: 866842711} - - 114: {fileID: 866842712} - m_Layer: 5 - m_Name: PlayerHP4 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &866842711 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22488818, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 866842710} + m_GameObject: {fileID: 1704268136} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2, y: 13, z: 1} + m_LocalPosition: {x: -49.216404, y: -3.89062476, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 148433720} - - {fileID: 9843160} - m_Father: {fileID: 1812589629} - m_RootOrder: 1 - m_AnchorMin: {x: .5, y: .5} - m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: 780.299988, y: -265.99942} - m_SizeDelta: {x: 100, y: 20} - m_Pivot: {x: .5, y: .5} ---- !u!114 &866842712 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400070, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 866842710} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -113659843, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} - m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} - m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} - m_ColorMultiplier: 1 - m_FadeDuration: .100000001 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 0} - m_FillRect: {fileID: 1676407023} - m_HandleRect: {fileID: 0} - m_Direction: 0 - m_MinValue: 0 - m_MaxValue: 1 - m_WholeNumbers: 0 - m_Value: 1 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Slider+SliderEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!1001 &1027524326 + - {fileID: 255717632} + - {fileID: 1928596399} + - {fileID: 600633117} + - {fileID: 226510263} + - {fileID: 631245031} + - {fileID: 1818458944} + m_Father: {fileID: 1660781286} + m_RootOrder: 0 +--- !u!1001 &1715199203 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 653857878} + m_TransformParent: {fileID: 1615139164} m_Modifications: - - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.x - value: 0 + value: 8.10000038 objectReference: {fileID: 0} - - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.y - value: 0 + value: -.200000003 objectReference: {fileID: 0} - - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.z - value: 323.855438 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_RootOrder - value: 10 + value: 4 objectReference: {fileID: 0} - - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} - propertyPath: m_LocalScale.x - value: 35.9839363 + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 5 objectReference: {fileID: 0} - - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} - propertyPath: m_LocalScale.y - value: 35.9839363 + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -10 objectReference: {fileID: 0} - - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} - propertyPath: m_LocalScale.z - value: 35.9839363 + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 2015190895 objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_IsPrefabParent: 0 ---- !u!1001 &1168999058 +--- !u!4 &1717947874 stripped +Transform: + m_PrefabParentObject: {fileID: 401230, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} + m_PrefabInternal: {fileID: 581025534} +--- !u!114 &1719456382 stripped +MonoBehaviour: + m_PrefabParentObject: {fileID: 11481414, guid: cf3b36c1277b6914ca9531867d57d6e5, + type: 2} + m_PrefabInternal: {fileID: 1422364005} + m_Script: {fileID: 11500000, guid: 684f389db4a8e194a89af18d0021af15, type: 3} +--- !u!4 &1724056570 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 1290932045} +--- !u!114 &1726136058 stripped +MonoBehaviour: + m_PrefabParentObject: {fileID: 11488472, guid: 177f3aee218d5654f91c54c038b43ac9, + type: 2} + m_PrefabInternal: {fileID: 256436919} + m_Script: {fileID: 11500000, guid: 72924532f27ef1a44a83a8354e4dcaa9, type: 3} +--- !u!1001 &1746983353 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 754702397} + m_TransformParent: {fileID: 1615139164} m_Modifications: - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.x - value: 6.0999999 + value: .0900000036 objectReference: {fileID: 0} - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.y - value: 6.80000019 + value: 3.78999996 objectReference: {fileID: 0} - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.z @@ -1567,294 +6516,386 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} - propertyPath: m_Name - value: Block 2 + value: 0 objectReference: {fileID: 0} - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_SortingOrder - value: -6 + value: -35 objectReference: {fileID: 0} - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_Sprite value: objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, type: 3} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 2015190895 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_IsPrefabParent: 0 ---- !u!1 &1204689826 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 169156, guid: b8af804de96124644898f0e89616d06a, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 224: {fileID: 1204689827} - - 222: {fileID: 1204689829} - - 114: {fileID: 1204689828} - m_Layer: 5 - m_Name: Fill - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1204689827 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22467270, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1204689826} - 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: 2067420757} - m_RootOrder: 0 - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 10, y: 0} - m_Pivot: {x: .5, y: .5} ---- !u!114 &1204689828 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11452864, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1204689826} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: .956862748, g: 1, b: .235294119, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!222 &1204689829 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22297152, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1204689826} ---- !u!1 &1234335048 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 166112, guid: b8af804de96124644898f0e89616d06a, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 224: {fileID: 1234335049} - - 222: {fileID: 1234335051} - - 114: {fileID: 1234335050} - m_Layer: 5 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1234335049 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22479554, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1234335048} - 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: 58277923} - m_RootOrder: 0 - m_AnchorMin: {x: 0, y: .25} - m_AnchorMax: {x: 1, y: .75} - m_AnchoredPosition: {x: -5, y: 0} - m_SizeDelta: {x: -10, y: 0} - m_Pivot: {x: .5, y: .5} ---- !u!114 &1234335050 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11476304, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1234335048} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!222 &1234335051 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22279058, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1234335048} ---- !u!4 &1250928786 stripped +--- !u!4 &1756222781 stripped Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} - m_PrefabInternal: {fileID: 1757835289} ---- !u!1001 &1275274076 + m_PrefabInternal: {fileID: 571052661} +--- !u!1001 &1757835289 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 653857878} + m_TransformParent: {fileID: 754702397} m_Modifications: - - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.x - value: 1439.35742 + value: 4.0999999 objectReference: {fileID: 0} - - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.y - value: 359.839355 + value: 5.80000019 objectReference: {fileID: 0} - - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.z - value: 323.855438 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_RootOrder - value: 15 + value: 4 objectReference: {fileID: 0} - - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} - propertyPath: m_LocalScale.x - value: 35.9839363 + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 5 objectReference: {fileID: 0} - - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} - propertyPath: m_LocalScale.y - value: 35.9839363 + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -78 objectReference: {fileID: 0} - - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} - propertyPath: m_LocalScale.z - value: 35.9839363 + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 1573436195 objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: f698b07087564614fbc3784bb72db068, type: 2} + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_IsPrefabParent: 0 ---- !u!1001 &1287841312 +--- !u!1001 &1761661803 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 653857878} + m_TransformParent: {fileID: 17652994} m_Modifications: - - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.x - value: -162.726624 + value: 4.0999999 objectReference: {fileID: 0} - - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.y - value: -127.129837 + value: 1.79999995 objectReference: {fileID: 0} - - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.z - value: 323.855438 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_RootOrder - value: 13 + value: 2 objectReference: {fileID: 0} - - target: {fileID: 11419152, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} - propertyPath: wallManager - value: - objectReference: {fileID: 329086457} - - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} - propertyPath: m_LocalScale.x - value: 35.9839363 + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 2 objectReference: {fileID: 0} - - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} - propertyPath: m_LocalScale.y - value: 35.9839363 + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -1 objectReference: {fileID: 0} - - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} - propertyPath: m_LocalScale.z - value: 35.9839363 + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 2015190895 objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_IsPrefabParent: 0 ---- !u!1001 &1290932045 +--- !u!1 &1764917751 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1764917752} + m_Layer: 0 + m_Name: Block Holder (5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1764917752 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1764917751} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 708413713} + - {fileID: 2132288174} + - {fileID: 1475970850} + - {fileID: 1113430748} + - {fileID: 2133150257} + - {fileID: 500239382} + m_Father: {fileID: 782908716} + m_RootOrder: 2 +--- !u!1 &1766389762 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 125282, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1766389763} + - 114: {fileID: 1766389764} + m_Layer: 5 + m_Name: PlayerHP2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1766389763 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22478556, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1766389762} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 13, z: 1} + m_Children: + - {fileID: 29733466} + - {fileID: 2021881325} + m_Father: {fileID: 1413660775} + m_RootOrder: 1 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: -407.700043, y: -265.99942} + m_SizeDelta: {x: 100, y: 20} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1766389764 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11429570, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1766389762} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -113659843, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} + m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} + m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_ColorMultiplier: 1 + m_FadeDuration: .100000001 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + m_FillRect: {fileID: 692605457} + m_HandleRect: {fileID: 0} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 1 + m_WholeNumbers: 0 + m_Value: 1 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Slider+SliderEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!4 &1771636599 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 585508550} +--- !u!1 &1795214381 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1795214382} + - 20: {fileID: 1795214386} + - 124: {fileID: 1795214385} + - 92: {fileID: 1795214384} + - 81: {fileID: 1795214383} + - 114: {fileID: 1795214387} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1795214382 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1795214381} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 +--- !u!81 &1795214383 +AudioListener: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1795214381} + m_Enabled: 1 +--- !u!92 &1795214384 +Behaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1795214381} + m_Enabled: 1 +--- !u!124 &1795214385 +Behaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1795214381} + m_Enabled: 1 +--- !u!20 &1795214386 +Camera: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1795214381} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: .389705896, g: .389705896, b: .389705896, a: .0196078438} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: .300000012 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 15 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: .0219999999 + m_StereoMirrorMode: 0 +--- !u!114 &1795214387 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1795214381} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 53e63288d3ed334438f84f8fe1b41b85, type: 3} + m_Name: + m_EditorClassIdentifier: + shakeTimer: 0 + shakeIntesity: 0 +--- !u!1001 &1800017801 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 754702397} + m_TransformParent: {fileID: 1937374956} m_Modifications: - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.x - value: 6.0999999 + value: 10.1000004 objectReference: {fileID: 0} - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.y - value: 8.80000019 + value: -1.20000005 objectReference: {fileID: 0} - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.z @@ -1878,570 +6919,257 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_RootOrder - value: 3 + value: 5 objectReference: {fileID: 0} - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_Name - value: Block 3 + value: Block 5 (1) objectReference: {fileID: 0} - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_SortingOrder - value: -8 + value: -13 objectReference: {fileID: 0} - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_Sprite value: objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, type: 3} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 1573436195 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_IsPrefabParent: 0 ---- !u!1 &1413660774 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 155084, guid: b8af804de96124644898f0e89616d06a, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 224: {fileID: 1413660775} - m_Layer: 5 - m_Name: Player2HUD - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1413660775 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22430850, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1413660774} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1898002833} - - {fileID: 1766389763} - - {fileID: 1667372849} - m_Father: {fileID: 143147948} - m_RootOrder: 1 - m_AnchorMin: {x: .5, y: .5} - m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: 3.05175781e-05, y: -9.15527344e-05} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: .5, y: .5} ---- !u!1001 &1422364005 +--- !u!1001 &1800545368 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 653857878} m_Modifications: - - target: {fileID: 471558, guid: cf3b36c1277b6914ca9531867d57d6e5, type: 2} + - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 471558, guid: cf3b36c1277b6914ca9531867d57d6e5, type: 2} + - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 471558, guid: cf3b36c1277b6914ca9531867d57d6e5, type: 2} + - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_LocalPosition.z value: 323.855438 objectReference: {fileID: 0} - - target: {fileID: 471558, guid: cf3b36c1277b6914ca9531867d57d6e5, type: 2} + - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 471558, guid: cf3b36c1277b6914ca9531867d57d6e5, type: 2} + - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 471558, guid: cf3b36c1277b6914ca9531867d57d6e5, type: 2} + - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 471558, guid: cf3b36c1277b6914ca9531867d57d6e5, type: 2} + - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 471558, guid: cf3b36c1277b6914ca9531867d57d6e5, type: 2} + - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 11481414, guid: cf3b36c1277b6914ca9531867d57d6e5, type: 2} - propertyPath: hasInfiniteAmmo - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 471558, guid: cf3b36c1277b6914ca9531867d57d6e5, type: 2} - propertyPath: m_LocalScale.x - value: 35.9839363 - objectReference: {fileID: 0} - - target: {fileID: 471558, guid: cf3b36c1277b6914ca9531867d57d6e5, type: 2} - propertyPath: m_LocalScale.y - value: 35.9839363 - objectReference: {fileID: 0} - - target: {fileID: 471558, guid: cf3b36c1277b6914ca9531867d57d6e5, type: 2} - propertyPath: m_LocalScale.z - value: 35.9839363 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: cf3b36c1277b6914ca9531867d57d6e5, type: 2} - m_IsPrefabParent: 0 ---- !u!1 &1433083140 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 158468, guid: b8af804de96124644898f0e89616d06a, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 224: {fileID: 1433083141} - - 222: {fileID: 1433083144} - - 114: {fileID: 1433083143} - - 114: {fileID: 1433083142} - m_Layer: 5 - m_Name: PlayerAmmoCount4 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1433083141 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22408268, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1433083140} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 6.56412172, z: 1} - m_Children: [] - m_Father: {fileID: 1812589629} - m_RootOrder: 2 - m_AnchorMin: {x: .5, y: .5} - m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: 585, y: -207} - m_SizeDelta: {x: 250, y: 80} - m_Pivot: {x: .5, y: .5} ---- !u!114 &1433083142 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11492744, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1433083140} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c88ea203cda48f3498c2583e23601830, type: 3} - m_Name: - m_EditorClassIdentifier: - ammoCount: {fileID: 2112786343} - playerID: 4 - player: {fileID: 1515989184} ---- !u!114 &1433083143 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11466586, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1433083140} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: .909803927, b: .23137255, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 45 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: AmmoCount ---- !u!222 &1433083144 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22259568, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1433083140} ---- !u!4 &1456487450 stripped -Transform: - m_PrefabParentObject: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - m_PrefabInternal: {fileID: 66076508} ---- !u!1 &1515989180 stripped -GameObject: - m_PrefabParentObject: {fileID: 133054, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - m_PrefabInternal: {fileID: 1800545368} ---- !u!114 &1515989184 stripped -MonoBehaviour: - m_PrefabParentObject: {fileID: 11438944, guid: 37b47e7042c5d694dbcf150debde834f, - type: 2} - m_PrefabInternal: {fileID: 1800545368} - m_Script: {fileID: 11500000, guid: 3800ba1d4402403408247b3365ec08f5, type: 3} ---- !u!4 &1515989185 stripped -Transform: - m_PrefabParentObject: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - m_PrefabInternal: {fileID: 1800545368} ---- !u!1001 &1540794253 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 754702397} - m_Modifications: - - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} - propertyPath: m_LocalPosition.x - value: 4.0999999 - objectReference: {fileID: 0} - - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} - propertyPath: m_LocalPosition.y - value: 7.80000019 + value: 2 objectReference: {fileID: 0} - - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} - propertyPath: m_LocalPosition.z + - target: {fileID: 11423510, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: spriteManager + value: + objectReference: {fileID: 1726136058} + - target: {fileID: 11438944, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: mEquippedWeapon + value: + objectReference: {fileID: 1998640093} + - target: {fileID: 22431700, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} - propertyPath: m_LocalRotation.x + - target: {fileID: 22431700, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} - propertyPath: m_LocalRotation.y + - target: {fileID: 22426558, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} - propertyPath: m_LocalRotation.z + - target: {fileID: 22426558, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + - target: {fileID: 133054, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_Name - value: Block 4 + value: Player 1 objectReference: {fileID: 0} - - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} - propertyPath: m_SortingOrder - value: -7 + - target: {fileID: 11438944, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: mPlayerNumber + value: 1 objectReference: {fileID: 0} - - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + - target: {fileID: 11468964, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: spriteManager + value: + objectReference: {fileID: 1726136058} + - target: {fileID: 21230166, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + objectReference: {fileID: 21300000, guid: d3661648c4213db4a83f88596f678fe0, type: 3} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_ParentPrefab: {fileID: 100100000, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} m_IsPrefabParent: 0 ---- !u!1001 &1633521612 +--- !u!1001 &1805697436 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 653857878} + m_TransformParent: {fileID: 1456487450} m_Modifications: - - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} propertyPath: m_LocalPosition.x - value: 0 + value: -13.0795021 objectReference: {fileID: 0} - - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} propertyPath: m_LocalPosition.y - value: 0 + value: .416473091 objectReference: {fileID: 0} - - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} propertyPath: m_LocalPosition.z - value: 323.855438 + value: -323.863647 objectReference: {fileID: 0} - - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} propertyPath: m_RootOrder - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 11440672, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} - propertyPath: hasInfiniteAmmo value: 0 objectReference: {fileID: 0} - - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + - target: {fileID: 11488472, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: player + value: + objectReference: {fileID: 1870004477} + - target: {fileID: 123852, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_Name + value: SpriteManager2 + objectReference: {fileID: 0} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} propertyPath: m_LocalScale.x - value: 35.9839363 + value: .99908936 objectReference: {fileID: 0} - - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} propertyPath: m_LocalScale.y - value: 35.9839363 + value: .99908936 objectReference: {fileID: 0} - - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} propertyPath: m_LocalScale.z - value: 35.9839363 - objectReference: {fileID: 0} - - target: {fileID: 11440672, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} - propertyPath: mAmmoRemaining - value: 200 + value: .99908936 objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + m_ParentPrefab: {fileID: 100100000, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} m_IsPrefabParent: 0 ---- !u!1 &1649534404 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 1649534405} - m_Layer: 0 - m_Name: WallHolder - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1649534405 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1649534404} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 323.855438} - m_LocalScale: {x: 35.9839363, y: 35.9839363, z: 35.9839363} - m_Children: [] - m_Father: {fileID: 653857878} - m_RootOrder: 12 ---- !u!4 &1667210046 stripped -Transform: - m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} - m_PrefabInternal: {fileID: 1168999058} ---- !u!1 &1667372848 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 177432, guid: b8af804de96124644898f0e89616d06a, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 224: {fileID: 1667372849} - - 222: {fileID: 1667372852} - - 114: {fileID: 1667372851} - - 114: {fileID: 1667372850} - m_Layer: 5 - m_Name: PlayerAmmoCount2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1667372849 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22472610, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1667372848} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 6.56412172, z: 1} - m_Children: [] - m_Father: {fileID: 1413660775} - m_RootOrder: 2 - m_AnchorMin: {x: .5, y: .5} - m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: -240, y: -207} - m_SizeDelta: {x: 250, y: 80} - m_Pivot: {x: .5, y: .5} ---- !u!114 &1667372850 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11410990, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1667372848} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c88ea203cda48f3498c2583e23601830, type: 3} - m_Name: - m_EditorClassIdentifier: - ammoCount: {fileID: 2112786343} - playerID: 2 - player: {fileID: 1515989184} ---- !u!114 &1667372851 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11430702, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1667372848} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: .709803939, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 45 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: AmmoCount ---- !u!222 &1667372852 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22248206, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1667372848} ---- !u!1 &1676407022 +--- !u!1 &1812589628 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 188778, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabParentObject: {fileID: 136076, guid: b8af804de96124644898f0e89616d06a, type: 2} m_PrefabInternal: {fileID: 0} serializedVersion: 4 m_Component: - - 224: {fileID: 1676407023} - - 222: {fileID: 1676407025} - - 114: {fileID: 1676407024} + - 224: {fileID: 1812589629} m_Layer: 5 - m_Name: Fill + m_Name: Player4HUD m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1676407023 +--- !u!224 &1812589629 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22447970, guid: b8af804de96124644898f0e89616d06a, + m_PrefabParentObject: {fileID: 22409954, guid: b8af804de96124644898f0e89616d06a, type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1676407022} + m_GameObject: {fileID: 1812589628} 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: 9843160} - m_RootOrder: 0 - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 10, y: 0} - m_Pivot: {x: .5, y: .5} ---- !u!114 &1676407024 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11421190, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1676407022} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: .909803927, b: .23137255, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!222 &1676407025 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22272998, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1676407022} ---- !u!4 &1717947874 stripped + m_Children: + - {fileID: 2093644044} + - {fileID: 866842711} + - {fileID: 1433083141} + m_Father: {fileID: 143147948} + m_RootOrder: 3 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: 3.05175781e-05, y: -9.15527344e-05} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: .5, y: .5} +--- !u!4 &1814961501 stripped Transform: - m_PrefabParentObject: {fileID: 401230, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} - m_PrefabInternal: {fileID: 581025534} ---- !u!114 &1719456382 stripped -MonoBehaviour: - m_PrefabParentObject: {fileID: 11481414, guid: cf3b36c1277b6914ca9531867d57d6e5, - type: 2} - m_PrefabInternal: {fileID: 1422364005} - m_Script: {fileID: 11500000, guid: 684f389db4a8e194a89af18d0021af15, type: 3} ---- !u!4 &1724056570 stripped + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 1138030137} +--- !u!4 &1815943686 stripped Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} - m_PrefabInternal: {fileID: 1290932045} ---- !u!114 &1726136058 stripped + m_PrefabInternal: {fileID: 2025662497} +--- !u!4 &1818458944 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 1979546376} +--- !u!114 &1828806172 stripped MonoBehaviour: m_PrefabParentObject: {fileID: 11488472, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} - m_PrefabInternal: {fileID: 256436919} + m_PrefabInternal: {fileID: 1805697436} m_Script: {fileID: 11500000, guid: 72924532f27ef1a44a83a8354e4dcaa9, type: 3} ---- !u!1001 &1757835289 +--- !u!1001 &1832848768 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 754702397} + m_TransformParent: {fileID: 123880526} m_Modifications: - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.x - value: 4.0999999 + value: .0900000036 objectReference: {fileID: 0} - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.y - value: 7.80000019 + value: 3.78999996 objectReference: {fileID: 0} - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.z @@ -2465,405 +7193,240 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} - propertyPath: m_Name - value: Block 5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_SortingOrder - value: -7 + value: 7 objectReference: {fileID: 0} - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_Sprite value: objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, type: 3} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 1573436195 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_IsPrefabParent: 0 ---- !u!1 &1766389762 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 125282, guid: b8af804de96124644898f0e89616d06a, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 224: {fileID: 1766389763} - - 114: {fileID: 1766389764} - m_Layer: 5 - m_Name: PlayerHP2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1766389763 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22478556, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1766389762} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2, y: 13, z: 1} - m_Children: - - {fileID: 29733466} - - {fileID: 2021881325} - m_Father: {fileID: 1413660775} - m_RootOrder: 1 - m_AnchorMin: {x: .5, y: .5} - m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: -407.700043, y: -265.99942} - m_SizeDelta: {x: 100, y: 20} - m_Pivot: {x: .5, y: .5} ---- !u!114 &1766389764 +--- !u!114 &1833327629 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11429570, guid: b8af804de96124644898f0e89616d06a, + m_PrefabParentObject: {fileID: 11463138, guid: b8af804de96124644898f0e89616d06a, type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1766389762} + m_GameObject: {fileID: 2025581860} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -113659843, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} - m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} - m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} - m_ColorMultiplier: 1 - m_FadeDuration: .100000001 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 0} - m_FillRect: {fileID: 692605457} - m_HandleRect: {fileID: 0} - m_Direction: 0 - m_MinValue: 0 - m_MaxValue: 1 - m_WholeNumbers: 0 - m_Value: 1 - m_OnValueChanged: + m_Material: {fileID: 0} + m_Color: {r: 1, g: .895334721, b: .0514705777, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_TypeName: UnityEngine.UI.Slider+SliderEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!1 &1795214381 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 1795214382} - - 20: {fileID: 1795214386} - - 124: {fileID: 1795214385} - - 92: {fileID: 1795214384} - - 81: {fileID: 1795214383} - - 114: {fileID: 1795214387} - m_Layer: 0 - m_Name: Camera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1795214382 + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 80 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: Timer +--- !u!4 &1838878313 stripped Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1795214381} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 ---- !u!81 &1795214383 -AudioListener: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1795214381} - m_Enabled: 1 ---- !u!92 &1795214384 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1795214381} - m_Enabled: 1 ---- !u!124 &1795214385 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1795214381} - m_Enabled: 1 ---- !u!20 &1795214386 -Camera: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1795214381} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: .389705896, g: .389705896, b: .389705896, a: .0196078438} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: .300000012 - far clip plane: 1000 - field of view: 60 - orthographic: 1 - orthographic size: 15 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: .0219999999 - m_StereoMirrorMode: 0 ---- !u!114 &1795214387 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1795214381} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 53e63288d3ed334438f84f8fe1b41b85, type: 3} - m_Name: - m_EditorClassIdentifier: - shakeTimer: 0 - shakeIntesity: 0 ---- !u!1001 &1800545368 + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 1434456278} +--- !u!4 &1860753582 stripped +Transform: + m_PrefabParentObject: {fileID: 409436, guid: f89e011de36c1124e97bf9847d797ad1, type: 2} + m_PrefabInternal: {fileID: 127613653} +--- !u!4 &1866523315 stripped +Transform: + m_PrefabParentObject: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + m_PrefabInternal: {fileID: 779553180} +--- !u!1 &1870004477 stripped +GameObject: + m_PrefabParentObject: {fileID: 133054, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 66076508} +--- !u!1001 &1876005340 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 653857878} + m_TransformParent: {fileID: 1704268137} m_Modifications: - - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.x - value: 0 + value: 4.0999999 objectReference: {fileID: 0} - - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.y - value: 0 + value: 5.80000019 objectReference: {fileID: 0} - - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.z - value: 323.855438 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 11423510, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: spriteManager - value: - objectReference: {fileID: 1726136058} - - target: {fileID: 11438944, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: mEquippedWeapon - value: - objectReference: {fileID: 1998640093} - - target: {fileID: 22431700, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22431700, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22426558, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22426558, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_AnchorMax.y - value: 0 + value: 4 objectReference: {fileID: 0} - - target: {fileID: 133054, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_Name - value: Player 1 + value: Block 5 objectReference: {fileID: 0} - - target: {fileID: 11438944, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: mPlayerNumber - value: 1 + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -41 objectReference: {fileID: 0} - - target: {fileID: 11468964, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: spriteManager + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite value: - objectReference: {fileID: 1726136058} + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 1573436195 + objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_IsPrefabParent: 0 ---- !u!1001 &1805697436 +--- !u!1001 &1890865682 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 1456487450} + m_TransformParent: {fileID: 754702397} m_Modifications: - - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.x - value: -13.0795021 + value: .0900000036 objectReference: {fileID: 0} - - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.y - value: .416473091 + value: 3.78999996 objectReference: {fileID: 0} - - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.z - value: -323.863647 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 11488472, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} - propertyPath: player - value: - objectReference: {fileID: 1870004477} - - target: {fileID: 123852, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} - propertyPath: m_Name - value: SpriteManager2 - objectReference: {fileID: 0} - - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} - propertyPath: m_LocalScale.x - value: .99908936 - objectReference: {fileID: 0} - - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} - propertyPath: m_LocalScale.y - value: .99908936 + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -66 objectReference: {fileID: 0} - - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} - propertyPath: m_LocalScale.z - value: .99908936 + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 1573436195 objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_IsPrefabParent: 0 ---- !u!1 &1812589628 +--- !u!1 &1898002832 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 136076, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabParentObject: {fileID: 137228, guid: b8af804de96124644898f0e89616d06a, type: 2} m_PrefabInternal: {fileID: 0} serializedVersion: 4 m_Component: - - 224: {fileID: 1812589629} + - 224: {fileID: 1898002833} + - 222: {fileID: 1898002835} + - 114: {fileID: 1898002834} m_Layer: 5 - m_Name: Player4HUD + m_Name: PlayerIconTwo m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1812589629 +--- !u!224 &1898002833 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22409954, guid: b8af804de96124644898f0e89616d06a, + m_PrefabParentObject: {fileID: 22463086, guid: b8af804de96124644898f0e89616d06a, type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1812589628} + m_GameObject: {fileID: 1898002832} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 2093644044} - - {fileID: 866842711} - - {fileID: 1433083141} - m_Father: {fileID: 143147948} - m_RootOrder: 3 + m_LocalScale: {x: 1, y: 6.56412172, z: 1} + m_Children: [] + m_Father: {fileID: 1413660775} + m_RootOrder: 0 m_AnchorMin: {x: .5, y: .5} m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: 3.05175781e-05, y: -9.15527344e-05} - m_SizeDelta: {x: 100, y: 100} + m_AnchoredPosition: {x: -417.300018, y: 208} + m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: .5, y: .5} ---- !u!114 &1828806172 stripped -MonoBehaviour: - m_PrefabParentObject: {fileID: 11488472, guid: 177f3aee218d5654f91c54c038b43ac9, - type: 2} - m_PrefabInternal: {fileID: 1805697436} - m_Script: {fileID: 11500000, guid: 72924532f27ef1a44a83a8354e4dcaa9, type: 3} ---- !u!114 &1833327629 +--- !u!114 &1898002834 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11463138, guid: b8af804de96124644898f0e89616d06a, + m_PrefabParentObject: {fileID: 11489882, guid: b8af804de96124644898f0e89616d06a, type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2025581860} + m_GameObject: {fileID: 1898002832} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: .895334721, b: .0514705777, a: 1} + m_Color: {r: 0, g: .710344791, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2872,35 +7435,133 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 80 + m_FontSize: 60 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 10 m_MaxSize: 40 m_Alignment: 4 m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Timer ---- !u!4 &1860753582 stripped + m_Text: Player 2 +--- !u!222 &1898002835 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22223918, guid: b8af804de96124644898f0e89616d06a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1898002832} +--- !u!1 &1900231290 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1900231291} + m_Layer: 0 + m_Name: Block Holder (5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1900231291 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1900231290} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1838878313} + - {fileID: 951669876} + - {fileID: 1416243554} + - {fileID: 1756222781} + - {fileID: 1930426167} + - {fileID: 360105793} + m_Father: {fileID: 1070331672} + m_RootOrder: 2 +--- !u!1001 &1903365224 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 653857878} + m_Modifications: + - target: {fileID: 405082, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 405082, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 405082, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} + propertyPath: m_LocalPosition.z + value: 323.855438 + objectReference: {fileID: 0} + - target: {fileID: 405082, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 405082, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 405082, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 405082, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 405082, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} + propertyPath: m_RootOrder + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 11420586, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} + propertyPath: hasInfiniteAmmo + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 405082, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} + propertyPath: m_LocalScale.x + value: 35.9839363 + objectReference: {fileID: 0} + - target: {fileID: 405082, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} + propertyPath: m_LocalScale.y + value: 35.9839363 + objectReference: {fileID: 0} + - target: {fileID: 405082, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} + propertyPath: m_LocalScale.z + value: 35.9839363 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &1910995931 stripped +Transform: + m_PrefabParentObject: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} + m_PrefabInternal: {fileID: 179693061} +--- !u!4 &1920822067 stripped Transform: - m_PrefabParentObject: {fileID: 409436, guid: f89e011de36c1124e97bf9847d797ad1, type: 2} - m_PrefabInternal: {fileID: 127613653} ---- !u!1 &1870004477 stripped -GameObject: - m_PrefabParentObject: {fileID: 133054, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - m_PrefabInternal: {fileID: 66076508} ---- !u!1001 &1890865682 + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 1294094049} +--- !u!1001 &1927696626 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 754702397} + m_TransformParent: {fileID: 1351565264} m_Modifications: - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.x - value: 4.0999999 + value: 8.10000038 objectReference: {fileID: 0} - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.y @@ -2928,11 +7589,15 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_RootOrder - value: 0 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 1 objectReference: {fileID: 0} - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_SortingOrder - value: -7 + value: -90 objectReference: {fileID: 0} - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_Sprite @@ -2942,143 +7607,189 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_IsPrefabParent: 0 ---- !u!1 &1898002832 +--- !u!4 &1928596399 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 1272197842} +--- !u!4 &1930426167 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 900741911} +--- !u!4 &1932369583 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 398347179} +--- !u!1 &1937374955 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 137228, guid: b8af804de96124644898f0e89616d06a, type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 4 m_Component: - - 224: {fileID: 1898002833} - - 222: {fileID: 1898002835} - - 114: {fileID: 1898002834} - m_Layer: 5 - m_Name: PlayerIconTwo + - 4: {fileID: 1937374956} + m_Layer: 0 + m_Name: Block Holder (3) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1898002833 -RectTransform: +--- !u!4 &1937374956 +Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22463086, guid: b8af804de96124644898f0e89616d06a, - type: 2} + m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1898002832} + m_GameObject: {fileID: 1937374955} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 6.56412172, z: 1} - m_Children: [] - m_Father: {fileID: 1413660775} + m_LocalPosition: {x: -12.0053568, y: 6.03046846, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1310894361} + - {fileID: 1448905500} + - {fileID: 815532423} + - {fileID: 499230965} + - {fileID: 988280011} + - {fileID: 221484448} + m_Father: {fileID: 1070331672} m_RootOrder: 0 - m_AnchorMin: {x: .5, y: .5} - m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: -417.300018, y: 208} - m_SizeDelta: {x: 250, y: 80} - m_Pivot: {x: .5, y: .5} ---- !u!114 &1898002834 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11489882, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1898002832} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: .710344791, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 60 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Player 2 ---- !u!222 &1898002835 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 22223918, guid: b8af804de96124644898f0e89616d06a, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1898002832} ---- !u!1001 &1903365224 +--- !u!4 &1946142852 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 2104523922} +--- !u!1001 &1979546376 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 653857878} + m_TransformParent: {fileID: 1704268137} m_Modifications: - - target: {fileID: 405082, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.x - value: 0 + value: -1.90999997 objectReference: {fileID: 0} - - target: {fileID: 405082, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.y - value: 0 + value: 2.78999996 objectReference: {fileID: 0} - - target: {fileID: 405082, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.z - value: 323.855438 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 405082, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 405082, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 405082, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 405082, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 405082, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_RootOrder - value: 11 + value: 5 objectReference: {fileID: 0} - - target: {fileID: 11420586, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} - propertyPath: hasInfiniteAmmo - value: 0 + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 5 (1) objectReference: {fileID: 0} - - target: {fileID: 405082, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -23 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalScale.x - value: 35.9839363 + value: 1 objectReference: {fileID: 0} - - target: {fileID: 405082, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalScale.y - value: 35.9839363 + value: 1 objectReference: {fileID: 0} - - target: {fileID: 405082, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalScale.z - value: 35.9839363 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 1573436195 objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &1987559970 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1937374956} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 4.0999999 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: 1.79999995 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 2 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -16 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 1573436195 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_IsPrefabParent: 0 ---- !u!4 &1910995931 stripped -Transform: - m_PrefabParentObject: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} - m_PrefabInternal: {fileID: 179693061} --- !u!114 &1998640093 stripped MonoBehaviour: m_PrefabParentObject: {fileID: 11440672, guid: 0d300e0327b70da49abe5b0e9498a7a7, @@ -3235,6 +7946,69 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2025581860} +--- !u!1001 &2025662497 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1493915461} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 6.0999999 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: 6.80000019 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 2 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 2015190895 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &2037202224 stripped +Transform: + m_PrefabParentObject: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} + m_PrefabInternal: {fileID: 1259412688} --- !u!1 &2050290494 GameObject: m_ObjectHideFlags: 0 @@ -3271,6 +8045,85 @@ RectTransform: m_AnchoredPosition: {x: 3.05175781e-05, y: -9.15527344e-05} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: .5, y: .5} +--- !u!4 &2051898811 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 1832848768} +--- !u!1001 &2061694409 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1764917752} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 10.1000004 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: -1.20000005 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 5 (1) + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -22 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 1573436195 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 --- !u!1 &2067420756 GameObject: m_ObjectHideFlags: 0 @@ -3380,9 +8233,214 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2093644043} +--- !u!1001 &2097656179 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 754702397} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: -1.90999997 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: 2.78999996 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 5 (1) + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -59 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 1573436195 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!1001 &2104523922 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 18288708} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 4.0999999 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: 1.79999995 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 2 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -22 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 1573436195 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 --- !u!114 &2112786343 stripped MonoBehaviour: m_PrefabParentObject: {fileID: 11405038, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} m_PrefabInternal: {fileID: 1800545368} m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} +--- !u!1001 &2129498887 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1493915461} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 8.10000038 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: 7.80000019 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 1 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -11 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, + type: 3} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingLayerID + value: 2015190895 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_IsPrefabParent: 0 +--- !u!4 &2132288174 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 1371076390} +--- !u!4 &2133150257 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 1448504151} +--- !u!4 &2138769919 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 2129498887} From 60299ebd0b4483653cb5971bf049d50de8457a1a Mon Sep 17 00:00:00 2001 From: julianstopher Date: Wed, 24 Feb 2016 12:05:10 +0000 Subject: [PATCH 13/39] HUD now hidden by default, use back button to enable Implemented functionality for the Back button on the controller to enable the playerHUD. Whilst it is pressed, the HUD is shown. --- Assets/Scenes/Prototype.unity | 2342 ++++++++++++++++++++++++++-- Assets/Scripts/Player/Player.cs | 9 + ProjectSettings/InputManager.asset | 32 + 3 files changed, 2253 insertions(+), 130 deletions(-) diff --git a/Assets/Scenes/Prototype.unity b/Assets/Scenes/Prototype.unity index ea5815f..3e5f416 100644 --- a/Assets/Scenes/Prototype.unity +++ b/Assets/Scenes/Prototype.unity @@ -464,6 +464,40 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 29733465} +--- !u!1 &45241850 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 119466, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 45241851} + m_Layer: 5 + m_Name: Fill Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &45241851 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22498810, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 45241850} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1472845390} + m_Father: {fileID: 966856042} + m_RootOrder: 1 + m_AnchorMin: {x: 0, y: .25} + m_AnchorMax: {x: 1, y: .75} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -20, y: 0} + m_Pivot: {x: .5, y: .5} --- !u!4 &47402629 stripped Transform: m_PrefabParentObject: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} @@ -553,112 +587,6 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Slider+SliderEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null ---- !u!1001 &66076508 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 653857878} - m_Modifications: - - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_LocalPosition.x - value: 471.080963 - objectReference: {fileID: 0} - - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_LocalPosition.y - value: -15 - objectReference: {fileID: 0} - - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_LocalPosition.z - value: 11988.3662 - objectReference: {fileID: 0} - - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_RootOrder - value: 15 - objectReference: {fileID: 0} - - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_LocalScale.x - value: 36.0167351 - objectReference: {fileID: 0} - - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_LocalScale.y - value: 36.0167351 - objectReference: {fileID: 0} - - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_LocalScale.z - value: 36.0167351 - objectReference: {fileID: 0} - - target: {fileID: 133054, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Name - value: Player 2 - objectReference: {fileID: 0} - - target: {fileID: 11438944, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: mPlayerNumber - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 11438944, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: mEquippedWeapon - value: - objectReference: {fileID: 1719456382} - - target: {fileID: 11423510, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: spriteManager - value: - objectReference: {fileID: 1828806172} - - target: {fileID: 22431700, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22431700, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22426558, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22426558, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22434640, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 490514, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 445210, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 495372, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11468964, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: spriteManager - value: - objectReference: {fileID: 1828806172} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - m_IsPrefabParent: 0 --- !u!1001 &66406261 Prefab: m_ObjectHideFlags: 0 @@ -726,6 +654,90 @@ Prefab: Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_PrefabInternal: {fileID: 746160465} +--- !u!1 &100469316 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 150530, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 100469317} + - 212: {fileID: 100469320} + - 58: {fileID: 100469319} + - 114: {fileID: 100469318} + m_Layer: 0 + m_Name: BallMode + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &100469317 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 495372, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 100469316} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -1} + m_LocalScale: {x: .115264796, y: .115264796, z: .115264796} + m_Children: [] + m_Father: {fileID: 1456487450} + m_RootOrder: 1 +--- !u!114 &100469318 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11476046, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 100469316} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 98209420a6d38b74bb9630d8cf0c9320, type: 3} + m_Name: + m_EditorClassIdentifier: + player: {fileID: 1870004477} +--- !u!58 &100469319 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 5827044, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 100469316} + m_Enabled: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 10 +--- !u!212 &100469320 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 21230166, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 100469316} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 1 + m_ReflectionProbeUsage: 1 + m_ProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_ImportantGI: 0 + m_AutoUVMaxDistance: .5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingOrder: 1 + m_Sprite: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} --- !u!4 &110914826 stripped Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} @@ -800,7 +812,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 409436, guid: f89e011de36c1124e97bf9847d797ad1, type: 2} propertyPath: m_RootOrder - value: 8 + value: 9 objectReference: {fileID: 0} - target: {fileID: 409436, guid: f89e011de36c1124e97bf9847d797ad1, type: 2} propertyPath: m_LocalScale.x @@ -913,6 +925,81 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 148433719} +--- !u!1 &152197722 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 170390, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 152197723} + - 222: {fileID: 152197725} + - 114: {fileID: 152197724} + m_Layer: 5 + m_Name: PlayerIconOne + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &152197723 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22478268, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 152197722} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -9} + m_LocalScale: {x: .0277901776, y: .0277901758, z: .0277901776} + m_Children: [] + m_Father: {fileID: 232170164} + m_RootOrder: 0 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: -.166748047, y: 1.06028748} + m_SizeDelta: {x: 250, y: 80} + m_Pivot: {x: .5, y: .5} +--- !u!114 &152197724 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11461712, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 152197722} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: .911764681, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 60 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Player 1 +--- !u!222 &152197725 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22230850, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 152197722} --- !u!4 &161115611 stripped Transform: m_PrefabParentObject: {fileID: 462742, guid: dcfaa153c5433dd478fabe3e62e3b353, type: 2} @@ -958,7 +1045,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} propertyPath: m_RootOrder - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} propertyPath: m_LocalScale.x @@ -1113,6 +1200,37 @@ Transform: Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_PrefabInternal: {fileID: 673191866} +--- !u!1 &232170163 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 232170164} + m_Layer: 0 + m_Name: testHUDHolder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &232170164 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 232170163} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 152197723} + - {fileID: 863266352} + - {fileID: 1967053839} + - {fileID: 966856042} + m_Father: {fileID: 1456487450} + m_RootOrder: 5 --- !u!4 &239526396 stripped Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} @@ -1187,6 +1305,61 @@ Prefab: Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_PrefabInternal: {fileID: 309667062} +--- !u!1 &282481001 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 183054, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 282481002} + - 212: {fileID: 282481003} + m_Layer: 0 + m_Name: Reticle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &282481002 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 445210, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 282481001} + 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: 1456487450} + m_RootOrder: 2 +--- !u!212 &282481003 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 21206478, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 282481001} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 1 + m_ReflectionProbeUsage: 1 + m_ProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_ImportantGI: 0 + m_AutoUVMaxDistance: .5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 1fd3c28ec5ebaef4d8511f68a1b521c2, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} --- !u!4 &285329012 stripped Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} @@ -1195,6 +1368,76 @@ Transform: Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_PrefabInternal: {fileID: 66406261} +--- !u!1 &308460198 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 172744, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 308460199} + - 222: {fileID: 308460201} + - 114: {fileID: 308460200} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &308460199 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22431700, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 308460198} + 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: 2059452436} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 10, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &308460200 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11473472, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 308460198} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &308460201 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22200920, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 308460198} --- !u!1001 &309667062 Prefab: m_ObjectHideFlags: 0 @@ -1273,7 +1516,7 @@ Transform: m_LocalScale: {x: 35.9839363, y: 35.9839363, z: 35.9839363} m_Children: [] m_Father: {fileID: 653857878} - m_RootOrder: 3 + m_RootOrder: 4 --- !u!114 &329086457 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1584,6 +1827,39 @@ CanvasRenderer: Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_PrefabInternal: {fileID: 1052030047} +--- !u!1 &389116436 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 121534, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 389116437} + m_Layer: 5 + m_Name: Player2HUD + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &389116437 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22434640, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 389116436} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -9} + m_LocalScale: {x: .0277901795, y: .0042336476, z: .0277901795} + m_Children: [] + m_Father: {fileID: 1456487450} + m_RootOrder: 3 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: 23.0102539, y: .1796875} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: .5, y: .5} --- !u!1001 &393398975 Prefab: m_ObjectHideFlags: 0 @@ -1712,8 +1988,1128 @@ Transform: m_PrefabInternal: {fileID: 673439712} --- !u!4 &418995551 stripped Transform: - m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} - m_PrefabInternal: {fileID: 514880646} + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 514880646} +--- !u!1 &467455898 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 120392, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 467455899} + - 198: {fileID: 467455901} + - 199: {fileID: 467455900} + m_Layer: 0 + m_Name: MiniGun Particle System + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &467455899 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 490514, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 467455898} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -.129999995, y: 0, z: .779999971} + m_LocalScale: {x: 5, y: 5, z: 5} + m_Children: [] + m_Father: {fileID: 1456487450} + m_RootOrder: 0 +--- !u!199 &467455900 +ParticleSystemRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 19911596, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 467455898} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_Materials: + - {fileID: 2100000, guid: 1598bf38b0a98824b9c2b464eaf93fb7, type: 2} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 1 + m_ReflectionProbeUsage: 1 + m_ProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_ImportantGI: 0 + m_AutoUVMaxDistance: .5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_RenderMode: 0 + m_MaxParticleSize: .5 + m_CameraVelocityScale: 0 + m_VelocityScale: 0 + m_LengthScale: 2 + m_SortingFudge: 0 + m_NormalDirection: 1 + m_SortMode: 0 + m_Mesh: {fileID: 0} + m_Mesh1: {fileID: 0} + m_Mesh2: {fileID: 0} + m_Mesh3: {fileID: 0} +--- !u!198 &467455901 +ParticleSystem: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 19868204, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 467455898} + lengthInSec: 2 + startDelay: 0 + speed: 1 + randomSeed: 0 + looping: 1 + prewarm: 1 + playOnAwake: 0 + moveWithTransform: 1 + InitialModule: + enabled: 1 + startLifetime: + scalar: .200000003 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + startSpeed: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + startColor: + maxGradient: + key0: + serializedVersion: 2 + rgba: 4294967295 + key1: + serializedVersion: 2 + rgba: 4294967295 + key2: + serializedVersion: 2 + rgba: 0 + key3: + serializedVersion: 2 + rgba: 0 + key4: + serializedVersion: 2 + rgba: 0 + key5: + serializedVersion: 2 + rgba: 0 + key6: + serializedVersion: 2 + rgba: 0 + key7: + serializedVersion: 2 + rgba: 0 + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + minGradient: + key0: + serializedVersion: 2 + rgba: 4294967295 + key1: + serializedVersion: 2 + rgba: 4294967295 + key2: + serializedVersion: 2 + rgba: 0 + key3: + serializedVersion: 2 + rgba: 0 + key4: + serializedVersion: 2 + rgba: 0 + key5: + serializedVersion: 2 + rgba: 0 + key6: + serializedVersion: 2 + rgba: 0 + key7: + serializedVersion: 2 + rgba: 0 + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + minColor: + serializedVersion: 2 + rgba: 4294967295 + maxColor: + serializedVersion: 2 + rgba: 4294967295 + minMaxState: 0 + startSize: + scalar: .200000003 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + startRotation: + scalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + gravityModifier: 8 + inheritVelocity: 0 + maxNumParticles: 100 + ShapeModule: + serializedVersion: 2 + enabled: 1 + type: 10 + radius: .200000003 + angle: 25 + length: 5 + boxX: 1 + boxY: 1 + boxZ: 1 + arc: 10 + placementMode: 0 + m_Mesh: {fileID: 0} + randomDirection: 0 + EmissionModule: + enabled: 1 + m_Type: 0 + rate: + scalar: 10 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + cnt0: 30 + cnt1: 30 + cnt2: 30 + cnt3: 30 + time0: 0 + time1: 0 + time2: 0 + time3: 0 + m_BurstCount: 0 + SizeModule: + enabled: 0 + curve: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 1 + RotationModule: + enabled: 1 + curve: + scalar: 17.4532928 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + ColorModule: + enabled: 1 + gradient: + maxGradient: + key0: + serializedVersion: 2 + rgba: 4294967295 + key1: + serializedVersion: 2 + rgba: 83886079 + key2: + serializedVersion: 2 + rgba: 0 + key3: + serializedVersion: 2 + rgba: 0 + key4: + serializedVersion: 2 + rgba: 0 + key5: + serializedVersion: 2 + rgba: 0 + key6: + serializedVersion: 2 + rgba: 0 + key7: + serializedVersion: 2 + rgba: 0 + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 65535 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + minGradient: + key0: + serializedVersion: 2 + rgba: 4294967295 + key1: + serializedVersion: 2 + rgba: 4294967295 + key2: + serializedVersion: 2 + rgba: 0 + key3: + serializedVersion: 2 + rgba: 0 + key4: + serializedVersion: 2 + rgba: 0 + key5: + serializedVersion: 2 + rgba: 0 + key6: + serializedVersion: 2 + rgba: 0 + key7: + serializedVersion: 2 + rgba: 0 + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + minColor: + serializedVersion: 2 + rgba: 4294967295 + maxColor: + serializedVersion: 2 + rgba: 4294967295 + minMaxState: 1 + UVModule: + enabled: 0 + frameOverTime: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 1 + tilesX: 1 + tilesY: 1 + animationType: 0 + rowIndex: 0 + cycles: 1 + randomRow: 1 + VelocityModule: + enabled: 1 + x: + scalar: .100000001 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + y: + scalar: .100000001 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + z: + scalar: .100000001 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + inWorldSpace: 0 + ForceModule: + enabled: 0 + x: + scalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + y: + scalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + z: + scalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + inWorldSpace: 0 + randomizePerFrame: 0 + ExternalForcesModule: + enabled: 0 + multiplier: 10 + ClampVelocityModule: + enabled: 0 + x: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + y: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + z: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + magnitude: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + separateAxis: 0 + inWorldSpace: 0 + dampen: .899999976 + SizeBySpeedModule: + enabled: 0 + curve: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 1 + range: {x: 0, y: 1} + RotationBySpeedModule: + enabled: 0 + curve: + scalar: .785398126 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + range: {x: 0, y: 1} + ColorBySpeedModule: + enabled: 0 + gradient: + maxGradient: + key0: + serializedVersion: 2 + rgba: 4294967295 + key1: + serializedVersion: 2 + rgba: 4294967295 + key2: + serializedVersion: 2 + rgba: 0 + key3: + serializedVersion: 2 + rgba: 0 + key4: + serializedVersion: 2 + rgba: 0 + key5: + serializedVersion: 2 + rgba: 0 + key6: + serializedVersion: 2 + rgba: 0 + key7: + serializedVersion: 2 + rgba: 0 + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + minGradient: + key0: + serializedVersion: 2 + rgba: 4294967295 + key1: + serializedVersion: 2 + rgba: 4294967295 + key2: + serializedVersion: 2 + rgba: 0 + key3: + serializedVersion: 2 + rgba: 0 + key4: + serializedVersion: 2 + rgba: 0 + key5: + serializedVersion: 2 + rgba: 0 + key6: + serializedVersion: 2 + rgba: 0 + key7: + serializedVersion: 2 + rgba: 0 + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + minColor: + serializedVersion: 2 + rgba: 4294967295 + maxColor: + serializedVersion: 2 + rgba: 4294967295 + minMaxState: 1 + range: {x: 0, y: 1} + CollisionModule: + enabled: 0 + type: 0 + plane0: {fileID: 0} + plane1: {fileID: 0} + plane2: {fileID: 0} + plane3: {fileID: 0} + plane4: {fileID: 0} + plane5: {fileID: 0} + dampen: 0 + bounce: 1 + energyLossOnCollision: 0 + minKillSpeed: 0 + particleRadius: .00999999978 + collidesWith: + serializedVersion: 2 + m_Bits: 4294967295 + quality: 0 + voxelSize: .5 + collisionMessages: 0 + SubModule: + enabled: 0 + subEmitterBirth: {fileID: 0} + subEmitterBirth1: {fileID: 0} + subEmitterCollision: {fileID: 0} + subEmitterCollision1: {fileID: 0} + subEmitterDeath: {fileID: 0} + subEmitterDeath1: {fileID: 0} --- !u!4 &469212889 stripped Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} @@ -1893,7 +3289,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 401230, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} propertyPath: m_RootOrder - value: 13 + value: 14 objectReference: {fileID: 0} - target: {fileID: 194862, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} propertyPath: m_Name @@ -2147,6 +3543,7 @@ RectTransform: - {fileID: 713839869} - {fileID: 143147948} - {fileID: 1515989185} + - {fileID: 1456487450} - {fileID: 329086456} - {fileID: 1910995931} - {fileID: 133048276} @@ -2159,7 +3556,6 @@ RectTransform: - {fileID: 531871430} - {fileID: 1717947874} - {fileID: 162690262} - - {fileID: 1456487450} - {fileID: 2037202224} - {fileID: 1866523315} - {fileID: 47402629} @@ -2768,7 +4164,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 462742, guid: dcfaa153c5433dd478fabe3e62e3b353, type: 2} propertyPath: m_RootOrder - value: 7 + value: 8 objectReference: {fileID: 0} - target: {fileID: 462742, guid: dcfaa153c5433dd478fabe3e62e3b353, type: 2} propertyPath: m_LocalScale.x @@ -3338,6 +4734,91 @@ Prefab: Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_PrefabInternal: {fileID: 1677744541} +--- !u!1 &863266351 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 137932, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 863266352} + - 114: {fileID: 863266353} + m_Layer: 5 + m_Name: PlayerHP1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &863266352 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22401764, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 863266351} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -9} + m_LocalScale: {x: .0555803552, y: .0550374165, z: .0277901776} + m_Children: + - {fileID: 1412533490} + - {fileID: 2059452436} + m_Father: {fileID: 232170164} + m_RootOrder: 1 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: .0555419922, y: 2.08905029} + m_SizeDelta: {x: 100, y: 20} + m_Pivot: {x: .5, y: .5} +--- !u!114 &863266353 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11483498, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 863266351} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -113659843, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} + m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} + m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_ColorMultiplier: 1 + m_FadeDuration: .100000001 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + m_FillRect: {fileID: 308460199} + m_HandleRect: {fileID: 0} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 1 + m_WholeNumbers: 0 + m_Value: 1 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Slider+SliderEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &866842710 GameObject: m_ObjectHideFlags: 0 @@ -3624,6 +5105,91 @@ Transform: Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_PrefabInternal: {fileID: 1633478505} +--- !u!1 &966856041 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 103882, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 966856042} + - 114: {fileID: 966856043} + m_Layer: 5 + m_Name: PlayerAmmoCountSlider1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &966856042 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22441718, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 966856041} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -9} + m_LocalScale: {x: .0555803552, y: .0550374165, z: .0277901776} + m_Children: + - {fileID: 1438425927} + - {fileID: 45241851} + m_Father: {fileID: 232170164} + m_RootOrder: 3 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: .0556030273, y: -3.45703125} + m_SizeDelta: {x: 100, y: 20} + m_Pivot: {x: .5, y: .5} +--- !u!114 &966856043 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11434670, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 966856041} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -113659843, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} + m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} + m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_ColorMultiplier: 1 + m_FadeDuration: .100000001 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + m_FillRect: {fileID: 1472845390} + m_HandleRect: {fileID: 0} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 1 + m_WholeNumbers: 0 + m_Value: 1 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Slider+SliderEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!4 &988280011 stripped Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} @@ -3803,7 +5369,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} propertyPath: m_RootOrder - value: 9 + value: 10 objectReference: {fileID: 0} - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} propertyPath: m_LocalScale.x @@ -4073,6 +5639,10 @@ Transform: Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_PrefabInternal: {fileID: 669112603} +--- !u!1 &1134726024 stripped +GameObject: + m_PrefabParentObject: {fileID: 121534, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 1800545368} --- !u!1001 &1138030137 Prefab: m_ObjectHideFlags: 0 @@ -4556,7 +6126,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} propertyPath: m_RootOrder - value: 14 + value: 15 objectReference: {fileID: 0} - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} propertyPath: m_LocalScale.x @@ -4673,7 +6243,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: m_RootOrder - value: 12 + value: 13 objectReference: {fileID: 0} - target: {fileID: 11419152, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: wallManager @@ -5121,6 +6691,76 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_IsPrefabParent: 0 +--- !u!1 &1412533489 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 191010, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1412533490} + - 222: {fileID: 1412533492} + - 114: {fileID: 1412533491} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1412533490 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22492620, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1412533489} + 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: 863266352} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: .25} + m_AnchorMax: {x: 1, y: .75} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -10, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1412533491 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11446066, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1412533489} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1412533492 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22235334, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1412533489} --- !u!1 &1413660774 GameObject: m_ObjectHideFlags: 0 @@ -5202,7 +6842,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 471558, guid: cf3b36c1277b6914ca9531867d57d6e5, type: 2} propertyPath: m_RootOrder - value: 5 + value: 6 objectReference: {fileID: 0} - target: {fileID: 11481414, guid: cf3b36c1277b6914ca9531867d57d6e5, type: 2} propertyPath: hasInfiniteAmmo @@ -5369,6 +7009,76 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_IsPrefabParent: 0 +--- !u!1 &1438425926 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 107548, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1438425927} + - 222: {fileID: 1438425929} + - 114: {fileID: 1438425928} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1438425927 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22408488, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1438425926} + 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: 966856042} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: .25} + m_AnchorMax: {x: 1, y: .75} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -10, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1438425928 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11404772, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1438425926} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1438425929 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22224336, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1438425926} --- !u!1001 &1441736284 Prefab: m_ObjectHideFlags: 0 @@ -5495,10 +7205,24 @@ Prefab: Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_PrefabInternal: {fileID: 1304065338} ---- !u!4 &1456487450 stripped +--- !u!4 &1456487450 Transform: + m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - m_PrefabInternal: {fileID: 66076508} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1870004477} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 471.080963, y: -15, z: 11988.3662} + m_LocalScale: {x: 36.0167351, y: 36.0167351, z: 36.0167351} + m_Children: + - {fileID: 467455899} + - {fileID: 100469317} + - {fileID: 282481002} + - {fileID: 389116437} + - {fileID: 1720242252} + - {fileID: 232170164} + m_Father: {fileID: 653857878} + m_RootOrder: 3 --- !u!1001 &1460317504 Prefab: m_ObjectHideFlags: 0 @@ -5558,6 +7282,76 @@ Prefab: Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_PrefabInternal: {fileID: 853747675} +--- !u!1 &1472845389 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 168636, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1472845390} + - 222: {fileID: 1472845392} + - 114: {fileID: 1472845391} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1472845390 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22426558, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1472845389} + 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: 45241851} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 10, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1472845391 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11468980, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1472845389} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1472845392 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22246132, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1472845389} --- !u!4 &1475970850 stripped Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} @@ -5903,7 +7697,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} propertyPath: m_RootOrder - value: 6 + value: 7 objectReference: {fileID: 0} - target: {fileID: 11440672, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} propertyPath: hasInfiniteAmmo @@ -5958,7 +7752,7 @@ Transform: m_LocalScale: {x: 35.9839363, y: 35.9839363, z: 35.9839363} m_Children: [] m_Father: {fileID: 653857878} - m_RootOrder: 11 + m_RootOrder: 12 --- !u!1 &1660781285 GameObject: m_ObjectHideFlags: 0 @@ -6469,6 +8263,10 @@ MonoBehaviour: type: 2} m_PrefabInternal: {fileID: 1422364005} m_Script: {fileID: 11500000, guid: 684f389db4a8e194a89af18d0021af15, type: 3} +--- !u!4 &1720242252 stripped +Transform: + m_PrefabParentObject: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + m_PrefabInternal: {fileID: 1805697436} --- !u!4 &1724056570 stripped Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} @@ -7006,19 +8804,19 @@ Prefab: objectReference: {fileID: 1998640093} - target: {fileID: 22431700, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 22431700, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 22426558, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 22426558, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 133054, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_Name @@ -7037,6 +8835,10 @@ Prefab: value: objectReference: {fileID: 21300000, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - target: {fileID: 11438944, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: playerHUD + value: + objectReference: {fileID: 1134726024} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} m_IsPrefabParent: 0 @@ -7077,7 +8879,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} propertyPath: m_RootOrder - value: 0 + value: 4 objectReference: {fileID: 0} - target: {fileID: 11488472, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} propertyPath: player @@ -7256,10 +9058,165 @@ Transform: Transform: m_PrefabParentObject: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} m_PrefabInternal: {fileID: 779553180} ---- !u!1 &1870004477 stripped +--- !u!1 &1870004477 GameObject: + m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 133054, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - m_PrefabInternal: {fileID: 66076508} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1456487450} + - 114: {fileID: 1870004485} + - 114: {fileID: 1870004484} + - 212: {fileID: 1870004483} + - 114: {fileID: 1870004482} + - 50: {fileID: 1870004481} + - 61: {fileID: 1870004480} + - 114: {fileID: 1870004478} + - 114: {fileID: 1870004479} + m_Layer: 0 + m_Name: Player 2 + m_TagString: Player + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1870004478 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11438944, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1870004477} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3800ba1d4402403408247b3365ec08f5, type: 3} + m_Name: + m_EditorClassIdentifier: + mEquippedWeapon: {fileID: 1719456382} + weaponList: [] + mPlayerNumber: 2 + HPSlider: {fileID: 863266353} + ammoSlider: {fileID: 966856043} + waitTime: 0 + minigunParticleSystem: {fileID: 467455901} + playerHUD: {fileID: 232170163} +--- !u!114 &1870004479 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11461038, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1870004477} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2064fcc622451c34086cbca807911795, type: 3} + m_Name: + m_EditorClassIdentifier: + ballObj: {fileID: 100469316} + playerScript: {fileID: 1870004478} + isBallin: 0 + weaponNumber: 0 +--- !u!61 &1870004480 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 6182250, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1870004477} + m_Enabled: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_Offset: {x: -.125, y: -.0320999995} + serializedVersion: 2 + m_Size: {x: .861835837, y: 2.24815989} +--- !u!50 &1870004481 +Rigidbody2D: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 5019476, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1870004477} + m_Mass: 1 + m_LinearDrag: 100 + m_AngularDrag: .0500000007 + m_GravityScale: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 4 +--- !u!114 &1870004482 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11468964, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1870004477} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9953f2ce208997f4590922eebec801a4, type: 3} + m_Name: + m_EditorClassIdentifier: + player: {fileID: 1870004477} + spriteManager: {fileID: 1828806172} + mReticle: {fileID: 282481001} +--- !u!212 &1870004483 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 21264780, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1870004477} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 1 + m_ReflectionProbeUsage: 1 + m_ProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_ImportantGI: 0 + m_AutoUVMaxDistance: .5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: -755987041 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300006, guid: 8d5e240089c1c994291391e0a9631f95, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} +--- !u!114 &1870004484 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11423510, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1870004477} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55891d2920542d641913a9d95d43c293, type: 3} + m_Name: + m_EditorClassIdentifier: + spriteManager: {fileID: 1828806172} +--- !u!114 &1870004485 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11491268, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1870004477} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8d5cf19dc09fdeb428bccce2b3e7e0a0, type: 3} + m_Name: + m_EditorClassIdentifier: + mMovementSpeed: 1000 + _playerActions: {fileID: 1870004479} --- !u!1001 &1876005340 Prefab: m_ObjectHideFlags: 0 @@ -7523,7 +9480,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 405082, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} propertyPath: m_RootOrder - value: 10 + value: 11 objectReference: {fileID: 0} - target: {fileID: 11420586, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} propertyPath: hasInfiniteAmmo @@ -7656,6 +9613,97 @@ Transform: Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_PrefabInternal: {fileID: 2104523922} +--- !u!1 &1967053838 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 143898, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1967053839} + - 222: {fileID: 1967053842} + - 114: {fileID: 1967053841} + - 114: {fileID: 1967053840} + m_Layer: 5 + m_Name: PlayerAmmoCount1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1967053839 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22428368, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1967053838} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -9} + m_LocalScale: {x: .0277901776, y: .0277901758, z: .0277901776} + m_Children: [] + m_Father: {fileID: 232170164} + m_RootOrder: 2 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: .111206055, y: -2.01763916} + m_SizeDelta: {x: 250, y: 80} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1967053840 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11492776, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1967053838} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c88ea203cda48f3498c2583e23601830, type: 3} + m_Name: + m_EditorClassIdentifier: + ammoCount: {fileID: 1967053841} + playerID: 1 + player: {fileID: 1870004478} +--- !u!114 &1967053841 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11405038, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1967053838} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: .911764681, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 45 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: AmmoCount +--- !u!222 &1967053842 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22295760, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1967053838} --- !u!1001 &1979546376 Prefab: m_ObjectHideFlags: 0 @@ -8049,6 +10097,40 @@ RectTransform: Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_PrefabInternal: {fileID: 1832848768} +--- !u!1 &2059452435 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 189848, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 2059452436} + m_Layer: 5 + m_Name: Fill Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2059452436 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22474460, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2059452435} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 308460199} + m_Father: {fileID: 863266352} + m_RootOrder: 1 + m_AnchorMin: {x: 0, y: .25} + m_AnchorMax: {x: 1, y: .75} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -20, y: 0} + m_Pivot: {x: .5, y: .5} --- !u!1001 &2061694409 Prefab: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Player/Player.cs b/Assets/Scripts/Player/Player.cs index f33bf84..bb29503 100644 --- a/Assets/Scripts/Player/Player.cs +++ b/Assets/Scripts/Player/Player.cs @@ -30,6 +30,7 @@ public int PlayerNumber float mRemainingSheidTime; Vector2 mReticlePosition; public ParticleSystem minigunParticleSystem; + public GameObject playerHUD; public Vector2 ReticlePosition { get @@ -50,6 +51,14 @@ void Start() void Update() { + if(Input.GetButton("Player_"+ mPlayerNumber + "_Back")) + { + playerHUD.SetActive(true); + } + else + { + playerHUD.SetActive(false); + } waitTime -= Time.deltaTime; if (mEquippedWeapon) { diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset index 8493295..640768c 100644 --- a/ProjectSettings/InputManager.asset +++ b/ProjectSettings/InputManager.asset @@ -405,3 +405,35 @@ InputManager: type: 0 axis: 0 joyNum: 2 + - serializedVersion: 3 + m_Name: Player_1_Back + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: escape + altNegativeButton: + altPositiveButton: joystick 1 button 6 + gravity: 1000 + dead: .00100000005 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 1 + - serializedVersion: 3 + m_Name: Player_2_Back + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: escape + altNegativeButton: + altPositiveButton: joystick 2 button 6 + gravity: 1000 + dead: .00100000005 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 2 From 686f85d005a22229f30390677e0a5da4dbbb8abb Mon Sep 17 00:00:00 2001 From: JSleekXD Date: Fri, 26 Feb 2016 17:41:38 +0000 Subject: [PATCH 14/39] Added in Giorgio's code from 24/02/ Added in Giorgio's code that was provided for 24th Feb, the day he could not attend due to illness. Code changes are from the text document he provided, which is located on Dropbox in CGD Group->Shellshock->Giorgio2402. From my understanding the new code makes the helicopter drop off a new ammo drop every 10 seconds, and spawns a new weapon on the ammo crate when the player collides with the ammo crate. There is however a compilation error due to the new ammo not switching to the player correctly. --- Assets/Scripts/Paracrate.cs | 36 ++++++++++++++++++++++++++------- Assets/Scripts/Player/Player.cs | 4 ++++ 2 files changed, 33 insertions(+), 7 deletions(-) diff --git a/Assets/Scripts/Paracrate.cs b/Assets/Scripts/Paracrate.cs index 76c8122..4dec66f 100644 --- a/Assets/Scripts/Paracrate.cs +++ b/Assets/Scripts/Paracrate.cs @@ -10,8 +10,12 @@ public class Paracrate : MonoBehaviour { public float flybySpeed; public bool ammoDropped; - // Use this for initialization - void Start () + public float minTime = 5.0f; + public float maxTime = 9.0f; + public bool isHeliSpawning = false; + + // Use this for initialization + void Start () { ammoDropped = false; tempDropCoordinates = new Vector2(0,-7); @@ -20,13 +24,22 @@ void Start () // Update is called once per frame void Update () { - if (Input.GetKeyDown(KeyCode.T)) - { - flyby = !flyby; + if (!isHeliSpawning) + { + isHeliSpawning = true; + flyby = !flyby; + StartCoroutine(HeliSpawner(Random.Range(minTime, maxTime))); //the helicopter will now spawn in a random range between 5 and 9 secs + transform.position = new Vector3(39f/*Random.Range(34f,55f)*/, Random.Range(-6f, 10f), 0.2f); //randomize the spawning position of the helicopte + Debug.Log("asda"); - } + } + //if (Input.GetKeyDown(KeyCode.T)) + //{ + // flyby = !flyby; + // Debug.Log("asda"); + //} - if (flyby) + if (flyby) { AmmoDrop(); } @@ -41,4 +54,13 @@ public void AmmoDrop() Instantiate(paracrateObj, transform.position, Quaternion.identity); } } + + IEnumerator HeliSpawner(float seconds) + { + + ammoDropped = false; + tempDropCoordinates = new Vector2(0, -7); //to be changed + yield return new WaitForSeconds(seconds); + isHeliSpawning = false; + } } diff --git a/Assets/Scripts/Player/Player.cs b/Assets/Scripts/Player/Player.cs index bb29503..905ff69 100644 --- a/Assets/Scripts/Player/Player.cs +++ b/Assets/Scripts/Player/Player.cs @@ -90,6 +90,10 @@ void OnCollisionEnter2D(Collision2D coll) public void ChangeWeapon(int weaponNumber) { + + Instantiate(mEquippedWeapon, new Vector3(transform.position.x, transform.position.y - 2.0f, transform.position.z), Quaternion.identity); + //create a clone of the previous weapon just under the player + //Destroy(InstantiatedWeapon, 3.0f); mEquippedWeapon = weaponList[weaponNumber]; mEquippedWeapon.transform.position = transform.position; weaponList[weaponNumber].transform.SetParent(transform); From 97ab591fad8bf2b1e3bb2471a12e5533ebe53cbb Mon Sep 17 00:00:00 2001 From: David Greedy Date: Sun, 28 Feb 2016 18:36:12 +0000 Subject: [PATCH 15/39] Altered timer format --- Assets/Scenes/Prototype.unity | 134 ++------------------------ Assets/Scripts/UI/TimerAndWin.cs | 47 ++++----- ProjectSettings/ProjectSettings.asset | 89 ++--------------- ProjectSettings/ProjectVersion.txt | 2 +- 4 files changed, 35 insertions(+), 237 deletions(-) diff --git a/Assets/Scenes/Prototype.unity b/Assets/Scenes/Prototype.unity index 3e5f416..4472a16 100644 --- a/Assets/Scenes/Prototype.unity +++ b/Assets/Scenes/Prototype.unity @@ -37,6 +37,9 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} +--- !u!127 &3 +LevelGameManager: + m_ObjectHideFlags: 0 --- !u!157 &4 LightmapSettings: m_ObjectHideFlags: 0 @@ -65,7 +68,6 @@ LightmapSettings: m_TextureCompression: 1 m_FinalGather: 0 m_FinalGatherRayCount: 1024 - m_ReflectionCompression: 2 m_LightmapSnapshot: {fileID: 0} m_RuntimeCPUUsage: 25 --- !u!196 &5 @@ -443,12 +445,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -904,12 +900,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -974,12 +964,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: .911764681, g: 0, b: 0, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 60 @@ -1417,12 +1401,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 0, b: 0, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -1561,12 +1539,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: .411764711} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -1722,12 +1694,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: .956862748, g: 1, b: .235294119, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 45 @@ -1797,12 +1763,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: .957809329, g: 1, b: .235294104, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 60 @@ -3942,12 +3902,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0, g: .709803939, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -5869,12 +5823,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: .956862748, g: 1, b: .235294119, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -5943,12 +5891,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -6740,12 +6682,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -6928,12 +6864,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0, g: .909803927, b: .23137255, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 45 @@ -7058,12 +6988,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -7331,12 +7255,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 0, b: 0, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -7911,12 +7829,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0, g: .709803939, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 45 @@ -7986,12 +7898,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0, g: .909803927, b: .23137255, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -8661,12 +8567,10 @@ Camera: m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 - m_TargetEye: 3 m_HDR: 0 m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: .0219999999 - m_StereoMirrorMode: 0 --- !u!114 &1795214387 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9027,12 +8931,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: .895334721, b: .0514705777, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 80 @@ -9133,7 +9031,6 @@ BoxCollider2D: m_Size: {x: .861835837, y: 2.24815989} --- !u!50 &1870004481 Rigidbody2D: - serializedVersion: 2 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 5019476, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} @@ -9143,11 +9040,11 @@ Rigidbody2D: m_LinearDrag: 100 m_AngularDrag: .0500000007 m_GravityScale: 0 + m_FixedAngle: 0 m_IsKinematic: 0 m_Interpolate: 0 m_SleepingMode: 1 m_CollisionDetection: 0 - m_Constraints: 4 --- !u!114 &1870004482 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9384,12 +9281,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0, g: .710344791, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 60 @@ -9678,12 +9569,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: .911764681, g: 0, b: 0, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 45 @@ -9873,7 +9758,7 @@ MonoBehaviour: m_Script: {fileID: 1997211142, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_ForceModuleActive: 0 + m_AllowActivationOnStandalone: 0 --- !u!114 &2020640165 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9890,8 +9775,7 @@ MonoBehaviour: m_SubmitButton: Submit m_CancelButton: Cancel m_InputActionsPerSecond: 10 - m_RepeatDelay: .5 - m_ForceModuleActive: 0 + m_AllowActivationOnMobileDevice: 0 --- !u!114 &2020640166 MonoBehaviour: m_ObjectHideFlags: 0 @@ -10289,12 +10173,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0, g: .911764681, b: .232657045, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 60 diff --git a/Assets/Scripts/UI/TimerAndWin.cs b/Assets/Scripts/UI/TimerAndWin.cs index f8caaf1..d791ba1 100644 --- a/Assets/Scripts/UI/TimerAndWin.cs +++ b/Assets/Scripts/UI/TimerAndWin.cs @@ -5,38 +5,31 @@ public class TimerAndWin : MonoBehaviour { public float roundLength = 60f; - public Text timerText; - public bool gamePaused; - + public Text timerText; + public bool gamePaused; - - // Use this for initialization - void Start() + // Update is called once per frame + void Update() { + if (gamePaused == false) + { + roundLength -= Time.deltaTime; + } - + string[] timeArr; + timeArr = roundLength.ToString("F2").Split('.'); - } + timerText.text = timeArr[0] + ":" + timeArr[1]; - // Update is called once per frame - void Update() - { - if (gamePaused == false) - { - roundLength -= Time.deltaTime; - } - timerText.text = roundLength.ToString("F2") ; + if (roundLength <= 0) + { + EndGame(); + } - if (roundLength <= 0) - { - EndGame(); - } - } - void EndGame() - { - //Call appropriate function (); - } -} - + void EndGame() + { + //Call appropriate function (); + } +} \ No newline at end of file diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index a93cb65..e7c503a 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,15 +3,17 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 7 + serializedVersion: 6 AndroidProfiler: 0 defaultScreenOrientation: 4 targetDevice: 2 + targetGlesGraphics: -1 + targetIOSGraphics: -1 targetResolution: 0 - useOnDemandResources: 0 accelerometerFrequency: 60 companyName: DefaultCompany productName: ShellShock + cloudProjectId: defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_ShowUnitySplashScreen: 1 @@ -24,12 +26,12 @@ PlayerSettings: m_ActiveColorSpace: 0 m_MTRendering: 1 m_MobileMTRendering: 0 + m_UseDX11: 1 m_Stereoscopic3D: 0 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 iosAppInBackgroundBehavior: 0 displayResolutionDialog: 1 - iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 allowedAutorotateToLandscapeRight: 1 @@ -62,23 +64,11 @@ PlayerSettings: xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 xboxEnableGuest: 0 - n3dsDisableStereoscopicView: 0 - n3dsEnableSharedListOpt: 1 - n3dsEnableVSync: 0 xboxOneResolution: 0 ps3SplashScreen: {fileID: 0} videoMemoryForVertexBuffers: 0 psp2PowerMode: 0 psp2AcquireBGM: 1 - wiiUTVResolution: 0 - wiiUGamePadMSAA: 1 - wiiUSupportsNunchuk: 0 - wiiUSupportsClassicController: 0 - wiiUSupportsBalanceBoard: 0 - wiiUSupportsMotionPlus: 0 - wiiUSupportsProController: 0 - wiiUAllowScreenCapture: 1 - wiiUControllerCount: 0 m_SupportedAspectRatios: 4:3: 1 5:4: 1 @@ -91,26 +81,20 @@ PlayerSettings: metroEnableIndependentInputSource: 0 metroEnableLowLatencyPresentationAPI: 0 xboxOneDisableKinectGpuReservation: 0 - virtualRealitySupported: 0 productGUID: 60205a5ec16fd7a4aa9e7e54625ef2fd AndroidBundleVersionCode: 1 AndroidMinSdkVersion: 9 AndroidPreferredInstallLocation: 1 aotOptions: apiCompatibilityLevel: 2 - stripEngineCode: 1 iPhoneStrippingLevel: 0 iPhoneScriptCallOptimization: 0 - iPhoneBuildNumber: 0 ForceInternetPermission: 0 ForceSDCardPermission: 0 CreateWallpaper: 0 APKExpansionFiles: 0 preloadShaders: 0 StripUnusedMeshComponents: 0 - VertexChannelCompressionMask: - serializedVersion: 2 - m_Bits: 238 iPhoneSdkVersion: 988 iPhoneTargetOSVersion: 22 uIPrerenderedIcon: 0 @@ -137,18 +121,8 @@ PlayerSettings: iOSLaunchScreenFillPct: 100 iOSLaunchScreenSize: 100 iOSLaunchScreenCustomXibPath: - iOSLaunchScreeniPadType: 0 - iOSLaunchScreeniPadImage: {fileID: 0} - iOSLaunchScreeniPadBackgroundColor: - serializedVersion: 2 - rgba: 0 - iOSLaunchScreeniPadFillPct: 100 - iOSLaunchScreeniPadSize: 100 - iOSLaunchScreeniPadCustomXibPath: - iOSDeviceRequirements: [] AndroidTargetDevice: 0 AndroidSplashScreenScale: 0 - androidSplashScreen: {fileID: 0} AndroidKeystoreName: AndroidKeyaliasName: AndroidTVCompatibility: 1 @@ -162,26 +136,8 @@ PlayerSettings: resolutionDialogBanner: {fileID: 0} m_BuildTargetIcons: [] m_BuildTargetBatching: [] - m_BuildTargetGraphicsAPIs: [] webPlayerTemplate: APPLICATION:Default m_TemplateCustomTags: {} - wiiUTitleID: 0005000011000000 - wiiUGroupID: 00010000 - wiiUCommonSaveSize: 4096 - wiiUAccountSaveSize: 2048 - wiiUOlvAccessKey: 0 - wiiUTinCode: 0 - wiiUJoinGameId: 0 - wiiUJoinGameModeMask: 0000000000000000 - wiiUCommonBossSize: 0 - wiiUAccountBossSize: 0 - wiiUAddOnUniqueIDs: [] - wiiUMainThreadStackSize: 3072 - wiiULoaderThreadStackSize: 1024 - wiiUSystemHeapSize: 128 - wiiUTVStartupScreen: {fileID: 0} - wiiUGamePadStartupScreen: {fileID: 0} - wiiUProfilerLibPath: actionOnDotNetUnhandledException: 1 enableInternalProfiler: 0 logObjCUncaughtExceptions: 1 @@ -232,39 +188,26 @@ PlayerSettings: ps4BackgroundImagePath: ps4StartupImagePath: ps4SaveDataImagePath: - ps4SdkOverride: ps4BGMPath: ps4ShareFilePath: - ps4ShareOverlayImagePath: - ps4PrivacyGuardImagePath: ps4NPtitleDatPath: ps4RemotePlayKeyAssignment: -1 - ps4RemotePlayKeyMappingDir: ps4EnterButtonAssignment: 1 ps4ApplicationParam1: 0 ps4ApplicationParam2: 0 ps4ApplicationParam3: 0 ps4ApplicationParam4: 0 - ps4DownloadDataSize: 0 - ps4GarlicHeapSize: 2048 ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ ps4pnSessions: 1 ps4pnPresence: 1 ps4pnFriends: 1 ps4pnGameCustomData: 1 playerPrefsSupport: 0 - ps4ReprojectionSupport: 0 - ps4attribUserManagement: 0 - ps4attribMoveSupport: 0 - ps4attrib3DSupport: 0 - ps4attribShareSupport: 0 - ps4IncludedModules: [] monoEnv: psp2Splashimage: {fileID: 0} psp2NPTrophyPackPath: psp2NPSupportGBMorGJP: 0 psp2NPAgeRating: 12 - psp2NPTitleDatPath: psp2NPCommsID: psp2NPCommunicationsID: psp2NPCommsPassphrase: @@ -279,7 +222,6 @@ PlayerSettings: psp2PatchOriginalPackage: psp2PackagePassword: F69AzBlax3CF3EDNhm3soLBPh71Yexui psp2KeystoneFile: - psp2MemoryExpansionMode: 0 psp2DRMType: 0 psp2StorageType: 0 psp2MediaCapacity: 0 @@ -395,20 +337,10 @@ PlayerSettings: blackberrySquareSplashScreen: {fileID: 0} tizenProductDescription: tizenProductURL: - tizenSigningProfileName: + tizenCertificatePath: + tizenCertificatePassword: tizenGPSPermissions: 0 tizenMicrophonePermissions: 0 - n3dsUseExtSaveData: 0 - n3dsCompressStaticMem: 1 - n3dsExtSaveDataNumber: 0x12345 - n3dsStackSize: 131072 - n3dsTargetPlatform: 2 - n3dsRegion: 7 - n3dsMediaSize: 0 - n3dsLogoStyle: 3 - n3dsTitle: GameName - n3dsProductCode: - n3dsApplicationId: 0xFF3FF stvDeviceAddress: stvProductDescription: stvProductAuthor: @@ -425,7 +357,6 @@ PlayerSettings: XboxOnePackagingOverridePath: XboxOneAppManifestOverridePath: XboxOnePackageEncryption: 0 - XboxOnePackageUpdateGranularity: 2 XboxOneDescription: XboxOneIsContentPackage: 0 XboxOneEnableGPUVariability: 0 @@ -474,8 +405,4 @@ PlayerSettings: WebGL::emscriptenArgs: WebGL::template: APPLICATION:Default additionalIl2CppArgs::additionalIl2CppArgs: - firstStreamedSceneWithResources: 0 - cloudProjectId: - projectName: - organizationId: - cloudEnabled: 0 + firstStreamedLevelWithResources: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 8a062e6..de77f25 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 5.2.1f1 +m_EditorVersion: 5.0.1f1 m_StandardAssetsVersion: 0 From d77f1e32d85bcd33f5956ff2edba36a86daf6fb6 Mon Sep 17 00:00:00 2001 From: David Greedy Date: Sun, 28 Feb 2016 18:52:00 +0000 Subject: [PATCH 16/39] Added in projectile ID so that players know who shot them. --- Assets/Scenes/Prototype.unity | 134 +++++++++++++++++++++- Assets/Scripts/Ammo/Projectile.cs | 18 ++- Assets/Scripts/Paracrate.cs | 63 +++++----- Assets/Scripts/Player/Player.cs | 7 +- Assets/Scripts/Walls/DynamicWallScript.cs | 108 +++++++++-------- Assets/Scripts/Weapons/Weapon.cs | 10 +- ProjectSettings/ProjectSettings.asset | 75 ++++++++++-- ProjectSettings/ProjectVersion.txt | 2 +- 8 files changed, 308 insertions(+), 109 deletions(-) diff --git a/Assets/Scenes/Prototype.unity b/Assets/Scenes/Prototype.unity index 4472a16..3e5f416 100644 --- a/Assets/Scenes/Prototype.unity +++ b/Assets/Scenes/Prototype.unity @@ -37,9 +37,6 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} ---- !u!127 &3 -LevelGameManager: - m_ObjectHideFlags: 0 --- !u!157 &4 LightmapSettings: m_ObjectHideFlags: 0 @@ -68,6 +65,7 @@ LightmapSettings: m_TextureCompression: 1 m_FinalGather: 0 m_FinalGatherRayCount: 1024 + m_ReflectionCompression: 2 m_LightmapSnapshot: {fileID: 0} m_RuntimeCPUUsage: 25 --- !u!196 &5 @@ -445,6 +443,12 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -900,6 +904,12 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -964,6 +974,12 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: .911764681, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 60 @@ -1401,6 +1417,12 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -1539,6 +1561,12 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: .411764711} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 @@ -1694,6 +1722,12 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: .956862748, g: 1, b: .235294119, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 45 @@ -1763,6 +1797,12 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: .957809329, g: 1, b: .235294104, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 60 @@ -3902,6 +3942,12 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0, g: .709803939, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -5823,6 +5869,12 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: .956862748, g: 1, b: .235294119, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -5891,6 +5943,12 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -6682,6 +6740,12 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -6864,6 +6928,12 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0, g: .909803927, b: .23137255, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 45 @@ -6988,6 +7058,12 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -7255,6 +7331,12 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -7829,6 +7911,12 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0, g: .709803939, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 45 @@ -7898,6 +7986,12 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0, g: .909803927, b: .23137255, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -8567,10 +8661,12 @@ Camera: m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 + m_TargetEye: 3 m_HDR: 0 m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: .0219999999 + m_StereoMirrorMode: 0 --- !u!114 &1795214387 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8931,6 +9027,12 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: .895334721, b: .0514705777, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 80 @@ -9031,6 +9133,7 @@ BoxCollider2D: m_Size: {x: .861835837, y: 2.24815989} --- !u!50 &1870004481 Rigidbody2D: + serializedVersion: 2 m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 5019476, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} @@ -9040,11 +9143,11 @@ Rigidbody2D: m_LinearDrag: 100 m_AngularDrag: .0500000007 m_GravityScale: 0 - m_FixedAngle: 0 m_IsKinematic: 0 m_Interpolate: 0 m_SleepingMode: 1 m_CollisionDetection: 0 + m_Constraints: 4 --- !u!114 &1870004482 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9281,6 +9384,12 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0, g: .710344791, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 60 @@ -9569,6 +9678,12 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: .911764681, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 45 @@ -9758,7 +9873,7 @@ MonoBehaviour: m_Script: {fileID: 1997211142, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - m_AllowActivationOnStandalone: 0 + m_ForceModuleActive: 0 --- !u!114 &2020640165 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9775,7 +9890,8 @@ MonoBehaviour: m_SubmitButton: Submit m_CancelButton: Cancel m_InputActionsPerSecond: 10 - m_AllowActivationOnMobileDevice: 0 + m_RepeatDelay: .5 + m_ForceModuleActive: 0 --- !u!114 &2020640166 MonoBehaviour: m_ObjectHideFlags: 0 @@ -10173,6 +10289,12 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 0, g: .911764681, b: .232657045, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 60 diff --git a/Assets/Scripts/Ammo/Projectile.cs b/Assets/Scripts/Ammo/Projectile.cs index 9fe705d..dd37d70 100644 --- a/Assets/Scripts/Ammo/Projectile.cs +++ b/Assets/Scripts/Ammo/Projectile.cs @@ -8,6 +8,8 @@ public class Projectile : MonoBehaviour protected Vector2 mVelocity; + private int mOwnerID; + protected float skinWidth = 0.1f; protected float minimumExtent; protected float partialExtent; @@ -29,6 +31,18 @@ public int Damage } } + public int OwnerID + { + get + { + return mOwnerID; + } + + set + { + mOwnerID = value; + } + } void Start() { @@ -36,6 +50,7 @@ void Start() partialExtent = minimumExtent * (1.0f - skinWidth); sqrMinimumExtent = minimumExtent * minimumExtent; } + void Update() { if (currentBounces > bouncesAllowed) @@ -47,9 +62,10 @@ void Update() transform.rotation = Quaternion.AngleAxis(angle, Vector3.forward); } - public virtual void Fire(Vector2 vel, int damage) + public virtual void Fire(Vector2 vel, int damage, int id) { mVelocity = vel; + mOwnerID = id; mRigidBody = gameObject.GetComponent(); mRigidBody.velocity = mVelocity; mDamage = damage; diff --git a/Assets/Scripts/Paracrate.cs b/Assets/Scripts/Paracrate.cs index 4dec66f..2f820d3 100644 --- a/Assets/Scripts/Paracrate.cs +++ b/Assets/Scripts/Paracrate.cs @@ -1,29 +1,30 @@ using UnityEngine; using System.Collections; -public class Paracrate : MonoBehaviour { +public class Paracrate : MonoBehaviour +{ - public GameObject paracrateObj; - public Vector2 tempDropCoordinates; - public float leftXBoundary, rightXBoundary, topYBoundary, bottomYBoundary; - private bool flyby = false; - public float flybySpeed; - public bool ammoDropped; + public GameObject paracrateObj; + public Vector2 tempDropCoordinates; + public float leftXBoundary, rightXBoundary, topYBoundary, bottomYBoundary; + private bool flyby = false; + public float flybySpeed; + public bool ammoDropped; public float minTime = 5.0f; public float maxTime = 9.0f; public bool isHeliSpawning = false; // Use this for initialization - void Start () - { - ammoDropped = false; - tempDropCoordinates = new Vector2(0,-7); - } - - // Update is called once per frame - void Update () - { + void Start() + { + ammoDropped = false; + tempDropCoordinates = new Vector2(0, -7); + } + + // Update is called once per frame + void Update() + { if (!isHeliSpawning) { isHeliSpawning = true; @@ -31,7 +32,7 @@ void Update () StartCoroutine(HeliSpawner(Random.Range(minTime, maxTime))); //the helicopter will now spawn in a random range between 5 and 9 secs transform.position = new Vector3(39f/*Random.Range(34f,55f)*/, Random.Range(-6f, 10f), 0.2f); //randomize the spawning position of the helicopte - Debug.Log("asda"); + //Debug.Log("asda"); } //if (Input.GetKeyDown(KeyCode.T)) //{ @@ -39,21 +40,21 @@ void Update () // Debug.Log("asda"); //} - if (flyby) - { - AmmoDrop(); - } - } + if (flyby) + { + AmmoDrop(); + } + } - public void AmmoDrop() - { - transform.Translate(-Vector2.right * flybySpeed * Time.deltaTime); - if (transform.position.x > -0.1 && transform.position.x < 0.1) - { - Debug.Log ("Drop"); - Instantiate(paracrateObj, transform.position, Quaternion.identity); - } - } + public void AmmoDrop() + { + transform.Translate(-Vector2.right * flybySpeed * Time.deltaTime); + if (transform.position.x > -0.1 && transform.position.x < 0.1) + { + //Debug.Log("Drop"); + Instantiate(paracrateObj, transform.position, Quaternion.identity); + } + } IEnumerator HeliSpawner(float seconds) { diff --git a/Assets/Scripts/Player/Player.cs b/Assets/Scripts/Player/Player.cs index 905ff69..98eddd6 100644 --- a/Assets/Scripts/Player/Player.cs +++ b/Assets/Scripts/Player/Player.cs @@ -44,14 +44,14 @@ void Start() mReticlePosition = mEquippedWeapon.transform.position; mEquippedWeapon.transform.position = transform.position; mEquippedWeapon.transform.parent = transform; - ammoSlider.maxValue = mEquippedWeapon.mAmmoRemaining; + ammoSlider.maxValue = mEquippedWeapon.mAmmoRemaining; ammoSlider.value = ammoSlider.maxValue; } void Update() { - if(Input.GetButton("Player_"+ mPlayerNumber + "_Back")) + if (Input.GetButton("Player_" + mPlayerNumber + "_Back")) { playerHUD.SetActive(true); } @@ -70,7 +70,7 @@ void Update() //emit the bullet casing particle system minigunParticleSystem.Emit(1); - if (!mEquippedWeapon.Shoot(GetComponent().CorrectedAimDirection)) + if (!mEquippedWeapon.Shoot(GetComponent().CorrectedAimDirection, mPlayerNumber)) { mEquippedWeapon = null; } @@ -84,6 +84,7 @@ void OnCollisionEnter2D(Collision2D coll) if (coll.gameObject.tag == "Projectile") { HPSlider.value -= (float)coll.gameObject.GetComponent().Damage / 100; + Debug.Log("Player_" + mPlayerNumber + " took damage from Player_" + coll.gameObject.GetComponent().OwnerID + "'s projectile"); Destroy(coll.gameObject); } } diff --git a/Assets/Scripts/Walls/DynamicWallScript.cs b/Assets/Scripts/Walls/DynamicWallScript.cs index a769192..a0fac24 100644 --- a/Assets/Scripts/Walls/DynamicWallScript.cs +++ b/Assets/Scripts/Walls/DynamicWallScript.cs @@ -1,59 +1,57 @@ using UnityEngine; using System.Collections; -public class DynamicWallScript : MonoBehaviour { - - public DynamicWallManager wallManager; - private Animator wallAnimator; - public float repeatTime = 5f; - //public Animation wallAnim; - - // Use this for initialization - void Start () - { - - wallAnimator = GetComponent (); - //wallAnim = GetComponent (); - wallAnimator.SetBool ("isDown", false); - - - } - - // Update is called once per frame - void Update () - { - repeatTime -= Time.deltaTime; - if (repeatTime <= 0.0f) - { - WallChange (); - } - } - - void WallChange() - { - Debug.Log ("Wall Change"); - if (wallAnimator.GetBool("isDown") == true) //Walls are down - { - WallsUp(); - Debug.Log ("Wall Up"); - } - - else if (wallAnimator.GetBool("isDown") == false) - { - WallsDown (); - Debug.Log ("Wall Down"); - } - - repeatTime = 5f; - } - - void WallsDown() - { - wallAnimator.SetBool ("isDown", true); //Walls go down - } - - void WallsUp() - { - wallAnimator.SetBool ("isDown", false); //Walls go up - } +public class DynamicWallScript : MonoBehaviour +{ + + public DynamicWallManager wallManager; + private Animator wallAnimator; + public float repeatTime = 5f; + //public Animation wallAnim; + + // Use this for initialization + void Start() + { + wallAnimator = GetComponent(); + //wallAnim = GetComponent (); + wallAnimator.SetBool("isDown", false); + } + + // Update is called once per frame + void Update() + { + repeatTime -= Time.deltaTime; + if (repeatTime <= 0.0f) + { + WallChange(); + } + } + + void WallChange() + { + //Debug.Log("Wall Change"); + if (wallAnimator.GetBool("isDown") == true) //Walls are down + { + WallsUp(); + //Debug.Log("Wall Up"); + } + + else if (wallAnimator.GetBool("isDown") == false) + { + WallsDown(); + //Debug.Log("Wall Down"); + } + + repeatTime = 5f; + } + + void WallsDown() + { + wallAnimator.SetBool("isDown", true); //Walls go down + } + + void WallsUp() + { + wallAnimator.SetBool("isDown", false); //Walls go up + } } diff --git a/Assets/Scripts/Weapons/Weapon.cs b/Assets/Scripts/Weapons/Weapon.cs index b418f9b..d8b42fa 100644 --- a/Assets/Scripts/Weapons/Weapon.cs +++ b/Assets/Scripts/Weapons/Weapon.cs @@ -34,7 +34,7 @@ public Vector2 ShootDirection public GameObject mProjectile; - public bool Shoot(Vector2 dir) + public bool Shoot(Vector2 dir, int id) { if (mAmmoRemaining > 0) { @@ -42,18 +42,20 @@ public bool Shoot(Vector2 dir) if (mCurrentFireTime > 1 / mFireRate) { GameObject firedProjectile = (GameObject)Instantiate(mProjectile, new Vector2(transform.position.x, transform.position.y) + dir.normalized * 1.8f, Quaternion.identity); - firedProjectile.GetComponent().Fire((dir * mMuzzleVelocity) + spr, mDamage); + firedProjectile.GetComponent().Fire((dir * mMuzzleVelocity) + spr, mDamage, id); if (!hasInfiniteAmmo) { mAmmoRemaining--; } mCurrentFireTime = 0; return true; - } else { + } + else { mCurrentFireTime += Time.deltaTime; return true; } - } else { + } + else { return false; } } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index e7c503a..05ae903 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,17 +3,14 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 6 + serializedVersion: 7 AndroidProfiler: 0 defaultScreenOrientation: 4 targetDevice: 2 - targetGlesGraphics: -1 - targetIOSGraphics: -1 targetResolution: 0 accelerometerFrequency: 60 companyName: DefaultCompany productName: ShellShock - cloudProjectId: defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_ShowUnitySplashScreen: 1 @@ -26,7 +23,6 @@ PlayerSettings: m_ActiveColorSpace: 0 m_MTRendering: 1 m_MobileMTRendering: 0 - m_UseDX11: 1 m_Stereoscopic3D: 0 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 @@ -64,11 +60,23 @@ PlayerSettings: xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 xboxEnableGuest: 0 + n3dsDisableStereoscopicView: 0 + n3dsEnableSharedListOpt: 1 + n3dsEnableVSync: 0 xboxOneResolution: 0 ps3SplashScreen: {fileID: 0} videoMemoryForVertexBuffers: 0 psp2PowerMode: 0 psp2AcquireBGM: 1 + wiiUTVResolution: 0 + wiiUGamePadMSAA: 1 + wiiUSupportsNunchuk: 0 + wiiUSupportsClassicController: 0 + wiiUSupportsBalanceBoard: 0 + wiiUSupportsMotionPlus: 0 + wiiUSupportsProController: 0 + wiiUAllowScreenCapture: 1 + wiiUControllerCount: 0 m_SupportedAspectRatios: 4:3: 1 5:4: 1 @@ -81,20 +89,26 @@ PlayerSettings: metroEnableIndependentInputSource: 0 metroEnableLowLatencyPresentationAPI: 0 xboxOneDisableKinectGpuReservation: 0 + virtualRealitySupported: 0 productGUID: 60205a5ec16fd7a4aa9e7e54625ef2fd AndroidBundleVersionCode: 1 AndroidMinSdkVersion: 9 AndroidPreferredInstallLocation: 1 aotOptions: apiCompatibilityLevel: 2 + stripEngineCode: 1 iPhoneStrippingLevel: 0 iPhoneScriptCallOptimization: 0 + iPhoneBuildNumber: 0 ForceInternetPermission: 0 ForceSDCardPermission: 0 CreateWallpaper: 0 APKExpansionFiles: 0 preloadShaders: 0 StripUnusedMeshComponents: 0 + VertexChannelCompressionMask: + serializedVersion: 2 + m_Bits: 238 iPhoneSdkVersion: 988 iPhoneTargetOSVersion: 22 uIPrerenderedIcon: 0 @@ -123,6 +137,7 @@ PlayerSettings: iOSLaunchScreenCustomXibPath: AndroidTargetDevice: 0 AndroidSplashScreenScale: 0 + androidSplashScreen: {fileID: 0} AndroidKeystoreName: AndroidKeyaliasName: AndroidTVCompatibility: 1 @@ -136,8 +151,26 @@ PlayerSettings: resolutionDialogBanner: {fileID: 0} m_BuildTargetIcons: [] m_BuildTargetBatching: [] + m_BuildTargetGraphicsAPIs: [] webPlayerTemplate: APPLICATION:Default m_TemplateCustomTags: {} + wiiUTitleID: 0005000011000000 + wiiUGroupID: 00010000 + wiiUCommonSaveSize: 4096 + wiiUAccountSaveSize: 2048 + wiiUOlvAccessKey: 0 + wiiUTinCode: 0 + wiiUJoinGameId: 0 + wiiUJoinGameModeMask: 0000000000000000 + wiiUCommonBossSize: 0 + wiiUAccountBossSize: 0 + wiiUAddOnUniqueIDs: [] + wiiUMainThreadStackSize: 3072 + wiiULoaderThreadStackSize: 1024 + wiiUSystemHeapSize: 128 + wiiUTVStartupScreen: {fileID: 0} + wiiUGamePadStartupScreen: {fileID: 0} + wiiUProfilerLibPath: actionOnDotNetUnhandledException: 1 enableInternalProfiler: 0 logObjCUncaughtExceptions: 1 @@ -188,26 +221,36 @@ PlayerSettings: ps4BackgroundImagePath: ps4StartupImagePath: ps4SaveDataImagePath: + ps4SdkOverride: ps4BGMPath: ps4ShareFilePath: ps4NPtitleDatPath: ps4RemotePlayKeyAssignment: -1 + ps4RemotePlayKeyMappingDir: ps4EnterButtonAssignment: 1 ps4ApplicationParam1: 0 ps4ApplicationParam2: 0 ps4ApplicationParam3: 0 ps4ApplicationParam4: 0 + ps4DownloadDataSize: 0 + ps4GarlicHeapSize: 2048 ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ ps4pnSessions: 1 ps4pnPresence: 1 ps4pnFriends: 1 ps4pnGameCustomData: 1 playerPrefsSupport: 0 + ps4ReprojectionSupport: 0 + ps4attribUserManagement: 0 + ps4attribMoveSupport: 0 + ps4attrib3DSupport: 0 + ps4attribShareSupport: 0 monoEnv: psp2Splashimage: {fileID: 0} psp2NPTrophyPackPath: psp2NPSupportGBMorGJP: 0 psp2NPAgeRating: 12 + psp2NPTitleDatPath: psp2NPCommsID: psp2NPCommunicationsID: psp2NPCommsPassphrase: @@ -222,6 +265,7 @@ PlayerSettings: psp2PatchOriginalPackage: psp2PackagePassword: F69AzBlax3CF3EDNhm3soLBPh71Yexui psp2KeystoneFile: + psp2MemoryExpansionMode: 0 psp2DRMType: 0 psp2StorageType: 0 psp2MediaCapacity: 0 @@ -337,10 +381,20 @@ PlayerSettings: blackberrySquareSplashScreen: {fileID: 0} tizenProductDescription: tizenProductURL: - tizenCertificatePath: - tizenCertificatePassword: + tizenSigningProfileName: tizenGPSPermissions: 0 tizenMicrophonePermissions: 0 + n3dsUseExtSaveData: 0 + n3dsCompressStaticMem: 1 + n3dsExtSaveDataNumber: 0x12345 + n3dsStackSize: 131072 + n3dsTargetPlatform: 2 + n3dsRegion: 7 + n3dsMediaSize: 0 + n3dsLogoStyle: 3 + n3dsTitle: GameName + n3dsProductCode: + n3dsApplicationId: 0xFF3FF stvDeviceAddress: stvProductDescription: stvProductAuthor: @@ -357,6 +411,7 @@ PlayerSettings: XboxOnePackagingOverridePath: XboxOneAppManifestOverridePath: XboxOnePackageEncryption: 0 + XboxOnePackageUpdateGranularity: 2 XboxOneDescription: XboxOneIsContentPackage: 0 XboxOneEnableGPUVariability: 0 @@ -405,4 +460,8 @@ PlayerSettings: WebGL::emscriptenArgs: WebGL::template: APPLICATION:Default additionalIl2CppArgs::additionalIl2CppArgs: - firstStreamedLevelWithResources: 0 + firstStreamedSceneWithResources: 0 + cloudProjectId: + projectName: + organizationId: + cloudEnabled: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index de77f25..e040c5c 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 5.0.1f1 +m_EditorVersion: 5.2.0f3 m_StandardAssetsVersion: 0 From 3ae6d9c8ec69ac8aececb756b36c3dfcc8d715e0 Mon Sep 17 00:00:00 2001 From: David Greedy Date: Sun, 28 Feb 2016 19:47:27 +0000 Subject: [PATCH 17/39] Fixed UI sliders. Added in a better slider image. Health now affects the sliders colour. < 50 is yellow, < 25 is red. --- Assets/Scenes/Prototype.unity | 210 +++++++++++++++++++- Assets/Scripts/DisplayAmmoCount.cs | 8 +- Assets/Scripts/Player/Player.cs | 26 ++- Assets/Scripts/UI/TimerAndWin.cs | 21 +- Assets/Scripts/Weapons/AssaultRifle.cs | 28 +-- Assets/Scripts/Weapons/MiniGun.cs | 31 +-- Assets/Scripts/Weapons/Pistol.cs | 28 +-- Assets/Scripts/Weapons/RocketLauncher.cs | 31 +-- Assets/Scripts/Weapons/Sniper.cs | 31 +-- Assets/Scripts/Weapons/Weapon.cs | 27 ++- Assets/Sprites/HealthBarBackground.png | Bin 0 -> 247 bytes Assets/Sprites/HealthBarBackground.png.meta | 56 ++++++ Assets/Sprites/HealthBarForeground.png | Bin 0 -> 245 bytes Assets/Sprites/HealthBarForeground.png.meta | 56 ++++++ 14 files changed, 452 insertions(+), 101 deletions(-) create mode 100644 Assets/Sprites/HealthBarBackground.png create mode 100644 Assets/Sprites/HealthBarBackground.png.meta create mode 100644 Assets/Sprites/HealthBarForeground.png create mode 100644 Assets/Sprites/HealthBarForeground.png.meta diff --git a/Assets/Scenes/Prototype.unity b/Assets/Scenes/Prototype.unity index 3e5f416..15e6efb 100644 --- a/Assets/Scenes/Prototype.unity +++ b/Assets/Scenes/Prototype.unity @@ -3994,9 +3994,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c1353a536c9d8c746b42a5ac419d21c2, type: 3} m_Name: m_EditorClassIdentifier: - roundLength: 60 + roundLength: 12 timerText: {fileID: 1833327629} - gamePaused: 0 + isGamePaused: 0 --- !u!4 &713839869 Transform: m_ObjectHideFlags: 0 @@ -4004,8 +4004,8 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 713839867} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 220.453979, y: 123.72718, z: 252.967438} - m_LocalScale: {x: 36.0547905, y: 36.0547905, z: 36.0547905} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 653857878} m_RootOrder: 0 @@ -7183,7 +7183,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_SortingOrder - value: -28 + value: 0 objectReference: {fileID: 0} - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_Sprite @@ -8804,19 +8804,19 @@ Prefab: objectReference: {fileID: 1998640093} - target: {fileID: 22431700, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 22431700, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 22426558, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 22426558, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 133054, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_Name @@ -8839,6 +8839,194 @@ Prefab: propertyPath: playerHUD value: objectReference: {fileID: 1134726024} + - target: {fileID: 11446066, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 05718618eaecab942a4da378f741875e, + type: 3} + - target: {fileID: 11446066, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11446066, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11446066, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11473472, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 455c3660ef4b63041a191d714693b47f, + type: 3} + - target: {fileID: 11446066, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_Type + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 11446066, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_FillMethod + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11446066, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_PreserveAspect + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11473472, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_RaycastTarget + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11473472, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_Type + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 11473472, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_FillOrigin + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11473472, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_FillMethod + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11473472, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_Color.r + value: .117241383 + objectReference: {fileID: 0} + - target: {fileID: 11473472, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11473472, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_Color.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11446066, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_RaycastTarget + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11473472, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_PreserveAspect + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11404772, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11404772, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11404772, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11404772, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_RaycastTarget + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11404772, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 05718618eaecab942a4da378f741875e, + type: 3} + - target: {fileID: 11404772, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_Type + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 11404772, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_PreserveAspect + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11404772, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_FillMethod + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11468980, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_Color.r + value: .713235259 + objectReference: {fileID: 0} + - target: {fileID: 11468980, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_Color.g + value: .545993865 + objectReference: {fileID: 0} + - target: {fileID: 11468980, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_RaycastTarget + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11468980, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 455c3660ef4b63041a191d714693b47f, + type: 3} + - target: {fileID: 11468980, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_Type + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 11468980, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_PreserveAspect + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11468980, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_FillMethod + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22428368, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_AnchoredPosition.y + value: -450 + objectReference: {fileID: 0} + - target: {fileID: 22441718, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_AnchoredPosition.y + value: -527 + objectReference: {fileID: 0} + - target: {fileID: 22441718, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22441718, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22441718, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_AnchoredPosition.x + value: -877 + objectReference: {fileID: 0} + - target: {fileID: 22441718, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22441718, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22441718, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22441718, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 22428368, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_AnchoredPosition.x + value: -758 + objectReference: {fileID: 0} + - target: {fileID: 11405038, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_FontData.m_FontSize + value: 32 + objectReference: {fileID: 0} + - target: {fileID: 11405038, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_FontData.m_RichText + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11434670, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_Interactable + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11468980, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_Color.b + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} m_IsPrefabParent: 0 @@ -9040,7 +9228,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 10 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_RichText: 1 m_HorizontalOverflow: 1 m_VerticalOverflow: 1 @@ -9984,7 +10172,7 @@ RectTransform: m_RootOrder: 0 m_AnchorMin: {x: .5, y: .5} m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: -1, y: 29} + m_AnchoredPosition: {x: -1, y: 28.9994812} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: .5, y: .5} --- !u!222 &2025581862 diff --git a/Assets/Scripts/DisplayAmmoCount.cs b/Assets/Scripts/DisplayAmmoCount.cs index 4022075..842af41 100644 --- a/Assets/Scripts/DisplayAmmoCount.cs +++ b/Assets/Scripts/DisplayAmmoCount.cs @@ -11,9 +11,11 @@ public class DisplayAmmoCount : MonoBehaviour public Player player; void Update() - { - ammoCount.text = player.mEquippedWeapon.mAmmoRemaining.ToString (); + { + if (player.mEquippedWeapon) + { + ammoCount.text = player.mEquippedWeapon.RemainingAmmo.ToString(); + } } - } diff --git a/Assets/Scripts/Player/Player.cs b/Assets/Scripts/Player/Player.cs index 98eddd6..b125d41 100644 --- a/Assets/Scripts/Player/Player.cs +++ b/Assets/Scripts/Player/Player.cs @@ -44,9 +44,11 @@ void Start() mReticlePosition = mEquippedWeapon.transform.position; mEquippedWeapon.transform.position = transform.position; mEquippedWeapon.transform.parent = transform; - ammoSlider.maxValue = mEquippedWeapon.mAmmoRemaining; - ammoSlider.value = ammoSlider.maxValue; + ammoSlider.maxValue = 1; + ammoSlider.value = 1; + mMaxHealth = 100; + mHealth = mMaxHealth; } void Update() @@ -66,7 +68,10 @@ void Update() { //if the fire button is pressed, fire the gun. if (Input.GetButton("Player_" + mPlayerNumber + "_Fire1")) { - ammoSlider.value--; + if (mEquippedWeapon.RemainingAmmo >= 0) + { + ammoSlider.value = (float)mEquippedWeapon.RemainingAmmo / (float)mEquippedWeapon.MaximumAmmo; + } //emit the bullet casing particle system minigunParticleSystem.Emit(1); @@ -83,7 +88,20 @@ void OnCollisionEnter2D(Collision2D coll) { if (coll.gameObject.tag == "Projectile") { - HPSlider.value -= (float)coll.gameObject.GetComponent().Damage / 100; + mHealth -= coll.gameObject.GetComponent().Damage; + HPSlider.value = (float)mHealth / (float)mMaxHealth; + if (mHealth <= mMaxHealth / 2) + { + if (mHealth <= mMaxHealth / 4) + { + HPSlider.transform.GetChild(1).transform.GetChild(0).GetComponent().color = Color.red;//TODO:Make this not super hacky (possibly with a script on the slider that holds references) + } + else + { + HPSlider.transform.GetChild(1).transform.GetChild(0).GetComponent().color = Color.yellow;//TODO:Make this not super hacky (possibly with a script on the slider that holds references) + } + } + Debug.Log("Player_" + mPlayerNumber + " took damage from Player_" + coll.gameObject.GetComponent().OwnerID + "'s projectile"); Destroy(coll.gameObject); } diff --git a/Assets/Scripts/UI/TimerAndWin.cs b/Assets/Scripts/UI/TimerAndWin.cs index d791ba1..d99f3a3 100644 --- a/Assets/Scripts/UI/TimerAndWin.cs +++ b/Assets/Scripts/UI/TimerAndWin.cs @@ -5,31 +5,34 @@ public class TimerAndWin : MonoBehaviour { public float roundLength = 60f; + bool isGameRunning = true; + public Text timerText; - public bool gamePaused; + public bool isGamePaused; // Update is called once per frame void Update() { - if (gamePaused == false) + if (!isGamePaused && isGameRunning) { roundLength -= Time.deltaTime; - } - string[] timeArr; - timeArr = roundLength.ToString("F2").Split('.'); + string[] timeArr; + timeArr = roundLength.ToString("F2").Split('.'); - timerText.text = timeArr[0] + ":" + timeArr[1]; + timerText.text = int.Parse(timeArr[0]) < 10 ? 0 + timeArr[0] + ":" + timeArr[1] : timeArr[0] + ":" + timeArr[1]; + } - if (roundLength <= 0) + if (roundLength <= 0 && isGameRunning) { EndGame(); } - } void EndGame() { - //Call appropriate function (); + isGameRunning = false; + timerText.text = "00:00"; + Application.Quit(); } } \ No newline at end of file diff --git a/Assets/Scripts/Weapons/AssaultRifle.cs b/Assets/Scripts/Weapons/AssaultRifle.cs index 03b6edf..9a3a2cb 100644 --- a/Assets/Scripts/Weapons/AssaultRifle.cs +++ b/Assets/Scripts/Weapons/AssaultRifle.cs @@ -3,18 +3,18 @@ public class AssaultRifle : Weapon { - void Start () - { - mDamage = 10; - mCurrentReloadTime = 0f; - mReloadTime = 10f; - mSpread = 5f; // Spread - mSpreadAngle = Mathf.PI / 18; // Angle in radians (360 degrees = 2PI Radians) - mFireRate = 60f; // Max fire rate is 60 as the game runs at 60 fps - mChargeTime = 0f; - mMuzzleVelocity = 40f; - mCurrentFireTime = 0f; - mAmmoRemaining = 30; - mAmmoMax = 100; - } + void Start() + { + mDamage = 10; + mCurrentReloadTime = 0f; + mReloadTime = 10f; + mSpread = 5f; // Spread + mSpreadAngle = Mathf.PI / 18; // Angle in radians (360 degrees = 2PI Radians) + mFireRate = 60f; // Max fire rate is 60 as the game runs at 60 fps + mChargeTime = 0f; + mMuzzleVelocity = 40f; + mCurrentFireTime = 0f; + mAmmoRemaining = 30; + mAmmoMax = 100; + } } \ No newline at end of file diff --git a/Assets/Scripts/Weapons/MiniGun.cs b/Assets/Scripts/Weapons/MiniGun.cs index 367edff..fc0f535 100644 --- a/Assets/Scripts/Weapons/MiniGun.cs +++ b/Assets/Scripts/Weapons/MiniGun.cs @@ -1,20 +1,21 @@ using UnityEngine; using System.Collections; -public class MiniGun : Weapon { +public class MiniGun : Weapon +{ - void Start () - { - mDamage = 10; - mCurrentReloadTime = 0f; - mReloadTime = 10f; - mSpread = 30f; // Spread - mSpreadAngle = Mathf.PI / 18; // Angle in radians (360 degrees = 2PI Radians) - mFireRate = 100f; // Max fire rate is 60 as the game runs at 60 fps - mChargeTime = 0f; - mMuzzleVelocity = 60f; - mCurrentFireTime = 0f; - mAmmoRemaining = 200; - mAmmoMax = 200; - } + void Start() + { + mDamage = 10; + mCurrentReloadTime = 0f; + mReloadTime = 10f; + mSpread = 30f; // Spread + mSpreadAngle = Mathf.PI / 18; // Angle in radians (360 degrees = 2PI Radians) + mFireRate = 100f; // Max fire rate is 60 as the game runs at 60 fps + mChargeTime = 0f; + mMuzzleVelocity = 60f; + mCurrentFireTime = 0f; + mAmmoRemaining = 200; + mAmmoMax = 200; + } } diff --git a/Assets/Scripts/Weapons/Pistol.cs b/Assets/Scripts/Weapons/Pistol.cs index c1f0cee..a3e561d 100644 --- a/Assets/Scripts/Weapons/Pistol.cs +++ b/Assets/Scripts/Weapons/Pistol.cs @@ -3,18 +3,18 @@ public class Pistol : Weapon { - void Start () - { - mDamage = 50; - mCurrentReloadTime = 0f; - mReloadTime = 10f; - mSpread = 2f; // Spread - mSpreadAngle = Mathf.PI / 18; // Angle in radians (360 degrees = 2PI Radians) - mFireRate = 10f; // Max fire rate is 60 as the game runs at 60 fps - mChargeTime = 0f; - mMuzzleVelocity = 40f; - mCurrentFireTime = 0f; - mAmmoRemaining = 10; - mAmmoMax = 10; - } + void Start() + { + mDamage = 50; + mCurrentReloadTime = 0f; + mReloadTime = 10f; + mSpread = 2f; // Spread + mSpreadAngle = Mathf.PI / 18; // Angle in radians (360 degrees = 2PI Radians) + mFireRate = 10f; // Max fire rate is 60 as the game runs at 60 fps + mChargeTime = 0f; + mMuzzleVelocity = 40f; + mCurrentFireTime = 0f; + mAmmoRemaining = 10; + mAmmoMax = 10; + } } \ No newline at end of file diff --git a/Assets/Scripts/Weapons/RocketLauncher.cs b/Assets/Scripts/Weapons/RocketLauncher.cs index 8a7e157..443f468 100644 --- a/Assets/Scripts/Weapons/RocketLauncher.cs +++ b/Assets/Scripts/Weapons/RocketLauncher.cs @@ -1,20 +1,21 @@ using UnityEngine; using System.Collections; -public class RocketLauncher : Weapon { +public class RocketLauncher : Weapon +{ - void Start () - { - mDamage = 90; - mCurrentReloadTime = 0f; - mReloadTime = 10f; - mSpread = 0f; // Spread - mSpreadAngle = Mathf.PI / 18; // Angle in radians (360 degrees = 2PI Radians) - mFireRate = 1f; // Max fire rate is 60 as the game runs at 60 fps - mChargeTime = 0f; - mMuzzleVelocity = 20f; - mCurrentFireTime = 0f; - mAmmoRemaining = 1; - mAmmoMax = 1; - } + void Start() + { + mDamage = 90; + mCurrentReloadTime = 0f; + mReloadTime = 10f; + mSpread = 0f; // Spread + mSpreadAngle = Mathf.PI / 18; // Angle in radians (360 degrees = 2PI Radians) + mFireRate = 1f; // Max fire rate is 60 as the game runs at 60 fps + mChargeTime = 0f; + mMuzzleVelocity = 20f; + mCurrentFireTime = 0f; + mAmmoRemaining = 1; + mAmmoMax = 1; + } } diff --git a/Assets/Scripts/Weapons/Sniper.cs b/Assets/Scripts/Weapons/Sniper.cs index 144a522..1cd0161 100644 --- a/Assets/Scripts/Weapons/Sniper.cs +++ b/Assets/Scripts/Weapons/Sniper.cs @@ -1,20 +1,21 @@ using UnityEngine; using System.Collections; -public class Sniper : Weapon { +public class Sniper : Weapon +{ - void Start () - { - mDamage = 50; - mCurrentReloadTime = 0f; - mReloadTime = 10f; - mSpread = 0f; // Spread - mSpreadAngle = Mathf.PI / 18; // Angle in radians (360 degrees = 2PI Radians) - mFireRate = 2f; // Max fire rate is 60 as the game runs at 60 fps - mChargeTime = 0f; - mMuzzleVelocity = 75f; - mCurrentFireTime = 0f; - mAmmoRemaining = 3; - mAmmoMax = 3; - } + void Start() + { + mDamage = 50; + mCurrentReloadTime = 0f; + mReloadTime = 10f; + mSpread = 0f; // Spread + mSpreadAngle = Mathf.PI / 18; // Angle in radians (360 degrees = 2PI Radians) + mFireRate = 2f; // Max fire rate is 60 as the game runs at 60 fps + mChargeTime = 0f; + mMuzzleVelocity = 75f; + mCurrentFireTime = 0f; + mAmmoRemaining = 3; + mAmmoMax = 3; + } } diff --git a/Assets/Scripts/Weapons/Weapon.cs b/Assets/Scripts/Weapons/Weapon.cs index d8b42fa..af91d39 100644 --- a/Assets/Scripts/Weapons/Weapon.cs +++ b/Assets/Scripts/Weapons/Weapon.cs @@ -13,7 +13,7 @@ public abstract class Weapon : MonoBehaviour protected float mChargeTime = 0f; //if protected float mMuzzleVelocity = 40f; protected float mCurrentFireTime = 0f; - public int mAmmoRemaining = 100; + protected int mAmmoRemaining = 100; protected int mAmmoMax = 100; public bool hasInfiniteAmmo; @@ -32,6 +32,31 @@ public Vector2 ShootDirection } } + public int RemainingAmmo + { + get + { + return mAmmoRemaining; + } + + set + { + mAmmoRemaining = value; + } + } + public int MaximumAmmo + { + get + { + return mAmmoMax; + } + + set + { + mAmmoMax = value; + } + } + public GameObject mProjectile; public bool Shoot(Vector2 dir, int id) diff --git a/Assets/Sprites/HealthBarBackground.png b/Assets/Sprites/HealthBarBackground.png new file mode 100644 index 0000000000000000000000000000000000000000..c954a9549b95167f6dc9bdb820c3f037b48eb3d4 GIT binary patch literal 247 zcmeAS@N?(olHy`uVBq!ia0vp^DL^d3!3HF&56qYfq*&4&eH|GXHuiJ>Nn{1`6_P!I zd>I(3)EF2VS{N990fib~Fff!FFfhDIU|_JC!N4G1FlSew4N!tD$=lrpNCUx7=iT){ zinG8YvY3H^?+6GpPSxg<1`0-dx;TbJ9DaLqBkutRp2H5BCko_l-hTSp=Yvj#Fh|15 zZGV+|%stbdedANTdDmvU`-}4m25gOn96gQ+JWR;~63quBSdL)|EsNWs!+yJrRhQ%J Ri5id_JYD@<);T3K0RRt4M)?2$ literal 0 HcmV?d00001 diff --git a/Assets/Sprites/HealthBarBackground.png.meta b/Assets/Sprites/HealthBarBackground.png.meta new file mode 100644 index 0000000..8a70153 --- /dev/null +++ b/Assets/Sprites/HealthBarBackground.png.meta @@ -0,0 +1,56 @@ +fileFormatVersion: 2 +guid: 05718618eaecab942a4da378f741875e +timeCreated: 1456686683 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -2 + maxTextureSize: 128 + textureSettings: + filterMode: 0 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 1, y: 1, z: 1, w: 1} + spritePixelsToUnits: 32 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/HealthBarForeground.png b/Assets/Sprites/HealthBarForeground.png new file mode 100644 index 0000000000000000000000000000000000000000..3acb852617a720a61c967907601cb6a6a4edb050 GIT binary patch literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^DL^d3!3HF&56qYfq*&4&eH|GXHuiJ>Nn{1`6_P!I zd>I(3)EF2VS{N990fib~Fff!FFfhDIU|_JC!N4G1FlSew4N!tD$=lrpNCUx7=iT){ zinG8YvY3H^?+6GpPSxg<1`0-cx;TbJ9DaLqBQJv?&tZp?KmNLx1^s79JUH8d!F%i5 zPJ?|aH}77zo|2MgwBG&2c?AQuMnjGs#{?dxWC4lh0}?F9Fol-I?a&dIKg6ng_++sT O$OWFRelF{r5}E)vibXI0 literal 0 HcmV?d00001 diff --git a/Assets/Sprites/HealthBarForeground.png.meta b/Assets/Sprites/HealthBarForeground.png.meta new file mode 100644 index 0000000..8cf5d3a --- /dev/null +++ b/Assets/Sprites/HealthBarForeground.png.meta @@ -0,0 +1,56 @@ +fileFormatVersion: 2 +guid: 455c3660ef4b63041a191d714693b47f +timeCreated: 1456686732 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -2 + maxTextureSize: 128 + textureSettings: + filterMode: 0 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 1, y: 1, z: 1, w: 1} + spritePixelsToUnits: 32 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: From a8a1ba9e3fcd10a8abad4c03476d82d43e011275 Mon Sep 17 00:00:00 2001 From: SilentSupernova Date: Sun, 28 Feb 2016 20:00:09 +0000 Subject: [PATCH 18/39] Put in the multi directional half blocks (Need to sort out colliders for prefab). UI button is no longer back is now L3 Signed-off-by: SilentSupernova --- Assets/Prefabs/Level Blocks/BottomHalf.prefab | 81 ++++++++++++++++++ Assets/Scenes/Prototype.unity | 8 +- Assets/Sprites/BottomHalf.png | Bin 0 -> 18219 bytes Assets/Sprites/LeftHalf.png | Bin 0 -> 18059 bytes Assets/Sprites/RightHalf.png | Bin 0 -> 18061 bytes Assets/Sprites/TopHalf.png | Bin 0 -> 18240 bytes ProjectSettings/InputManager.asset | 4 +- ProjectSettings/ProjectSettings.asset | 14 +++ ProjectSettings/ProjectVersion.txt | 2 +- 9 files changed, 102 insertions(+), 7 deletions(-) create mode 100644 Assets/Prefabs/Level Blocks/BottomHalf.prefab create mode 100644 Assets/Sprites/BottomHalf.png create mode 100644 Assets/Sprites/LeftHalf.png create mode 100644 Assets/Sprites/RightHalf.png create mode 100644 Assets/Sprites/TopHalf.png diff --git a/Assets/Prefabs/Level Blocks/BottomHalf.prefab b/Assets/Prefabs/Level Blocks/BottomHalf.prefab new file mode 100644 index 0000000..9b7a31d --- /dev/null +++ b/Assets/Prefabs/Level Blocks/BottomHalf.prefab @@ -0,0 +1,81 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &166938 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 4: {fileID: 475468} + - 212: {fileID: 21247336} + - 61: {fileID: 6164900} + m_Layer: 0 + m_Name: BottomHalf + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &475468 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 166938} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: .153086752, y: -4.38849735, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 +--- !u!61 &6164900 +BoxCollider2D: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 166938} + m_Enabled: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Size: {x: 4, y: 2} +--- !u!212 &21247336 +SpriteRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 166938} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 0 + m_ReflectionProbeUsage: 0 + m_ProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_ImportantGI: 0 + m_AutoUVMaxDistance: .5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: f1a98541567a5f747b6e43c9b3bccc54, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 166938} + m_IsPrefabParent: 1 diff --git a/Assets/Scenes/Prototype.unity b/Assets/Scenes/Prototype.unity index 15e6efb..231b12f 100644 --- a/Assets/Scenes/Prototype.unity +++ b/Assets/Scenes/Prototype.unity @@ -8804,19 +8804,19 @@ Prefab: objectReference: {fileID: 1998640093} - target: {fileID: 22431700, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 22431700, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 22426558, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 22426558, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 133054, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_Name diff --git a/Assets/Sprites/BottomHalf.png b/Assets/Sprites/BottomHalf.png new file mode 100644 index 0000000000000000000000000000000000000000..c5065d3cbf7fa4a7c0777e05aeb5e2ed3edb7240 GIT binary patch literal 18219 zcmeI4c{r5o`@mljvbRx5XDmrFD~6fISjHL>Mn?NA?~DmE!%SH!QCV6}lCnlxZKXvi zp^&H)X)nqtBz5SV)ZtY4y@SGA&G-DS-}(OWyRMn*8Z-BEKlgpV&*!=Cd!Cu=dTn2_ z*hy7smJ$E}sxHp6^bg!&ZeH`Q7U ziL^kkLg6wX6LwEo5vXv_sKCsQ8&rQ|m$pJCYMV@jDACeYF=`rM6S3RwIAG%_6P1~2 z=nZ7c0c+}*j8L8-O*}_4UJmZE3(X$M?RZKNl2g zbQnXV($11f3~+06*=N;l&I8$jg@>!PLVh)^MOP1M?h|FEdl>N(fo(4@+@v;{H-k0(#?;9z~ zM)_}j(GWWL&br?zdoB>gcG(*Y0ITc`P}G}6*0qWNV4odreA-s~L*)#U3i;WU6PqiQ zzpTM;vool!veU3rVnxjkSu_8{7CWQZ+oyGm*P!p)=$KV_`o|^-)KFDE7uBo;>YwO} zS(Qd*(UatCuPaWa>pqQ_VeFvk?^e`Gi|Ny?be5a4(*SWJewwGAYofU`)@uh9;p43H z-YR4QA#R1^rNo8T0o;}^v1Lx!ebHw_3849M=ff!WHRl75mCXp8fI@K9q;nI^gB)RGR&N3=_lQI$_hBE zK-g!3Sa3b2Ewk-vn`xVNo9_GNN|_9s;G=!sFO9rzu3a>xu+4>ww_j;Cl zh&tIkVVT{@L&aXFJmYewnypJG+}^6`;(F}l;r;h!`D^+2a!G zbvnIHc`f@PR7Ev*`qtWbj?v7F845EvGec*bN_9Iv^WM&xwN#7+_HAlMntB@Fhh|)C zym5NsO{M*d_8ackHbztP@{i{~&sX;8@u{OGfM?*>3(v7Pk!c-x8B;` zoVoJFW8b4iPA(i%flsyn6Prtrc2RgZmDM7EkIh%1P;o-0^(cyZJBYYacgr zE5U**0`iknl4%9b1)c>?Z_Dw8T{)S@%N6&>kpQMAXZTi!bvhu18|u=#F9qRkq3^yI;!vD)~skXXbq|fsySjP zZ>VeN>i)*PJKf8@;nJ4EyEInD8GdZVZanj;~tcRSdr~fRzQJi;S z=IQpw@=b-sLB*Ts9EKL>!nMMy-AUz1n=WnowckoXHSUR8fzC3WNa4AVX~d<(=jrta zx~(@|`;gp;=Fl268XlXr7Ei64U(L<*&ba5q(c+W{xAw&E-0r%i4wXViWoXwtyI$V5 zNc1sy<%@{BA2TzGGOD_An@)A(ySd$Q%?EFp9h{%#XDYmN^*ZG@&-O-Z<%9b%0WBvY zJt!X0obw&}XeK(*_vE9~7mkJI_tM{Kk^drx9Bd`Gk}RI%p8Ku7Wl?eA`h_}=tNg6h zF)ftM`h%>&h`~l6Cu*(?M|OL(ZS?X9pZg*<>R#DxO>6@HI{T!{c2{iSvm~7(~zu0o$AGR9CxthD?zMmR8cehe_ zl};5$58a4wjDJj7VLWH?duLv!C*js!o*3}oOLwi+zVlCk; zDLA}Isdf6q1+h!zPmnI|C^imy;8D=!n^G8AZW!Sn5WTAM=9bFyG68RueU#c`Hoa|r z)V0!shW2YYPyZB~sZE}~eMjN6Casj|n;#oBhqY_R@o!#9YuoF{R|l71G5rFy}`7?S|NP@1%0*RM6z=`9UWcQDUTc^BKHV|HJN@%=#_~%Zx5$kT-#m}_;?(qu z`T;YNU-+UP>J9GG&Mo(nIPV*FW$w@16p8w~c}>&d;td_l`j)lo{CAf$L@(|-4DRe$ zShlc!#run*_h*~hr}|#>O+Q6k9rQ-@hBT0L&!e{VKxukm$%=rI?uhd98`!;_+F2I$ z&pwog|EW3n@Ie;A>REYD1i$xM@5dI+XOSWE`s?dTpM=iqK3V2bw)%rjm+ceEv$zM= z%LketziZySwjwmUr?J_oS3YKI!$9K41a->9gtUaZSk>6KS(ao1;iYv*f9IDRN&~CG zFiUIT@IYOmmL@u~@4?$g^^K{Ghf?0BBwY#Gc&z_T#oL*unrf|t z%FyOeop(oC)IHiZA~qWh`u~0AqxYSh&q*_rk_P2uQ+vKJO_5CiK>UMCrHN?nZbT+O z2t{Y{86YYwNB|u~0f1y3CZIC|KoNoga=1Jzy?3Qo^blN@m7cG;JH}l=0sXno5h0*= z#9}HlB7jL?=~Dh_{B53YQ z5EOn0h%iUtkxVQWi?AS|u;!MgICB#O4udsEV+d$028qEEu^1u_gBW?}k(Ho#q!1RH z=wOouiqqo?CzWTr>kHwzgY^_ zg#-=(W--xVAQ%M26hd~`AFe^fWsh#oxFv`+KMe;K(at{3=)e4&5@R-OiLuglFl&4nVDf(X85mx#yI;fkVgm? zYDDzFF>}OgVL`z#47Pn6!eDYpB(DgTdoRzbXQ`LoGu<4-tamO0?4ZT8iI#%(oUIwi&8uBAqF2He{wa zUqKcLJ#KXLvc6f4m~p?~&VPnr*#8*wpT`LG2YElq_hBzX6Mk+l%c$TwBfBB zUr%3a^!xfFjrNnT^=}LHGjW*;$0x&3ncC4g<447pJ(4;1A z8(zrxh$QqsyWTO&qVNOxA?|z@NH!g7Jvuy!b&M7CYv7XM9|OrkFDE;MivtCZCE)Q$ z911(u&6s&({IHlrHa{eYE+TV-=o}C&;BiRk(ZMk@#UIf`sC7cMOdo1lkoWJ#;PYwX z78tm0Xubsw13jRF9P}759jk_$`bjn&tA?A7TKe#~A~J3y8fj1QHo14ADC8(3kF28D8(h24@@h?1p^{kl;V=i z2d0(cf&q~%N^wc%1Jg=z!GK5>rMM*XfoY|T8Yw zAhXQH-j*8n^!NLRCRf=^b7(Y4GStia^^(!tEsOTdXP!}!k5=lPePMmafJJg{M{vfw zcW>AKa&7ZPlcT?WYTulXjGlNJ=-N5>szs}E0u9hwy-H4bjm(OT;ge0GCJO#+cQ_4b zR$NQ@H90h0q6KnuQKn4NG{kMcaGO!&Vlr{f%F)X)g0RS*K aC<_=gyLcXC{%!$@fQ!Ro`$D@lTmA=7q1Ukh literal 0 HcmV?d00001 diff --git a/Assets/Sprites/LeftHalf.png b/Assets/Sprites/LeftHalf.png new file mode 100644 index 0000000000000000000000000000000000000000..bedcdcd2850c3eb30de6a6ba7b653c77f6c08166 GIT binary patch literal 18059 zcmeI4dpK0v|Hrq(ahFRZNoQP&WUdTm8sjpqxrGtB8Z+CNFf*B{K_^kUbU8`NHIC|t zC|#5i6)Gwry1V2Qk~;J&b#xNGdnmN4Ip;jT@9&S_^UQvpG5fPV>-|}4z1C-~Su@YG zZC~o)q$EE_9smF(7iW8K=si~Wl9h)3ULn)!p*K0Ma{vzj6lMxv5Ka}a#J+yo4;iMfmho5Xb9D2WU z=vl+)*$3p_V}m)RO)^!oifPWKUietWqjvLDf8Sbnwf0Fj$|g?UfD5R|mNImCBl;4+ z`xp{wkzSR|B|swbj)E*u<(^%InVUGK{K77Cr9|vDi7I}IrK@bLI$#sM+wKTp<0uiE zld-@D$ddvB>*+yVz)~a-Xt?>=9UwO6edb09V8uRN4T-!I05KCxvIjyI1IL<{?Qj76 zF@Soo>s12q5D8#h{DPfbWex%on zN>qA{AyS#AN#zCvhqx88$aOM)eyDjyjV_vt)Xix>(6Ve$HBp&bxHvQA-v@62KwgRl zG}^(D$i^8Zjg98J%Vw-WzPKzsrWX{{HQLiu%(Vf4C;XV^Q4@6OoY=+EvEieK<_}1P ztX9ZdKeRLWw6e`vAg{00Z;&fw<8W|K`J+cY-Q5qDT(w(4yXm)Slv%T;%5Nm>uNczD zp?AMudTJ1dTNURd_5SyoTW{U+=Qiz?+ZNRREZOPfIfb#0I(PK0x&)Q`8>@GDsjb^> zpS5ccm#??oZtuct^IOIkPdiP9CCQz5;N)7e#Ksh4;VQc1pRR@~{`{(^Ljdrmf>V9h zNLDg7Wb2bA!PqP75vRQQKy0wf-gN-5+TH*~y;*8qCkp`fd2z-kZMEN4&o-%&o?HE6 zd$q#HK=W;O23KqBRP5v#v2!B=7arSUXOz%zQpY$Deb+|Etja4SA(cA=RpWbph80)& z15Gx!+Nd&4PRjPW>`a<&Ym!9J4uAdKvYMIk?{%x4rPOvBAZ{e7d+E8R;GMDFJE#a> zXPq}z5kC+TS2|uuS$rM9ZTXl`>4e=EciPM9uHsord7;IeZH|W&ZZr7UtmIjF*|#Ik z%(2>Kez5m;afotjGMQ3`sd_$J#`J0!2332-?v$m8Tq?c(l-@DL;@UYUmmQO=*#3^* zbV?wl7UxhUXD%hML(t~gI{Ul%dpvY5M9eiXQ*D*AkdxfzRb!}^TIhOa!3EX7uFej^ zVH5qGP4w@pCC@~wY)qnDwJ=cIPQe+L@A<*y)Nj-lwHC(~wzqzt$SM5{-o$E-&h%)r_D9?tUa zC_G42#V0SfJASat`-E3w;Y_pjS%ikIvs_&Bk0089XHJM_$PnwqbN&U@j{WmI(r^2< z)b}|(Pk%1?R-mYqps}?siD{&jJzHirQ%f-WM26cDtvfrl>ZlkC?8}VaOyx|DufK7b z@y{A5H|6&)*}q`FwlSJ|wCG6D<01v$LEn06^3l~kn@SvgO?|qK%H2&X_ASa;`qD?+ zhk0~yVPX-pkVCcpEhb=OyL7-6w=15M-@Nipt?8<)MJUj}4BNUThAR!7n8}Sl=JfhJ^64m$ zFPP-i&eX_%b+W~HoW%m z0_g?13tZh_xDRA`yO$qXcx18LVz;`6TMdUA?q}k&t*{Spz1h9l53)PY1ul*1cQJ`8-?vd(IoO_>n<>c$K8)Zk& zX`SqODBV_47GAcA#thPAp1W3ZWgzup>ZS{uei^ZnQA&I?qgZFTP7Lo%ggS8<@o`q; zfdT7H*WRY}p_%?oDoqbfyUJ$PFTBdi@yWj9#MES#^R^Bq?cDCVr5=?|MrCW)c3i*M zy@da6-Kr zu8HrYY}OxRj75(%0|l}3C76=i<80$r{4o4J`e)tCyRC_B;Gd@-_1o^sE4S6KP2O^R zOHcK2-H_{l>^ZJG)SJCtQKo#)W=_RHJ|E!}hM#{i^!ncb1+ z)a6DGjAc$ULBHV34cl)L(u#8zHT2&qz1g#)zvq*RG*ayeW~Cp-xI&- zW&4BvRi6InfX=hD4+%NiWR2}RO4Qpl(=|3fG-{9R(N5&tyqwv-@66HStL2QQ;FjRN zXOEG&D`un>r9Vrb!B%?IdPb>p*_r-#e>$|G(;JN1Dz=tU$`4;Aov#E7ZZtM5wx<3@ zeM|j7H6Li{I7@r*p4~j4y|MC7vp?>&t*9ItA>X*v<}2arelPeQIP5Z9I%Hk4y{PYf z+Hm-);~wGb`s*ZHBu8ZQXOulCzk5%o#fs{ke1FkPrx|rWT^h}KB|s{fEBXF%p!TUg z*FLJdZ%D3lXr2Nl zdly$OZe021Jpaw%lM~w7+ETA+o znik}0jvgAVFVUQZj(LCY<%7oNjOK&sZ_-mQhyR>E@}lac)`_;-n%a4nZbX`5SHE30 z++Qtd7wEh?+^Ou@{WD^-(OAe|r{4M8E*MVLN=+S;lFS(VNH;~c0RT~pMfKOnEAPN8^>qst*9t!diK_HXGw$gi5aaj++Vp!?<;oULrTnZS%a*mDw zeWE?6^ypAJfuUzjmM29Lp#b3^pN5DG4`cI)kyd)+af#5quo$g}7_Y()wbHW{Hi+u!0fog|n&R*#2pk5BM`H+RECz|e60sN}4ukk~>5=83J5mHA znCNZq_^CO_veFCT^SMMcS|AXh1g0oX1QU%V5C~`t4voVhp&CeD6q`?rM6!AM6G1-5 zu?Knd2o{&m;;<3IxU?Y7dcKvOp0J_G>(jWxxswgCd7s!p6w#41E*gu%puZz>cNZ-S z5C5i;$9LEO_2kpYzS$s;8pQ?C-XM>&K7tN9YyjDO{cm-GL7$AnT^|uP&WAxqgJEDe zB;i4w$9}U5+|S=YCgoprW77TI(eqisQ}HJuq0rEKr_509y>m?FXdl_w&&2-3o{1_ zJ+aam96A(!G9QTeAOaq5$-p2PARdFnVnIC8(v)tA46>vJ;c;eWScaMT=Z2;Q`>G+& z2o|&v(ZZ(H5srlcHD*DuWMFA{5J{lZ2}nk;nFW#-Y#EFMu`~jWhG&3uhS}#Pz7giD zrkq(kD1D-)r4^K1<6DgnxbDl+&yFzG_?E$?Meso3O0?4Zyc8$*n8__fs2N|;L>gVV z*^ueNd<7XK^cSU5-I`Q>lCi#?&VPnrBK|b__uCMJfb8$&`$UxS3g6fBIKg}YEdsP< zLdo$@R^dd{FJ7?)^1Fs~RF42Wn`j7u~hm{*Jo21K+e#wD5$%qzwP z10vcK;}XpW<`v_D0TFGAaf#*w^NMl7fQUB5xJ2`TdBwP3Kt!8jT%!5FykcB1Afin% zF425oUNJ5h5YeU>muNmPuNW5$h-g!cOEe#tSBwh=M6@Z!C7KV+E5-!_BH9#*OMdEk zPmm2g7fWA<_&0(B$l0 zbIlO|BvM@LZK;v1e{`HusR#?uRZZ+T>rfp{-s)b+FP>9nrc7v{M4L$6whMpoK0ijI@B`ZhxThW~ zE2SclWCN)F`*C;HUt$-yk literal 0 HcmV?d00001 diff --git a/Assets/Sprites/RightHalf.png b/Assets/Sprites/RightHalf.png new file mode 100644 index 0000000000000000000000000000000000000000..be9ab6a8f054da265fc24ff92f7e157565f8ca53 GIT binary patch literal 18061 zcmeI4dpJ~G`^UG)`BW)MY8)!b92v|s#$g;o!pP`6X7-H9VWyd>L8VcN4sVi*h*VE0 zN(ZHcawsVwdOD$0NGf_Clumf}P|>dDecs>i{r&N~uG!Z$X5Z_+zxUefv+lKK&s^8G zb-{dB4b>^C003yXyE*wn?_$YISrPhMPNr8uZz?>uKmh=#O_03gfYbw%0YKH8L!m5K z5X=>F1;Jb%!kt1v@c3L7ClmyLh=z1OHr20Vl5O9UUPq63@g5JZ??h#Uuj6*HPU1{6 zLly0L@rH*UP4p=p=j^PYUzr&%zjLQ}$3!1<^=+yTm0ArC@7#1Ge%r0j&(5@Di^hq71)u#ej5cnq+2krSt< z%=7~?6@V30jGz`^0TNg-Yr~7XfH?ib{9hdF^(qD6O zwcE`gQv1)53QP#jF^iRvtCRu)P}59n+;!*ZSkcGOQ|(b@k^A* zv_1V1HJZ6KHC8+GHJ2k_T~!=33JPi&XsgZP*#p2cVRYSqIXZ8Oc&?&2Y~b*WE`{J_ zYMHD1wzJM@*z9jagI^5p8eMY_DxjI^wD^o)wbLne zM-T3((N@RZv#-ynA7nmnHvcS7ZpH&=R+8n`CL)h7Wyrtxn59h7S;` z^5Wo4&uT@3Z|(YBGiLx|miz8i0I|r#ZOMJZbYEx*bPMHL)Dmpkl2ezuBj3mQm7ikMlDxkNbFSau5z1 zM{_ebzCS);0$O`*Jms3T$@r}l+^m9KW8BaFL9HKO?@}M`YusUeBF)lmigD7-24=`P zCBhza#GK05*7Vl$R*P2sR>SVas_8-YtN!@l_uSO?*2;N$ZQ5;?ZHizD&cXjks_*0D zhp6N535y(09m@AT?Gtx=g5~N|LiMIe?jA=^9o~C)O0aHlALsN-;pK6U_fDIid?%p3 zs>AhV@=N(%k-El~iJNZ3vrYBVCM!*5>xm|xPVqdZcXzwq4JyVO`#Pn4zt(=PKg}%P zY~94fTdI5K?VY(--waJXk$o)tNw%7QkAD?4;lwh(^|>zo7Je-!RQ}wTmo8IpC$nSBM zYStt#TjIN1RCdTw{X>OLqO0LqT`3t?mWeYwxmiyli`zdw( znW;F_aHfaXE3d9pU$25=vyaX7oa=d``gZl<>ihfgX|~u0xc0R6vAg}V?KX~T4#85rya2oe1Gmyr^AlS0*8qX2^&vs zY%4uw7+m>g*D1rk_LQ2$8jfb{g6Nm`?%@^pOwxsKmCvM%AtJA2PJaNNA)24_v{W$KetNWYwoIjCst$}o#IC7PAsR+!vSyMgNj`|0+ zm->ln)m8ua0{y{<@VYMjwMFkO-`s0lT-4W3zImn5U(Vm_9_t?X+5K}~pIz?O?2Zrn zK8GzmH9u@s=MDLK`FRrAL5D+B3oMMw=R4gY@}sCaJ7 zbBb*3=u>I#o2Ef*ShHj8$!AJ;r>`+!8=zM@rgo>gr1_i7o!S-=+PZYQBdf&U|NspuXv-)eQ3LlAPb)72mE?VAe-|6s(@;L6E z-Qt0!hi{uUtSk{__S7}G_9@10svSstm!L%%o3KBjYKz8}*BLfs0^zwGzrW*47NwS1 zJ2OLf;P60IuI?ms^oM(|AJo*P)E!FhPENWSw(e;EtCH7xryDEEDyChz8DW84*1Pa? zXQ`-3WbpP#vzB-3I>ZLk!QhW)-}&9i`kbVflr*RypVIS%VS#J}0HPj;N)yt&Jc$f$ z7>ds127#!EFdlRx3IHU#2p*jg0tyj9Ae$3zYxK78su6<2v^5IAdttnI6fl_M7R3ks zqUKW>Q6UTh)5wmjN{S#t3Bo`j9T5>08ZID4*cuJxB|_(tX0#DvC`1@yYvds55JB@= zfS_>sAOerFLNc&eEW(P0>$OC(O3e3fX3j^I2;m+Knfzmh4ctyxWITg$+tXC zpn$>W@Pr(0I6{(_9>iTOv^6r4boBlBI<7F@_m08^U)ezv(GheW8jHf9e>F)p8-0r0mFsHzq$w}<9i<7YJTVtA0`70hJs;` zL;zhp_LrBy`}PgwyZndC`0oDg=!G2C$mIN>m3V$D10y)Ukx4wmvY}EKo*@!ce?$r& zqzk!xDwi8d9FF4lDBCB^U|%QSRkMbPpE@>ER5}-H8kh z7RBK(i3BE&$--M$BW)}gETj!+$v_fptQkm5kcB12f*FJ-5U@i-`%(T=Y9}sZwWM;O z)Wa*C$z?$4zt;oN(i(>g3bJA$nIIm6#9~3bq)QuQkPSTukF&JIGA*sXbu=p3PaS#l zInYK#4;>XF84DBY3`ekGvgj5zNTv-FM6wu`7$lv5u|~2i>DDYukcp?`ncuqjMVgVevZ$bTkpMjCuWdzg1*&vgQ{#Lf%8vfp- z4Nv8d>*?DX{dxV7m<%F|%MYUq$(%4c8$|QM*(CHx<4B*Rk)4Oa4dwE^xJ;02K|=qk z`Ijo_2et*nzps%6zOIf4cV~(fmSAOt#G#-KaU{*CxKVi|pJha7kAaGwKD4$W%};Ic zc$#Fd2wgoCZ;iu12Xw~+9bcuR-Ee83bm?d}Tsork59bKUxUapznn$T5AGpLJsD9AB zAxMUX25*8#FW^Lgp)@BB^a&x5>~vV1%~uiJ^GjvmZL2Xp8T+;c#yfR!cAks}4F6n$=UKuVJ5b352mvlZbuM8Iq zh;&niOFAEzSB47)M7k-%C7lnBKq?3m>b87>$Q>81>qbUrYz3>OTDbWw^{699Z1gx)&ACH!1@#vhTh=!Ct}b zO2n9W;HIuOFb?tYxe8*8$#RmMlel&JEHQs9?=OV~y8$S8-uMzI*nP~Uh%u(_02Dk! z<>_;kOcS{!B)L5%Vkmg`*h@>NPp{2+SFdX*4%#qQI|i6HNvy1(Ef;SOjQh_|j-kuW z%n+;FD(H7+G8rF4>%YaCq( zsVEYaBq~L^=UO4D=$z>2hVLFK+SPo|TIc)wXFsp!^E`XcthMb} zy2MUJX{HhY04fgl)^5;yr1+&M5BrWe*Jlq*h5v^R7mL{2FS06TT_5(wr@Sje=W>c z>(qxxr4*1$<`8Y7ycJPv6+AuBv-N5nG#5@YW{hK`TA(XJQ)b|!j8vcW-UNWmcy(yB zy#pb&lk#h8jdvGKT8(;nNqz|F>)STiQJ2fJ0Dz~$i26YTOySJPMe>nBgNNq!$oa2Q z&Ro|Y>sO#^aTdtzYVhpkiP_j3+*9)SaYuXmqs5h0-i#Zb8wc4HtIItH0zX8MKli_T za`D-mDE!JOJGu8yDsJ{U9i3ITcfwZRrsr{XpNo};K5O4aRyz2W(DkRaxlUQT+d6eu zFa9WUht=K%SLfatVm)g$_#{hdB><<^P-Md6QQ0e*vVS|ySECEdpY;R4+fwf3dwPnp zk^Wnr)`^DRm=D-x&IKa<9QLjSfK}FW(6k$c=GBS-V4WGIf67v;@A7nma`{=8$2VP8 z{_JDC)oM;5-V~R-)BMIW-GmIw@zv6`(W-_Xd9Kg`fp3%O+r_AoSS6EQ~k(L z%($#q7BxZ6@|xmQhE79_jPFjm?rufRl<4<5m+j@I#LhunkD2C*bc`q14=LYf32~`$8kuRg`DbRD z?J_>tc{|r%wIPl|t;UwWn66-08Hhz!U9mcCYA_*zS#uhhH!-(r=BZ_QvZXuTG3!o? zqcblsjk)o5KR@zxd%2gjo)4(-1?(_hoSpL6ns@ciWF{j--O-S)gw z(`EM}>4j{cXrjtC^)1ygY`qz2(-o$(XNabsOm;dp<8JJXY8uuA_bRzFMKy)%LDw(R z-=H3ULuvow{qy!~>0@ZebB^V-?kDTSZPMM(k{v_GZDe1zN|9 zoJw%uih!KNq(pkIeXeV+-Kz`6`Q2IR$1d2EdVPwTWLdp<{)+i_?6}(T>7DM6-J7$N zvNW8{NbmB|IRQtt4whPrE(K@xBxhV)6`A40&1wm~(D`xJM$7}MoB-5Os~Pd9b@SGtTMtqQX=b>G_|CM>w1;V}#XieJmKzjh z7o7tg3fh++^Xe%o3yxk+^g2rSSiZ8*_C)%LxerQDlx9uNDp``SBsb#$`^u@mimn$O zFP?F#k-hHXVtYZg>;(%sYU+Oaj+C4w!zF|j)wH`kz(DCjh;s^)7K z+7}DotzG#v?9RLNw8FHC?(D{sJ;ptpp6yM4+%)=QL57#1;P#bk)F-YT_2$Zd?8gSQ z=0&(rU82}$J9RNkOuXlbho_2exLo08 ztd4G_ZqglM4TTNW16h%CW!SPiqAa7l$9;Mqwn698ZgWy2_;vJtuVfJCkeUYdMpmmqxsJa9e@#oDq8^V&eSh?a`jw%y;u*=rikaNd!@S z6IIY^{n0wnx+RT`b0MBYEhgwwa?oqY4JPM}&YM@E{k(48r>D~$0v%@&(fawu!GRZB zKX>1S)~n)`ODXzp&M z&BYS2-#b^h@^Wlkzi&1s|zjnwss zAiNpr0&dIR_&sZ_a&(*%ir6pN&;8cd38YYjvK_p+>C{{x^EWVXxw9R;LRUH-BT*2Jl$J#bep3mN}K-tLf#r; z0eNj`qf(pt_=Ve+$>)*J?JUv{y6=+P?U|GxabaGVb3oLp%QrS(J}VROO4&oHBYNYj zria}tUFaCE*0YR{+tRft>N|GkPixdnQs4AQuPLNMYdiPGrIe<9XO8Dqmayvl?)Y^* zZ$V{vPfE;5dY&{XSmklU8I{&$XS(10ZPSQJx~11xx}}I(a`+PYTp5^kz4q23bJ`JF zAMGQ}xaUsuS;oWn!Sy{_;bngty}sY*UDiK9xqh+HL&n4TzTbWDlf$RNe)IetIbH7) zKLxEku_S11ceU&t*#QOJNktD!?%mhEV@7j}d$918-K6T@E)J%@5usF!RXlz_Q1wig zXC2z!)jy%Nf3^y#Vg0V~yr&9xe_OB3*2b){N`0GZo93SS$=lcayvt2W{ezb+VV~_9 ze^WhRMD_|@+)KO8Y3SN~H-Y`OZddyL^o93Xx4n8H;mhVwf|kKMsoyz{y=R_>0{CSo)cv*Wvlxvx-B15o44OL z_a1C|^rmUknsQNQZ+(+pzkKwTy21E&ajMkuaVc>%+f=r_$}pu6iODvazb7YWBtJA%?hBeak*| zUluiqwBH z5Sqc_`hw_?ARcrh3IJsD5FUdW016SlAe$3xhI~_c35npa%#fZ0XRI@i3i@;G!}y?k z*b*8uEPzR5AHU4#KzgT-U;coftFB?t``GD1+n0^N}yU*lMV z0w$ls6LPr02ytA7FL#~L42cvc`gVL7R}k-8qF})nb`V8O2!n^gp|O}>h@71z%YuS_ zsuT!q)P%K#UtG;I88{L7Vkpuu%7BC&ByrP2%U_zPW!n3KsL5lDCc@ zI1HG@#DIZd5R_8@>2N`XOcs(K*$JYf)3UcXs~Dw zhea~R8#0VdOifTsqOl)}fHlISd|5`uC?jJ6mS|*R!XO%%4iD{n`46G3xy*IqiHAau ztaKKa35EYwM-MeL0Zxe=r9E#`=FZ1OIG6{ePc<(b{GDGlJP5i-P%DwqG0m*`$q3 z<@f99>l*!W{gFraldtRF657wi%T(}vF$^zLD+c@fR`F?nDV?A1Qbs0tyss~`6H45r zepY=W1NlB98S~H1cg(P;+(0hhnactxhGW&E&7)YysGwg1myY}xND;W%Ss@&3sKz*= zu`vpd#*Ga#rr(%2EGEg1%MW4*DV!h%8^rK}*<{RUNtTXv!=7)ZC~Ko>rNcmv1bp=;%^2=4i*((9MXF`h5Vk@6aIYdT!mBdySl zFLck1`F7L&L(PA?aQrVnj1K9485I^wngj+!vMI$SnGeh>#RUT**_7gv%m?O`;(`H@ zY)WxS<^%IealwE{Hl?^E^MQG#xL`men^Iho`M|tVTreP#O(`zPd|+NFE*KEWrWBWC zJ}|Eo7YvAGQ;JJ6ADCB)3kF28Da9q356mmY1p^}4l;V=i2j-RHf&r0iN^wc%1M^C8 z!GK6MrMM*XfqA94U_d0BQe2Yxz`RmiFd&jmDK5!;U|uOM7!b*(6qjT^Fs~FB42Wb? zic2ydm{*Dm21K$c#U+^!%qztO10va!;*!h<=9S`t0g-G%qo?R6|52>ye{VoeV;EG_{yEy|u*j(s;uxtT<4@1y<7XYlo0>Dcj=-Jq00MO*_ zU47LS0A#oh)|Rx8hS$xdDis!LHm(}3aynOC6JvFc#Lg|Y_W4j~SlGGGr#W=}^9SLV za3@Rc5P)1HpazVy02Be4e`oCa^Zka_i0RnVMT3m3h&AD6Nzc{GhsM(j70;qu>=2C_ z<;Z*ILzK%ejz6VXf@vAYdp(Z6b%iEZ##AI@VD&n-7+6sXXy`n+>J3z(BWN+%7738Y{mW4fW3v4u0{}xqvVih3{>yQBPcZ;=IM^() J&bRW}{2y}2<*NVy literal 0 HcmV?d00001 diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset index 640768c..a4c3752 100644 --- a/ProjectSettings/InputManager.asset +++ b/ProjectSettings/InputManager.asset @@ -412,7 +412,7 @@ InputManager: negativeButton: positiveButton: escape altNegativeButton: - altPositiveButton: joystick 1 button 6 + altPositiveButton: joystick 1 button 8 gravity: 1000 dead: .00100000005 sensitivity: 1000 @@ -428,7 +428,7 @@ InputManager: negativeButton: positiveButton: escape altNegativeButton: - altPositiveButton: joystick 2 button 6 + altPositiveButton: joystick 2 button 8 gravity: 1000 dead: .00100000005 sensitivity: 1000 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 05ae903..a93cb65 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -8,6 +8,7 @@ PlayerSettings: defaultScreenOrientation: 4 targetDevice: 2 targetResolution: 0 + useOnDemandResources: 0 accelerometerFrequency: 60 companyName: DefaultCompany productName: ShellShock @@ -28,6 +29,7 @@ PlayerSettings: androidShowActivityIndicatorOnLoading: -1 iosAppInBackgroundBehavior: 0 displayResolutionDialog: 1 + iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 allowedAutorotateToLandscapeRight: 1 @@ -135,6 +137,15 @@ PlayerSettings: iOSLaunchScreenFillPct: 100 iOSLaunchScreenSize: 100 iOSLaunchScreenCustomXibPath: + iOSLaunchScreeniPadType: 0 + iOSLaunchScreeniPadImage: {fileID: 0} + iOSLaunchScreeniPadBackgroundColor: + serializedVersion: 2 + rgba: 0 + iOSLaunchScreeniPadFillPct: 100 + iOSLaunchScreeniPadSize: 100 + iOSLaunchScreeniPadCustomXibPath: + iOSDeviceRequirements: [] AndroidTargetDevice: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} @@ -224,6 +235,8 @@ PlayerSettings: ps4SdkOverride: ps4BGMPath: ps4ShareFilePath: + ps4ShareOverlayImagePath: + ps4PrivacyGuardImagePath: ps4NPtitleDatPath: ps4RemotePlayKeyAssignment: -1 ps4RemotePlayKeyMappingDir: @@ -245,6 +258,7 @@ PlayerSettings: ps4attribMoveSupport: 0 ps4attrib3DSupport: 0 ps4attribShareSupport: 0 + ps4IncludedModules: [] monoEnv: psp2Splashimage: {fileID: 0} psp2NPTrophyPackPath: diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index e040c5c..8a062e6 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 5.2.0f3 +m_EditorVersion: 5.2.1f1 m_StandardAssetsVersion: 0 From b9f8e33379670f4d9fe1845cd5083f303acf6e43 Mon Sep 17 00:00:00 2001 From: Paul Normington Date: Sun, 28 Feb 2016 20:05:57 +0000 Subject: [PATCH 19/39] Players now collide with the tunnels. --- Assets/Prefabs/Level Blocks.meta | 9 ++ .../Level Blocks/BottomHalf.prefab.meta | 8 ++ Assets/Scripts/tunnelScript.cs | 112 +++++++++--------- Assets/Sprites/BottomHalf.png.meta | 56 +++++++++ Assets/Sprites/LeftHalf.png.meta | 56 +++++++++ Assets/Sprites/RightHalf.png.meta | 56 +++++++++ Assets/Sprites/TopHalf.png.meta | 56 +++++++++ 7 files changed, 297 insertions(+), 56 deletions(-) create mode 100644 Assets/Prefabs/Level Blocks.meta create mode 100644 Assets/Prefabs/Level Blocks/BottomHalf.prefab.meta create mode 100644 Assets/Sprites/BottomHalf.png.meta create mode 100644 Assets/Sprites/LeftHalf.png.meta create mode 100644 Assets/Sprites/RightHalf.png.meta create mode 100644 Assets/Sprites/TopHalf.png.meta diff --git a/Assets/Prefabs/Level Blocks.meta b/Assets/Prefabs/Level Blocks.meta new file mode 100644 index 0000000..eb2fa33 --- /dev/null +++ b/Assets/Prefabs/Level Blocks.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 03e3d0668533e904fa7f436aee58758b +folderAsset: yes +timeCreated: 1456689917 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Level Blocks/BottomHalf.prefab.meta b/Assets/Prefabs/Level Blocks/BottomHalf.prefab.meta new file mode 100644 index 0000000..a5e4e91 --- /dev/null +++ b/Assets/Prefabs/Level Blocks/BottomHalf.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ecc87d954462bfa4bb25470843b889e6 +timeCreated: 1456689921 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/tunnelScript.cs b/Assets/Scripts/tunnelScript.cs index 526c547..1d105be 100644 --- a/Assets/Scripts/tunnelScript.cs +++ b/Assets/Scripts/tunnelScript.cs @@ -1,56 +1,56 @@ -using UnityEngine; -using System.Collections; - -public class tunnelScript : MonoBehaviour { - - public GameObject tunnelMan; - - int tunnelNo; - - int randTunnelLink; - // Use this for initialization - void Start () { - tunnelMan.GetComponent().tunnels.Add(this.gameObject); - tunnelNo = tunnelMan.GetComponent().tunnelNo; - tunnelMan.GetComponent().tunnelNo++; - randTunnelLink = tunnelMan.GetComponent().randTunnel; - } - - // Update is called once per frame - void Update () { - if (randTunnelLink >= 3) - { - randTunnelLink = 0; - } - } - - void OnTriggerEnter2D(Collider2D coll) - { - if (coll.name == "Player" && coll.gameObject.GetComponentInParent().waitTime <= 0.0f) - { - if (randTunnelLink != tunnelNo) - { - if (randTunnelLink == 0) - { - coll.transform.position = tunnelMan.GetComponent().tunnels[0].transform.position; - } - else if (randTunnelLink == 1) - { - coll.transform.position = tunnelMan.GetComponent().tunnels[1].transform.position; - } - else if (randTunnelLink == 2) - { - coll.transform.position = tunnelMan.GetComponent().tunnels[2].transform.position; - } - else if (randTunnelLink == 3) - { - coll.transform.position = tunnelMan.GetComponent().tunnels[3].transform.position; - } - } - //Problem is that you can teleport to random tunnels but you can also teleport to the same on you just walked into - //Have to check whether you are colliding with the one you're teleporting to - randTunnelLink += 1; - coll.gameObject.GetComponentInParent().waitTime = 0.5f; - } - } -} +using UnityEngine; +using System.Collections; + +public class tunnelScript : MonoBehaviour { + + public GameObject tunnelMan; + + int tunnelNo; + + int randTunnelLink; + // Use this for initialization + void Start () { + tunnelMan.GetComponent().tunnels.Add(this.gameObject); + tunnelNo = tunnelMan.GetComponent().tunnelNo; + tunnelMan.GetComponent().tunnelNo++; + randTunnelLink = tunnelMan.GetComponent().randTunnel; + } + + // Update is called once per frame + void Update () { + if (randTunnelLink >= 3) + { + randTunnelLink = 0; + } + } + + void OnTriggerEnter2D(Collider2D coll) + { + if (coll.GetComponent() && coll.gameObject.GetComponentInParent().waitTime <= 0.0f) + { + if (randTunnelLink != tunnelNo) + { + if (randTunnelLink == 0) + { + coll.transform.position = tunnelMan.GetComponent().tunnels[0].transform.position; + } + else if (randTunnelLink == 1) + { + coll.transform.position = tunnelMan.GetComponent().tunnels[1].transform.position; + } + else if (randTunnelLink == 2) + { + coll.transform.position = tunnelMan.GetComponent().tunnels[2].transform.position; + } + else if (randTunnelLink == 3) + { + coll.transform.position = tunnelMan.GetComponent().tunnels[3].transform.position; + } + } + //Problem is that you can teleport to random tunnels but you can also teleport to the same on you just walked into + //Have to check whether you are colliding with the one you're teleporting to + randTunnelLink += 1; + coll.gameObject.GetComponentInParent().waitTime = 0.5f; + } + } +} diff --git a/Assets/Sprites/BottomHalf.png.meta b/Assets/Sprites/BottomHalf.png.meta new file mode 100644 index 0000000..9577e26 --- /dev/null +++ b/Assets/Sprites/BottomHalf.png.meta @@ -0,0 +1,56 @@ +fileFormatVersion: 2 +guid: 04cc6522bdafc294d9d9c6380d6dfffb +timeCreated: 1456689920 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/LeftHalf.png.meta b/Assets/Sprites/LeftHalf.png.meta new file mode 100644 index 0000000..f98e1db --- /dev/null +++ b/Assets/Sprites/LeftHalf.png.meta @@ -0,0 +1,56 @@ +fileFormatVersion: 2 +guid: 81386197513bb7341a662d0d99b5ec0a +timeCreated: 1456689920 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/RightHalf.png.meta b/Assets/Sprites/RightHalf.png.meta new file mode 100644 index 0000000..cb23ff9 --- /dev/null +++ b/Assets/Sprites/RightHalf.png.meta @@ -0,0 +1,56 @@ +fileFormatVersion: 2 +guid: 19bd393f613f8784ead672766cf32686 +timeCreated: 1456689920 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/TopHalf.png.meta b/Assets/Sprites/TopHalf.png.meta new file mode 100644 index 0000000..82d92f9 --- /dev/null +++ b/Assets/Sprites/TopHalf.png.meta @@ -0,0 +1,56 @@ +fileFormatVersion: 2 +guid: 8fdcb288c1273ac41a6c6fb56b2d8339 +timeCreated: 1456689920 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: From 83866c1cad41a842f1537bcff4c4d5b2d02be7a6 Mon Sep 17 00:00:00 2001 From: JSleekXD Date: Tue, 1 Mar 2016 17:27:21 +0000 Subject: [PATCH 20/39] Disabled old playerHUDs from the oldHUD. The old PlayerHUDs that were next to the timer at the top have been disabled. Although they have been left in the project now until the player HUD is finalised. --- Assets/Scenes/Prototype.unity | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Assets/Scenes/Prototype.unity b/Assets/Scenes/Prototype.unity index 231b12f..2c23591 100644 --- a/Assets/Scenes/Prototype.unity +++ b/Assets/Scenes/Prototype.unity @@ -3924,7 +3924,7 @@ RectTransform: m_Father: {fileID: 2021881325} m_RootOrder: 0 m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: .5, y: .5} @@ -5851,7 +5851,7 @@ RectTransform: m_Father: {fileID: 2067420757} m_RootOrder: 0 m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: .5, y: .5} @@ -6775,7 +6775,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1413660775 RectTransform: m_ObjectHideFlags: 0 @@ -7968,7 +7968,7 @@ RectTransform: m_Father: {fileID: 9843160} m_RootOrder: 0 m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: .5, y: .5} @@ -8804,19 +8804,19 @@ Prefab: objectReference: {fileID: 1998640093} - target: {fileID: 22431700, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 22431700, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 22426558, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 22426558, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 133054, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_Name @@ -9106,7 +9106,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1812589629 RectTransform: m_ObjectHideFlags: 0 @@ -10259,7 +10259,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2050290495 RectTransform: m_ObjectHideFlags: 0 From d85d64b56ed646d8cf8d8126f535093b62ce7551 Mon Sep 17 00:00:00 2001 From: JSleekXD Date: Tue, 1 Mar 2016 18:13:43 +0000 Subject: [PATCH 21/39] Players can now die When the player's health (HPslider) is equal to 0, the player's game object is disabled. Also added in NULL checking in IsometricLayerSorter.cs, as without any players enabled, the game would lag from all the null reference errors. This has been fixed. --- Assets/Scenes/Prototype.unity | 175 +++++++++++++++++++------ Assets/Scripts/IsometricLayerSorter.cs | 18 ++- Assets/Scripts/Player/Player.cs | 8 ++ ProjectSettings/ProjectSettings.asset | 6 +- 4 files changed, 161 insertions(+), 46 deletions(-) diff --git a/Assets/Scenes/Prototype.unity b/Assets/Scenes/Prototype.unity index 2c23591..3cfaeae 100644 --- a/Assets/Scenes/Prototype.unity +++ b/Assets/Scenes/Prototype.unity @@ -812,7 +812,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 409436, guid: f89e011de36c1124e97bf9847d797ad1, type: 2} propertyPath: m_RootOrder - value: 9 + value: 10 objectReference: {fileID: 0} - target: {fileID: 409436, guid: f89e011de36c1124e97bf9847d797ad1, type: 2} propertyPath: m_LocalScale.x @@ -3289,7 +3289,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 401230, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} propertyPath: m_RootOrder - value: 14 + value: 15 objectReference: {fileID: 0} - target: {fileID: 194862, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} propertyPath: m_Name @@ -3548,6 +3548,7 @@ RectTransform: - {fileID: 1910995931} - {fileID: 133048276} - {fileID: 613553048} + - {fileID: 938098168} - {fileID: 161115611} - {fileID: 1860753582} - {fileID: 605769312} @@ -3556,13 +3557,10 @@ RectTransform: - {fileID: 531871430} - {fileID: 1717947874} - {fileID: 162690262} + - {fileID: 2107970909} - {fileID: 2037202224} - {fileID: 1866523315} - {fileID: 47402629} - - {fileID: 1660781286} - - {fileID: 782908716} - - {fileID: 1070331672} - - {fileID: 1102166523} m_Father: {fileID: 0} m_RootOrder: 2 m_AnchorMin: {x: 0, y: 0} @@ -4164,7 +4162,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 462742, guid: dcfaa153c5433dd478fabe3e62e3b353, type: 2} propertyPath: m_RootOrder - value: 8 + value: 9 objectReference: {fileID: 0} - target: {fileID: 462742, guid: dcfaa153c5433dd478fabe3e62e3b353, type: 2} propertyPath: m_LocalScale.x @@ -4326,7 +4324,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: m_RootOrder - value: 17 + value: 19 objectReference: {fileID: 0} - target: {fileID: 11419152, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: wallManager @@ -4373,14 +4371,14 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 782908715} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 832, y: -2, z: 268.979919} - m_LocalScale: {x: 35.9839363, y: 35.9839363, z: 35.9839363} + m_LocalPosition: {x: 16.5073681, y: 7.39218855, z: -1.52500069} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 17652994} - {fileID: 1615139164} - {fileID: 1764917752} - m_Father: {fileID: 653857878} - m_RootOrder: 20 + m_Father: {fileID: 2107970909} + m_RootOrder: 1 --- !u!1001 &799390284 Prefab: m_ObjectHideFlags: 0 @@ -4532,7 +4530,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: m_RootOrder - value: 18 + value: 20 objectReference: {fileID: 0} - target: {fileID: 11419152, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: wallManager @@ -5101,10 +5099,86 @@ Prefab: Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_PrefabInternal: {fileID: 1460317504} +--- !u!4 &938098168 stripped +Transform: + m_PrefabParentObject: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + m_PrefabInternal: {fileID: 960469493} +--- !u!114 &938098169 stripped +MonoBehaviour: + m_PrefabParentObject: {fileID: 11440672, guid: 0d300e0327b70da49abe5b0e9498a7a7, + type: 2} + m_PrefabInternal: {fileID: 960469493} + m_Script: {fileID: 11500000, guid: b3aa7abba9400b449baa976216c4b8ef, type: 3} --- !u!4 &951669876 stripped Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_PrefabInternal: {fileID: 1633478505} +--- !u!1001 &960469493 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 653857878} + m_Modifications: + - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + propertyPath: m_LocalPosition.z + value: 323.855438 + objectReference: {fileID: 0} + - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 11440672, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + propertyPath: hasInfiniteAmmo + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + propertyPath: m_LocalScale.x + value: 35.9839363 + objectReference: {fileID: 0} + - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + propertyPath: m_LocalScale.y + value: 35.9839363 + objectReference: {fileID: 0} + - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + propertyPath: m_LocalScale.z + value: 35.9839363 + objectReference: {fileID: 0} + - target: {fileID: 11440672, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + propertyPath: mAmmoRemaining + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 176856, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + propertyPath: m_Name + value: MiniGun 2 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} + m_IsPrefabParent: 0 --- !u!1 &966856041 GameObject: m_ObjectHideFlags: 0 @@ -5369,7 +5443,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} propertyPath: m_RootOrder - value: 10 + value: 11 objectReference: {fileID: 0} - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} propertyPath: m_LocalScale.x @@ -5475,14 +5549,14 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1070331671} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -393, y: -651, z: 268.979919} - m_LocalScale: {x: 35.9839363, y: 35.9839363, z: 35.9839363} + m_LocalPosition: {x: -17.5356064, y: -10.6436405, z: -1.52500069} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1937374956} - {fileID: 18288708} - {fileID: 1900231291} - m_Father: {fileID: 653857878} - m_RootOrder: 21 + m_Father: {fileID: 2107970909} + m_RootOrder: 2 --- !u!1001 &1076453588 Prefab: m_ObjectHideFlags: 0 @@ -5627,14 +5701,14 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1102166522} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1013, y: 236, z: 268.979919} - m_LocalScale: {x: 35.9839363, y: 35.9839363, z: 35.9839363} + m_LocalPosition: {x: 21.5373917, y: 14.0062523, z: -1.52500069} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 665245883} - {fileID: 1493915461} - {fileID: 1351565264} - m_Father: {fileID: 653857878} - m_RootOrder: 22 + m_Father: {fileID: 2107970909} + m_RootOrder: 3 --- !u!4 &1113430748 stripped Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} @@ -6005,7 +6079,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: m_RootOrder - value: 16 + value: 18 objectReference: {fileID: 0} - target: {fileID: 11419152, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: wallManager @@ -6126,7 +6200,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} propertyPath: m_RootOrder - value: 15 + value: 16 objectReference: {fileID: 0} - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} propertyPath: m_LocalScale.x @@ -6243,7 +6317,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: m_RootOrder - value: 13 + value: 14 objectReference: {fileID: 0} - target: {fileID: 11419152, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: wallManager @@ -7752,7 +7826,7 @@ Transform: m_LocalScale: {x: 35.9839363, y: 35.9839363, z: 35.9839363} m_Children: [] m_Father: {fileID: 653857878} - m_RootOrder: 12 + m_RootOrder: 13 --- !u!1 &1660781285 GameObject: m_ObjectHideFlags: 0 @@ -7775,14 +7849,14 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1660781285} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 2239, y: -449, z: 268.979919} - m_LocalScale: {x: 35.9839363, y: 35.9839363, z: 35.9839363} + m_LocalPosition: {x: 55.6081581, y: -5.0300231, z: -1.52500069} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1704268137} - {fileID: 123880526} - {fileID: 754702397} - m_Father: {fileID: 653857878} - m_RootOrder: 19 + m_Father: {fileID: 2107970909} + m_RootOrder: 0 --- !u!1001 &1665901799 Prefab: m_ObjectHideFlags: 0 @@ -8257,12 +8331,6 @@ Prefab: Transform: m_PrefabParentObject: {fileID: 401230, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} m_PrefabInternal: {fileID: 581025534} ---- !u!114 &1719456382 stripped -MonoBehaviour: - m_PrefabParentObject: {fileID: 11481414, guid: cf3b36c1277b6914ca9531867d57d6e5, - type: 2} - m_PrefabInternal: {fileID: 1422364005} - m_Script: {fileID: 11500000, guid: 684f389db4a8e194a89af18d0021af15, type: 3} --- !u!4 &1720242252 stripped Transform: m_PrefabParentObject: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} @@ -9281,7 +9349,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3800ba1d4402403408247b3365ec08f5, type: 3} m_Name: m_EditorClassIdentifier: - mEquippedWeapon: {fileID: 1719456382} + mEquippedWeapon: {fileID: 938098169} weaponList: [] mPlayerNumber: 2 HPSlider: {fileID: 863266353} @@ -9668,7 +9736,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 405082, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} propertyPath: m_RootOrder - value: 11 + value: 12 objectReference: {fileID: 0} - target: {fileID: 11420586, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} propertyPath: hasInfiniteAmmo @@ -10637,6 +10705,37 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_IsPrefabParent: 0 +--- !u!1 &2107970908 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 2107970909} + m_Layer: 0 + m_Name: Walls + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2107970909 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2107970908} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 238, y: -268, z: 323.855438} + m_LocalScale: {x: 35.9839287, y: 35.9839287, z: 35.9839287} + m_Children: + - {fileID: 1660781286} + - {fileID: 782908716} + - {fileID: 1070331672} + - {fileID: 1102166523} + m_Father: {fileID: 653857878} + m_RootOrder: 17 --- !u!114 &2112786343 stripped MonoBehaviour: m_PrefabParentObject: {fileID: 11405038, guid: 37b47e7042c5d694dbcf150debde834f, diff --git a/Assets/Scripts/IsometricLayerSorter.cs b/Assets/Scripts/IsometricLayerSorter.cs index 9d57148..04c86a9 100644 --- a/Assets/Scripts/IsometricLayerSorter.cs +++ b/Assets/Scripts/IsometricLayerSorter.cs @@ -12,13 +12,17 @@ void Start() } void Update() { - if (GameObject.FindGameObjectWithTag("Player").transform.position.y > transform.position.y) + //Null check to avoid null reference exception errors + if (GameObject.FindGameObjectWithTag("Player") != null) { - GetComponent().sortingLayerName = "WallsInFront"; - } - else - { - GetComponent().sortingLayerName = "WallsBehind"; - } + if (GameObject.FindGameObjectWithTag("Player").transform.position.y > transform.position.y) + { + GetComponent().sortingLayerName = "WallsInFront"; + } + else + { + GetComponent().sortingLayerName = "WallsBehind"; + } + } } } diff --git a/Assets/Scripts/Player/Player.cs b/Assets/Scripts/Player/Player.cs index b125d41..2de0bd2 100644 --- a/Assets/Scripts/Player/Player.cs +++ b/Assets/Scripts/Player/Player.cs @@ -53,6 +53,7 @@ void Start() void Update() { + //if L3 is held, the HUD will appear if (Input.GetButton("Player_" + mPlayerNumber + "_Back")) { playerHUD.SetActive(true); @@ -61,6 +62,7 @@ void Update() { playerHUD.SetActive(false); } + waitTime -= Time.deltaTime; if (mEquippedWeapon) { @@ -101,6 +103,12 @@ void OnCollisionEnter2D(Collision2D coll) HPSlider.transform.GetChild(1).transform.GetChild(0).GetComponent().color = Color.yellow;//TODO:Make this not super hacky (possibly with a script on the slider that holds references) } } + //if the player's health is 0, the player game object will be disabled. + if(HPSlider.value == 0) { + gameObject.SetActive(false); + Debug.Log("Player_" + mPlayerNumber + " has died"); + + } Debug.Log("Player_" + mPlayerNumber + " took damage from Player_" + coll.gameObject.GetComponent().OwnerID + "'s projectile"); Destroy(coll.gameObject); diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index a93cb65..462dc71 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -160,7 +160,11 @@ PlayerSettings: banner: {fileID: 0} androidGamepadSupportLevel: 0 resolutionDialogBanner: {fileID: 0} - m_BuildTargetIcons: [] + m_BuildTargetIcons: + - m_BuildTarget: + m_Icons: + - m_Icon: {fileID: 0} + m_Size: 128 m_BuildTargetBatching: [] m_BuildTargetGraphicsAPIs: [] webPlayerTemplate: APPLICATION:Default From 41fcd36656faa4eeaa178f22e7fb219ab56a1b4e Mon Sep 17 00:00:00 2001 From: JSleekXD Date: Tue, 1 Mar 2016 18:33:00 +0000 Subject: [PATCH 22/39] Cleaned up game object hierarchy and put the timer script on the timer Cleaned up game object hierarchy: The weapons are now under the game object "Weapons" The arena walls, tunnels, dynamic walls and the dynamic wall manager are now under "Arena" Put the timer script on the timer: The timer script was on a game object that was not the Timer itself. The timer script has been moved to the timer itself, and is under "HUDPanel" --- Assets/Scenes/Prototype.unity | 291 +++++++++++++++++----------------- 1 file changed, 148 insertions(+), 143 deletions(-) diff --git a/Assets/Scenes/Prototype.unity b/Assets/Scenes/Prototype.unity index 3cfaeae..1516464 100644 --- a/Assets/Scenes/Prototype.unity +++ b/Assets/Scenes/Prototype.unity @@ -780,7 +780,7 @@ Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 653857878} + m_TransformParent: {fileID: 512983136} m_Modifications: - target: {fileID: 409436, guid: f89e011de36c1124e97bf9847d797ad1, type: 2} propertyPath: m_LocalPosition.x @@ -812,7 +812,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 409436, guid: f89e011de36c1124e97bf9847d797ad1, type: 2} propertyPath: m_RootOrder - value: 10 + value: 5 objectReference: {fileID: 0} - target: {fileID: 409436, guid: f89e011de36c1124e97bf9847d797ad1, type: 2} propertyPath: m_LocalScale.x @@ -849,7 +849,7 @@ RectTransform: - {fileID: 2050290495} - {fileID: 1812589629} m_Father: {fileID: 653857878} - m_RootOrder: 1 + m_RootOrder: 0 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 1, y: 458} @@ -1013,7 +1013,7 @@ Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 653857878} + m_TransformParent: {fileID: 512983136} m_Modifications: - target: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} propertyPath: m_LocalPosition.x @@ -1045,7 +1045,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} propertyPath: m_RootOrder - value: 5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} propertyPath: m_LocalScale.x @@ -1516,7 +1516,7 @@ Transform: m_LocalScale: {x: 35.9839363, y: 35.9839363, z: 35.9839363} m_Children: [] m_Father: {fileID: 653857878} - m_RootOrder: 4 + m_RootOrder: 3 --- !u!114 &329086457 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3126,6 +3126,46 @@ Transform: Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_PrefabInternal: {fileID: 2061694409} +--- !u!1 &512983135 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 512983136} + m_Layer: 5 + m_Name: Guns + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &512983136 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 512983135} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1910995931} + - {fileID: 133048276} + - {fileID: 613553048} + - {fileID: 938098168} + - {fileID: 161115611} + - {fileID: 1860753582} + - {fileID: 605769312} + - {fileID: 516090087} + m_Father: {fileID: 653857878} + m_RootOrder: 6 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: -1.78813934e-06, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: .5, y: .5} --- !u!1001 &514880646 Prefab: m_ObjectHideFlags: 0 @@ -3289,7 +3329,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 401230, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} propertyPath: m_RootOrder - value: 15 + value: 14 objectReference: {fileID: 0} - target: {fileID: 194862, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} propertyPath: m_Name @@ -3540,27 +3580,15 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - - {fileID: 713839869} - {fileID: 143147948} - - {fileID: 1515989185} - {fileID: 1456487450} + - {fileID: 1515989185} - {fileID: 329086456} - - {fileID: 1910995931} - - {fileID: 133048276} - - {fileID: 613553048} - - {fileID: 938098168} - - {fileID: 161115611} - - {fileID: 1860753582} - - {fileID: 605769312} - - {fileID: 516090087} - - {fileID: 1649534405} - - {fileID: 531871430} + - {fileID: 2107970909} + - {fileID: 1609190550} + - {fileID: 512983136} - {fileID: 1717947874} - {fileID: 162690262} - - {fileID: 2107970909} - - {fileID: 2037202224} - - {fileID: 1866523315} - - {fileID: 47402629} m_Father: {fileID: 0} m_RootOrder: 2 m_AnchorMin: {x: 0, y: 0} @@ -3965,48 +3993,6 @@ CanvasRenderer: Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_PrefabInternal: {fileID: 886125205} ---- !u!1 &713839867 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 713839869} - - 114: {fileID: 713839868} - m_Layer: 5 - m_Name: Timer - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &713839868 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 713839867} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c1353a536c9d8c746b42a5ac419d21c2, type: 3} - m_Name: - m_EditorClassIdentifier: - roundLength: 12 - timerText: {fileID: 1833327629} - isGamePaused: 0 ---- !u!4 &713839869 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 713839867} - 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: 653857878} - m_RootOrder: 0 --- !u!1001 &728924225 Prefab: m_ObjectHideFlags: 0 @@ -4130,7 +4116,7 @@ Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 653857878} + m_TransformParent: {fileID: 512983136} m_Modifications: - target: {fileID: 462742, guid: dcfaa153c5433dd478fabe3e62e3b353, type: 2} propertyPath: m_LocalPosition.x @@ -4162,7 +4148,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 462742, guid: dcfaa153c5433dd478fabe3e62e3b353, type: 2} propertyPath: m_RootOrder - value: 9 + value: 4 objectReference: {fileID: 0} - target: {fileID: 462742, guid: dcfaa153c5433dd478fabe3e62e3b353, type: 2} propertyPath: m_LocalScale.x @@ -4292,19 +4278,19 @@ Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 653857878} + m_TransformParent: {fileID: 1609190550} m_Modifications: - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: m_LocalPosition.x - value: 246 + value: 6.77034521 objectReference: {fileID: 0} - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: m_LocalPosition.y - value: 15 + value: -1.66962719 objectReference: {fileID: 0} - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: m_LocalPosition.z - value: 323.855438 + value: 8.98609829 objectReference: {fileID: 0} - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: m_LocalRotation.x @@ -4324,7 +4310,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: m_RootOrder - value: 19 + value: 2 objectReference: {fileID: 0} - target: {fileID: 11419152, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: wallManager @@ -4332,15 +4318,15 @@ Prefab: objectReference: {fileID: 329086457} - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: m_LocalScale.x - value: 35.9839287 + value: .998455167 objectReference: {fileID: 0} - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: m_LocalScale.y - value: 35.9839287 + value: .998455167 objectReference: {fileID: 0} - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: m_LocalScale.z - value: 35.9839287 + value: .998455167 objectReference: {fileID: 0} - target: {fileID: 129564, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: m_Name @@ -4498,19 +4484,19 @@ Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 653857878} + m_TransformParent: {fileID: 1609190550} m_Modifications: - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: m_LocalPosition.x - value: 238 + value: 6.54836702 objectReference: {fileID: 0} - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: m_LocalPosition.y - value: -268 + value: -9.52209949 objectReference: {fileID: 0} - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: m_LocalPosition.z - value: 323.855438 + value: 8.98609829 objectReference: {fileID: 0} - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: m_LocalRotation.x @@ -4530,7 +4516,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: m_RootOrder - value: 20 + value: 3 objectReference: {fileID: 0} - target: {fileID: 11419152, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: wallManager @@ -4538,15 +4524,15 @@ Prefab: objectReference: {fileID: 329086457} - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: m_LocalScale.x - value: 35.9839287 + value: .998455167 objectReference: {fileID: 0} - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: m_LocalScale.y - value: 35.9839287 + value: .998455167 objectReference: {fileID: 0} - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: m_LocalScale.z - value: 35.9839287 + value: .998455167 objectReference: {fileID: 0} - target: {fileID: 129564, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: m_Name @@ -5118,7 +5104,7 @@ Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 653857878} + m_TransformParent: {fileID: 512983136} m_Modifications: - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} propertyPath: m_LocalPosition.x @@ -5150,7 +5136,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} propertyPath: m_RootOrder - value: 8 + value: 3 objectReference: {fileID: 0} - target: {fileID: 11440672, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} propertyPath: hasInfiniteAmmo @@ -5411,7 +5397,7 @@ Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 653857878} + m_TransformParent: {fileID: 512983136} m_Modifications: - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} propertyPath: m_LocalPosition.x @@ -5443,7 +5429,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} propertyPath: m_RootOrder - value: 11 + value: 6 objectReference: {fileID: 0} - target: {fileID: 476548, guid: 80dc342e8beab4f4b9dae0ca5c1ec431, type: 2} propertyPath: m_LocalScale.x @@ -6047,19 +6033,19 @@ Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 653857878} + m_TransformParent: {fileID: 1609190550} m_Modifications: - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: m_LocalPosition.x - value: -397 + value: -11.0711384 objectReference: {fileID: 0} - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: m_LocalPosition.y - value: -31 + value: -2.94600081 objectReference: {fileID: 0} - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: m_LocalPosition.z - value: 323.855438 + value: 8.98609829 objectReference: {fileID: 0} - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: m_LocalRotation.x @@ -6079,7 +6065,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: m_RootOrder - value: 18 + value: 1 objectReference: {fileID: 0} - target: {fileID: 11419152, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: wallManager @@ -6087,15 +6073,15 @@ Prefab: objectReference: {fileID: 329086457} - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: m_LocalScale.x - value: 35.9839325 + value: .998455286 objectReference: {fileID: 0} - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: m_LocalScale.y - value: 35.9839325 + value: .998455286 objectReference: {fileID: 0} - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: m_LocalScale.z - value: 35.9839325 + value: .998455286 objectReference: {fileID: 0} - target: {fileID: 129564, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: m_Name @@ -6200,7 +6186,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} propertyPath: m_RootOrder - value: 16 + value: 15 objectReference: {fileID: 0} - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} propertyPath: m_LocalScale.x @@ -6285,19 +6271,19 @@ Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 653857878} + m_TransformParent: {fileID: 1609190550} m_Modifications: - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: m_LocalPosition.x - value: -405 + value: -11.2931166 objectReference: {fileID: 0} - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: m_LocalPosition.y - value: -281 + value: -9.88281441 objectReference: {fileID: 0} - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: m_LocalPosition.z - value: 323.855438 + value: 8.98609829 objectReference: {fileID: 0} - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: m_LocalRotation.x @@ -6317,7 +6303,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: m_RootOrder - value: 14 + value: 0 objectReference: {fileID: 0} - target: {fileID: 11419152, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: wallManager @@ -6325,15 +6311,15 @@ Prefab: objectReference: {fileID: 329086457} - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: m_LocalScale.x - value: 35.9839363 + value: .998455405 objectReference: {fileID: 0} - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: m_LocalScale.y - value: 35.9839363 + value: .998455405 objectReference: {fileID: 0} - target: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} propertyPath: m_LocalScale.z - value: 35.9839363 + value: .998455405 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} @@ -6884,7 +6870,7 @@ Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 653857878} + m_TransformParent: {fileID: 512983136} m_Modifications: - target: {fileID: 471558, guid: cf3b36c1277b6914ca9531867d57d6e5, type: 2} propertyPath: m_LocalPosition.x @@ -6916,7 +6902,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 471558, guid: cf3b36c1277b6914ca9531867d57d6e5, type: 2} propertyPath: m_RootOrder - value: 6 + value: 1 objectReference: {fileID: 0} - target: {fileID: 11481414, guid: cf3b36c1277b6914ca9531867d57d6e5, type: 2} propertyPath: hasInfiniteAmmo @@ -7296,7 +7282,7 @@ Transform: - {fileID: 1720242252} - {fileID: 232170164} m_Father: {fileID: 653857878} - m_RootOrder: 3 + m_RootOrder: 1 --- !u!1001 &1460317504 Prefab: m_ObjectHideFlags: 0 @@ -7642,6 +7628,37 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_IsPrefabParent: 0 +--- !u!1 &1609190549 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1609190550} + m_Layer: 0 + m_Name: Dynamic Covers + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1609190550 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1609190549} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.99944329, y: 75.172699, z: 0} + m_LocalScale: {x: 36.0396042, y: 36.0396042, z: 36.0396042} + m_Children: + - {fileID: 531871430} + - {fileID: 2037202224} + - {fileID: 1866523315} + - {fileID: 47402629} + m_Father: {fileID: 653857878} + m_RootOrder: 5 --- !u!1 &1615139163 GameObject: m_ObjectHideFlags: 0 @@ -7739,7 +7756,7 @@ Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 653857878} + m_TransformParent: {fileID: 512983136} m_Modifications: - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} propertyPath: m_LocalPosition.x @@ -7771,7 +7788,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} propertyPath: m_RootOrder - value: 7 + value: 2 objectReference: {fileID: 0} - target: {fileID: 11440672, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} propertyPath: hasInfiniteAmmo @@ -7800,33 +7817,6 @@ Prefab: Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_PrefabInternal: {fileID: 846475841} ---- !u!1 &1649534404 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 1649534405} - m_Layer: 0 - m_Name: WallHolder - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1649534405 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1649534404} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 323.855438} - m_LocalScale: {x: 35.9839363, y: 35.9839363, z: 35.9839363} - m_Children: [] - m_Father: {fileID: 653857878} - m_RootOrder: 13 --- !u!1 &1660781285 GameObject: m_ObjectHideFlags: 0 @@ -8872,19 +8862,19 @@ Prefab: objectReference: {fileID: 1998640093} - target: {fileID: 22431700, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 22431700, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 22426558, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 22426558, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 133054, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_Name @@ -9704,7 +9694,7 @@ Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 653857878} + m_TransformParent: {fileID: 512983136} m_Modifications: - target: {fileID: 405082, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} propertyPath: m_LocalPosition.x @@ -9736,7 +9726,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 405082, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} propertyPath: m_RootOrder - value: 12 + value: 7 objectReference: {fileID: 0} - target: {fileID: 11420586, guid: 003cf19f83162bf49b315e76e2a9d43e, type: 2} propertyPath: hasInfiniteAmmo @@ -10218,6 +10208,7 @@ GameObject: - 224: {fileID: 2025581861} - 222: {fileID: 2025581862} - 114: {fileID: 1833327629} + - 114: {fileID: 2025581863} m_Layer: 5 m_Name: Timer m_TagString: Untagged @@ -10250,6 +10241,20 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2025581860} +--- !u!114 &2025581863 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2025581860} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c1353a536c9d8c746b42a5ac419d21c2, type: 3} + m_Name: + m_EditorClassIdentifier: + roundLength: 60 + timerText: {fileID: 1833327629} + isGamePaused: 0 --- !u!1001 &2025662497 Prefab: m_ObjectHideFlags: 0 @@ -10735,7 +10740,7 @@ Transform: - {fileID: 1070331672} - {fileID: 1102166523} m_Father: {fileID: 653857878} - m_RootOrder: 17 + m_RootOrder: 4 --- !u!114 &2112786343 stripped MonoBehaviour: m_PrefabParentObject: {fileID: 11405038, guid: 37b47e7042c5d694dbcf150debde834f, From eefda23279d520e58359b889bf460d55bebe464e Mon Sep 17 00:00:00 2001 From: Paul Normington Date: Tue, 1 Mar 2016 19:28:22 +0000 Subject: [PATCH 23/39] Stat Tracker attached to player. --- Assets/Acolades.cs | 27 + Assets/Acolades.cs.meta | 12 + Assets/Prefabs/Player 1.prefab | 2073 ++++++++++++++++++++++++++- Assets/Prefabs/Player 1.prefab.meta | 2 +- Assets/Scenes/Prototype.unity | 424 ++---- Assets/StatTracker.cs | 35 + Assets/StatTracker.cs.meta | 12 + 7 files changed, 2237 insertions(+), 348 deletions(-) create mode 100644 Assets/Acolades.cs create mode 100644 Assets/Acolades.cs.meta create mode 100644 Assets/StatTracker.cs create mode 100644 Assets/StatTracker.cs.meta diff --git a/Assets/Acolades.cs b/Assets/Acolades.cs new file mode 100644 index 0000000..69596da --- /dev/null +++ b/Assets/Acolades.cs @@ -0,0 +1,27 @@ +using UnityEngine; +using System.Collections; +using System.Collections.Generic; + +public class Acolades : MonoBehaviour { + + public List statTrackers = new List(); + + bool sorted; + + // Use this for initialization + void Start () { + + } + + // Update is called once per frame + void Update () { + //Compare all the statTrackers + //Compare elusiveScore + if (!sorted) { + for (int i = 0; i < statTrackers.Count; i++) { + //if (statTrackers [i].GetComponent ().elusiveScore () >= statTrackers [i + 1].GetComponent ().elusiveScore ()) { + //statTrackers[i] + } + } + } +} diff --git a/Assets/Acolades.cs.meta b/Assets/Acolades.cs.meta new file mode 100644 index 0000000..ba17320 --- /dev/null +++ b/Assets/Acolades.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 3da60e80b5f08a84bbeefea68eef36db +timeCreated: 1456839950 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Player 1.prefab b/Assets/Prefabs/Player 1.prefab index a8be3cc..cb497cb 100644 --- a/Assets/Prefabs/Player 1.prefab +++ b/Assets/Prefabs/Player 1.prefab @@ -1,35 +1,151 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &106500 +--- !u!1 &109242 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22449236} + - 222: {fileID: 22284044} + - 114: {fileID: 11482916} + - 114: {fileID: 11455178} + m_Layer: 5 + m_Name: PlayerAmmoCount1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &111226 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22446714} + m_Layer: 5 + m_Name: Fill Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &117662 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22423068} + - 222: {fileID: 22290392} + - 114: {fileID: 11409312} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &125686 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 4 m_Component: - - 4: {fileID: 409882} - - 212: {fileID: 21207774} - - 50: {fileID: 5057970} - - 61: {fileID: 6105624} - - 114: {fileID: 11478112} - - 114: {fileID: 11404236} + - 4: {fileID: 415802} + - 114: {fileID: 11457724} + - 114: {fileID: 11436168} + - 212: {fileID: 21284472} + - 114: {fileID: 11460076} + - 50: {fileID: 5007030} + - 61: {fileID: 6189416} + - 114: {fileID: 11433774} + - 114: {fileID: 11403606} m_Layer: 0 m_Name: Player 1 + m_TagString: Player + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &130486 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 4: {fileID: 442998} + - 114: {fileID: 11497108} + m_Layer: 0 + m_Name: SpriteManager1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &135394 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22478960} + - 222: {fileID: 22237330} + - 114: {fileID: 11411458} + m_Layer: 5 + m_Name: Fill m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &152524 +--- !u!1 &136784 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22410990} + - 114: {fileID: 11426000} + m_Layer: 5 + m_Name: PlayerAmmoCountSlider1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &141810 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22468868} + m_Layer: 5 + m_Name: Fill Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &148638 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 4 m_Component: - - 4: {fileID: 411536} - - 212: {fileID: 21242954} - - 114: {fileID: 11438638} + - 4: {fileID: 437298} + - 212: {fileID: 21216528} m_Layer: 0 m_Name: Reticle m_TagString: Untagged @@ -37,100 +153,1714 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &409882 +--- !u!1 &150180 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 4: {fileID: 484988} + - 212: {fileID: 21234086} + - 58: {fileID: 5808798} + - 114: {fileID: 11437266} + m_Layer: 0 + m_Name: BallMode + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &152794 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22461154} + - 222: {fileID: 22243938} + - 114: {fileID: 11482770} + m_Layer: 5 + m_Name: PlayerIconOne + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!1 &153446 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 4: {fileID: 423976} + - 198: {fileID: 19881748} + - 199: {fileID: 19961562} + m_Layer: 0 + m_Name: MiniGun Particle System + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &168570 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22403484} + m_Layer: 5 + m_Name: Player1HUD + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &176408 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22420022} + - 222: {fileID: 22241436} + - 114: {fileID: 11423686} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &198152 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22467912} + - 222: {fileID: 22215144} + - 114: {fileID: 11410246} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &198902 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 224: {fileID: 22406026} + - 114: {fileID: 11449660} + m_Layer: 5 + m_Name: PlayerHP1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &415802 Transform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 106500} + m_GameObject: {fileID: 125686} 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_LocalPosition: {x: 0, y: 0, z: 323.855438} + m_LocalScale: {x: 35.9839363, y: 35.9839363, z: 35.9839363} m_Children: - - {fileID: 411536} + - {fileID: 484988} + - {fileID: 437298} + - {fileID: 423976} + - {fileID: 22403484} + - {fileID: 442998} m_Father: {fileID: 0} m_RootOrder: 0 ---- !u!4 &411536 +--- !u!4 &423976 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 153446} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -.129999995, y: 0, z: .779999971} + m_LocalScale: {x: 5, y: 5, z: 5} + m_Children: [] + m_Father: {fileID: 415802} + m_RootOrder: 2 +--- !u!4 &437298 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 148638} + 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: 415802} + m_RootOrder: 1 +--- !u!4 &442998 Transform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 152524} + m_GameObject: {fileID: 130486} 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: 409882} + m_Father: {fileID: 415802} + m_RootOrder: 4 +--- !u!4 &484988 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 150180} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -1} + m_LocalScale: {x: .115264796, y: .115264796, z: .115264796} + m_Children: [] + m_Father: {fileID: 415802} m_RootOrder: 0 ---- !u!50 &5057970 +--- !u!50 &5007030 Rigidbody2D: + serializedVersion: 2 m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 106500} + m_GameObject: {fileID: 125686} m_Mass: 1 m_LinearDrag: 100 m_AngularDrag: .0500000007 m_GravityScale: 0 - m_FixedAngle: 1 m_IsKinematic: 0 m_Interpolate: 0 m_SleepingMode: 1 m_CollisionDetection: 0 ---- !u!61 &6105624 + m_Constraints: 4 +--- !u!58 &5808798 +CircleCollider2D: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 150180} + m_Enabled: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 10 +--- !u!61 &6189416 BoxCollider2D: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 106500} + m_GameObject: {fileID: 125686} m_Enabled: 1 m_Material: {fileID: 0} m_IsTrigger: 0 m_UsedByEffector: 0 - m_Offset: {x: 0, y: .100000001} + m_Offset: {x: -.125, y: -.0320999995} serializedVersion: 2 - m_Size: {x: 1.20000005, y: .200000003} ---- !u!114 &11404236 + m_Size: {x: .861835837, y: 2.24815989} +--- !u!114 &11403606 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 125686} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2064fcc622451c34086cbca807911795, type: 3} + m_Name: + m_EditorClassIdentifier: + ballObj: {fileID: 150180} + playerScript: {fileID: 11433774} + isBallin: 0 + weaponNumber: 0 +--- !u!114 &11409312 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 117662} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 05718618eaecab942a4da378f741875e, type: 3} + m_Type: 3 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 0 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!114 &11410246 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 106500} + m_GameObject: {fileID: 198152} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: .713235259, g: .545993865, b: 0, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 455c3660ef4b63041a191d714693b47f, type: 3} + m_Type: 3 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 0 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!114 &11411458 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 135394} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: .117241383, g: 1, b: 0, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 455c3660ef4b63041a191d714693b47f, type: 3} + m_Type: 3 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 0 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!114 &11423686 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 176408} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 05718618eaecab942a4da378f741875e, type: 3} + m_Type: 3 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 0 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!114 &11426000 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 136784} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -113659843, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} + m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} + m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_ColorMultiplier: 1 + m_FadeDuration: .100000001 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + m_FillRect: {fileID: 22467912} + m_HandleRect: {fileID: 0} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 1 + m_WholeNumbers: 0 + m_Value: 1 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Slider+SliderEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &11433774 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 125686} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3800ba1d4402403408247b3365ec08f5, type: 3} + m_Name: + m_EditorClassIdentifier: + mEquippedWeapon: {fileID: 0} + weaponList: [] + mPlayerNumber: 1 + HPSlider: {fileID: 11449660} + ammoSlider: {fileID: 11426000} + waitTime: 0 + minigunParticleSystem: {fileID: 19881748} + playerHUD: {fileID: 168570} +--- !u!114 &11436168 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 125686} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55891d2920542d641913a9d95d43c293, type: 3} + m_Name: + m_EditorClassIdentifier: + spriteManager: {fileID: 11497108} +--- !u!114 &11437266 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 150180} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 98209420a6d38b74bb9630d8cf0c9320, type: 3} + m_Name: + m_EditorClassIdentifier: + player: {fileID: 125686} +--- !u!114 &11449660 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 198902} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -113659843, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} + m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} + m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_ColorMultiplier: 1 + m_FadeDuration: .100000001 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + m_FillRect: {fileID: 22478960} + m_HandleRect: {fileID: 0} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 1 + m_WholeNumbers: 0 + m_Value: 1 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Slider+SliderEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &11455178 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 109242} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c88ea203cda48f3498c2583e23601830, type: 3} + m_Name: + m_EditorClassIdentifier: + ammoCount: {fileID: 11482916} + playerID: 1 + player: {fileID: 11433774} +--- !u!114 &11457724 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 125686} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8d5cf19dc09fdeb428bccce2b3e7e0a0, type: 3} m_Name: m_EditorClassIdentifier: - mMovementSpeed: 2000 ---- !u!114 &11438638 + mMovementSpeed: 1000 + _playerActions: {fileID: 11403606} +--- !u!114 &11460076 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 152524} + m_GameObject: {fileID: 125686} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 9953f2ce208997f4590922eebec801a4, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &11478112 + player: {fileID: 125686} + spriteManager: {fileID: 11497108} + mReticle: {fileID: 148638} +--- !u!114 &11482770 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 106500} + m_GameObject: {fileID: 152794} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8fd093cc424c8bc448a0687c4c9c016e, type: 3} + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} m_Name: m_EditorClassIdentifier: - bullet: {fileID: 104962, guid: dea1b2a0b5b8d2c46adb881aa59fc2a9, type: 2} ---- !u!212 &21207774 + m_Material: {fileID: 0} + m_Color: {r: .911764681, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 60 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Player 1 +--- !u!114 &11482916 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 109242} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: .911764681, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 32 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: AmmoCount +--- !u!114 &11497108 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 130486} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 72924532f27ef1a44a83a8354e4dcaa9, type: 3} + m_Name: + m_EditorClassIdentifier: + playerSprites: + - {fileID: 21300000, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300012, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300008, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300002, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300004, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300006, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300010, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300014, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300016, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + player: {fileID: 125686} +--- !u!198 &19881748 +ParticleSystem: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 153446} + lengthInSec: 2 + startDelay: 0 + speed: 1 + randomSeed: 0 + looping: 1 + prewarm: 1 + playOnAwake: 0 + moveWithTransform: 1 + InitialModule: + enabled: 1 + startLifetime: + scalar: .200000003 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + startSpeed: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + startColor: + maxGradient: + key0: + serializedVersion: 2 + rgba: 4294967295 + key1: + serializedVersion: 2 + rgba: 4294967295 + key2: + serializedVersion: 2 + rgba: 0 + key3: + serializedVersion: 2 + rgba: 0 + key4: + serializedVersion: 2 + rgba: 0 + key5: + serializedVersion: 2 + rgba: 0 + key6: + serializedVersion: 2 + rgba: 0 + key7: + serializedVersion: 2 + rgba: 0 + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + minGradient: + key0: + serializedVersion: 2 + rgba: 4294967295 + key1: + serializedVersion: 2 + rgba: 4294967295 + key2: + serializedVersion: 2 + rgba: 0 + key3: + serializedVersion: 2 + rgba: 0 + key4: + serializedVersion: 2 + rgba: 0 + key5: + serializedVersion: 2 + rgba: 0 + key6: + serializedVersion: 2 + rgba: 0 + key7: + serializedVersion: 2 + rgba: 0 + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + minColor: + serializedVersion: 2 + rgba: 4294967295 + maxColor: + serializedVersion: 2 + rgba: 4294967295 + minMaxState: 0 + startSize: + scalar: .200000003 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + startRotation: + scalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + gravityModifier: 8 + inheritVelocity: 0 + maxNumParticles: 100 + ShapeModule: + serializedVersion: 2 + enabled: 1 + type: 10 + radius: .200000003 + angle: 25 + length: 5 + boxX: 1 + boxY: 1 + boxZ: 1 + arc: 10 + placementMode: 0 + m_Mesh: {fileID: 0} + randomDirection: 0 + EmissionModule: + enabled: 1 + m_Type: 0 + rate: + scalar: 10 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + cnt0: 30 + cnt1: 30 + cnt2: 30 + cnt3: 30 + time0: 0 + time1: 0 + time2: 0 + time3: 0 + m_BurstCount: 0 + SizeModule: + enabled: 0 + curve: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 1 + RotationModule: + enabled: 1 + curve: + scalar: 17.4532928 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + ColorModule: + enabled: 1 + gradient: + maxGradient: + key0: + serializedVersion: 2 + rgba: 4294967295 + key1: + serializedVersion: 2 + rgba: 83886079 + key2: + serializedVersion: 2 + rgba: 0 + key3: + serializedVersion: 2 + rgba: 0 + key4: + serializedVersion: 2 + rgba: 0 + key5: + serializedVersion: 2 + rgba: 0 + key6: + serializedVersion: 2 + rgba: 0 + key7: + serializedVersion: 2 + rgba: 0 + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 65535 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + minGradient: + key0: + serializedVersion: 2 + rgba: 4294967295 + key1: + serializedVersion: 2 + rgba: 4294967295 + key2: + serializedVersion: 2 + rgba: 0 + key3: + serializedVersion: 2 + rgba: 0 + key4: + serializedVersion: 2 + rgba: 0 + key5: + serializedVersion: 2 + rgba: 0 + key6: + serializedVersion: 2 + rgba: 0 + key7: + serializedVersion: 2 + rgba: 0 + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + minColor: + serializedVersion: 2 + rgba: 4294967295 + maxColor: + serializedVersion: 2 + rgba: 4294967295 + minMaxState: 1 + UVModule: + enabled: 0 + frameOverTime: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 1 + tilesX: 1 + tilesY: 1 + animationType: 0 + rowIndex: 0 + cycles: 1 + randomRow: 1 + VelocityModule: + enabled: 1 + x: + scalar: .100000001 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + y: + scalar: .100000001 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + z: + scalar: .100000001 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + inWorldSpace: 0 + ForceModule: + enabled: 0 + x: + scalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + y: + scalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + z: + scalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + inWorldSpace: 0 + randomizePerFrame: 0 + ExternalForcesModule: + enabled: 0 + multiplier: 10 + ClampVelocityModule: + enabled: 0 + x: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + y: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + z: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + magnitude: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + separateAxis: 0 + inWorldSpace: 0 + dampen: .899999976 + SizeBySpeedModule: + enabled: 0 + curve: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 1 + range: {x: 0, y: 1} + RotationBySpeedModule: + enabled: 0 + curve: + scalar: .785398126 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + range: {x: 0, y: 1} + ColorBySpeedModule: + enabled: 0 + gradient: + maxGradient: + key0: + serializedVersion: 2 + rgba: 4294967295 + key1: + serializedVersion: 2 + rgba: 4294967295 + key2: + serializedVersion: 2 + rgba: 0 + key3: + serializedVersion: 2 + rgba: 0 + key4: + serializedVersion: 2 + rgba: 0 + key5: + serializedVersion: 2 + rgba: 0 + key6: + serializedVersion: 2 + rgba: 0 + key7: + serializedVersion: 2 + rgba: 0 + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + minGradient: + key0: + serializedVersion: 2 + rgba: 4294967295 + key1: + serializedVersion: 2 + rgba: 4294967295 + key2: + serializedVersion: 2 + rgba: 0 + key3: + serializedVersion: 2 + rgba: 0 + key4: + serializedVersion: 2 + rgba: 0 + key5: + serializedVersion: 2 + rgba: 0 + key6: + serializedVersion: 2 + rgba: 0 + key7: + serializedVersion: 2 + rgba: 0 + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + minColor: + serializedVersion: 2 + rgba: 4294967295 + maxColor: + serializedVersion: 2 + rgba: 4294967295 + minMaxState: 1 + range: {x: 0, y: 1} + CollisionModule: + enabled: 0 + type: 0 + plane0: {fileID: 0} + plane1: {fileID: 0} + plane2: {fileID: 0} + plane3: {fileID: 0} + plane4: {fileID: 0} + plane5: {fileID: 0} + dampen: 0 + bounce: 1 + energyLossOnCollision: 0 + minKillSpeed: 0 + particleRadius: .00999999978 + collidesWith: + serializedVersion: 2 + m_Bits: 4294967295 + quality: 0 + voxelSize: .5 + collisionMessages: 0 + SubModule: + enabled: 0 + subEmitterBirth: {fileID: 0} + subEmitterBirth1: {fileID: 0} + subEmitterCollision: {fileID: 0} + subEmitterCollision1: {fileID: 0} + subEmitterDeath: {fileID: 0} + subEmitterDeath1: {fileID: 0} +--- !u!199 &19961562 +ParticleSystemRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 153446} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_Materials: + - {fileID: 2100000, guid: 1598bf38b0a98824b9c2b464eaf93fb7, type: 2} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 1 + m_ReflectionProbeUsage: 1 + m_ProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_ImportantGI: 0 + m_AutoUVMaxDistance: .5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_RenderMode: 0 + m_MaxParticleSize: .5 + m_CameraVelocityScale: 0 + m_VelocityScale: 0 + m_LengthScale: 2 + m_SortingFudge: 0 + m_NormalDirection: 1 + m_SortMode: 0 + m_Mesh: {fileID: 0} + m_Mesh1: {fileID: 0} + m_Mesh2: {fileID: 0} + m_Mesh3: {fileID: 0} +--- !u!212 &21216528 SpriteRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 106500} + m_GameObject: {fileID: 148638} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -149,14 +1879,14 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 717c3cca669c64d488ffb990a8ed78d9, type: 3} + m_Sprite: {fileID: 21300000, guid: 1fd3c28ec5ebaef4d8511f68a1b521c2, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} ---- !u!212 &21242954 +--- !u!212 &21234086 SpriteRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 152524} + m_GameObject: {fileID: 150180} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -174,9 +1904,268 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 + m_SortingOrder: 1 + m_Sprite: {fileID: 21300000, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} +--- !u!212 &21284472 +SpriteRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 125686} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 1 + m_ReflectionProbeUsage: 1 + m_ProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_ImportantGI: 0 + m_AutoUVMaxDistance: .5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: -755987041 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: ebcde48508da607448708dea21c7065b, type: 3} + m_Sprite: {fileID: 21300006, guid: 8d5e240089c1c994291391e0a9631f95, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} +--- !u!222 &22215144 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 198152} +--- !u!222 &22237330 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 135394} +--- !u!222 &22241436 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 176408} +--- !u!222 &22243938 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 152794} +--- !u!222 &22284044 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 109242} +--- !u!222 &22290392 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 117662} +--- !u!224 &22403484 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 168570} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -9} + m_LocalScale: {x: .0277901795, y: .0042336476, z: .0277901795} + m_Children: + - {fileID: 22461154} + - {fileID: 22406026} + - {fileID: 22449236} + - {fileID: 22410990} + m_Father: {fileID: 415802} + m_RootOrder: 3 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: 23.0102539, y: .1796875} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: .5, y: .5} +--- !u!224 &22406026 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 198902} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 13, z: 1} + m_Children: + - {fileID: 22420022} + - {fileID: 22446714} + m_Father: {fileID: 22403484} + m_RootOrder: 1 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: -826, y: 451} + m_SizeDelta: {x: 100, y: 20} + m_Pivot: {x: .5, y: .5} +--- !u!224 &22410990 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 136784} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 13, z: 1} + m_Children: + - {fileID: 22423068} + - {fileID: 22468868} + m_Father: {fileID: 22403484} + m_RootOrder: 3 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -877, y: -527} + m_SizeDelta: {x: 100, y: 20} + m_Pivot: {x: 0, y: 0} +--- !u!224 &22420022 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 176408} + 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: 22406026} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: .25} + m_AnchorMax: {x: 1, y: .75} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -10, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!224 &22423068 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 117662} + 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: 22410990} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: .25} + m_AnchorMax: {x: 1, y: .75} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -10, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!224 &22446714 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 111226} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 22478960} + m_Father: {fileID: 22406026} + m_RootOrder: 1 + m_AnchorMin: {x: 0, y: .25} + m_AnchorMax: {x: 1, y: .75} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -20, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!224 &22449236 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 109242} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 6.56412172, z: 1} + m_Children: [] + m_Father: {fileID: 22403484} + m_RootOrder: 2 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: -758, y: -450} + m_SizeDelta: {x: 250, y: 80} + m_Pivot: {x: .5, y: .5} +--- !u!224 &22461154 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 152794} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 6.56412172, z: 1} + m_Children: [] + m_Father: {fileID: 22403484} + m_RootOrder: 0 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: -834, y: 208} + m_SizeDelta: {x: 250, y: 80} + m_Pivot: {x: .5, y: .5} +--- !u!224 &22467912 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 198152} + 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: 22468868} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 10, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!224 &22468868 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 141810} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 22467912} + m_Father: {fileID: 22410990} + m_RootOrder: 1 + m_AnchorMin: {x: 0, y: .25} + m_AnchorMax: {x: 1, y: .75} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -20, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!224 &22478960 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 135394} + 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: 22446714} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 10, y: 0} + m_Pivot: {x: .5, y: .5} --- !u!1001 &100100000 Prefab: m_ObjectHideFlags: 1 @@ -186,5 +2175,5 @@ Prefab: m_Modifications: [] m_RemovedComponents: [] m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 106500} + m_RootGameObject: {fileID: 125686} m_IsPrefabParent: 1 diff --git a/Assets/Prefabs/Player 1.prefab.meta b/Assets/Prefabs/Player 1.prefab.meta index fa8d089..54ec2bc 100644 --- a/Assets/Prefabs/Player 1.prefab.meta +++ b/Assets/Prefabs/Player 1.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 03770e410261d274a89c76e1c0deb063 -timeCreated: 1452534578 +timeCreated: 1456839434 licenseType: Free NativeFormatImporter: userData: diff --git a/Assets/Scenes/Prototype.unity b/Assets/Scenes/Prototype.unity index 231b12f..62d6683 100644 --- a/Assets/Scenes/Prototype.unity +++ b/Assets/Scenes/Prototype.unity @@ -650,6 +650,64 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_IsPrefabParent: 0 +--- !u!1001 &77461409 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1515989185} + m_Modifications: + - target: {fileID: 418188, guid: 08a27cbc8e73fef4cb7f9cb3b2b6eb71, type: 2} + propertyPath: m_LocalPosition.x + value: .382297277 + objectReference: {fileID: 0} + - target: {fileID: 418188, guid: 08a27cbc8e73fef4cb7f9cb3b2b6eb71, type: 2} + propertyPath: m_LocalPosition.y + value: -.199220359 + objectReference: {fileID: 0} + - target: {fileID: 418188, guid: 08a27cbc8e73fef4cb7f9cb3b2b6eb71, type: 2} + propertyPath: m_LocalPosition.z + value: .00820271578 + objectReference: {fileID: 0} + - target: {fileID: 418188, guid: 08a27cbc8e73fef4cb7f9cb3b2b6eb71, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 418188, guid: 08a27cbc8e73fef4cb7f9cb3b2b6eb71, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 418188, guid: 08a27cbc8e73fef4cb7f9cb3b2b6eb71, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 418188, guid: 08a27cbc8e73fef4cb7f9cb3b2b6eb71, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 418188, guid: 08a27cbc8e73fef4cb7f9cb3b2b6eb71, type: 2} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 418188, guid: 08a27cbc8e73fef4cb7f9cb3b2b6eb71, type: 2} + propertyPath: m_LocalScale.x + value: 1.00091147 + objectReference: {fileID: 0} + - target: {fileID: 418188, guid: 08a27cbc8e73fef4cb7f9cb3b2b6eb71, type: 2} + propertyPath: m_LocalScale.y + value: 1.00091147 + objectReference: {fileID: 0} + - target: {fileID: 418188, guid: 08a27cbc8e73fef4cb7f9cb3b2b6eb71, type: 2} + propertyPath: m_LocalScale.z + value: 1.00091147 + objectReference: {fileID: 0} + - target: {fileID: 11444164, guid: 08a27cbc8e73fef4cb7f9cb3b2b6eb71, type: 2} + propertyPath: player + value: + objectReference: {fileID: 1515989180} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 08a27cbc8e73fef4cb7f9cb3b2b6eb71, type: 2} + m_IsPrefabParent: 0 --- !u!4 &84567864 stripped Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} @@ -1239,68 +1297,6 @@ Transform: Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_PrefabInternal: {fileID: 677909765} ---- !u!1001 &256436919 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1515989185} - m_Modifications: - - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 11488472, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} - propertyPath: player - value: - objectReference: {fileID: 1515989180} - - target: {fileID: 123852, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} - propertyPath: m_Name - value: SpriteManager1 - objectReference: {fileID: 0} - - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} - propertyPath: m_LocalScale.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} - m_IsPrefabParent: 0 --- !u!4 &266021868 stripped Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} @@ -5639,10 +5635,6 @@ Transform: Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_PrefabInternal: {fileID: 669112603} ---- !u!1 &1134726024 stripped -GameObject: - m_PrefabParentObject: {fileID: 121534, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - m_PrefabInternal: {fileID: 1800545368} --- !u!1001 &1138030137 Prefab: m_ObjectHideFlags: 0 @@ -5964,6 +5956,47 @@ CanvasRenderer: type: 2} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1234335048} +--- !u!1 &1243680215 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 172904, guid: 08a27cbc8e73fef4cb7f9cb3b2b6eb71, type: 2} + m_PrefabInternal: {fileID: 77461409} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1243680216} + - 114: {fileID: 1243680217} + m_Layer: 0 + m_Name: StatTracker + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1243680216 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 418188, guid: 08a27cbc8e73fef4cb7f9cb3b2b6eb71, type: 2} + m_PrefabInternal: {fileID: 77461409} + m_GameObject: {fileID: 1243680215} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: .382297277, y: -.199220359, z: .00820271578} + m_LocalScale: {x: 1.00091147, y: 1.00091147, z: 1.00091147} + m_Children: [] + m_Father: {fileID: 1515989185} + m_RootOrder: 5 +--- !u!114 &1243680217 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11444164, guid: 08a27cbc8e73fef4cb7f9cb3b2b6eb71, + type: 2} + m_PrefabInternal: {fileID: 77461409} + m_GameObject: {fileID: 1243680215} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 56528e23e2f115447855f6a2e52937f4, type: 3} + m_Name: + m_EditorClassIdentifier: + player: {fileID: 1515989180} --- !u!4 &1250928786 stripped Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} @@ -7196,7 +7229,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_SortingLayerID - value: 1573436195 + value: 2015190895 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} @@ -7391,17 +7424,17 @@ Transform: m_RootOrder: 1 --- !u!1 &1515989180 stripped GameObject: - m_PrefabParentObject: {fileID: 133054, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabParentObject: {fileID: 125686, guid: 03770e410261d274a89c76e1c0deb063, type: 2} m_PrefabInternal: {fileID: 1800545368} --- !u!114 &1515989184 stripped MonoBehaviour: - m_PrefabParentObject: {fileID: 11438944, guid: 37b47e7042c5d694dbcf150debde834f, + m_PrefabParentObject: {fileID: 11433774, guid: 03770e410261d274a89c76e1c0deb063, type: 2} m_PrefabInternal: {fileID: 1800545368} m_Script: {fileID: 11500000, guid: 3800ba1d4402403408247b3365ec08f5, type: 3} --- !u!4 &1515989185 stripped Transform: - m_PrefabParentObject: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabParentObject: {fileID: 415802, guid: 03770e410261d274a89c76e1c0deb063, type: 2} m_PrefabInternal: {fileID: 1800545368} --- !u!1001 &1528351361 Prefab: @@ -8271,12 +8304,6 @@ Transform: Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_PrefabInternal: {fileID: 1290932045} ---- !u!114 &1726136058 stripped -MonoBehaviour: - m_PrefabParentObject: {fileID: 11488472, guid: 177f3aee218d5654f91c54c038b43ac9, - type: 2} - m_PrefabInternal: {fileID: 256436919} - m_Script: {fileID: 11500000, guid: 72924532f27ef1a44a83a8354e4dcaa9, type: 3} --- !u!1001 &1746983353 Prefab: m_ObjectHideFlags: 0 @@ -8762,273 +8789,60 @@ Prefab: m_Modification: m_TransformParent: {fileID: 653857878} m_Modifications: - - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + - target: {fileID: 415802, guid: 03770e410261d274a89c76e1c0deb063, type: 2} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + - target: {fileID: 415802, guid: 03770e410261d274a89c76e1c0deb063, type: 2} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + - target: {fileID: 415802, guid: 03770e410261d274a89c76e1c0deb063, type: 2} propertyPath: m_LocalPosition.z value: 323.855438 objectReference: {fileID: 0} - - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + - target: {fileID: 415802, guid: 03770e410261d274a89c76e1c0deb063, type: 2} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + - target: {fileID: 415802, guid: 03770e410261d274a89c76e1c0deb063, type: 2} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + - target: {fileID: 415802, guid: 03770e410261d274a89c76e1c0deb063, type: 2} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + - target: {fileID: 415802, guid: 03770e410261d274a89c76e1c0deb063, type: 2} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + - target: {fileID: 415802, guid: 03770e410261d274a89c76e1c0deb063, type: 2} propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} - - target: {fileID: 11423510, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: spriteManager - value: - objectReference: {fileID: 1726136058} - - target: {fileID: 11438944, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + - target: {fileID: 11433774, guid: 03770e410261d274a89c76e1c0deb063, type: 2} propertyPath: mEquippedWeapon value: objectReference: {fileID: 1998640093} - - target: {fileID: 22431700, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + - target: {fileID: 22478960, guid: 03770e410261d274a89c76e1c0deb063, type: 2} propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 22431700, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 22426558, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 22426558, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 133054, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Name - value: Player 1 - objectReference: {fileID: 0} - - target: {fileID: 11438944, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: mPlayerNumber - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11468964, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: spriteManager - value: - objectReference: {fileID: 1726136058} - - target: {fileID: 21230166, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: d3661648c4213db4a83f88596f678fe0, - type: 3} - - target: {fileID: 11438944, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: playerHUD - value: - objectReference: {fileID: 1134726024} - - target: {fileID: 11446066, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 05718618eaecab942a4da378f741875e, - type: 3} - - target: {fileID: 11446066, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Color.r - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11446066, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Color.g - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11446066, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Color.b - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11473472, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 455c3660ef4b63041a191d714693b47f, - type: 3} - - target: {fileID: 11446066, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Type - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 11446066, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_FillMethod - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 11446066, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_PreserveAspect - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11473472, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_RaycastTarget - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 11473472, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Type - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 11473472, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_FillOrigin - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 11473472, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_FillMethod value: 0 objectReference: {fileID: 0} - - target: {fileID: 11473472, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Color.r - value: .117241383 - objectReference: {fileID: 0} - - target: {fileID: 11473472, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Color.g - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11473472, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Color.b - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 11446066, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_RaycastTarget - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 11473472, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_PreserveAspect - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11404772, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Color.r - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11404772, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Color.g - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11404772, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Color.b - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11404772, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_RaycastTarget - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 11404772, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 05718618eaecab942a4da378f741875e, - type: 3} - - target: {fileID: 11404772, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Type - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 11404772, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_PreserveAspect - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11404772, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_FillMethod - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 11468980, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Color.r - value: .713235259 - objectReference: {fileID: 0} - - target: {fileID: 11468980, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Color.g - value: .545993865 - objectReference: {fileID: 0} - - target: {fileID: 11468980, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_RaycastTarget - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 11468980, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 455c3660ef4b63041a191d714693b47f, - type: 3} - - target: {fileID: 11468980, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Type - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 11468980, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_PreserveAspect - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11468980, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_FillMethod - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22428368, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_AnchoredPosition.y - value: -450 - objectReference: {fileID: 0} - - target: {fileID: 22441718, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_AnchoredPosition.y - value: -527 - objectReference: {fileID: 0} - - target: {fileID: 22441718, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22441718, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + - target: {fileID: 22478960, guid: 03770e410261d274a89c76e1c0deb063, type: 2} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 22441718, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_AnchoredPosition.x - value: -877 - objectReference: {fileID: 0} - - target: {fileID: 22441718, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22441718, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + - target: {fileID: 22467912, guid: 03770e410261d274a89c76e1c0deb063, type: 2} propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 22441718, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22441718, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Pivot.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22428368, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_AnchoredPosition.x - value: -758 - objectReference: {fileID: 0} - - target: {fileID: 11405038, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_FontData.m_FontSize - value: 32 - objectReference: {fileID: 0} - - target: {fileID: 11405038, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_FontData.m_RichText - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11434670, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Interactable - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11468980, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Color.b + - target: {fileID: 22467912, guid: 03770e410261d274a89c76e1c0deb063, type: 2} + propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_ParentPrefab: {fileID: 100100000, guid: 03770e410261d274a89c76e1c0deb063, type: 2} m_IsPrefabParent: 0 --- !u!1001 &1805697436 Prefab: @@ -10639,7 +10453,7 @@ Prefab: m_IsPrefabParent: 0 --- !u!114 &2112786343 stripped MonoBehaviour: - m_PrefabParentObject: {fileID: 11405038, guid: 37b47e7042c5d694dbcf150debde834f, + m_PrefabParentObject: {fileID: 11482916, guid: 03770e410261d274a89c76e1c0deb063, type: 2} m_PrefabInternal: {fileID: 1800545368} m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} diff --git a/Assets/StatTracker.cs b/Assets/StatTracker.cs new file mode 100644 index 0000000..71efcf3 --- /dev/null +++ b/Assets/StatTracker.cs @@ -0,0 +1,35 @@ +using UnityEngine; +using System.Collections; + +public class StatTracker : MonoBehaviour { + + public GameObject p; + public GameObject acoladeManager; + Vector3 oldPos; + float oldValue; + + public float elusiveScore; //Linked to the acolade, elusive (taken the least damage) + public float timeSatStill; //Linked to the acolade, squatter + public float amountOfBullets; //Linked to the acolade, spray and pray + //Need another script to compare all of the different score + // Use this for initialization + void Start () { + acoladeManager.GetComponent ().statTrackers.Add (this.gameObject); + elusiveScore = p.GetComponent ().HPSlider.value; + } + + // Update is called once per frame + void Update () { + oldPos = new Vector3 (0, 0, 0); + oldValue = p.GetComponent ().ammoSlider.value; + if (p.transform.position == oldPos) { + timeSatStill += Time.deltaTime; + } + oldPos = p.transform.position; + + if(p.GetComponent ().ammoSlider.value <= oldValue) + { + amountOfBullets += 1; + } + } +} diff --git a/Assets/StatTracker.cs.meta b/Assets/StatTracker.cs.meta new file mode 100644 index 0000000..7e9664d --- /dev/null +++ b/Assets/StatTracker.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 56528e23e2f115447855f6a2e52937f4 +timeCreated: 1456838923 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From e7a20cb3818fb841c92277ddec9df5ce8cb5fdff Mon Sep 17 00:00:00 2001 From: JSleekXD Date: Tue, 1 Mar 2016 20:13:31 +0000 Subject: [PATCH 24/39] Players can now respawn after dying. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Respawning now works. • After the player dies, their active components are disabled (so they can’t move, shoot or emit anything). This replaces disabling the player game object entirely, as the Player.cs script on the player game object still needs to be accessed, and it can’t be accessed properly (booleans) without the gameobject it is attached to being enabled. • Then, the player’s health, gun and ammo are reset to a default setting (max hp, switch gun to pistol, max ammo in pistol). • The respawn timer is then started. After the timer hits the threshold, the player is then enabled and shown. --- Assets/Scenes/Prototype.unity | 393 +++++++++++++++++++++++++++++-- Assets/Scripts/Player/Player.cs | 78 +++++- ProjectSettings/TagManager.asset | 1 + 3 files changed, 448 insertions(+), 24 deletions(-) diff --git a/Assets/Scenes/Prototype.unity b/Assets/Scenes/Prototype.unity index 1516464..e125580 100644 --- a/Assets/Scenes/Prototype.unity +++ b/Assets/Scenes/Prototype.unity @@ -1515,8 +1515,8 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 323.855438} m_LocalScale: {x: 35.9839363, y: 35.9839363, z: 35.9839363} m_Children: [] - m_Father: {fileID: 653857878} - m_RootOrder: 3 + m_Father: {fileID: 1960966083} + m_RootOrder: 1 --- !u!114 &329086457 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3135,7 +3135,7 @@ GameObject: m_Component: - 224: {fileID: 512983136} m_Layer: 5 - m_Name: Guns + m_Name: Weapons m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3160,7 +3160,7 @@ RectTransform: - {fileID: 605769312} - {fileID: 516090087} m_Father: {fileID: 653857878} - m_RootOrder: 6 + m_RootOrder: 3 m_AnchorMin: {x: .5, y: .5} m_AnchorMax: {x: .5, y: .5} m_AnchoredPosition: {x: -1.78813934e-06, y: 0} @@ -3297,7 +3297,7 @@ Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 653857878} + m_TransformParent: {fileID: 1960966083} m_Modifications: - target: {fileID: 401230, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} propertyPath: m_LocalPosition.x @@ -3329,7 +3329,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 401230, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} propertyPath: m_RootOrder - value: 14 + value: 2 objectReference: {fileID: 0} - target: {fileID: 194862, guid: 7d978cf6304959f409bdd80d1f97e725, type: 2} propertyPath: m_Name @@ -3581,13 +3581,10 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - {fileID: 143147948} - - {fileID: 1456487450} - {fileID: 1515989185} - - {fileID: 329086456} - - {fileID: 2107970909} - - {fileID: 1609190550} + - {fileID: 1456487450} - {fileID: 512983136} - - {fileID: 1717947874} + - {fileID: 1960966083} - {fileID: 162690262} m_Father: {fileID: 0} m_RootOrder: 2 @@ -4052,6 +4049,74 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_IsPrefabParent: 0 +--- !u!1 &737733635 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 737733636} + - 222: {fileID: 737733638} + - 114: {fileID: 737733637} + m_Layer: 5 + m_Name: Respawn Point 1 + m_TagString: RESPAWNPOINT + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &737733636 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 737733635} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2041321888} + m_Father: {fileID: 1705665582} + m_RootOrder: 0 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: -270.600006, y: 175.899994} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: .5, y: .5} +--- !u!114 &737733637 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 737733635} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &737733638 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 737733635} --- !u!1001 &746160465 Prefab: m_ObjectHideFlags: 0 @@ -4541,6 +4606,64 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} m_IsPrefabParent: 0 +--- !u!1001 &835328183 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1515989185} + m_Modifications: + - target: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 159140, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} + propertyPath: m_Name + value: PlayerPistol + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} + m_IsPrefabParent: 0 --- !u!4 &841423359 stripped Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} @@ -4888,6 +5011,16 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Slider+SliderEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!4 &879158140 stripped +Transform: + m_PrefabParentObject: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} + m_PrefabInternal: {fileID: 1330797746} +--- !u!114 &879158141 stripped +MonoBehaviour: + m_PrefabParentObject: {fileID: 11406788, guid: fb80daa749f26694dbd949ac8cd91e23, + type: 2} + m_PrefabInternal: {fileID: 1330797746} + m_Script: {fileID: 11500000, guid: c5ecd6a541894464d8a1b8dc1d6ef09b, type: 3} --- !u!1001 &886125205 Prefab: m_ObjectHideFlags: 0 @@ -6186,7 +6319,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} propertyPath: m_RootOrder - value: 15 + value: 8 objectReference: {fileID: 0} - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} propertyPath: m_LocalScale.x @@ -6525,6 +6658,64 @@ Prefab: Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_PrefabInternal: {fileID: 1528351361} +--- !u!1001 &1330797746 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1456487450} + m_Modifications: + - target: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} + propertyPath: m_LocalPosition.x + value: -13.0795021 + objectReference: {fileID: 0} + - target: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} + propertyPath: m_LocalPosition.y + value: .416473091 + objectReference: {fileID: 0} + - target: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} + propertyPath: m_LocalPosition.z + value: -323.863647 + objectReference: {fileID: 0} + - target: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} + propertyPath: m_LocalScale.x + value: .99908936 + objectReference: {fileID: 0} + - target: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} + propertyPath: m_LocalScale.y + value: .99908936 + objectReference: {fileID: 0} + - target: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} + propertyPath: m_LocalScale.z + value: .99908936 + objectReference: {fileID: 0} + - target: {fileID: 159140, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} + propertyPath: m_Name + value: PlayerPistol + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} + m_IsPrefabParent: 0 --- !u!1001 &1346685846 Prefab: m_ObjectHideFlags: 0 @@ -7281,8 +7472,9 @@ Transform: - {fileID: 389116437} - {fileID: 1720242252} - {fileID: 232170164} + - {fileID: 879158140} m_Father: {fileID: 653857878} - m_RootOrder: 1 + m_RootOrder: 2 --- !u!1001 &1460317504 Prefab: m_ObjectHideFlags: 0 @@ -7628,6 +7820,12 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_IsPrefabParent: 0 +--- !u!114 &1597409232 stripped +MonoBehaviour: + m_PrefabParentObject: {fileID: 11406788, guid: fb80daa749f26694dbd949ac8cd91e23, + type: 2} + m_PrefabInternal: {fileID: 835328183} + m_Script: {fileID: 11500000, guid: c5ecd6a541894464d8a1b8dc1d6ef09b, type: 3} --- !u!1 &1609190549 GameObject: m_ObjectHideFlags: 0 @@ -7657,8 +7855,8 @@ Transform: - {fileID: 2037202224} - {fileID: 1866523315} - {fileID: 47402629} - m_Father: {fileID: 653857878} - m_RootOrder: 5 + m_Father: {fileID: 1960966083} + m_RootOrder: 3 --- !u!1 &1615139163 GameObject: m_ObjectHideFlags: 0 @@ -8254,6 +8452,39 @@ Transform: - {fileID: 1818458944} m_Father: {fileID: 1660781286} m_RootOrder: 0 +--- !u!1 &1705665581 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1705665582} + m_Layer: 5 + m_Name: Respawn Points + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1705665582 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1705665581} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 737733636} + m_Father: {fileID: 1960966083} + m_RootOrder: 4 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: .5, y: .5} --- !u!1001 &1715199203 Prefab: m_ObjectHideFlags: 0 @@ -8850,7 +9081,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 11423510, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: spriteManager @@ -8862,19 +9093,19 @@ Prefab: objectReference: {fileID: 1998640093} - target: {fileID: 22431700, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 22431700, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 22426558, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_AnchorMax.x - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 22426558, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 133054, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_Name @@ -9085,6 +9316,10 @@ Prefab: propertyPath: m_Color.b value: 0 objectReference: {fileID: 0} + - target: {fileID: 11438944, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: playerPistol + value: + objectReference: {fileID: 1597409232} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} m_IsPrefabParent: 0 @@ -9347,6 +9582,11 @@ MonoBehaviour: waitTime: 0 minigunParticleSystem: {fileID: 467455901} playerHUD: {fileID: 232170163} + playerPistol: {fileID: 879158141} + playerSpawnPoints: [] + isPlayerDead: 0 + timeToRespawn: 3 + timeSpentDead: 0 --- !u!114 &1870004479 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9859,6 +10099,43 @@ Transform: Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_PrefabInternal: {fileID: 2104523922} +--- !u!1 &1960966082 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1960966083} + m_Layer: 5 + m_Name: Arena + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1960966083 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1960966082} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2107970909} + - {fileID: 329086456} + - {fileID: 1717947874} + - {fileID: 1609190550} + - {fileID: 1705665582} + m_Father: {fileID: 653857878} + m_RootOrder: 4 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: -1.78813934e-06, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: .5, y: .5} --- !u!1 &1967053838 GameObject: m_ObjectHideFlags: 0 @@ -10318,6 +10595,78 @@ Prefab: Transform: m_PrefabParentObject: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} m_PrefabInternal: {fileID: 1259412688} +--- !u!1 &2041321887 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 2041321888} + - 222: {fileID: 2041321890} + - 114: {fileID: 2041321889} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2041321888 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2041321887} + 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: 737733636} + m_RootOrder: 0 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: .5, y: .5} +--- !u!114 &2041321889 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2041321887} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 50 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: R +--- !u!222 &2041321890 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2041321887} --- !u!1 &2050290494 GameObject: m_ObjectHideFlags: 0 @@ -10739,8 +11088,8 @@ Transform: - {fileID: 782908716} - {fileID: 1070331672} - {fileID: 1102166523} - m_Father: {fileID: 653857878} - m_RootOrder: 4 + m_Father: {fileID: 1960966083} + m_RootOrder: 0 --- !u!114 &2112786343 stripped MonoBehaviour: m_PrefabParentObject: {fileID: 11405038, guid: 37b47e7042c5d694dbcf150debde834f, diff --git a/Assets/Scripts/Player/Player.cs b/Assets/Scripts/Player/Player.cs index 2de0bd2..97a4c9b 100644 --- a/Assets/Scripts/Player/Player.cs +++ b/Assets/Scripts/Player/Player.cs @@ -31,6 +31,7 @@ public int PlayerNumber Vector2 mReticlePosition; public ParticleSystem minigunParticleSystem; public GameObject playerHUD; + public Vector2 ReticlePosition { get @@ -39,6 +40,17 @@ public Vector2 ReticlePosition } } + public Pistol playerPistol; + public GameObject[] playerSpawnPoints; + public bool isPlayerDead = false; + public float timeToRespawn = 3f; + public float timeSpentDead = 0f; + + + void Awake() + { + playerSpawnPoints = GameObject.FindGameObjectsWithTag("RESPAWNPOINT"); + } void Start() { mReticlePosition = mEquippedWeapon.transform.position; @@ -53,6 +65,22 @@ void Start() void Update() { + Debug.Log(timeSpentDead); + if (isPlayerDead) + { + Debug.Log("TRUE"); + } + if (isPlayerDead == true) { + Debug.Log("AAAAA"); + timeSpentDead += Time.deltaTime; + if (timeSpentDead >= timeToRespawn) + { + EnableAndShowPlayer(); + isPlayerDead = false; + timeSpentDead = 0f; + } + } + //if L3 is held, the HUD will appear if (Input.GetButton("Player_" + mPlayerNumber + "_Back")) { @@ -68,7 +96,7 @@ void Update() { if (GetComponent().AimDirection.magnitude > 0.9) { //if the fire button is pressed, fire the gun. - if (Input.GetButton("Player_" + mPlayerNumber + "_Fire1")) + if (Input.GetButton("Player_" + mPlayerNumber + "_Fire1") && !isPlayerDead) { if (mEquippedWeapon.RemainingAmmo >= 0) { @@ -105,9 +133,15 @@ void OnCollisionEnter2D(Collision2D coll) } //if the player's health is 0, the player game object will be disabled. if(HPSlider.value == 0) { - gameObject.SetActive(false); + // gameObject.SetActive(false); + DisableAndHidePlayer(); Debug.Log("Player_" + mPlayerNumber + " has died"); + ResetPlayerProperties(); + SetPlayerSpawnPosition(); + StartRespawnTimer(); + + } Debug.Log("Player_" + mPlayerNumber + " took damage from Player_" + coll.gameObject.GetComponent().OwnerID + "'s projectile"); @@ -115,6 +149,46 @@ void OnCollisionEnter2D(Collision2D coll) } } + public void ResetPlayerProperties() + { + //reset player's health + mHealth = mMaxHealth; + //equip the player with a fully loaded pistol. + mEquippedWeapon = playerPistol; + mEquippedWeapon.RemainingAmmo = mEquippedWeapon.MaximumAmmo; + } + public void SetPlayerSpawnPosition() + { + //sets the player's position to a random spawn point. + gameObject.transform.position = playerSpawnPoints[Random.Range(0, playerSpawnPoints.Length)].transform.position; + } + public void StartRespawnTimer() + { + isPlayerDead = true; + } + public void DisableAndHidePlayer() + { + gameObject.GetComponent().enabled = false; + gameObject.GetComponent().enabled = false; + gameObject.GetComponent().enabled = false; + gameObject.GetComponent().enabled = false; + gameObject.GetComponent().enabled = false; + gameObject.GetComponent().enabled = false; + gameObject.GetComponentInChildren().enabled = false; + + } + public void EnableAndShowPlayer() + { + gameObject.GetComponent().enabled = true; + gameObject.GetComponent().enabled = true; + gameObject.GetComponent().enabled = true; + gameObject.GetComponent().enabled = true; + gameObject.GetComponent().enabled = true; + gameObject.GetComponent().enabled = true; + gameObject.GetComponentInChildren().enabled = true; + } + + public void ChangeWeapon(int weaponNumber) { diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index cc354a6..d6fbf06 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -6,6 +6,7 @@ TagManager: tags: - Projectile - Dynamic + - RESPAWNPOINT layers: - Default - TransparentFX From 9940a6119d69482e610d0db6f57f102d1a1158b7 Mon Sep 17 00:00:00 2001 From: JSleekXD Date: Tue, 1 Mar 2016 20:31:02 +0000 Subject: [PATCH 25/39] Fixed reticle disabling/enabling during player respawn The Reticle was not getting disabled when the player died. It now does, and enabled again when the player respawns. --- Assets/Scenes/Prototype.unity | 16 ++++++++++++---- Assets/Scripts/Player/Player.cs | 8 +++++--- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/Assets/Scenes/Prototype.unity b/Assets/Scenes/Prototype.unity index e125580..2db5417 100644 --- a/Assets/Scenes/Prototype.unity +++ b/Assets/Scenes/Prototype.unity @@ -683,7 +683,7 @@ Transform: m_LocalScale: {x: .115264796, y: .115264796, z: .115264796} m_Children: [] m_Father: {fileID: 1456487450} - m_RootOrder: 1 + m_RootOrder: 2 --- !u!114 &100469318 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1332,7 +1332,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1456487450} - m_RootOrder: 2 + m_RootOrder: 0 --- !u!212 &282481003 SpriteRenderer: m_ObjectHideFlags: 0 @@ -2018,7 +2018,7 @@ Transform: m_LocalScale: {x: 5, y: 5, z: 5} m_Children: [] m_Father: {fileID: 1456487450} - m_RootOrder: 0 + m_RootOrder: 1 --- !u!199 &467455900 ParticleSystemRenderer: m_ObjectHideFlags: 0 @@ -7466,9 +7466,9 @@ Transform: m_LocalPosition: {x: 471.080963, y: -15, z: 11988.3662} m_LocalScale: {x: 36.0167351, y: 36.0167351, z: 36.0167351} m_Children: + - {fileID: 282481002} - {fileID: 467455899} - {fileID: 100469317} - - {fileID: 282481002} - {fileID: 389116437} - {fileID: 1720242252} - {fileID: 232170164} @@ -9320,6 +9320,14 @@ Prefab: propertyPath: playerPistol value: objectReference: {fileID: 1597409232} + - target: {fileID: 445210, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 495372, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} m_IsPrefabParent: 0 diff --git a/Assets/Scripts/Player/Player.cs b/Assets/Scripts/Player/Player.cs index 97a4c9b..c7b3f30 100644 --- a/Assets/Scripts/Player/Player.cs +++ b/Assets/Scripts/Player/Player.cs @@ -174,8 +174,9 @@ public void DisableAndHidePlayer() gameObject.GetComponent().enabled = false; gameObject.GetComponent().enabled = false; gameObject.GetComponent().enabled = false; - gameObject.GetComponentInChildren().enabled = false; - + //disabling Reticle Game object + gameObject.transform.GetChild(0).gameObject.SetActive(false); + } public void EnableAndShowPlayer() { @@ -185,7 +186,8 @@ public void EnableAndShowPlayer() gameObject.GetComponent().enabled = true; gameObject.GetComponent().enabled = true; gameObject.GetComponent().enabled = true; - gameObject.GetComponentInChildren().enabled = true; + //enabling Reticle Game object + gameObject.transform.GetChild(0).gameObject.SetActive(true); } From 5640bf16ed0900b17dccb3d5b7700a213879aa0d Mon Sep 17 00:00:00 2001 From: Paul Normington Date: Tue, 1 Mar 2016 20:48:41 +0000 Subject: [PATCH 26/39] Package --- StatTrackAndAcolade.unitypackage | Bin 0 -> 1991 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 StatTrackAndAcolade.unitypackage diff --git a/StatTrackAndAcolade.unitypackage b/StatTrackAndAcolade.unitypackage new file mode 100644 index 0000000000000000000000000000000000000000..f24a68ae32cfabac06a45cdaaaabd9844ab458f5 GIT binary patch literal 1991 zcmV;&2RQg2iwFn;0M=Fj0AX@tXmn+5a4vLVascgHZEw>s5boFIR~#QeL$EAy-kOym zjqx^#H&H-B2q7nNiXlx(;tmGdFXID0iNCgraX5Z@!7ry6bOrtcGCSdOon>xR)M2JvK%H6BC!XC(s@s~A3NP%>yy+!CupSo=x*VM<2IR z8YC>5^<7%ncPnui=6up%VLGapt1y~!Z0)!X=`&(665}n~_Rs)hmlEa>-|}MnDu{y# zs=zv|Et6W0y9qul_97fHk2%ZLy~*ORX_zH6V)toEN8c-fCDQ^I!Z6HoR?02-m<_2I z3Z5io2_0usoYeTnG)b5!YRZ!H2AAfur(t5BA9W12<@ldfg4>>0(iD((Ac%)6ssUH=n& zSf;3s-sx%8`Ul%wz<&hos9XPS(2iVS#b)^gDK=}HUVWmaodRUq+J43(8P~}LtY1b6*0i-l{7~&C5$L{l|KA4v0ROKtjbre?<@=6t4E~p{e~$Z?$K4_X z9MeQR#%^+k{&yB8V;@*Jl`ec1oy9U;Qm1sm`;&_I72WRS=|ZFmPoXp5V0}u|!b( zrC1%-B|VPkKvNyApIkz?wmn}Nm$9*uWWo5PFedgti^Tk#|8EWd+qP+`^M7WC|68GB z@&Cz=109F|`#!Nc{QnoxDkZmr|DDD6e;xjBi7NbG+sJhxfd7en-z5==f&h=(Qs&tG zenjxJYaCd1?E8`RoAAHYz5j2AR_g!!@jo6Jv=;I|Ovmc>f347I@;?mRu)BXr{)fym zFqY(hST^zdOY=V};0p>B|F#?uCI26j1EMs4COIIO^g+n?J@~u zLuP@PzSGCyFUtZclRwIwk26g5P-gK*rFy7oKhso?Rj>U{lj>0q4oL<4hglg)QD=~q z(H@=b`G3CgpJx7t4R~Q&UHrcl`a%3>m1!)={~%rd$6rLNl-x@E$8N-by7+I4w2=SN Z*z|TeARTqoQAhtSeFHnH4IltW008<@{I~!B literal 0 HcmV?d00001 From 66df8d7fc2059a65d796c01e912174b1002a252a Mon Sep 17 00:00:00 2001 From: Paul Normington Date: Tue, 1 Mar 2016 20:50:26 +0000 Subject: [PATCH 27/39] Hopefully fixed the conflicts --- Assets/Prefabs/Acolade Manager.prefab | 53 ++++++++ Assets/Prefabs/Acolade Manager.prefab.meta | 8 ++ Assets/Prefabs/Player 1.prefab | 45 +++++++ Assets/Prefabs/Player.prefab | 142 ++++++++++++++++----- Assets/Prefabs/StatTracker.prefab | 57 +++++++++ Assets/Prefabs/StatTracker.prefab.meta | 8 ++ 6 files changed, 282 insertions(+), 31 deletions(-) create mode 100644 Assets/Prefabs/Acolade Manager.prefab create mode 100644 Assets/Prefabs/Acolade Manager.prefab.meta create mode 100644 Assets/Prefabs/StatTracker.prefab create mode 100644 Assets/Prefabs/StatTracker.prefab.meta diff --git a/Assets/Prefabs/Acolade Manager.prefab b/Assets/Prefabs/Acolade Manager.prefab new file mode 100644 index 0000000..7f592fe --- /dev/null +++ b/Assets/Prefabs/Acolade Manager.prefab @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &104076 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 4: {fileID: 472770} + - 114: {fileID: 11434298} + m_Layer: 0 + m_Name: Acolade Manager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &472770 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 104076} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -.124886155, y: .0156106949, z: -.00819587708} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 +--- !u!114 &11434298 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 104076} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3da60e80b5f08a84bbeefea68eef36db, type: 3} + m_Name: + m_EditorClassIdentifier: + statTrackers: [] +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 104076} + m_IsPrefabParent: 1 diff --git a/Assets/Prefabs/Acolade Manager.prefab.meta b/Assets/Prefabs/Acolade Manager.prefab.meta new file mode 100644 index 0000000..73db74a --- /dev/null +++ b/Assets/Prefabs/Acolade Manager.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9962d2dbb715ae5488d2147fb34f99d3 +timeCreated: 1456865252 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Player 1.prefab b/Assets/Prefabs/Player 1.prefab index cb497cb..bf09c5b 100644 --- a/Assets/Prefabs/Player 1.prefab +++ b/Assets/Prefabs/Player 1.prefab @@ -220,6 +220,22 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &176390 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 4: {fileID: 465712} + - 114: {fileID: 11416036} + m_Layer: 0 + m_Name: StatTracker + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &176408 GameObject: m_ObjectHideFlags: 1 @@ -285,6 +301,7 @@ Transform: - {fileID: 423976} - {fileID: 22403484} - {fileID: 442998} + - {fileID: 465712} m_Father: {fileID: 0} m_RootOrder: 0 --- !u!4 &423976 @@ -323,6 +340,18 @@ Transform: m_Children: [] m_Father: {fileID: 415802} m_RootOrder: 4 +--- !u!4 &465712 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 176390} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: .382297277, y: -.199220359, z: .00820271578} + m_LocalScale: {x: 1.00091147, y: 1.00091147, z: 1.00091147} + m_Children: [] + m_Father: {fileID: 415802} + m_RootOrder: 5 --- !u!4 &484988 Transform: m_ObjectHideFlags: 1 @@ -473,6 +502,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 +--- !u!114 &11416036 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 176390} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 56528e23e2f115447855f6a2e52937f4, type: 3} + m_Name: + m_EditorClassIdentifier: + p: {fileID: 0} + acoladeManager: {fileID: 0} + elusiveScore: 0 + timeSatStill: 0 + amountOfBullets: 0 --- !u!114 &11423686 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index a7240b6..01ce141 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -74,7 +74,22 @@ GameObject: m_Component: - 224: {fileID: 22434640} m_Layer: 5 - m_Name: Player1HUD + m_Name: Player2HUD + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &123568 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 4: {fileID: 422624} + m_Layer: 0 + m_Name: testHUDHolder m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -137,6 +152,22 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &147460 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 4: {fileID: 404134} + - 114: {fileID: 11400524} + m_Layer: 0 + m_Name: SpriteManager2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &150530 GameObject: m_ObjectHideFlags: 0 @@ -254,6 +285,34 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!4 &404134 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 147460} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -13.0795021, y: .416473091, z: -323.863647} + m_LocalScale: {x: .99908936, y: .99908936, z: .99908936} + m_Children: [] + m_Father: {fileID: 472642} + m_RootOrder: 4 +--- !u!4 &422624 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 123568} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 22478268} + - {fileID: 22401764} + - {fileID: 22428368} + - {fileID: 22441718} + m_Father: {fileID: 472642} + m_RootOrder: 5 --- !u!4 &445210 Transform: m_ObjectHideFlags: 1 @@ -265,7 +324,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 472642} - m_RootOrder: 1 + m_RootOrder: 2 --- !u!4 &472642 Transform: m_ObjectHideFlags: 1 @@ -273,13 +332,15 @@ Transform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 133054} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 323.855438} - m_LocalScale: {x: 35.9839363, y: 35.9839363, z: 35.9839363} + m_LocalPosition: {x: 471.080963, y: -15, z: 11988.3662} + m_LocalScale: {x: 36.0167351, y: 36.0167351, z: 36.0167351} m_Children: + - {fileID: 490514} - {fileID: 495372} - {fileID: 445210} - - {fileID: 490514} - {fileID: 22434640} + - {fileID: 404134} + - {fileID: 422624} m_Father: {fileID: 0} m_RootOrder: 0 --- !u!4 &490514 @@ -293,7 +354,7 @@ Transform: m_LocalScale: {x: 5, y: 5, z: 5} m_Children: [] m_Father: {fileID: 472642} - m_RootOrder: 2 + m_RootOrder: 0 --- !u!4 &495372 Transform: m_ObjectHideFlags: 1 @@ -305,7 +366,7 @@ Transform: m_LocalScale: {x: .115264796, y: .115264796, z: .115264796} m_Children: [] m_Father: {fileID: 472642} - m_RootOrder: 0 + m_RootOrder: 1 --- !u!50 &5019476 Rigidbody2D: serializedVersion: 2 @@ -348,6 +409,28 @@ BoxCollider2D: m_Offset: {x: -.125, y: -.0320999995} serializedVersion: 2 m_Size: {x: .861835837, y: 2.24815989} +--- !u!114 &11400524 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 147460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 72924532f27ef1a44a83a8354e4dcaa9, type: 3} + m_Name: + m_EditorClassIdentifier: + playerSprites: + - {fileID: 21300000, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300012, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300008, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300002, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300004, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300006, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300010, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300014, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300016, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + player: {fileID: 133054} --- !u!114 &11404772 MonoBehaviour: m_ObjectHideFlags: 1 @@ -418,7 +501,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 55891d2920542d641913a9d95d43c293, type: 3} m_Name: m_EditorClassIdentifier: - spriteManager: {fileID: 0} + spriteManager: {fileID: 11400524} --- !u!114 &11434670 MonoBehaviour: m_ObjectHideFlags: 1 @@ -480,11 +563,12 @@ MonoBehaviour: m_EditorClassIdentifier: mEquippedWeapon: {fileID: 0} weaponList: [] - mPlayerNumber: 1 + mPlayerNumber: 2 HPSlider: {fileID: 11483498} ammoSlider: {fileID: 11434670} waitTime: 0 minigunParticleSystem: {fileID: 19868204} + playerHUD: {fileID: 123568} --- !u!114 &11446066 MonoBehaviour: m_ObjectHideFlags: 1 @@ -571,7 +655,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: player: {fileID: 133054} - spriteManager: {fileID: 0} + spriteManager: {fileID: 11400524} mReticle: {fileID: 183054} --- !u!114 &11468980 MonoBehaviour: @@ -1924,16 +2008,16 @@ RectTransform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 137932} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2, y: 13, z: 1} + m_LocalPosition: {x: 0, y: 0, z: -9} + m_LocalScale: {x: .0555803552, y: .0550374165, z: .0277901776} m_Children: - {fileID: 22492620} - {fileID: 22474460} - m_Father: {fileID: 22434640} + m_Father: {fileID: 422624} m_RootOrder: 1 m_AnchorMin: {x: .5, y: .5} m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: -826, y: 451} + m_AnchoredPosition: {x: .0555419922, y: 2.08905029} m_SizeDelta: {x: 100, y: 20} m_Pivot: {x: .5, y: .5} --- !u!224 &22408488 @@ -1977,14 +2061,14 @@ RectTransform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 143898} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 6.56412172, z: 1} + m_LocalPosition: {x: 0, y: 0, z: -9} + m_LocalScale: {x: .0277901776, y: .0277901758, z: .0277901776} m_Children: [] - m_Father: {fileID: 22434640} + m_Father: {fileID: 422624} m_RootOrder: 2 m_AnchorMin: {x: .5, y: .5} m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: -824, y: -519} + m_AnchoredPosition: {x: .111206055, y: -2.01763916} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: .5, y: .5} --- !u!224 &22431700 @@ -2013,11 +2097,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -9} m_LocalScale: {x: .0277901795, y: .0042336476, z: .0277901795} - m_Children: - - {fileID: 22478268} - - {fileID: 22401764} - - {fileID: 22428368} - - {fileID: 22441718} + m_Children: [] m_Father: {fileID: 472642} m_RootOrder: 3 m_AnchorMin: {x: .5, y: .5} @@ -2032,16 +2112,16 @@ RectTransform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 103882} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2, y: 13, z: 1} + m_LocalPosition: {x: 0, y: 0, z: -9} + m_LocalScale: {x: .0555803552, y: .0550374165, z: .0277901776} m_Children: - {fileID: 22408488} - {fileID: 22498810} - m_Father: {fileID: 22434640} + m_Father: {fileID: 422624} m_RootOrder: 3 m_AnchorMin: {x: .5, y: .5} m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: -826.000183, y: -859} + m_AnchoredPosition: {x: .0556030273, y: -3.45703125} m_SizeDelta: {x: 100, y: 20} m_Pivot: {x: .5, y: .5} --- !u!224 &22474460 @@ -2069,14 +2149,14 @@ RectTransform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 170390} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 6.56412172, z: 1} + m_LocalPosition: {x: 0, y: 0, z: -9} + m_LocalScale: {x: .0277901776, y: .0277901758, z: .0277901776} m_Children: [] - m_Father: {fileID: 22434640} + m_Father: {fileID: 422624} m_RootOrder: 0 m_AnchorMin: {x: .5, y: .5} m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: -834, y: 208} + m_AnchoredPosition: {x: -.166748047, y: 1.06028748} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: .5, y: .5} --- !u!224 &22492620 diff --git a/Assets/Prefabs/StatTracker.prefab b/Assets/Prefabs/StatTracker.prefab new file mode 100644 index 0000000..c67f806 --- /dev/null +++ b/Assets/Prefabs/StatTracker.prefab @@ -0,0 +1,57 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &157894 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 4: {fileID: 485512} + - 114: {fileID: 11474032} + m_Layer: 0 + m_Name: StatTracker + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &485512 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 157894} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: .382297277, y: -.199220359, z: .00820271578} + m_LocalScale: {x: 1.00091147, y: 1.00091147, z: 1.00091147} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 +--- !u!114 &11474032 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 157894} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 56528e23e2f115447855f6a2e52937f4, type: 3} + m_Name: + m_EditorClassIdentifier: + p: {fileID: 0} + acoladeManager: {fileID: 0} + elusiveScore: 0 + timeSatStill: 0 + amountOfBullets: 0 +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 157894} + m_IsPrefabParent: 1 diff --git a/Assets/Prefabs/StatTracker.prefab.meta b/Assets/Prefabs/StatTracker.prefab.meta new file mode 100644 index 0000000..f28a7a1 --- /dev/null +++ b/Assets/Prefabs/StatTracker.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 08a27cbc8e73fef4cb7f9cb3b2b6eb71 +timeCreated: 1456865255 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: From d8ee66b6181e484fb76a3d834f6c8d7cd947187e Mon Sep 17 00:00:00 2001 From: JSleekXD Date: Tue, 1 Mar 2016 22:28:11 +0000 Subject: [PATCH 28/39] Revert "Hopefully fixed the conflicts" This reverts commit 66df8d7fc2059a65d796c01e912174b1002a252a. --- Assets/Prefabs/Acolade Manager.prefab | 53 -------- Assets/Prefabs/Acolade Manager.prefab.meta | 8 -- Assets/Prefabs/Player 1.prefab | 45 ------- Assets/Prefabs/Player.prefab | 142 +++++---------------- Assets/Prefabs/StatTracker.prefab | 57 --------- Assets/Prefabs/StatTracker.prefab.meta | 8 -- 6 files changed, 31 insertions(+), 282 deletions(-) delete mode 100644 Assets/Prefabs/Acolade Manager.prefab delete mode 100644 Assets/Prefabs/Acolade Manager.prefab.meta delete mode 100644 Assets/Prefabs/StatTracker.prefab delete mode 100644 Assets/Prefabs/StatTracker.prefab.meta diff --git a/Assets/Prefabs/Acolade Manager.prefab b/Assets/Prefabs/Acolade Manager.prefab deleted file mode 100644 index 7f592fe..0000000 --- a/Assets/Prefabs/Acolade Manager.prefab +++ /dev/null @@ -1,53 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &104076 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 - m_Component: - - 4: {fileID: 472770} - - 114: {fileID: 11434298} - m_Layer: 0 - m_Name: Acolade Manager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &472770 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 104076} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -.124886155, y: .0156106949, z: -.00819587708} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 ---- !u!114 &11434298 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 104076} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3da60e80b5f08a84bbeefea68eef36db, type: 3} - m_Name: - m_EditorClassIdentifier: - statTrackers: [] ---- !u!1001 &100100000 -Prefab: - m_ObjectHideFlags: 1 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: [] - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 104076} - m_IsPrefabParent: 1 diff --git a/Assets/Prefabs/Acolade Manager.prefab.meta b/Assets/Prefabs/Acolade Manager.prefab.meta deleted file mode 100644 index 73db74a..0000000 --- a/Assets/Prefabs/Acolade Manager.prefab.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9962d2dbb715ae5488d2147fb34f99d3 -timeCreated: 1456865252 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Prefabs/Player 1.prefab b/Assets/Prefabs/Player 1.prefab index bf09c5b..cb497cb 100644 --- a/Assets/Prefabs/Player 1.prefab +++ b/Assets/Prefabs/Player 1.prefab @@ -220,22 +220,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &176390 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 - m_Component: - - 4: {fileID: 465712} - - 114: {fileID: 11416036} - m_Layer: 0 - m_Name: StatTracker - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!1 &176408 GameObject: m_ObjectHideFlags: 1 @@ -301,7 +285,6 @@ Transform: - {fileID: 423976} - {fileID: 22403484} - {fileID: 442998} - - {fileID: 465712} m_Father: {fileID: 0} m_RootOrder: 0 --- !u!4 &423976 @@ -340,18 +323,6 @@ Transform: m_Children: [] m_Father: {fileID: 415802} m_RootOrder: 4 ---- !u!4 &465712 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 176390} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: .382297277, y: -.199220359, z: .00820271578} - m_LocalScale: {x: 1.00091147, y: 1.00091147, z: 1.00091147} - m_Children: [] - m_Father: {fileID: 415802} - m_RootOrder: 5 --- !u!4 &484988 Transform: m_ObjectHideFlags: 1 @@ -502,22 +473,6 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 ---- !u!114 &11416036 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 176390} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 56528e23e2f115447855f6a2e52937f4, type: 3} - m_Name: - m_EditorClassIdentifier: - p: {fileID: 0} - acoladeManager: {fileID: 0} - elusiveScore: 0 - timeSatStill: 0 - amountOfBullets: 0 --- !u!114 &11423686 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index 01ce141..a7240b6 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -74,22 +74,7 @@ GameObject: m_Component: - 224: {fileID: 22434640} m_Layer: 5 - m_Name: Player2HUD - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &123568 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 - m_Component: - - 4: {fileID: 422624} - m_Layer: 0 - m_Name: testHUDHolder + m_Name: Player1HUD m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -152,22 +137,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &147460 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 - m_Component: - - 4: {fileID: 404134} - - 114: {fileID: 11400524} - m_Layer: 0 - m_Name: SpriteManager2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!1 &150530 GameObject: m_ObjectHideFlags: 0 @@ -285,34 +254,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &404134 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 147460} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -13.0795021, y: .416473091, z: -323.863647} - m_LocalScale: {x: .99908936, y: .99908936, z: .99908936} - m_Children: [] - m_Father: {fileID: 472642} - m_RootOrder: 4 ---- !u!4 &422624 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 123568} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 22478268} - - {fileID: 22401764} - - {fileID: 22428368} - - {fileID: 22441718} - m_Father: {fileID: 472642} - m_RootOrder: 5 --- !u!4 &445210 Transform: m_ObjectHideFlags: 1 @@ -324,7 +265,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 472642} - m_RootOrder: 2 + m_RootOrder: 1 --- !u!4 &472642 Transform: m_ObjectHideFlags: 1 @@ -332,15 +273,13 @@ Transform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 133054} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 471.080963, y: -15, z: 11988.3662} - m_LocalScale: {x: 36.0167351, y: 36.0167351, z: 36.0167351} + m_LocalPosition: {x: 0, y: 0, z: 323.855438} + m_LocalScale: {x: 35.9839363, y: 35.9839363, z: 35.9839363} m_Children: - - {fileID: 490514} - {fileID: 495372} - {fileID: 445210} + - {fileID: 490514} - {fileID: 22434640} - - {fileID: 404134} - - {fileID: 422624} m_Father: {fileID: 0} m_RootOrder: 0 --- !u!4 &490514 @@ -354,7 +293,7 @@ Transform: m_LocalScale: {x: 5, y: 5, z: 5} m_Children: [] m_Father: {fileID: 472642} - m_RootOrder: 0 + m_RootOrder: 2 --- !u!4 &495372 Transform: m_ObjectHideFlags: 1 @@ -366,7 +305,7 @@ Transform: m_LocalScale: {x: .115264796, y: .115264796, z: .115264796} m_Children: [] m_Father: {fileID: 472642} - m_RootOrder: 1 + m_RootOrder: 0 --- !u!50 &5019476 Rigidbody2D: serializedVersion: 2 @@ -409,28 +348,6 @@ BoxCollider2D: m_Offset: {x: -.125, y: -.0320999995} serializedVersion: 2 m_Size: {x: .861835837, y: 2.24815989} ---- !u!114 &11400524 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 147460} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 72924532f27ef1a44a83a8354e4dcaa9, type: 3} - m_Name: - m_EditorClassIdentifier: - playerSprites: - - {fileID: 21300000, guid: d3661648c4213db4a83f88596f678fe0, type: 3} - - {fileID: 21300012, guid: d3661648c4213db4a83f88596f678fe0, type: 3} - - {fileID: 21300008, guid: d3661648c4213db4a83f88596f678fe0, type: 3} - - {fileID: 21300002, guid: d3661648c4213db4a83f88596f678fe0, type: 3} - - {fileID: 21300004, guid: d3661648c4213db4a83f88596f678fe0, type: 3} - - {fileID: 21300006, guid: d3661648c4213db4a83f88596f678fe0, type: 3} - - {fileID: 21300010, guid: d3661648c4213db4a83f88596f678fe0, type: 3} - - {fileID: 21300014, guid: d3661648c4213db4a83f88596f678fe0, type: 3} - - {fileID: 21300016, guid: d3661648c4213db4a83f88596f678fe0, type: 3} - player: {fileID: 133054} --- !u!114 &11404772 MonoBehaviour: m_ObjectHideFlags: 1 @@ -501,7 +418,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 55891d2920542d641913a9d95d43c293, type: 3} m_Name: m_EditorClassIdentifier: - spriteManager: {fileID: 11400524} + spriteManager: {fileID: 0} --- !u!114 &11434670 MonoBehaviour: m_ObjectHideFlags: 1 @@ -563,12 +480,11 @@ MonoBehaviour: m_EditorClassIdentifier: mEquippedWeapon: {fileID: 0} weaponList: [] - mPlayerNumber: 2 + mPlayerNumber: 1 HPSlider: {fileID: 11483498} ammoSlider: {fileID: 11434670} waitTime: 0 minigunParticleSystem: {fileID: 19868204} - playerHUD: {fileID: 123568} --- !u!114 &11446066 MonoBehaviour: m_ObjectHideFlags: 1 @@ -655,7 +571,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: player: {fileID: 133054} - spriteManager: {fileID: 11400524} + spriteManager: {fileID: 0} mReticle: {fileID: 183054} --- !u!114 &11468980 MonoBehaviour: @@ -2008,16 +1924,16 @@ RectTransform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 137932} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -9} - m_LocalScale: {x: .0555803552, y: .0550374165, z: .0277901776} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 13, z: 1} m_Children: - {fileID: 22492620} - {fileID: 22474460} - m_Father: {fileID: 422624} + m_Father: {fileID: 22434640} m_RootOrder: 1 m_AnchorMin: {x: .5, y: .5} m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: .0555419922, y: 2.08905029} + m_AnchoredPosition: {x: -826, y: 451} m_SizeDelta: {x: 100, y: 20} m_Pivot: {x: .5, y: .5} --- !u!224 &22408488 @@ -2061,14 +1977,14 @@ RectTransform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 143898} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -9} - m_LocalScale: {x: .0277901776, y: .0277901758, z: .0277901776} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 6.56412172, z: 1} m_Children: [] - m_Father: {fileID: 422624} + m_Father: {fileID: 22434640} m_RootOrder: 2 m_AnchorMin: {x: .5, y: .5} m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: .111206055, y: -2.01763916} + m_AnchoredPosition: {x: -824, y: -519} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: .5, y: .5} --- !u!224 &22431700 @@ -2097,7 +2013,11 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -9} m_LocalScale: {x: .0277901795, y: .0042336476, z: .0277901795} - m_Children: [] + m_Children: + - {fileID: 22478268} + - {fileID: 22401764} + - {fileID: 22428368} + - {fileID: 22441718} m_Father: {fileID: 472642} m_RootOrder: 3 m_AnchorMin: {x: .5, y: .5} @@ -2112,16 +2032,16 @@ RectTransform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 103882} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -9} - m_LocalScale: {x: .0555803552, y: .0550374165, z: .0277901776} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 13, z: 1} m_Children: - {fileID: 22408488} - {fileID: 22498810} - m_Father: {fileID: 422624} + m_Father: {fileID: 22434640} m_RootOrder: 3 m_AnchorMin: {x: .5, y: .5} m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: .0556030273, y: -3.45703125} + m_AnchoredPosition: {x: -826.000183, y: -859} m_SizeDelta: {x: 100, y: 20} m_Pivot: {x: .5, y: .5} --- !u!224 &22474460 @@ -2149,14 +2069,14 @@ RectTransform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 170390} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -9} - m_LocalScale: {x: .0277901776, y: .0277901758, z: .0277901776} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 6.56412172, z: 1} m_Children: [] - m_Father: {fileID: 422624} + m_Father: {fileID: 22434640} m_RootOrder: 0 m_AnchorMin: {x: .5, y: .5} m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: -.166748047, y: 1.06028748} + m_AnchoredPosition: {x: -834, y: 208} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: .5, y: .5} --- !u!224 &22492620 diff --git a/Assets/Prefabs/StatTracker.prefab b/Assets/Prefabs/StatTracker.prefab deleted file mode 100644 index c67f806..0000000 --- a/Assets/Prefabs/StatTracker.prefab +++ /dev/null @@ -1,57 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &157894 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 - m_Component: - - 4: {fileID: 485512} - - 114: {fileID: 11474032} - m_Layer: 0 - m_Name: StatTracker - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &485512 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 157894} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: .382297277, y: -.199220359, z: .00820271578} - m_LocalScale: {x: 1.00091147, y: 1.00091147, z: 1.00091147} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 ---- !u!114 &11474032 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 157894} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 56528e23e2f115447855f6a2e52937f4, type: 3} - m_Name: - m_EditorClassIdentifier: - p: {fileID: 0} - acoladeManager: {fileID: 0} - elusiveScore: 0 - timeSatStill: 0 - amountOfBullets: 0 ---- !u!1001 &100100000 -Prefab: - m_ObjectHideFlags: 1 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: [] - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 157894} - m_IsPrefabParent: 1 diff --git a/Assets/Prefabs/StatTracker.prefab.meta b/Assets/Prefabs/StatTracker.prefab.meta deleted file mode 100644 index f28a7a1..0000000 --- a/Assets/Prefabs/StatTracker.prefab.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 08a27cbc8e73fef4cb7f9cb3b2b6eb71 -timeCreated: 1456865255 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: From 8df22b04732290b66a0447ad253d83f4c91b380b Mon Sep 17 00:00:00 2001 From: JSleekXD Date: Tue, 1 Mar 2016 22:29:32 +0000 Subject: [PATCH 29/39] Revert "Package" This reverts commit 5640bf16ed0900b17dccb3d5b7700a213879aa0d. --- StatTrackAndAcolade.unitypackage | Bin 1991 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 StatTrackAndAcolade.unitypackage diff --git a/StatTrackAndAcolade.unitypackage b/StatTrackAndAcolade.unitypackage deleted file mode 100644 index f24a68ae32cfabac06a45cdaaaabd9844ab458f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1991 zcmV;&2RQg2iwFn;0M=Fj0AX@tXmn+5a4vLVascgHZEw>s5boFIR~#QeL$EAy-kOym zjqx^#H&H-B2q7nNiXlx(;tmGdFXID0iNCgraX5Z@!7ry6bOrtcGCSdOon>xR)M2JvK%H6BC!XC(s@s~A3NP%>yy+!CupSo=x*VM<2IR z8YC>5^<7%ncPnui=6up%VLGapt1y~!Z0)!X=`&(665}n~_Rs)hmlEa>-|}MnDu{y# zs=zv|Et6W0y9qul_97fHk2%ZLy~*ORX_zH6V)toEN8c-fCDQ^I!Z6HoR?02-m<_2I z3Z5io2_0usoYeTnG)b5!YRZ!H2AAfur(t5BA9W12<@ldfg4>>0(iD((Ac%)6ssUH=n& zSf;3s-sx%8`Ul%wz<&hos9XPS(2iVS#b)^gDK=}HUVWmaodRUq+J43(8P~}LtY1b6*0i-l{7~&C5$L{l|KA4v0ROKtjbre?<@=6t4E~p{e~$Z?$K4_X z9MeQR#%^+k{&yB8V;@*Jl`ec1oy9U;Qm1sm`;&_I72WRS=|ZFmPoXp5V0}u|!b( zrC1%-B|VPkKvNyApIkz?wmn}Nm$9*uWWo5PFedgti^Tk#|8EWd+qP+`^M7WC|68GB z@&Cz=109F|`#!Nc{QnoxDkZmr|DDD6e;xjBi7NbG+sJhxfd7en-z5==f&h=(Qs&tG zenjxJYaCd1?E8`RoAAHYz5j2AR_g!!@jo6Jv=;I|Ovmc>f347I@;?mRu)BXr{)fym zFqY(hST^zdOY=V};0p>B|F#?uCI26j1EMs4COIIO^g+n?J@~u zLuP@PzSGCyFUtZclRwIwk26g5P-gK*rFy7oKhso?Rj>U{lj>0q4oL<4hglg)QD=~q z(H@=b`G3CgpJx7t4R~Q&UHrcl`a%3>m1!)={~%rd$6rLNl-x@E$8N-by7+I4w2=SN Z*z|TeARTqoQAhtSeFHnH4IltW008<@{I~!B From 81f5168f603d9c2a60c309fe039745b03954cf19 Mon Sep 17 00:00:00 2001 From: JSleekXD Date: Tue, 1 Mar 2016 22:56:08 +0000 Subject: [PATCH 30/39] Fixed Player 2's pistol, and the resetting of ammo and HP sliders Player 2's pistol was not centred onto the player, therefore always fired out of the respawn point. It is now directly on player 2. The ammo and hp sliders did not reset upon respawning, but now they do. --- Assets/Scenes/Prototype.unity | 106 ++++++++++++-------------------- Assets/Scripts/Player/Player.cs | 3 + 2 files changed, 44 insertions(+), 65 deletions(-) diff --git a/Assets/Scenes/Prototype.unity b/Assets/Scenes/Prototype.unity index 2db5417..cd6a013 100644 --- a/Assets/Scenes/Prototype.unity +++ b/Assets/Scenes/Prototype.unity @@ -683,7 +683,7 @@ Transform: m_LocalScale: {x: .115264796, y: .115264796, z: .115264796} m_Children: [] m_Father: {fileID: 1456487450} - m_RootOrder: 2 + m_RootOrder: 1 --- !u!114 &100469318 MonoBehaviour: m_ObjectHideFlags: 0 @@ -950,14 +950,14 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 152197722} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -9} - m_LocalScale: {x: .0277901776, y: .0277901758, z: .0277901776} + m_LocalPosition: {x: 0, y: 0, z: .000205901742} + m_LocalScale: {x: 1, y: 6.56412125, z: 1} m_Children: [] - m_Father: {fileID: 232170164} + m_Father: {fileID: 389116437} m_RootOrder: 0 m_AnchorMin: {x: .5, y: .5} m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: -.166748047, y: 1.06028748} + m_AnchoredPosition: {x: -833.999634, y: 208.000412} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: .5, y: .5} --- !u!114 &152197724 @@ -1200,37 +1200,6 @@ Transform: Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_PrefabInternal: {fileID: 673191866} ---- !u!1 &232170163 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 232170164} - m_Layer: 0 - m_Name: testHUDHolder - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &232170164 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 232170163} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 152197723} - - {fileID: 863266352} - - {fileID: 1967053839} - - {fileID: 966856042} - m_Father: {fileID: 1456487450} - m_RootOrder: 5 --- !u!4 &239526396 stripped Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} @@ -1836,7 +1805,7 @@ GameObject: m_Component: - 224: {fileID: 389116437} m_Layer: 5 - m_Name: Player2HUD + m_Name: PlayerHUD m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1852,7 +1821,11 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -9} m_LocalScale: {x: .0277901795, y: .0042336476, z: .0277901795} - m_Children: [] + m_Children: + - {fileID: 152197723} + - {fileID: 863266352} + - {fileID: 1967053839} + - {fileID: 966856042} m_Father: {fileID: 1456487450} m_RootOrder: 3 m_AnchorMin: {x: .5, y: .5} @@ -2018,7 +1991,7 @@ Transform: m_LocalScale: {x: 5, y: 5, z: 5} m_Children: [] m_Father: {fileID: 1456487450} - m_RootOrder: 1 + m_RootOrder: 2 --- !u!199 &467455900 ParticleSystemRenderer: m_ObjectHideFlags: 0 @@ -4865,16 +4838,16 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 863266351} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -9} - m_LocalScale: {x: .0555803552, y: .0550374165, z: .0277901776} + m_LocalPosition: {x: 0, y: 0, z: .000205901742} + m_LocalScale: {x: 2, y: 13, z: 1} m_Children: - {fileID: 1412533490} - {fileID: 2059452436} - m_Father: {fileID: 232170164} + m_Father: {fileID: 389116437} m_RootOrder: 1 m_AnchorMin: {x: .5, y: .5} m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: .0555419922, y: 2.08905029} + m_AnchoredPosition: {x: -826.000732, y: 450.997192} m_SizeDelta: {x: 100, y: 20} m_Pivot: {x: .5, y: .5} --- !u!114 &863266353 @@ -5322,16 +5295,16 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 966856041} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -9} - m_LocalScale: {x: .0555803552, y: .0550374165, z: .0277901776} + m_LocalPosition: {x: 0, y: 0, z: .000205901742} + m_LocalScale: {x: 2, y: 13, z: 1} m_Children: - {fileID: 1438425927} - {fileID: 45241851} - m_Father: {fileID: 232170164} + m_Father: {fileID: 389116437} m_RootOrder: 3 m_AnchorMin: {x: .5, y: .5} m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: .0556030273, y: -3.45703125} + m_AnchoredPosition: {x: -825.998596, y: -859.003723} m_SizeDelta: {x: 100, y: 20} m_Pivot: {x: .5, y: .5} --- !u!114 &966856043 @@ -6667,15 +6640,15 @@ Prefab: m_Modifications: - target: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} propertyPath: m_LocalPosition.x - value: -13.0795021 + value: 0 objectReference: {fileID: 0} - target: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} propertyPath: m_LocalPosition.y - value: .416473091 + value: 0 objectReference: {fileID: 0} - target: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} propertyPath: m_LocalPosition.z - value: -323.863647 + value: 0 objectReference: {fileID: 0} - target: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} propertyPath: m_LocalRotation.x @@ -6695,19 +6668,19 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} propertyPath: m_RootOrder - value: 6 + value: 5 objectReference: {fileID: 0} - target: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} propertyPath: m_LocalScale.x - value: .99908936 + value: 1 objectReference: {fileID: 0} - target: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} propertyPath: m_LocalScale.y - value: .99908936 + value: 1 objectReference: {fileID: 0} - target: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} propertyPath: m_LocalScale.z - value: .99908936 + value: 1 objectReference: {fileID: 0} - target: {fileID: 159140, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} propertyPath: m_Name @@ -7467,11 +7440,10 @@ Transform: m_LocalScale: {x: 36.0167351, y: 36.0167351, z: 36.0167351} m_Children: - {fileID: 282481002} - - {fileID: 467455899} - {fileID: 100469317} + - {fileID: 467455899} - {fileID: 389116437} - {fileID: 1720242252} - - {fileID: 232170164} - {fileID: 879158140} m_Father: {fileID: 653857878} m_RootOrder: 2 @@ -9093,19 +9065,19 @@ Prefab: objectReference: {fileID: 1998640093} - target: {fileID: 22431700, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 22431700, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 22426558, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 22426558, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 133054, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} propertyPath: m_Name @@ -9328,6 +9300,10 @@ Prefab: propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} + - target: {fileID: 121534, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + propertyPath: m_Name + value: PlayerHUD + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} m_IsPrefabParent: 0 @@ -9589,7 +9565,7 @@ MonoBehaviour: ammoSlider: {fileID: 966856043} waitTime: 0 minigunParticleSystem: {fileID: 467455901} - playerHUD: {fileID: 232170163} + playerHUD: {fileID: 389116436} playerPistol: {fileID: 879158141} playerSpawnPoints: [] isPlayerDead: 0 @@ -10170,14 +10146,14 @@ RectTransform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1967053838} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -9} - m_LocalScale: {x: .0277901776, y: .0277901758, z: .0277901776} + m_LocalPosition: {x: 0, y: 0, z: .000205901742} + m_LocalScale: {x: 1, y: 6.56412125, z: 1} m_Children: [] - m_Father: {fileID: 232170164} + m_Father: {fileID: 389116437} m_RootOrder: 2 m_AnchorMin: {x: .5, y: .5} m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: .111206055, y: -2.01763916} + m_AnchoredPosition: {x: -823.997986, y: -519.015503} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: .5, y: .5} --- !u!114 &1967053840 diff --git a/Assets/Scripts/Player/Player.cs b/Assets/Scripts/Player/Player.cs index c7b3f30..549ac57 100644 --- a/Assets/Scripts/Player/Player.cs +++ b/Assets/Scripts/Player/Player.cs @@ -153,9 +153,12 @@ public void ResetPlayerProperties() { //reset player's health mHealth = mMaxHealth; + HPSlider.value = 1; + ammoSlider.value = 1; //equip the player with a fully loaded pistol. mEquippedWeapon = playerPistol; mEquippedWeapon.RemainingAmmo = mEquippedWeapon.MaximumAmmo; + } public void SetPlayerSpawnPosition() { From c55090d736a2a3c187cc77ea9ba29742c8158f8a Mon Sep 17 00:00:00 2001 From: JSleekXD Date: Tue, 1 Mar 2016 22:58:34 +0000 Subject: [PATCH 31/39] Revert "Revert "Hopefully fixed the conflicts"" This reverts commit d8ee66b6181e484fb76a3d834f6c8d7cd947187e. --- Assets/Prefabs/Acolade Manager.prefab | 53 ++++++++ Assets/Prefabs/Acolade Manager.prefab.meta | 8 ++ Assets/Prefabs/Player 1.prefab | 45 +++++++ Assets/Prefabs/Player.prefab | 142 ++++++++++++++++----- Assets/Prefabs/StatTracker.prefab | 57 +++++++++ Assets/Prefabs/StatTracker.prefab.meta | 8 ++ 6 files changed, 282 insertions(+), 31 deletions(-) create mode 100644 Assets/Prefabs/Acolade Manager.prefab create mode 100644 Assets/Prefabs/Acolade Manager.prefab.meta create mode 100644 Assets/Prefabs/StatTracker.prefab create mode 100644 Assets/Prefabs/StatTracker.prefab.meta diff --git a/Assets/Prefabs/Acolade Manager.prefab b/Assets/Prefabs/Acolade Manager.prefab new file mode 100644 index 0000000..7f592fe --- /dev/null +++ b/Assets/Prefabs/Acolade Manager.prefab @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &104076 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 4: {fileID: 472770} + - 114: {fileID: 11434298} + m_Layer: 0 + m_Name: Acolade Manager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &472770 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 104076} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -.124886155, y: .0156106949, z: -.00819587708} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 +--- !u!114 &11434298 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 104076} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3da60e80b5f08a84bbeefea68eef36db, type: 3} + m_Name: + m_EditorClassIdentifier: + statTrackers: [] +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 104076} + m_IsPrefabParent: 1 diff --git a/Assets/Prefabs/Acolade Manager.prefab.meta b/Assets/Prefabs/Acolade Manager.prefab.meta new file mode 100644 index 0000000..73db74a --- /dev/null +++ b/Assets/Prefabs/Acolade Manager.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9962d2dbb715ae5488d2147fb34f99d3 +timeCreated: 1456865252 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Player 1.prefab b/Assets/Prefabs/Player 1.prefab index cb497cb..bf09c5b 100644 --- a/Assets/Prefabs/Player 1.prefab +++ b/Assets/Prefabs/Player 1.prefab @@ -220,6 +220,22 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &176390 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 4: {fileID: 465712} + - 114: {fileID: 11416036} + m_Layer: 0 + m_Name: StatTracker + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &176408 GameObject: m_ObjectHideFlags: 1 @@ -285,6 +301,7 @@ Transform: - {fileID: 423976} - {fileID: 22403484} - {fileID: 442998} + - {fileID: 465712} m_Father: {fileID: 0} m_RootOrder: 0 --- !u!4 &423976 @@ -323,6 +340,18 @@ Transform: m_Children: [] m_Father: {fileID: 415802} m_RootOrder: 4 +--- !u!4 &465712 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 176390} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: .382297277, y: -.199220359, z: .00820271578} + m_LocalScale: {x: 1.00091147, y: 1.00091147, z: 1.00091147} + m_Children: [] + m_Father: {fileID: 415802} + m_RootOrder: 5 --- !u!4 &484988 Transform: m_ObjectHideFlags: 1 @@ -473,6 +502,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 +--- !u!114 &11416036 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 176390} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 56528e23e2f115447855f6a2e52937f4, type: 3} + m_Name: + m_EditorClassIdentifier: + p: {fileID: 0} + acoladeManager: {fileID: 0} + elusiveScore: 0 + timeSatStill: 0 + amountOfBullets: 0 --- !u!114 &11423686 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index a7240b6..01ce141 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -74,7 +74,22 @@ GameObject: m_Component: - 224: {fileID: 22434640} m_Layer: 5 - m_Name: Player1HUD + m_Name: Player2HUD + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &123568 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 4: {fileID: 422624} + m_Layer: 0 + m_Name: testHUDHolder m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -137,6 +152,22 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &147460 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 4: {fileID: 404134} + - 114: {fileID: 11400524} + m_Layer: 0 + m_Name: SpriteManager2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &150530 GameObject: m_ObjectHideFlags: 0 @@ -254,6 +285,34 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!4 &404134 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 147460} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -13.0795021, y: .416473091, z: -323.863647} + m_LocalScale: {x: .99908936, y: .99908936, z: .99908936} + m_Children: [] + m_Father: {fileID: 472642} + m_RootOrder: 4 +--- !u!4 &422624 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 123568} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 22478268} + - {fileID: 22401764} + - {fileID: 22428368} + - {fileID: 22441718} + m_Father: {fileID: 472642} + m_RootOrder: 5 --- !u!4 &445210 Transform: m_ObjectHideFlags: 1 @@ -265,7 +324,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 472642} - m_RootOrder: 1 + m_RootOrder: 2 --- !u!4 &472642 Transform: m_ObjectHideFlags: 1 @@ -273,13 +332,15 @@ Transform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 133054} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 323.855438} - m_LocalScale: {x: 35.9839363, y: 35.9839363, z: 35.9839363} + m_LocalPosition: {x: 471.080963, y: -15, z: 11988.3662} + m_LocalScale: {x: 36.0167351, y: 36.0167351, z: 36.0167351} m_Children: + - {fileID: 490514} - {fileID: 495372} - {fileID: 445210} - - {fileID: 490514} - {fileID: 22434640} + - {fileID: 404134} + - {fileID: 422624} m_Father: {fileID: 0} m_RootOrder: 0 --- !u!4 &490514 @@ -293,7 +354,7 @@ Transform: m_LocalScale: {x: 5, y: 5, z: 5} m_Children: [] m_Father: {fileID: 472642} - m_RootOrder: 2 + m_RootOrder: 0 --- !u!4 &495372 Transform: m_ObjectHideFlags: 1 @@ -305,7 +366,7 @@ Transform: m_LocalScale: {x: .115264796, y: .115264796, z: .115264796} m_Children: [] m_Father: {fileID: 472642} - m_RootOrder: 0 + m_RootOrder: 1 --- !u!50 &5019476 Rigidbody2D: serializedVersion: 2 @@ -348,6 +409,28 @@ BoxCollider2D: m_Offset: {x: -.125, y: -.0320999995} serializedVersion: 2 m_Size: {x: .861835837, y: 2.24815989} +--- !u!114 &11400524 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 147460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 72924532f27ef1a44a83a8354e4dcaa9, type: 3} + m_Name: + m_EditorClassIdentifier: + playerSprites: + - {fileID: 21300000, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300012, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300008, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300002, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300004, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300006, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300010, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300014, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300016, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + player: {fileID: 133054} --- !u!114 &11404772 MonoBehaviour: m_ObjectHideFlags: 1 @@ -418,7 +501,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 55891d2920542d641913a9d95d43c293, type: 3} m_Name: m_EditorClassIdentifier: - spriteManager: {fileID: 0} + spriteManager: {fileID: 11400524} --- !u!114 &11434670 MonoBehaviour: m_ObjectHideFlags: 1 @@ -480,11 +563,12 @@ MonoBehaviour: m_EditorClassIdentifier: mEquippedWeapon: {fileID: 0} weaponList: [] - mPlayerNumber: 1 + mPlayerNumber: 2 HPSlider: {fileID: 11483498} ammoSlider: {fileID: 11434670} waitTime: 0 minigunParticleSystem: {fileID: 19868204} + playerHUD: {fileID: 123568} --- !u!114 &11446066 MonoBehaviour: m_ObjectHideFlags: 1 @@ -571,7 +655,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: player: {fileID: 133054} - spriteManager: {fileID: 0} + spriteManager: {fileID: 11400524} mReticle: {fileID: 183054} --- !u!114 &11468980 MonoBehaviour: @@ -1924,16 +2008,16 @@ RectTransform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 137932} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2, y: 13, z: 1} + m_LocalPosition: {x: 0, y: 0, z: -9} + m_LocalScale: {x: .0555803552, y: .0550374165, z: .0277901776} m_Children: - {fileID: 22492620} - {fileID: 22474460} - m_Father: {fileID: 22434640} + m_Father: {fileID: 422624} m_RootOrder: 1 m_AnchorMin: {x: .5, y: .5} m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: -826, y: 451} + m_AnchoredPosition: {x: .0555419922, y: 2.08905029} m_SizeDelta: {x: 100, y: 20} m_Pivot: {x: .5, y: .5} --- !u!224 &22408488 @@ -1977,14 +2061,14 @@ RectTransform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 143898} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 6.56412172, z: 1} + m_LocalPosition: {x: 0, y: 0, z: -9} + m_LocalScale: {x: .0277901776, y: .0277901758, z: .0277901776} m_Children: [] - m_Father: {fileID: 22434640} + m_Father: {fileID: 422624} m_RootOrder: 2 m_AnchorMin: {x: .5, y: .5} m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: -824, y: -519} + m_AnchoredPosition: {x: .111206055, y: -2.01763916} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: .5, y: .5} --- !u!224 &22431700 @@ -2013,11 +2097,7 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -9} m_LocalScale: {x: .0277901795, y: .0042336476, z: .0277901795} - m_Children: - - {fileID: 22478268} - - {fileID: 22401764} - - {fileID: 22428368} - - {fileID: 22441718} + m_Children: [] m_Father: {fileID: 472642} m_RootOrder: 3 m_AnchorMin: {x: .5, y: .5} @@ -2032,16 +2112,16 @@ RectTransform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 103882} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2, y: 13, z: 1} + m_LocalPosition: {x: 0, y: 0, z: -9} + m_LocalScale: {x: .0555803552, y: .0550374165, z: .0277901776} m_Children: - {fileID: 22408488} - {fileID: 22498810} - m_Father: {fileID: 22434640} + m_Father: {fileID: 422624} m_RootOrder: 3 m_AnchorMin: {x: .5, y: .5} m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: -826.000183, y: -859} + m_AnchoredPosition: {x: .0556030273, y: -3.45703125} m_SizeDelta: {x: 100, y: 20} m_Pivot: {x: .5, y: .5} --- !u!224 &22474460 @@ -2069,14 +2149,14 @@ RectTransform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 170390} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 6.56412172, z: 1} + m_LocalPosition: {x: 0, y: 0, z: -9} + m_LocalScale: {x: .0277901776, y: .0277901758, z: .0277901776} m_Children: [] - m_Father: {fileID: 22434640} + m_Father: {fileID: 422624} m_RootOrder: 0 m_AnchorMin: {x: .5, y: .5} m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: -834, y: 208} + m_AnchoredPosition: {x: -.166748047, y: 1.06028748} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: .5, y: .5} --- !u!224 &22492620 diff --git a/Assets/Prefabs/StatTracker.prefab b/Assets/Prefabs/StatTracker.prefab new file mode 100644 index 0000000..c67f806 --- /dev/null +++ b/Assets/Prefabs/StatTracker.prefab @@ -0,0 +1,57 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &157894 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 4: {fileID: 485512} + - 114: {fileID: 11474032} + m_Layer: 0 + m_Name: StatTracker + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &485512 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 157894} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: .382297277, y: -.199220359, z: .00820271578} + m_LocalScale: {x: 1.00091147, y: 1.00091147, z: 1.00091147} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 +--- !u!114 &11474032 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 157894} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 56528e23e2f115447855f6a2e52937f4, type: 3} + m_Name: + m_EditorClassIdentifier: + p: {fileID: 0} + acoladeManager: {fileID: 0} + elusiveScore: 0 + timeSatStill: 0 + amountOfBullets: 0 +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 0} + m_RootGameObject: {fileID: 157894} + m_IsPrefabParent: 1 diff --git a/Assets/Prefabs/StatTracker.prefab.meta b/Assets/Prefabs/StatTracker.prefab.meta new file mode 100644 index 0000000..f28a7a1 --- /dev/null +++ b/Assets/Prefabs/StatTracker.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 08a27cbc8e73fef4cb7f9cb3b2b6eb71 +timeCreated: 1456865255 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: From d94d97d03a29ea6209e1c3ff93fece6462a8c15d Mon Sep 17 00:00:00 2001 From: JSleekXD Date: Tue, 1 Mar 2016 22:58:44 +0000 Subject: [PATCH 32/39] Revert "Revert "Package"" This reverts commit 8df22b04732290b66a0447ad253d83f4c91b380b. --- StatTrackAndAcolade.unitypackage | Bin 0 -> 1991 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 StatTrackAndAcolade.unitypackage diff --git a/StatTrackAndAcolade.unitypackage b/StatTrackAndAcolade.unitypackage new file mode 100644 index 0000000000000000000000000000000000000000..f24a68ae32cfabac06a45cdaaaabd9844ab458f5 GIT binary patch literal 1991 zcmV;&2RQg2iwFn;0M=Fj0AX@tXmn+5a4vLVascgHZEw>s5boFIR~#QeL$EAy-kOym zjqx^#H&H-B2q7nNiXlx(;tmGdFXID0iNCgraX5Z@!7ry6bOrtcGCSdOon>xR)M2JvK%H6BC!XC(s@s~A3NP%>yy+!CupSo=x*VM<2IR z8YC>5^<7%ncPnui=6up%VLGapt1y~!Z0)!X=`&(665}n~_Rs)hmlEa>-|}MnDu{y# zs=zv|Et6W0y9qul_97fHk2%ZLy~*ORX_zH6V)toEN8c-fCDQ^I!Z6HoR?02-m<_2I z3Z5io2_0usoYeTnG)b5!YRZ!H2AAfur(t5BA9W12<@ldfg4>>0(iD((Ac%)6ssUH=n& zSf;3s-sx%8`Ul%wz<&hos9XPS(2iVS#b)^gDK=}HUVWmaodRUq+J43(8P~}LtY1b6*0i-l{7~&C5$L{l|KA4v0ROKtjbre?<@=6t4E~p{e~$Z?$K4_X z9MeQR#%^+k{&yB8V;@*Jl`ec1oy9U;Qm1sm`;&_I72WRS=|ZFmPoXp5V0}u|!b( zrC1%-B|VPkKvNyApIkz?wmn}Nm$9*uWWo5PFedgti^Tk#|8EWd+qP+`^M7WC|68GB z@&Cz=109F|`#!Nc{QnoxDkZmr|DDD6e;xjBi7NbG+sJhxfd7en-z5==f&h=(Qs&tG zenjxJYaCd1?E8`RoAAHYz5j2AR_g!!@jo6Jv=;I|Ovmc>f347I@;?mRu)BXr{)fym zFqY(hST^zdOY=V};0p>B|F#?uCI26j1EMs4COIIO^g+n?J@~u zLuP@PzSGCyFUtZclRwIwk26g5P-gK*rFy7oKhso?Rj>U{lj>0q4oL<4hglg)QD=~q z(H@=b`G3CgpJx7t4R~Q&UHrcl`a%3>m1!)={~%rd$6rLNl-x@E$8N-by7+I4w2=SN Z*z|TeARTqoQAhtSeFHnH4IltW008<@{I~!B literal 0 HcmV?d00001 From df2273de4283e1df5306f2a309cf8504e26e017b Mon Sep 17 00:00:00 2001 From: JSleekXD Date: Tue, 1 Mar 2016 23:08:44 +0000 Subject: [PATCH 33/39] Player 1's ammo count and slider now positioned correctly. Also re-reverted (added) Pauls stuff in The ammo count and slider were completely in the middle of nowhere due 'testHUDHolder'. This has now been fixed and the 'testHUDHolder has been removed. Also re-reverted Pauls stat tracker. This means all of Paul's work is now in the latest working version, albeit not in the scene itself. --- Assets/Scenes/Prototype.unity | 2725 ++++++++++++++++++++++++++++----- 1 file changed, 2316 insertions(+), 409 deletions(-) diff --git a/Assets/Scenes/Prototype.unity b/Assets/Scenes/Prototype.unity index cd6a013..66a71da 100644 --- a/Assets/Scenes/Prototype.unity +++ b/Assets/Scenes/Prototype.unity @@ -650,6 +650,76 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_IsPrefabParent: 0 +--- !u!1 &75480627 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 107548, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 75480628} + - 222: {fileID: 75480630} + - 114: {fileID: 75480629} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &75480628 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22408488, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 75480627} + 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: 1582865739} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: .25} + m_AnchorMax: {x: 1, y: .75} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -10, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &75480629 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11404772, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 75480627} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 05718618eaecab942a4da378f741875e, type: 3} + m_Type: 3 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 0 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &75480630 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22224336, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 75480627} --- !u!4 &84567864 stripped Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} @@ -738,6 +808,76 @@ SpriteRenderer: m_SortingOrder: 1 m_Sprite: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} +--- !u!1 &106052291 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 191010, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 106052292} + - 222: {fileID: 106052294} + - 114: {fileID: 106052293} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &106052292 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22492620, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 106052291} + 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: 899817849} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: .25} + m_AnchorMax: {x: 1, y: .75} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -10, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &106052293 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11446066, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 106052291} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 05718618eaecab942a4da378f741875e, type: 3} + m_Type: 3 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 0 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &106052294 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22235334, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 106052291} --- !u!4 &110914826 stripped Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} @@ -1337,6 +1477,57 @@ Transform: Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_PrefabInternal: {fileID: 66406261} +--- !u!1 &294597588 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 147460, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 294597589} + - 114: {fileID: 294597590} + m_Layer: 0 + m_Name: SpriteManager2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &294597589 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 404134, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 294597588} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -13.0795021, y: .416473091, z: -323.863647} + m_LocalScale: {x: .99908936, y: .99908936, z: .99908936} + m_Children: [] + m_Father: {fileID: 1515989185} + m_RootOrder: 6 +--- !u!114 &294597590 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11400524, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 294597588} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 72924532f27ef1a44a83a8354e4dcaa9, type: 3} + m_Name: + m_EditorClassIdentifier: + playerSprites: + - {fileID: 21300000, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300012, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300008, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300002, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300004, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300006, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300010, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300014, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + - {fileID: 21300016, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + player: {fileID: 1515989180} --- !u!1 &308460198 GameObject: m_ObjectHideFlags: 0 @@ -1499,6 +1690,40 @@ MonoBehaviour: m_EditorClassIdentifier: DynamicWallsList: [] wallScript: {fileID: 0} +--- !u!1 &330277378 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 119466, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 330277379} + m_Layer: 5 + m_Name: Fill Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &330277379 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22498810, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 330277378} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1536661276} + m_Father: {fileID: 1582865739} + m_RootOrder: 1 + m_AnchorMin: {x: 0, y: .25} + m_AnchorMax: {x: 1, y: .75} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -20, y: 0} + m_Pivot: {x: .5, y: .5} --- !u!1 &331099736 GameObject: m_ObjectHideFlags: 0 @@ -3206,6 +3431,64 @@ Transform: Transform: m_PrefabParentObject: {fileID: 474252, guid: 1b2ba2bc4d75b9e4687f59dbb42902ff, type: 2} m_PrefabInternal: {fileID: 1287841312} +--- !u!1 &532732566 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 143898, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 532732567} + - 222: {fileID: 532732569} + - 114: {fileID: 2112786343} + - 114: {fileID: 532732568} + m_Layer: 5 + m_Name: PlayerAmmoCount1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &532732567 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22428368, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 532732566} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 6.56412077, z: 1} + m_Children: [] + m_Father: {fileID: 1134726025} + m_RootOrder: 2 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: -823.997986, y: -519.015503} + m_SizeDelta: {x: 250, y: 80} + m_Pivot: {x: .5, y: .5} +--- !u!114 &532732568 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11492776, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 532732566} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c88ea203cda48f3498c2583e23601830, type: 3} + m_Name: + m_EditorClassIdentifier: + ammoCount: {fileID: 2112786343} + playerID: 1 + player: {fileID: 1515989184} +--- !u!222 &532732569 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22295760, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 532732566} --- !u!1001 &571052661 Prefab: m_ObjectHideFlags: 0 @@ -5049,56 +5332,141 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_IsPrefabParent: 0 ---- !u!1001 &900741911 -Prefab: +--- !u!1 &899817848 +GameObject: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1900231291} - m_Modifications: - - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} - propertyPath: m_LocalPosition.x - value: 8.10000038 - objectReference: {fileID: 0} - - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} - propertyPath: m_LocalPosition.y - value: -.200000003 - objectReference: {fileID: 0} - - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} - propertyPath: m_Name - value: Block 5 - objectReference: {fileID: 0} - - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} - propertyPath: m_SortingOrder - value: -8 - objectReference: {fileID: 0} - - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} - propertyPath: m_Sprite - value: + m_PrefabParentObject: {fileID: 137932, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 899817849} + - 114: {fileID: 899817850} + m_Layer: 5 + m_Name: PlayerHP1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &899817849 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22401764, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 899817848} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 13, z: 1} + m_Children: + - {fileID: 106052292} + - {fileID: 2048834753} + m_Father: {fileID: 1134726025} + m_RootOrder: 1 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: -826.000916, y: 450.997131} + m_SizeDelta: {x: 100, y: 20} + m_Pivot: {x: .5, y: .5} +--- !u!114 &899817850 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11483498, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 899817848} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -113659843, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} + m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} + m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_ColorMultiplier: 1 + m_FadeDuration: .100000001 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + m_FillRect: {fileID: 1089303817} + m_HandleRect: {fileID: 0} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 1 + m_WholeNumbers: 0 + m_Value: 1 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Slider+SliderEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!1001 &900741911 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1900231291} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: 8.10000038 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.y + value: -.200000003 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Name + value: Block 5 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_SortingOrder + value: -8 + objectReference: {fileID: 0} + - target: {fileID: 21226700, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_Sprite + value: objectReference: {fileID: 21300000, guid: 19b77e21ba629c3448768918503ec43a, type: 3} - target: {fileID: 172214, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} @@ -5771,6 +6139,160 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_IsPrefabParent: 0 +--- !u!1 &1088834178 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 150530, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1088834179} + - 212: {fileID: 1088834182} + - 58: {fileID: 1088834181} + - 114: {fileID: 1088834180} + m_Layer: 0 + m_Name: BallMode + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1088834179 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 495372, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1088834178} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -1} + m_LocalScale: {x: .115264796, y: .115264796, z: .115264796} + m_Children: [] + m_Father: {fileID: 1515989185} + m_RootOrder: 2 +--- !u!114 &1088834180 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11476046, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1088834178} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 98209420a6d38b74bb9630d8cf0c9320, type: 3} + m_Name: + m_EditorClassIdentifier: + player: {fileID: 1515989180} +--- !u!58 &1088834181 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 5827044, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1088834178} + m_Enabled: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 10 +--- !u!212 &1088834182 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 21230166, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1088834178} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 1 + m_ReflectionProbeUsage: 1 + m_ProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_ImportantGI: 0 + m_AutoUVMaxDistance: .5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingOrder: 1 + m_Sprite: {fileID: 21300000, guid: d3661648c4213db4a83f88596f678fe0, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} +--- !u!1 &1089303816 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 172744, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1089303817} + - 222: {fileID: 1089303819} + - 114: {fileID: 1089303818} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1089303817 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22431700, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1089303816} + 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: 2048834753} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 10, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1089303818 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11473472, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1089303816} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: .117241383, g: 1, b: 0, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 455c3660ef4b63041a191d714693b47f, type: 3} + m_Type: 3 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 0 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1089303819 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22200920, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1089303816} --- !u!1 &1102166522 GameObject: m_ObjectHideFlags: 0 @@ -5805,12 +6327,45 @@ Transform: Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_PrefabInternal: {fileID: 669112603} ---- !u!1 &1134726024 stripped +--- !u!1 &1134726024 GameObject: + m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 121534, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - m_PrefabInternal: {fileID: 1800545368} ---- !u!1001 &1138030137 -Prefab: + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1134726025} + m_Layer: 5 + m_Name: PlayerHUD + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1134726025 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22434640, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1134726024} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -9} + m_LocalScale: {x: .0277901795, y: .0042336476, z: .0277901795} + m_Children: + - {fileID: 1630950368} + - {fileID: 899817849} + - {fileID: 532732567} + - {fileID: 1582865739} + m_Father: {fileID: 1515989185} + m_RootOrder: 3 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: 23.0102539, y: .1796875} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: .5, y: .5} +--- !u!1001 &1138030137 +Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: @@ -7613,20 +8168,244 @@ Transform: - {fileID: 762002932} m_Father: {fileID: 1102166523} m_RootOrder: 1 ---- !u!1 &1515989180 stripped +--- !u!1 &1502948557 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 183054, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1502948558} + - 212: {fileID: 1502948559} + m_Layer: 0 + m_Name: Reticle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1502948558 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 445210, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1502948557} + 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: 1515989185} + m_RootOrder: 0 +--- !u!212 &1502948559 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 21206478, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1502948557} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 1 + m_ReflectionProbeUsage: 1 + m_ProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_ImportantGI: 0 + m_AutoUVMaxDistance: .5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 1fd3c28ec5ebaef4d8511f68a1b521c2, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} +--- !u!1 &1515989180 GameObject: + m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 133054, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - m_PrefabInternal: {fileID: 1800545368} ---- !u!114 &1515989184 stripped + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1515989185} + - 114: {fileID: 1515989189} + - 114: {fileID: 1515989188} + - 212: {fileID: 1515989187} + - 114: {fileID: 1515989186} + - 50: {fileID: 1515989183} + - 61: {fileID: 1515989182} + - 114: {fileID: 1515989184} + - 114: {fileID: 1515989181} + m_Layer: 0 + m_Name: Player 1 + m_TagString: Player + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1515989181 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11461038, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1515989180} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2064fcc622451c34086cbca807911795, type: 3} + m_Name: + m_EditorClassIdentifier: + ballObj: {fileID: 1088834178} + playerScript: {fileID: 1515989184} + isBallin: 0 + weaponNumber: 0 +--- !u!61 &1515989182 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 6182250, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1515989180} + m_Enabled: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_Offset: {x: -.125, y: -.0320999995} + serializedVersion: 2 + m_Size: {x: .861835837, y: 2.24815989} +--- !u!50 &1515989183 +Rigidbody2D: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 5019476, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1515989180} + m_Mass: 1 + m_LinearDrag: 100 + m_AngularDrag: .0500000007 + m_GravityScale: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 4 +--- !u!114 &1515989184 MonoBehaviour: + m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11438944, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - m_PrefabInternal: {fileID: 1800545368} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1515989180} + m_Enabled: 1 + m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 3800ba1d4402403408247b3365ec08f5, type: 3} ---- !u!4 &1515989185 stripped + m_Name: + m_EditorClassIdentifier: + mEquippedWeapon: {fileID: 1998640093} + weaponList: [] + mPlayerNumber: 1 + HPSlider: {fileID: 899817850} + ammoSlider: {fileID: 1582865740} + waitTime: 0 + minigunParticleSystem: {fileID: 1947075206} + playerHUD: {fileID: 1134726024} + playerPistol: {fileID: 1597409232} + playerSpawnPoints: [] + isPlayerDead: 0 + timeToRespawn: 3 + timeSpentDead: 0 +--- !u!4 &1515989185 Transform: + m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - m_PrefabInternal: {fileID: 1800545368} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1515989180} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 323.855438} + m_LocalScale: {x: 36.0167351, y: 36.0167351, z: 36.0167351} + m_Children: + - {fileID: 1502948558} + - {fileID: 1947075205} + - {fileID: 1088834179} + - {fileID: 1134726025} + - {fileID: 1762781404} + - {fileID: 1534274173} + - {fileID: 294597589} + m_Father: {fileID: 653857878} + m_RootOrder: 1 +--- !u!114 &1515989186 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11468964, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1515989180} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9953f2ce208997f4590922eebec801a4, type: 3} + m_Name: + m_EditorClassIdentifier: + player: {fileID: 1515989180} + spriteManager: {fileID: 1726136058} + mReticle: {fileID: 1502948557} +--- !u!212 &1515989187 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 21264780, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1515989180} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 1 + m_ReflectionProbeUsage: 1 + m_ProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_ImportantGI: 0 + m_AutoUVMaxDistance: .5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: -755987041 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300006, guid: 8d5e240089c1c994291391e0a9631f95, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} +--- !u!114 &1515989188 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11423510, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1515989180} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55891d2920542d641913a9d95d43c293, type: 3} + m_Name: + m_EditorClassIdentifier: + spriteManager: {fileID: 1726136058} +--- !u!114 &1515989189 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11491268, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1515989180} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8d5cf19dc09fdeb428bccce2b3e7e0a0, type: 3} + m_Name: + m_EditorClassIdentifier: + mMovementSpeed: 1000 + _playerActions: {fileID: 1515989181} --- !u!1001 &1528351361 Prefab: m_ObjectHideFlags: 0 @@ -7682,6 +8461,80 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_IsPrefabParent: 0 +--- !u!4 &1534274173 stripped +Transform: + m_PrefabParentObject: {fileID: 485638, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} + m_PrefabInternal: {fileID: 835328183} +--- !u!1 &1536661275 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 168636, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1536661276} + - 222: {fileID: 1536661278} + - 114: {fileID: 1536661277} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1536661276 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22426558, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1536661275} + 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: 330277379} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 10, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1536661277 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11468980, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1536661275} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: .713235259, g: .545993865, b: 0, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 455c3660ef4b63041a191d714693b47f, type: 3} + m_Type: 3 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 0 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1536661278 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22246132, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1536661275} --- !u!4 &1558480073 stripped Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} @@ -7741,18 +8594,103 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_IsPrefabParent: 0 ---- !u!1001 &1583449085 -Prefab: +--- !u!1 &1582865738 +GameObject: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 665245883} - m_Modifications: - - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} - propertyPath: m_LocalPosition.x - value: .0900000036 - objectReference: {fileID: 0} - - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabParentObject: {fileID: 103882, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1582865739} + - 114: {fileID: 1582865740} + m_Layer: 5 + m_Name: PlayerAmmoCountSlider1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1582865739 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22441718, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1582865738} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 13, z: 1} + m_Children: + - {fileID: 75480628} + - {fileID: 330277379} + m_Father: {fileID: 1134726025} + m_RootOrder: 3 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: -875, y: -859.003723} + m_SizeDelta: {x: 100, y: 20} + m_Pivot: {x: 0, y: 0} +--- !u!114 &1582865740 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11434670, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1582865738} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -113659843, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: .960784316, g: .960784316, b: .960784316, a: 1} + m_PressedColor: {r: .784313738, g: .784313738, b: .784313738, a: 1} + m_DisabledColor: {r: .784313738, g: .784313738, b: .784313738, a: .501960814} + m_ColorMultiplier: 1 + m_FadeDuration: .100000001 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + m_FillRect: {fileID: 1536661276} + m_HandleRect: {fileID: 0} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 1 + m_WholeNumbers: 0 + m_Value: 1 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Slider+SliderEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!1001 &1583449085 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 665245883} + m_Modifications: + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + propertyPath: m_LocalPosition.x + value: .0900000036 + objectReference: {fileID: 0} + - target: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} propertyPath: m_LocalPosition.y value: 3.78999996 objectReference: {fileID: 0} @@ -7862,6 +8800,81 @@ Transform: - {fileID: 342067655} m_Father: {fileID: 782908716} m_RootOrder: 1 +--- !u!1 &1630950367 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 170390, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1630950368} + - 222: {fileID: 1630950370} + - 114: {fileID: 1630950369} + m_Layer: 5 + m_Name: PlayerIconOne + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1630950368 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22478268, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1630950367} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 6.56412077, z: 1} + m_Children: [] + m_Father: {fileID: 1134726025} + m_RootOrder: 0 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: -833.999756, y: 208.00032} + m_SizeDelta: {x: 250, y: 80} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1630950369 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11461712, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1630950367} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: .911764681, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 60 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Player 1 +--- !u!222 &1630950370 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22230850, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1630950367} --- !u!1001 &1633478505 Prefab: m_ObjectHideFlags: 0 @@ -8719,6 +9732,10 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_IsPrefabParent: 0 +--- !u!4 &1762781404 stripped +Transform: + m_PrefabParentObject: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + m_PrefabInternal: {fileID: 256436919} --- !u!1 &1764917751 GameObject: m_ObjectHideFlags: 0 @@ -9016,355 +10033,64 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_IsPrefabParent: 0 ---- !u!1001 &1800545368 +--- !u!1001 &1805697436 Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 653857878} + m_TransformParent: {fileID: 1456487450} m_Modifications: - - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} propertyPath: m_LocalPosition.x - value: 0 + value: -13.0795021 objectReference: {fileID: 0} - - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} propertyPath: m_LocalPosition.y - value: 0 + value: .416473091 objectReference: {fileID: 0} - - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} propertyPath: m_LocalPosition.z - value: 323.855438 + value: -323.863647 objectReference: {fileID: 0} - - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 472642, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} propertyPath: m_RootOrder - value: 1 + value: 4 objectReference: {fileID: 0} - - target: {fileID: 11423510, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: spriteManager - value: - objectReference: {fileID: 1726136058} - - target: {fileID: 11438944, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: mEquippedWeapon + - target: {fileID: 11488472, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: player value: - objectReference: {fileID: 1998640093} - - target: {fileID: 22431700, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 22431700, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 22426558, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 22426558, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 133054, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + objectReference: {fileID: 1870004477} + - target: {fileID: 123852, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} propertyPath: m_Name - value: Player 1 - objectReference: {fileID: 0} - - target: {fileID: 11438944, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: mPlayerNumber - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11468964, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: spriteManager - value: - objectReference: {fileID: 1726136058} - - target: {fileID: 21230166, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: d3661648c4213db4a83f88596f678fe0, - type: 3} - - target: {fileID: 11438944, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: playerHUD - value: - objectReference: {fileID: 1134726024} - - target: {fileID: 11446066, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 05718618eaecab942a4da378f741875e, - type: 3} - - target: {fileID: 11446066, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Color.r - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11446066, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Color.g - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11446066, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Color.b - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11473472, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 455c3660ef4b63041a191d714693b47f, - type: 3} - - target: {fileID: 11446066, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Type - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 11446066, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_FillMethod - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 11446066, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_PreserveAspect - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11473472, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_RaycastTarget - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 11473472, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Type - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 11473472, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_FillOrigin - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 11473472, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_FillMethod - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 11473472, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Color.r - value: .117241383 - objectReference: {fileID: 0} - - target: {fileID: 11473472, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Color.g - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11473472, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Color.b - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 11446066, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_RaycastTarget - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 11473472, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_PreserveAspect - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11404772, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Color.r - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11404772, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Color.g - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11404772, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Color.b - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11404772, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_RaycastTarget - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 11404772, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 05718618eaecab942a4da378f741875e, - type: 3} - - target: {fileID: 11404772, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Type - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 11404772, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_PreserveAspect - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11404772, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_FillMethod - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 11468980, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Color.r - value: .713235259 + value: SpriteManager2 objectReference: {fileID: 0} - - target: {fileID: 11468980, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Color.g - value: .545993865 + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_LocalScale.x + value: .99908936 objectReference: {fileID: 0} - - target: {fileID: 11468980, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_RaycastTarget - value: 0 + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_LocalScale.y + value: .99908936 objectReference: {fileID: 0} - - target: {fileID: 11468980, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 455c3660ef4b63041a191d714693b47f, - type: 3} - - target: {fileID: 11468980, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Type - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 11468980, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_PreserveAspect - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11468980, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_FillMethod - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22428368, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_AnchoredPosition.y - value: -450 - objectReference: {fileID: 0} - - target: {fileID: 22441718, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_AnchoredPosition.y - value: -527 - objectReference: {fileID: 0} - - target: {fileID: 22441718, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22441718, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22441718, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_AnchoredPosition.x - value: -877 - objectReference: {fileID: 0} - - target: {fileID: 22441718, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22441718, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22441718, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22441718, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Pivot.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 22428368, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_AnchoredPosition.x - value: -758 - objectReference: {fileID: 0} - - target: {fileID: 11405038, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_FontData.m_FontSize - value: 32 - objectReference: {fileID: 0} - - target: {fileID: 11405038, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_FontData.m_RichText - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11434670, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Interactable - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 11468980, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Color.b - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 11438944, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: playerPistol - value: - objectReference: {fileID: 1597409232} - - target: {fileID: 445210, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 495372, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 121534, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - propertyPath: m_Name - value: PlayerHUD - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - m_IsPrefabParent: 0 ---- !u!1001 &1805697436 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1456487450} - m_Modifications: - - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} - propertyPath: m_LocalPosition.x - value: -13.0795021 - objectReference: {fileID: 0} - - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} - propertyPath: m_LocalPosition.y - value: .416473091 - objectReference: {fileID: 0} - - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} - propertyPath: m_LocalPosition.z - value: -323.863647 - objectReference: {fileID: 0} - - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 11488472, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} - propertyPath: player - value: - objectReference: {fileID: 1870004477} - - target: {fileID: 123852, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} - propertyPath: m_Name - value: SpriteManager2 - objectReference: {fileID: 0} - - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} - propertyPath: m_LocalScale.x - value: .99908936 - objectReference: {fileID: 0} - - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} - propertyPath: m_LocalScale.y - value: .99908936 - objectReference: {fileID: 0} - - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} - propertyPath: m_LocalScale.z - value: .99908936 + - target: {fileID: 459904, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} + propertyPath: m_LocalScale.z + value: .99908936 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 177f3aee218d5654f91c54c038b43ac9, type: 2} @@ -10064,25 +10790,1145 @@ GameObject: --- !u!4 &1937374956 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1937374955} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -12.0053568, y: 6.03046846, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1310894361} + - {fileID: 1448905500} + - {fileID: 815532423} + - {fileID: 499230965} + - {fileID: 988280011} + - {fileID: 221484448} + m_Father: {fileID: 1070331672} + m_RootOrder: 0 +--- !u!4 &1946142852 stripped +Transform: + m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} + m_PrefabInternal: {fileID: 2104523922} +--- !u!1 &1947075204 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 120392, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1947075205} + - 198: {fileID: 1947075206} + - 199: {fileID: 1947075207} + m_Layer: 0 + m_Name: MiniGun Particle System + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1947075205 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 490514, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1947075204} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -.129999995, y: 0, z: .779999971} + m_LocalScale: {x: 5, y: 5, z: 5} + m_Children: [] + m_Father: {fileID: 1515989185} + m_RootOrder: 1 +--- !u!198 &1947075206 +ParticleSystem: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 19868204, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1947075204} + lengthInSec: 2 + startDelay: 0 + speed: 1 + randomSeed: 0 + looping: 1 + prewarm: 1 + playOnAwake: 0 + moveWithTransform: 1 + InitialModule: + enabled: 1 + startLifetime: + scalar: .200000003 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + startSpeed: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + startColor: + maxGradient: + key0: + serializedVersion: 2 + rgba: 4294967295 + key1: + serializedVersion: 2 + rgba: 4294967295 + key2: + serializedVersion: 2 + rgba: 0 + key3: + serializedVersion: 2 + rgba: 0 + key4: + serializedVersion: 2 + rgba: 0 + key5: + serializedVersion: 2 + rgba: 0 + key6: + serializedVersion: 2 + rgba: 0 + key7: + serializedVersion: 2 + rgba: 0 + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + minGradient: + key0: + serializedVersion: 2 + rgba: 4294967295 + key1: + serializedVersion: 2 + rgba: 4294967295 + key2: + serializedVersion: 2 + rgba: 0 + key3: + serializedVersion: 2 + rgba: 0 + key4: + serializedVersion: 2 + rgba: 0 + key5: + serializedVersion: 2 + rgba: 0 + key6: + serializedVersion: 2 + rgba: 0 + key7: + serializedVersion: 2 + rgba: 0 + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + minColor: + serializedVersion: 2 + rgba: 4294967295 + maxColor: + serializedVersion: 2 + rgba: 4294967295 + minMaxState: 0 + startSize: + scalar: .200000003 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + startRotation: + scalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + gravityModifier: 8 + inheritVelocity: 0 + maxNumParticles: 100 + ShapeModule: + serializedVersion: 2 + enabled: 1 + type: 10 + radius: .200000003 + angle: 25 + length: 5 + boxX: 1 + boxY: 1 + boxZ: 1 + arc: 10 + placementMode: 0 + m_Mesh: {fileID: 0} + randomDirection: 0 + EmissionModule: + enabled: 1 + m_Type: 0 + rate: + scalar: 10 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + cnt0: 30 + cnt1: 30 + cnt2: 30 + cnt3: 30 + time0: 0 + time1: 0 + time2: 0 + time3: 0 + m_BurstCount: 0 + SizeModule: + enabled: 0 + curve: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 1 + RotationModule: + enabled: 1 + curve: + scalar: 17.4532928 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + ColorModule: + enabled: 1 + gradient: + maxGradient: + key0: + serializedVersion: 2 + rgba: 4294967295 + key1: + serializedVersion: 2 + rgba: 83886079 + key2: + serializedVersion: 2 + rgba: 0 + key3: + serializedVersion: 2 + rgba: 0 + key4: + serializedVersion: 2 + rgba: 0 + key5: + serializedVersion: 2 + rgba: 0 + key6: + serializedVersion: 2 + rgba: 0 + key7: + serializedVersion: 2 + rgba: 0 + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 65535 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + minGradient: + key0: + serializedVersion: 2 + rgba: 4294967295 + key1: + serializedVersion: 2 + rgba: 4294967295 + key2: + serializedVersion: 2 + rgba: 0 + key3: + serializedVersion: 2 + rgba: 0 + key4: + serializedVersion: 2 + rgba: 0 + key5: + serializedVersion: 2 + rgba: 0 + key6: + serializedVersion: 2 + rgba: 0 + key7: + serializedVersion: 2 + rgba: 0 + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + minColor: + serializedVersion: 2 + rgba: 4294967295 + maxColor: + serializedVersion: 2 + rgba: 4294967295 + minMaxState: 1 + UVModule: + enabled: 0 + frameOverTime: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 1 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 1 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 1 + tilesX: 1 + tilesY: 1 + animationType: 0 + rowIndex: 0 + cycles: 1 + randomRow: 1 + VelocityModule: + enabled: 1 + x: + scalar: .100000001 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + y: + scalar: .100000001 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + z: + scalar: .100000001 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + inWorldSpace: 0 + ForceModule: + enabled: 0 + x: + scalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + y: + scalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + z: + scalar: 0 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + inWorldSpace: 0 + randomizePerFrame: 0 + ExternalForcesModule: + enabled: 0 + multiplier: 10 + ClampVelocityModule: + enabled: 0 + x: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + y: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + z: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + magnitude: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + separateAxis: 0 + inWorldSpace: 0 + dampen: .899999976 + SizeBySpeedModule: + enabled: 0 + curve: + scalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 1 + range: {x: 0, y: 1} + RotationBySpeedModule: + enabled: 0 + curve: + scalar: .785398126 + maxCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + minMaxState: 0 + range: {x: 0, y: 1} + ColorBySpeedModule: + enabled: 0 + gradient: + maxGradient: + key0: + serializedVersion: 2 + rgba: 4294967295 + key1: + serializedVersion: 2 + rgba: 4294967295 + key2: + serializedVersion: 2 + rgba: 0 + key3: + serializedVersion: 2 + rgba: 0 + key4: + serializedVersion: 2 + rgba: 0 + key5: + serializedVersion: 2 + rgba: 0 + key6: + serializedVersion: 2 + rgba: 0 + key7: + serializedVersion: 2 + rgba: 0 + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + minGradient: + key0: + serializedVersion: 2 + rgba: 4294967295 + key1: + serializedVersion: 2 + rgba: 4294967295 + key2: + serializedVersion: 2 + rgba: 0 + key3: + serializedVersion: 2 + rgba: 0 + key4: + serializedVersion: 2 + rgba: 0 + key5: + serializedVersion: 2 + rgba: 0 + key6: + serializedVersion: 2 + rgba: 0 + key7: + serializedVersion: 2 + rgba: 0 + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + minColor: + serializedVersion: 2 + rgba: 4294967295 + maxColor: + serializedVersion: 2 + rgba: 4294967295 + minMaxState: 1 + range: {x: 0, y: 1} + CollisionModule: + enabled: 0 + type: 0 + plane0: {fileID: 0} + plane1: {fileID: 0} + plane2: {fileID: 0} + plane3: {fileID: 0} + plane4: {fileID: 0} + plane5: {fileID: 0} + dampen: 0 + bounce: 1 + energyLossOnCollision: 0 + minKillSpeed: 0 + particleRadius: .00999999978 + collidesWith: + serializedVersion: 2 + m_Bits: 4294967295 + quality: 0 + voxelSize: .5 + collisionMessages: 0 + SubModule: + enabled: 0 + subEmitterBirth: {fileID: 0} + subEmitterBirth1: {fileID: 0} + subEmitterCollision: {fileID: 0} + subEmitterCollision1: {fileID: 0} + subEmitterDeath: {fileID: 0} + subEmitterDeath1: {fileID: 0} +--- !u!199 &1947075207 +ParticleSystemRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 19911596, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1937374955} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -12.0053568, y: 6.03046846, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1310894361} - - {fileID: 1448905500} - - {fileID: 815532423} - - {fileID: 499230965} - - {fileID: 988280011} - - {fileID: 221484448} - m_Father: {fileID: 1070331672} - m_RootOrder: 0 ---- !u!4 &1946142852 stripped -Transform: - m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} - m_PrefabInternal: {fileID: 2104523922} + m_GameObject: {fileID: 1947075204} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_Materials: + - {fileID: 2100000, guid: 1598bf38b0a98824b9c2b464eaf93fb7, type: 2} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 1 + m_ReflectionProbeUsage: 1 + m_ProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_ImportantGI: 0 + m_AutoUVMaxDistance: .5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_RenderMode: 0 + m_MaxParticleSize: .5 + m_CameraVelocityScale: 0 + m_VelocityScale: 0 + m_LengthScale: 2 + m_SortingFudge: 0 + m_NormalDirection: 1 + m_SortMode: 0 + m_Mesh: {fileID: 0} + m_Mesh1: {fileID: 0} + m_Mesh2: {fileID: 0} + m_Mesh3: {fileID: 0} --- !u!1 &1960966082 GameObject: m_ObjectHideFlags: 0 @@ -10651,6 +12497,40 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2041321887} +--- !u!1 &2048834752 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 189848, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 2048834753} + m_Layer: 5 + m_Name: Fill Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2048834753 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22474460, guid: 37b47e7042c5d694dbcf150debde834f, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2048834752} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1089303817} + m_Father: {fileID: 899817849} + m_RootOrder: 1 + m_AnchorMin: {x: 0, y: .25} + m_AnchorMax: {x: 1, y: .75} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -20, y: 0} + m_Pivot: {x: .5, y: .5} --- !u!1 &2050290494 GameObject: m_ObjectHideFlags: 0 @@ -11074,12 +12954,39 @@ Transform: - {fileID: 1102166523} m_Father: {fileID: 1960966083} m_RootOrder: 0 ---- !u!114 &2112786343 stripped +--- !u!114 &2112786343 MonoBehaviour: + m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 11405038, guid: 37b47e7042c5d694dbcf150debde834f, type: 2} - m_PrefabInternal: {fileID: 1800545368} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 532732566} + m_Enabled: 1 + m_EditorHideFlags: 0 m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: .911764681, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 32 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: AmmoCount --- !u!1001 &2129498887 Prefab: m_ObjectHideFlags: 0 From d02fab52ea695b82d72cce94e3efbee95ef62938 Mon Sep 17 00:00:00 2001 From: JSleekXD Date: Wed, 2 Mar 2016 00:01:00 +0000 Subject: [PATCH 34/39] Players can now score points (work in progress) If a player kills another player, they score a point. However, a player can also score a point by killing themselves. This is due to having not yet set up a special case for suicides. --- Assets/Scenes/Prototype.unity | 203 ++++++++++++++++++++++++++++++-- Assets/Scripts/Player/Player.cs | 33 ++++-- 2 files changed, 219 insertions(+), 17 deletions(-) diff --git a/Assets/Scenes/Prototype.unity b/Assets/Scenes/Prototype.unity index 66a71da..f29988c 100644 --- a/Assets/Scenes/Prototype.unity +++ b/Assets/Scenes/Prototype.unity @@ -985,9 +985,9 @@ RectTransform: m_LocalScale: {x: 1, y: .152343303, z: 1} m_Children: - {fileID: 2025581861} - - {fileID: 1413660775} - - {fileID: 2050290495} - - {fileID: 1812589629} + - {fileID: 505511254} + - {fileID: 731998854} + - {fileID: 1953444895} m_Father: {fileID: 653857878} m_RootOrder: 0 m_AnchorMin: {x: 0, y: 0} @@ -3324,6 +3324,41 @@ Transform: Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_PrefabInternal: {fileID: 2061694409} +--- !u!1 &505511253 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 505511254} + m_Layer: 5 + m_Name: old + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &505511254 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 505511253} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1413660775} + - {fileID: 2050290495} + - {fileID: 1812589629} + m_Father: {fileID: 143147948} + m_RootOrder: 1 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: .5, y: .5} --- !u!1 &512983135 GameObject: m_ObjectHideFlags: 0 @@ -4305,6 +4340,78 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_IsPrefabParent: 0 +--- !u!1 &731998853 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 731998854} + - 222: {fileID: 731998856} + - 114: {fileID: 731998855} + m_Layer: 5 + m_Name: Player1Score + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &731998854 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 731998853} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 6.5641222, z: 1} + m_Children: [] + m_Father: {fileID: 143147948} + m_RootOrder: 2 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: -817.200012, y: 0} + m_SizeDelta: {x: 400, y: 400} + m_Pivot: {x: .5, y: .5} +--- !u!114 &731998855 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 731998853} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 80 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: P1Score +--- !u!222 &731998856 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 731998853} --- !u!1 &737733635 GameObject: m_ObjectHideFlags: 0 @@ -7569,8 +7676,8 @@ RectTransform: - {fileID: 1898002833} - {fileID: 1766389763} - {fileID: 1667372849} - m_Father: {fileID: 143147948} - m_RootOrder: 1 + m_Father: {fileID: 505511254} + m_RootOrder: 0 m_AnchorMin: {x: .5, y: .5} m_AnchorMax: {x: .5, y: .5} m_AnchoredPosition: {x: 3.05175781e-05, y: -9.15527344e-05} @@ -8313,11 +8420,14 @@ MonoBehaviour: waitTime: 0 minigunParticleSystem: {fileID: 1947075206} playerHUD: {fileID: 1134726024} + playerScore: 0 playerPistol: {fileID: 1597409232} playerSpawnPoints: [] isPlayerDead: 0 timeToRespawn: 3 timeSpentDead: 0 + killingBulletID: 0 + playerScoreText: {fileID: 731998855} --- !u!4 &1515989185 Transform: m_ObjectHideFlags: 0 @@ -10124,8 +10234,8 @@ RectTransform: - {fileID: 2093644044} - {fileID: 866842711} - {fileID: 1433083141} - m_Father: {fileID: 143147948} - m_RootOrder: 3 + m_Father: {fileID: 505511254} + m_RootOrder: 2 m_AnchorMin: {x: .5, y: .5} m_AnchorMax: {x: .5, y: .5} m_AnchoredPosition: {x: 3.05175781e-05, y: -9.15527344e-05} @@ -10292,11 +10402,14 @@ MonoBehaviour: waitTime: 0 minigunParticleSystem: {fileID: 467455901} playerHUD: {fileID: 389116436} + playerScore: 0 playerPistol: {fileID: 879158141} playerSpawnPoints: [] isPlayerDead: 0 timeToRespawn: 3 timeSpentDead: 0 + killingBulletID: 0 + playerScoreText: {fileID: 1953444896} --- !u!114 &1870004479 MonoBehaviour: m_ObjectHideFlags: 0 @@ -11929,6 +12042,78 @@ ParticleSystemRenderer: m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} +--- !u!1 &1953444894 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1953444895} + - 222: {fileID: 1953444897} + - 114: {fileID: 1953444896} + m_Layer: 5 + m_Name: Player2Score + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1953444895 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1953444894} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 6.5641222, z: 1} + m_Children: [] + m_Father: {fileID: 143147948} + m_RootOrder: 3 + m_AnchorMin: {x: .5, y: .5} + m_AnchorMax: {x: .5, y: .5} + m_AnchoredPosition: {x: -394, y: -.00122070312} + m_SizeDelta: {x: 400, y: 400} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1953444896 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1953444894} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: .586206913, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 80 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: P2Score +--- !u!222 &1953444897 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1953444894} --- !u!1 &1960966082 GameObject: m_ObjectHideFlags: 0 @@ -12560,8 +12745,8 @@ RectTransform: - {fileID: 368835091} - {fileID: 58277923} - {fileID: 365794304} - m_Father: {fileID: 143147948} - m_RootOrder: 2 + m_Father: {fileID: 505511254} + m_RootOrder: 1 m_AnchorMin: {x: .5, y: .5} m_AnchorMax: {x: .5, y: .5} m_AnchoredPosition: {x: 3.05175781e-05, y: -9.15527344e-05} diff --git a/Assets/Scripts/Player/Player.cs b/Assets/Scripts/Player/Player.cs index 549ac57..0fa517e 100644 --- a/Assets/Scripts/Player/Player.cs +++ b/Assets/Scripts/Player/Player.cs @@ -32,6 +32,8 @@ public int PlayerNumber public ParticleSystem minigunParticleSystem; public GameObject playerHUD; + public int playerScore; + public Vector2 ReticlePosition { get @@ -45,6 +47,8 @@ public Vector2 ReticlePosition public bool isPlayerDead = false; public float timeToRespawn = 3f; public float timeSpentDead = 0f; + public int killingBulletID; + public Text playerScoreText; void Awake() @@ -61,17 +65,16 @@ void Start() mMaxHealth = 100; mHealth = mMaxHealth; + playerScore = 0; + playerScoreText.text = playerScore.ToString(); } void Update() { - Debug.Log(timeSpentDead); - if (isPlayerDead) - { - Debug.Log("TRUE"); - } + playerScoreText.text = playerScore.ToString(); + + if (isPlayerDead == true) { - Debug.Log("AAAAA"); timeSpentDead += Time.deltaTime; if (timeSpentDead >= timeToRespawn) { @@ -136,19 +139,33 @@ void OnCollisionEnter2D(Collision2D coll) // gameObject.SetActive(false); DisableAndHidePlayer(); Debug.Log("Player_" + mPlayerNumber + " has died"); - + killingBulletID = coll.gameObject.GetComponent().OwnerID; + IncreaseKillersScore(); ResetPlayerProperties(); SetPlayerSpawnPosition(); StartRespawnTimer(); } - + Debug.Log("Player_" + mPlayerNumber + " took damage from Player_" + coll.gameObject.GetComponent().OwnerID + "'s projectile"); Destroy(coll.gameObject); } } + public void IncreaseKillersScore() + { + Player[] players = FindObjectsOfType(typeof(Player)) as Player[]; + foreach(Player player in players) + { + if(player.mPlayerNumber == killingBulletID) + { + player.playerScore++; + + } + } + } + public void ResetPlayerProperties() { //reset player's health From c6066d72c7e5acb043b9f46bce4aa811cbe082e9 Mon Sep 17 00:00:00 2001 From: julianstopher Date: Wed, 2 Mar 2016 10:52:09 +0000 Subject: [PATCH 35/39] Player's default weapon is now pistol with infinite ammo The default weapon the player starts with is now a pistol, and the pistol has infinite ammo, so the player always has something to fire. --- Assets/Scenes/Prototype.unity | 38 ++++++++++++++++----------------- Assets/Scripts/Player/Player.cs | 16 +++++++------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Assets/Scenes/Prototype.unity b/Assets/Scenes/Prototype.unity index f29988c..a92b83a 100644 --- a/Assets/Scenes/Prototype.unity +++ b/Assets/Scenes/Prototype.unity @@ -1199,6 +1199,10 @@ Prefab: propertyPath: m_LocalScale.z value: 35.9839363 objectReference: {fileID: 0} + - target: {fileID: 11406788, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} + propertyPath: hasInfiniteAmmo + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} m_IsPrefabParent: 0 @@ -3499,7 +3503,7 @@ RectTransform: m_RootOrder: 2 m_AnchorMin: {x: .5, y: .5} m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: -823.997986, y: -519.015503} + m_AnchoredPosition: {x: 84, y: -255} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: .5, y: .5} --- !u!114 &532732568 @@ -5024,6 +5028,10 @@ Prefab: propertyPath: m_Name value: PlayerPistol objectReference: {fileID: 0} + - target: {fileID: 11406788, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} + propertyPath: hasInfiniteAmmo + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} m_IsPrefabParent: 0 @@ -5472,7 +5480,7 @@ RectTransform: m_RootOrder: 1 m_AnchorMin: {x: .5, y: .5} m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: -826.000916, y: 450.997131} + m_AnchoredPosition: {x: 0, y: 439} m_SizeDelta: {x: 100, y: 20} m_Pivot: {x: .5, y: .5} --- !u!114 &899817850 @@ -5670,12 +5678,6 @@ Transform: Transform: m_PrefabParentObject: {fileID: 413778, guid: 0d300e0327b70da49abe5b0e9498a7a7, type: 2} m_PrefabInternal: {fileID: 960469493} ---- !u!114 &938098169 stripped -MonoBehaviour: - m_PrefabParentObject: {fileID: 11440672, guid: 0d300e0327b70da49abe5b0e9498a7a7, - type: 2} - m_PrefabInternal: {fileID: 960469493} - m_Script: {fileID: 11500000, guid: b3aa7abba9400b449baa976216c4b8ef, type: 3} --- !u!4 &951669876 stripped Transform: m_PrefabParentObject: {fileID: 444954, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} @@ -6468,7 +6470,7 @@ RectTransform: m_RootOrder: 3 m_AnchorMin: {x: .5, y: .5} m_AnchorMax: {x: .5, y: .5} - m_AnchoredPosition: {x: 23.0102539, y: .1796875} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: .5, y: .5} --- !u!1001 &1138030137 @@ -7348,6 +7350,10 @@ Prefab: propertyPath: m_Name value: PlayerPistol objectReference: {fileID: 0} + - target: {fileID: 11406788, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} + propertyPath: hasInfiniteAmmo + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: fb80daa749f26694dbd949ac8cd91e23, type: 2} m_IsPrefabParent: 0 @@ -8412,7 +8418,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3800ba1d4402403408247b3365ec08f5, type: 3} m_Name: m_EditorClassIdentifier: - mEquippedWeapon: {fileID: 1998640093} + mEquippedWeapon: {fileID: 1597409232} weaponList: [] mPlayerNumber: 1 HPSlider: {fileID: 899817850} @@ -8435,7 +8441,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1515989180} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 323.855438} + m_LocalPosition: {x: -13, y: 0, z: 323.855438} m_LocalScale: {x: 36.0167351, y: 36.0167351, z: 36.0167351} m_Children: - {fileID: 1502948558} @@ -8737,7 +8743,7 @@ RectTransform: m_RootOrder: 3 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: -875, y: -859.003723} + m_AnchoredPosition: {x: -43, y: -559} m_SizeDelta: {x: 100, y: 20} m_Pivot: {x: 0, y: 0} --- !u!114 &1582865740 @@ -10394,7 +10400,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3800ba1d4402403408247b3365ec08f5, type: 3} m_Name: m_EditorClassIdentifier: - mEquippedWeapon: {fileID: 938098169} + mEquippedWeapon: {fileID: 879158141} weaponList: [] mPlayerNumber: 2 HPSlider: {fileID: 863266353} @@ -12376,12 +12382,6 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 4747a4c6e0ab2bb41ae2d4ea1ca98a83, type: 2} m_IsPrefabParent: 0 ---- !u!114 &1998640093 stripped -MonoBehaviour: - m_PrefabParentObject: {fileID: 11440672, guid: 0d300e0327b70da49abe5b0e9498a7a7, - type: 2} - m_PrefabInternal: {fileID: 1633521612} - m_Script: {fileID: 11500000, guid: b3aa7abba9400b449baa976216c4b8ef, type: 3} --- !u!1 &2020640163 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Player/Player.cs b/Assets/Scripts/Player/Player.cs index 0fa517e..360d3e8 100644 --- a/Assets/Scripts/Player/Player.cs +++ b/Assets/Scripts/Player/Player.cs @@ -85,14 +85,14 @@ void Update() } //if L3 is held, the HUD will appear - if (Input.GetButton("Player_" + mPlayerNumber + "_Back")) - { - playerHUD.SetActive(true); - } - else - { - playerHUD.SetActive(false); - } + //if (Input.GetButton("Player_" + mPlayerNumber + "_Back")) + //{ + // playerHUD.SetActive(true); + //} + //else + //{ + // playerHUD.SetActive(false); + //} waitTime -= Time.deltaTime; if (mEquippedWeapon) From 47a13fe2731e740cf89f9ef86767b0e704159c0a Mon Sep 17 00:00:00 2001 From: julianstopher Date: Wed, 2 Mar 2016 11:13:51 +0000 Subject: [PATCH 36/39] Players now get -1 for a suicide With an assist from David, the player is now only awarded score when the killing bullet does not come from the same player. Now if this happens, the players score is decremented by 1. --- Assets/Scripts/Player/Player.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Assets/Scripts/Player/Player.cs b/Assets/Scripts/Player/Player.cs index 360d3e8..22726b9 100644 --- a/Assets/Scripts/Player/Player.cs +++ b/Assets/Scripts/Player/Player.cs @@ -49,6 +49,7 @@ public Vector2 ReticlePosition public float timeSpentDead = 0f; public int killingBulletID; public Text playerScoreText; + bool hasPlayerSuicided = false; void Awake() @@ -158,10 +159,13 @@ public void IncreaseKillersScore() Player[] players = FindObjectsOfType(typeof(Player)) as Player[]; foreach(Player player in players) { - if(player.mPlayerNumber == killingBulletID) + if(player.mPlayerNumber == killingBulletID && killingBulletID != mPlayerNumber) { - player.playerScore++; - + player.playerScore++; + } + if(player.mPlayerNumber == killingBulletID && killingBulletID == mPlayerNumber) + { + playerScore--; } } } From 88e78e316ec244dce2b7f4c1adc119b8671a2533 Mon Sep 17 00:00:00 2001 From: julianstopher Date: Wed, 2 Mar 2016 11:22:08 +0000 Subject: [PATCH 37/39] Helicopter now has its own sorting layer, disabled ammo count text The helicopter now appears in front of the arena, but behind the UI. This is achieved via sorting layers. The ammo count text game object (number to represent current ammo remaining) has now been disabled as it is redundant. --- Assets/Scenes/Prototype.unity | 12 ++++++++---- ProjectSettings/TagManager.asset | 3 +++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Assets/Scenes/Prototype.unity b/Assets/Scenes/Prototype.unity index a92b83a..31143ab 100644 --- a/Assets/Scenes/Prototype.unity +++ b/Assets/Scenes/Prototype.unity @@ -3487,7 +3487,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &532732567 RectTransform: m_ObjectHideFlags: 0 @@ -6936,7 +6936,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} propertyPath: m_LocalPosition.z - value: 323.855438 + value: 0 objectReference: {fileID: 0} - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} propertyPath: m_LocalRotation.x @@ -6956,7 +6956,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} propertyPath: m_RootOrder - value: 8 + value: 5 objectReference: {fileID: 0} - target: {fileID: 461538, guid: f698b07087564614fbc3784bb72db068, type: 2} propertyPath: m_LocalScale.x @@ -6970,6 +6970,10 @@ Prefab: propertyPath: m_LocalScale.z value: 35.9839363 objectReference: {fileID: 0} + - target: {fileID: 21295492, guid: f698b07087564614fbc3784bb72db068, type: 2} + propertyPath: m_SortingLayerID + value: -223448031 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: f698b07087564614fbc3784bb72db068, type: 2} m_IsPrefabParent: 0 @@ -12174,7 +12178,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1967053839 RectTransform: m_ObjectHideFlags: 0 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index d6fbf06..40a2233 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -62,6 +62,9 @@ TagManager: - name: Reticle uniqueID: 3486639111 locked: 0 + - name: Helicopter + uniqueID: 4071519265 + locked: 0 - name: UI uniqueID: 4017442859 locked: 0 From f7c68f802cb29b79872299b9085528daf1683b83 Mon Sep 17 00:00:00 2001 From: GiorgioBufa Date: Wed, 2 Mar 2016 12:06:31 +0000 Subject: [PATCH 38/39] Grenade damage The grenade should damage based on the distance and if the player is exposed to the explosion or not. --- Assets/Scripts/Ammo/Grenade.cs | 110 ++++++++++++++++++++-------- Assets/Scripts/Ammo/Grenade.cs.meta | 24 +++--- 2 files changed, 92 insertions(+), 42 deletions(-) mode change 100644 => 100755 Assets/Scripts/Ammo/Grenade.cs mode change 100644 => 100755 Assets/Scripts/Ammo/Grenade.cs.meta diff --git a/Assets/Scripts/Ammo/Grenade.cs b/Assets/Scripts/Ammo/Grenade.cs old mode 100644 new mode 100755 index b2c1554..f6b584d --- a/Assets/Scripts/Ammo/Grenade.cs +++ b/Assets/Scripts/Ammo/Grenade.cs @@ -1,40 +1,90 @@ using UnityEngine; using System.Collections; -public class Grenade : Projectile +namespace ShellShock + { - public float grenadeLife = 0.5f; - void Awake() - { - bouncesAllowed = 20f; - } - void Update() + public class Grenade : Projectile { - if (currentBounces > bouncesAllowed) + public float grenadeLife = 0.5f; + + public Collider2D[] PlayersAffected; + + public float damageRadius; + + RaycastHit2D checkHit; + + float distance; + + float effect; + + void Awake() + { + bouncesAllowed = 20f; + } + void Update() { - Destroy(gameObject); + if (currentBounces > bouncesAllowed) + { + Destroy(gameObject); + } + Vector3 dir = (Vector2)transform.position - mRigidBody.velocity; + float angle = Mathf.Atan2(dir.y, dir.x) * Mathf.Rad2Deg; + transform.rotation = Quaternion.AngleAxis(angle - 180, Vector3.forward); + } + + void AOEDamage(Vector3 position, float damageRadius, float damage, GameObject Player) + { + Collider2D[] PlayersAffected = Physics2D.OverlapCircleAll(position, damageRadius); + + foreach (Collider2D col in PlayersAffected) + { + Player playerAffected = col.GetComponent(); + + if (playerAffected != null) //if there is at least one player to affect apply damage + { + bool checkCover = false; + + if (Physics2D.Raycast(position, (playerAffected.gameObject.transform.position - position))) + { + if(checkHit.collider == Player.gameObject.GetComponent()) + { + checkCover = true; + Debug.Log(checkCover); + } + } + if (checkCover) //effect of the explosion + { + Debug.Log("vaffanculo"); + distance = (position - Player.transform.position).magnitude; + effect = 1 - (distance / damageRadius); + playerAffected.GetComponent().AddForce(new Vector2(1, 1)); + // affect health based on the effect = (damage * effect) + } + + } + + } + + } + + //public override void Fire(Vector2 vel, int damage) + //{ + // Debug.Log("adsd"); + // mVelocity = vel; + // mRigidBody = gameObject.GetComponent(); + // mRigidBody.velocity = mVelocity; + // mDamage = damage; + // Vector3 dir = new Vector2(transform.position.x, transform.position.y) - vel; + // float angle = Mathf.Atan2(dir.y, dir.x) * Mathf.Rad2Deg; + // transform.rotation = Quaternion.AngleAxis(angle - 180, Vector3.forward); + // Destroy (gameObject, grenadeLife); + //} + + void OnCollisionEnter2D(Collision2D bulletCollider) + { + currentBounces++; } - Vector3 dir = (Vector2)transform.position - mRigidBody.velocity; - float angle = Mathf.Atan2(dir.y, dir.x) * Mathf.Rad2Deg; - transform.rotation = Quaternion.AngleAxis(angle - 180, Vector3.forward); - } - - //public override void Fire(Vector2 vel, int damage) - //{ - // Debug.Log("adsd"); - // mVelocity = vel; - // mRigidBody = gameObject.GetComponent(); - // mRigidBody.velocity = mVelocity; - // mDamage = damage; - // Vector3 dir = new Vector2(transform.position.x, transform.position.y) - vel; - // float angle = Mathf.Atan2(dir.y, dir.x) * Mathf.Rad2Deg; - // transform.rotation = Quaternion.AngleAxis(angle - 180, Vector3.forward); - // Destroy (gameObject, grenadeLife); - //} - - void OnCollisionEnter2D(Collision2D bulletCollider) - { - currentBounces++; } } diff --git a/Assets/Scripts/Ammo/Grenade.cs.meta b/Assets/Scripts/Ammo/Grenade.cs.meta old mode 100644 new mode 100755 index 709840b..711f93b --- a/Assets/Scripts/Ammo/Grenade.cs.meta +++ b/Assets/Scripts/Ammo/Grenade.cs.meta @@ -1,12 +1,12 @@ -fileFormatVersion: 2 -guid: 3419894c82dd50c42ba4c128870a45e8 -timeCreated: 1454618040 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: +fileFormatVersion: 2 +guid: 3419894c82dd50c42ba4c128870a45e8 +timeCreated: 1454618040 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From 60034e1c842e959023be6d6abce3ecad20d04045 Mon Sep 17 00:00:00 2001 From: julianstopher Date: Wed, 2 Mar 2016 13:25:03 +0000 Subject: [PATCH 39/39] Added ShellShock namespace to every script and set up namespaces correctly in every script for ArmadHeroes push preparation Changed acolades and every mention of it to accolade added a namespace ShellShock to every script (32 scripts) changed every GetComponent (over 80 occurrences) to include the ShellShock namespace (where needed) --- Assets/Acolades.cs | 27 -- Assets/Editor/PolygonalColliderMan.cs | 181 ++++----- Assets/MovementISO.cs | 49 --- Assets/Scripts/Accolades.cs | 34 ++ .../Accolades.cs.meta} | 0 Assets/Scripts/Ammo/Grenade.cs | 6 +- Assets/Scripts/Ammo/Projectile.cs | 161 ++++---- Assets/Scripts/Ammo/Rocket.cs | 43 ++- Assets/Scripts/CameraShake.cs | 70 ++-- Assets/Scripts/Crate.cs | 14 +- Assets/Scripts/DisplayAmmoCount.cs | 20 +- Assets/Scripts/IsometricLayerSorter.cs | 39 +- Assets/Scripts/MovementISO.cs | 62 +++ Assets/{ => Scripts}/MovementISO.cs.meta | 0 Assets/Scripts/Paracrate.cs | 100 ++--- Assets/Scripts/Player/Aiming.cs | 135 +++---- Assets/Scripts/Player/Ball.cs | 79 ++-- Assets/Scripts/Player/DynamicWall.cs | 42 ++- Assets/Scripts/Player/Movement.cs | 64 ++-- Assets/Scripts/Player/Player.cs | 357 +++++++++--------- Assets/Scripts/Player/PlayerActions.cs | 125 +++--- Assets/Scripts/SpriteManager.cs | 36 ++ Assets/{ => Scripts}/SpriteManager.cs.meta | 0 Assets/Scripts/StatTracker.cs | 42 +++ Assets/{ => Scripts}/StatTracker.cs.meta | 0 Assets/Scripts/Tunnel.cs | 47 ++- Assets/Scripts/UI/TimerAndWin.cs | 48 +-- Assets/Scripts/Walls/DynamicWallManager.cs | 58 +-- Assets/Scripts/Walls/DynamicWallScript.cs | 81 ++-- Assets/Scripts/Weapons/AssaultRifle.cs | 30 +- Assets/Scripts/Weapons/GrenadeLauncher.cs | 30 +- Assets/Scripts/Weapons/MiniGun.cs | 32 +- Assets/Scripts/Weapons/Pistol.cs | 30 +- Assets/Scripts/Weapons/RocketLauncher.cs | 31 +- Assets/Scripts/Weapons/Shotgun.cs | 30 +- Assets/Scripts/Weapons/Sniper.cs | 31 +- Assets/Scripts/Weapons/Weapon.cs | 124 +++--- Assets/Scripts/tunnelScript.cs | 84 +++-- Assets/SpriteManager.cs | 32 -- Assets/StatTracker.cs | 35 -- 40 files changed, 1264 insertions(+), 1145 deletions(-) delete mode 100644 Assets/Acolades.cs delete mode 100644 Assets/MovementISO.cs create mode 100644 Assets/Scripts/Accolades.cs rename Assets/{Acolades.cs.meta => Scripts/Accolades.cs.meta} (100%) create mode 100644 Assets/Scripts/MovementISO.cs rename Assets/{ => Scripts}/MovementISO.cs.meta (100%) create mode 100644 Assets/Scripts/SpriteManager.cs rename Assets/{ => Scripts}/SpriteManager.cs.meta (100%) create mode 100644 Assets/Scripts/StatTracker.cs rename Assets/{ => Scripts}/StatTracker.cs.meta (100%) delete mode 100644 Assets/SpriteManager.cs delete mode 100644 Assets/StatTracker.cs diff --git a/Assets/Acolades.cs b/Assets/Acolades.cs deleted file mode 100644 index 69596da..0000000 --- a/Assets/Acolades.cs +++ /dev/null @@ -1,27 +0,0 @@ -using UnityEngine; -using System.Collections; -using System.Collections.Generic; - -public class Acolades : MonoBehaviour { - - public List statTrackers = new List(); - - bool sorted; - - // Use this for initialization - void Start () { - - } - - // Update is called once per frame - void Update () { - //Compare all the statTrackers - //Compare elusiveScore - if (!sorted) { - for (int i = 0; i < statTrackers.Count; i++) { - //if (statTrackers [i].GetComponent ().elusiveScore () >= statTrackers [i + 1].GetComponent ().elusiveScore ()) { - //statTrackers[i] - } - } - } -} diff --git a/Assets/Editor/PolygonalColliderMan.cs b/Assets/Editor/PolygonalColliderMan.cs index 79ce357..227c9de 100644 --- a/Assets/Editor/PolygonalColliderMan.cs +++ b/Assets/Editor/PolygonalColliderMan.cs @@ -2,106 +2,109 @@ using System.Collections; using UnityEditor; -//is a custom editor for whatever object has a polygoncollider2d attached -[CustomEditor(typeof(PolygonCollider2D))] -public class PolygonColliderMan : Editor -{ +namespace ShellShock +{ + //is a custom editor for whatever object has a polygoncollider2d attached + [CustomEditor(typeof(PolygonCollider2D))] + public class PolygonColliderMan : Editor + { - private bool PolygonColliderManual; - private bool[] NewColliders = new bool[0]; - private Vector2[][] Polygons; + private bool PolygonColliderManual; + private bool[] NewColliders = new bool[0]; + private Vector2[][] Polygons; - public override void OnInspectorGUI() - { - PolygonCollider2D collider = (PolygonCollider2D)target; + public override void OnInspectorGUI() + { + PolygonCollider2D collider = (PolygonCollider2D)target; - DrawDefaultInspector(); - //modify the layout with a new polygoncollidermanual section - PolygonColliderManual = EditorGUILayout.Foldout(PolygonColliderManual, "PolygonColliderManual"); + DrawDefaultInspector(); + //modify the layout with a new polygoncollidermanual section + PolygonColliderManual = EditorGUILayout.Foldout(PolygonColliderManual, "PolygonColliderManual"); - if (PolygonColliderManual) - { - Polygons = new Vector2[collider.pathCount][]; - for (int i = 0; i < collider.pathCount; i++) - { - Vector2[] path = collider.GetPath(i); - Polygons[i] = path; - } + if (PolygonColliderManual) + { + Polygons = new Vector2[collider.pathCount][]; + for (int i = 0; i < collider.pathCount; i++) + { + Vector2[] path = collider.GetPath(i); + Polygons[i] = path; + } - int size = EditorGUILayout.IntField("Size", Polygons.Length); + int size = EditorGUILayout.IntField("Size", Polygons.Length); - if (NewColliders.Length != Polygons.Length) - { - bool[] ArrNewColliders = new bool[Polygons.Length]; + if (NewColliders.Length != Polygons.Length) + { + bool[] ArrNewColliders = new bool[Polygons.Length]; - for (int i = 0; i < ArrNewColliders.Length; i++) - { - if (NewColliders.Length > i) - ArrNewColliders[i] = NewColliders[i]; - else - ArrNewColliders[i] = false; - } + for (int i = 0; i < ArrNewColliders.Length; i++) + { + if (NewColliders.Length > i) + ArrNewColliders[i] = NewColliders[i]; + else + ArrNewColliders[i] = false; + } - NewColliders = ArrNewColliders; - } + NewColliders = ArrNewColliders; + } - if (size != Polygons.Length) - { - Vector2[][] newPaths = new Vector2[size][]; - for (int i = 0; i < size; i++) - { - if (Polygons.Length > i) - { - newPaths[i] = Polygons[i]; - } - else - { - newPaths[i] = new Vector2[0]; - } - } - Polygons = newPaths; - } + if (size != Polygons.Length) + { + Vector2[][] newPaths = new Vector2[size][]; + for (int i = 0; i < size; i++) + { + if (Polygons.Length > i) + { + newPaths[i] = Polygons[i]; + } + else + { + newPaths[i] = new Vector2[0]; + } + } + Polygons = newPaths; + } - EditorGUI.indentLevel++; - for (int i = 0; i < size; i++) - { - NewColliders[i] = EditorGUILayout.Foldout(NewColliders[i], string.Concat("Path ", i)); + EditorGUI.indentLevel++; + for (int i = 0; i < size; i++) + { + NewColliders[i] = EditorGUILayout.Foldout(NewColliders[i], string.Concat("Path ", i)); - if (NewColliders[i]) - { - Vector2[] path = Polygons[i]; - int pathSize = EditorGUILayout.IntField("Size", path.Length); - if (pathSize != path.Length) - { - Vector2[] newPath = new Vector2[pathSize]; - for (int j = 0; j < pathSize; j++) - { - if (path.Length > j) - { - newPath[j] = path[j]; - } - else - { - newPath[j] = new Vector2(); - } - } - Polygons[i] = newPath; - } + if (NewColliders[i]) + { + Vector2[] path = Polygons[i]; + int pathSize = EditorGUILayout.IntField("Size", path.Length); + if (pathSize != path.Length) + { + Vector2[] newPath = new Vector2[pathSize]; + for (int j = 0; j < pathSize; j++) + { + if (path.Length > j) + { + newPath[j] = path[j]; + } + else + { + newPath[j] = new Vector2(); + } + } + Polygons[i] = newPath; + } - for (int j = 0; j < pathSize; j++) - { - Polygons[i][j] = EditorGUILayout.Vector2Field(string.Concat("Point ", j), Polygons[i][j]); - } - } - } - EditorGUI.indentLevel--; + for (int j = 0; j < pathSize; j++) + { + Polygons[i][j] = EditorGUILayout.Vector2Field(string.Concat("Point ", j), Polygons[i][j]); + } + } + } + EditorGUI.indentLevel--; - collider.pathCount = Polygons.Length; - for (int i = 0; i < Polygons.Length; i++) - { - collider.SetPath(i, Polygons[i]); - } - } - } -} \ No newline at end of file + collider.pathCount = Polygons.Length; + for (int i = 0; i < Polygons.Length; i++) + { + collider.SetPath(i, Polygons[i]); + } + } + } + } +} diff --git a/Assets/MovementISO.cs b/Assets/MovementISO.cs deleted file mode 100644 index 0d3b23a..0000000 --- a/Assets/MovementISO.cs +++ /dev/null @@ -1,49 +0,0 @@ -using UnityEngine; -using System.Collections; - -public class MovementISO : MonoBehaviour { - - public SpriteManager spriteManager; - - // Use this for initialization - void Start () - { - //spriteManager = GetComponent (); - } - - // Update is called once per frame - void Update () - { - if (Input.GetKeyDown (KeyCode.Keypad1)) { - spriteManager.ChangeSprite (1); - - } - if (Input.GetKeyDown (KeyCode.Keypad2)) { - spriteManager.ChangeSprite (2); - - } - if (Input.GetKeyDown (KeyCode.Keypad3)) { - spriteManager.ChangeSprite (3); - - } - if (Input.GetKeyDown (KeyCode.Keypad4)) { - spriteManager.ChangeSprite (4); - } - - if (Input.GetKeyDown (KeyCode.Keypad5)) { - spriteManager.ChangeSprite (0); - } - if (Input.GetKeyDown (KeyCode.Keypad6)) { - spriteManager.ChangeSprite (5); - } - if (Input.GetKeyDown (KeyCode.Keypad7)) { - spriteManager.ChangeSprite (6); - } - if (Input.GetKeyDown (KeyCode.Keypad8)) { - spriteManager.ChangeSprite (7); - } - if (Input.GetKeyDown (KeyCode.Keypad9)) { - spriteManager.ChangeSprite (8); - } - } -} diff --git a/Assets/Scripts/Accolades.cs b/Assets/Scripts/Accolades.cs new file mode 100644 index 0000000..3e1864d --- /dev/null +++ b/Assets/Scripts/Accolades.cs @@ -0,0 +1,34 @@ +using UnityEngine; +using System.Collections; +using System.Collections.Generic; +namespace ShellShock +{ + public class Accolades : MonoBehaviour + { + + public List statTrackers = new List(); + + bool sorted = true; + + // Use this for initialization + void Start() + { + + } + + // Update is called once per frame + void Update() + { + //Compare all the statTrackers + //Compare elusiveScore + if (!sorted) + { + for (int i = 0; i < statTrackers.Count; i++) + { + //if (statTrackers [i].GetComponent ().elusiveScore () >= statTrackers [i + 1].GetComponent ().elusiveScore ()) { + //statTrackers[i] + } + } + } + } +} diff --git a/Assets/Acolades.cs.meta b/Assets/Scripts/Accolades.cs.meta similarity index 100% rename from Assets/Acolades.cs.meta rename to Assets/Scripts/Accolades.cs.meta diff --git a/Assets/Scripts/Ammo/Grenade.cs b/Assets/Scripts/Ammo/Grenade.cs index f6b584d..1b6c2ea 100755 --- a/Assets/Scripts/Ammo/Grenade.cs +++ b/Assets/Scripts/Ammo/Grenade.cs @@ -17,7 +17,7 @@ public class Grenade : Projectile float distance; - float effect; + float effect = 0f; void Awake() { @@ -40,7 +40,7 @@ void AOEDamage(Vector3 position, float damageRadius, float damage, GameObject Pl foreach (Collider2D col in PlayersAffected) { - Player playerAffected = col.GetComponent(); + Player playerAffected = col.GetComponent(); if (playerAffected != null) //if there is at least one player to affect apply damage { @@ -73,7 +73,7 @@ void AOEDamage(Vector3 position, float damageRadius, float damage, GameObject Pl //{ // Debug.Log("adsd"); // mVelocity = vel; - // mRigidBody = gameObject.GetComponent(); + // mRigidBody = gameObject.GetComponent(); // mRigidBody.velocity = mVelocity; // mDamage = damage; // Vector3 dir = new Vector2(transform.position.x, transform.position.y) - vel; diff --git a/Assets/Scripts/Ammo/Projectile.cs b/Assets/Scripts/Ammo/Projectile.cs index dd37d70..f060740 100644 --- a/Assets/Scripts/Ammo/Projectile.cs +++ b/Assets/Scripts/Ammo/Projectile.cs @@ -1,112 +1,115 @@ using UnityEngine; using System.Collections; -public class Projectile : MonoBehaviour +namespace ShellShock { - protected float bouncesAllowed = 3; - protected float currentBounces = 0; + public class Projectile : MonoBehaviour + { + protected float bouncesAllowed = 3; + protected float currentBounces = 0; - protected Vector2 mVelocity; + protected Vector2 mVelocity; - private int mOwnerID; + private int mOwnerID; - protected float skinWidth = 0.1f; - protected float minimumExtent; - protected float partialExtent; - protected float sqrMinimumExtent; + protected float skinWidth = 0.1f; + protected float minimumExtent; + protected float partialExtent; + protected float sqrMinimumExtent; - protected Vector2 mPreviousPosition; - protected Rigidbody2D mRigidBody; - protected int mDamage; + protected Vector2 mPreviousPosition; + protected Rigidbody2D mRigidBody; + protected int mDamage; - public int Damage - { - get + public int Damage { - return mDamage; + get + { + return mDamage; + } + set + { + mDamage = value; + } } - set + + public int OwnerID { - mDamage = value; + get + { + return mOwnerID; + } + + set + { + mOwnerID = value; + } } - } - public int OwnerID - { - get + void Start() { - return mOwnerID; + minimumExtent = Mathf.Min(Mathf.Min(GetComponent().bounds.extents.x, GetComponent().bounds.extents.y), GetComponent().bounds.extents.z); + partialExtent = minimumExtent * (1.0f - skinWidth); + sqrMinimumExtent = minimumExtent * minimumExtent; } - set + void Update() { - mOwnerID = value; + if (currentBounces > bouncesAllowed) + { + Destroy(gameObject); + } + Vector3 dir = mRigidBody.velocity.normalized; + float angle = Mathf.Atan2(dir.y, dir.x) * Mathf.Rad2Deg; + transform.rotation = Quaternion.AngleAxis(angle, Vector3.forward); } - } - void Start() - { - minimumExtent = Mathf.Min(Mathf.Min(GetComponent().bounds.extents.x, GetComponent().bounds.extents.y), GetComponent().bounds.extents.z); - partialExtent = minimumExtent * (1.0f - skinWidth); - sqrMinimumExtent = minimumExtent * minimumExtent; - } - - void Update() - { - if (currentBounces > bouncesAllowed) + public virtual void Fire(Vector2 vel, int damage, int id) { - Destroy(gameObject); + mVelocity = vel; + mOwnerID = id; + mRigidBody = gameObject.GetComponent(); + mRigidBody.velocity = mVelocity; + mDamage = damage; + Vector3 dir = vel.normalized; + //Debug.Log(dir); + float angle = Mathf.Atan2(dir.y, dir.x) * Mathf.Rad2Deg; + transform.rotation = Quaternion.AngleAxis(angle, Vector3.forward); + Destroy(gameObject, 5f); } - Vector3 dir = mRigidBody.velocity.normalized; - float angle = Mathf.Atan2(dir.y, dir.x) * Mathf.Rad2Deg; - transform.rotation = Quaternion.AngleAxis(angle, Vector3.forward); - } - public virtual void Fire(Vector2 vel, int damage, int id) - { - mVelocity = vel; - mOwnerID = id; - mRigidBody = gameObject.GetComponent(); - mRigidBody.velocity = mVelocity; - mDamage = damage; - Vector3 dir = vel.normalized; - //Debug.Log(dir); - float angle = Mathf.Atan2(dir.y, dir.x) * Mathf.Rad2Deg; - transform.rotation = Quaternion.AngleAxis(angle, Vector3.forward); - Destroy(gameObject, 5f); - } - - void OnCollisionEnter2D(Collision2D bulletCollider) - { - currentBounces++; - } - - //Fixed Update runs on every physics tick - void FixedUpdate() - { - //have we moved more than our minimum extent? - Vector2 movementThisStep = mRigidBody.position - mPreviousPosition; - float movementSqrMagnitude = movementThisStep.sqrMagnitude; + void OnCollisionEnter2D(Collision2D bulletCollider) + { + currentBounces++; + } - if (movementSqrMagnitude > sqrMinimumExtent) + //Fixed Update runs on every physics tick + void FixedUpdate() { - float movementMagnitude = Mathf.Sqrt(movementSqrMagnitude); - RaycastHit hitInfo; + //have we moved more than our minimum extent? + Vector2 movementThisStep = mRigidBody.position - mPreviousPosition; + float movementSqrMagnitude = movementThisStep.sqrMagnitude; - //check for obstructions we might have missed - if (Physics.Raycast(mPreviousPosition, movementThisStep, out hitInfo, movementMagnitude)) + if (movementSqrMagnitude > sqrMinimumExtent) { - if (!hitInfo.collider) - return; + float movementMagnitude = Mathf.Sqrt(movementSqrMagnitude); + RaycastHit hitInfo; + + //check for obstructions we might have missed + if (Physics.Raycast(mPreviousPosition, movementThisStep, out hitInfo, movementMagnitude)) + { + if (!hitInfo.collider) + return; - if (hitInfo.collider.isTrigger) - hitInfo.collider.SendMessage("OnTriggerEnter", GetComponent()); + if (hitInfo.collider.isTrigger) + hitInfo.collider.SendMessage("OnTriggerEnter", GetComponent()); - if (!hitInfo.collider.isTrigger) - mRigidBody.position = (Vector2)hitInfo.point - (movementThisStep / movementMagnitude) * partialExtent; + if (!hitInfo.collider.isTrigger) + mRigidBody.position = (Vector2)hitInfo.point - (movementThisStep / movementMagnitude) * partialExtent; + } } - } - mPreviousPosition = mRigidBody.position; + mPreviousPosition = mRigidBody.position; + } } } \ No newline at end of file diff --git a/Assets/Scripts/Ammo/Rocket.cs b/Assets/Scripts/Ammo/Rocket.cs index 2150cb9..5dd27df 100644 --- a/Assets/Scripts/Ammo/Rocket.cs +++ b/Assets/Scripts/Ammo/Rocket.cs @@ -1,25 +1,28 @@ using UnityEngine; using System.Collections; +namespace ShellShock +{ + public class Rocket : Projectile + { -public class Rocket : Projectile { + void Awake() + { + bouncesAllowed = 20f; + } + void Update() + { + if (currentBounces > bouncesAllowed) + { + Destroy(gameObject); + } + Vector3 dir = (Vector2)transform.position - mRigidBody.velocity; + float angle = Mathf.Atan2(dir.y, dir.x) * Mathf.Rad2Deg; + transform.rotation = Quaternion.AngleAxis(angle - 180, Vector3.forward); + } - void Awake() - { - bouncesAllowed = 20f; - } - void Update() - { - if (currentBounces > bouncesAllowed) - { - Destroy(gameObject); - } - Vector3 dir = (Vector2)transform.position - mRigidBody.velocity; - float angle = Mathf.Atan2(dir.y, dir.x) * Mathf.Rad2Deg; - transform.rotation = Quaternion.AngleAxis(angle - 180, Vector3.forward); - } - - void OnCollisionEnter2D(Collision2D bulletCollider) - { - currentBounces++; - } + void OnCollisionEnter2D(Collision2D bulletCollider) + { + currentBounces++; + } + } } diff --git a/Assets/Scripts/CameraShake.cs b/Assets/Scripts/CameraShake.cs index c9c8229..13dad06 100644 --- a/Assets/Scripts/CameraShake.cs +++ b/Assets/Scripts/CameraShake.cs @@ -1,41 +1,45 @@ using UnityEngine; using System.Collections; +namespace ShellShock +{ -public class CameraShake : MonoBehaviour { + public class CameraShake : MonoBehaviour + { - public float shakeTimer; //Time the shake lasts - public float shakeIntesity;//Intensity of the shake - private Vector3 cameraStartPos; - // Use this for initialization - void Start () - { - cameraStartPos = transform.position; - } - - // Update is called once per frame - void Update () - { - if (Input.GetKeyDown (KeyCode.Q)) - { - shakeCamera(0.1f,1.0f); //power, duration - } + public float shakeTimer; //Time the shake lasts + public float shakeIntesity;//Intensity of the shake + private Vector3 cameraStartPos; + // Use this for initialization + void Start() + { + cameraStartPos = transform.position; + } - if (shakeTimer >= 0) - { - Vector2 shakePosition = Random.insideUnitCircle * shakeIntesity; //Circle that has a 1 unit radius and picks a random x,y value that the camera moves to - transform.position = new Vector3(transform.position.x + shakePosition.x, transform.position.y + shakePosition.y,transform.position.z); //updates camera position with the insideUnitCircle offset - shakeTimer -= Time.deltaTime; - } - if (shakeTimer <= 0) - { - transform.position = cameraStartPos; + // Update is called once per frame + void Update() + { + if (Input.GetKeyDown(KeyCode.Q)) + { + shakeCamera(0.1f, 1.0f); //power, duration + } - } - } + if (shakeTimer >= 0) + { + Vector2 shakePosition = Random.insideUnitCircle * shakeIntesity; //Circle that has a 1 unit radius and picks a random x,y value that the camera moves to + transform.position = new Vector3(transform.position.x + shakePosition.x, transform.position.y + shakePosition.y, transform.position.z); //updates camera position with the insideUnitCircle offset + shakeTimer -= Time.deltaTime; + } + if (shakeTimer <= 0) + { + transform.position = cameraStartPos; - public void shakeCamera(float shakePower, float shakeDuration) - { - shakeIntesity = shakePower; - shakeTimer = shakeDuration; - } + } + } + + public void shakeCamera(float shakePower, float shakeDuration) + { + shakeIntesity = shakePower; + shakeTimer = shakeDuration; + } + } } diff --git a/Assets/Scripts/Crate.cs b/Assets/Scripts/Crate.cs index 0a4bc4b..de6a1c8 100644 --- a/Assets/Scripts/Crate.cs +++ b/Assets/Scripts/Crate.cs @@ -1,14 +1,16 @@ using UnityEngine; using System.Collections; - -public class Crate : MonoBehaviour +namespace ShellShock { - void OnTriggerEnter2D(Collider2D coll) + public class Crate : MonoBehaviour { - if (coll.gameObject.GetComponent()) + void OnTriggerEnter2D(Collider2D coll) { - coll.gameObject.GetComponent().ChangeWeapon(Random.Range(0, 7)); - //Destroy(gameObject.transform.parent.transform.parent.gameObject); + if (coll.gameObject.GetComponent()) + { + coll.gameObject.GetComponent().ChangeWeapon(Random.Range(0, 7)); + //Destroy(gameObject.transform.parent.transform.parent.gameObject); + } } } } diff --git a/Assets/Scripts/DisplayAmmoCount.cs b/Assets/Scripts/DisplayAmmoCount.cs index 842af41..0065cdf 100644 --- a/Assets/Scripts/DisplayAmmoCount.cs +++ b/Assets/Scripts/DisplayAmmoCount.cs @@ -2,19 +2,21 @@ using UnityEngine.UI; using System.Collections; - -public class DisplayAmmoCount : MonoBehaviour +namespace ShellShock { - public Text ammoCount; - public int playerID; + public class DisplayAmmoCount : MonoBehaviour + { + public Text ammoCount; + public int playerID; - public Player player; + public Player player; - void Update() - { - if (player.mEquippedWeapon) + void Update() { - ammoCount.text = player.mEquippedWeapon.RemainingAmmo.ToString(); + if (player.mEquippedWeapon) + { + ammoCount.text = player.mEquippedWeapon.RemainingAmmo.ToString(); + } } } } diff --git a/Assets/Scripts/IsometricLayerSorter.cs b/Assets/Scripts/IsometricLayerSorter.cs index 04c86a9..46f9d67 100644 --- a/Assets/Scripts/IsometricLayerSorter.cs +++ b/Assets/Scripts/IsometricLayerSorter.cs @@ -1,28 +1,31 @@ using UnityEngine; using System.Collections; -[ExecuteInEditMode] -public class IsometricLayerSorter : MonoBehaviour +namespace ShellShock { - SpriteRenderer mSpriteRenderer; - void Start() + [ExecuteInEditMode] + public class IsometricLayerSorter : MonoBehaviour { - mSpriteRenderer = GetComponent(); - mSpriteRenderer.sortingOrder = (int)-transform.position.y; - } - void Update() - { - //Null check to avoid null reference exception errors - if (GameObject.FindGameObjectWithTag("Player") != null) + SpriteRenderer mSpriteRenderer; + void Start() { - if (GameObject.FindGameObjectWithTag("Player").transform.position.y > transform.position.y) - { - GetComponent().sortingLayerName = "WallsInFront"; - } - else + mSpriteRenderer = GetComponent(); + mSpriteRenderer.sortingOrder = (int)-transform.position.y; + } + void Update() + { + //Null check to avoid null reference exception errors + if (GameObject.FindGameObjectWithTag("Player") != null) { - GetComponent().sortingLayerName = "WallsBehind"; + if (GameObject.FindGameObjectWithTag("Player").transform.position.y > transform.position.y) + { + GetComponent().sortingLayerName = "WallsInFront"; + } + else + { + GetComponent().sortingLayerName = "WallsBehind"; + } } - } + } } } diff --git a/Assets/Scripts/MovementISO.cs b/Assets/Scripts/MovementISO.cs new file mode 100644 index 0000000..b77c0f9 --- /dev/null +++ b/Assets/Scripts/MovementISO.cs @@ -0,0 +1,62 @@ +using UnityEngine; +using System.Collections; + +namespace ShellShock +{ + public class MovementISO : MonoBehaviour + { + + public SpriteManager spriteManager; + + // Use this for initialization + void Start() + { + //spriteManager = GetComponent (); + } + + // Update is called once per frame + void Update() + { + if (Input.GetKeyDown(KeyCode.Keypad1)) + { + spriteManager.ChangeSprite(1); + + } + if (Input.GetKeyDown(KeyCode.Keypad2)) + { + spriteManager.ChangeSprite(2); + + } + if (Input.GetKeyDown(KeyCode.Keypad3)) + { + spriteManager.ChangeSprite(3); + + } + if (Input.GetKeyDown(KeyCode.Keypad4)) + { + spriteManager.ChangeSprite(4); + } + + if (Input.GetKeyDown(KeyCode.Keypad5)) + { + spriteManager.ChangeSprite(0); + } + if (Input.GetKeyDown(KeyCode.Keypad6)) + { + spriteManager.ChangeSprite(5); + } + if (Input.GetKeyDown(KeyCode.Keypad7)) + { + spriteManager.ChangeSprite(6); + } + if (Input.GetKeyDown(KeyCode.Keypad8)) + { + spriteManager.ChangeSprite(7); + } + if (Input.GetKeyDown(KeyCode.Keypad9)) + { + spriteManager.ChangeSprite(8); + } + } + } +} diff --git a/Assets/MovementISO.cs.meta b/Assets/Scripts/MovementISO.cs.meta similarity index 100% rename from Assets/MovementISO.cs.meta rename to Assets/Scripts/MovementISO.cs.meta diff --git a/Assets/Scripts/Paracrate.cs b/Assets/Scripts/Paracrate.cs index 2f820d3..bf94168 100644 --- a/Assets/Scripts/Paracrate.cs +++ b/Assets/Scripts/Paracrate.cs @@ -1,67 +1,69 @@ using UnityEngine; using System.Collections; - -public class Paracrate : MonoBehaviour +namespace ShellShock { + public class Paracrate : MonoBehaviour + { - public GameObject paracrateObj; - public Vector2 tempDropCoordinates; - public float leftXBoundary, rightXBoundary, topYBoundary, bottomYBoundary; - private bool flyby = false; - public float flybySpeed; - public bool ammoDropped; - - public float minTime = 5.0f; - public float maxTime = 9.0f; - public bool isHeliSpawning = false; + public GameObject paracrateObj; + public Vector2 tempDropCoordinates; + public float leftXBoundary, rightXBoundary, topYBoundary, bottomYBoundary; + private bool flyby = false; + public float flybySpeed; + public bool ammoDropped; - // Use this for initialization - void Start() - { - ammoDropped = false; - tempDropCoordinates = new Vector2(0, -7); - } + public float minTime = 5.0f; + public float maxTime = 9.0f; + public bool isHeliSpawning = false; - // Update is called once per frame - void Update() - { - if (!isHeliSpawning) + // Use this for initialization + void Start() { - isHeliSpawning = true; - flyby = !flyby; - StartCoroutine(HeliSpawner(Random.Range(minTime, maxTime))); //the helicopter will now spawn in a random range between 5 and 9 secs - transform.position = new Vector3(39f/*Random.Range(34f,55f)*/, Random.Range(-6f, 10f), 0.2f); //randomize the spawning position of the helicopte - - //Debug.Log("asda"); + ammoDropped = false; + tempDropCoordinates = new Vector2(0, -7); } - //if (Input.GetKeyDown(KeyCode.T)) - //{ - // flyby = !flyby; - // Debug.Log("asda"); - //} - if (flyby) + // Update is called once per frame + void Update() { - AmmoDrop(); + if (!isHeliSpawning) + { + isHeliSpawning = true; + flyby = !flyby; + StartCoroutine(HeliSpawner(Random.Range(minTime, maxTime))); //the helicopter will now spawn in a random range between 5 and 9 secs + transform.position = new Vector3(39f/*Random.Range(34f,55f)*/, Random.Range(-6f, 10f), 0.2f); //randomize the spawning position of the helicopte + + //Debug.Log("asda"); + } + //if (Input.GetKeyDown(KeyCode.T)) + //{ + // flyby = !flyby; + // Debug.Log("asda"); + //} + + if (flyby) + { + AmmoDrop(); + } } - } - public void AmmoDrop() - { - transform.Translate(-Vector2.right * flybySpeed * Time.deltaTime); - if (transform.position.x > -0.1 && transform.position.x < 0.1) + public void AmmoDrop() { - //Debug.Log("Drop"); - Instantiate(paracrateObj, transform.position, Quaternion.identity); + transform.Translate(-Vector2.right * flybySpeed * Time.deltaTime); + if (transform.position.x > -0.1 && transform.position.x < 0.1) + { + //Debug.Log("Drop"); + Instantiate(paracrateObj, transform.position, Quaternion.identity); + } } - } - IEnumerator HeliSpawner(float seconds) - { + IEnumerator HeliSpawner(float seconds) + { - ammoDropped = false; - tempDropCoordinates = new Vector2(0, -7); //to be changed - yield return new WaitForSeconds(seconds); - isHeliSpawning = false; + ammoDropped = false; + tempDropCoordinates = new Vector2(0, -7); //to be changed + yield return new WaitForSeconds(seconds); + isHeliSpawning = false; + } } } diff --git a/Assets/Scripts/Player/Aiming.cs b/Assets/Scripts/Player/Aiming.cs index b74a758..fba6ba7 100644 --- a/Assets/Scripts/Player/Aiming.cs +++ b/Assets/Scripts/Player/Aiming.cs @@ -1,92 +1,95 @@ using UnityEngine; using System.Collections; -public class Aiming : MonoBehaviour +namespace ShellShock { - public GameObject player; - private PlayerActions _playerActions; - private SpriteRenderer reticleRenderer; - public SpriteManager spriteManager; - - Vector2 mDefaultPosition = new Vector2(0.0f, 0.0f); + public class Aiming : MonoBehaviour + { + public GameObject player; + private PlayerActions _playerActions; + private SpriteRenderer reticleRenderer; + public SpriteManager spriteManager; - float Range = 1f; //Range the reticle can move from the origin(player) - Vector2 mAimDirection; - Vector2 mPreviousAimDirection = new Vector2(0.0f, 0.0f); - Vector2 mCorrectedAimDirection = new Vector2(0.0f, 0.0f); + Vector2 mDefaultPosition = new Vector2(0.0f, 0.0f); - public GameObject mReticle; + float Range = 1f; //Range the reticle can move from the origin(player) + Vector2 mAimDirection; + Vector2 mPreviousAimDirection = new Vector2(0.0f, 0.0f); + Vector2 mCorrectedAimDirection = new Vector2(0.0f, 0.0f); - void Start() - { - reticleRenderer = GetComponent(); - _playerActions = player.GetComponent(); - reticleRenderer.enabled = true; - } + public GameObject mReticle; - public Vector2 AimDirection - { - get + void Start() { - return mAimDirection; + reticleRenderer = GetComponent(); + _playerActions = player.GetComponent(); + reticleRenderer.enabled = true; } - set + + public Vector2 AimDirection { - mAimDirection = value; + get + { + return mAimDirection; + } + set + { + mAimDirection = value; + } } - } - public Vector2 CorrectedAimDirection - { - get + public Vector2 CorrectedAimDirection { - return - mCorrectedAimDirection.normalized; + get + { + return -mCorrectedAimDirection.normalized; + } + + set + { + mCorrectedAimDirection = value.normalized; + } } - set + void Update() { - mCorrectedAimDirection = value.normalized; - } - } + Vector2 playerPosition = new Vector2(transform.position.x, transform.position.y); + mAimDirection = new Vector2(Input.GetAxis("Player_" + GetComponent().PlayerNumber + "_RJoystickX"), Input.GetAxis("Player_" + GetComponent().PlayerNumber + "_RJoystickY")).normalized; - void Update() - { - Vector2 playerPosition = new Vector2(transform.position.x, transform.position.y); - mAimDirection = new Vector2(Input.GetAxis("Player_" + GetComponent().PlayerNumber + "_RJoystickX"), Input.GetAxis("Player_" + GetComponent().PlayerNumber + "_RJoystickY")).normalized; - - //mReticle.gameObject.SetActive(false); - if (mAimDirection != mPreviousAimDirection && mAimDirection.magnitude > 0) - { - //Get the angle in degrees between the aim direction and the up direction - float angle = Vector2.Angle(mAimDirection, Vector2.up); - //Gets the sign value for the degrees as Vector2.Angle will round 270 to 90 degrees - //Then multiplies it by the angle so 20 degrees becomes -90 degrees - float sinedAngle = Mathf.Sign(Vector3.Cross(mAimDirection, Vector3.up).z) * angle; - //Calculates the numerator for the 8 sections. - int spriteNumber = Mathf.RoundToInt(((sinedAngle <= -157.5f ? 180 : sinedAngle) + 180) / 45); - - mCorrectedAimDirection = new Vector2((Mathf.Sin(spriteNumber * 45 * Mathf.Deg2Rad)), (Mathf.Cos(spriteNumber * 45 * Mathf.Deg2Rad))) * Range; - - mReticle.transform.position = mDefaultPosition + playerPosition - (mCorrectedAimDirection) * 1.5f; - //Debug.DrawLine (playerPosition, playerPosition + mAimDirection * Range); - - spriteManager.ChangeSprite(spriteNumber); - // SpriteManager.instance.ChangeSprite(spriteNumber); - mPreviousAimDirection = mAimDirection; - } - } + //mReticle.gameObject.SetActive(false); + if (mAimDirection != mPreviousAimDirection && mAimDirection.magnitude > 0) + { + //Get the angle in degrees between the aim direction and the up direction + float angle = Vector2.Angle(mAimDirection, Vector2.up); + //Gets the sign value for the degrees as Vector2.Angle will round 270 to 90 degrees + //Then multiplies it by the angle so 20 degrees becomes -90 degrees + float sinedAngle = Mathf.Sign(Vector3.Cross(mAimDirection, Vector3.up).z) * angle; + //Calculates the numerator for the 8 sections. + int spriteNumber = Mathf.RoundToInt(((sinedAngle <= -157.5f ? 180 : sinedAngle) + 180) / 45); - public void ReticleRender() - { - if (_playerActions.isBallin == true) - { - reticleRenderer.enabled = false; + mCorrectedAimDirection = new Vector2((Mathf.Sin(spriteNumber * 45 * Mathf.Deg2Rad)), (Mathf.Cos(spriteNumber * 45 * Mathf.Deg2Rad))) * Range; + + mReticle.transform.position = mDefaultPosition + playerPosition - (mCorrectedAimDirection) * 1.5f; + //Debug.DrawLine (playerPosition, playerPosition + mAimDirection * Range); + + spriteManager.ChangeSprite(spriteNumber); + // SpriteManager.instance.ChangeSprite(spriteNumber); + mPreviousAimDirection = mAimDirection; + } } - if (_playerActions.isBallin == false) + public void ReticleRender() { - reticleRenderer.enabled = true; + if (_playerActions.isBallin == true) + { + reticleRenderer.enabled = false; + } + + if (_playerActions.isBallin == false) + { + reticleRenderer.enabled = true; + } } } } \ No newline at end of file diff --git a/Assets/Scripts/Player/Ball.cs b/Assets/Scripts/Player/Ball.cs index 736426b..09849be 100644 --- a/Assets/Scripts/Player/Ball.cs +++ b/Assets/Scripts/Player/Ball.cs @@ -1,47 +1,50 @@ using UnityEngine; using System.Collections; +namespace ShellShock +{ + public class Ball : MonoBehaviour + { -public class Ball : MonoBehaviour { + public GameObject player; + private SpriteRenderer ballRenderer; + private Collider2D ballCollider; + private Rigidbody2D rb; - public GameObject player; - private SpriteRenderer ballRenderer; - private Collider2D ballCollider; - private Rigidbody2D rb; - - void Start () - { - ballCollider = GetComponent(); - ballRenderer = GetComponent(); - rb = player.GetComponentInParent(); - ballCollider.enabled = false; - ballRenderer.enabled = false; - } + void Start() + { + ballCollider = GetComponent(); + ballRenderer = GetComponent(); + rb = player.GetComponentInParent(); + ballCollider.enabled = false; + ballRenderer.enabled = false; + } - public void BallRender() - { - if (player.GetComponent().isBallin == true) - { - Debug.Log("Hi"); - Debug.Log(rb.drag); - float tCount = 0.0f; - tCount += Time.deltaTime; - rb.drag = 8.5f; - //rb.velocity = rb.AddForce(new Vector2(rb.drag); - if (tCount >= 3.0f) + public void BallRender() + { + if (player.GetComponent().isBallin == true) { - ballCollider.enabled = true; - ballRenderer.enabled = true; + Debug.Log("Hi"); + Debug.Log(rb.drag); + float tCount = 0.0f; + tCount += Time.deltaTime; + rb.drag = 8.5f; + //rb.velocity = rb.AddForce(new Vector2(rb.drag); + if (tCount >= 3.0f) + { + ballCollider.enabled = true; + ballRenderer.enabled = true; + } + } - } - - if (player.GetComponent().isBallin == false) - { - rb.drag = 100; - //rb.AddForce(new Vector2(player.transform.position.x, rb.drag)); - // rb.AddForce(new Vector2(rb.drag, player.transform.position.y)); - ballCollider.enabled = false; - ballRenderer.enabled = false; - } - } + if (player.GetComponent().isBallin == false) + { + rb.drag = 100; + //rb.AddForce(new Vector2(player.transform.position.x, rb.drag)); + // rb.AddForce(new Vector2(rb.drag, player.transform.position.y)); + ballCollider.enabled = false; + ballRenderer.enabled = false; + } + } + } } \ No newline at end of file diff --git a/Assets/Scripts/Player/DynamicWall.cs b/Assets/Scripts/Player/DynamicWall.cs index c461800..a5b9b3b 100644 --- a/Assets/Scripts/Player/DynamicWall.cs +++ b/Assets/Scripts/Player/DynamicWall.cs @@ -1,25 +1,29 @@ using UnityEngine; using System.Collections; -public class DynamicWall : MonoBehaviour { - public Animator wallAnim; - // Use this for initialization - void Start() - { - wallAnim = GetComponent(); - wallAnim.enabled = false; - } +namespace ShellShock +{ + public class DynamicWall : MonoBehaviour + { + public Animator wallAnim; + // Use this for initialization + void Start() + { + wallAnim = GetComponent(); + wallAnim.enabled = false; + } - void Update() - { - if (Input.GetButton ("Fire2")) - { - Walls(); - } - } + void Update() + { + if (Input.GetButton("Fire2")) + { + Walls(); + } + } - void Walls() - { - wallAnim.enabled = true; - } + void Walls() + { + wallAnim.enabled = true; + } + } } diff --git a/Assets/Scripts/Player/Movement.cs b/Assets/Scripts/Player/Movement.cs index 1ae5e1a..2d99c4d 100644 --- a/Assets/Scripts/Player/Movement.cs +++ b/Assets/Scripts/Player/Movement.cs @@ -1,37 +1,43 @@ using UnityEngine; using System.Collections; - -public class Movement : MonoBehaviour +namespace ShellShock { - public float mMovementSpeed; - public PlayerActions _playerActions; - Rigidbody2D mRigidBody2D; + public class Movement : MonoBehaviour + { + public float mMovementSpeed; + public PlayerActions _playerActions; + Rigidbody2D mRigidBody2D; - void Start () - { - mRigidBody2D = gameObject.GetComponent (); - _playerActions = GetComponent (); - } + void Start() + { + mRigidBody2D = gameObject.GetComponent(); + _playerActions = GetComponent(); + } - void Update () - { - if (Input.GetKey (KeyCode.W)) { - mRigidBody2D.AddForce (new Vector2 (0, mMovementSpeed)); - } - if (Input.GetKey (KeyCode.A)) { - mRigidBody2D.AddForce (new Vector2 (-mMovementSpeed, 0)); - } - if (Input.GetKey (KeyCode.S)) { - mRigidBody2D.AddForce (new Vector2 (0, -mMovementSpeed)); - } - if (Input.GetKey (KeyCode.D)) { - mRigidBody2D.AddForce (new Vector2 (mMovementSpeed, 0)); - } + void Update() + { + if (Input.GetKey(KeyCode.W)) + { + mRigidBody2D.AddForce(new Vector2(0, mMovementSpeed)); + } + if (Input.GetKey(KeyCode.A)) + { + mRigidBody2D.AddForce(new Vector2(-mMovementSpeed, 0)); + } + if (Input.GetKey(KeyCode.S)) + { + mRigidBody2D.AddForce(new Vector2(0, -mMovementSpeed)); + } + if (Input.GetKey(KeyCode.D)) + { + mRigidBody2D.AddForce(new Vector2(mMovementSpeed, 0)); + } - if (_playerActions.isBallin == false) - { - mRigidBody2D.AddForce (mMovementSpeed * new Vector2 (Input.GetAxisRaw ("Player_" + GetComponent ().PlayerNumber + "_LJoystickX"), Input.GetAxisRaw ("Player_" + GetComponent ().PlayerNumber + "_LJoystickY"))); - } + if (_playerActions.isBallin == false) + { + mRigidBody2D.AddForce(mMovementSpeed * new Vector2(Input.GetAxisRaw("Player_" + GetComponent().PlayerNumber + "_LJoystickX"), Input.GetAxisRaw("Player_" + GetComponent().PlayerNumber + "_LJoystickY"))); + } - } + } + } } \ No newline at end of file diff --git a/Assets/Scripts/Player/Player.cs b/Assets/Scripts/Player/Player.cs index 22726b9..3a842c2 100644 --- a/Assets/Scripts/Player/Player.cs +++ b/Assets/Scripts/Player/Player.cs @@ -2,227 +2,232 @@ using UnityEngine.UI; using System.Collections; -public class Player : MonoBehaviour +namespace ShellShock { - public Weapon mEquippedWeapon; - public Weapon[] weaponList; - public int mPlayerNumber; + public class Player : MonoBehaviour + { + public Weapon mEquippedWeapon; + public Weapon[] weaponList; + public int mPlayerNumber; - public int PlayerNumber - { - get + public int PlayerNumber { - return mPlayerNumber; + get + { + return mPlayerNumber; + } } - } - public Slider HPSlider; - public Slider ammoSlider; + public Slider HPSlider; + public Slider ammoSlider; - int mHealth; - int mMaxHealth; + int mHealth; + int mMaxHealth; - int mSheildDamageReduction; + int mSheildDamageReduction; - public float waitTime; - float mMaxSheildTime; - float mRemainingSheidTime; - Vector2 mReticlePosition; - public ParticleSystem minigunParticleSystem; - public GameObject playerHUD; + public float waitTime; + float mMaxSheildTime; + float mRemainingSheidTime; + Vector2 mReticlePosition; + public ParticleSystem minigunParticleSystem; + public GameObject playerHUD; - public int playerScore; + public int playerScore; - public Vector2 ReticlePosition - { - get + public Vector2 ReticlePosition { - return mReticlePosition; + get + { + return mReticlePosition; + } } - } - public Pistol playerPistol; - public GameObject[] playerSpawnPoints; - public bool isPlayerDead = false; - public float timeToRespawn = 3f; - public float timeSpentDead = 0f; - public int killingBulletID; - public Text playerScoreText; - bool hasPlayerSuicided = false; - - - void Awake() - { - playerSpawnPoints = GameObject.FindGameObjectsWithTag("RESPAWNPOINT"); - } - void Start() - { - mReticlePosition = mEquippedWeapon.transform.position; - mEquippedWeapon.transform.position = transform.position; - mEquippedWeapon.transform.parent = transform; - ammoSlider.maxValue = 1; - ammoSlider.value = 1; - - mMaxHealth = 100; - mHealth = mMaxHealth; - playerScore = 0; - playerScoreText.text = playerScore.ToString(); - } + public Pistol playerPistol; + public GameObject[] playerSpawnPoints; + public bool isPlayerDead = false; + public float timeToRespawn = 3f; + public float timeSpentDead = 0f; + public int killingBulletID; + public Text playerScoreText; - void Update() - { - playerScoreText.text = playerScore.ToString(); - if (isPlayerDead == true) { - timeSpentDead += Time.deltaTime; - if (timeSpentDead >= timeToRespawn) - { - EnableAndShowPlayer(); - isPlayerDead = false; - timeSpentDead = 0f; - } + void Awake() + { + playerSpawnPoints = GameObject.FindGameObjectsWithTag("RESPAWNPOINT"); } - - //if L3 is held, the HUD will appear - //if (Input.GetButton("Player_" + mPlayerNumber + "_Back")) - //{ - // playerHUD.SetActive(true); - //} - //else - //{ - // playerHUD.SetActive(false); - //} - - waitTime -= Time.deltaTime; - if (mEquippedWeapon) + void Start() { - if (GetComponent().AimDirection.magnitude > 0.9) - { //if the fire button is pressed, fire the gun. - if (Input.GetButton("Player_" + mPlayerNumber + "_Fire1") && !isPlayerDead) + mReticlePosition = mEquippedWeapon.transform.position; + mEquippedWeapon.transform.position = transform.position; + mEquippedWeapon.transform.parent = transform; + ammoSlider.maxValue = 1; + ammoSlider.value = 1; + + mMaxHealth = 100; + mHealth = mMaxHealth; + playerScore = 0; + playerScoreText.text = playerScore.ToString(); + } + + void Update() + { + playerScoreText.text = playerScore.ToString(); + + + if (isPlayerDead == true) + { + timeSpentDead += Time.deltaTime; + if (timeSpentDead >= timeToRespawn) { - if (mEquippedWeapon.RemainingAmmo >= 0) - { - ammoSlider.value = (float)mEquippedWeapon.RemainingAmmo / (float)mEquippedWeapon.MaximumAmmo; - } - //emit the bullet casing particle system - minigunParticleSystem.Emit(1); + EnableAndShowPlayer(); + isPlayerDead = false; + timeSpentDead = 0f; + } + } - if (!mEquippedWeapon.Shoot(GetComponent().CorrectedAimDirection, mPlayerNumber)) + //if L3 is held, the HUD will appear + //if (Input.GetButton("Player_" + mPlayerNumber + "_Back")) + //{ + // playerHUD.SetActive(true); + //} + //else + //{ + // playerHUD.SetActive(false); + //} + + waitTime -= Time.deltaTime; + if (mEquippedWeapon) + { + if (GetComponent().AimDirection.magnitude > 0.9) + { //if the fire button is pressed, fire the gun. + if (Input.GetButton("Player_" + mPlayerNumber + "_Fire1") && !isPlayerDead) { - mEquippedWeapon = null; + if (mEquippedWeapon.RemainingAmmo >= 0) + { + ammoSlider.value = (float)mEquippedWeapon.RemainingAmmo / (float)mEquippedWeapon.MaximumAmmo; + } + //emit the bullet casing particle system + minigunParticleSystem.Emit(1); + + if (!mEquippedWeapon.Shoot(GetComponent().CorrectedAimDirection, mPlayerNumber)) + { + mEquippedWeapon = null; + } } } } } - } - void OnCollisionEnter2D(Collision2D coll) - { - if (coll.gameObject.tag == "Projectile") + void OnCollisionEnter2D(Collision2D coll) { - mHealth -= coll.gameObject.GetComponent().Damage; - HPSlider.value = (float)mHealth / (float)mMaxHealth; - if (mHealth <= mMaxHealth / 2) + if (coll.gameObject.tag == "Projectile") { - if (mHealth <= mMaxHealth / 4) + mHealth -= coll.gameObject.GetComponent().Damage; + HPSlider.value = (float)mHealth / (float)mMaxHealth; + if (mHealth <= mMaxHealth / 2) { - HPSlider.transform.GetChild(1).transform.GetChild(0).GetComponent().color = Color.red;//TODO:Make this not super hacky (possibly with a script on the slider that holds references) + if (mHealth <= mMaxHealth / 4) + { + HPSlider.transform.GetChild(1).transform.GetChild(0).GetComponent().color = Color.red;//TODO:Make this not super hacky (possibly with a script on the slider that holds references) + } + else + { + HPSlider.transform.GetChild(1).transform.GetChild(0).GetComponent().color = Color.yellow;//TODO:Make this not super hacky (possibly with a script on the slider that holds references) + } } - else + //if the player's health is 0, the player game object will be disabled. + if (HPSlider.value == 0) { - HPSlider.transform.GetChild(1).transform.GetChild(0).GetComponent().color = Color.yellow;//TODO:Make this not super hacky (possibly with a script on the slider that holds references) + // gameObject.SetActive(false); + DisableAndHidePlayer(); + Debug.Log("Player_" + mPlayerNumber + " has died"); + killingBulletID = coll.gameObject.GetComponent().OwnerID; + IncreaseKillersScore(); + ResetPlayerProperties(); + SetPlayerSpawnPosition(); + StartRespawnTimer(); + + } - } - //if the player's health is 0, the player game object will be disabled. - if(HPSlider.value == 0) { - // gameObject.SetActive(false); - DisableAndHidePlayer(); - Debug.Log("Player_" + mPlayerNumber + " has died"); - killingBulletID = coll.gameObject.GetComponent().OwnerID; - IncreaseKillersScore(); - ResetPlayerProperties(); - SetPlayerSpawnPosition(); - StartRespawnTimer(); - + Debug.Log("Player_" + mPlayerNumber + " took damage from Player_" + coll.gameObject.GetComponent().OwnerID + "'s projectile"); + Destroy(coll.gameObject); } - - Debug.Log("Player_" + mPlayerNumber + " took damage from Player_" + coll.gameObject.GetComponent().OwnerID + "'s projectile"); - Destroy(coll.gameObject); } - } - public void IncreaseKillersScore() - { - Player[] players = FindObjectsOfType(typeof(Player)) as Player[]; - foreach(Player player in players) + public void IncreaseKillersScore() { - if(player.mPlayerNumber == killingBulletID && killingBulletID != mPlayerNumber) + Player[] players = FindObjectsOfType(typeof(Player)) as Player[]; + foreach (Player player in players) { - player.playerScore++; - } - if(player.mPlayerNumber == killingBulletID && killingBulletID == mPlayerNumber) - { - playerScore--; + if (player.mPlayerNumber == killingBulletID && killingBulletID != mPlayerNumber) + { + player.playerScore++; + } + if (player.mPlayerNumber == killingBulletID && killingBulletID == mPlayerNumber) + { + playerScore--; + } } } - } - public void ResetPlayerProperties() - { - //reset player's health - mHealth = mMaxHealth; - HPSlider.value = 1; - ammoSlider.value = 1; - //equip the player with a fully loaded pistol. - mEquippedWeapon = playerPistol; - mEquippedWeapon.RemainingAmmo = mEquippedWeapon.MaximumAmmo; - - } - public void SetPlayerSpawnPosition() - { - //sets the player's position to a random spawn point. - gameObject.transform.position = playerSpawnPoints[Random.Range(0, playerSpawnPoints.Length)].transform.position; - } - public void StartRespawnTimer() - { - isPlayerDead = true; - } - public void DisableAndHidePlayer() - { - gameObject.GetComponent().enabled = false; - gameObject.GetComponent().enabled = false; - gameObject.GetComponent().enabled = false; - gameObject.GetComponent().enabled = false; - gameObject.GetComponent().enabled = false; - gameObject.GetComponent().enabled = false; - //disabling Reticle Game object - gameObject.transform.GetChild(0).gameObject.SetActive(false); + public void ResetPlayerProperties() + { + //reset player's health + mHealth = mMaxHealth; + HPSlider.value = 1; + ammoSlider.value = 1; + //equip the player with a fully loaded pistol. + mEquippedWeapon = playerPistol; + mEquippedWeapon.RemainingAmmo = mEquippedWeapon.MaximumAmmo; - } - public void EnableAndShowPlayer() - { - gameObject.GetComponent().enabled = true; - gameObject.GetComponent().enabled = true; - gameObject.GetComponent().enabled = true; - gameObject.GetComponent().enabled = true; - gameObject.GetComponent().enabled = true; - gameObject.GetComponent().enabled = true; - //enabling Reticle Game object - gameObject.transform.GetChild(0).gameObject.SetActive(true); - } + } + public void SetPlayerSpawnPosition() + { + //sets the player's position to a random spawn point. + gameObject.transform.position = playerSpawnPoints[Random.Range(0, playerSpawnPoints.Length)].transform.position; + } + public void StartRespawnTimer() + { + isPlayerDead = true; + } + public void DisableAndHidePlayer() + { + gameObject.GetComponent().enabled = false; + gameObject.GetComponent().enabled = false; + gameObject.GetComponent().enabled = false; + gameObject.GetComponent().enabled = false; + gameObject.GetComponent().enabled = false; + gameObject.GetComponent().enabled = false; + //disabling Reticle Game object + gameObject.transform.GetChild(0).gameObject.SetActive(false); + + } + public void EnableAndShowPlayer() + { + gameObject.GetComponent().enabled = true; + gameObject.GetComponent().enabled = true; + gameObject.GetComponent().enabled = true; + gameObject.GetComponent().enabled = true; + gameObject.GetComponent().enabled = true; + gameObject.GetComponent().enabled = true; + //enabling Reticle Game object + gameObject.transform.GetChild(0).gameObject.SetActive(true); + } - public void ChangeWeapon(int weaponNumber) - { + public void ChangeWeapon(int weaponNumber) + { - Instantiate(mEquippedWeapon, new Vector3(transform.position.x, transform.position.y - 2.0f, transform.position.z), Quaternion.identity); - //create a clone of the previous weapon just under the player - //Destroy(InstantiatedWeapon, 3.0f); - mEquippedWeapon = weaponList[weaponNumber]; - mEquippedWeapon.transform.position = transform.position; - weaponList[weaponNumber].transform.SetParent(transform); + Instantiate(mEquippedWeapon, new Vector3(transform.position.x, transform.position.y - 2.0f, transform.position.z), Quaternion.identity); + //create a clone of the previous weapon just under the player + //Destroy(InstantiatedWeapon, 3.0f); + mEquippedWeapon = weaponList[weaponNumber]; + mEquippedWeapon.transform.position = transform.position; + weaponList[weaponNumber].transform.SetParent(transform); + } } } diff --git a/Assets/Scripts/Player/PlayerActions.cs b/Assets/Scripts/Player/PlayerActions.cs index 799e289..6005d06 100644 --- a/Assets/Scripts/Player/PlayerActions.cs +++ b/Assets/Scripts/Player/PlayerActions.cs @@ -1,70 +1,73 @@ using UnityEngine; using System.Collections; -public class PlayerActions: MonoBehaviour +namespace ShellShock { - public GameObject ballObj; - public Player playerScript; - public bool isBallin = false; //curled up in a ball - public int weaponNumber; - private SpriteRenderer playerRenderer; - private Collider2D playerCollider; - - void Start () - { - playerCollider = GetComponent(); - playerRenderer = GetComponent(); - playerScript = GetComponent (); - } + public class PlayerActions : MonoBehaviour + { + public GameObject ballObj; + public ShellShock.Player playerScript; + public bool isBallin = false; //curled up in a ball + public int weaponNumber; + private SpriteRenderer playerRenderer; + private Collider2D playerCollider; - void Update () - { - if(Input.GetButton("Player_" + GetComponent().PlayerNumber + "_Ball")) - { - Debug.Log (GetComponent().PlayerNumber); - isBallin = true; - PlayerRender(); - GetComponent().ReticleRender(); - ballObj.GetComponent().BallRender(); - } + void Start() + { + playerCollider = GetComponent(); + playerRenderer = GetComponent(); + playerScript = GetComponent(); + } - if(Input.GetButtonUp("Player_" + GetComponent().PlayerNumber + "_Ball")) - { - isBallin = false; - PlayerRender(); - GetComponent().ReticleRender(); - ballObj.GetComponent().BallRender(); - } - if(Input.GetButtonUp("Player_" + GetComponent().PlayerNumber + "_Switch")) - { - if (weaponNumber < playerScript.weaponList.Length) - { - weaponNumber++; - playerScript.ChangeWeapon(weaponNumber); - Debug.Log (weaponNumber); + void Update() + { + if (Input.GetButton("Player_" + GetComponent().PlayerNumber + "_Ball")) + { + Debug.Log(GetComponent().PlayerNumber); + isBallin = true; + PlayerRender(); + GetComponent().ReticleRender(); + ballObj.GetComponent().BallRender(); + } - } - if (weaponNumber == playerScript.weaponList.Length) - { - weaponNumber = 0; - playerScript.ChangeWeapon(weaponNumber); - } - } - - } + if (Input.GetButtonUp("Player_" + GetComponent().PlayerNumber + "_Ball")) + { + isBallin = false; + PlayerRender(); + GetComponent().ReticleRender(); + ballObj.GetComponent().BallRender(); + } + if (Input.GetButtonUp("Player_" + GetComponent().PlayerNumber + "_Switch")) + { + if (weaponNumber < playerScript.weaponList.Length) + { + weaponNumber++; + playerScript.ChangeWeapon(weaponNumber); + Debug.Log(weaponNumber); - void PlayerRender() - { - if (isBallin == false) - { - playerCollider.enabled = true; - playerRenderer.enabled = true; - } - - if (isBallin == true) - { - playerCollider.enabled = false; - playerRenderer.enabled = false; - } - } + } + if (weaponNumber == playerScript.weaponList.Length) + { + weaponNumber = 0; + playerScript.ChangeWeapon(weaponNumber); + } + } + + } + + void PlayerRender() + { + if (isBallin == false) + { + playerCollider.enabled = true; + playerRenderer.enabled = true; + } + + if (isBallin == true) + { + playerCollider.enabled = false; + playerRenderer.enabled = false; + } + } + } } diff --git a/Assets/Scripts/SpriteManager.cs b/Assets/Scripts/SpriteManager.cs new file mode 100644 index 0000000..2900a98 --- /dev/null +++ b/Assets/Scripts/SpriteManager.cs @@ -0,0 +1,36 @@ +using UnityEngine; +using System.Collections; + +namespace ShellShock +{ + public class SpriteManager : MonoBehaviour + { + + public Sprite[] playerSprites; + public GameObject player; + private SpriteRenderer playerSR; + + public static SpriteManager instance; + + void Start() + { + instance = this; + playerSR = player.GetComponent(); + + } + + void Update() + { + //ChangeSprite (9); + } + + public void ChangeSprite(int spriteNum) + { + if (spriteNum > 8 && spriteNum < 0) + { + Debug.LogError(spriteNum); + } + playerSR.sprite = playerSprites[spriteNum]; + } + } +} diff --git a/Assets/SpriteManager.cs.meta b/Assets/Scripts/SpriteManager.cs.meta similarity index 100% rename from Assets/SpriteManager.cs.meta rename to Assets/Scripts/SpriteManager.cs.meta diff --git a/Assets/Scripts/StatTracker.cs b/Assets/Scripts/StatTracker.cs new file mode 100644 index 0000000..abf3543 --- /dev/null +++ b/Assets/Scripts/StatTracker.cs @@ -0,0 +1,42 @@ +using UnityEngine; +using System.Collections; + +namespace ShellShock +{ + public class StatTracker : MonoBehaviour + { + + public GameObject p; + public GameObject accoladeManager; + Vector3 oldPos; + float oldValue; + + public float elusiveScore; //Linked to the acolade, elusive (taken the least damage) + public float timeSatStill; //Linked to the acolade, squatter + public float amountOfBullets; //Linked to the acolade, spray and pray + //Need another script to compare all of the different score + // Use this for initialization + void Start() + { + accoladeManager.GetComponent().statTrackers.Add(this.gameObject); + elusiveScore = p.GetComponent().HPSlider.value; + } + + // Update is called once per frame + void Update() + { + oldPos = new Vector3(0, 0, 0); + oldValue = p.GetComponent().ammoSlider.value; + if (p.transform.position == oldPos) + { + timeSatStill += Time.deltaTime; + } + oldPos = p.transform.position; + + if (p.GetComponent().ammoSlider.value <= oldValue) + { + amountOfBullets += 1; + } + } + } +} diff --git a/Assets/StatTracker.cs.meta b/Assets/Scripts/StatTracker.cs.meta similarity index 100% rename from Assets/StatTracker.cs.meta rename to Assets/Scripts/StatTracker.cs.meta diff --git a/Assets/Scripts/Tunnel.cs b/Assets/Scripts/Tunnel.cs index 8c151c6..25a0ef0 100644 --- a/Assets/Scripts/Tunnel.cs +++ b/Assets/Scripts/Tunnel.cs @@ -2,24 +2,31 @@ using System.Collections; using System.Collections.Generic; -public class Tunnel : MonoBehaviour { - - public List tunnels = new List(); - - public int tunnelNo = 0; - public int randTunnel = 0; - - // Use this for initialization - void Start () { - - } - - // Update is called once per frame - void Update () { - if (randTunnel >= 4) { - randTunnel = 0; - } - } - - +namespace ShellShock +{ + public class Tunnel : MonoBehaviour + { + + public List tunnels = new List(); + + public int tunnelNo = 0; + public int randTunnel = 0; + + // Use this for initialization + void Start() + { + + } + + // Update is called once per frame + void Update() + { + if (randTunnel >= 4) + { + randTunnel = 0; + } + } + + + } } diff --git a/Assets/Scripts/UI/TimerAndWin.cs b/Assets/Scripts/UI/TimerAndWin.cs index d99f3a3..9ec5749 100644 --- a/Assets/Scripts/UI/TimerAndWin.cs +++ b/Assets/Scripts/UI/TimerAndWin.cs @@ -1,38 +1,40 @@ using UnityEngine; using System.Collections; using UnityEngine.UI; - -public class TimerAndWin : MonoBehaviour +namespace ShellShock { - public float roundLength = 60f; - bool isGameRunning = true; + public class TimerAndWin : MonoBehaviour + { + public float roundLength = 60f; + bool isGameRunning = true; - public Text timerText; - public bool isGamePaused; + public Text timerText; + public bool isGamePaused; - // Update is called once per frame - void Update() - { - if (!isGamePaused && isGameRunning) + // Update is called once per frame + void Update() { - roundLength -= Time.deltaTime; + if (!isGamePaused && isGameRunning) + { + roundLength -= Time.deltaTime; + + string[] timeArr; + timeArr = roundLength.ToString("F2").Split('.'); - string[] timeArr; - timeArr = roundLength.ToString("F2").Split('.'); + timerText.text = int.Parse(timeArr[0]) < 10 ? 0 + timeArr[0] + ":" + timeArr[1] : timeArr[0] + ":" + timeArr[1]; + } - timerText.text = int.Parse(timeArr[0]) < 10 ? 0 + timeArr[0] + ":" + timeArr[1] : timeArr[0] + ":" + timeArr[1]; + if (roundLength <= 0 && isGameRunning) + { + EndGame(); + } } - if (roundLength <= 0 && isGameRunning) + void EndGame() { - EndGame(); + isGameRunning = false; + timerText.text = "00:00"; + Application.Quit(); } } - - void EndGame() - { - isGameRunning = false; - timerText.text = "00:00"; - Application.Quit(); - } } \ No newline at end of file diff --git a/Assets/Scripts/Walls/DynamicWallManager.cs b/Assets/Scripts/Walls/DynamicWallManager.cs index 3be2f6f..a1be0e6 100644 --- a/Assets/Scripts/Walls/DynamicWallManager.cs +++ b/Assets/Scripts/Walls/DynamicWallManager.cs @@ -1,39 +1,43 @@ using UnityEngine; using System.Collections; -public class DynamicWallManager : MonoBehaviour { +namespace ShellShock +{ + public class DynamicWallManager : MonoBehaviour + { - public GameObject[] DynamicWallsList; - public DynamicWallScript wallScript; + public GameObject[] DynamicWallsList; + public DynamicWallScript wallScript; - // Use this for initialization - void Start () - { - DynamicWallsList = GameObject.FindGameObjectsWithTag("Dynamic"); - wallScript = GetComponent (); - } - - // Update is called once per frame - void Update () - { - - } + // Use this for initialization + void Start() + { + DynamicWallsList = GameObject.FindGameObjectsWithTag("Dynamic"); + wallScript = GetComponent(); + } - public void RaiseAllWalls() - { + // Update is called once per frame + void Update() + { - } + } - public void DropAllWalls() - { - for (int i = 0; i < DynamicWallsList.Length; i++) - { + public void RaiseAllWalls() + { - } - } + } - public void RandomWallDrop() - { + public void DropAllWalls() + { + for (int i = 0; i < DynamicWallsList.Length; i++) + { - } + } + } + + public void RandomWallDrop() + { + + } + } } diff --git a/Assets/Scripts/Walls/DynamicWallScript.cs b/Assets/Scripts/Walls/DynamicWallScript.cs index a0fac24..367ef66 100644 --- a/Assets/Scripts/Walls/DynamicWallScript.cs +++ b/Assets/Scripts/Walls/DynamicWallScript.cs @@ -1,57 +1,60 @@ using UnityEngine; using System.Collections; -public class DynamicWallScript : MonoBehaviour +namespace ShellShock { - - public DynamicWallManager wallManager; - private Animator wallAnimator; - public float repeatTime = 5f; - //public Animation wallAnim; - - // Use this for initialization - void Start() + public class DynamicWallScript : MonoBehaviour { - wallAnimator = GetComponent(); - //wallAnim = GetComponent (); - wallAnimator.SetBool("isDown", false); - } - // Update is called once per frame - void Update() - { - repeatTime -= Time.deltaTime; - if (repeatTime <= 0.0f) + public DynamicWallManager wallManager; + private Animator wallAnimator; + public float repeatTime = 5f; + //public Animation wallAnim; + + // Use this for initialization + void Start() { - WallChange(); + wallAnimator = GetComponent(); + //wallAnim = GetComponent (); + wallAnimator.SetBool("isDown", false); } - } - void WallChange() - { - //Debug.Log("Wall Change"); - if (wallAnimator.GetBool("isDown") == true) //Walls are down + // Update is called once per frame + void Update() { - WallsUp(); - //Debug.Log("Wall Up"); + repeatTime -= Time.deltaTime; + if (repeatTime <= 0.0f) + { + WallChange(); + } } - else if (wallAnimator.GetBool("isDown") == false) + void WallChange() { - WallsDown(); - //Debug.Log("Wall Down"); + //Debug.Log("Wall Change"); + if (wallAnimator.GetBool("isDown") == true) //Walls are down + { + WallsUp(); + //Debug.Log("Wall Up"); + } + + else if (wallAnimator.GetBool("isDown") == false) + { + WallsDown(); + //Debug.Log("Wall Down"); + } + + repeatTime = 5f; } - repeatTime = 5f; - } - - void WallsDown() - { - wallAnimator.SetBool("isDown", true); //Walls go down - } + void WallsDown() + { + wallAnimator.SetBool("isDown", true); //Walls go down + } - void WallsUp() - { - wallAnimator.SetBool("isDown", false); //Walls go up + void WallsUp() + { + wallAnimator.SetBool("isDown", false); //Walls go up + } } } diff --git a/Assets/Scripts/Weapons/AssaultRifle.cs b/Assets/Scripts/Weapons/AssaultRifle.cs index 9a3a2cb..ea0f0d5 100644 --- a/Assets/Scripts/Weapons/AssaultRifle.cs +++ b/Assets/Scripts/Weapons/AssaultRifle.cs @@ -1,20 +1,22 @@ using UnityEngine; using System.Collections; - -public class AssaultRifle : Weapon +namespace ShellShock { - void Start() + public class AssaultRifle : Weapon { - mDamage = 10; - mCurrentReloadTime = 0f; - mReloadTime = 10f; - mSpread = 5f; // Spread - mSpreadAngle = Mathf.PI / 18; // Angle in radians (360 degrees = 2PI Radians) - mFireRate = 60f; // Max fire rate is 60 as the game runs at 60 fps - mChargeTime = 0f; - mMuzzleVelocity = 40f; - mCurrentFireTime = 0f; - mAmmoRemaining = 30; - mAmmoMax = 100; + void Start() + { + mDamage = 10; + mCurrentReloadTime = 0f; + mReloadTime = 10f; + mSpread = 5f; // Spread + mSpreadAngle = Mathf.PI / 18; // Angle in radians (360 degrees = 2PI Radians) + mFireRate = 60f; // Max fire rate is 60 as the game runs at 60 fps + mChargeTime = 0f; + mMuzzleVelocity = 40f; + mCurrentFireTime = 0f; + mAmmoRemaining = 30; + mAmmoMax = 100; + } } } \ No newline at end of file diff --git a/Assets/Scripts/Weapons/GrenadeLauncher.cs b/Assets/Scripts/Weapons/GrenadeLauncher.cs index 50ef2db..82260cb 100644 --- a/Assets/Scripts/Weapons/GrenadeLauncher.cs +++ b/Assets/Scripts/Weapons/GrenadeLauncher.cs @@ -1,20 +1,22 @@ using UnityEngine; using System.Collections; - -public class GrenadeLauncher : Weapon +namespace ShellShock { - void Start() + public class GrenadeLauncher : Weapon { - mDamage = 10; - mCurrentReloadTime = 0f; - mReloadTime = 10f; - mSpread = 0f; // Spread - mSpreadAngle = Mathf.PI / 18; // Angle in radians (360 degrees = 2PI Radians) - mFireRate = 10f; // Max fire rate is 60 as the game runs at 60 fps - mChargeTime = 0f; - mMuzzleVelocity = 10f; - mCurrentFireTime = 0f; - mAmmoRemaining = 1; - mAmmoMax = 1; + void Start() + { + mDamage = 10; + mCurrentReloadTime = 0f; + mReloadTime = 10f; + mSpread = 0f; // Spread + mSpreadAngle = Mathf.PI / 18; // Angle in radians (360 degrees = 2PI Radians) + mFireRate = 10f; // Max fire rate is 60 as the game runs at 60 fps + mChargeTime = 0f; + mMuzzleVelocity = 10f; + mCurrentFireTime = 0f; + mAmmoRemaining = 1; + mAmmoMax = 1; + } } } \ No newline at end of file diff --git a/Assets/Scripts/Weapons/MiniGun.cs b/Assets/Scripts/Weapons/MiniGun.cs index fc0f535..4a0b10b 100644 --- a/Assets/Scripts/Weapons/MiniGun.cs +++ b/Assets/Scripts/Weapons/MiniGun.cs @@ -1,21 +1,23 @@ using UnityEngine; using System.Collections; - -public class MiniGun : Weapon +namespace ShellShock { - - void Start() + public class MiniGun : Weapon { - mDamage = 10; - mCurrentReloadTime = 0f; - mReloadTime = 10f; - mSpread = 30f; // Spread - mSpreadAngle = Mathf.PI / 18; // Angle in radians (360 degrees = 2PI Radians) - mFireRate = 100f; // Max fire rate is 60 as the game runs at 60 fps - mChargeTime = 0f; - mMuzzleVelocity = 60f; - mCurrentFireTime = 0f; - mAmmoRemaining = 200; - mAmmoMax = 200; + + void Start() + { + mDamage = 10; + mCurrentReloadTime = 0f; + mReloadTime = 10f; + mSpread = 30f; // Spread + mSpreadAngle = Mathf.PI / 18; // Angle in radians (360 degrees = 2PI Radians) + mFireRate = 100f; // Max fire rate is 60 as the game runs at 60 fps + mChargeTime = 0f; + mMuzzleVelocity = 60f; + mCurrentFireTime = 0f; + mAmmoRemaining = 200; + mAmmoMax = 200; + } } } diff --git a/Assets/Scripts/Weapons/Pistol.cs b/Assets/Scripts/Weapons/Pistol.cs index a3e561d..e563926 100644 --- a/Assets/Scripts/Weapons/Pistol.cs +++ b/Assets/Scripts/Weapons/Pistol.cs @@ -1,20 +1,22 @@ using UnityEngine; using System.Collections; - -public class Pistol : Weapon +namespace ShellShock { - void Start() + public class Pistol : Weapon { - mDamage = 50; - mCurrentReloadTime = 0f; - mReloadTime = 10f; - mSpread = 2f; // Spread - mSpreadAngle = Mathf.PI / 18; // Angle in radians (360 degrees = 2PI Radians) - mFireRate = 10f; // Max fire rate is 60 as the game runs at 60 fps - mChargeTime = 0f; - mMuzzleVelocity = 40f; - mCurrentFireTime = 0f; - mAmmoRemaining = 10; - mAmmoMax = 10; + void Start() + { + mDamage = 50; + mCurrentReloadTime = 0f; + mReloadTime = 10f; + mSpread = 2f; // Spread + mSpreadAngle = Mathf.PI / 18; // Angle in radians (360 degrees = 2PI Radians) + mFireRate = 10f; // Max fire rate is 60 as the game runs at 60 fps + mChargeTime = 0f; + mMuzzleVelocity = 40f; + mCurrentFireTime = 0f; + mAmmoRemaining = 10; + mAmmoMax = 10; + } } } \ No newline at end of file diff --git a/Assets/Scripts/Weapons/RocketLauncher.cs b/Assets/Scripts/Weapons/RocketLauncher.cs index 443f468..9d21d3e 100644 --- a/Assets/Scripts/Weapons/RocketLauncher.cs +++ b/Assets/Scripts/Weapons/RocketLauncher.cs @@ -1,21 +1,24 @@ using UnityEngine; using System.Collections; -public class RocketLauncher : Weapon +namespace ShellShock { - - void Start() + public class RocketLauncher : Weapon { - mDamage = 90; - mCurrentReloadTime = 0f; - mReloadTime = 10f; - mSpread = 0f; // Spread - mSpreadAngle = Mathf.PI / 18; // Angle in radians (360 degrees = 2PI Radians) - mFireRate = 1f; // Max fire rate is 60 as the game runs at 60 fps - mChargeTime = 0f; - mMuzzleVelocity = 20f; - mCurrentFireTime = 0f; - mAmmoRemaining = 1; - mAmmoMax = 1; + + void Start() + { + mDamage = 90; + mCurrentReloadTime = 0f; + mReloadTime = 10f; + mSpread = 0f; // Spread + mSpreadAngle = Mathf.PI / 18; // Angle in radians (360 degrees = 2PI Radians) + mFireRate = 1f; // Max fire rate is 60 as the game runs at 60 fps + mChargeTime = 0f; + mMuzzleVelocity = 20f; + mCurrentFireTime = 0f; + mAmmoRemaining = 1; + mAmmoMax = 1; + } } } diff --git a/Assets/Scripts/Weapons/Shotgun.cs b/Assets/Scripts/Weapons/Shotgun.cs index c794d17..a6f7a2c 100644 --- a/Assets/Scripts/Weapons/Shotgun.cs +++ b/Assets/Scripts/Weapons/Shotgun.cs @@ -1,20 +1,22 @@ using UnityEngine; using System.Collections; - -public class Shotgun : Weapon +namespace ShellShock { - void Start() + public class Shotgun : Weapon { - mDamage = 35; - mCurrentReloadTime = 0f; - mReloadTime = 10f; - mSpread = 45f; // Spread - mSpreadAngle = Mathf.PI / 18; // Angle in radians (360 degrees = 2PI Radians) - mFireRate = 10f; // Max fire rate is 60 as the game runs at 60 fps - mChargeTime = 0f; - mMuzzleVelocity = 30f; - mCurrentFireTime = 0f; - mAmmoRemaining = 10; - mAmmoMax = 10; + void Start() + { + mDamage = 35; + mCurrentReloadTime = 0f; + mReloadTime = 10f; + mSpread = 45f; // Spread + mSpreadAngle = Mathf.PI / 18; // Angle in radians (360 degrees = 2PI Radians) + mFireRate = 10f; // Max fire rate is 60 as the game runs at 60 fps + mChargeTime = 0f; + mMuzzleVelocity = 30f; + mCurrentFireTime = 0f; + mAmmoRemaining = 10; + mAmmoMax = 10; + } } } \ No newline at end of file diff --git a/Assets/Scripts/Weapons/Sniper.cs b/Assets/Scripts/Weapons/Sniper.cs index 1cd0161..4e976b6 100644 --- a/Assets/Scripts/Weapons/Sniper.cs +++ b/Assets/Scripts/Weapons/Sniper.cs @@ -1,21 +1,24 @@ using UnityEngine; using System.Collections; -public class Sniper : Weapon +namespace ShellShock { - - void Start() + public class Sniper : Weapon { - mDamage = 50; - mCurrentReloadTime = 0f; - mReloadTime = 10f; - mSpread = 0f; // Spread - mSpreadAngle = Mathf.PI / 18; // Angle in radians (360 degrees = 2PI Radians) - mFireRate = 2f; // Max fire rate is 60 as the game runs at 60 fps - mChargeTime = 0f; - mMuzzleVelocity = 75f; - mCurrentFireTime = 0f; - mAmmoRemaining = 3; - mAmmoMax = 3; + + void Start() + { + mDamage = 50; + mCurrentReloadTime = 0f; + mReloadTime = 10f; + mSpread = 0f; // Spread + mSpreadAngle = Mathf.PI / 18; // Angle in radians (360 degrees = 2PI Radians) + mFireRate = 2f; // Max fire rate is 60 as the game runs at 60 fps + mChargeTime = 0f; + mMuzzleVelocity = 75f; + mCurrentFireTime = 0f; + mAmmoRemaining = 3; + mAmmoMax = 3; + } } } diff --git a/Assets/Scripts/Weapons/Weapon.cs b/Assets/Scripts/Weapons/Weapon.cs index af91d39..f1cc2cc 100644 --- a/Assets/Scripts/Weapons/Weapon.cs +++ b/Assets/Scripts/Weapons/Weapon.cs @@ -1,87 +1,91 @@ using UnityEngine; using UnityEngine.UI; using System.Collections; - -public abstract class Weapon : MonoBehaviour +namespace ShellShock { - protected int mDamage; //Damage per bullet - protected float mCurrentReloadTime = 0f; //current reload time compared to mReloadTime - protected float mReloadTime = 10f; //Reload time in seconds - protected float mSpread = 2f; //Bullet spread - protected float mSpreadAngle = Mathf.PI / 18; // Angle in radians (360 degrees = 2PI Radians) - protected float mFireRate = 60f;//Max fire rate is 60 as the game runs at 60 fps - protected float mChargeTime = 0f; //if - protected float mMuzzleVelocity = 40f; - protected float mCurrentFireTime = 0f; - protected int mAmmoRemaining = 100; - protected int mAmmoMax = 100; + public abstract class Weapon : MonoBehaviour + { + protected int mDamage; //Damage per bullet + protected float mCurrentReloadTime = 0f; //current reload time compared to mReloadTime + protected float mReloadTime = 10f; //Reload time in seconds + protected float mSpread = 2f; //Bullet spread + protected float mSpreadAngle = Mathf.PI / 18; // Angle in radians (360 degrees = 2PI Radians) + protected float mFireRate = 60f;//Max fire rate is 60 as the game runs at 60 fps + protected float mChargeTime = 0f; //if + protected float mMuzzleVelocity = 40f; + protected float mCurrentFireTime = 0f; + protected int mAmmoRemaining = 100; + protected int mAmmoMax = 100; - public bool hasInfiniteAmmo; + public bool hasInfiniteAmmo; - protected Vector2 mShootDirection = new Vector2(0, 0); + protected Vector2 mShootDirection = new Vector2(0, 0); - public Vector2 ShootDirection - { - get - { - return mShootDirection; - } - set + public Vector2 ShootDirection { - mShootDirection = value; + get + { + return mShootDirection; + } + set + { + mShootDirection = value; + } } - } - public int RemainingAmmo - { - get + public int RemainingAmmo { - return mAmmoRemaining; - } + get + { + return mAmmoRemaining; + } - set - { - mAmmoRemaining = value; + set + { + mAmmoRemaining = value; + } } - } - public int MaximumAmmo - { - get + public int MaximumAmmo { - return mAmmoMax; - } + get + { + return mAmmoMax; + } - set - { - mAmmoMax = value; + set + { + mAmmoMax = value; + } } - } - public GameObject mProjectile; + public GameObject mProjectile; - public bool Shoot(Vector2 dir, int id) - { - if (mAmmoRemaining > 0) + public bool Shoot(Vector2 dir, int id) { - Vector2 spr = new Vector2(Random.value - 0.5f, Random.value - 0.5f) * mSpread; - if (mCurrentFireTime > 1 / mFireRate) + if (mAmmoRemaining > 0) { - GameObject firedProjectile = (GameObject)Instantiate(mProjectile, new Vector2(transform.position.x, transform.position.y) + dir.normalized * 1.8f, Quaternion.identity); - firedProjectile.GetComponent().Fire((dir * mMuzzleVelocity) + spr, mDamage, id); - if (!hasInfiniteAmmo) + Vector2 spr = new Vector2(Random.value - 0.5f, Random.value - 0.5f) * mSpread; + if (mCurrentFireTime > 1 / mFireRate) { - mAmmoRemaining--; + GameObject firedProjectile = (GameObject)Instantiate(mProjectile, new Vector2(transform.position.x, transform.position.y) + dir.normalized * 1.8f, Quaternion.identity); + firedProjectile.GetComponent().Fire((dir * mMuzzleVelocity) + spr, mDamage, id); + if (!hasInfiniteAmmo) + { + mAmmoRemaining--; + } + mCurrentFireTime = 0; + return true; + } + else + { + mCurrentFireTime += Time.deltaTime; + return true; } - mCurrentFireTime = 0; - return true; } - else { - mCurrentFireTime += Time.deltaTime; - return true; + else + { + return false; } } - else { - return false; - } } } \ No newline at end of file diff --git a/Assets/Scripts/tunnelScript.cs b/Assets/Scripts/tunnelScript.cs index 1d105be..81f8d8a 100644 --- a/Assets/Scripts/tunnelScript.cs +++ b/Assets/Scripts/tunnelScript.cs @@ -1,56 +1,62 @@ using UnityEngine; using System.Collections; -public class tunnelScript : MonoBehaviour { +namespace ShellShock +{ + public class tunnelScript : MonoBehaviour + { - public GameObject tunnelMan; + public GameObject tunnelMan; - int tunnelNo; + int tunnelNo; - int randTunnelLink; - // Use this for initialization - void Start () { - tunnelMan.GetComponent().tunnels.Add(this.gameObject); - tunnelNo = tunnelMan.GetComponent().tunnelNo; - tunnelMan.GetComponent().tunnelNo++; - randTunnelLink = tunnelMan.GetComponent().randTunnel; - } - - // Update is called once per frame - void Update () { - if (randTunnelLink >= 3) + int randTunnelLink; + // Use this for initialization + void Start() { - randTunnelLink = 0; + tunnelMan.GetComponent().tunnels.Add(this.gameObject); + tunnelNo = tunnelMan.GetComponent().tunnelNo; + tunnelMan.GetComponent().tunnelNo++; + randTunnelLink = tunnelMan.GetComponent().randTunnel; } - } - void OnTriggerEnter2D(Collider2D coll) - { - if (coll.GetComponent() && coll.gameObject.GetComponentInParent().waitTime <= 0.0f) + // Update is called once per frame + void Update() { - if (randTunnelLink != tunnelNo) + if (randTunnelLink >= 3) { - if (randTunnelLink == 0) - { - coll.transform.position = tunnelMan.GetComponent().tunnels[0].transform.position; - } - else if (randTunnelLink == 1) - { - coll.transform.position = tunnelMan.GetComponent().tunnels[1].transform.position; - } - else if (randTunnelLink == 2) - { - coll.transform.position = tunnelMan.GetComponent().tunnels[2].transform.position; - } - else if (randTunnelLink == 3) + randTunnelLink = 0; + } + } + + void OnTriggerEnter2D(Collider2D coll) + { + if (coll.GetComponent() && coll.gameObject.GetComponentInParent().waitTime <= 0.0f) + { + if (randTunnelLink != tunnelNo) { - coll.transform.position = tunnelMan.GetComponent().tunnels[3].transform.position; + if (randTunnelLink == 0) + { + coll.transform.position = tunnelMan.GetComponent().tunnels[0].transform.position; + } + else if (randTunnelLink == 1) + { + coll.transform.position = tunnelMan.GetComponent().tunnels[1].transform.position; + } + else if (randTunnelLink == 2) + { + coll.transform.position = tunnelMan.GetComponent().tunnels[2].transform.position; + } + else if (randTunnelLink == 3) + { + coll.transform.position = tunnelMan.GetComponent().tunnels[3].transform.position; + } } + //Problem is that you can teleport to random tunnels but you can also teleport to the same on you just walked into + //Have to check whether you are colliding with the one you're teleporting to + randTunnelLink += 1; + coll.gameObject.GetComponentInParent().waitTime = 0.5f; } - //Problem is that you can teleport to random tunnels but you can also teleport to the same on you just walked into - //Have to check whether you are colliding with the one you're teleporting to - randTunnelLink += 1; - coll.gameObject.GetComponentInParent().waitTime = 0.5f; } } } diff --git a/Assets/SpriteManager.cs b/Assets/SpriteManager.cs deleted file mode 100644 index ab659a9..0000000 --- a/Assets/SpriteManager.cs +++ /dev/null @@ -1,32 +0,0 @@ -using UnityEngine; -using System.Collections; - -public class SpriteManager : MonoBehaviour { - - public Sprite[] playerSprites; - public GameObject player; - private SpriteRenderer playerSR; - - public static SpriteManager instance; - - void Start () - { - instance = this; - playerSR = player.GetComponent (); - - } - - void Update () - { - //ChangeSprite (9); - } - - public void ChangeSprite(int spriteNum) - { - if (spriteNum > 8 && spriteNum < 0) - { - Debug.LogError(spriteNum); - } - playerSR.sprite = playerSprites [spriteNum]; - } -} diff --git a/Assets/StatTracker.cs b/Assets/StatTracker.cs deleted file mode 100644 index 71efcf3..0000000 --- a/Assets/StatTracker.cs +++ /dev/null @@ -1,35 +0,0 @@ -using UnityEngine; -using System.Collections; - -public class StatTracker : MonoBehaviour { - - public GameObject p; - public GameObject acoladeManager; - Vector3 oldPos; - float oldValue; - - public float elusiveScore; //Linked to the acolade, elusive (taken the least damage) - public float timeSatStill; //Linked to the acolade, squatter - public float amountOfBullets; //Linked to the acolade, spray and pray - //Need another script to compare all of the different score - // Use this for initialization - void Start () { - acoladeManager.GetComponent ().statTrackers.Add (this.gameObject); - elusiveScore = p.GetComponent ().HPSlider.value; - } - - // Update is called once per frame - void Update () { - oldPos = new Vector3 (0, 0, 0); - oldValue = p.GetComponent ().ammoSlider.value; - if (p.transform.position == oldPos) { - timeSatStill += Time.deltaTime; - } - oldPos = p.transform.position; - - if(p.GetComponent ().ammoSlider.value <= oldValue) - { - amountOfBullets += 1; - } - } -}