任务界面ui修改

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button22.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.CommonGame
+{
+    public partial class UI_Button22
+    {
+        public GButton target;
+        public Controller m_buttonType;
+        public const string URL = "ui://eg2y0ldpyhomtpq";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "Button22";
+        private static UI_Button22 _proxy;
+
+        public static UI_Button22 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button22();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Button22 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button22();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_buttonType = comp.GetController("buttonType");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_buttonType = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button22.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8280538bb2fa37046aa5207144bdd9a2
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -13,8 +13,9 @@ namespace UI.CommonGame
         public GTextField m_txtDesc;
         public GTextField m_txtCount;
         public GList m_listTaskReward;
-        public GButton m_GetRewardBt;
-        public GButton m_ComeBt;
+        public UI_Button22 m_GetRewardBt;
+        public UI_Button22 m_ComeBt;
+        public UI_Button22 m_GetRewardBt_2;
         public const string URL = "ui://eg2y0ldplh8v5";
         public const string PACKAGE_NAME = "CommonGame";
         public const string RES_NAME = "TaskListItem";
@@ -68,8 +69,9 @@ namespace UI.CommonGame
             m_txtDesc = (GTextField)comp.GetChild("txtDesc");
             m_txtCount = (GTextField)comp.GetChild("txtCount");
             m_listTaskReward = (GList)comp.GetChild("listTaskReward");
-            m_GetRewardBt = (GButton)comp.GetChild("GetRewardBt");
-            m_ComeBt = (GButton)comp.GetChild("ComeBt");
+            m_GetRewardBt = (UI_Button22)UI_Button22.Create(comp.GetChild("GetRewardBt"));
+            m_ComeBt = (UI_Button22)UI_Button22.Create(comp.GetChild("ComeBt"));
+            m_GetRewardBt_2 = (UI_Button22)UI_Button22.Create(comp.GetChild("GetRewardBt"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -79,8 +81,12 @@ namespace UI.CommonGame
             m_txtDesc = null;
             m_txtCount = null;
             m_listTaskReward = null;
+            m_GetRewardBt.Dispose();
             m_GetRewardBt = null;
+            m_ComeBt.Dispose();
             m_ComeBt = null;
+            m_GetRewardBt_2.Dispose();
+            m_GetRewardBt_2 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/Views/ActivityDay7/ActivityDay7View.cs

@@ -187,23 +187,23 @@ namespace GFGGame
             item.m_txtDesc.text = TaskDataManager.Instance.GetTaskDesc(taskCfg.id);
             item.m_txtCount.text =
                 $"{TaskDataManager.Instance.GetTaskProgressById(taskCfg.id)}/{taskCfg.GetTargetCount()}";
-            if (item.m_GetRewardBt.data == null)
+            if (item.m_GetRewardBt.target.data == null)
             {
-                item.m_GetRewardBt.onClick.Add(OnBtnGetClick);
+                item.m_GetRewardBt.target.onClick.Add(OnBtnGetClick);
             }
-            item.m_GetRewardBt.data = taskCfg.id;
-            if (item.m_ComeBt.data == null)
+            item.m_GetRewardBt.target.data = taskCfg.id;
+            if (item.m_ComeBt.target.data == null)
             {
-                item.m_ComeBt.onClick.Add(OnBtnGoClick);
+                item.m_ComeBt.target.onClick.Add(OnBtnGoClick);
             }
-            item.m_ComeBt.data = taskCfg;
+            item.m_ComeBt.target.data = taskCfg;
             if (item.m_listTaskReward.data == null)
             {
                 item.m_listTaskReward.itemRenderer = ListTaskRewardItemRender;
             }
             item.m_listTaskReward.data = TaskDataManager.Instance.GetReward(taskCfg);
             item.m_listTaskReward.numItems = TaskDataManager.Instance.GetReward(taskCfg).Length;
-            RedDotController.Instance.SetComRedDot(item.m_GetRewardBt, item.m_c1.selectedIndex == 1);
+            RedDotController.Instance.SetComRedDot(item.m_GetRewardBt.target, item.m_c1.selectedIndex == 1);
             UI_TaskListItem.ProxyEnd();
         }
 

GameClient/Assets/Game/HotUpdate/Views/Store/BrocadeWeavTask.cs

@@ -114,16 +114,16 @@ namespace GFGGame
             item.m_txtDesc.text = TaskDataManager.Instance.GetTaskDesc(_cfgs[index].id);
             item.m_txtCount.text =
                 $"{TaskDataManager.Instance.GetTaskProgressById(_cfgs[index].id)}/{_cfgs[index].GetTargetCount()}";
-            if (item.m_GetRewardBt.data == null)
+            if (item.m_GetRewardBt.target.data == null)
             {
-                item.m_GetRewardBt.onClick.Add(OnBtnGetClick);
+                item.m_GetRewardBt.target.onClick.Add(OnBtnGetClick);
             }
-            item.m_GetRewardBt.data = _cfgs[index].id;
-            if (item.m_ComeBt.data == null)
+            item.m_GetRewardBt.target.data = _cfgs[index].id;
+            if (item.m_ComeBt.target.data == null)
             {
-                item.m_ComeBt.onClick.Add(OnBtnGoClick);
+                item.m_ComeBt.target.onClick.Add(OnBtnGoClick);
             }
-            item.m_ComeBt.data = _cfgs[index];
+            item.m_ComeBt.target.data = _cfgs[index];
             if (item.m_listTaskReward.data == null)
             {
                 item.m_listTaskReward.itemRenderer = ListTaskRewardItemRender;
@@ -133,7 +133,7 @@ namespace GFGGame
             item.m_listTaskReward.numItems = reward.Length;
             var isBuy = BattlePassTaskDataManager.Instance.GetIsBuy();
             bool canGet = item.m_c1.selectedIndex == 1 && (funcType != TaskFuncType.BattlePass || funcType == TaskFuncType.BattlePass && isBuy);
-            RedDotController.Instance.SetComRedDot(item.m_GetRewardBt, canGet);
+            RedDotController.Instance.SetComRedDot(item.m_GetRewardBt.target, canGet);
             UI_TaskListItem.ProxyEnd();
         }
 

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

@@ -149,16 +149,16 @@ namespace GFGGame
             item.m_txtDesc.text = TaskDataManager.Instance.GetTaskDesc(_cfgs[index].id);
             item.m_txtCount.text =
                 $"{TaskDataManager.Instance.GetTaskProgressById(_cfgs[index].id)}/{_cfgs[index].GetTargetCount()}";
-            if (item.m_GetRewardBt.data == null)
+            if (item.m_GetRewardBt.target.data == null)
             {
-                item.m_GetRewardBt.onClick.Add(OnBtnGetClick);
+                item.m_GetRewardBt.target.onClick.Add(OnBtnGetClick);
             }
-            item.m_GetRewardBt.data = _cfgs[index].id;
-            if (item.m_ComeBt.data == null)
+            item.m_GetRewardBt.target.data = _cfgs[index].id;
+            if (item.m_ComeBt.target.data == null)
             {
-                item.m_ComeBt.onClick.Add(OnBtnGoClick);
+                item.m_ComeBt.target.onClick.Add(OnBtnGoClick);
             }
-            item.m_ComeBt.data = _cfgs[index];
+            item.m_ComeBt.target.data = _cfgs[index];
             if (item.m_listTaskReward.data == null)
             {
                 item.m_listTaskReward.itemRenderer = ListTaskRewardItemRender;
@@ -168,7 +168,7 @@ namespace GFGGame
             item.m_listTaskReward.numItems = reward.Length;
             var isBuy = BattlePassTaskDataManager.Instance.GetIsBuy();
             bool canGet = item.m_c1.selectedIndex == 1;
-            RedDotController.Instance.SetComRedDot(item.m_GetRewardBt, canGet);
+            RedDotController.Instance.SetComRedDot(item.m_GetRewardBt.target, canGet);
             UI_TaskListItem.ProxyEnd();
         }
 

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

@@ -79,14 +79,14 @@ namespace GFGGame
                 $"{TaskDataManager.Instance.GetTaskProgressById(_cfgs[index].id)}/{_cfgs[index].GetTargetCount()}";
             //if (item.m_GetRewardBt.data == null)
             //{
-            //    item.m_GetRewardBt.onClick.Add(OnBtnGetClick);
+            //    item.m_GetRewardBt.target.onClick.Add(OnBtnGetClick);
             //}
             //item.m_GetRewardBt.data = _cfgs[index].id;
             //if (item.m_ComeBt.data == null)
             //{
-            //    item.m_ComeBt.onClick.Add(OnBtnGoClick);
+            //    item.m_ComeBt.target.onClick.Add(OnBtnGoClick);
             //}
-            item.m_ComeBt.data = _cfgs[index];
+            item.m_ComeBt.target.data = _cfgs[index];
             if (item.m_listTaskReward.data == null)
             {
                 item.m_listTaskReward.itemRenderer = ListTaskRewardItemRender;
@@ -96,7 +96,8 @@ namespace GFGGame
             item.m_listTaskReward.numItems = reward.Length;
             var isBuy = BattlePassTaskDataManager.Instance.GetIsBuy();
             bool canGet = item.m_c1.selectedIndex == 1;
-            RedDotController.Instance.SetComRedDot(item.m_GetRewardBt, canGet);
+            RedDotController.Instance.SetComRedDot(item.m_GetRewardBt.target, canGet);
+            RedDotController.Instance.SetComRedDot(item.m_GetRewardBt.target, canGet);
             UI_TaskListItem.ProxyEnd();
         }