diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.CharaterCreateUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.CharaterCreateUI.prefab index 5a232d72..2cba1a18 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.CharaterCreateUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.CharaterCreateUI.prefab @@ -107,7 +107,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6630207678925732143} - m_Father: {fileID: 3104050453120761193} + m_Father: {fileID: 1284662031430669302} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -220,6 +220,59 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!1 &1262686849475514525 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1284662031430669302} + - component: {fileID: 2358292559440491175} + m_Layer: 5 + m_Name: SafeArea + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1284662031430669302 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1262686849475514525} + 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 + m_Children: + - {fileID: 1562849937918914050} + - {fileID: 1546175570349773815} + - {fileID: 6058810809619323447} + - {fileID: 8249704364040652040} + - {fileID: 898800120090628923} + m_Father: {fileID: 3104050453120761193} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2358292559440491175 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1262686849475514525} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 196728227d77b9440af7a0e6102e7a6e, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1517860949095008603 GameObject: m_ObjectHideFlags: 0 @@ -328,11 +381,7 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1562849937918914050} - - {fileID: 1546175570349773815} - - {fileID: 6058810809619323447} - - {fileID: 8249704364040652040} - - {fileID: 898800120090628923} + - {fileID: 1284662031430669302} - {fileID: 1655660795233311557} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -380,7 +429,7 @@ MonoBehaviour: m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 m_ReferenceResolution: {x: 1920, y: 1080} - m_ScreenMatchMode: 0 + m_ScreenMatchMode: 1 m_MatchWidthOrHeight: 0.5 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 @@ -710,7 +759,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 3104050453120761193} + m_Father: {fileID: 1284662031430669302} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -933,14 +982,14 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3640879789491338599} - 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 m_Children: - {fileID: 289130454474221960} - {fileID: 4370234102771175042} - m_Father: {fileID: 3104050453120761193} + m_Father: {fileID: 1284662031430669302} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2326,7 +2375,7 @@ RectTransform: m_Children: - {fileID: 1352327425356814719} - {fileID: 6450518831246390029} - m_Father: {fileID: 3104050453120761193} + m_Father: {fileID: 1284662031430669302} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2607,12 +2656,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8718471723672706869} - 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 m_Children: [] - m_Father: {fileID: 3104050453120761193} + m_Father: {fileID: 1284662031430669302} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.CharaterSelectUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.CharaterSelectUI.prefab index 3a124493..fb397798 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.CharaterSelectUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.CharaterSelectUI.prefab @@ -349,7 +349,7 @@ MonoBehaviour: m_ReferencePixelsPerUnit: 1 m_ScaleFactor: 1 m_ReferenceResolution: {x: 1920, y: 1080} - m_ScreenMatchMode: 0 + m_ScreenMatchMode: 1 m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.ControllerUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.ControllerUI.prefab index 50e8dfbc..bf768ec0 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.ControllerUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.ControllerUI.prefab @@ -1,5 +1,55 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &833251161581075210 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7503827789577383822} + - component: {fileID: 4810617682143269219} + m_Layer: 5 + m_Name: SafeArea + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7503827789577383822 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 833251161581075210} + 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 + m_Children: + - {fileID: 2676530321349970973} + - {fileID: 2166821633958283099} + m_Father: {fileID: 5417560988456393388} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &4810617682143269219 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 833251161581075210} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 196728227d77b9440af7a0e6102e7a6e, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1508238593265001016 GameObject: m_ObjectHideFlags: 0 @@ -32,8 +82,7 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 2676530321349970973} - - {fileID: 2166821633958283099} + - {fileID: 7503827789577383822} - {fileID: 4857358156532185045} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -81,7 +130,7 @@ MonoBehaviour: m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 m_ReferenceResolution: {x: 1920, y: 1080} - m_ScreenMatchMode: 0 + m_ScreenMatchMode: 1 m_MatchWidthOrHeight: 0.5 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 @@ -467,7 +516,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8296493774891888372} - 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 @@ -475,11 +524,11 @@ RectTransform: - {fileID: 8241068946626211148} - {fileID: 2009939342780089657} - {fileID: 1736755227099461833} - m_Father: {fileID: 5417560988456393388} + m_Father: {fileID: 7503827789577383822} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -80, y: 0} + m_AnchoredPosition: {x: -113, y: 60} m_SizeDelta: {x: 600, y: -500} m_Pivot: {x: 1, y: 0} --- !u!1001 &1452685402175000212 @@ -1191,7 +1240,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 5417560988456393388} + m_TransformParent: {fileID: 7503827789577383822} m_Modifications: - target: {fileID: 814810301664960626, guid: 74ca7c3222561dd4dab5958919043890, type: 3} propertyPath: snapX @@ -1259,7 +1308,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5426365777429535360, guid: 74ca7c3222561dd4dab5958919043890, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 120 objectReference: {fileID: 0} - target: {fileID: 5426365777429535360, guid: 74ca7c3222561dd4dab5958919043890, type: 3} propertyPath: m_AnchoredPosition.y diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameWinUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameWinUI.prefab index b6c51ddb..32b38c9c 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameWinUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GameWinUI.prefab @@ -770,9 +770,9 @@ RectTransform: - {fileID: 670939754479757235} m_Father: {fileID: 3933977183902288733} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 180, y: -180} m_SizeDelta: {x: 360, y: 90} m_Pivot: {x: 0.5, y: 0} --- !u!1 &1982124915072814020 @@ -1354,7 +1354,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4183783038133039772} - 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 @@ -1363,7 +1363,7 @@ RectTransform: - {fileID: 5658636051620795267} - {fileID: 3240000635064004838} - {fileID: 7654468693448300772} - m_Father: {fileID: 1781236700806201943} + m_Father: {fileID: 1237099380685609580} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1975,10 +1975,7 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 8309246643985150052} - - {fileID: 4381857254374141117} - - {fileID: 2521041396983871113} - - {fileID: 4459542549437555570} + - {fileID: 1237099380685609580} - {fileID: 8515947653153126304} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2026,7 +2023,7 @@ MonoBehaviour: m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 m_ReferenceResolution: {x: 1920, y: 1080} - m_ScreenMatchMode: 0 + m_ScreenMatchMode: 1 m_MatchWidthOrHeight: 0.5 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 @@ -2142,11 +2139,63 @@ RectTransform: - {fileID: 8161201319551105915} m_Father: {fileID: 3933977183902288733} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 180, y: 0} m_SizeDelta: {x: 360, y: 90} m_Pivot: {x: 0.5, y: 1} +--- !u!1 &7154374108166559228 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1237099380685609580} + - component: {fileID: 286885651711889290} + m_Layer: 5 + m_Name: SafeArea + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1237099380685609580 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7154374108166559228} + 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 + m_Children: + - {fileID: 8309246643985150052} + - {fileID: 4381857254374141117} + - {fileID: 2521041396983871113} + - {fileID: 4459542549437555570} + m_Father: {fileID: 1781236700806201943} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &286885651711889290 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7154374108166559228} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 196728227d77b9440af7a0e6102e7a6e, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &7281142883953491103 GameObject: m_ObjectHideFlags: 0 @@ -2950,9 +2999,9 @@ RectTransform: - {fileID: 5504165209642586413} m_Father: {fileID: 3933977183902288733} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 180, y: -270} m_SizeDelta: {x: 360, y: 90} m_Pivot: {x: 0.5, y: 0} --- !u!1001 &685096132383014060 @@ -3171,7 +3220,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1781236700806201943} + m_TransformParent: {fileID: 1237099380685609580} m_Modifications: - target: {fileID: 27539374732905338, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_AnchorMax.y @@ -3327,15 +3376,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3240794480833331071, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3240794480833331071, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3240794480833331071, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3240794480833331071, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_AnchoredPosition.x @@ -3723,7 +3772,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1781236700806201943} + m_TransformParent: {fileID: 1237099380685609580} m_Modifications: - target: {fileID: 61177833917032615, guid: 3f28b0f5c3b932d43a67aa4a7e70a1a6, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode @@ -3823,15 +3872,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7358801455686628088, guid: 3f28b0f5c3b932d43a67aa4a7e70a1a6, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7358801455686628088, guid: 3f28b0f5c3b932d43a67aa4a7e70a1a6, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7358801455686628088, guid: 3f28b0f5c3b932d43a67aa4a7e70a1a6, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7358801455686628088, guid: 3f28b0f5c3b932d43a67aa4a7e70a1a6, type: 3} propertyPath: m_AnchoredPosition.x @@ -3882,7 +3931,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1781236700806201943} + m_TransformParent: {fileID: 1237099380685609580} m_Modifications: - target: {fileID: 1793846211474527041, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3} propertyPath: m_Name @@ -3942,15 +3991,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3} propertyPath: m_AnchoredPosition.x diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GuideUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GuideUI.prefab index 32783d07..76d3b800 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GuideUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.GuideUI.prefab @@ -1,5 +1,60 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &154344918670904889 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7579035617275700098} + - component: {fileID: 5479282883424688216} + m_Layer: 5 + m_Name: SafeArea + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7579035617275700098 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 154344918670904889} + 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 + m_Children: + - {fileID: 3097688673570992477} + - {fileID: 1154145077615478065} + - {fileID: 7666862643430358464} + - {fileID: 7285378812078261580} + - {fileID: 4154765739370431544} + - {fileID: 4709593830566605936} + - {fileID: 2488605143347340164} + m_Father: {fileID: 4662312663976063282} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &5479282883424688216 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 154344918670904889} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 196728227d77b9440af7a0e6102e7a6e, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &281489421988301794 GameObject: m_ObjectHideFlags: 0 @@ -108,7 +163,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 140999776213307080} - m_Father: {fileID: 4662312663976063282} + m_Father: {fileID: 7579035617275700098} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -319,8 +374,8 @@ RectTransform: 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_AnchoredPosition: {x: 748, y: -279} - m_SizeDelta: {x: 450, y: 500} + m_AnchoredPosition: {x: 895, y: -279} + m_SizeDelta: {x: 500, y: 500} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9035777210435213379 CanvasRenderer: @@ -530,8 +585,8 @@ RectTransform: 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_AnchoredPosition: {x: 340, y: 429} - m_SizeDelta: {x: 1000, y: 200} + m_AnchoredPosition: {x: 422, y: 429} + m_SizeDelta: {x: 1200, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2301980105744695234 CanvasRenderer: @@ -757,8 +812,8 @@ RectTransform: 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_AnchoredPosition: {x: 748, y: -279} - m_SizeDelta: {x: 450, y: 500} + m_AnchoredPosition: {x: 895, y: -279} + m_SizeDelta: {x: 500, y: 500} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4553348707644200580 CanvasRenderer: @@ -906,13 +961,8 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 3097688673570992477} - - {fileID: 1154145077615478065} - - {fileID: 7666862643430358464} - - {fileID: 7285378812078261580} - - {fileID: 4154765739370431544} - - {fileID: 4709593830566605936} - - {fileID: 2488605143347340164} + - {fileID: 361944294757606513} + - {fileID: 7579035617275700098} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -959,7 +1009,7 @@ MonoBehaviour: m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 m_ReferenceResolution: {x: 1920, y: 1080} - m_ScreenMatchMode: 0 + m_ScreenMatchMode: 1 m_MatchWidthOrHeight: 0.5 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 @@ -1036,7 +1086,7 @@ RectTransform: m_Children: - {fileID: 7015110689462072891} - {fileID: 2021525202872125750} - m_Father: {fileID: 4662312663976063282} + m_Father: {fileID: 7579035617275700098} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1113,7 +1163,7 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 0} + m_TargetGraphic: {fileID: 963717526806043460} m_OnClick: m_PersistentCalls: m_Calls: @@ -1170,7 +1220,7 @@ RectTransform: m_Children: - {fileID: 2003133345354687984} - {fileID: 4834857823319477832} - m_Father: {fileID: 4662312663976063282} + m_Father: {fileID: 7579035617275700098} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1247,7 +1297,7 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 0} + m_TargetGraphic: {fileID: 367987944488472850} m_OnClick: m_PersistentCalls: m_Calls: @@ -1304,7 +1354,7 @@ RectTransform: m_Children: - {fileID: 7766098000587452911} - {fileID: 4370686740981619484} - m_Father: {fileID: 4662312663976063282} + m_Father: {fileID: 7579035617275700098} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1381,7 +1431,7 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 0} + m_TargetGraphic: {fileID: 7664682816925311728} m_OnClick: m_PersistentCalls: m_Calls: @@ -1439,8 +1489,8 @@ RectTransform: 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_AnchoredPosition: {x: -799, y: 433} - m_SizeDelta: {x: 300, y: 150} + m_AnchoredPosition: {x: -897, y: 433} + m_SizeDelta: {x: 450, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4027232126605815743 CanvasRenderer: @@ -1589,7 +1639,7 @@ RectTransform: m_Children: - {fileID: 6152264555804137426} - {fileID: 4111786694355703313} - m_Father: {fileID: 4662312663976063282} + m_Father: {fileID: 7579035617275700098} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1666,7 +1716,7 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 0} + m_TargetGraphic: {fileID: 7958031785330918982} m_OnClick: m_PersistentCalls: m_Calls: @@ -1857,7 +1907,7 @@ RectTransform: m_Children: - {fileID: 708470307998695575} - {fileID: 2340591477532463096} - m_Father: {fileID: 4662312663976063282} + m_Father: {fileID: 7579035617275700098} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1934,7 +1984,7 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 0} + m_TargetGraphic: {fileID: 2694794193259571033} m_OnClick: m_PersistentCalls: m_Calls: @@ -1991,7 +2041,7 @@ RectTransform: m_Children: - {fileID: 8659203184585030514} - {fileID: 2936137714262372977} - m_Father: {fileID: 4662312663976063282} + m_Father: {fileID: 7579035617275700098} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2068,7 +2118,7 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 0} + m_TargetGraphic: {fileID: 7505169074078896212} m_OnClick: m_PersistentCalls: m_Calls: @@ -2124,9 +2174,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 1154145077615478065} 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_AnchoredPosition: {x: -789, y: -413} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 195, y: 127} m_SizeDelta: {x: 280, y: 260} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1884286545329628857 @@ -2381,6 +2431,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6802365493986537044 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 361944294757606513} + - component: {fileID: 7523083139488984178} + - component: {fileID: 8268823553095030219} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &361944294757606513 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6802365493986537044} + 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 + m_Children: [] + m_Father: {fileID: 4662312663976063282} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 400, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7523083139488984178 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6802365493986537044} + m_CullTransparentMesh: 1 +--- !u!114 &8268823553095030219 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6802365493986537044} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + 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 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &6849435792574262435 GameObject: m_ObjectHideFlags: 0 @@ -2549,10 +2674,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 2488605143347340164} 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_AnchoredPosition: {x: 886, y: 454} - m_SizeDelta: {x: 140, y: 140} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -80, y: 454} + m_SizeDelta: {x: 160, y: 160} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8963174084205896457 CanvasRenderer: diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.InGameUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.InGameUI.prefab index d52ea0bb..fdb1edb8 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.InGameUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.InGameUI.prefab @@ -67,8 +67,8 @@ MonoBehaviour: m_Calls: [] m_text: play time 00:00 m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: b43a164f1c9ce804bab1090e60c159b4, type: 2} - m_sharedMaterial: {fileID: 2333603320826562980, guid: b43a164f1c9ce804bab1090e60c159b4, type: 2} + m_fontAsset: {fileID: 11400000, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} + m_sharedMaterial: {fileID: -5364670637895760327, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -92,8 +92,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 42 + m_fontSizeBase: 42 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -244,7 +244,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 100, y: 0} + m_AnchoredPosition: {x: 200, y: 0} m_SizeDelta: {x: 100, y: -160} m_Pivot: {x: 0, y: 0.5} --- !u!1 &1679873360829968752 @@ -431,7 +431,7 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 3954124197450694553} + - {fileID: 9203736096630988406} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -478,7 +478,7 @@ MonoBehaviour: m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 m_ReferenceResolution: {x: 1920, y: 1080} - m_ScreenMatchMode: 0 + m_ScreenMatchMode: 1 m_MatchWidthOrHeight: 0.5 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 @@ -521,6 +521,55 @@ MonoBehaviour: playTimeText: {fileID: 4621789781371979516} scoreText: {fileID: 18395332886957268} character: {fileID: 0} +--- !u!1 &2528955780315538210 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9203736096630988406} + - component: {fileID: 8245736303530354058} + m_Layer: 5 + m_Name: SafeArea + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9203736096630988406 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2528955780315538210} + 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 + m_Children: + - {fileID: 3954124197450694553} + m_Father: {fileID: 5957244545150369457} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &8245736303530354058 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2528955780315538210} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 196728227d77b9440af7a0e6102e7a6e, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2837283741072849140 GameObject: m_ObjectHideFlags: 0 @@ -687,7 +736,7 @@ RectTransform: - {fileID: 1442053628981883187} - {fileID: 8456465457182026322} - {fileID: 6121660253025211306} - m_Father: {fileID: 5957244545150369457} + m_Father: {fileID: 9203736096630988406} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -1084,8 +1133,8 @@ MonoBehaviour: m_Calls: [] m_text: 'score : 00' m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: b43a164f1c9ce804bab1090e60c159b4, type: 2} - m_sharedMaterial: {fileID: 2333603320826562980, guid: b43a164f1c9ce804bab1090e60c159b4, type: 2} + m_fontAsset: {fileID: 11400000, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} + m_sharedMaterial: {fileID: -5364670637895760327, guid: 3116464c7616674448f2fb05b50bf91b, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1109,8 +1158,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 42 + m_fontSizeBase: 42 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.LoadingUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.LoadingUI.prefab index eaabd4fb..1b698af6 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.LoadingUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.LoadingUI.prefab @@ -80,7 +80,7 @@ MonoBehaviour: m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 m_ReferenceResolution: {x: 1920, y: 1080} - m_ScreenMatchMode: 0 + m_ScreenMatchMode: 1 m_MatchWidthOrHeight: 0.5 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.LobbyUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.LobbyUI.prefab index 10efd183..a87cd545 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.LobbyUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.LobbyUI.prefab @@ -1204,7 +1204,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3748514453644374350} - m_Father: {fileID: 8757641668296036231} + m_Father: {fileID: 4760497490744360200} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -2245,18 +2245,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3111236585222825448} - 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 m_Children: - {fileID: 1868980129245571363} - {fileID: 2448940093655542050} - m_Father: {fileID: 8757641668296036231} + m_Father: {fileID: 4760497490744360200} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -100, y: -30} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 940, y: -40} m_SizeDelta: {x: 660, y: -260} m_Pivot: {x: 1, y: 0.5} --- !u!1 &3204152513616998047 @@ -2504,10 +2504,7 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 5597899927436761229} - - {fileID: 5497518096438283056} - - {fileID: 3280644615170995712} - - {fileID: 8856578722473345802} + - {fileID: 4760497490744360200} - {fileID: 4746103566376610781} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2555,7 +2552,7 @@ MonoBehaviour: m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 m_ReferenceResolution: {x: 1920, y: 1080} - m_ScreenMatchMode: 0 + m_ScreenMatchMode: 1 m_MatchWidthOrHeight: 0.5 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 @@ -2899,12 +2896,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4104720381199224404} - 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 m_Children: [] - m_Father: {fileID: 8757641668296036231} + m_Father: {fileID: 4760497490744360200} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -4133,7 +4130,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5179214324631122276} - 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 @@ -4141,11 +4138,11 @@ RectTransform: - {fileID: 6783469586413991124} - {fileID: 8006700817135627474} - {fileID: 905340339734798737} - m_Father: {fileID: 8757641668296036231} + m_Father: {fileID: 4760497490744360200} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 200, y: -30} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -840, y: -40} m_SizeDelta: {x: 910, y: -260} m_Pivot: {x: 0, y: 0.5} --- !u!1 &5311323319972475408 @@ -4741,9 +4738,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -20} + m_AnchoredPosition: {x: -150, y: -20} m_SizeDelta: {x: 150, y: -40} - m_Pivot: {x: 1, y: 0.5} + m_Pivot: {x: 0, y: 0.5} --- !u!114 &7692963846689867117 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6273,6 +6270,45 @@ RectTransform: m_AnchoredPosition: {x: -8, y: 0} m_SizeDelta: {x: -108, y: 50} m_Pivot: {x: 1, y: 0.5} +--- !u!1 &8368217112560033755 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4760497490744360200} + m_Layer: 0 + m_Name: SafeArea + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4760497490744360200 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8368217112560033755} + 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 + m_Children: + - {fileID: 5597899927436761229} + - {fileID: 5497518096438283056} + - {fileID: 3280644615170995712} + - {fileID: 8856578722473345802} + m_Father: {fileID: 8757641668296036231} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8387423531455542859 GameObject: m_ObjectHideFlags: 0 @@ -7467,7 +7503,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1252597083677857153, guid: 337e10d50a493a74f9362a255e6df564, type: 3} propertyPath: m_AnchoredPosition.x - value: 100 + value: 200 objectReference: {fileID: 0} - target: {fileID: 1252597083677857153, guid: 337e10d50a493a74f9362a255e6df564, type: 3} propertyPath: m_AnchoredPosition.y diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.OptionUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.OptionUI.prefab index 1a32906c..9b76528a 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.OptionUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.OptionUI.prefab @@ -105,7 +105,7 @@ RectTransform: m_Children: - {fileID: 7880194785073738049} - {fileID: 2309035583870530441} - m_Father: {fileID: 694752155933920904} + m_Father: {fileID: 396361505860893605} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -277,7 +277,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 625, y: -50} + m_AnchoredPosition: {x: 1025.7998, y: -50} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7587492074973768813 @@ -402,14 +402,14 @@ RectTransform: 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 + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 7220191883467986395} m_Father: {fileID: 5857252250657883994} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -350, y: -100} + m_AnchoredPosition: {x: -450, y: -100} m_SizeDelta: {x: 430, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &529327219126588155 @@ -478,7 +478,7 @@ RectTransform: 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: 0} - m_ConstrainProportionsScale: 0 + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 4950687460265832273} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -746,7 +746,7 @@ RectTransform: 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: 0} - m_ConstrainProportionsScale: 0 + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 644337214924361488} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -852,6 +852,55 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &4552896137802289065 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 396361505860893605} + - component: {fileID: 2701478672014755807} + m_Layer: 5 + m_Name: SafeArea + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &396361505860893605 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4552896137802289065} + 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 + m_Children: + - {fileID: 5857252250657883994} + m_Father: {fileID: 694752155933920904} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2701478672014755807 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4552896137802289065} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 196728227d77b9440af7a0e6102e7a6e, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &4569349810503708685 GameObject: m_ObjectHideFlags: 0 @@ -879,7 +928,7 @@ RectTransform: 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 + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 644337214924361488} - {fileID: 4950687460265832273} @@ -889,8 +938,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -80, y: 0} - m_SizeDelta: {x: -1080, y: 100} + m_AnchoredPosition: {x: -200, y: 0} + m_SizeDelta: {x: -1200, y: 100} m_Pivot: {x: 1, y: 0.5} --- !u!114 &5021670431844709229 MonoBehaviour: @@ -1025,7 +1074,7 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 5857252250657883994} + - {fileID: 396361505860893605} - {fileID: 4586318655571725426} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1073,7 +1122,7 @@ MonoBehaviour: m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 m_ReferenceResolution: {x: 1920, y: 1080} - m_ScreenMatchMode: 0 + m_ScreenMatchMode: 1 m_MatchWidthOrHeight: 0.5 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 @@ -1151,7 +1200,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 365, y: -50} + m_AnchoredPosition: {x: 765.7998, y: -50} m_SizeDelta: {x: 250, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5943371146499282711 @@ -1548,7 +1597,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 279568491784269283, guid: 7841b45ffe1a21446a4f041cdae97841, type: 3} propertyPath: m_AnchoredPosition.x - value: 800 + value: 1200.7998 objectReference: {fileID: 0} - target: {fileID: 279568491784269283, guid: 7841b45ffe1a21446a4f041cdae97841, type: 3} propertyPath: m_AnchoredPosition.y diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.PauseUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.PauseUI.prefab index 770cc9b1..5430fc02 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.PauseUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.PauseUI.prefab @@ -128,6 +128,59 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!1 &3453296452990709617 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7655990435366503312} + - component: {fileID: 1875450758366721973} + m_Layer: 5 + m_Name: SafeArea + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7655990435366503312 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3453296452990709617} + 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 + m_Children: + - {fileID: 7392833791599581562} + - {fileID: 8659056901785831664} + - {fileID: 2972897344498405378} + - {fileID: 3368458914398238061} + - {fileID: 172706481160907446} + m_Father: {fileID: 5830140097779826096} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1875450758366721973 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3453296452990709617} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 196728227d77b9440af7a0e6102e7a6e, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &4041420524911590249 GameObject: m_ObjectHideFlags: 0 @@ -153,7 +206,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4041420524911590249} - 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 @@ -161,7 +214,7 @@ RectTransform: - {fileID: 6438110724697141456} - {fileID: 1996344890731152664} - {fileID: 5193992654960055226} - m_Father: {fileID: 5830140097779826096} + m_Father: {fileID: 7655990435366503312} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -484,11 +537,7 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 7392833791599581562} - - {fileID: 8659056901785831664} - - {fileID: 2972897344498405378} - - {fileID: 3368458914398238061} - - {fileID: 172706481160907446} + - {fileID: 7655990435366503312} - {fileID: 6022035691370160664} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -536,7 +585,7 @@ MonoBehaviour: m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 m_ReferenceResolution: {x: 1920, y: 1080} - m_ScreenMatchMode: 0 + m_ScreenMatchMode: 1 m_MatchWidthOrHeight: 0.5 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 @@ -797,7 +846,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5490627752139354865, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} propertyPath: m_AnchoredPosition.x - value: 439.99997 + value: 700.3999 objectReference: {fileID: 0} - target: {fileID: 5490627752139354865, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} propertyPath: m_AnchoredPosition.y @@ -831,7 +880,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 5830140097779826096} + m_TransformParent: {fileID: 7655990435366503312} m_Modifications: - target: {fileID: 1303106263457310075, guid: c885c2fae59f7094aa3d7df1a760b720, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode @@ -907,15 +956,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3570862311249145640, guid: c885c2fae59f7094aa3d7df1a760b720, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3570862311249145640, guid: c885c2fae59f7094aa3d7df1a760b720, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3570862311249145640, guid: c885c2fae59f7094aa3d7df1a760b720, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3570862311249145640, guid: c885c2fae59f7094aa3d7df1a760b720, type: 3} propertyPath: m_AnchoredPosition.x @@ -1050,7 +1099,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3325059767138359770, guid: 0e07e566979a34647848af731786bffa, type: 3} propertyPath: m_AnchoredPosition.x - value: 146.66666 + value: 233.46663 objectReference: {fileID: 0} - target: {fileID: 3325059767138359770, guid: 0e07e566979a34647848af731786bffa, type: 3} propertyPath: m_AnchoredPosition.y @@ -1610,7 +1659,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5490627752139354865, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} propertyPath: m_AnchoredPosition.x - value: 733.33325 + value: 1167.3331 objectReference: {fileID: 0} - target: {fileID: 5490627752139354865, guid: ffb3a6e5566636947b80328e8c2b0a84, type: 3} propertyPath: m_AnchoredPosition.y @@ -1644,7 +1693,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 5830140097779826096} + m_TransformParent: {fileID: 7655990435366503312} m_Modifications: - target: {fileID: 61177833917032615, guid: 3f28b0f5c3b932d43a67aa4a7e70a1a6, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode @@ -1740,15 +1789,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7358801455686628088, guid: 3f28b0f5c3b932d43a67aa4a7e70a1a6, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7358801455686628088, guid: 3f28b0f5c3b932d43a67aa4a7e70a1a6, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7358801455686628088, guid: 3f28b0f5c3b932d43a67aa4a7e70a1a6, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7358801455686628088, guid: 3f28b0f5c3b932d43a67aa4a7e70a1a6, type: 3} propertyPath: m_AnchoredPosition.x @@ -1799,7 +1848,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 5830140097779826096} + m_TransformParent: {fileID: 7655990435366503312} m_Modifications: - target: {fileID: 27539374732905338, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_AnchorMax.y @@ -1995,15 +2044,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3240794480833331071, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3240794480833331071, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3240794480833331071, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3240794480833331071, guid: f4a016815da869a4dad6d8dc7e8aab79, type: 3} propertyPath: m_AnchoredPosition.x @@ -2273,7 +2322,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 5830140097779826096} + m_TransformParent: {fileID: 7655990435366503312} m_Modifications: - target: {fileID: 1793846211474527041, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3} propertyPath: m_Name @@ -2333,15 +2382,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7619827470732011535, guid: 087b80cc5e15a874bba75f8c15df434f, type: 3} propertyPath: m_AnchoredPosition.x diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.RankingUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.RankingUI.prefab index a1e909ac..9ad3c9cb 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.RankingUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.RankingUI.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 4733240151297030649} - component: {fileID: 4776882524516972063} - component: {fileID: 7551671613535986307} + - component: {fileID: 6853946122075172991} m_Layer: 5 m_Name: Background m_TagString: Untagged @@ -29,7 +30,10 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 7764230924738659234} + - {fileID: 7498466727035974352} + - {fileID: 3893907938536155103} m_Father: {fileID: 761104765373339944} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -75,6 +79,18 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &6853946122075172991 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 96741275943030464} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 196728227d77b9440af7a0e6102e7a6e, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &652415331442646963 GameObject: m_ObjectHideFlags: 0 @@ -227,7 +243,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &4887657808625157883 RectTransform: m_ObjectHideFlags: 0 @@ -1170,9 +1186,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4733240151297030649} - - {fileID: 7764230924738659234} - - {fileID: 7498466727035974352} - - {fileID: 3893907938536155103} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -1219,7 +1232,7 @@ MonoBehaviour: m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 m_ReferenceResolution: {x: 1920, y: 1080} - m_ScreenMatchMode: 0 + m_ScreenMatchMode: 1 m_MatchWidthOrHeight: 0.5 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 @@ -1785,13 +1798,13 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4842117009313819197} - 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 m_Children: - {fileID: 931218065942683726} - m_Father: {fileID: 761104765373339944} + m_Father: {fileID: 4733240151297030649} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -1867,7 +1880,7 @@ RectTransform: m_Children: - {fileID: 9176320134699391305} - {fileID: 9055284487169725321} - m_Father: {fileID: 761104765373339944} + m_Father: {fileID: 4733240151297030649} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} @@ -2697,7 +2710,7 @@ RectTransform: m_Children: - {fileID: 1550755645343784586} - {fileID: 2073365934641173985} - m_Father: {fileID: 761104765373339944} + m_Father: {fileID: 4733240151297030649} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -2982,7 +2995,7 @@ RectTransform: m_Father: {fileID: 7949169664028140168} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.SkillSettingUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.SkillSettingUI.prefab index a430deb7..d9e6f624 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.SkillSettingUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.SkillSettingUI.prefab @@ -154,17 +154,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 932209541466020962} - 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 m_Children: - {fileID: 7085974276930548662} - m_Father: {fileID: 8518902362947851428} + m_Father: {fileID: 2411556885994749898} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 80} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -460} m_SizeDelta: {x: 300, y: 100} m_Pivot: {x: 0.5, y: 0} --- !u!222 &4039956453003213137 @@ -273,6 +273,56 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!1 &1027427006481090975 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2411556885994749898} + - component: {fileID: 8839841069404512034} + m_Layer: 5 + m_Name: SafeArea + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2411556885994749898 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1027427006481090975} + 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 + m_Children: + - {fileID: 7618211337660530387} + - {fileID: 1313160516565209799} + m_Father: {fileID: 8518902362947851428} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &8839841069404512034 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1027427006481090975} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 196728227d77b9440af7a0e6102e7a6e, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1254259714894380562 GameObject: m_ObjectHideFlags: 0 @@ -692,8 +742,7 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 7618211337660530387} - - {fileID: 1313160516565209799} + - {fileID: 2411556885994749898} - {fileID: 3384139042876835637} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -741,7 +790,7 @@ MonoBehaviour: m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 m_ReferenceResolution: {x: 1920, y: 1080} - m_ScreenMatchMode: 0 + m_ScreenMatchMode: 1 m_MatchWidthOrHeight: 0.5 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 @@ -1162,7 +1211,7 @@ MonoBehaviour: m_HandleRect: {fileID: 502097972041828455} m_Direction: 2 m_Value: 0 - m_Size: 0.99847275 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -1192,7 +1241,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6464222557162890127} - 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 @@ -1200,12 +1249,12 @@ RectTransform: - {fileID: 8234641265010181104} - {fileID: 1410040467359975213} - {fileID: 8687837182751153917} - m_Father: {fileID: 8518902362947851428} + m_Father: {fileID: 2411556885994749898} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 5} - m_SizeDelta: {x: 600, y: -410} + m_SizeDelta: {x: 600, y: 670} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5231728675424541061 CanvasRenderer: @@ -1278,7 +1327,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0.00018692666} + m_AnchoredPosition: {x: 0, y: 0.00026580493} m_SizeDelta: {x: 555, y: 200} m_Pivot: {x: 0, y: 1} --- !u!1001 &273107853452891176 diff --git a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.TitleUI.prefab b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.TitleUI.prefab index 0f144419..0c7a2987 100644 --- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.TitleUI.prefab +++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.TitleUI.prefab @@ -155,7 +155,7 @@ MonoBehaviour: m_ReferencePixelsPerUnit: 1 m_ScaleFactor: 1 m_ReferenceResolution: {x: 1920, y: 1080} - m_ScreenMatchMode: 0 + m_ScreenMatchMode: 1 m_MatchWidthOrHeight: 0.5 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 @@ -468,8 +468,9 @@ GameObject: m_Component: - component: {fileID: 7114312418154409345} - component: {fileID: 7128498400607546024} + - component: {fileID: 991028331682109507} m_Layer: 5 - m_Name: Backgroud + m_Name: SafeArea m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -504,6 +505,18 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4342843922256902920} m_CullTransparentMesh: 1 +--- !u!114 &991028331682109507 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4342843922256902920} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 196728227d77b9440af7a0e6102e7a6e, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &6371053127936218335 GameObject: m_ObjectHideFlags: 0 diff --git a/Gameton-06/Assets/Gameton/Scenes/Lobby.unity b/Gameton-06/Assets/Gameton/Scenes/Lobby.unity index ed051ac4..7e69782a 100644 --- a/Gameton-06/Assets/Gameton/Scenes/Lobby.unity +++ b/Gameton-06/Assets/Gameton/Scenes/Lobby.unity @@ -133,6 +133,7 @@ GameObject: - component: {fileID: 568366737} - component: {fileID: 568366736} - component: {fileID: 568366735} + - component: {fileID: 568366738} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -158,7 +159,7 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -182,7 +183,7 @@ Camera: near clip plane: 0.3 far clip plane: 1000 field of view: 60 - orthographic: 1 + orthographic: 0 orthographic size: 5 m_Depth: -1 m_CullingMask: @@ -214,6 +215,18 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &568366738 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 568366734} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eadc9322e4859cf439f92413ff4636d9, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &693928583 GameObject: m_ObjectHideFlags: 0 diff --git a/Gameton-06/Assets/Gameton/Scenes/Stage 4.unity b/Gameton-06/Assets/Gameton/Scenes/Stage 4.unity index 53ec2cac..b9f666ac 100644 --- a/Gameton-06/Assets/Gameton/Scenes/Stage 4.unity +++ b/Gameton-06/Assets/Gameton/Scenes/Stage 4.unity @@ -20112,7 +20112,7 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 2 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -20136,7 +20136,7 @@ Camera: near clip plane: 0.3 far clip plane: 1000 field of view: 60 - orthographic: 1 + orthographic: 0 orthographic size: 6 m_Depth: -1 m_CullingMask: @@ -20162,7 +20162,7 @@ Transform: m_GameObject: {fileID: 1185367601} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.7236786, y: -1.5159683, z: -10.076585} + m_LocalPosition: {x: -0.7200012, y: -2.3600006, z: -10.076585} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: diff --git a/Gameton-06/Assets/Gameton/Scenes/Title.unity b/Gameton-06/Assets/Gameton/Scenes/Title.unity index 5724a246..25c8e417 100644 --- a/Gameton-06/Assets/Gameton/Scenes/Title.unity +++ b/Gameton-06/Assets/Gameton/Scenes/Title.unity @@ -133,6 +133,7 @@ GameObject: - component: {fileID: 1728598203} - component: {fileID: 1728598202} - component: {fileID: 1728598201} + - component: {fileID: 1728598204} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -158,7 +159,7 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -182,7 +183,7 @@ Camera: near clip plane: 0.3 far clip plane: 1000 field of view: 60 - orthographic: 1 + orthographic: 0 orthographic size: 540 m_Depth: 0 m_CullingMask: @@ -214,6 +215,18 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1728598204 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1728598200} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eadc9322e4859cf439f92413ff4636d9, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Gameton-06/Assets/Gameton/Scripts/Camera/CameraResolution.cs b/Gameton-06/Assets/Gameton/Scripts/Camera/CameraResolution.cs new file mode 100644 index 00000000..d88da0d3 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/Camera/CameraResolution.cs @@ -0,0 +1,37 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace TON +{ + public class CameraResolution : MonoBehaviour + { + private void Start() + { + SetResolution(); // 초기에 게임 해상도 고정 + } + + /* 해상도 설정하는 함수 */ + public void SetResolution() + { + int setWidth = 1920; // 사용자 설정 너비 + int setHeight = 1080; // 사용자 설정 높이 + + int deviceWidth = Screen.width; // 기기 너비 저장 + int deviceHeight = Screen.height; // 기기 높이 저장 + + Screen.SetResolution(setWidth, (int)(((float)deviceHeight / deviceWidth) * setWidth), true); // SetResolution 함수 제대로 사용하기 + + if ((float)setWidth / setHeight < (float)deviceWidth / deviceHeight) // 기기의 해상도 비가 더 큰 경우 + { + float newWidth = ((float)setWidth / setHeight) / ((float)deviceWidth / deviceHeight); // 새로운 너비 + Camera.main.rect = new Rect((1f - newWidth) / 2f, 0f, newWidth, 1f); // 새로운 Rect 적용 + } + else // 게임의 해상도 비가 더 큰 경우 + { + float newHeight = ((float)deviceWidth / deviceHeight) / ((float)setWidth / setHeight); // 새로운 높이 + Camera.main.rect = new Rect(0f, (1f - newHeight) / 2f, 1f, newHeight); // 새로운 Rect 적용 + } + } + } +} diff --git a/Gameton-06/Assets/Gameton/Scripts/Camera/CameraResolution.cs.meta b/Gameton-06/Assets/Gameton/Scripts/Camera/CameraResolution.cs.meta new file mode 100644 index 00000000..0bf4ee24 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/Camera/CameraResolution.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: eadc9322e4859cf439f92413ff4636d9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Scripts/Common/RectHelper.cs b/Gameton-06/Assets/Gameton/Scripts/Common/RectHelper.cs new file mode 100644 index 00000000..0fc48df7 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/Common/RectHelper.cs @@ -0,0 +1,32 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace TON +{ + public class RectHelper : MonoBehaviour + { + Vector2 minAnchor; + Vector2 maxAnchor; + + + private void Start() + { + var Myrect = this.GetComponent(); + + minAnchor = Screen.safeArea.min; + maxAnchor = Screen.safeArea.max; + + minAnchor.x /= Screen.width; + minAnchor.y /= Screen.height; + + maxAnchor.x /= Screen.width; + maxAnchor.y /= Screen.height; + + + Myrect.anchorMin = minAnchor; + Myrect.anchorMax = maxAnchor; + + } + } +} diff --git a/Gameton-06/Assets/Gameton/Scripts/Common/RectHelper.cs.meta b/Gameton-06/Assets/Gameton/Scripts/Common/RectHelper.cs.meta new file mode 100644 index 00000000..eac11258 --- /dev/null +++ b/Gameton-06/Assets/Gameton/Scripts/Common/RectHelper.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 196728227d77b9440af7a0e6102e7a6e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/GuideUI.cs b/Gameton-06/Assets/Gameton/Scripts/UI/GuideUI.cs index 6cdd429b..dc318b36 100644 --- a/Gameton-06/Assets/Gameton/Scripts/UI/GuideUI.cs +++ b/Gameton-06/Assets/Gameton/Scripts/UI/GuideUI.cs @@ -38,7 +38,7 @@ namespace TON if (index == guideList.Count - 1) { UIManager.Hide(UIList.GuideUI); - + UIManager.Show(UIList.LobbyUI); return; } diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/LobbyUI.cs b/Gameton-06/Assets/Gameton/Scripts/UI/LobbyUI.cs index 8942b1ab..9bb3d2bf 100644 --- a/Gameton-06/Assets/Gameton/Scripts/UI/LobbyUI.cs +++ b/Gameton-06/Assets/Gameton/Scripts/UI/LobbyUI.cs @@ -145,6 +145,7 @@ namespace TON public void OnClickGuideButton() { UIManager.Show(UIList.GuideUI); + UIManager.Hide(UIList.LobbyUI); } } }