Merge remote-tracking branch 'remotes/origin/master' into xiaojie

GameClient/Assets/Game/HotUpdate/Constant/ConstStoreSubId.cs

@@ -1,20 +0,0 @@
-namespace GFGGame
-{
-    public class ConstStoreSubId
-    {
-        public const int STORE_CHARGE = 0;//充值
-        public const int STORE_CHARGE_ADDUP = 1;//累计充值
-        public const int STORE_MONTH_GOLD_CARD = 0;//灵犀卡
-        public const int STORE_MONTH_BLACK_CARD = 1;//璇玑卡
-        public const int STORE_GIFT_BAG_ACTIVITY = 0;//活动
-        public const int STORE_GIFT_BAG_TIME_LIMIT = 1;//珍珠商城
-        public const int STORE_GIFT_BAG_GREATEST = 2;//材料商城
-        public const int STORE_GIFT_BAG_HOT = 3;//热销
-        public const int STORE_EXCHANGE_GALLERY = 0;//画廊商城
-        public const int STORE_EXCHANGE_LEAGUE = 1;//雅集商城
-        public const int STORE_ARENA_ITEM = 0;//竞技场
-        public const int FU_ZHUANG_DIAN = 0;//服装店
-        public const int ENDURING_GIFT_BOX_POWER = 0;//常驻礼包-体力
-        public const int ENDURING_GIFT_BOX_GOLD = 1;//常驻礼包-金币
-    }
-}

GameClient/Assets/Game/HotUpdate/Constant/ConstStoreSubId.cs.meta

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

GameClient/Assets/Game/HotUpdate/Constant/ConstStoreTabId.cs

@@ -1,15 +0,0 @@
-namespace GFGGame
-{
-    public class ConstStoreTabId
-    {
-        public const int STORE_CHARGE = 1;//商城-充值
-        public const int STORE_MONTH_CARD = 2;//商城-月卡
-        public const int STORE_GIFT_BAG = 3;//商城-礼包
-        public const int STORE_EXCHANGE = 4;//商城-兑换
-        public const int STORE_ARENA = 5;//商城-竞技场
-
-        public const int FU_ZHUANG_DIAN = 101;//服装店
-        
-        public const int ENDURING_GIFT_BOX = 105;//常驻礼包
-    }
-}

GameClient/Assets/Game/HotUpdate/Constant/ConstStoreTabId.cs.meta

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

GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -292,6 +292,7 @@ namespace GFGGame
             MailSProxy.ReqMailCount().Coroutine();
             FriendSProxy.ReqAllFriendInfos().Coroutine();
             PoemGallerySProxy.ReqGalleryTheme().Coroutine();
+            TaskSProxy.GetTaskInfos();
         }
 
         public static void GoBackToMainView()

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

@@ -175,6 +175,12 @@ namespace GFGGame
                     {
                         return string.Format(activeRewardCfg.desc, taskCfg.paramsArr[0]);
                     }
+                case ConstTaskType.PlayTheLuckyBox:
+                    var luckyBoxId = taskCfg.paramsArr[0];
+                    var luckyBoxCfg = LuckyBoxCfgArray.Instance.GetCfg(luckyBoxId);
+                    return string.Format(activeRewardCfg.desc, luckyBoxCfg.name, taskCfg.GetTargetCount());
+                case ConstTaskType.UpgradeCardSkill:
+                    return string.Format(activeRewardCfg.desc, taskCfg.paramsArr[0], taskCfg.GetTargetCount());
                 default: return string.Format(activeRewardCfg.desc, taskCfg.GetTargetCount());
             }
         }

GameClient/Assets/Game/HotUpdate/Effect/EffectUI.cs

@@ -32,7 +32,6 @@ namespace GFGGame
             _gameObject.transform.localScale = new Vector3(scale, scale, scale);
             _wrapper = new GoWrapper(_gameObject);
             holder.SetNativeObject(_wrapper);
-
         }
 
 

GameClient/Assets/Game/HotUpdate/Effect/EffectUIPool.cs

@@ -12,6 +12,7 @@ namespace GFGGame
             EffectUI effectUI;
             if (effectUIs.Count > 0)
             {
+
                 int lastIndex = effectUIs.Count - 1;
                 effectUI = effectUIs[lastIndex];
                 effectUIs.RemoveAt(lastIndex);

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

@@ -61,6 +61,7 @@ namespace GFGGame
         //获取所有类型的任务信息
         public static void GetTaskInfos()
         {
+            TaskDataManager.Instance.Clear();
             for (var i = TaskType.Daily; i < TaskType.TaskMax; i++) GetTaskInfos(i).Coroutine();
         }
 

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

@@ -317,7 +317,7 @@ namespace GFGGame
                 _ui.m_comRenewReward.m_loaReward.url = ResPathUtil.GetIconPath(itemCfg);
             }
             _ui.m_txtRenewProperty.text = string.Format("套装所有部件属性+{0}%", renewCfg.addition * 100 / 10000);
-            _ui.m_txtRenewTips.text = string.Format("完成{0}阶段", SuitFosterDataManager.Instance.stepNames[cfg.renewOpenLv - 1]);
+            _ui.m_txtRenewTips.text = string.Format("完成养护-{0}阶段", SuitFosterDataManager.Instance.stepNames[cfg.renewOpenLv - 1]);
             _ui.m_listRenewMaterial.numItems = renewCfg.materialsArr.Length;
 
             long costHas = ItemDataManager.GetItemNum(renewCfg.costId);

GameClient/Assets/Game/HotUpdate/Views/CommonGame/GetSuitItemVIew.cs

@@ -76,7 +76,6 @@ namespace GFGGame
             int suitId = GetSuitItemController.TryShow(0);
             if (suitId > 0)
             {
-
                 UpdateView(suitId);
             }
             else

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

@@ -230,7 +230,9 @@ namespace GFGGame
             item.m_loaIcon.url = string.Format("ui://League/tb_jn_{0}", _type);
             bool isLock = !SkillDataManager.Instance.LeagueSkillDatas.ContainsKey(_type) ||
                           SkillDataManager.Instance.LeagueSkillDatas[_type].IndexOf(skillCfgs[index].id) < 0;
+          
             item.m_imgLock.visible = isLock;
+
             bool canActive = true;
             List<LeagueSkillCfg> lastSkillCfgs =
                 LeagueSkillCfgArray.Instance.GetCfgsBytypeAndlayer(_type, skillCfgs[index].layer - 1);
@@ -244,7 +246,10 @@ namespace GFGGame
                 }
             }
 
-            item.m_imgSuo.visible = !canActive;
+            if (!canActive)
+                item.m_c1.selectedIndex = 0;
+            else
+                item.m_c1.selectedIndex = 1;
 
             if (isLock && canActive && _effectUIs.Count <= index)
             {

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxBonusShowView.cs

@@ -10,19 +10,15 @@ namespace GFGGame
     {
         private UI_LuckBoxBonusShowUI _ui;
         private List<ItemData> _rewardList = new List<ItemData>();
-        // private List<GameObject> _gameobjects = new List<GameObject>();
-        //private Dictionary<int, Dictionary<int, EffectUI>> _effList = new Dictionary<int, Dictionary<int, EffectUI>>();
-        private List<EffectUI> _effList = new List<EffectUI>();
+        private Dictionary<int , Dictionary<int, EffectUI>> _effListTen = new Dictionary<int, Dictionary<int, EffectUI>>();
+        private Dictionary<int, EffectUI> _effList = new Dictionary<int, EffectUI>();
 
         private EffectUI _effectUI1;
         private EffectUI _effectUI2;
         private EffectUI _effectUI3;
-        private EffectUI _effectUI4;
 
-        private int _effectIndex = 0;
         public override void Dispose()
         {
-            base.Dispose();
             EffectUIPool.Recycle(_effectUI1);
             _effectUI1 = null;
             EffectUIPool.Recycle(_effectUI2);
@@ -30,17 +26,37 @@ namespace GFGGame
             EffectUIPool.Recycle(_effectUI3);
             _effectUI3 = null;
 
-            // for (int i = 0; i < _gameobjects.Count; i++)
-            // {
-            //     SceneController.DestroyObjectFromView(_gameobjects[i], _wrappers[i]);
+            for (int key = 0; key < _effListTen.Count; key++) {
+                if (_effListTen.ContainsKey(key))
+                {
+                    for (int key1 = 0; key1 < _effListTen[key].Count; key1++)
+                    {
+                        if (_effListTen[key].ContainsKey(key1))
+                        {
+                            EffectUIPool.Recycle(_effListTen[key][key1]);
+                            _effListTen[key][key1] = null;
+                        }
+                    }
+                }
+            }
+            _effListTen.Clear();
 
-            // }
+            for (int key = 0; key < _effList.Count; key++)
+            {
+                if (_effList.ContainsKey(key))
+                {
+                    EffectUIPool.Recycle(_effList[key]);
+                    _effList[key] = null;
+                }
+            }
+            _effList.Clear();
 
             if (_ui != null)
             {
                 _ui.Dispose();
                 _ui = null;
             }
+            base.Dispose();
         }
 
         protected override void OnInit()
@@ -66,7 +82,6 @@ namespace GFGGame
         {
             base.OnShown();
             _rewardList.AddRange(this.viewData as List<ItemData>);
-            _effectIndex = 0;
             if (_rewardList.Count == 1)
             {
                 _ui.m_c1.selectedIndex = 0;
@@ -84,18 +99,9 @@ namespace GFGGame
 
         protected override void OnHide()
         {
-            for (int key = 0; key < _effList.Count; key++)
-            {
-                EffectUIPool.Recycle(_effList[key]);
-                _effList[key] = null;
-            }
-            _effList.Clear();
-        
-            EffectUIPool.Recycle(_effectUI4);
-            _effectUI4 = null;
+            _rewardList.Clear();
 
             base.OnHide();
-            _rewardList.Clear();
             GetSuitItemController.TryShow(0);
         }
 
@@ -110,19 +116,46 @@ namespace GFGGame
             item.m_comIcon.m_icon.url = ResPathUtil.GetIconPath(itemCfg);
             RarityIconController.UpdateRarityIcon(item.m_comIcon.m_rarity, itemData.id, false);
 
-            string resPath = itemCfg.rarity == ConstDressRarity.Rarity_TIANYI ? "CK_all_01" : "CK_all_02";
+            item.m_comIcon.m_holder.visible = false;
+            item.m_comIcon.m_holder1.visible = false;
 
-            if (countType == 10 && itemCfg.rarity > 2 )//&& (!_effList.ContainsKey(itemCfg.rarity) || !_effList[itemCfg.rarity].ContainsKey(index)))
-            {
-                GGraph holder = itemCfg.rarity == 3 ? item.m_comIcon.m_holder : item.m_comIcon.m_holder1;
-                EffectUI _effectUI = EffectUIPool.CreateEffectUI(holder, "ui_LuckyBox", resPath);
-                _effList.Add(_effectUI);
-            }
-            if (countType == 1 && itemCfg.rarity > 2 && _effectUI4 == null)
-            {
+            if (itemCfg.rarity > 2) { 
+                string resPath = itemCfg.rarity == ConstDressRarity.Rarity_TIANYI ? "CK_all_01" : "CK_all_02";
                 GGraph holder = itemCfg.rarity == 3 ? item.m_comIcon.m_holder : item.m_comIcon.m_holder1;
-                _effectUI4 = EffectUIPool.CreateEffectUI(holder, "ui_LuckyBox", resPath);
+                holder.visible = true;
+                if (countType == 10 && (!_effListTen.ContainsKey(index) ||
+                    ((itemCfg.rarity == 3 && !_effListTen[index].ContainsKey(0)) || (itemCfg.rarity == 4 && !_effListTen[index].ContainsKey(1)))))
+                {
+                    EffectUI _effectUI = EffectUIPool.CreateEffectUI(holder, "ui_LuckyBox", resPath);
+
+                    if (!_effListTen.ContainsKey(index))
+                    {
+                        Dictionary<int, EffectUI> effectList = new Dictionary<int, EffectUI>();
+                        if (itemCfg.rarity == 3)
+                            effectList.Add(0, _effectUI);
+                        else if (itemCfg.rarity == 4)
+                            effectList.Add(1, _effectUI);
+                        _effListTen.Add(index, effectList);
+                    }
+                    else {
+                        if (itemCfg.rarity == 3)
+                            _effListTen[index].Add(0, _effectUI);
+                        else if (itemCfg.rarity == 4)
+                            _effListTen[index].Add(1, _effectUI);
+                    }
+                }
+              
+                if (countType == 1 && 
+                    ((itemCfg.rarity == 3 && !_effList.ContainsKey(0)) || (itemCfg.rarity == 4 && !_effList.ContainsKey(1))))
+                {
+                    EffectUI _effectUI = EffectUIPool.CreateEffectUI(holder, "ui_LuckyBox", resPath);
+                    if (itemCfg.rarity == 3)
+                        _effList.Add(0, _effectUI);
+                    else if (itemCfg.rarity == 4)
+                        _effList.Add(1, _effectUI);
+                }
             }
+
             int count = 0;
             bool isFirst = false;
             for (int i = 0; i < _rewardList.Count; i++)
@@ -137,6 +170,7 @@ namespace GFGGame
                 item.target.onClick.Add(ShowItemTips);
             }
             item.target.data = itemCfg.id;
+
             UI_LuckyBoxBonusShowItem.ProxyEnd();
         }
 

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxNewDressView.cs

@@ -26,7 +26,6 @@ namespace GFGGame
 
         public override void Dispose()
         {
-            base.Dispose();
             EffectUIPool.Recycle(_effectUI1);
             _effectUI1 = null;
             EffectUIPool.Recycle(_effectUI2);
@@ -40,6 +39,7 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
+            base.Dispose();
         }
 
         protected override void OnInit()
@@ -160,17 +160,18 @@ namespace GFGGame
 
         private void OnClickBg()
         {
-            if (_newRewardList.Count == 0 && _oldRewardList.Count == 0)
-            {
-                this.Hide();
-                return;
-            }
             _ui.m_t_close.Play(() =>
             {
                 _ui.m_comCard.m_holder.visible = false;
                 _ui.m_comCard.m_holder1.visible = false;
-                _ui.m_t_open.Play();
-                UpdateView();
+                if (_newRewardList.Count == 0 && _oldRewardList.Count == 0)
+                {
+                    this.Hide();
+                }
+                else {
+                    _ui.m_t_open.Play();
+                    UpdateView();
+                }
             });
         }
         private int GetThisCount(int itemId, List<ItemData> rewards)