Merge pull request #87 from 2024FALL-SWPP/feature/startloadscene

chore: start load scene, radial change
2024FALL-SWPP · Dec 17, 2024 · e2870bf · e2870bf
2 parents 3737f80 + b1382dc
commit e2870bf
Show file tree

Hide file tree

Showing 9 changed files with 527 additions and 12 deletions.
diff --git a/Assets/SWPPT3/Prefabs/ManagerObject/GameManager.prefab b/Assets/SWPPT3/Prefabs/ManagerObject/GameManager.prefab
@@ -9,7 +9,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 6404462614507032101}
-  - component: {fileID: 6404462614507032100}
+  - component: {fileID: 8718208846313316995}
   m_Layer: 0
   m_Name: GameManager
   m_TagString: Untagged
@@ -25,14 +25,14 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6404462614507032103}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 411.38785, y: 231.10301, z: 0.17117564}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &6404462614507032100
+--- !u!114 &8718208846313316995
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -44,4 +44,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 98767ffb1155413dbb0d3f67fd4f2848, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  stageNumber: 1
+  _stageManager: {fileID: 0}
+  _onTryingLoadStatusChanged:
+    m_PersistentCalls:
+      m_Calls: []
diff --git a/Assets/SWPPT3/Prefabs/UI/Overlay/StartScreen.prefab b/Assets/SWPPT3/Prefabs/UI/Overlay/StartScreen.prefab
@@ -33,10 +33,10 @@ RectTransform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &4594056759085863215
 GameObject:
@@ -100,7 +100,7 @@ MonoBehaviour:
   m_Color: {r: 0, g: 0, b: 0, a: 0.9411765}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
+  m_Maskable: 0
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []

diff --git a/Assets/SWPPT3/Prefabs/UI/Screen/InGame.prefab b/Assets/SWPPT3/Prefabs/UI/Screen/InGame.prefab
@@ -2755,7 +2755,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3061622423582226959}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -2867,6 +2867,9 @@ MonoBehaviour:
   _metalNumTmp: {fileID: 2895323979621877206}
   _rubberNumTmp: {fileID: 818430995981542076}
   _radialUI: {fileID: 8488859834885466518}
+  _rubberButton: {fileID: 8488859835809235302}
+  _metalButton: {fileID: 8488859835077312272}
+  _slimeButton: {fileID: 8488859835786804939}
 --- !u!1 &4169080372856693958
 GameObject:
   m_ObjectHideFlags: 0