농장 - 상점

Assets/ResWork/UIPrefabs/Common/MoneyForm.prefab

@@ -250,7 +250,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 158, y: 36}
+  m_SizeDelta: {x: 215, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &-6408983573810322809
 MonoBehaviour:

Assets/ResWork/UIPrefabs/Farm/FarmShopCard.prefab

@@ -68,7 +68,7 @@ MonoBehaviour:
   m_text: "\uC544\uC774\uD15C \uC774\uB984"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2}
-  m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2}
+  m_sharedMaterial: {fileID: 2100000, guid: 6d7cd7be388f7ca40a8ad4491be308b8, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -168,7 +168,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: -78.1, y: 0}
+  m_AnchoredPosition: {x: -53.8, y: 0}
   m_SizeDelta: {x: 40, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3247830879098475964
@@ -234,17 +234,17 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 758171220068255664}
-  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: 8389777718529326263}
+  m_Father: {fileID: 7012411246163411634}
   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: 26.500002}
-  m_SizeDelta: {x: 80, y: 80}
+  m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1197656856543570465
 CanvasRenderer:
@@ -352,14 +352,15 @@ MonoBehaviour:
   m_text: "\uC77C\uC77C 00/00"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2}
-  m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2}
+  m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57,
+    type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
-    rgba: 4278190080
+    rgba: 4294967295
-  m_fontColor: {r: 0, g: 0, b: 0, a: 1}
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
   m_enableVertexGradient: 0
   m_colorMode: 3
   m_fontColorGradient:
@@ -376,8 +377,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 20
+  m_fontSize: 18
-  m_fontSizeBase: 20
+  m_fontSizeBase: 18
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 10
@@ -386,7 +387,7 @@ MonoBehaviour:
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 4096
   m_textAlignment: 65535
-  m_characterSpacing: 0
+  m_characterSpacing: -5
   m_wordSpacing: 0
   m_lineSpacing: 0
   m_lineSpacingMax: 0
@@ -418,83 +419,6 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!1 &2084708524093340871
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8389777718529326263}
-  - component: {fileID: 7239218556933018676}
-  - component: {fileID: 8481260765435106347}
-  m_Layer: 5
-  m_Name: i_grade
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &8389777718529326263
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2084708524093340871}
-  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: 2181433710599598108}
-  - {fileID: 1019104530645800989}
-  m_Father: {fileID: 7012411246163411634}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 1}
-  m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -97}
-  m_SizeDelta: {x: 90, y: 90}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &7239218556933018676
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2084708524093340871}
-  m_CullTransparentMesh: 1
---- !u!114 &8481260765435106347
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2084708524093340871}
-  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: 0
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 85d57d28c66889443bc920419dec61bc, 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 &2143249531747351078
 GameObject:
   m_ObjectHideFlags: 0
@@ -564,7 +488,7 @@ MonoBehaviour:
   m_text: "\uBB34\uB8CC"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2}
-  m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2}
+  m_sharedMaterial: {fileID: 2100000, guid: 6d7cd7be388f7ca40a8ad4491be308b8, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -588,8 +512,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 20
+  m_fontSize: 30
-  m_fontSizeBase: 20
+  m_fontSizeBase: 30
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 10
@@ -711,7 +635,7 @@ MonoBehaviour:
   m_text: "\uAD11\uACE0 or \uAC00\uACA9"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2}
-  m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2}
+  m_sharedMaterial: {fileID: 2100000, guid: 6d7cd7be388f7ca40a8ad4491be308b8, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -735,8 +659,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 20
+  m_fontSize: 30
-  m_fontSizeBase: 20
+  m_fontSizeBase: 30
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 10
@@ -835,15 +759,15 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.23137257, g: 0.09411766, b: 0.427451, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 5c8299abe57a3d74fbae741459ec31fe, type: 3}
-  m_Type: 0
+  m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -883,7 +807,8 @@ RectTransform:
   m_Children:
   - {fileID: 4810528627875093537}
   - {fileID: 2036498207220931440}
-  - {fileID: 8389777718529326263}
+  - {fileID: 2181433710599598108}
+  - {fileID: 1019104530645800989}
   - {fileID: 6838778911419873840}
   - {fileID: 5286116022750036597}
   m_Father: {fileID: 0}
@@ -891,7 +816,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -496, y: -167}
-  m_SizeDelta: {x: 250, y: 300}
+  m_SizeDelta: {x: 202, y: 247}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2409586419247657659
 MonoBehaviour:
@@ -906,7 +831,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   images:
-  - {fileID: 8481260765435106347}
+  - {fileID: 0}
   - {fileID: 4363266747789216309}
   - {fileID: 4009765633097807682}
   texts:
@@ -940,16 +865,16 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7937588612439951882}
-  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: 8389777718529326263}
+  m_Father: {fileID: 7012411246163411634}
   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: 15}
+  m_AnchoredPosition: {x: 14.3, y: 114.8}
   m_SizeDelta: {x: 150, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &252765776381145154
@@ -1007,17 +932,17 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 20
+  m_fontSize: 30
-  m_fontSizeBase: 20
+  m_fontSizeBase: 30
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 10
   m_fontSizeMax: 40
   m_fontStyle: 0
-  m_HorizontalAlignment: 2
+  m_HorizontalAlignment: 4
   m_VerticalAlignment: 4096
   m_textAlignment: 65535
-  m_characterSpacing: 0
+  m_characterSpacing: -5
   m_wordSpacing: 0
   m_lineSpacing: 0
   m_lineSpacingMax: 0
@@ -1084,8 +1009,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: 0, y: -30}
+  m_AnchoredPosition: {x: 0, y: -39.8}
-  m_SizeDelta: {x: 185.2, y: 35}
+  m_SizeDelta: {x: 130, y: 25}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1162697637986860673
 CanvasRenderer:
@@ -1115,8 +1040,8 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 5673dbd77ef9ae34db4816e6ba58101a, type: 3}
-  m_Type: 0
+  m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -1157,16 +1082,15 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 4961906994506413597}
   - {fileID: 3664101175868543539}
   - {fileID: 8006472879317656}
   - {fileID: 920520480232780503}
   m_Father: {fileID: 7012411246163411634}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
-  m_AnchorMax: {x: 1, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 30}
+  m_AnchoredPosition: {x: 0, y: 34.6}
-  m_SizeDelta: {x: 0, y: 60}
+  m_SizeDelta: {x: 175, y: 60}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3453046773052772670
 CanvasRenderer:
@@ -1196,8 +1120,8 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 3ea8fcbbe0fc3f94cbe3190c9098a48a, type: 3}
-  m_Type: 0
+  m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -1274,78 +1198,3 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!1 &9011250988363850028
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 4961906994506413597}
-  - component: {fileID: 2116128803692007420}
-  - component: {fileID: 1544736788332892756}
-  m_Layer: 5
-  m_Name: bg
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &4961906994506413597
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9011250988363850028}
-  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: 5286116022750036597}
-  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_SizeDelta: {x: 200, y: 45}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &2116128803692007420
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9011250988363850028}
-  m_CullTransparentMesh: 1
---- !u!114 &1544736788332892756
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9011250988363850028}
-  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.078431375, g: 0.054901965, b: 0.14509805, a: 1}
-  m_RaycastTarget: 0
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, 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

Assets/Script/UI/Farm/FarmShopCard.cs

@@ -5,37 +5,33 @@ using UnityEngine.UI;
 
 public class FarmShopCard : CardBase
 {
-    public Image[] images; // 0 등급, 1 아이템, 2 필요 재화
+    public Image[] images; // 0 등급(null), 1 아이템, 2 필요 재화
     public TextMeshProUGUI[] texts; // 0 아이템 이름, 1 일일 제한, 2 무료, 3 광고 or 가격, 4 지급양
 
     List<ObscuredInt> m_Data; // 0 FarmShop ID, 1 구매 횟수, 2 남은 시간
     FarmShopListTableData m_Tdata;
 
-    private void Start()
-    {
-        Set_Repeat_for1sec(Set_Time);
-    }
-
     void Set_Time()
     {
         switch (m_Tdata.e_ShopType)
         {
-            case eShopType.AD:   texts[2].text = m_Data[2] > 0 ? DSUtil.Get_TimeText_MS(m_Data[2]) : "광고(s)"; break;
+            case eShopType.AD:   texts[2].text = m_Data[2] > 0 ? DSUtil.Get_TimeText_MS(m_Data[2]) : table_localtext.Ins.Get_Text(387); break;
-            case eShopType.Free: texts[2].text = m_Data[2] > 0 ? DSUtil.Get_TimeText_MS(m_Data[2]) : "무료(s)"; break;
+            case eShopType.Free: texts[2].text = m_Data[2] > 0 ? DSUtil.Get_TimeText_MS(m_Data[2]) : table_localtext.Ins.Get_Text(433); break;
         }
     }
 
     public override void Set<T>(T _base)
     {
         base.Set(_base);
+        Set_Repeat_for1sec(Set_Time);
         m_Data = _base as List<ObscuredInt>;
         m_Tdata = table_farmshoplist.Ins.Get_Data(m_Data[0]);
         var itemData = table_itemlist.Ins.Get_Data(m_Tdata.n_ItemID);
-        images[0].sprite = itemData.Get_GradeSprite();
+        //images[0].sprite = itemData.Get_GradeSprite();
         images[1].sprite = itemData.Get_IconSprite();
         images[2].enabled = true;
         texts[0].text = table_itemlist.Ins.Get_ItemName(itemData.n_ItemID);
-        texts[1].text = $"{m_Data[1]}/{m_Tdata.n_DayLimit}";
+        texts[1].text = DSUtil.Format(392, m_Data[1], m_Tdata.n_DayLimit);
         texts[2].text = texts[3].text = "";
         texts[4].text = m_Tdata.n_ItemAmount.ToString();
 
@@ -43,11 +39,9 @@ public class FarmShopCard : CardBase
         {
             case eShopType.AD:
                 images[2].sprite = UIAtlasMgr.Ins.Get_Sprite("icon_ad");
-                texts[2].text = "광고(s)";
                 break;
             case eShopType.Free:
                 images[2].enabled = false;
-                texts[2].text = "무료(s)";
                 break;
             case eShopType.Pay:
                 images[2].sprite = table_itemlist.Ins.Get_Data(m_Tdata.n_PayItemID).Get_IconSprite();

Assets/Script/UI/Farm/FarmShopUI.cs

@@ -1,4 +1,3 @@
-using System;
 using TMPro;
 
 public class FarmShopUI : BotMenuBase
@@ -7,17 +6,15 @@ public class FarmShopUI : BotMenuBase
 
     public TextMeshProUGUI[] texts; // 0 갱신 시간
 
-    private void Start()
+    private void Start() { Ins = this; }
-    {
-        Ins = this;
-        Set_Repeat_for1sec(Set_NextTime);
-    }
 
     public override void Set()
     {
         base.Set();
+        Set_Repeat_for1sec(Set_NextTime);
         Set_ScrollView(ServerInfo.Ins.m_ServerData.Farm.Shop);
         Set_NextTime();
+        Set_Money(1, 2);
     }
 
     void Set_NextTime()

Assets/Script/UI/NewGameUI.cs

@@ -130,6 +130,7 @@ public class NewGameUI : MonoBehaviourSingletonTemplate<NewGameUI>
                     InGameInfo.Ins.Return_To_Lobby();
                 }
 
+                CloseAllFarmUI();
                 TestMapUIMgr.Ins.Set_TestBtns(false);
                 break;
 
@@ -144,8 +145,12 @@ public class NewGameUI : MonoBehaviourSingletonTemplate<NewGameUI>
     }
     public void OnClick_FarmButton(int index)
     {
-        for (int i = 0; i < FarmMenu.Length; i++)
+        CloseAllFarmUI();
-            FarmMenu[i].OnClick_Back();
         FarmMenu[index].Set();
     }
+    void CloseAllFarmUI()
+    {
+        for (int i = 0; i < FarmMenu.Length; i++)
+            FarmMenu[i].OnClick_Back();
+    }
 }