fix 删除多余文件

FGUIProject/assets/Arena/components/comListType(1).xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="230,1920">
-  <displayList>
-    <image id="n15_wono" name="n15" src="psph17" fileName="components/hz_zdikuang_1.png" xy="3,94" size="226,1826" group="n17_wono">
-      <relation target="" sidePair="height-height"/>
-    </image>
-    <image id="n16_wono" name="n16" src="psph1c" fileName="components/hz_zdikuang_2.png" xy="0,72" group="n17_wono"/>
-    <group id="n17_wono" name="n17" xy="0,72" size="276,1848"/>
-  </displayList>
-</component>

FGUIProject/assets/Arena/components/comListType(2).xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="230,1920">
-  <displayList>
-    <image id="n15_wono" name="n15" src="psph17" fileName="components/hz_zdikuang_1.png" xy="3,94" size="226,1826" group="n17_wono">
-      <relation target="" sidePair="height-height"/>
-    </image>
-    <image id="n16_wono" name="n16" src="psph1c" fileName="components/hz_zdikuang_2.png" xy="0,72" group="n17_wono"/>
-    <group id="n17_wono" name="n17" xy="0,72" size="276,1848"/>
-  </displayList>
-</component>

FGUIProject/assets/Arena/package.xml

@@ -171,8 +171,6 @@
     <image id="rv0958" name="dljm_jdq_5.png" path="/images/"/>
     <image id="rv0959" name="dljm_jdq_4.png" path="/images/"/>
     <image id="rv095a" name="dljm_jdq_3.png" path="/images/"/>
-    <component id="ids45b" name="comListType(1).xml" path="/components/"/>
-    <component id="ids45c" name="comListType(2).xml" path="/components/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Arena" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/Task/components/BattlePassRewardItem.xml

@@ -1,29 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,153">
-  <controller name="c1" pages="0,GetReward,1,HadGet,2,Continue,3,Come" selected="0">
-    <remark page="0" value="领取奖励"/>
-    <remark page="1" value="已领取"/>
-    <remark page="2" value="继续领取"/>
-    <remark page="3" value="前往"/>
+  <controller name="c1" pages="0,未完成,1,可领取,2,已领取,3,继续领取" selected="3">
+    <remark page="0" value="未完成"/>
+    <remark page="1" value="可领取"/>
+    <remark page="2" value="已领取"/>
+    <remark page="3" value="继续领取"/>
   </controller>
+  <controller name="c2" pages="0,能前往,1,不能前往" selected="1"/>
   <displayList>
     <image id="n6_nd17" name="n6" src="nd172x" fileName="images/txz_lvl_db.png" xy="9,10"/>
     <component id="n7_nd17" name="NormalReward" src="nd1742" fileName="components/RewardIconBlue.xml" xy="203,11"/>
-    <component id="n10_nd17" name="GetRewardBt" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="822,44" size="189,58">
+    <component id="n12_nd17" name="ComeBt" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="822,43" size="189,58">
       <gearDisplay controller="c1" pages="0"/>
+      <gearDisplay2 controller="c2" pages="0" condition="0"/>
+      <Button title="前往" icon="ui://eg2y0ldpnd17tlv"/>
+    </component>
+    <component id="n10_nd17" name="GetRewardBt" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="822,44" size="189,58">
+      <gearDisplay controller="c1" pages="1"/>
       <Button title="领取" icon="ui://eg2y0ldpo9gh4k"/>
     </component>
-    <component id="n11_nd17" name="ContinueBt" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="822,43" size="189,58">
+    <component id="n13_nd17" name="HadGet" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="822,43" size="189,58">
       <gearDisplay controller="c1" pages="2"/>
-      <Button title="继续领取" icon="ui://eg2y0ldpo9gh4k"/>
+      <Button title=" 已领取" icon="ui://eg2y0ldpo9gh4l"/>
     </component>
-    <component id="n12_nd17" name="ComeBt" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="822,43" size="189,58">
+    <component id="n11_nd17" name="ContinueBt" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="822,43" size="189,58">
       <gearDisplay controller="c1" pages="3"/>
-      <Button title="前往" icon="ui://eg2y0ldpnd17tlv"/>
-    </component>
-    <component id="n13_nd17" name="HadGet" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="822,43" size="189,58">
-      <gearDisplay controller="c1" pages="1"/>
-      <Button title=" 已领取" icon="ui://eg2y0ldpo9gh4l"/>
+      <Button title="继续领取" icon="ui://eg2y0ldpo9gh4k"/>
     </component>
     <text id="n15_nd17" name="Level" xy="30,42" size="82,62" font="ui://eg2y0ldpa0cftks" fontSize="40" color="#c48624" align="center" autoSize="none" text="1"/>
     <list id="n18_vixc" name="RewardList" xy="450,11" size="270,123" layout="row" overflow="hidden" scroll="horizontal" colGap="28" align="center" vAlign="middle">

FGUIProject/assets/Task/components/TaskListItem.xml

@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1037,224">
-  <controller name="c1" pages="1,,2,,3," selected="2">
+  <controller name="c1" pages="1,,2,,3," selected="0">
     <remark page="0" value="未完成"/>
     <remark page="1" value="可领取"/>
     <remark page="2" value="已领取"/>
   </controller>
+  <controller name="c2" pages="0,CanGo,1,NotGo" selected="1"/>
   <displayList>
     <image id="n13_ids4" name="n13" src="nd172s" fileName="images/mrrw_db.png" xy="-4,8"/>
     <image id="n12_ids4" name="n12" src="nd172y" fileName="images/mrrw_bq_qb.png" xy="35,12"/>
     <text id="n1_lh8v" name="txtDesc" xy="56,19" size="260,44" font="ui://eg2y0ldpa0cftks" fontSize="32" color="#915e15" align="center" vAlign="middle" text="任务描述任务描述"/>
-    <text id="n14_ids4" name="txtCount" xy="390,20" size="84,44" fontSize="32" color="#915e15" vars="true" text="{cur=1}/{count=100}"/>
+    <text id="n14_ids4" name="txtCount" xy="390,20" size="80,44" fontSize="32" color="#915e15" text="1/100"/>
     <list id="n7_wet2" name="listTaskReward" xy="93,78" size="265,125" layout="row" colGap="6" defaultItem="ui://5mpsibzzwet22j" autoClearItems="true">
       <item url="ui://5mpsibzznd1743"/>
       <item url="ui://5mpsibzznd1743"/>
@@ -20,6 +21,7 @@
     </component>
     <component id="n17_ids4" name="ComeBt" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="804,81" size="189,58">
       <gearDisplay controller="c1" pages="1"/>
+      <gearDisplay2 controller="c2" pages="0" condition="0"/>
       <Button title="前往" icon="ui://eg2y0ldpnd17tlv"/>
     </component>
     <component id="n18_ids4" name="HadGet" src="rv091p" fileName="components/BtnStyle1Big.xml" pkg="eg2y0ldp" xy="804,81" size="189,58">

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_BattlePassRewardItem.cs

@@ -8,11 +8,12 @@ namespace UI.Task
     {
         public GComponent target;
         public Controller m_c1;
+        public Controller m_c2;
         public UI_RewardIconBlue m_NormalReward;
-        public GButton m_GetRewardBt;
-        public GButton m_ContinueBt;
         public GButton m_ComeBt;
+        public GButton m_GetRewardBt;
         public GButton m_HadGet;
+        public GButton m_ContinueBt;
         public GTextField m_Level;
         public GList m_RewardList;
         public const string URL = "ui://5mpsibzznd173u";
@@ -63,23 +64,25 @@ namespace UI.Task
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_c2 = comp.GetController("c2");
             m_NormalReward = (UI_RewardIconBlue)UI_RewardIconBlue.Create(comp.GetChild("NormalReward"));
-            m_GetRewardBt = (GButton)comp.GetChild("GetRewardBt");
-            m_ContinueBt = (GButton)comp.GetChild("ContinueBt");
             m_ComeBt = (GButton)comp.GetChild("ComeBt");
+            m_GetRewardBt = (GButton)comp.GetChild("GetRewardBt");
             m_HadGet = (GButton)comp.GetChild("HadGet");
+            m_ContinueBt = (GButton)comp.GetChild("ContinueBt");
             m_Level = (GTextField)comp.GetChild("Level");
             m_RewardList = (GList)comp.GetChild("RewardList");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_c2 = null;
             m_NormalReward.Dispose();
             m_NormalReward = null;
-            m_GetRewardBt = null;
-            m_ContinueBt = null;
             m_ComeBt = null;
+            m_GetRewardBt = null;
             m_HadGet = null;
+            m_ContinueBt = null;
             m_Level = null;
             m_RewardList = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_TaskListItem.cs

@@ -8,6 +8,7 @@ namespace UI.Task
     {
         public GComponent target;
         public Controller m_c1;
+        public Controller m_c2;
         public GTextField m_txtDesc;
         public GTextField m_txtCount;
         public GList m_listTaskReward;
@@ -62,6 +63,7 @@ namespace UI.Task
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_c2 = comp.GetController("c2");
             m_txtDesc = (GTextField)comp.GetChild("txtDesc");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_listTaskReward = (GList)comp.GetChild("listTaskReward");
@@ -72,6 +74,7 @@ namespace UI.Task
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_c2 = null;
             m_txtDesc = null;
             m_txtCount = null;
             m_listTaskReward = null;

GameClient/Assets/Game/HotUpdate/Views/Task/CombTaskView.cs

@@ -91,56 +91,45 @@ namespace GFGGame
             _ui.m_TaskList.numItems = _cfgs.Count;
         }
 
-        private void UpdateList()
-        {
-            _cfgs = TaskDataManager.Instance.GetTaskCfgs(TaskType.Daily);
-        }
-
-
         private void TaskItemIndex(int index, GObject obj)
         {
             var item = UI_TaskListItem.Proxy(obj);
             //领取状态
-            item.m_c1.selectedIndex =TaskDataManager.Instance.GetTaskStateById(_cfgs[index].id);
-            UI_TaskListItem.ProxyEnd();
-        }
+            item.m_c1.selectedIndex = TaskDataManager.Instance.GetTaskStateById(_cfgs[index].id);
+            item.m_txtDesc.text = TaskDataManager.Instance.GetTaskDesc(_cfgs[index].id);
+            item.m_txtCount.text =
+                $"{TaskDataManager.Instance.GetTaskProgressById(_cfgs[index].id)}/{_cfgs[index].count}";
+            if (item.m_GetRewardBt.data == null)
+            {
+                item.m_GetRewardBt.onClick.Add(OnBtnGetClick);
+            }
 
-        private void ListItemRender(int index, GObject obj)
-        {
-            // var item = UI_ListItem.Proxy(obj);
-            // item.m_c1.selectedIndex = TaskDataManager.Instance.GetTaskStateById(_cfgs[index].id);
-            // item.m_c2.selectedIndex = _cfgs[index].jumpId == "" ? 0 : 1;
-            // item.m_txtDesc.text = TaskDataManager.Instance.GetTaskDesc(_cfgs[index].id);
-            // item.m_txtCount.text = string.Format("{0}/{1}", TaskDataManager.Instance.GetTaskProgressById(_cfgs[index].id), _cfgs[index].count);
-            // if (item.m_btnGet.data == null)
-            // {
-            //     item.m_btnGet.onClick.Add(OnBtnGetClick);
-            // }
-            // item.m_btnGet.data = _cfgs[index].id;
-            // if (item.m_btnGo.data == null)
-            // {
-            //     item.m_btnGo.onClick.Add(OnBtnGoClick);
-            // }
-            // item.m_btnGo.data = _cfgs[index].jumpId;
-            //
-            // if (item.m_listTaskReward.data == null)
-            // {
-            //     item.m_listTaskReward.itemRenderer = ListTaskRewardItemRender;
-            // }
-            // item.m_listTaskReward.data = _cfgs[index].rewardsArr;
-            // item.m_listTaskReward.numItems = _cfgs[index].rewardsArr.Length;
-            // UI_ListItem.ClearProxy();
+            item.m_GetRewardBt.data = _cfgs[index].id;
+            if (item.m_ComeBt.data == null)
+            {
+                item.m_ComeBt.onClick.Add(OnBtnGoClick);
+            }
+
+            item.m_ComeBt.data = _cfgs[index].jumpId;
+
+            if (item.m_listTaskReward.data == null)
+            {
+                item.m_listTaskReward.itemRenderer = ListTaskRewardItemRender;
+            }
+
+            item.m_listTaskReward.data = _cfgs[index].rewardsArr;
+            item.m_listTaskReward.numItems = _cfgs[index].rewardsArr.Length;
+            UI_TaskListItem.ProxyEnd();
         }
 
-        private void ListTaskRewardItemRender(int index, GObject obj)
+        private static void ListTaskRewardItemRender(int index, GObject obj)
         {
-            // var item = UI_ListTaskRewardItem.Proxy(obj);
-            // var rewards = (int[][])item.target.parent.data;
-            //
-            // var itemCfg = ItemCfgArray.Instance.GetCfg(rewards[index][0]);
-            // item.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(itemCfg.res);
-            // item.m_txtNum.text = $"x{rewards[index][1]}";
-            // UI_ListTaskRewardItem.ProxyEnd();
+            var item = UI_RewardIconYellow.Proxy(obj);
+            var rewards = (int[][])item.target.parent.data;
+            var itemCfg = ItemCfgArray.Instance.GetCfg(rewards[index][0]);
+            item.m_loaIcon.url = ResPathUtil.GetCommonGameResPath(itemCfg.res);
+            item.m_num.text = $"{rewards[index][1]}";
+            UI_RewardIconYellow.ProxyEnd();
         }
 
         private async void OnBtnGetClick(EventContext context)
@@ -160,19 +149,6 @@ namespace GFGGame
             ViewManager.Show($"GFGGame.{btnGo.data}", null, new[] { typeof(CombTaskView).FullName, viewData }, true);
         }
 
-        private void ListBoxRewardItemRender(int index, GObject obj)
-        {
-            // var item = UI_ListBoxRewardItem.Proxy(obj);
-            // var cfg = _rewardCfgs[index];
-            // var state = DailyTaskDataManager.Instance.GetBoxStateById(cfg.id);
-            // item.m_c1.selectedIndex = state;
-            // item.m_txtNum.text = cfg.count.ToString();
-            // RedDotController.Instance.SetComRedDot(item.target, state == ConstBonusStatus.CAN_GET, "", 12, 4);
-            //
-            // item.target.data = _rewardCfgs[index];
-            // UI_ListBoxRewardItem.ClearProxy();
-        }
-
         private async void OnBoxRewardItemClick(EventContext context)
         {
             var item = context.data as GObject;
@@ -189,8 +165,7 @@ namespace GFGGame
             else
             {
                 var rewards = ItemUtil.CreateItemDataList(cfg.rewardsArr);
-                ViewManager.Show<RewardPreView>(new object[]
-                    { rewards, "活跃度奖励", string.Format("满足{0}活跃度可领取", cfg.count) });
+                ViewManager.Show<RewardPreView>(new object[] { rewards, "活跃度奖励", $"满足{cfg.count}活跃度可领取" });
             }
         }