Skip to content

Commit af6e870

Browse files
committed
Update UI and input setup in BluePlanetArea and GameScene
Added an EventSystem to BluePlanetArea for UI event handling. Refactored GameScene by removing the UIDocument GameObject and its controllers, integrating their components directly into InputController, and adjusted related references and teamId. Also updated NavMesh voxel size in GameScene.
1 parent 84f8f6f commit af6e870

File tree

2 files changed

+133
-89
lines changed

2 files changed

+133
-89
lines changed

Red Strike/Assets/Scenes/BluePlanetArea.unity

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,85 @@ NavMeshSettings:
119119
debug:
120120
m_Flags: 0
121121
m_NavMeshData: {fileID: 0}
122+
--- !u!1 &387184701
123+
GameObject:
124+
m_ObjectHideFlags: 0
125+
m_CorrespondingSourceObject: {fileID: 0}
126+
m_PrefabInstance: {fileID: 0}
127+
m_PrefabAsset: {fileID: 0}
128+
serializedVersion: 6
129+
m_Component:
130+
- component: {fileID: 387184704}
131+
- component: {fileID: 387184703}
132+
- component: {fileID: 387184702}
133+
m_Layer: 0
134+
m_Name: EventSystem
135+
m_TagString: Untagged
136+
m_Icon: {fileID: 0}
137+
m_NavMeshLayer: 0
138+
m_StaticEditorFlags: 0
139+
m_IsActive: 1
140+
--- !u!114 &387184702
141+
MonoBehaviour:
142+
m_ObjectHideFlags: 0
143+
m_CorrespondingSourceObject: {fileID: 0}
144+
m_PrefabInstance: {fileID: 0}
145+
m_PrefabAsset: {fileID: 0}
146+
m_GameObject: {fileID: 387184701}
147+
m_Enabled: 1
148+
m_EditorHideFlags: 0
149+
m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3}
150+
m_Name:
151+
m_EditorClassIdentifier:
152+
m_SendPointerHoverToParent: 1
153+
m_MoveRepeatDelay: 0.5
154+
m_MoveRepeatRate: 0.1
155+
m_XRTrackingOrigin: {fileID: 0}
156+
m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
157+
m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
158+
m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
159+
m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
160+
m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
161+
m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
162+
m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
163+
m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
164+
m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
165+
m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
166+
m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3}
167+
m_DeselectOnBackgroundClick: 1
168+
m_PointerBehavior: 0
169+
m_CursorLockBehavior: 0
170+
m_ScrollDeltaPerTick: 6
171+
--- !u!114 &387184703
172+
MonoBehaviour:
173+
m_ObjectHideFlags: 0
174+
m_CorrespondingSourceObject: {fileID: 0}
175+
m_PrefabInstance: {fileID: 0}
176+
m_PrefabAsset: {fileID: 0}
177+
m_GameObject: {fileID: 387184701}
178+
m_Enabled: 1
179+
m_EditorHideFlags: 0
180+
m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
181+
m_Name:
182+
m_EditorClassIdentifier:
183+
m_FirstSelected: {fileID: 0}
184+
m_sendNavigationEvents: 1
185+
m_DragThreshold: 10
186+
--- !u!4 &387184704
187+
Transform:
188+
m_ObjectHideFlags: 0
189+
m_CorrespondingSourceObject: {fileID: 0}
190+
m_PrefabInstance: {fileID: 0}
191+
m_PrefabAsset: {fileID: 0}
192+
m_GameObject: {fileID: 387184701}
193+
serializedVersion: 2
194+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
195+
m_LocalPosition: {x: 0, y: 0, z: 0}
196+
m_LocalScale: {x: 1, y: 1, z: 1}
197+
m_ConstrainProportionsScale: 0
198+
m_Children: []
199+
m_Father: {fileID: 0}
200+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
122201
--- !u!1 &452305708
123202
GameObject:
124203
m_ObjectHideFlags: 0
@@ -5834,3 +5913,4 @@ SceneRoots:
58345913
- {fileID: 804291814}
58355914
- {fileID: 2126698098}
58365915
- {fileID: 1454141292}
5916+
- {fileID: 387184704}

Red Strike/Assets/Scenes/GameScene.unity

Lines changed: 53 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ GameObject:
136136
m_Icon: {fileID: 0}
137137
m_NavMeshLayer: 0
138138
m_StaticEditorFlags: 0
139-
m_IsActive: 1
139+
m_IsActive: 0
140140
--- !u!114 &117385833
141141
MonoBehaviour:
142142
m_ObjectHideFlags: 0
@@ -539,88 +539,6 @@ MonoBehaviour:
539539
m_LightCookieSize: {x: 1, y: 1}
540540
m_LightCookieOffset: {x: 0, y: 0}
541541
m_SoftShadowQuality: 1
542-
--- !u!1 &422005010
543-
GameObject:
544-
m_ObjectHideFlags: 0
545-
m_CorrespondingSourceObject: {fileID: 0}
546-
m_PrefabInstance: {fileID: 0}
547-
m_PrefabAsset: {fileID: 0}
548-
serializedVersion: 6
549-
m_Component:
550-
- component: {fileID: 422005012}
551-
- component: {fileID: 422005011}
552-
- component: {fileID: 422005013}
553-
- component: {fileID: 422005014}
554-
m_Layer: 5
555-
m_Name: UIDocument
556-
m_TagString: Untagged
557-
m_Icon: {fileID: 0}
558-
m_NavMeshLayer: 0
559-
m_StaticEditorFlags: 0
560-
m_IsActive: 1
561-
--- !u!114 &422005011
562-
MonoBehaviour:
563-
m_ObjectHideFlags: 0
564-
m_CorrespondingSourceObject: {fileID: 0}
565-
m_PrefabInstance: {fileID: 0}
566-
m_PrefabAsset: {fileID: 0}
567-
m_GameObject: {fileID: 422005010}
568-
m_Enabled: 1
569-
m_EditorHideFlags: 0
570-
m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0}
571-
m_Name:
572-
m_EditorClassIdentifier:
573-
m_PanelSettings: {fileID: 11400000, guid: 4d371fff1e2f90943bde16f9cfcff34a, type: 2}
574-
m_ParentUI: {fileID: 0}
575-
sourceAsset: {fileID: 9197481963319205126, guid: cd8da59dcd24b6741a617380d31cdce0, type: 3}
576-
m_SortingOrder: 0
577-
m_WorldSpaceSizeMode: 1
578-
m_WorldSpaceWidth: 1920
579-
m_WorldSpaceHeight: 1080
580-
--- !u!4 &422005012
581-
Transform:
582-
m_ObjectHideFlags: 0
583-
m_CorrespondingSourceObject: {fileID: 0}
584-
m_PrefabInstance: {fileID: 0}
585-
m_PrefabAsset: {fileID: 0}
586-
m_GameObject: {fileID: 422005010}
587-
serializedVersion: 2
588-
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
589-
m_LocalPosition: {x: 0, y: 0, z: 0}
590-
m_LocalScale: {x: 1, y: 1, z: 1}
591-
m_ConstrainProportionsScale: 0
592-
m_Children: []
593-
m_Father: {fileID: 0}
594-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
595-
--- !u!114 &422005013
596-
MonoBehaviour:
597-
m_ObjectHideFlags: 0
598-
m_CorrespondingSourceObject: {fileID: 0}
599-
m_PrefabInstance: {fileID: 0}
600-
m_PrefabAsset: {fileID: 0}
601-
m_GameObject: {fileID: 422005010}
602-
m_Enabled: 1
603-
m_EditorHideFlags: 0
604-
m_Script: {fileID: 11500000, guid: b9196fefff361e148875260ff54b24a4, type: 3}
605-
m_Name:
606-
m_EditorClassIdentifier:
607-
inputController: {fileID: 1556403732}
608-
--- !u!114 &422005014
609-
MonoBehaviour:
610-
m_ObjectHideFlags: 0
611-
m_CorrespondingSourceObject: {fileID: 0}
612-
m_PrefabInstance: {fileID: 0}
613-
m_PrefabAsset: {fileID: 0}
614-
m_GameObject: {fileID: 422005010}
615-
m_Enabled: 1
616-
m_EditorHideFlags: 0
617-
m_Script: {fileID: 11500000, guid: 70d5e1bc8a892c841afaa940cb019eb1, type: 3}
618-
m_Name:
619-
m_EditorClassIdentifier:
620-
inputController: {fileID: 1556403732}
621-
mainStationTemplate: {fileID: 9197481963319205126, guid: 7e5b2e72160062249ab83c27bd5a52e7, type: 3}
622-
hangarTemplate: {fileID: 9197481963319205126, guid: 5a649d49f0f531a49a7cdedc28d5fce4, type: 3}
623-
energyTowerTemplate: {fileID: 9197481963319205126, guid: 11d450df22e338a49886331ef99c2108, type: 3}
624542
--- !u!1 &460729958
625543
GameObject:
626544
m_ObjectHideFlags: 0
@@ -1196,6 +1114,9 @@ GameObject:
11961114
m_Component:
11971115
- component: {fileID: 1556403731}
11981116
- component: {fileID: 1556403732}
1117+
- component: {fileID: 1556403735}
1118+
- component: {fileID: 1556403734}
1119+
- component: {fileID: 1556403733}
11991120
m_Layer: 0
12001121
m_Name: InputController
12011122
m_TagString: Untagged
@@ -1230,7 +1151,7 @@ MonoBehaviour:
12301151
m_Script: {fileID: 11500000, guid: 768c93e16b4ed8f46a9cbb09dc7237ad, type: 3}
12311152
m_Name:
12321153
m_EditorClassIdentifier:
1233-
gameUIDocument: {fileID: 422005011}
1154+
gameUIDocument: {fileID: 0}
12341155
terrainLayer:
12351156
serializedVersion: 2
12361157
m_Bits: 8
@@ -1239,9 +1160,53 @@ MonoBehaviour:
12391160
m_Bits: 64
12401161
buildingsDatabase: {fileID: 11400000, guid: 93b080ce34c08df468e7afea3e6569c6, type: 2}
12411162
minDistanceBetweenObjects: 25
1242-
vehiclesHUDController: {fileID: 422005013}
1243-
buildingHUDController: {fileID: 422005014}
1244-
teamId: 1
1163+
teamId: 0
1164+
--- !u!114 &1556403733
1165+
MonoBehaviour:
1166+
m_ObjectHideFlags: 0
1167+
m_CorrespondingSourceObject: {fileID: 0}
1168+
m_PrefabInstance: {fileID: 0}
1169+
m_PrefabAsset: {fileID: 0}
1170+
m_GameObject: {fileID: 1556403729}
1171+
m_Enabled: 1
1172+
m_EditorHideFlags: 0
1173+
m_Script: {fileID: 11500000, guid: 70d5e1bc8a892c841afaa940cb019eb1, type: 3}
1174+
m_Name:
1175+
m_EditorClassIdentifier:
1176+
mainStationTemplate: {fileID: 9197481963319205126, guid: 7e5b2e72160062249ab83c27bd5a52e7, type: 3}
1177+
hangarTemplate: {fileID: 9197481963319205126, guid: 5a649d49f0f531a49a7cdedc28d5fce4, type: 3}
1178+
energyTowerTemplate: {fileID: 9197481963319205126, guid: 11d450df22e338a49886331ef99c2108, type: 3}
1179+
--- !u!114 &1556403734
1180+
MonoBehaviour:
1181+
m_ObjectHideFlags: 0
1182+
m_CorrespondingSourceObject: {fileID: 0}
1183+
m_PrefabInstance: {fileID: 0}
1184+
m_PrefabAsset: {fileID: 0}
1185+
m_GameObject: {fileID: 1556403729}
1186+
m_Enabled: 1
1187+
m_EditorHideFlags: 0
1188+
m_Script: {fileID: 11500000, guid: b9196fefff361e148875260ff54b24a4, type: 3}
1189+
m_Name:
1190+
m_EditorClassIdentifier:
1191+
--- !u!114 &1556403735
1192+
MonoBehaviour:
1193+
m_ObjectHideFlags: 0
1194+
m_CorrespondingSourceObject: {fileID: 0}
1195+
m_PrefabInstance: {fileID: 0}
1196+
m_PrefabAsset: {fileID: 0}
1197+
m_GameObject: {fileID: 1556403729}
1198+
m_Enabled: 1
1199+
m_EditorHideFlags: 0
1200+
m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0}
1201+
m_Name:
1202+
m_EditorClassIdentifier:
1203+
m_PanelSettings: {fileID: 11400000, guid: 4d371fff1e2f90943bde16f9cfcff34a, type: 2}
1204+
m_ParentUI: {fileID: 0}
1205+
sourceAsset: {fileID: 9197481963319205126, guid: cd8da59dcd24b6741a617380d31cdce0, type: 3}
1206+
m_SortingOrder: 0
1207+
m_WorldSpaceSizeMode: 1
1208+
m_WorldSpaceWidth: 1920
1209+
m_WorldSpaceHeight: 1080
12451210
--- !u!1 &1702380761
12461211
GameObject:
12471212
m_ObjectHideFlags: 0
@@ -1287,7 +1252,7 @@ MonoBehaviour:
12871252
m_OverrideTileSize: 0
12881253
m_TileSize: 256
12891254
m_OverrideVoxelSize: 0
1290-
m_VoxelSize: 0.16666667
1255+
m_VoxelSize: 0.23333333
12911256
m_MinRegionArea: 2
12921257
m_NavMeshData: {fileID: 23800000, guid: 3ff2c8e836bd5c7448f44461092934c4, type: 2}
12931258
m_BuildHeightMesh: 0
@@ -1386,7 +1351,6 @@ SceneRoots:
13861351
- {fileID: 460729962}
13871352
- {fileID: 1702380763}
13881353
- {fileID: 1556403731}
1389-
- {fileID: 422005012}
13901354
- {fileID: 117385835}
13911355
- {fileID: 538656817}
13921356
- {fileID: 496563313}

0 commit comments

Comments
 (0)