养护状态

FGUIProject/assets/ClothingFoster/components/ListFosterItem.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="42,42">
-  <controller name="finish" pages="1,未开始,2,进行中,3,已完成" selected="2"/>
+  <controller name="finish" pages="1,已完成,2,进行中,3,未开始" selected="0"/>
   <displayList>
     <image id="n3_py5g" name="n3" src="py5g3" fileName="images/tujian_xzdg.png" xy="0,0">
-      <gearDisplay controller="finish" pages="3"/>
+      <gearDisplay controller="finish" pages="1"/>
     </image>
-    <image id="n4_py5g" name="n4" src="py5g4" fileName="images/tujian_xzdg_1.png" xy="0,0">
+    <image id="n4_py5g" name="n4" src="py5g6" fileName="images/tujian_zkanniu.png" xy="0,-5">
       <gearDisplay controller="finish" pages="2"/>
     </image>
     <image id="n5_py5g" name="n5" src="py5g4" fileName="images/tujian_xzdg_1.png" xy="0,0">
-      <gearDisplay controller="finish" pages="1"/>
+      <gearDisplay controller="finish" pages="3"/>
     </image>
   </displayList>
 </component>

GameClient/Assets/Game/HotUpdate/Data/SuitFosterDatamanager.cs

@@ -7,7 +7,7 @@ namespace GFGGame
 {
     public class SuitFosterDataManager : SingletonBase<SuitFosterDataManager>
     {
-
+        public string[] stepNames = { "浆洗", "晾晒", "熏香", "熨烫", "整饬" };
         private Dictionary<int, SuitFosterData> _suitInfoBySuitIdDic = new Dictionary<int, SuitFosterData>();
 
         public void InitData()
@@ -111,19 +111,20 @@ namespace GFGGame
             return propertyData;
         }
 
-        //0：未养护，1：养护中，2未养护
+        //0：已完成，1：养护中，2未养护
         public int GetFosterState(int suitId, int index)
         {
             SuitFosterData suitFosterData = this.GetSuitFosterData(suitId);
-            if (suitFosterData.maintainStep == index)
+            if (index < suitFosterData.maintainStep)
             {
-                return 1;
+                return 0;
             }
-            else if (suitFosterData.maintainStep < index)
+            else if (index == suitFosterData.maintainStep)
             {
-                return 2;
+                return 1;
             }
-            return 0;
+
+            return 2;
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/SuitRewardView.cs

@@ -6,7 +6,6 @@ namespace GFGGame
     {
         private UI_SuitRewardUI _ui;
         private int _suitId;
-        private string[] stageNames = { "浆洗", "晾晒", "熏香", "熨烫", "整饬" };
 
         public override void Dispose()
         {
@@ -43,7 +42,7 @@ namespace GFGGame
         {
             UI_ListRewardItem item = UI_ListRewardItem.Proxy(obj);
             SuitFosterCfg cfg = SuitFosterCfgArray.Instance.GetCfgs(_suitId)[index];
-            item.m_txtDiscribe.text = string.Format("完成套装{0}获得", stageNames[index]);
+            item.m_txtDiscribe.text = string.Format("完成套装{0}获得", SuitFosterDataManager.Instance.stepNames[index]);
             ItemData itemData = new ItemData();
             itemData.id = cfg.rewardsArr[0][0];
             itemData.num = cfg.rewardsArr[0][1];

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/SuitView.cs

@@ -162,10 +162,20 @@ namespace GFGGame
         private void OnClickListFosterItem(EventContext context)
         {
             int index = (int)(context.data as GObject).data;
-            if (index == _index)
+            int state = SuitFosterDataManager.Instance.GetFosterState(_suitId, index);
+            if (state == 0)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("已完成该阶段");
+            }
+            else if (state == 1)
             {
                 ViewManager.Show<SuitFosterView>(new object[] { _suitId, index });
             }
+            else
+            {
+                PromptController.Instance.ShowFloatTextPrompt(string.Format("请完成{0}阶段", SuitFosterDataManager.Instance.stepNames[_index]));
+            }
+
         }
         private void OnClickBtnReward()
         {