Add game loop conditions

and UI data update
renatoconkist · Feb 11, 2022 · 9c0c1ff · 9c0c1ff
1 parent fde0236
commit 9c0c1ff
Show file tree

Hide file tree

Showing 43 changed files with 1,521 additions and 1,353 deletions.
diff --git a/Assets/Settings/GameInputs.inputactions b/Assets/Settings/GameInputs.inputactions
@@ -36,14 +36,6 @@
                     "expectedControlType": "Button",
                     "processors": "",
                     "interactions": ""
-                },
-                {
-                    "name": "Pause Toggle",
-                    "type": "Button",
-                    "id": "26915df4-f50d-4ce7-8bf3-20d0d1abc5ff",
-                    "expectedControlType": "Button",
-                    "processors": "",
-                    "interactions": ""
                 }
             ],
             "bindings": [
@@ -112,17 +104,6 @@
                     "action": "Fire",
                     "isComposite": false,
                     "isPartOfComposite": false
-                },
-                {
-                    "name": "",
-                    "id": "8220bba2-8bbc-49a1-affa-b8615a937849",
-                    "path": "<Keyboard>/escape",
-                    "interactions": "",
-                    "processors": "",
-                    "groups": "Keyboard",
-                    "action": "Pause Toggle",
-                    "isComposite": false,
-                    "isPartOfComposite": false
                 }
             ]
         },

diff --git a/Assets/_Game/Bundles/Environments/GameplayEnv.unity b/Assets/_Game/Bundles/Environments/GameplayEnv.unity
@@ -251,6 +251,17 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 128935687, guid: 8d931b3fb82717949a490ba2479926c4, type: 3}
   m_PrefabInstance: {fileID: 230503137}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &600096873 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 5036681580851540238, guid: d459442882cd68e45b5127c764b20087, type: 3}
+  m_PrefabInstance: {fileID: 4819601664677487038}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &646307499
 GameObject:
   m_ObjectHideFlags: 0
@@ -1107,6 +1118,26 @@ PrefabInstance:
       propertyPath: m_Name
       value: Ship - Player
       objectReference: {fileID: 0}
+    - target: {fileID: 5036681580851540238, guid: d459442882cd68e45b5127c764b20087, type: 3}
+      propertyPath: m_ActionEvents.Array.data[1].m_PersistentCalls.m_Calls.Array.data[0].m_Mode
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5036681580851540238, guid: d459442882cd68e45b5127c764b20087, type: 3}
+      propertyPath: m_ActionEvents.Array.data[1].m_PersistentCalls.m_Calls.Array.data[0].m_Target
+      value: 
+      objectReference: {fileID: 600096873}
+    - target: {fileID: 5036681580851540238, guid: d459442882cd68e45b5127c764b20087, type: 3}
+      propertyPath: m_ActionEvents.Array.data[1].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 5036681580851540238, guid: d459442882cd68e45b5127c764b20087, type: 3}
+      propertyPath: m_ActionEvents.Array.data[1].m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
+      value: 
+      objectReference: {fileID: 0}
+    - target: {fileID: 5036681580851540238, guid: d459442882cd68e45b5127c764b20087, type: 3}
+      propertyPath: m_ActionEvents.Array.data[1].m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
+      value: 
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: d459442882cd68e45b5127c764b20087, type: 3}
 --- !u!1001 &8268515868544434237

diff --git a/Assets/_Game/Bundles/Ships/Ship - Player.prefab b/Assets/_Game/Bundles/Ships/Ship - Player.prefab
@@ -160,7 +160,7 @@ MonoBehaviour:
   - m_PersistentCalls:
       m_Calls:
       - m_Target: {fileID: 2078137657}
-        m_TargetAssemblyTypeName: realima.asterioidz.ShipControls, Assembly-CSharp
+        m_TargetAssemblyTypeName: realima.asterioidz.ShipControls, realima.asteroidz
         m_MethodName: Accelerate
         m_Mode: 0
         m_Arguments:
@@ -174,25 +174,13 @@ MonoBehaviour:
     m_ActionId: 75464198-84f5-4cb8-9348-f0b220834f24
     m_ActionName: Gameplay/Accelerate[/Keyboard/w]
   - m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 2078137657}
-        m_TargetAssemblyTypeName: realima.asterioidz.ShipControls, Assembly-CSharp
-        m_MethodName: Break
-        m_Mode: 0
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
+      m_Calls: []
     m_ActionId: e6fb8c4d-c755-4c8e-a6d0-0c6243689791
     m_ActionName: Gameplay/Break[/Keyboard/s]
   - m_PersistentCalls:
       m_Calls:
       - m_Target: {fileID: 2078137657}
-        m_TargetAssemblyTypeName: realima.asterioidz.ShipControls, Assembly-CSharp
+        m_TargetAssemblyTypeName: realima.asterioidz.ShipControls, realima.asteroidz
         m_MethodName: Steer
         m_Mode: 0
         m_Arguments:
@@ -208,7 +196,7 @@ MonoBehaviour:
   - m_PersistentCalls:
       m_Calls:
       - m_Target: {fileID: 313949985145399314}
-        m_TargetAssemblyTypeName: realima.asterioidz.WeaponControls, Assembly-CSharp
+        m_TargetAssemblyTypeName: realima.asterioidz.WeaponControls, realima.asteroidz
         m_MethodName: Shoot
         m_Mode: 0
         m_Arguments:
@@ -221,10 +209,6 @@ MonoBehaviour:
         m_CallState: 2
     m_ActionId: a978285e-8e51-4be2-9e09-65d57cbb9170
     m_ActionName: Gameplay/Fire[/Keyboard/space]
-  - m_PersistentCalls:
-      m_Calls: []
-    m_ActionId: 26915df4-f50d-4ce7-8bf3-20d0d1abc5ff
-    m_ActionName: Gameplay/Pause Toggle[/Keyboard/escape]
   - m_PersistentCalls:
       m_Calls: []
     m_ActionId: 89f59b9c-d46a-4861-b331-5cf754fc074c
@@ -265,8 +249,8 @@ MonoBehaviour:
       m_Calls: []
     m_ActionId: 68ba29d1-0e88-46bb-8d70-4b473c8a7e6c
     m_ActionName: UI/TrackedDeviceOrientation
-  m_NeverAutoSwitchControlSchemes: 1
-  m_DefaultControlScheme: Keyboard
+  m_NeverAutoSwitchControlSchemes: 0
+  m_DefaultControlScheme: 
   m_DefaultActionMap: Gameplay
   m_SplitScreenIndex: -1
   m_Camera: {fileID: 0}

diff --git a/Assets/_Game/Common/Prefabs/EventSystem.prefab b/Assets/_Game/Common/Prefabs/EventSystem.prefab
@@ -0,0 +1,76 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1315769887836801982
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1315769887836801953}
+  - component: {fileID: 1315769887836801952}
+  - component: {fileID: 1315769887836801983}
+  m_Layer: 0
+  m_Name: EventSystem
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1315769887836801953
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1315769887836801982}
+  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: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1315769887836801952
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1315769887836801982}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_FirstSelected: {fileID: 0}
+  m_sendNavigationEvents: 1
+  m_DragThreshold: 10
+--- !u!114 &1315769887836801983
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1315769887836801982}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MoveRepeatDelay: 0.5
+  m_MoveRepeatRate: 0.1
+  m_ActionsAsset: {fileID: -944628639613478452, guid: e7489c61927bb9a42bf3cf046ca1ef24, type: 3}
+  m_PointAction: {fileID: -471497678256517183, guid: e7489c61927bb9a42bf3cf046ca1ef24, type: 3}
+  m_MoveAction: {fileID: 3912047458457557239, guid: e7489c61927bb9a42bf3cf046ca1ef24, type: 3}
+  m_SubmitAction: {fileID: -7508966663446272471, guid: e7489c61927bb9a42bf3cf046ca1ef24, type: 3}
+  m_CancelAction: {fileID: -6152369189311080542, guid: e7489c61927bb9a42bf3cf046ca1ef24, type: 3}
+  m_LeftClickAction: {fileID: -8481863795926258145, guid: e7489c61927bb9a42bf3cf046ca1ef24, type: 3}
+  m_MiddleClickAction: {fileID: -8533247940819938395, guid: e7489c61927bb9a42bf3cf046ca1ef24, type: 3}
+  m_RightClickAction: {fileID: -6151689893899655811, guid: e7489c61927bb9a42bf3cf046ca1ef24, type: 3}
+  m_ScrollWheelAction: {fileID: -475395390632294580, guid: e7489c61927bb9a42bf3cf046ca1ef24, type: 3}
+  m_TrackedDevicePositionAction: {fileID: -805676959764539278, guid: e7489c61927bb9a42bf3cf046ca1ef24, type: 3}
+  m_TrackedDeviceOrientationAction: {fileID: 7983004009231396716, guid: e7489c61927bb9a42bf3cf046ca1ef24, type: 3}
+  m_DeselectOnBackgroundClick: 1
+  m_PointerBehavior: 0
diff --git a/Assets/_Game/Common/Prefabs/EventSystem.prefab.meta b/Assets/_Game/Common/Prefabs/EventSystem.prefab.meta
diff --git a/Assets/_Game/Common/UI/Fonts/Rowdies/Rowdies-Regular SDF.asset b/Assets/_Game/Common/UI/Fonts/Rowdies/Rowdies-Regular SDF.asset
diff --git a/Assets/_Game/Common/UI/Fonts/UbuntuMono/UbuntuMono-BoldItalic SDF.asset b/Assets/_Game/Common/UI/Fonts/UbuntuMono/UbuntuMono-BoldItalic SDF.asset
diff --git a/Assets/_Game/Common/Scenes.meta → Assets/_Game/Common/UI/Scenes.meta b/Assets/_Game/Common/Scenes.meta → Assets/_Game/Common/UI/Scenes.meta