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

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

@@ -192,5 +192,8 @@ namespace GFGGame
 
         //通知新限时累充领取成功
         public const string NEWLIMITCHARGE_GET = "NEWLIMITCHARGEGET";
+
+        // 服装合成成功事件
+        public const string CLOTHING_SYNTHETIC_SUCCESS = "CLOTHING_SYNTHETIC_SUCCESS";
     }
 }

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

@@ -116,7 +116,7 @@ namespace GFGGame
             return count;
         }
 
-        public static void PutOnRecommendItems2()
+        public static void PutOnRecommendItems2(int id)
         {
             Dictionary<int, List<int>> itemsDic = GetRecommendItems();
             List<int> recommendList = new List<int>();
@@ -125,7 +125,8 @@ namespace GFGGame
                 if (key == ConstDressUpItemType.SHANG_YI || key == ConstDressUpItemType.XIA_ZHUANG || key == ConstDressUpItemType.LIAN_YI_QUN) continue;
                 recommendList.AddRange(itemsDic[key]);
             }
-            StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
+            //StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
+            StoryLevelCfg levelCfg = StoryLevelCfgArray.Instance.GetCfg(id);
             StoryFightCfg fightCfg = StoryFightCfgArray.Instance.GetCfg(levelCfg.fightID);
             SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(fightCfg.needSuitId);
             int[] suitParts = suitCfg == null ? new int[] { } : suitCfg.partsArr;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_DBGiftItem.cs

@@ -1,74 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.DailyWelfare
-{
-    public partial class UI_DBGiftItem
-    {
-        public GComponent target;
-        public GLoader m_DBB;
-        public GLoader m_loaIcon;
-        public const string URL = "ui://t8nwuj7ievdh28";
-        public const string PACKAGE_NAME = "DailyWelfare";
-        public const string RES_NAME = "DBGiftItem";
-        private static UI_DBGiftItem _proxy;
-
-        public static UI_DBGiftItem Create(GObject gObject = null)
-        {
-            var ui = new UI_DBGiftItem();
-            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_DBGiftItem Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_DBGiftItem();
-            }
-            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_DBB = (GLoader)comp.GetChild("DBB");
-            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_DBB = null;
-            m_loaIcon = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_DBGiftItem.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_LimitedRechargeDBGiftUI.cs

@@ -1,103 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.DailyWelfare
-{
-    public partial class UI_LimitedRechargeDBGiftUI
-    {
-        public GComponent target;
-        public GComponent m_bg;
-        public UI_ProgressBar2 m_progress;
-        public UI_DBGiftItem m_DBGiftItem1;
-        public UI_DBGiftItem m_DBGiftItem2;
-        public UI_DBGiftItem m_DBGiftItem3;
-        public UI_DBGiftItem m_DBGiftItem4;
-        public GGroup m_DBGiftItemGroup;
-        public GTextField m_txtTime;
-        public GGroup m_grpTime;
-        public GButton m_btnTest;
-        public const string URL = "ui://t8nwuj7ievdh25";
-        public const string PACKAGE_NAME = "DailyWelfare";
-        public const string RES_NAME = "LimitedRechargeDBGiftUI";
-        private static UI_LimitedRechargeDBGiftUI _proxy;
-
-        public static UI_LimitedRechargeDBGiftUI Create(GObject gObject = null)
-        {
-            var ui = new UI_LimitedRechargeDBGiftUI();
-            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_LimitedRechargeDBGiftUI Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_LimitedRechargeDBGiftUI();
-            }
-            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_bg = (GComponent)comp.GetChild("bg");
-            m_progress = (UI_ProgressBar2)UI_ProgressBar2.Create(comp.GetChild("progress"));
-            m_DBGiftItem1 = (UI_DBGiftItem)UI_DBGiftItem.Create(comp.GetChild("DBGiftItem1"));
-            m_DBGiftItem2 = (UI_DBGiftItem)UI_DBGiftItem.Create(comp.GetChild("DBGiftItem2"));
-            m_DBGiftItem3 = (UI_DBGiftItem)UI_DBGiftItem.Create(comp.GetChild("DBGiftItem3"));
-            m_DBGiftItem4 = (UI_DBGiftItem)UI_DBGiftItem.Create(comp.GetChild("DBGiftItem4"));
-            m_DBGiftItemGroup = (GGroup)comp.GetChild("DBGiftItemGroup");
-            m_txtTime = (GTextField)comp.GetChild("txtTime");
-            m_grpTime = (GGroup)comp.GetChild("grpTime");
-            m_btnTest = (GButton)comp.GetChild("btnTest");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_bg = null;
-            m_progress.Dispose();
-            m_progress = null;
-            m_DBGiftItem1.Dispose();
-            m_DBGiftItem1 = null;
-            m_DBGiftItem2.Dispose();
-            m_DBGiftItem2 = null;
-            m_DBGiftItem3.Dispose();
-            m_DBGiftItem3 = null;
-            m_DBGiftItem4.Dispose();
-            m_DBGiftItem4 = null;
-            m_DBGiftItemGroup = null;
-            m_txtTime = null;
-            m_grpTime = null;
-            m_btnTest = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_LimitedRechargeDBGiftUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ProgressBar2.cs

@@ -1,93 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.DailyWelfare
-{
-    public partial class UI_ProgressBar2
-    {
-        public GProgressBar target;
-        public UI_ComProBonus2 m_comProBonus0;
-        public UI_ComProBonus2 m_comProBonus1;
-        public UI_ComProBonus2 m_comProBonus2;
-        public UI_ComProBonus2 m_comProBonus3;
-        public GGroup m_comProBonusGroup;
-        public GGraph m_holder;
-        public GGraph m_holderReward;
-        public const string URL = "ui://t8nwuj7ievdh26";
-        public const string PACKAGE_NAME = "DailyWelfare";
-        public const string RES_NAME = "ProgressBar2";
-        private static UI_ProgressBar2 _proxy;
-
-        public static UI_ProgressBar2 Create(GObject gObject = null)
-        {
-            var ui = new UI_ProgressBar2();
-            if(gObject == null)
-            	ui.target =  (GProgressBar)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GProgressBar)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static UI_ProgressBar2 Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ProgressBar2();
-            }
-            var ui = _proxy;
-            if(gObject == null)
-            	ui.target =  (GProgressBar)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GProgressBar)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_comProBonus0 = (UI_ComProBonus2)UI_ComProBonus2.Create(comp.GetChild("comProBonus0"));
-            m_comProBonus1 = (UI_ComProBonus2)UI_ComProBonus2.Create(comp.GetChild("comProBonus1"));
-            m_comProBonus2 = (UI_ComProBonus2)UI_ComProBonus2.Create(comp.GetChild("comProBonus2"));
-            m_comProBonus3 = (UI_ComProBonus2)UI_ComProBonus2.Create(comp.GetChild("comProBonus3"));
-            m_comProBonusGroup = (GGroup)comp.GetChild("comProBonusGroup");
-            m_holder = (GGraph)comp.GetChild("holder");
-            m_holderReward = (GGraph)comp.GetChild("holderReward");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_comProBonus0.Dispose();
-            m_comProBonus0 = null;
-            m_comProBonus1.Dispose();
-            m_comProBonus1 = null;
-            m_comProBonus2.Dispose();
-            m_comProBonus2 = null;
-            m_comProBonus3.Dispose();
-            m_comProBonus3 = null;
-            m_comProBonusGroup = null;
-            m_holder = null;
-            m_holderReward = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ProgressBar2.cs.meta

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

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

@@ -173,6 +173,9 @@ namespace GFGGame
                 _selectedItemId = 0;
                 UpdateClothingList(true);
                 LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.FU_ZHUANG_HE_CHENG, 2);
+
+                // 发送服装合成成功事件
+                EventAgent.DispatchEvent(ConstMessage.CLOTHING_SYNTHETIC_SUCCESS);
             }
 
         }

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailySignView.cs

@@ -23,6 +23,7 @@ namespace GFGGame
         private int _month;
         private int _day;
         private bool isOpenPanel = true;
+        DateTime dateTime;
 
         public override void Dispose()
         {
@@ -87,6 +88,8 @@ namespace GFGGame
             _day = TimeUtil.GetCurDay();
             _ui.m_txtMonth.text = NumberUtil.GetOldChiniseNumberText(_month);
 
+            DateTime unixStartTime = new DateTime(1970, 1, 1);
+            dateTime = unixStartTime.AddMilliseconds(GameGlobal.OpenServerTime);
             UpdateSignView();
             //从主界面自动打开这个界面的话,就显示 1
             if (this.viewData != null)
@@ -126,16 +129,28 @@ namespace GFGGame
             _signCount = MathUtil.CountOnes2(GameGlobal.myNumericComponent.GetAsLong(NumericType.SignDay));
             _ui.m_proSign.m_txtSignCount.text = _signCount.ToString();
             List<DailySignBonusCfg> signBonusCfgs = DailySignBonusCfgArray.Instance.GetCfgsBymonth(_month);
-            _ui.m_proSign.target.max = signBonusCfgs.Count;
-            _ui.m_proSign.target.value = _signCount;
-            _ui.m_proSign.m_holder.x = _signCount / signBonusCfgs.Count * _ui.m_proSign.target.width - 68;
+
             List<DailySignCfg> signCfgs = DailySignCfgArray.Instance.GetCfgsBymonth(_month);
+            _ui.m_proSign.target.max = signCfgs[signCfgs.Count - 1].day;
+            _ui.m_proSign.target.value = _signCount;
+            _ui.m_proSign.m_holder.x = _signCount / signCfgs[signCfgs.Count - 1].day * _ui.m_proSign.target.width - 88;
+            
             _ui.m_proSign.m_holderReward.visible = false;
             for (int i = 0; i < signCfgs.Count; i++)
             {
                 GComponent comProBonus = _ui.m_proSign.target.GetChild("comProBonus" + i).asCom;
-                comProBonus.x = ((float)signCfgs[i].day / (float)signBonusCfgs.Count) * _ui.m_proSign.target.width;
+                if (i == signCfgs.Count - 1)
+                {
+                    comProBonus.x = ((float)signCfgs[i].day / (float)signCfgs[signCfgs.Count - 1].day) * _ui.m_proSign.target.width - 30;
+                }
+                else
+                {
+                    comProBonus.x = ((float)signCfgs[i].day / (float)signCfgs[signCfgs.Count-1].day) * _ui.m_proSign.target.width - 10;
+                }
+
+
                 UI_ComProBonus item = UI_ComProBonus.Proxy(comProBonus);
+                item.target.visible = true;
                 item.m_loaIcon.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(signCfgs[i].bonusArr[0][0]));
                 item.m_txtCount.text = signCfgs[i].bonusArr[0][1].ToString();
                 item.m_txtDay.text = signCfgs[i].day.ToString();
@@ -164,8 +179,14 @@ namespace GFGGame
                 RedDotController.Instance.SetComRedDot(item.target, canGet);
                 UI_ComProBonus.ProxyEnd();
             }
-
-            _ui.m_list.numItems = signBonusCfgs.Count > 29 ? signBonusCfgs.Count + 1 : signBonusCfgs.Count;
+            if (_month > dateTime.Month)
+            {
+                _ui.m_list.numItems = signBonusCfgs.Count > 29 ? signBonusCfgs.Count + 1 : signBonusCfgs.Count;
+            }
+            else if (_month == dateTime.Month)
+            {
+                _ui.m_list.numItems = signBonusCfgs.Count > 29 ? signBonusCfgs.Count + 1 - dateTime.Day : signBonusCfgs.Count - dateTime.Day + 1;
+            }
         }
 
         private async void OnBtnGetProBonus(EventContext context)
@@ -181,7 +202,7 @@ namespace GFGGame
             {
                 bool result = await DailyWelfareSProxy.ReqGetSignReward(signCfg.day);
                 if (result)
-                {
+                { 
                     UpdateSignView();
                 }
             }
@@ -190,14 +211,20 @@ namespace GFGGame
         private void ListItemRender(int index, GObject obj)
         {
             UI_ListSignItem item = UI_ListSignItem.Proxy(obj);
-            if (index == 29)
+
+            if (_month == dateTime.Month)
+            {
+                index += dateTime.Day - 1;
+            }
+
+            if (index == 29 && _ui.m_list.numItems > 29)
             {
                 item.target.touchable = false;
                 item.target.visible = false;
                 return;
             }
 
-            int _index = index >= 29 ? index - 1 : index;
+            int _index = index >= 29 && _ui.m_list.numItems > 29 ? index - 1 : index;
             DailySignBonusCfg bonusCfg = DailySignBonusCfgArray.Instance.GetCfgsBymonth(_month)[_index];
             int itemType = ItemDataManager.GetItemType(bonusCfg.bonusArr[0][0]);
             bool isGot = MathUtil.isBitSet(GameGlobal.myNumericComponent.GetAsLong(NumericType.SignDay), bonusCfg.day);

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -130,6 +130,7 @@ namespace GFGGame
             EventAgent.AddEventListener(ConstMessage.DRESS_FILTER, UpdateSerch);
             EventAgent.AddEventListener(ConstMessage.DRESS_FILTER_RESET, DressResetSerch);
             EventAgent.AddEventListener(ConstMessage.TEA_PARTY_STATU, TeaPartyStatuChange);
+            EventAgent.AddEventListener(ConstMessage.CLOTHING_SYNTHETIC_SUCCESS, UpdateNeedClothesState);
             // EventAgent.AddEventListener(ConstMessage.DRESS_UP_SCORE_CHANGED, UpdateScore);
         }
 
@@ -142,6 +143,7 @@ namespace GFGGame
             EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER, UpdateSerch);
             EventAgent.RemoveEventListener(ConstMessage.DRESS_FILTER_RESET, DressResetSerch);
             EventAgent.RemoveEventListener(ConstMessage.TEA_PARTY_STATU, TeaPartyStatuChange);
+            EventAgent.RemoveEventListener(ConstMessage.CLOTHING_SYNTHETIC_SUCCESS, UpdateNeedClothesState);
             // EventAgent.RemoveEventListener(ConstMessage.DRESS_UP_SCORE_CHANGED, UpdateScore);
         }
 
@@ -190,28 +192,7 @@ namespace GFGGame
                 InstanceZonesDataManager.FightScene = _levelCfg.type;
 
                 _ui.m_compNeed.target.visible = _fightCfg.needItemId > 0 || _fightCfg.needSuitId > 0 || _fightCfg.needTagsArr.Length > 0;
-                if (_ui.m_compNeed.target.visible)
-                {
-                    _ui.m_compNeed.m_c1.selectedIndex = 0;
-                    if (_fightCfg.needItemId > 0)
-                    {
-                        _ui.m_compNeed.m_txtNeedName.text = ItemUtil.GetItemName(_fightCfg.needItemId);
-                        _ui.m_compNeed.target.data = _fightCfg.needItemId;
-                        _ui.m_compNeed.m_imgGot.visible = ItemDataManager.GetItemNum(_fightCfg.needItemId) > 0;
-                    }
-                    else if (_fightCfg.needSuitId > 0)
-                    {
-                        _ui.m_compNeed.m_txtNeedName.text = ItemUtil.GetSuitName(_fightCfg.needSuitId);
-                        _ui.m_compNeed.target.data = _fightCfg.needSuitId;
-                        _ui.m_compNeed.m_imgGot.visible = DressUpMenuSuitDataManager.CheckHaveSuit(_fightCfg.needSuitId);
-                    }
-                    else
-                    {
-                        _ui.m_compNeed.m_c1.selectedIndex = 1;
-                        _ui.m_compNeed.m_listTag.numItems = _fightCfg.needTagsArr.Length;
-                        _ui.m_compNeed.m_imgGot.visible = false;
-                    }
-                }
+                UpdateNeedClothesState();
             }
             InstanceZonesDataManager.currentScoreType = scoreType;
             //一级菜单
@@ -699,7 +680,7 @@ namespace GFGGame
             }
             InstanceZonesDataManager.usedRecommend = true;
             // MyDressUpHelper.PutOnRecommendItems();
-            MyDressUpHelper.PutOnRecommendItems2();
+            MyDressUpHelper.PutOnRecommendItems2(_levelCfg.id);
             _ui.m_txtDressLimit.text = string.Format("饰品穿戴限制：{0}/{1}", MyDressUpHelper.GetCurrentOrnamentCount(), GlobalCfgArray.globalCfg.dressLimitCount);
             UpdateStepBtn(true);
             // UpdateListPartsSelected();
@@ -1517,9 +1498,46 @@ namespace GFGGame
                 .SetLeftButton(false).SetRightButton(true, "确定", (object data) =>
                 {
                     this.Hide();
-                    ViewManager.Show<LeagueTeaPartyView>();
+                    if (LeagueDataManager.Instance.TeaPartyStatus == LeagueTeaPartyStatus.YesGo)
+                    {
+                        if (LeagueDataManager.Instance.RoleTeapartyInfo.Status && !LeagueDataManager.Instance.RoleTeapartyInfo.IsComplete)
+                        {
+                            ViewManager.Show<LeagueTeaPartyShowView>();
+                        }
+                        else
+                            ViewManager.Show<LeagueTeaPartyView>();
+                    }
                 });
             }
         }
+
+        /// <summary>
+        /// 更新必需品的拥有状态
+        /// </summary>
+        private void UpdateNeedClothesState()
+        {
+            if (_ui.m_compNeed.target.visible)
+            {
+                _ui.m_compNeed.m_c1.selectedIndex = 0;
+                if (_fightCfg.needItemId > 0)
+                {
+                    _ui.m_compNeed.m_txtNeedName.text = ItemUtil.GetItemName(_fightCfg.needItemId);
+                    _ui.m_compNeed.target.data = _fightCfg.needItemId;
+                    _ui.m_compNeed.m_imgGot.visible = ItemDataManager.GetItemNum(_fightCfg.needItemId) > 0;
+                }
+                else if (_fightCfg.needSuitId > 0)
+                {
+                    _ui.m_compNeed.m_txtNeedName.text = ItemUtil.GetSuitName(_fightCfg.needSuitId);
+                    _ui.m_compNeed.target.data = _fightCfg.needSuitId;
+                    _ui.m_compNeed.m_imgGot.visible = DressUpMenuSuitDataManager.CheckHaveSuit(_fightCfg.needSuitId);
+                }
+                else
+                {
+                    _ui.m_compNeed.m_c1.selectedIndex = 1;
+                    _ui.m_compNeed.m_listTag.numItems = _fightCfg.needTagsArr.Length;
+                    _ui.m_compNeed.m_imgGot.visible = false;
+                }
+            }
+        }
     }
 }

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

@@ -106,7 +106,10 @@ namespace GFGGame
             GetTeapartyMatchingInfos();
             GetRoleContainerInfos();
             ReferBtnRewardRed();
-            TeaPartyStatuChange();
+
+            if (LeagueDataManager.Instance.TeaPartyStatus == LeagueTeaPartyStatus.YesGo
+                && LeagueDataManager.Instance.CheckTeaPartyRewardCanGet())
+                    OnBtnRewardClick();
         }
 
         protected override void OnHide()
@@ -185,7 +188,7 @@ namespace GFGGame
         {
             ViewManager.Show<LeagueTeaPartyRewardView>();
         }
-        
+
         private void OnBtnBackClick()
         {
             ViewManager.GoBackFrom(typeof(LeagueTeaPartyView).FullName);
@@ -278,7 +281,7 @@ namespace GFGGame
 
             if (LeagueDataManager.Instance.TeaPartyStatus == LeagueTeaPartyStatus.YesGo) {
                 if (LeagueDataManager.Instance.RoleTeapartyInfo.Status && !LeagueDataManager.Instance.RoleTeapartyInfo.IsComplete) { 
-                    ViewManager.Show<LeagueTeaPartyShowView>(null,null,true);
+                    ViewManager.Show<LeagueTeaPartyShowView>();
                 }
                 else if(LeagueDataManager.Instance.CheckTeaPartyRewardCanGet())
                     OnBtnRewardClick();

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

@@ -17,6 +17,7 @@ namespace GFGGame
         private Dictionary<int, int> _itemIdList = new Dictionary<int, int>();
         private Dictionary<int, GComponent> _itemObjList = new Dictionary<int, GComponent>();
         private List<int> _recordOpenIndex = new List<int>();  //记录打开过得item位置
+        private List<int> _recordTurnIndex = new List<int>();  //记录播放过item位置
         private int _chooseIndex = -1;  //当前选中的index
         private int _countShow = 0;   //第几次展示
         private int _countNewRecord = 0;  //展示步骤
@@ -123,6 +124,7 @@ namespace GFGGame
             _itemIdList.Clear();
             _itemObjList.Clear();
             _recordOpenIndex.Clear();
+            _recordTurnIndex.Clear();
             _ui.m_BtnPass.visible = true;
             _ui.m_touchFlipOpen.touchable = false;
 
@@ -238,76 +240,31 @@ namespace GFGGame
             Timers.inst.Add(1f, 1, UpClickDataTime,index);
         }
 
-        void ClickItem(int index)
+        private void UpClickDataTime(object param = null)
         {
-            if (!_recordOpenIndex.Contains(index))
+            int index = (int)param;
+            if (_recordTurnIndex.Contains(index) && _recordOpenIndex.Contains(index))
             {
-                UI_LuckyBoxBonusShowItem item = UI_LuckyBoxBonusShowItem.Proxy(_itemObjList[index]);
-                if (_recordOpenIndex.Count >= _rewardList.Count - 1)
-                    _ui.m_BtnPass.visible = false;
-
-                //先翻开牌面
-                if (!item.m_comIcon.m_imgNew.visible || _countNewRecord < 1)
-                {
-                    HideOtherShowWindow();
-                    item.m_comIcon.m_FlipOpenType.selectedIndex = 0;
-                    //item.m_t1.Play();
-                    item.m_t2.Play();
-                    item.m_comIcon.m_t0.Play();
-
-                    if (!item.m_comIcon.m_imgNew.visible) {
-                        _recordOpenIndex.Add(index);
-                    }
-                    else if (_countNewRecord < 1) 
-                        _countNewRecord += 1;
+                Timers.inst.Remove(UpClickDataTime);
+                HideOtherShowWindow();
+                _ui.m_touchFlipOpen.touchable = false;
+            }
+            else
+                ClickItem(index);
+        }
 
-                    return;
-                }
+        void ClickItem(int index)
+        {
+            if (_recordOpenIndex.Count >= _rewardList.Count)
+                _ui.m_BtnPass.visible = false;
 
-                if (item.m_comIcon.m_imgNew.visible && _countNewRecord >= 1)
-                {
-                    //判断是否有套装需要展示
-                    if (GetSuitItemController.GetSuitWaitingToId(_itemIdList[index]))
-                    {
-                        if (_countShow < 1)
-                        {
-                            _countShow += 1;
-                            ViewManager.Hide<GetSuitItemVIew>();
-                            _rewardItemList.Clear();
-                            _rewardItemList.Add(_rewardList[index]);
-                            ViewManager.Show<LuckyBoxNewDressView>(_rewardItemList);
-                        }
-                        else
-                        {
-                            ViewManager.Hide<LuckyBoxNewDressView>();
-                            ViewManager.Hide<LuckyBoxNewCardView>();
-                            GetSuitItemController.TryShow(_itemIdList[index]);
-                            _recordOpenIndex.Add(index);
-                            _countShow = 0;
-                            _countNewRecord = 0;
-
-                            if (_handClick)
-                            {
-                                _handClick = false;
-                                Timers.inst.Remove(UpClickDataTime);
-                                _ui.m_touchFlipOpen.touchable = false;
-                            }
-                        }
-                    }
-                    else
-                    {
-                        ViewManager.Hide<GetSuitItemVIew>();
-                        _rewardItemList.Clear();
-                        _rewardItemList.Add(_rewardList[index]);
-                        ViewManager.Show<LuckyBoxNewDressView>(_rewardItemList);
-                        _recordOpenIndex.Add(index);
-                        _countNewRecord = 0;
-                    }
-                }
-                UI_LuckyBoxBonusShowItem.ProxyEnd();
-            }
-            else{
-                GoodsItemTipsController.ShowItemTips(_itemIdList[index]);
+            if (!_recordOpenIndex.Contains(index))
+                TurnItem(index);
+            else {
+                if (!_recordTurnIndex.Contains(index))
+                    ShowTurnItem(index);
+                else
+                    GoodsItemTipsController.ShowItemTips(_itemIdList[index]);
             }
         }
 
@@ -359,39 +316,102 @@ namespace GFGGame
         private void ClickPass()
         {
             _ui.m_touchFlipOpen.touchable = true;
+            _ui.m_BtnPass.visible = false;
+            for (int i = 0; i < _rewardList.Count; i++)
+            {
+                TurnItem(i);
+            }
             Timers.inst.Add(1f, 0, UpDataTime);
         }
 
         private void UpDataTime(object param = null)
         {
-            if (_recordOpenIndex.Count >= _rewardList.Count) {
+            _ui.m_touchFlipOpen.touchable = true;
+            for (int i = 0; i < _rewardList.Count; i++)
+            {
+                if (!_recordTurnIndex.Contains(i)) {
+                    ShowTurnItem(i);
+                    break;
+                }
+            }
+
+            if (_recordTurnIndex.Count >= _rewardList.Count)
+            {
                 Timers.inst.Remove(UpDataTime);
                 HideOtherShowWindow();
                 _ui.m_touchFlipOpen.touchable = false;
             }
+        }
 
-            for (int i = 0; i < _rewardList.Count; i++)
+        private void ShowTurnItem(int index)
+        {
+            UI_LuckyBoxBonusShowItem item = UI_LuckyBoxBonusShowItem.Proxy(_itemObjList[index]);
+
+            if (item.m_comIcon.m_imgNew.visible)
             {
-                if (!_recordOpenIndex.Contains(i)) {
-                    ClickItem(i);
-                    break;
+                //判断是否有套装需要展示
+                if (GetSuitItemController.GetSuitWaitingToId(_itemIdList[index]))
+                {
+                    if (_countShow < 1)
+                    {
+                        _countShow += 1;
+                        ViewManager.Hide<GetSuitItemVIew>();
+                        _rewardItemList.Clear();
+                        _rewardItemList.Add(_rewardList[index]);
+                        ViewManager.Show<LuckyBoxNewDressView>(_rewardItemList);
+                    }
+                    else
+                    {
+                        ViewManager.Hide<LuckyBoxNewDressView>();
+                        ViewManager.Hide<LuckyBoxNewCardView>();
+                        GetSuitItemController.TryShow(_itemIdList[index]);
+                        _recordTurnIndex.Add(index);
+                        _countShow = 0;
+
+                        if (_handClick)
+                        {
+                            _handClick = false;
+                            Timers.inst.Remove(UpClickDataTime);
+                            _ui.m_touchFlipOpen.touchable = false;
+                        }
+                    }
+                }
+                else
+                {
+                    ViewManager.Hide<GetSuitItemVIew>();
+                    _rewardItemList.Clear();
+                    _rewardItemList.Add(_rewardList[index]);
+                    ViewManager.Show<LuckyBoxNewDressView>(_rewardItemList);
+                    _recordTurnIndex.Add(index);
+                    _ui.m_touchFlipOpen.touchable = false;
                 }
             }
+            else {
+                _recordTurnIndex.Add(index);
+                _ui.m_touchFlipOpen.touchable = false;
+            }
+            UI_LuckyBoxBonusShowItem.ProxyEnd();
         }
-
-        private void UpClickDataTime(object param = null)
+        
+        private void TurnItem(int index)
         {
-            int index = (int)param;
-            if (_recordOpenIndex.Contains(index))
+            if (!_recordOpenIndex.Contains(index))
             {
-                Timers.inst.Remove(UpClickDataTime);
-                HideOtherShowWindow();
-                _ui.m_touchFlipOpen.touchable = false;
+                UI_LuckyBoxBonusShowItem item = UI_LuckyBoxBonusShowItem.Proxy(_itemObjList[index]);
+                if (!item.m_comIcon.m_imgNew.visible)
+                    _recordTurnIndex.Add(index);
+
+                //先翻开牌面 
+                item.m_comIcon.m_FlipOpenType.selectedIndex = 0;
+                //item.m_t1.Play();
+                item.m_t2.Play();
+                item.m_comIcon.m_t0.Play();
+                _recordOpenIndex.Add(index);
+                UI_LuckyBoxBonusShowItem.ProxyEnd();
             }
-            else
-                ClickItem(index);
         }
 
+
         private void HideOtherShowWindow()
         {
             ViewManager.Hide<GetSuitItemVIew>();

GameClient/Assets/ResIn/UI/DailyWelfare/DailyWelfare_atlas0_6!a.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 186d8720358d4f24bb2ef965fe3742a6
-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/DailyWelfare/DailyWelfare_atlas0_6.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 831a8c05925e1734bae909b0e46f7497
-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: