养护完成

FGUIProject/assets/ClothingFoster/SuitFosterFinishUI.xml

@@ -13,7 +13,7 @@
     <component id="n10_l4ui" name="comProperty1" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="355,635" pivot="0,0.5" size="0,58"/>
     <component id="n11_l4ui" name="comProperty2" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="555,635" pivot="0,0.5" size="0,58"/>
     <component id="n12_l4ui" name="comProperty3" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="755,635" pivot="0,0.5" size="0,58"/>
-    <image id="n18_l4ui" name="n18" src="bd1c1v" fileName="images/fzyc_wcyh_2.png" xy="504,756" size="72,56" fillMethod="vt"/>
+    <image id="n18_l4ui" name="img" src="bd1c1v" fileName="images/fzyc_wcyh_2.png" xy="504,756" size="72,56" fillMethod="vt"/>
     <component id="n14_l4ui" name="comAddProperty0" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="155,851" pivot="0,0.5" size="0,58"/>
     <component id="n15_l4ui" name="n15comAddProperty1" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="355,851" pivot="0,0.5" size="0,58"/>
     <component id="n16_l4ui" name="comAddProperty2" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="555,851" pivot="0,0.5" size="0,58"/>
@@ -34,9 +34,6 @@
     <item time="27" type="Scale" target="n12_l4ui" tween="true" startValue="1.2,1.2" endValue="1,1" duration="4" ease="Linear"/>
   </transition>
   <transition name="t1">
-    <item time="0" type="Size" target="n18_l4ui" tween="true" startValue="72,56" endValue="72,56" duration="5" ease="Linear"/>
-  </transition>
-  <transition name="t2">
     <item time="0" type="Scale" target="n14_l4ui" tween="true" startValue="1,1" endValue="1.2,1.2" duration="4" ease="Linear"/>
     <item time="0" type="Size" target="n14_l4ui" tween="true" startValue="0,58" endValue="170,58" duration="8" ease="Linear"/>
     <item time="4" type="Scale" target="n14_l4ui" tween="true" startValue="1.2,1.2" endValue="1,1" duration="4" ease="Linear"/>

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_SuitFosterFinishUI.cs

@@ -14,13 +14,13 @@ namespace UI.ClothingFoster
         public GComponent m_comProperty1;
         public GComponent m_comProperty2;
         public GComponent m_comProperty3;
+        public GImage m_img;
         public GComponent m_comAddProperty0;
         public GComponent m_n15comAddProperty1;
         public GComponent m_comAddProperty2;
         public GComponent m_comAddProperty3;
         public Transition m_t0;
         public Transition m_t1;
-        public Transition m_t2;
         public const string URL = "ui://uicwtr5bpy5gs";
         public const string PACKAGE_NAME = "ClothingFoster";
         public const string RES_NAME = "SuitFosterFinishUI";
@@ -75,13 +75,13 @@ namespace UI.ClothingFoster
             m_comProperty1 = (GComponent)comp.GetChild("comProperty1");
             m_comProperty2 = (GComponent)comp.GetChild("comProperty2");
             m_comProperty3 = (GComponent)comp.GetChild("comProperty3");
+            m_img = (GImage)comp.GetChild("img");
             m_comAddProperty0 = (GComponent)comp.GetChild("comAddProperty0");
             m_n15comAddProperty1 = (GComponent)comp.GetChild("n15comAddProperty1");
             m_comAddProperty2 = (GComponent)comp.GetChild("comAddProperty2");
             m_comAddProperty3 = (GComponent)comp.GetChild("comAddProperty3");
             m_t0 = comp.GetTransition("t0");
             m_t1 = comp.GetTransition("t1");
-            m_t2 = comp.GetTransition("t2");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -92,13 +92,13 @@ namespace UI.ClothingFoster
             m_comProperty1 = null;
             m_comProperty2 = null;
             m_comProperty3 = null;
+            m_img = null;
             m_comAddProperty0 = null;
             m_n15comAddProperty1 = null;
             m_comAddProperty2 = null;
             m_comAddProperty3 = null;
             m_t0 = null;
             m_t1 = null;
-            m_t2 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -1,6 +1,9 @@
+using System;
 using System.Collections;
 using FairyGUI;
 using UI.ClothingFoster;
+using UI.CommonGame;
+
 namespace GFGGame
 {
     public class SuitFosterFinishView : BaseWindow
@@ -8,7 +11,7 @@ namespace GFGGame
         private UI_SuitFosterFinishUI _ui;
         private int _suitId;
         private int _index;
-        private SortedList _propertyList;
+        private SortedList _lastPropertyList;
         private SortedList _curPropertyList;
         public override void Dispose()
         {
@@ -35,19 +38,42 @@ namespace GFGGame
             base.OnShown();
             _suitId = (int)(this.viewData as object[])[0];
             _index = (int)(this.viewData as object[])[1];
-
-            _propertyList = (this.viewData as object[])[1] as SortedList;
+            _ui.m_grpRenew.visible = false;
+            _ui.m_bg.touchable = false;
+            _lastPropertyList = (this.viewData as object[])[2] as SortedList;
             SuitFosterDataManager.Instance.GetPropertyData(_suitId, _index, out _curPropertyList, out SortedList _addPropertyList);
 
             SuitFosterData data = SuitFosterDataManager.Instance.GetSuitFosterData(_suitId);
             SuitFosterListCfg cfg = SuitFosterListCfgArray.Instance.GetCfg(_suitId);
 
-            _ui.m_grpRenew.visible = data.maintainStep >= cfg.renewOpenLv;
-            for (int i = 0; i < ConstDressUpScoreType.scoreTypeList().Count; i++)
+            int count = ConstDressUpScoreType.scoreTypeList().Count;
+            for (int i = 0; i < count; i++)
             {
+                UI_ListPropertyItem comPrpperty = UI_ListPropertyItem.Proxy(_ui.target.GetChild("comProperty" + i).asCom);
+                UI_ListPropertyItem comAddPrpperty = UI_ListPropertyItem.Proxy(_ui.target.GetChild("comAddProperty" + i).asCom);
+                int property = (int)_lastPropertyList[i + 1];
+                int addProperty = (int)_curPropertyList[i + 1];
 
+                comPrpperty.m_txtProperty.text = StringUtil.GetColorText(property.ToString(), "#5B4A3B");
+                comAddPrpperty.m_txtProperty.text = StringUtil.GetColorText(addProperty.ToString(), addProperty == property ? "#5B4A3B" : "#FFDE9E");
             }
-
+            _ui.m_t0.Play(() =>
+            {
+                int num = 0;
+                Timers.inst.Add(0.1f, 10, (param) =>
+                {
+                    num++;
+                    _ui.m_img.fillAmount += 0.1f;
+                    if (num == 10)
+                    {
+                        _ui.m_t1.Play(() =>
+                        {
+                            _ui.m_grpRenew.visible = data.maintainStep >= cfg.renewOpenLv;
+                            _ui.m_bg.touchable = true;
+                        });
+                    }
+                });
+            });
         }
 
         protected override void OnHide()

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

@@ -247,7 +247,8 @@ namespace GFGGame
              {
                  _ui.m_comFosterAni.target.visible = false;
                  ViewManager.Show<SuitFosterFinishView>(new object[] { _suitId, _index, _propertyList });
-                 UpdateFoster();
+                 //  UpdateFoster();
+
              });
 
         }