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

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

@@ -9,6 +9,8 @@ namespace GFGGame
         private static List<int> _suitIDList = new List<int>();
         private static List<int> _actionIDList;//拥有的特殊动作列表列表
         private static List<int> _travelSuitIDList;//拥有的游历套装列表
+        public static int chooseClothing = 0;//服裝合成选择合成第几件衣服
+
         public static List<int> TravelSuitIDList
         {
             get

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

@@ -12,8 +12,8 @@ namespace UI.CommonGame
         public UI_ComCardMask m_comCard;
         public GLoader m_loaBorder;
         public GLoader m_loaRarity;
-        public GGraph m_holderGoldBg;
         public GGraph m_holderPurpleBg;
+        public GGraph m_holderGoldBg;
         public GTextField m_txtLv;
         public GTextField m_txtName;
         public GLoader m_loaMainScore;
@@ -74,8 +74,8 @@ namespace UI.CommonGame
             m_comCard = (UI_ComCardMask)UI_ComCardMask.Create(comp.GetChild("comCard"));
             m_loaBorder = (GLoader)comp.GetChild("loaBorder");
             m_loaRarity = (GLoader)comp.GetChild("loaRarity");
-            m_holderGoldBg = (GGraph)comp.GetChild("holderGoldBg");
             m_holderPurpleBg = (GGraph)comp.GetChild("holderPurpleBg");
+            m_holderGoldBg = (GGraph)comp.GetChild("holderGoldBg");
             m_txtLv = (GTextField)comp.GetChild("txtLv");
             m_txtName = (GTextField)comp.GetChild("txtName");
             m_loaMainScore = (GLoader)comp.GetChild("loaMainScore");
@@ -93,8 +93,8 @@ namespace UI.CommonGame
             m_comCard = null;
             m_loaBorder = null;
             m_loaRarity = null;
-            m_holderGoldBg = null;
             m_holderPurpleBg = null;
+            m_holderGoldBg = null;
             m_txtLv = null;
             m_txtName = null;
             m_loaMainScore = null;

GameClient/Assets/Game/HotUpdate/Views/ActivityHuaRongDao/ActivityHuaRongDaoEntryView.cs

@@ -24,6 +24,7 @@ namespace GFGGame
             viewCom = _ui.target;
             isfullScreen = true;
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gf_pjxq_bj");
+            isReturnView = true;
 
             _ui.m_btnStart.onClick.Add(OnBtnStartClick);
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);

GameClient/Assets/Game/HotUpdate/Views/ActivityHuaRongDao/ActivityHuaRongDaoSuccessView.cs

@@ -35,7 +35,6 @@ namespace GFGGame
             clickBlankToClose = false;
 
             _ui.m_listReward.itemRenderer = RenderListRewardItem;
-            _ui.m_againCom.m_btnRestart.onClick.Add(OnClickBtnRestart);
             _ui.m_btnExit.onClick.Add(OnClickBtnExit);
         }
 
@@ -46,6 +45,7 @@ namespace GFGGame
             cfg = (HuarongRoadGame)viewData;
             itemDatas = ItemUtil.CreateItemDataList(cfg.bonusWinArr);
             InitReward();
+            Timers.inst.StartCoroutine(ShowSuitLater());
             //_ui.m_listReward.numItems = itemDatas.Count;
             //_ui.m_againCom.target.visible = (cfg.comsumeStartArr.Length > 0);
         }
@@ -53,7 +53,6 @@ namespace GFGGame
         protected override void OnHide()
         {
             base.OnHide();
-            GetSuitItemController.TryShow(0);
         }
 
         protected override void AddEventListener()
@@ -68,7 +67,7 @@ namespace GFGGame
 
         private void RenderListRewardItem(int index, GObject obj)
         {
-            if(index >= itemDatas.Count)
+            if (index >= itemDatas.Count)
             {
                 return;
             }
@@ -81,18 +80,10 @@ namespace GFGGame
             (obj.data as ItemView).SetData(reward);
         }
 
-        private void OnClickBtnRestart()
-        {
-            // 消耗对应物品
-
-            ViewManager.Show<ActivityHuaRongDaoView>(cfg);
-            Hide();
-        }
-
         private void OnClickBtnExit()
         {
-            ViewManager.Hide<ActivityHuaRongDaoView>();
             Hide();
+            ViewManager.Hide<ActivityHuaRongDaoView>();
         }
 
         private void InitReward()
@@ -100,5 +91,13 @@ namespace GFGGame
             _ui.m_reward.data = new ItemView(_ui.m_reward);
             (_ui.m_reward.data as ItemView).SetData(itemDatas[0]);
         }
+
+        private IEnumerator ShowSuitLater()
+        {
+            GRoot.inst.touchable = false;
+            yield return new WaitForSeconds(0.25f);
+            GetSuitItemController.TryShow(0);
+            GRoot.inst.touchable = true;
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/ActivityHuaRongDao/ActivityHuaRongDaoView.cs

@@ -307,12 +307,12 @@ namespace GFGGame
 
         private void MoveItem(Grid newGrid, int changeNum)
         {
-            for(int i = 0; i < _items.Count; i++)
+            for (int i = 0; i < _items.Count; i++)
             {
                 GObject obj = _items[i];
                 int num = (int)obj.data;
 
-                if(num == changeNum)
+                if (num == changeNum)
                 {
                     _ui.m_maskGlobal.visible = true;
                     obj.TweenMove(newGrid.pos, 0.1f).OnComplete(() =>

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

@@ -39,7 +39,7 @@ namespace GFGGame
 
             _ui.m_comListCard.m_listCard.itemRenderer = RenderListCardItem;
             _ui.m_comListCard.m_listCard.onClickItem.Add(OnClickListCardItem);
-            _ui.m_comListCard.m_listCard.SetVirtual();
+            //_ui.m_comListCard.m_listCard.SetVirtual();
 
             _ui.m_listRole.itemRenderer = RenderListRoleItem;
             _ui.m_listRole.onClickItem.Add(OnClickListRoleItem);
@@ -119,11 +119,13 @@ namespace GFGGame
                 cardList = CardDataManager.FilterCardList(cardList);
             }
             cardList = CardDataManager.SortItemList(cardList);
+
             foreach (var v in _effectUIDic)
             {
                 EffectUIPool.Recycle(v.Value);
             }
             _effectUIDic.Clear();
+
             _ui.m_comListCard.m_listCard.data = cardList;
             _ui.m_comListCard.m_listCard.numItems = cardList.Count;
 
@@ -146,26 +148,17 @@ namespace GFGGame
             listItem.m_txtName.text = data.itemCfg.name;
             RedDotController.Instance.SetComRedDot(listItem.target, RedDotDataManager.Instance.GetCardRed(data.id), "", 5, -10);
 
-            //if (data.itemCfg.rarity == 4)
-            //{
-            //    listItem.m_holderGoldBg.visible = true;
-            //    listItem.m_holderPurpleBg.visible = false;
-            //    if (!_effectUIDic.ContainsKey("gold" + obj.id))
-            //        _effectUIDic.Add("gold" + obj.id, EffectUIPool.CreateEffectUI(listItem.m_holderGoldBg, "ui_KP", "KP_Gold_Frame"));
-            //}
-            //else if (data.itemCfg.rarity == 3)
-            //{
-            //    listItem.m_holderPurpleBg.visible = true;
-            //    listItem.m_holderGoldBg.visible = false;
-            //    if (!_effectUIDic.ContainsKey("purple" + obj.id))
-            //        _effectUIDic.Add("purple" + obj.id, EffectUIPool.CreateEffectUI(listItem.m_holderPurpleBg, "ui_KP", "KP_Purple_Frame"));
-            //}
-            //else
-            //{
-            //    listItem.m_holderGoldBg.visible = false;
-            //    listItem.m_holderPurpleBg.visible = false;
-            //}
-
+            if (data.itemCfg.rarity == 4)
+            {
+                if (!_effectUIDic.ContainsKey("gold" + index))
+                    _effectUIDic.Add("gold" + index, EffectUIPool.CreateEffectUI(listItem.m_holderGoldBg, "ui_KP", "KP_Gold_Frame"));
+            }
+            else if (data.itemCfg.rarity == 3)
+            {
+                if (!_effectUIDic.ContainsKey("purple" + index))
+                    _effectUIDic.Add("purple" + index, EffectUIPool.CreateEffectUI(listItem.m_holderPurpleBg, "ui_KP", "KP_Purple_Frame"));
+            }
+            
             int starLevelDodge = data.star / 5;
             listItem.m_starNumType.selectedIndex = data.itemCfg.starDescArr.Length - 1;
             for (int i = 0; i < data.itemCfg.starDescArr.Length; i++)

GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs

@@ -126,6 +126,10 @@ namespace GFGGame
                 _suitId = (int)(this.viewData as object[])[0];
                 _selectedItemId = (this.viewData as object[]).Length > 1 ? (int)(this.viewData as object[])[1] : 0;
             }
+
+            if (DressUpMenuSuitDataManager.chooseClothing > 0)
+                _selectedItemId = DressUpMenuSuitDataManager.chooseClothing;
+
             _valueBarController.OnShown();
             _ui.m_loaBg2.url = ResPathUtil.GetBgImgPath("hc_bj_1");
             UpdateClothingList(false);
@@ -149,6 +153,7 @@ namespace GFGGame
         }
         private void OnClickBtnBack()
         {
+            DressUpMenuSuitDataManager.chooseClothing = 0;
             ViewManager.GoBackFrom(typeof(ClothingSyntheticView).FullName);
         }
 
@@ -225,7 +230,7 @@ namespace GFGGame
 
             _dressUpObjUI.ResetSceneObj(45, true, true, null, false);
             _dressUpObjUI.dressUpObj.AddOrRemove(_selectedItemId, true);
-            _imgSelected.visible = _dressUpObjUI.dressUpObj.CheckDressUpItemIsOn(_selectedItemId);
+            _imgSelected.visible = true;// _dressUpObjUI.dressUpObj.CheckDressUpItemIsOn(_selectedItemId);
             _dressUpObjUI.UpdateWrapper(_compMover.m_holder);
             int type = ItemUtilCS.GetItemSubType(_selectedItemId);
             float duration = DURATION;
@@ -326,6 +331,7 @@ namespace GFGGame
             _selectedListItem = listItem;
             listItem.AddChildAt(_imgSelected, 1);
             _selectedItemId = (int)listItem.data;
+            DressUpMenuSuitDataManager.chooseClothing = _selectedItemId;
             UpdateRole(tween);
             UpdateSelectedItemInfo();
         }