Merge branch 'master' of http://10.108.64.190:3000/gfg/client

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

@@ -70,7 +70,6 @@ namespace GFGGame
             }
             _cardDicByType[0][cardData.id] = cardData;
             _cardDicByType[cardData.itemCfg.mainScore][cardData.id] = cardData;
-
         }
 
         private static List<string> GetCardResources(ItemCfg itemCfg)
@@ -137,7 +136,9 @@ namespace GFGGame
         /// <returns></returns>
         public static CardData GetCardDataById(int cardId)
         {
-            if (!_cardDicByType.ContainsKey(0) || !_cardDicByType[0].ContainsKey(cardId)) return null;
+            if (_cardDicByType.Count == 0 || !_cardDicByType.ContainsKey(0) || !_cardDicByType[0].ContainsKey(cardId)) { 
+                return null;
+            }
             return _cardDicByType[0][cardId];
         }
         /// <summary>

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

@@ -118,8 +118,7 @@ namespace GFGGame
                     }
                 }
 
-                if (itemCfg.itemType == ConstItemType.DRESS_UP &&
-                    !DressUpMenuItemCfg1Array.Instance.CheckIsSceneType(itemID))
+                if (itemCfg.itemType == ConstItemType.DRESS_UP)//&& !DressUpMenuItemCfg1Array.Instance.CheckIsSceneType(itemID)
                 {
                     DecomposeDataManager.Instance.Remove(itemID);
                 }
@@ -354,8 +353,9 @@ namespace GFGGame
         public static bool BagIsExistGiftBag()
         {
             var isExistGiftBag = _dataDic.Values.Any(a =>
-                (a.itemType == ConstItemType.USEABLE && a.subType == ConstItemSubType.USEABLE_GIFT_BAG_SELECTABLE) ||
-                (a.itemType == ConstItemType.USEABLE && a.subType == ConstItemSubType.USEABLE_GIFT_BAG_RANDOM));
+                ((a.itemType == ConstItemType.USEABLE && a.subType == ConstItemSubType.USEABLE_GIFT_BAG_SELECTABLE) ||
+                (a.itemType == ConstItemType.USEABLE && a.subType == ConstItemSubType.USEABLE_GIFT_BAG_RANDOM)) 
+                && a.id != 6003001 && a.id != 6003002);
 
             return isExistGiftBag;
         }

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

@@ -415,16 +415,33 @@ namespace GFGGame
             {
                 return false;
             }
+
             if (!DressUpMenuSuitDataManager.CheckHaveSuit(suitId)) return false;
 
             SuitFosterCfg fosterCfg = fosterCfgs[index];
+
             if (fosterCfg.materialsArr.Length == 0) return false;
 
+            CardData cardData = new CardData();
+            List <ItemCfg> itemCfgs = ItemCfgArray.Instance.GetCfgsBysuitId(suitId);
+            for (int i = 0; i < itemCfgs.Count; i++)
+            {
+                if (itemCfgs[i].itemType == ConstItemType.CARD)
+                {
+                    cardData = CardDataManager.GetCardDataById(itemCfgs[i].id);
+                    break;
+                }
+            }
+           
+            if (cardData != null && fosterCfg.cardStar > 0 && cardData.star < fosterCfg.cardStar) {
+                return false;
+            } 
+
             long itemHas = ItemDataManager.GetItemNum(fosterCfg.materialsArr[0][0]);
             int itemNeed = fosterCfg.materialsArr[0][1];
-
             long costHas = ItemDataManager.GetItemNum(fosterCfg.costId);
             int costNeed = fosterCfg.costNum;
+
             return itemHas >= itemNeed && costHas >= costNeed;
         }
         /// <summary>

GameClient/Assets/Game/HotUpdate/DressUp/DressUpObj.cs

@@ -82,7 +82,7 @@ namespace GFGGame
             _showSceneType = showSceneType;
             _showBg = showBg;
             _roleObj = roleObj;
-            if(_dressUpData.IsNew)
+            if (_dressUpData.IsNew)
             {
                 PutOnDefaultDressUpData();
             }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Bag/UI_BagUI.cs

@@ -9,8 +9,8 @@ namespace UI.Bag
         public GComponent target;
         public GLoader m_loaBg;
         public GComponent m_comValueBar;
-        public GButton m_btnback;
         public GList m_list;
+        public GButton m_btnBack;
         public const string URL = "ui://2bsz6nelohbxn";
         public const string PACKAGE_NAME = "Bag";
         public const string RES_NAME = "BagUI";
@@ -60,15 +60,15 @@ namespace UI.Bag
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_comValueBar = (GComponent)comp.GetChild("comValueBar");
-            m_btnback = (GButton)comp.GetChild("btnback");
             m_list = (GList)comp.GetChild("list");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
             m_comValueBar = null;
-            m_btnback = null;
             m_list = null;
+            m_btnBack = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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/FairyGUI/GenCode/League/UI_LeagueChatUI.cs

@@ -10,7 +10,7 @@ namespace UI.League
         public GLoader m_loaBg;
         public GList m_list;
         public GTextInput m_txtChat;
-        public GButton m_btnSend;
+        public UI_Button22 m_btnSend;
         public const string URL = "ui://tw70qm9dofwu8d";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "LeagueChatUI";
@@ -61,13 +61,14 @@ namespace UI.League
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_list = (GList)comp.GetChild("list");
             m_txtChat = (GTextInput)comp.GetChild("txtChat");
-            m_btnSend = (GButton)comp.GetChild("btnSend");
+            m_btnSend = (UI_Button22)UI_Button22.Create(comp.GetChild("btnSend"));
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
             m_list = null;
             m_txtChat = null;
+            m_btnSend.Dispose();
             m_btnSend = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_MainUI.cs

@@ -9,13 +9,6 @@ namespace UI.Main
         public GComponent target;
         public GComponent m_valueBar;
         public GGroup m_grpLeagueAnswer;
-        public GList m_list;
-        public UI_ButtonChange m_btnChange;
-        public GGroup m_grpList;
-        public UI_ComAd m_comListAd;
-        public UI_BtnModle1 m_btnDailyWelfare;
-        public UI_BtnModle2 m_btnActivityDay7;
-        public UI_BtnModle2 m_btnActivityLuckyBox;
         public UI_ButtonModle1 m_btnMain;
         public UI_ButtonModle1 m_btnHuanZhuang;
         public UI_ButtonModle1 m_btnXiuFang;
@@ -29,6 +22,12 @@ namespace UI.Main
         public UI_ComponentHeadBar m_headBar;
         public GButton m_btnYouJian;
         public GButton m_btnGongGao;
+        public GList m_list;
+        public UI_ButtonChange m_btnChange;
+        public UI_ComAd m_comListAd;
+        public UI_BtnModle1 m_btnDailyWelfare;
+        public UI_BtnModle2 m_btnActivityDay7;
+        public UI_BtnModle2 m_btnActivityLuckyBox;
         public GGroup m_grpLeft;
         public GButton m_loaLeft;
         public UI_ButtonModle7 m_btn1;
@@ -94,13 +93,6 @@ namespace UI.Main
         {
             m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_grpLeagueAnswer = (GGroup)comp.GetChild("grpLeagueAnswer");
-            m_list = (GList)comp.GetChild("list");
-            m_btnChange = (UI_ButtonChange)UI_ButtonChange.Create(comp.GetChild("btnChange"));
-            m_grpList = (GGroup)comp.GetChild("grpList");
-            m_comListAd = (UI_ComAd)UI_ComAd.Create(comp.GetChild("comListAd"));
-            m_btnDailyWelfare = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnDailyWelfare"));
-            m_btnActivityDay7 = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityDay7"));
-            m_btnActivityLuckyBox = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityLuckyBox"));
             m_btnMain = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnMain"));
             m_btnHuanZhuang = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnHuanZhuang"));
             m_btnXiuFang = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnXiuFang"));
@@ -114,6 +106,12 @@ namespace UI.Main
             m_headBar = (UI_ComponentHeadBar)UI_ComponentHeadBar.Create(comp.GetChild("headBar"));
             m_btnYouJian = (GButton)comp.GetChild("btnYouJian");
             m_btnGongGao = (GButton)comp.GetChild("btnGongGao");
+            m_list = (GList)comp.GetChild("list");
+            m_btnChange = (UI_ButtonChange)UI_ButtonChange.Create(comp.GetChild("btnChange"));
+            m_comListAd = (UI_ComAd)UI_ComAd.Create(comp.GetChild("comListAd"));
+            m_btnDailyWelfare = (UI_BtnModle1)UI_BtnModle1.Create(comp.GetChild("btnDailyWelfare"));
+            m_btnActivityDay7 = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityDay7"));
+            m_btnActivityLuckyBox = (UI_BtnModle2)UI_BtnModle2.Create(comp.GetChild("btnActivityLuckyBox"));
             m_grpLeft = (GGroup)comp.GetChild("grpLeft");
             m_loaLeft = (GButton)comp.GetChild("loaLeft");
             m_btn1 = (UI_ButtonModle7)UI_ButtonModle7.Create(comp.GetChild("btn1"));
@@ -135,18 +133,6 @@ namespace UI.Main
         {
             m_valueBar = null;
             m_grpLeagueAnswer = null;
-            m_list = null;
-            m_btnChange.Dispose();
-            m_btnChange = null;
-            m_grpList = null;
-            m_comListAd.Dispose();
-            m_comListAd = null;
-            m_btnDailyWelfare.Dispose();
-            m_btnDailyWelfare = null;
-            m_btnActivityDay7.Dispose();
-            m_btnActivityDay7 = null;
-            m_btnActivityLuckyBox.Dispose();
-            m_btnActivityLuckyBox = null;
             m_btnMain.Dispose();
             m_btnMain = null;
             m_btnHuanZhuang.Dispose();
@@ -170,6 +156,17 @@ namespace UI.Main
             m_headBar = null;
             m_btnYouJian = null;
             m_btnGongGao = null;
+            m_list = null;
+            m_btnChange.Dispose();
+            m_btnChange = null;
+            m_comListAd.Dispose();
+            m_comListAd = null;
+            m_btnDailyWelfare.Dispose();
+            m_btnDailyWelfare = null;
+            m_btnActivityDay7.Dispose();
+            m_btnActivityDay7 = null;
+            m_btnActivityLuckyBox.Dispose();
+            m_btnActivityLuckyBox = null;
             m_grpLeft = null;
             m_loaLeft = null;
             m_btn1.Dispose();

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

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Task
+{
+    public partial class UI_AchieveItem
+    {
+        public GComponent target;
+        public GTextField m_txtName;
+        public const string URL = "ui://5mpsibzzaignto5";
+        public const string PACKAGE_NAME = "Task";
+        public const string RES_NAME = "AchieveItem";
+        private static UI_AchieveItem _proxy;
+
+        public static UI_AchieveItem Create(GObject gObject = null)
+        {
+            var ui = new UI_AchieveItem();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_AchieveItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_AchieveItem();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)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_txtName = (GTextField)comp.GetChild("txtName");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtName = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_AchieveItem.cs.meta

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

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

@@ -11,6 +11,8 @@ namespace UI.Task
         public UI_LivenessRewardProcess m_LivenessProcess;
         public GList m_TaskList;
         public GButton m_GetAll;
+        public GTextField m_txtLevel;
+        public GTextField m_txtLevel_2;
         public const string URL = "ui://5mpsibzzfqor2p";
         public const string PACKAGE_NAME = "Task";
         public const string RES_NAME = "CombTaskUI";
@@ -62,6 +64,8 @@ namespace UI.Task
             m_LivenessProcess = (UI_LivenessRewardProcess)UI_LivenessRewardProcess.Create(comp.GetChild("LivenessProcess"));
             m_TaskList = (GList)comp.GetChild("TaskList");
             m_GetAll = (GButton)comp.GetChild("GetAll");
+            m_txtLevel = (GTextField)comp.GetChild("txtLevel");
+            m_txtLevel_2 = (GTextField)comp.GetChild("txtLevel");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -70,6 +74,8 @@ namespace UI.Task
             m_LivenessProcess = null;
             m_TaskList = null;
             m_GetAll = null;
+            m_txtLevel = null;
+            m_txtLevel_2 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Task
+{
+    public partial class UI_TaskAchieveDetailUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GButton m_btnBack;
+        public GList m_listAchieveTask;
+        public const string URL = "ui://5mpsibzzaigntob";
+        public const string PACKAGE_NAME = "Task";
+        public const string RES_NAME = "TaskAchieveDetailUI";
+        private static UI_TaskAchieveDetailUI _proxy;
+
+        public static UI_TaskAchieveDetailUI Create(GObject gObject = null)
+        {
+            var ui = new UI_TaskAchieveDetailUI();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_TaskAchieveDetailUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_TaskAchieveDetailUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)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_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_listAchieveTask = (GList)comp.GetChild("listAchieveTask");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_btnBack = null;
+            m_listAchieveTask = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_TaskAchieveDetailUI.cs.meta

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

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

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Task
+{
+    public partial class UI_TaskAchieveUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GButton m_btnBack;
+        public GList m_listAchieveItem;
+        public const string URL = "ui://5mpsibzzaigntny";
+        public const string PACKAGE_NAME = "Task";
+        public const string RES_NAME = "TaskAchieveUI";
+        private static UI_TaskAchieveUI _proxy;
+
+        public static UI_TaskAchieveUI Create(GObject gObject = null)
+        {
+            var ui = new UI_TaskAchieveUI();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_TaskAchieveUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_TaskAchieveUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)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_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_listAchieveItem = (GList)comp.GetChild("listAchieveItem");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_btnBack = null;
+            m_listAchieveItem = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Task/UI_TaskAchieveUI.cs.meta

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

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

@@ -9,11 +9,11 @@ namespace UI.Task
         public GComponent target;
         public Controller m_c1;
         public GLoader m_loaBg;
-        public GComponent m_comValueBar;
         public GButton m_btnBack;
         public GButton m_btnTask;
         public GButton m_btnWeekly;
         public UI_CombTaskUI m_taskInfoCom;
+        public GButton m_btnAchieve;
         public const string URL = "ui://5mpsibzzfqor2n";
         public const string PACKAGE_NAME = "Task";
         public const string RES_NAME = "TaskUI";
@@ -63,22 +63,22 @@ namespace UI.Task
         {
             m_c1 = comp.GetController("c1");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_comValueBar = (GComponent)comp.GetChild("comValueBar");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnTask = (GButton)comp.GetChild("btnTask");
             m_btnWeekly = (GButton)comp.GetChild("btnWeekly");
             m_taskInfoCom = (UI_CombTaskUI)UI_CombTaskUI.Create(comp.GetChild("taskInfoCom"));
+            m_btnAchieve = (GButton)comp.GetChild("btnAchieve");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
             m_loaBg = null;
-            m_comValueBar = null;
             m_btnBack = null;
             m_btnTask = null;
             m_btnWeekly = null;
             m_taskInfoCom.Dispose();
             m_taskInfoCom = null;
+            m_btnAchieve = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/GameGlobal.cs

@@ -29,6 +29,7 @@ namespace GFGGame
         public static bool DataInited;
         public static NumericComponent myNumericComponent;
         public static int lastLoginTime;//上次登录时间
+        public static bool isLogon;//是否是重新登录
 
 
 

GameClient/Assets/Game/HotUpdate/ServerProxy/CardSProxy.cs

@@ -32,6 +32,7 @@ namespace GFGGame
                         SkillDataManager.Instance.InitCardData(response.CardInfos[i].CardId, response.CardInfos[i].KsSkill, response.CardInfos[i].VsSkill);
                     }
                     EventAgent.DispatchEvent(ConstMessage.CARD_INFO);
+                    EventAgent.DispatchEvent(ConstMessage.RED_CHANGE);
                 }
             }
         }

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/Bag/BagView.cs

@@ -46,12 +46,12 @@ namespace GFGGame
 
             _valueBarController = new ValueBarController(_ui.m_comValueBar);
 
-            _ui.m_btnback.onClick.Add(OnBtnBackClick);
+            _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _ui.m_list.SetVirtual();
             _ui.m_list.itemRenderer = ListItemRender;
             _ui.m_list.onClickItem.Add(OnListItemClick);
 
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("tc_bjbj");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("cp_beijing");
         }
 
         protected override void AddEventListener()
@@ -102,11 +102,14 @@ namespace GFGGame
             item.m_txtCount.text = itemData.num.ToString();
             item.target.data = itemCfg;
             item.m_QualityType.selectedIndex = itemCfg.rarity - 1;
+            item.m_ShowName.selectedIndex = 1;
+            item.m_txtName.text = itemCfg.name;
             //是礼包就加入红点
-            if ((itemCfg.itemType == ConstItemType.USEABLE &&
+            if (((itemCfg.itemType == ConstItemType.USEABLE &&
                  itemCfg.subType == ConstItemSubType.USEABLE_GIFT_BAG_SELECTABLE) ||
                 (itemCfg.itemType == ConstItemType.USEABLE &&
                  itemCfg.subType == ConstItemSubType.USEABLE_GIFT_BAG_RANDOM))
+                 && itemData.id != 6003001 && itemData.id != 6003002)
             {
                 RedDotController.Instance.SetComRedDot(item.target, true);
             }

GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -130,9 +130,9 @@ namespace GFGGame
             //_ui.m_comCard.target.onClick.Add(OnClickComCard);
 
             _ui.m_comImgCard.target.onTouchBegin.Add(onTouchCardBegin);
-            _ui.m_comImgCard.target.onTouchEnd.Add(onTouchImgCardEnd);
+            _ui.m_comImgCard.target.onTouchEnd.Add(onTouchCardEnd);
             _ui.m_loaListener1.onTouchBegin.Add(onTouchCardBegin);
-            _ui.m_loaListener1.onTouchEnd.Add(onTouchImgCardEnd);
+            _ui.m_loaListener1.onTouchEnd.Add(onTouchCardEnd);
             _ui.m_loaListener.onTouchBegin.Add(onTouchCardBegin);
             _ui.m_loaListener.onTouchEnd.Add(onTouchCardEnd);
             _ui.m_comCard.target.onTouchBegin.Add(onTouchCardBegin);
@@ -144,21 +144,26 @@ namespace GFGGame
 
         private void RefLeftAndRight()
         {
-            _ui.m_btnRight.grayed = false;
-            _ui.m_btnRight.touchable = true;
-            _ui.m_btnLeft.grayed = false;
-            _ui.m_btnLeft.touchable = true;
-
             if (nowIndex <= 0)
             {
                 _ui.m_btnLeft.grayed = true;
                 _ui.m_btnLeft.touchable = false;
             }
-            else if (nowIndex >= cardList.Count - 1)
+            else {
+                _ui.m_btnLeft.grayed = false;
+                _ui.m_btnLeft.touchable = true;
+            }
+
+            if (nowIndex >= cardList.Count - 1)
             {
                 _ui.m_btnRight.grayed = true;
                 _ui.m_btnRight.touchable = false;
             }
+            else
+            {
+                _ui.m_btnRight.grayed = false;
+                _ui.m_btnRight.touchable = true;
+            }
         }
 
         private void OnClickBtnLeft()
@@ -1013,42 +1018,27 @@ namespace GFGGame
             float diffValueX = touchBeginX - inputEvent.x;
             if (diffValueX > 20 && showCard == false)
             {
-                if (nowIndex < cardList.Count - 1) { 
+                if (nowIndex < cardList.Count - 1)
+                {
                     OnClickBtnRight();
                     RefLeftAndRight();
                 }
             }
-            else if (diffValueX < - 20 && showCard == false)
+            else if (diffValueX < -20 && showCard == false)
             {
-                if (nowIndex > 0) { 
+                if (nowIndex > 0)
+                {
                     OnClickBtnLeft();
                     RefLeftAndRight();
                 }
             }
-            else if (diffValueX <= 20 && diffValueX >= - 20)
-                OnClickComCard();
-        }
-
-        private void onTouchImgCardEnd(EventContext context)
-        {
-            InputEvent inputEvent = (InputEvent)context.data;
-            float diffValueX = touchBeginX - inputEvent.x;
-            if (diffValueX > 20 && showCard == false)
+            else if (diffValueX <= 20 && diffValueX >= -20)
             {
-                if (nowIndex < cardList.Count - 1) { 
-                    OnClickBtnRight();
-                    RefLeftAndRight();
-                }
-            }
-            else if (diffValueX < - 20 && showCard == false)
-            {
-                if (nowIndex > 0) { 
-                    OnClickBtnLeft();
-                    RefLeftAndRight();
-                }
+                if(_ui.m_c1.selectedIndex == 1)
+                    OnClickComCard();
+                else
+                    OnClickLoaCard();
             }
-            else if(diffValueX <= 20 && diffValueX >= - 20)
-                OnClickLoaCard();
         }
 
         private void OnClickLoaCard()

GameClient/Assets/Game/HotUpdate/Views/League/LeagueChatView.cs

@@ -34,7 +34,7 @@ namespace GFGGame
             _ui.m_list.itemProvider = GetListChatItemResource;
             _ui.m_list.SetVirtual();
 
-            _ui.m_btnSend.onClick.Add(OnBtnSendClick);
+            _ui.m_btnSend.target.onClick.Add(OnBtnSendClick);
         }
         protected override void AddEventListener()
         {
@@ -90,6 +90,12 @@ namespace GFGGame
         }
         private async void OnBtnSendClick()
         {
+            if (_ui.m_btnSend.m_c1.selectedIndex == 1)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("消息发送频繁");
+                return;
+            }
+            
             if (string.IsNullOrEmpty(_ui.m_txtChat.text))
             {
                 PromptController.Instance.ShowFloatTextPrompt("还没有输入想发送的内容哦");
@@ -100,6 +106,19 @@ namespace GFGGame
             {
                 _ui.m_txtChat.text = "";
                 UpdateChatList();
+                
+                int num = GlobalCfgArray.globalCfg.chatTime;
+                _ui.m_btnSend.m_timeStr.text = num.ToString();
+                _ui.m_btnSend.m_c1.selectedIndex = 1;
+                Timers.inst.Add(1, 10, (param) =>
+                {
+                    num--;
+                    _ui.m_btnSend.m_timeStr.text = num.ToString();
+                    if (num == 0)
+                    {
+                        _ui.m_btnSend.m_c1.selectedIndex = 0;
+                    }
+                });
             }
         }
     }

GameClient/Assets/Game/HotUpdate/Views/Login/LoginView.cs

@@ -102,6 +102,8 @@ namespace GFGGame
                 //初始化平台配置
                 QDManager.InitPlatform();
             }
+
+            GameGlobal.isLogon = true;
         }
 
         protected override void OnHide()

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

@@ -40,11 +40,7 @@ namespace GFGGame
 
         private GButton _btnActivityDay7;
 
-        private EffectUI _effectUI1;
-        private EffectUI _effectUI2;
-        private EffectUI _effectUI3;
-        private EffectUI _effectUI4;
-        private EffectUI _effectUI5;
+        private List<EffectUI> _effectUIList = new List<EffectUI>();
 
 
         private UI_ButtonModle1[] _btns;
@@ -57,17 +53,13 @@ namespace GFGGame
                 _valueBarController = null;
             }
 
-            EffectUIPool.Recycle(_effectUI1);
-            _effectUI1 = null;
-            EffectUIPool.Recycle(_effectUI2);
-            _effectUI2 = null;
-            EffectUIPool.Recycle(_effectUI3);
-            _effectUI3 = null;
-            EffectUIPool.Recycle(_effectUI4);
-            _effectUI4 = null;
-            EffectUIPool.Recycle(_effectUI5);
-            _effectUI5 = null;
-            
+            // Clear Effect
+            for (int i = 0; i < _effectUIList.Capacity; i++)
+            {
+                EffectUIPool.Recycle(_effectUIList[i]);
+            }
+            _effectUIList.Clear();
+
 
             if (_sceneObject != null)
             {
@@ -213,18 +205,19 @@ namespace GFGGame
             _valueBarController.OnShown();
 
 
-            long lastTime =
-                GameGlobal.lastLoginTime; // GameGlobal.myNumericComponent.GetAsInt(NumericType.OnlineTimeSecs);
+            //long lastTime = GameGlobal.lastLoginTime; // GameGlobal.myNumericComponent.GetAsInt(NumericType.OnlineTimeSecs);
 
-            if (!TimeUtil.CheckIsSameTime(lastTime * 1000, TimeHelper.ClientNow()))
+            //if (!TimeUtil.CheckIsSameTime(lastTime * 1000, TimeHelper.ClientNow()))
+            if (GameGlobal.isLogon)
             {
                 if (ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.CAN_GET &&
                     GuideDataManager.currentGuideId <= 0)
                 {
                     ViewManager.Show<SevenDayLoginView>();
+                    GameGlobal.isLogon = false;
                 }
-                
-                GameGlobal.lastLoginTime = GameGlobal.myNumericComponent.GetAsInt(NumericType.OnlineTimeSecs);
+
+                //GameGlobal.lastLoginTime = GameGlobal.myNumericComponent.GetAsInt(NumericType.OnlineTimeSecs);
             }
 
             SetPos();
@@ -268,11 +261,11 @@ namespace GFGGame
 
         private void AddEffect()
         {
-            _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_btnMain.m_holder, "ui_zjm", "ZJM_szl_down_3");
-            _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_btnMain.m_holder1, "ui_zjm", "ZJM_szl_top_1");
-            _effectUI3 = EffectUIPool.CreateEffectUI(_ui.m_btnHaiZhiShi.m_holder, "ui_zjm", "ZJM_hzs_down_3");
-            _effectUI4 = EffectUIPool.CreateEffectUI(_ui.m_btnHaiZhiShi.m_holder1, "ui_zjm", "ZJM_hzs_top_1");
-            _effectUI5 = EffectUIPool.CreateEffectUI(_ui.m_BottomEffectHolder, "ui_zjm", "ZJM_DiBan");
+            _effectUIList.Add(EffectUIPool.CreateEffectUI(_ui.m_btnMain.m_holder, "ui_zjm", "ZJM_szl_down_3"));
+            _effectUIList.Add(EffectUIPool.CreateEffectUI(_ui.m_btnMain.m_holder1, "ui_zjm", "ZJM_szl_top_1"));
+            _effectUIList.Add(EffectUIPool.CreateEffectUI(_ui.m_btnHaiZhiShi.m_holder, "ui_zjm", "ZJM_hzs_down_3"));
+            _effectUIList.Add(EffectUIPool.CreateEffectUI(_ui.m_btnHaiZhiShi.m_holder1, "ui_zjm", "ZJM_hzs_top_1"));
+            _effectUIList.Add(EffectUIPool.CreateEffectUI(_ui.m_BottomEffectHolder, "ui_zjm", "ZJM_DiBan"));
         }
 
         private void SetPos()
@@ -412,7 +405,7 @@ namespace GFGGame
             // {
             // _ui.m_btnMain.m_holder1.visible = false;
             // this.Hide();
-            ViewManager.Show<StoryChapterListView>( null,
+            ViewManager.Show<StoryChapterListView>(null,
                 new object[] { ViewName.MAINUI_VIEW, this.viewData });
             isOpen = false;
             ;
@@ -464,7 +457,7 @@ namespace GFGGame
             // Timers.inst.Add(effectTime, 1, (param) =>
             // {
             _ui.m_btnXiuFang.m_holder1.visible = false;
-            ViewManager.Show<XiuFangView>( null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
+            ViewManager.Show<XiuFangView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
             isOpen = false;
 
 
@@ -857,7 +850,7 @@ namespace GFGGame
             if (_ui.m_btnFirstRecharge.target.visible)
             {
                 bool canget = ActivityDataManager.Instance.firstChargeBonusStatus == ConstBonusStatus.CAN_GET;
-                RedDotController.Instance.SetComRedDot(_ui.m_btnFirstRecharge.target, canget);
+                RedDotController.Instance.SetComRedDot(_ui.m_btnFirstRecharge.target, canget, "", -10, 10);
             }
         }
 
@@ -1000,7 +993,7 @@ namespace GFGGame
             RedDotController.Instance.SetComRedDot(_ui.m_headBar.m_comHead, RedDotDataManager.Instance.GetHeadRed() || RedDotDataManager.Instance.GetHeadBorderRed(), "", -26, 42);
 
             RedDotController.Instance.SetComRedDot(_ui.m_btnTravel.target, RedDotDataManager.Instance.GetTravelRed(), "", -36, 32);
-            RedDotController.Instance.SetComRedDot(_btnLeague, RedDotDataManager.Instance.GetLeagueRed());
+            RedDotController.Instance.SetComRedDot(_btnLeague, RedDotDataManager.Instance.GetLeagueRed(), "", -8);
             RedDotController.Instance.SetComRedDot(_ui.m_btnDailyWelfare.target, RedDotDataManager.Instance.GetDailyWelfareRed(), "", 9, -1);
             RedDotController.Instance.SetComRedDot(_ui.m_btnActivityLuckyBox.target, RedDotDataManager.Instance.GetMeiRiTeHuiRed() || RedDotDataManager.Instance.GetActLuckyBoxRewardRed() || RedDotDataManager.Instance.GetActLuckyBoxTaskdRed() || RedDotDataManager.Instance.GetGiftBagRewardRed(), "", 9, -1);
             RedDotController.Instance.SetComRedDot(_btnBag, RedDotDataManager.Instance.GetMainBagGiftRed(), "", -8);

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

@@ -95,6 +95,7 @@ namespace GFGGame
             DailyTaskDataManager.Instance.GetShowLivenessBoxNum(funcType);
             _ui.m_LivenessProcess.target.max = 100;
             _ui.m_LivenessProcess.target.value = liveness;
+            _ui.m_txtLevel.text = liveness.ToString();
             var cfgs = TaskActiveRewardCfgArray.Instance.GetCfgsByfuncType(funcType);
             for (var i = 0; i < cfgs.Count; i++)
             {
@@ -148,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;
@@ -167,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

@@ -0,0 +1,115 @@
+using FairyGUI;
+using System.Collections.Generic;
+using UI.CommonGame;
+using UI.Task;
+
+namespace GFGGame
+{
+    public class TaskAchieveDetailView : BaseWindow
+    {
+        private UI_TaskAchieveDetailUI _ui;
+        private List<TaskCfg> _cfgs;
+        private int funcType = TaskFuncType.BattlePass;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_TaskAchieveDetailUI.PACKAGE_NAME;
+            _ui = UI_TaskAchieveDetailUI.Create();
+            viewCom = _ui.target;
+            isfullScreen = true;
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("chengjiu_bg");
+            _ui.m_btnBack.onClick.Add(OnBtnBackClick);
+            _ui.m_listAchieveTask.itemRenderer = RenderListAchieveTask;
+        }
+
+        private void OnBtnBackClick()
+        {
+            ViewManager.Hide<TaskAchieveDetailView>();
+        }
+
+    
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _cfgs = TaskDataManager.Instance.GetTaskCfgs(funcType);
+            UpdateTask();
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+        private void UpdateTask()
+        {
+            _cfgs = TaskDataManager.Instance.GetTaskCfgs(funcType);
+            _ui.m_listAchieveTask.numItems = _cfgs.Count;
+        }
+
+        private void RenderListAchieveTask(int index, GObject obj)
+        {
+            var item = UI_TaskListItem.Proxy(obj);
+            //Áìȡ״̬
+            item.m_c1.selectedIndex = TaskDataManager.Instance.GetTaskStateById(_cfgs[index].id);
+            item.m_c2.selectedIndex = _cfgs[index].jumpId == "" ? 1 : 0;
+            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)
+            //{
+            //    item.m_GetRewardBt.target.onClick.Add(OnBtnGetClick);
+            //}
+            //item.m_GetRewardBt.data = _cfgs[index].id;
+            //if (item.m_ComeBt.data == null)
+            //{
+            //    item.m_ComeBt.target.onClick.Add(OnBtnGoClick);
+            //}
+            item.m_ComeBt.target.data = _cfgs[index];
+            if (item.m_listTaskReward.data == null)
+            {
+                item.m_listTaskReward.itemRenderer = ListTaskRewardItemRender;
+            }
+            var reward = TaskDataManager.Instance.GetReward(_cfgs[index]);
+            item.m_listTaskReward.data = reward;
+            item.m_listTaskReward.numItems = reward.Length;
+            var isBuy = BattlePassTaskDataManager.Instance.GetIsBuy();
+            bool canGet = item.m_c1.selectedIndex == 1;
+            RedDotController.Instance.SetComRedDot(item.m_GetRewardBt.target, canGet);
+            RedDotController.Instance.SetComRedDot(item.m_GetRewardBt.target, canGet);
+            UI_TaskListItem.ProxyEnd();
+        }
+
+        private static void ListTaskRewardItemRender(int index, GObject obj)
+        {
+            var rewards = (int[][])obj.parent.data;
+            var itemData = ItemUtil.createItemData(rewards[index]);
+            var item = new ItemView(obj as GComponent);
+            obj.data = item;
+            item.SetData(itemData);
+            item.ChangeTxtCountStyle();
+            UI_RewardIconYellow.ProxyEnd();
+        }
+    }
+}

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

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

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

@@ -0,0 +1,72 @@
+using FairyGUI;
+using UI.Task;
+
+namespace GFGGame
+{
+    public class TaskAchieveView : BaseWindow
+    {
+        private UI_TaskAchieveUI _ui;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_TaskAchieveUI.PACKAGE_NAME;
+            _ui = UI_TaskAchieveUI.Create();
+            viewCom = _ui.target;
+            isfullScreen = true;
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("chengjiu_bg");
+            _ui.m_btnBack.onClick.Add(OnBtnBackClick);
+            _ui.m_listAchieveItem.itemRenderer = RenderListAchieveItem;
+            _ui.m_listAchieveItem.onClickItem.Add(OnClickListRarityItem);
+        }
+
+        private void OnBtnBackClick()
+        {
+            ViewManager.Hide<TaskAchieveView>();
+        }
+
+        private void OnClickListRarityItem(EventContext context)
+        {
+            ViewManager.Show<TaskAchieveDetailView>();
+        }
+
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _ui.m_listAchieveItem.numItems = 5;
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+        private void RenderListAchieveItem(int index, GObject obj)
+        {
+            UI_AchieveItem listItem = UI_AchieveItem.Proxy(obj);
+            listItem.m_txtName.text = "ÈÎÎñ";
+            UI_AchieveItem.ProxyEnd();
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/Task/TaskAchieveView.cs.meta

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

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

@@ -6,16 +6,10 @@ namespace GFGGame
     public class TaskView : BaseWindow
     {
         private UI_TaskUI _ui;
-        private ValueBarController _valueBarController;
         private CombTaskController _combTaskController;
 
         public override void Dispose()
         {
-            if (_valueBarController != null)
-            {
-                _valueBarController.Dispose();
-                _valueBarController = null;
-            }
             if(_combTaskController != null)
             {
                 _combTaskController.Dispose();
@@ -39,9 +33,9 @@ namespace GFGGame
             isfullScreen = true;
             bringToFontOnClick = false;
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
-            _valueBarController = new ValueBarController(_ui.m_comValueBar);
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("quanping_moren_bg");
             _ui.m_c1.onChanged.Add(OnCtrlChange);
+            _ui.m_btnAchieve.onClick.Add(OnBtnAchieveClick);
             _combTaskController = new CombTaskController(_ui.m_taskInfoCom);
         }
 
@@ -52,6 +46,11 @@ namespace GFGGame
             ViewManager.GoBackFrom(typeof(TaskView).FullName);
         }
 
+        private void OnBtnAchieveClick()
+        {
+            ViewManager.Show<TaskAchieveView>();
+        }
+            
         protected override void AddEventListener()
         {
             base.AddEventListener();
@@ -69,7 +68,6 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _valueBarController.OnShown();
             int selectedIndex = 0;
             if (viewData != null)
             {
@@ -88,7 +86,6 @@ namespace GFGGame
         {
             base.OnHide();
             _ui.m_c1.selectedIndex = 0;
-            _valueBarController.OnHide();
             UpdateRedPoint();
         }
 

GameClient/Assets/ResIn/UI/League/League_atlas0_8!a.png.meta → GameClient/Assets/ResIn/UI/Task/Task_atlas0_3!a.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 726e7f10cd7fec847806366b24311ae0
+guid: 016d38e7535b991498476c92087f8915
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

GameClient/Assets/ResIn/UI/League/League_atlas0_8.png.meta → GameClient/Assets/ResIn/UI/Task/Task_atlas0_3.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f1597f8c9e40b17439e8c3621066718a
+guid: e3263f0fdbe4c8745976dd24bda50a16
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

GameClient/Assets/ResIn/UI/Task/Task_atlas0_4!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 724092c2de7d4b54599ad22cf8583f93
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/Task/Task_atlas0_4.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 200cabac085b0f240b2b99fbb572cf71
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: