养护完成动画

FGUIProject/assets/ClothingFoster/SuitFosterFinishUI.xml

@@ -7,20 +7,28 @@
       <relation target="" sidePair="bottom-bottom"/>
     </text>
     <image id="n6_l4ui" name="n6" src="bd1c1w" fileName="images/fzyc_wcyh_3.png" xy="115,1138" pivot="0.5,0" group="n8_l4ui"/>
-    <text id="n3_bd1c" name="txtRenewTips" xy="376,1140" pivot="0.5,0" size="328,49" group="n8_l4ui" visible="false" fontSize="36" color="#d1bc8d" autoSize="none" text="本套装的换新已可用"/>
+    <text id="n3_bd1c" name="txtRenewTips" xy="376,1140" pivot="0.5,0" size="328,49" group="n8_l4ui" fontSize="36" color="#d1bc8d" autoSize="none" text="本套装的换新已可用"/>
     <group id="n8_l4ui" name="grpRenew" xy="115,1138" size="850,60" visible="false" advanced="true"/>
-    <component id="n9_l4ui" name="comProperty0" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="155,635" pivot="0,0.5" size="0,58"/>
-    <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="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"/>
-    <component id="n17_l4ui" name="comAddProperty3" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="755,851" pivot="0,0.5" size="0,58"/>
+    <image id="n18_l4ui" name="img" src="bd1c1v" fileName="images/fzyc_wcyh_2.png" xy="504,756" size="72,56" fillMethod="vt" fillAmount=""/>
+    <component id="n9_l4ui" name="comProperty0" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="155,635" pivot="0,0.5" size="0,58" group="n20_l4ui"/>
+    <component id="n10_l4ui" name="comProperty1" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="355,635" pivot="0,0.5" size="0,58" group="n20_l4ui"/>
+    <component id="n11_l4ui" name="comProperty2" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="555,635" pivot="0,0.5" size="0,58" group="n20_l4ui"/>
+    <component id="n12_l4ui" name="comProperty3" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="755,635" pivot="0,0.5" size="0,58" group="n20_l4ui"/>
+    <group id="n20_l4ui" name="grpProperty" xy="155,635" size="600,58" visible="false" advanced="true"/>
+    <component id="n14_l4ui" name="comAddProperty0" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="155,851" pivot="0,0.5" size="0,58" group="n21_l4ui"/>
+    <component id="n15_l4ui" name="comAddProperty1" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="355,851" pivot="0,0.5" size="0,58" group="n21_l4ui"/>
+    <component id="n16_l4ui" name="comAddProperty2" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="555,851" pivot="0,0.5" size="0,58" group="n21_l4ui"/>
+    <component id="n17_l4ui" name="comAddProperty3" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="755,851" pivot="0,0.5" size="0,58" group="n21_l4ui"/>
+    <group id="n21_l4ui" name="grpAddProperty" xy="155,851" size="600,58" visible="false" advanced="true"/>
   </displayList>
   <transition name="t0">
+    <item time="0" type="Scale" target="n10_l4ui" value="1.2,1.2"/>
+    <item time="0" type="Scale" target="n11_l4ui" value="1.2,1.2"/>
+    <item time="0" type="Scale" target="n12_l4ui" value="1.2,1.2"/>
     <item time="0" type="Scale" target="n9_l4ui" tween="true" startValue="1,1" endValue="1.2,1.2" duration="4" ease="Linear"/>
+    <item time="0" type="Size" target="n10_l4ui" value="0,58"/>
+    <item time="0" type="Size" target="n11_l4ui" value="0,58"/>
+    <item time="0" type="Size" target="n12_l4ui" value="0,58"/>
     <item time="0" type="Size" target="n9_l4ui" tween="true" startValue="0,58" endValue="170,58" duration="8" ease="Linear"/>
     <item time="4" type="Scale" target="n9_l4ui" tween="true" startValue="1.2,1.2" endValue="1,1" duration="4" ease="Linear"/>
     <item time="8" type="Scale" target="n10_l4ui" tween="true" startValue="1,1" endValue="1.2,1.2" duration="3" ease="Linear"/>
@@ -35,7 +43,13 @@
   </transition>
   <transition name="t1">
     <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="Scale" target="n15_l4ui" value="1.2,1.2"/>
+    <item time="0" type="Scale" target="n16_l4ui" value="1.2,1.2"/>
+    <item time="0" type="Scale" target="n17_l4ui" value="1.2,1.2"/>
     <item time="0" type="Size" target="n14_l4ui" tween="true" startValue="0,58" endValue="170,58" duration="8" ease="Linear"/>
+    <item time="0" type="Size" target="n15_l4ui" value="0,58"/>
+    <item time="0" type="Size" target="n16_l4ui" value="0,58"/>
+    <item time="0" type="Size" target="n17_l4ui" value="0,58"/>
     <item time="4" type="Scale" target="n14_l4ui" tween="true" startValue="1.2,1.2" endValue="1,1" duration="4" ease="Linear"/>
     <item time="8" type="Scale" target="n15_l4ui" tween="true" startValue="1,1" endValue="1.2,1.2" duration="3" ease="Linear"/>
     <item time="8" type="Size" target="n15_l4ui" tween="true" startValue="0,58" endValue="170,58" duration="7" ease="Linear"/>

FGUIProject/assets/CommonGame/components/ListPropertyItem.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="170,58" overflow="hidden">
   <displayList>
-    <text id="n5_ojlz" name="txtProperty" xy="59,7" size="103,44" fontSize="32" color="#7d6956" text="66666"/>
+    <text id="n5_ojlz" name="txtProperty" xy="59,7" size="103,44" fontSize="32" color="#7d6956" ubb="true" text="66666"/>
     <loader id="n6_ojlz" name="loaIcon" xy="0,0" size="58,58" url="ui://eg2y0ldp842s6h" autoSize="true"/>
   </displayList>
 </component>

GameClient/Assets/Game/CSShare

@@ -1 +1 @@
-Subproject commit 993beeaf18a52163c913584db22c22697a7f2b03
+Subproject commit b6c4ad5bec1a42de62d46668e10a469b1f983e98

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

@@ -10,15 +10,17 @@ namespace UI.ClothingFoster
         public GLoader m_bg;
         public GTextField m_txtRenewTips;
         public GGroup m_grpRenew;
+        public GImage m_img;
         public GComponent m_comProperty0;
         public GComponent m_comProperty1;
         public GComponent m_comProperty2;
         public GComponent m_comProperty3;
-        public GImage m_img;
+        public GGroup m_grpProperty;
         public GComponent m_comAddProperty0;
-        public GComponent m_n15comAddProperty1;
+        public GComponent m_comAddProperty1;
         public GComponent m_comAddProperty2;
         public GComponent m_comAddProperty3;
+        public GGroup m_grpAddProperty;
         public Transition m_t0;
         public Transition m_t1;
         public const string URL = "ui://uicwtr5bpy5gs";
@@ -71,15 +73,17 @@ namespace UI.ClothingFoster
             m_bg = (GLoader)comp.GetChild("bg");
             m_txtRenewTips = (GTextField)comp.GetChild("txtRenewTips");
             m_grpRenew = (GGroup)comp.GetChild("grpRenew");
+            m_img = (GImage)comp.GetChild("img");
             m_comProperty0 = (GComponent)comp.GetChild("comProperty0");
             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_grpProperty = (GGroup)comp.GetChild("grpProperty");
             m_comAddProperty0 = (GComponent)comp.GetChild("comAddProperty0");
-            m_n15comAddProperty1 = (GComponent)comp.GetChild("n15comAddProperty1");
+            m_comAddProperty1 = (GComponent)comp.GetChild("comAddProperty1");
             m_comAddProperty2 = (GComponent)comp.GetChild("comAddProperty2");
             m_comAddProperty3 = (GComponent)comp.GetChild("comAddProperty3");
+            m_grpAddProperty = (GGroup)comp.GetChild("grpAddProperty");
             m_t0 = comp.GetTransition("t0");
             m_t1 = comp.GetTransition("t1");
         }
@@ -88,15 +92,17 @@ namespace UI.ClothingFoster
             m_bg = null;
             m_txtRenewTips = null;
             m_grpRenew = null;
+            m_img = null;
             m_comProperty0 = null;
             m_comProperty1 = null;
             m_comProperty2 = null;
             m_comProperty3 = null;
-            m_img = null;
+            m_grpProperty = null;
             m_comAddProperty0 = null;
-            m_n15comAddProperty1 = null;
+            m_comAddProperty1 = null;
             m_comAddProperty2 = null;
             m_comAddProperty3 = null;
+            m_grpAddProperty = null;
             m_t0 = null;
             m_t1 = null;
             if(disposeTarget && target != null)

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

@@ -40,6 +40,9 @@ namespace GFGGame
             _index = (int)(this.viewData as object[])[1];
             _ui.m_grpRenew.visible = false;
             _ui.m_bg.touchable = false;
+            _ui.m_img.fillAmount = 0;
+
+
             _lastPropertyList = (this.viewData as object[])[2] as SortedList;
             SuitFosterDataManager.Instance.GetPropertyData(_suitId, _index, out _curPropertyList, out SortedList _addPropertyList);
 
@@ -49,23 +52,28 @@ namespace GFGGame
             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];
-
+                int score = i + 1;
+                UI_ListPropertyItem comPrpperty = UI_ListPropertyItem.Proxy(_ui.target.GetChild("comProperty" + i));
+                int property = (int)_lastPropertyList[score];
                 comPrpperty.m_txtProperty.text = StringUtil.GetColorText(property.ToString(), "#5B4A3B");
+                comPrpperty.m_loaIcon.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + (score));
+
+                UI_ListPropertyItem comAddPrpperty = UI_ListPropertyItem.Proxy(_ui.target.GetChild("comAddProperty" + i));
+                int addProperty = (int)_curPropertyList[score];
                 comAddPrpperty.m_txtProperty.text = StringUtil.GetColorText(addProperty.ToString(), addProperty == property ? "#5B4A3B" : "#FFDE9E");
+                comAddPrpperty.m_loaIcon.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + (score));
             }
+            _ui.m_grpProperty.visible = true;
             _ui.m_t0.Play(() =>
             {
                 int num = 0;
-                Timers.inst.Add(0.1f, 10, (param) =>
+                Timers.inst.Add(0.01f, 100, (param) =>
                 {
                     num++;
                     _ui.m_img.fillAmount += 0.1f;
                     if (num == 10)
                     {
+                        _ui.m_grpAddProperty.visible = true;
                         _ui.m_t1.Play(() =>
                         {
                             _ui.m_grpRenew.visible = data.maintainStep >= cfg.renewOpenLv;
@@ -73,12 +81,17 @@ namespace GFGGame
                         });
                     }
                 });
+
             });
         }
 
         protected override void OnHide()
         {
             base.OnHide();
+            _ui.m_img.fillAmount = 0;
+            _ui.m_grpRenew.visible = false;
+            _ui.m_grpProperty.visible = false;
+            _ui.m_grpAddProperty.visible = false;
 
         }
     }

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

@@ -171,6 +171,7 @@ namespace GFGGame
 
         private void UpdateFoster()
         {
+            _index = SuitFosterDataManager.Instance.GetSuitFosterData(_suitId).maintainStep;
             UpdateFosterReward();
             _propertyList.Clear();
             _addPropertyList.Clear();
@@ -243,13 +244,13 @@ namespace GFGGame
             _ui.m_comFosterAni.target.visible = true;
             _ui.m_comFosterAni.m_txtContent.text = string.Format("服装{0}中......", SuitFosterDataManager.Instance.stepNames[_index]);
             _ui.m_comFosterAni.m_proFoster.value = 0;
-            _ui.m_comFosterAni.m_proFoster.TweenValue(100, 2f).OnComplete(() =>
-             {
-                 _ui.m_comFosterAni.target.visible = false;
-                 ViewManager.Show<SuitFosterFinishView>(new object[] { _suitId, _index, _propertyList });
-                 //  UpdateFoster();
 
-             });
+            _ui.m_comFosterAni.m_proFoster.TweenValue(100, 2f).OnComplete(() =>
+            {
+                ViewManager.Show<SuitFosterFinishView>(new object[] { _suitId, _index, _propertyList });
+                UpdateFoster();
+                _ui.m_comFosterAni.target.visible = false;
+            });
 
         }
         private void OnListenerGetFosterReward(EventContext context)
@@ -263,6 +264,7 @@ namespace GFGGame
         /*************************************************换新************************************************/
         private void UpdateRenew()
         {
+            _index = SuitFosterDataManager.Instance.GetSuitFosterData(_suitId).maintainStep;
             SuitFosterData suitFosterData = SuitFosterDataManager.Instance.GetSuitFosterData(_suitId);
             if (suitFosterData.makeNewState > 0)
             {