服装养护红点

FGUIProject/assets/ClothingFoster/ClothingFosterFinishUI.xml

@@ -5,34 +5,34 @@
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
     <image id="n5_l4ui" name="n5" src="bd1c1x" fileName="images/fzyc_wcyh_1.png" xy="0,300"/>
-    <text id="n7_l4ui" name="n7" xy="430,1822" size="217,49" fontSize="36" color="#958163" text="点击屏幕继续">
+    <text id="n7_l4ui" name="n7" xy="430,1822" size="220,49" fontSize="36" color="#958163" text="点击屏幕继续">
       <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" fontSize="36" color="#d1bc8d" autoSize="none" text="本套装的换新已可用"/>
     <group id="n8_l4ui" name="grpRenew" xy="115,1138" size="850,60" visible="false" advanced="true"/>
     <image id="n18_l4ui" name="img" src="bd1c1v" fileName="images/fzyc_wcyh_2.png" xy="504,724" size="72,56" fillMethod="vt"/>
-    <component id="n9_l4ui" name="comProperty0" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="197,592" pivot="0.5,0" size="170,58" group="n20_l4ui"/>
-    <component id="n10_l4ui" name="comProperty1" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="397,592" pivot="0.5,0" size="170,58" group="n20_l4ui"/>
-    <component id="n11_l4ui" name="comProperty2" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="597,592" pivot="0.5,0" size="170,58" group="n20_l4ui"/>
-    <component id="n12_l4ui" name="comProperty3" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="797,592" pivot="0.5,0" size="170,58" group="n20_l4ui"/>
-    <group id="n20_l4ui" name="grpProperty" xy="197,592" size="770,58" visible="false" advanced="true"/>
-    <component id="n14_l4ui" name="comAddProperty0" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="197,851" pivot="0.5,0" size="170,58" group="n21_l4ui"/>
-    <component id="n15_l4ui" name="comAddProperty1" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="397,851" pivot="0.5,0" size="170,58" group="n21_l4ui"/>
-    <component id="n16_l4ui" name="comAddProperty2" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="597,851" pivot="0.5,0" size="170,58" group="n21_l4ui"/>
-    <component id="n17_l4ui" name="comAddProperty3" src="ojlzk" fileName="components/ListPropertyItem.xml" pkg="eg2y0ldp" xy="797,851" pivot="0.5,0" size="170,58" group="n21_l4ui"/>
-    <group id="n21_l4ui" name="grpAddProperty" xy="197,851" size="770,58" visible="false" advanced="true"/>
+    <component id="n9_l4ui" name="comProperty0" src="ojlzk" fileName="components/ListScoreItem.xml" pkg="eg2y0ldp" xy="110,592" pivot="0.5,0" size="200,54" group="n20_l4ui"/>
+    <component id="n10_l4ui" name="comProperty1" src="ojlzk" fileName="components/ListScoreItem.xml" pkg="eg2y0ldp" xy="330,592" pivot="0.5,0" size="200,54" group="n20_l4ui"/>
+    <component id="n11_l4ui" name="comProperty2" src="ojlzk" fileName="components/ListScoreItem.xml" pkg="eg2y0ldp" xy="550,592" pivot="0.5,0" size="200,54" group="n20_l4ui"/>
+    <component id="n12_l4ui" name="comProperty3" src="ojlzk" fileName="components/ListScoreItem.xml" pkg="eg2y0ldp" xy="770,592" pivot="0.5,0" size="200,54" group="n20_l4ui"/>
+    <group id="n20_l4ui" name="grpProperty" xy="110,592" size="860,54" visible="false" advanced="true" layout="hz" colGap="20"/>
+    <component id="n14_l4ui" name="comAddProperty0" src="ojlzk" fileName="components/ListScoreItem.xml" pkg="eg2y0ldp" xy="110,851" pivot="0.5,0" size="200,54" group="n21_l4ui"/>
+    <component id="n15_l4ui" name="comAddProperty1" src="ojlzk" fileName="components/ListScoreItem.xml" pkg="eg2y0ldp" xy="330,851" pivot="0.5,0" size="200,54" group="n21_l4ui"/>
+    <component id="n16_l4ui" name="comAddProperty2" src="ojlzk" fileName="components/ListScoreItem.xml" pkg="eg2y0ldp" xy="550,851" pivot="0.5,0" size="200,54" group="n21_l4ui"/>
+    <component id="n17_l4ui" name="comAddProperty3" src="ojlzk" fileName="components/ListScoreItem.xml" pkg="eg2y0ldp" xy="770,851" pivot="0.5,0" size="200,54" group="n21_l4ui"/>
+    <group id="n21_l4ui" name="grpAddProperty" xy="110,851" size="860,54" visible="false" advanced="true" layout="hz" colGap="20"/>
   </displayList>
   <transition name="t0" autoPlay="true">
-    <item time="0" type="Size" target="n10_l4ui" tween="true" startValue="170,0" endValue="170,58" duration="8" ease="Linear"/>
-    <item time="0" type="Size" target="n11_l4ui" tween="true" startValue="170,0" endValue="170,58" duration="8" ease="Linear"/>
-    <item time="0" type="Size" target="n12_l4ui" tween="true" startValue="170,0" endValue="170,58" duration="8" ease="Linear"/>
-    <item time="0" type="Size" target="n9_l4ui" tween="true" startValue="170,0" endValue="170,58" duration="8" ease="Linear"/>
+    <item time="0" type="Size" target="n10_l4ui" tween="true" startValue="200,0" endValue="200,54" duration="8" ease="Linear"/>
+    <item time="0" type="Size" target="n11_l4ui" tween="true" startValue="200,0" endValue="200,54" duration="8" ease="Linear"/>
+    <item time="0" type="Size" target="n12_l4ui" tween="true" startValue="200,0" endValue="200,54" duration="8" ease="Linear"/>
+    <item time="0" type="Size" target="n9_l4ui" tween="true" startValue="200,0" endValue="200,54" duration="8" ease="Linear"/>
   </transition>
   <transition name="t1">
-    <item time="0" type="Size" target="n14_l4ui" tween="true" startValue="170,0" endValue="170,58" duration="8" ease="Linear"/>
-    <item time="0" type="Size" target="n15_l4ui" tween="true" startValue="170,0" endValue="170,58" duration="8" ease="Linear"/>
-    <item time="0" type="Size" target="n16_l4ui" tween="true" startValue="170,0" endValue="170,58" duration="8" ease="Linear"/>
-    <item time="0" type="Size" target="n17_l4ui" tween="true" startValue="170,0" endValue="170,58" duration="8" ease="Linear"/>
+    <item time="0" type="Size" target="n14_l4ui" tween="true" startValue="200,0" endValue="200,54" duration="8" ease="Linear"/>
+    <item time="0" type="Size" target="n15_l4ui" tween="true" startValue="200,0" endValue="200,54" duration="8" ease="Linear"/>
+    <item time="0" type="Size" target="n16_l4ui" tween="true" startValue="200,0" endValue="200,54" duration="8" ease="Linear"/>
+    <item time="0" type="Size" target="n17_l4ui" tween="true" startValue="200,0" endValue="200,54" duration="8" ease="Linear"/>
   </transition>
 </component>

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

@@ -313,6 +313,19 @@ namespace GFGGame
             }
             return false;
         }
+        /// <summary>
+        /// 服装养护红点
+        /// </summary>
+        /// <returns></returns>
+        public bool GetClothingFosterRed()
+        {
+            List<int> _suitIds = SuitUtil.GetClothingFosterSuitIdList(true, true, 0);
+            for (int i = 0; i < _suitIds.Count; i++)
+            {
+                if (GetClothingFosterRed(_suitIds[i]) || GetClothingRenewRed(_suitIds[i])) return true;
+            }
+            return false;
+        }
 
         /// <summary>
         /// 服装养护红点
@@ -323,7 +336,10 @@ namespace GFGGame
         {
             int index = SuitFosterDataManager.Instance.GetSuitFosterData(suitId).maintainStep;
             List<SuitFosterCfg> fosterCfgs = SuitFosterCfgArray.Instance.GetCfgsBysuitId(suitId);
-            if (index >= fosterCfgs.Count) return false;
+            if (index >= fosterCfgs.Count)
+            {
+                return false;
+            }
             if (!DressUpMenuSuitDataManager.CheckHaveSuit(suitId)) return false;
 
             SuitFosterCfg fosterCfg = fosterCfgs[index];
@@ -336,6 +352,25 @@ namespace GFGGame
             int costNeed = fosterCfg.costNum;
             return itemHas >= itemNeed && costHas >= costNeed;
         }
+        /// <summary>
+        /// 服装换新红点
+        /// </summary>
+        /// <param name="suitId"></param>
+        /// <returns></returns>
+        public bool GetClothingRenewRed(int suitId)
+        {
+            int index = SuitFosterDataManager.Instance.GetSuitFosterData(suitId).maintainStep;
+            List<SuitFosterCfg> fosterCfgs = SuitFosterCfgArray.Instance.GetCfgsBysuitId(suitId);
+            SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(suitId);
+            SuitRenewCfg renewCfg = SuitRenewCfgArray.Instance.GetCfg(suitCfg.rarity);
+            if (index >= fosterCfgs.Count
+            && ItemDataManager.GetItemNum(renewCfg.costId) >= renewCfg.costNum
+            && ItemDataManager.GetItemNum(renewCfg.materialsArr[0][0]) >= renewCfg.materialsArr[0][1])
+            {
+                return true;
+            }
+            return false;
+        }
 
         /// <summary>
         /// 商城

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

@@ -174,7 +174,7 @@ namespace GFGGame
                 }
             });
 
-            RedDotController.Instance.SetComRedDot(listItem.target, RedDotDataManager.Instance.GetClothingFosterRed(suitId), "", 8, -3);
+            RedDotController.Instance.SetComRedDot(listItem.target, RedDotDataManager.Instance.GetClothingFosterRed(suitId) || RedDotDataManager.Instance.GetClothingRenewRed(suitId), "", 8, -3);
         }
 
         private void CheckGuide(object param)

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -1023,6 +1023,8 @@ namespace GFGGame
             RedDotController.Instance.SetComRedDot(_ui.m_btnActivityLuckyBox.target, RedDotDataManager.Instance.GetMeiRiTeHuiRed() || RedDotDataManager.Instance.GetActLuckyBoxRewardRed() || RedDotDataManager.Instance.GetActLuckyBoxTaskdRed() || RedDotDataManager.Instance.GetGiftBagRewardRed(), "", -10, 5);
             RedDotController.Instance.SetComRedDot(_btnBag, RedDotDataManager.Instance.GetMainBagGiftRed());
             RedDotController.Instance.SetComRedDot(_ui.m_btnActivityDay7.target, RedDotDataManager.Instance.GetActivityDay7Red());
+
+            RedDotController.Instance.SetComRedDot(_ui.m_btnXiuFang.target, RedDotDataManager.Instance.GetClothingFosterRed(), "", -10, 20);
         }
 
         private void CheckGuide(object param)

GameClient/Assets/Game/HotUpdate/Views/XiuFang/XiuFangView.cs

@@ -35,7 +35,11 @@ namespace GFGGame
             _ui.m_component.m_btnClothingUpgrade.target.onClick.Add(OnClickBtnClothingUpgrade);
             _ui.m_component.m_btnDecompose.target.onClick.Add(OnClickBtnDecompose);
         }
-
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
+        }
         protected override void OnShown()
         {
             base.OnShown();
@@ -54,6 +58,7 @@ namespace GFGGame
                 _ui.m_component.target.scrollPane.SetPosX(400, false);
             }
 
+            UpdateRedDot();
             Timers.inst.AddUpdate(CheckGuide);
         }
 
@@ -62,7 +67,11 @@ namespace GFGGame
             base.OnHide();
             Timers.inst.Remove(CheckGuide);
         }
-
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.RED_CHANGE, UpdateRedDot);
+        }
         private void OnClickBtnBack()
         {
             this.Hide();
@@ -111,6 +120,11 @@ namespace GFGGame
             }
         }
 
+        private void UpdateRedDot()
+        {
+            RedDotController.Instance.SetComRedDot(_ui.m_component.m_btnClothingUpgrade.target, RedDotDataManager.Instance.GetClothingFosterRed(), "", 0, 200);
+        }
+
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;