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 5efb1854..e2683460 100644
--- a/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.LobbyUI.prefab
+++ b/Gameton-06/Assets/Gameton/Resources/UI/Prefabs/UI.LobbyUI.prefab
@@ -10,7 +10,6 @@ GameObject:
m_Component:
- component: {fileID: 4396814966004432854}
- component: {fileID: 875996541910703982}
- - component: {fileID: 8033364398708779381}
m_Layer: 5
m_Name: Right
m_TagString: Untagged
@@ -36,8 +35,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: -150, y: 45}
- m_SizeDelta: {x: 280, y: -250}
+ m_AnchoredPosition: {x: -150, y: 0}
+ m_SizeDelta: {x: 280, y: -20}
m_Pivot: {x: 1, y: 0.5}
--- !u!222 &875996541910703982
CanvasRenderer:
@@ -47,32 +46,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 90168084561850146}
m_CullTransparentMesh: 1
---- !u!114 &8033364398708779381
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 90168084561850146}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Padding:
- m_Left: 0
- m_Right: 0
- m_Top: 0
- m_Bottom: 0
- m_ChildAlignment: 4
- m_Spacing: 0
- m_ChildForceExpandWidth: 1
- m_ChildForceExpandHeight: 1
- m_ChildControlWidth: 0
- m_ChildControlHeight: 0
- m_ChildScaleWidth: 0
- m_ChildScaleHeight: 0
- m_ReverseArrangement: 0
--- !u!1 &123278881285011709
GameObject:
m_ObjectHideFlags: 0
@@ -263,7 +236,6 @@ GameObject:
m_Component:
- component: {fileID: 8486289532789286686}
- component: {fileID: 3205632392889539198}
- - component: {fileID: 4639735270031539645}
m_Layer: 5
m_Name: HP
m_TagString: Untagged
@@ -301,20 +273,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 446340643863793218}
m_CullTransparentMesh: 1
---- !u!114 &4639735270031539645
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 446340643863793218}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- radius: 10
- image: {fileID: 0}
--- !u!1 &506978226179480332
GameObject:
m_ObjectHideFlags: 0
@@ -424,7 +382,7 @@ 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: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: -25}
m_SizeDelta: {x: 200, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6314180770579036321
@@ -539,7 +497,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &1747380112094165964
RectTransform:
m_ObjectHideFlags: 0
@@ -1034,6 +992,81 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 200}
m_Pivot: {x: 0.5, y: 1}
+--- !u!1 &1673668481387177829
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4392553059139651691}
+ - component: {fileID: 117973276575402247}
+ - component: {fileID: 842433910380999221}
+ m_Layer: 5
+ m_Name: icon
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4392553059139651691
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1673668481387177829}
+ 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: 4704085106301035772}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0.5}
+ m_AnchorMax: {x: 0, y: 0.5}
+ m_AnchoredPosition: {x: 180, y: 0}
+ m_SizeDelta: {x: 80, y: 80}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &117973276575402247
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1673668481387177829}
+ m_CullTransparentMesh: 1
+--- !u!114 &842433910380999221
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1673668481387177829}
+ 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: 1, g: 1, b: 1, 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: 21300000, guid: 0613e308ac5b6ee4dbfbfe56592596af, type: 3}
+ 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 &1749750757137415591
GameObject:
m_ObjectHideFlags: 0
@@ -1390,7 +1423,7 @@ 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: 0, y: -115}
+ m_AnchoredPosition: {x: 0, y: -105}
m_SizeDelta: {x: 180, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6102782865721960545
@@ -1414,7 +1447,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 0.8313726, b: 0.45098042, a: 1}
+ m_Color: {r: 0.70980394, g: 0.5411765, b: 0.38823533, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -1730,9 +1763,9 @@ 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: -272, y: 45}
- m_SizeDelta: {x: 250, y: 310}
- m_Pivot: {x: 0, y: 0.5}
+ m_AnchoredPosition: {x: 10, y: 0}
+ m_SizeDelta: {x: 306.63, y: 403.62}
+ m_Pivot: {x: 1, y: 0.5}
--- !u!222 &8647164516175995316
CanvasRenderer:
m_ObjectHideFlags: 0
@@ -1761,7 +1794,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 24e416a6bcaf5064697f013a21cadded, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 677f09f022278c5458d1bb66ec302da3, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -1933,6 +1966,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
+ - {fileID: 995615796704875938}
- {fileID: 4588716762380020347}
m_Father: {fileID: 8610968509371172117}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2102,7 +2136,6 @@ GameObject:
m_Component:
- component: {fileID: 2269700562774354752}
- component: {fileID: 1381076838473207511}
- - component: {fileID: 3303135116122027320}
m_Layer: 5
m_Name: ATK
m_TagString: Untagged
@@ -2140,20 +2173,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4195376402818810911}
m_CullTransparentMesh: 1
---- !u!114 &3303135116122027320
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 4195376402818810911}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- radius: 10
- image: {fileID: 0}
--- !u!1 &4314740411726438189
GameObject:
m_ObjectHideFlags: 0
@@ -2169,7 +2188,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &3460732519249728995
RectTransform:
m_ObjectHideFlags: 0
@@ -2501,11 +2520,12 @@ RectTransform:
m_Children:
- {fileID: 6783469586413991124}
- {fileID: 8006700817135627474}
+ - {fileID: 905340339734798737}
m_Father: {fileID: 8757641668296036231}
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: -30}
+ m_AnchoredPosition: {x: 200, y: -30}
m_SizeDelta: {x: 880, y: -260}
m_Pivot: {x: 0, y: 0.5}
--- !u!1 &5311323319972475408
@@ -2574,7 +2594,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 65b1d186d72869c4f8a74b2b279c03f8, type: 3}
+ m_Sprite: {fileID: 21300000, guid: f8f7024705b0e264db0fab26ac3cde48, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -2636,10 +2656,10 @@ RectTransform:
- {fileID: 2578576541202882733}
m_Father: {fileID: 4396814966004432854}
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_SizeDelta: {x: 250, y: 190}
+ m_AnchorMin: {x: 0.5, y: 1}
+ m_AnchorMax: {x: 0.5, y: 1}
+ m_AnchoredPosition: {x: 10, y: -20}
+ m_SizeDelta: {x: 250, y: 280}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &3707917845820440675
CanvasRenderer:
@@ -2669,7 +2689,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: 24e416a6bcaf5064697f013a21cadded, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 677f09f022278c5458d1bb66ec302da3, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -2855,7 +2875,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &6837691456964567253
RectTransform:
m_ObjectHideFlags: 0
@@ -2991,7 +3011,6 @@ GameObject:
m_Component:
- component: {fileID: 24308890334000206}
- component: {fileID: 2524991457390944208}
- - component: {fileID: 118934627132806610}
m_Layer: 5
m_Name: MP
m_TagString: Untagged
@@ -3029,20 +3048,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5489683189456517259}
m_CullTransparentMesh: 1
---- !u!114 &118934627132806610
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5489683189456517259}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- radius: 10
- image: {fileID: 0}
--- !u!1 &5615363954043977231
GameObject:
m_ObjectHideFlags: 0
@@ -3079,6 +3084,41 @@ RectTransform:
m_AnchoredPosition: {x: -10, y: 0}
m_SizeDelta: {x: 80, y: 50}
m_Pivot: {x: 1, y: 0.5}
+--- !u!1 &5818397182128397121
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 905340339734798737}
+ m_Layer: 5
+ m_Name: Button Area
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &905340339734798737
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5818397182128397121}
+ 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: 3280644615170995712}
+ 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: 0}
+ m_SizeDelta: {x: 150, y: 0}
+ m_Pivot: {x: 1, y: 0.5}
--- !u!1 &5884465832663805409
GameObject:
m_ObjectHideFlags: 0
@@ -3258,7 +3298,6 @@ GameObject:
m_Component:
- component: {fileID: 2578576541202882733}
- component: {fileID: 414510666730145329}
- - component: {fileID: 1431447044492994500}
m_Layer: 5
m_Name: CRI
m_TagString: Untagged
@@ -3296,20 +3335,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6175427827498168689}
m_CullTransparentMesh: 1
---- !u!114 &1431447044492994500
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6175427827498168689}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- radius: 10
- image: {fileID: 0}
--- !u!1 &6345784611267699658
GameObject:
m_ObjectHideFlags: 0
@@ -3395,7 +3420,6 @@ GameObject:
m_Component:
- component: {fileID: 881931461087672791}
- component: {fileID: 5384340082872944477}
- - component: {fileID: 389189257985782415}
m_Layer: 5
m_Name: DEF
m_TagString: Untagged
@@ -3433,20 +3457,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6707303380091965083}
m_CullTransparentMesh: 1
---- !u!114 &389189257985782415
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6707303380091965083}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- radius: 10
- image: {fileID: 0}
--- !u!1 &6962303744627252444
GameObject:
m_ObjectHideFlags: 0
@@ -3514,6 +3524,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
+ - {fileID: 4392553059139651691}
- {fileID: 7131723136883866220}
m_Father: {fileID: 8006700817135627474}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -4259,8 +4270,8 @@ RectTransform:
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: -50}
- m_SizeDelta: {x: 0, y: -100}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: -200}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &8603232855419168940
GameObject:
@@ -4564,8 +4575,8 @@ RectTransform:
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_AnchoredPosition: {x: 25, y: 0}
+ m_SizeDelta: {x: -50, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5027177474193206859
CanvasRenderer:
@@ -4604,8 +4615,8 @@ MonoBehaviour:
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
- rgba: 4294967295
- m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+ rgba: 4289122280
+ m_fontColor: {r: 0.909804, g: 0.8117648, b: 0.6509804, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@@ -4698,7 +4709,7 @@ 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: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 20}
m_SizeDelta: {x: 140, y: 140}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8662237665644818968
@@ -5118,6 +5129,249 @@ RectTransform:
m_AnchoredPosition: {x: -97, y: 0}
m_SizeDelta: {x: 40, y: 50}
m_Pivot: {x: 1, y: 0.5}
+--- !u!1001 &161798631964487125
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 4696811377547952634}
+ m_Modifications:
+ - target: {fileID: 1077768852921302574, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_SizeDelta.x
+ value: -200
+ objectReference: {fileID: 0}
+ - target: {fileID: 1077768852921302574, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1148402191174711415, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_Pivot.x
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 1148402191174711415, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_Pivot.y
+ value: 0.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 1148402191174711415, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1148402191174711415, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1148402191174711415, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1148402191174711415, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1148402191174711415, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 660
+ objectReference: {fileID: 0}
+ - target: {fileID: 1148402191174711415, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 800
+ objectReference: {fileID: 0}
+ - target: {fileID: 1148402191174711415, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1148402191174711415, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1148402191174711415, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1148402191174711415, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1148402191174711415, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1148402191174711415, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1148402191174711415, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1148402191174711415, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1148402191174711415, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1148402191174711415, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1148402191174711415, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1148402191174711415, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1244312209180289180, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1556631089071821170, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2273889548321886483, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_Sprite
+ value:
+ objectReference: {fileID: 21300000, guid: e2afc659a6ca2fd489b53572802a9fff, type: 3}
+ - target: {fileID: 2273889548321886700, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_TargetGraphic
+ value:
+ objectReference: {fileID: 0}
+ - target: {fileID: 2273889548321886700, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_SpriteState.m_PressedSprite
+ value:
+ objectReference: {fileID: 21300000, guid: 9d26634aa9a787046bfe9cc554478b39, type: 3}
+ - target: {fileID: 2273889548321886700, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_SpriteState.m_DisabledSprite
+ value:
+ objectReference: {fileID: 21300000, guid: e2afc659a6ca2fd489b53572802a9fff, type: 3}
+ - target: {fileID: 2273889548321886700, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_SpriteState.m_SelectedSprite
+ value:
+ objectReference: {fileID: 21300000, guid: e2afc659a6ca2fd489b53572802a9fff, type: 3}
+ - target: {fileID: 2273889548321886700, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_SpriteState.m_HighlightedSprite
+ value:
+ objectReference: {fileID: 21300000, guid: e2afc659a6ca2fd489b53572802a9fff, type: 3}
+ - target: {fileID: 2273889548321886700, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+ value:
+ objectReference: {fileID: 1707601040220393083}
+ - target: {fileID: 2273889548321886702, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 250
+ objectReference: {fileID: 0}
+ - target: {fileID: 2273889548321886702, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 80
+ objectReference: {fileID: 0}
+ - target: {fileID: 2664070523333872795, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3703304680486478202, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_Name
+ value: StagePage_new
+ objectReference: {fileID: 0}
+ - target: {fileID: 4867166665481618711, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_Sprite
+ value:
+ objectReference: {fileID: 21300000, guid: b085a77e5bc6af745a0c8554e6aece80, type: 3}
+ - target: {fileID: 4867166665481618711, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_Color.b
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4867166665481618711, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_Color.g
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4867166665481618711, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_Color.r
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5024229360136497342, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_Sprite
+ value:
+ objectReference: {fileID: 21300000, guid: 677f09f022278c5458d1bb66ec302da3, type: 3}
+ - target: {fileID: 5024229360136497342, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_Color.a
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5024229360136497342, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_Color.b
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5024229360136497342, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_Color.g
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5024229360136497342, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_Color.r
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5445582895900415478, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_Sprite
+ value:
+ objectReference: {fileID: 21300000, guid: cf34cd8b424dc5c47998854c17dd38bc, type: 3}
+ - target: {fileID: 5563710392318594705, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_text
+ value: Stage
+ objectReference: {fileID: 0}
+ - target: {fileID: 5563710392318594705, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_fontStyle
+ value: 17
+ objectReference: {fileID: 0}
+ - target: {fileID: 6293878479587871109, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6293878479587871109, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6293878479587871109, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6293878479587871109, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6293878479587871109, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: -100
+ objectReference: {fileID: 0}
+ - target: {fileID: 6357892206167044803, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_SizeDelta.y
+ value: -100
+ objectReference: {fileID: 0}
+ - target: {fileID: 6357892206167044803, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7881644893557345821, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+ value:
+ objectReference: {fileID: 1707601040220393083}
+ - target: {fileID: 8481812916655228936, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects:
+ - {fileID: 6168401667605346058, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ m_AddedGameObjects: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+--- !u!224 &995615796704875938 stripped
+RectTransform:
+ m_CorrespondingSourceObject: {fileID: 1148402191174711415, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ m_PrefabInstance: {fileID: 161798631964487125}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &2695255263361688783
PrefabInstance:
m_ObjectHideFlags: 0
@@ -5392,6 +5646,10 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 2273889548321886700, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+ value:
+ objectReference: {fileID: 1707601040220393083}
- target: {fileID: 2273889548321886700, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
value: 2
@@ -5420,6 +5678,10 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 7881644893557345821, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+ value:
+ objectReference: {fileID: 1707601040220393083}
- target: {fileID: 9027789193876814119, guid: 37b882a126f0daf42a4b4a0f0f261a17, type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
@@ -5481,7 +5743,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4080852878387782616, guid: b7c158541d0b9af44be175bf0c087157, type: 3}
propertyPath: m_AnchorMax.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 4080852878387782616, guid: b7c158541d0b9af44be175bf0c087157, type: 3}
propertyPath: m_AnchorMin.x
@@ -5489,7 +5751,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4080852878387782616, guid: b7c158541d0b9af44be175bf0c087157, type: 3}
propertyPath: m_AnchorMin.y
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 4080852878387782616, guid: b7c158541d0b9af44be175bf0c087157, type: 3}
propertyPath: m_SizeDelta.x
@@ -5529,11 +5791,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4080852878387782616, guid: b7c158541d0b9af44be175bf0c087157, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 0
+ value: 140
objectReference: {fileID: 0}
- target: {fileID: 4080852878387782616, guid: b7c158541d0b9af44be175bf0c087157, type: 3}
propertyPath: m_AnchoredPosition.y
- value: 0
+ value: -371.96744
objectReference: {fileID: 0}
- target: {fileID: 4080852878387782616, guid: b7c158541d0b9af44be175bf0c087157, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/LobbyUI.cs b/Gameton-06/Assets/Gameton/Scripts/UI/LobbyUI.cs
index 35424f4d..a32350f4 100644
--- a/Gameton-06/Assets/Gameton/Scripts/UI/LobbyUI.cs
+++ b/Gameton-06/Assets/Gameton/Scripts/UI/LobbyUI.cs
@@ -32,7 +32,7 @@ namespace TON
private void Start()
{
SetCharacterData();
- SetStageData();
+ // SetStageData();
}
private void SetCharacterData()
@@ -50,6 +50,9 @@ namespace TON
characterCritical.text = $"{player.critical}";
}
+ ///
+ /// 스테이지를 1개로 변경하여 해당 메소드 사용하지 않음
+ ///
private void SetStageData()
{
if (stagePages.Count > 0)
@@ -68,14 +71,14 @@ namespace TON
GameObject stagePageObject = Instantiate(stagePagePrefab, stagePageGroup);
LobbyUI_StagePage stagePage = stagePageObject.GetComponent();
stagePageObject.SetActive(true);
- stagePage.Initalize(stageId, i);
+ // stagePage.Initalize(stageId, i);
stagePages.Add(stagePage);
}
}
public void OnClickChangeStageButton()
{
- // TODO: 스테이지 입장 popupUI 비활성화
+ // 스테이지 입장 popupUI 비활성화
stagePages.ForEach(page => page.GetComponent().OnClickStageChangeButton());
}
@@ -85,7 +88,8 @@ namespace TON
GameObject currentSelectedGameObject = EventSystem.current.currentSelectedGameObject;
LobbyUI_StagePage lobbyUI_StagePage = currentSelectedGameObject.GetComponentInParent();
- PlayerPrefs.SetString("StageId", lobbyUI_StagePage.stageId);
+ // 강제로 스테이지 4맵을 사용하도록 적용
+ PlayerPrefs.SetString("StageId", "STG004");
lobbyUI_StagePage.OnClickStageButton();
}
diff --git a/Gameton-06/Assets/Gameton/Scripts/UI/LobbyUI_StagePage.cs b/Gameton-06/Assets/Gameton/Scripts/UI/LobbyUI_StagePage.cs
index a49c7632..cc376a53 100644
--- a/Gameton-06/Assets/Gameton/Scripts/UI/LobbyUI_StagePage.cs
+++ b/Gameton-06/Assets/Gameton/Scripts/UI/LobbyUI_StagePage.cs
@@ -11,7 +11,7 @@ namespace TON
public class LobbyUI_StagePage : MonoBehaviour
{
public Button stageEntryButton;
- public TextMeshProUGUI stageTitle;
+ // public TextMeshProUGUI stageTitle;
public GameObject stageImage;
public Transform starGroup;
public StageStar starPrefab;
@@ -24,7 +24,7 @@ namespace TON
public string stageId;
private SerializableDictionary bestStageClearDict = new SerializableDictionary();
- public void Initalize(string stageId, int index)
+ public void Initalize(string stageId)
{
this.stageId = stageId;
@@ -38,10 +38,13 @@ namespace TON
stageClearData = bestStageClearDict.GetValueOrDefault(stageId, null);
SetStageImage();
- SetStageEntryInfo(index);
- stageTitle.text = $"stage {index + 1}";
+ // SetStageEntryInfo(index);
+ // stageTitle.text = $"stage {index + 1}";
}
+ ///
+ /// 스테이지 1개 축소 및 게임 장르 변경으로 아래 메소드 사용하지 않음음
+ ///
private void SetStageEntryInfo(int index)
{
if (stageClearData != null)