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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_ComTagItem.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.DressUp
+{
+    public partial class UI_ComTagItem
+    {
+        public GComponent target;
+        public GTextField m_txtScore;
+        public GGroup m_grpScore;
+        public GComponent m_loaTag;
+        public const string URL = "ui://mbo439wbhyzlfc";
+        public const string PACKAGE_NAME = "DressUp";
+        public const string RES_NAME = "ComTagItem";
+        private static UI_ComTagItem _proxy;
+
+        public static UI_ComTagItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ComTagItem();
+            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_ComTagItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComTagItem();
+            }
+            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_txtScore = (GTextField)comp.GetChild("txtScore");
+            m_grpScore = (GGroup)comp.GetChild("grpScore");
+            m_loaTag = (GComponent)comp.GetChild("loaTag");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_txtScore = null;
+            m_grpScore = null;
+            m_loaTag = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_ComTagItem.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_DressUpFightUI.cs

@@ -39,6 +39,9 @@ namespace UI.DressUp
         public GTextField m_txtRecommendCount;
         public GGroup m_graContent;
         public GLoader m_loaGuide;
+        public GButton m_btnSubmission;
+        public GTextField m_txtMatch;
+        public GTextField m_txtTeaPartyName;
         public const string URL = "ui://mbo439wbqsvd2m";
         public const string PACKAGE_NAME = "DressUp";
         public const string RES_NAME = "DressUpFightUI";
@@ -118,6 +121,9 @@ namespace UI.DressUp
             m_txtRecommendCount = (GTextField)comp.GetChild("txtRecommendCount");
             m_graContent = (GGroup)comp.GetChild("graContent");
             m_loaGuide = (GLoader)comp.GetChild("loaGuide");
+            m_btnSubmission = (GButton)comp.GetChild("btnSubmission");
+            m_txtMatch = (GTextField)comp.GetChild("txtMatch");
+            m_txtTeaPartyName = (GTextField)comp.GetChild("txtTeaPartyName");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -159,6 +165,9 @@ namespace UI.DressUp
             m_txtRecommendCount = null;
             m_graContent = null;
             m_loaGuide = null;
+            m_btnSubmission = null;
+            m_txtMatch = null;
+            m_txtTeaPartyName = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_PartsListItem.cs

@@ -7,6 +7,7 @@ namespace UI.DressUp
     public partial class UI_PartsListItem
     {
         public GComponent target;
+        public Controller m_itemType;
         public GLoader m_loaBorder;
         public GImage m_iconSelected;
         public GLoader m_icon;
@@ -18,6 +19,7 @@ namespace UI.DressUp
         public GImage m_imgNew;
         public GTextField m_txtTitle;
         public GButton m_btnAni;
+        public GList m_ListTag;
         public const string URL = "ui://mbo439wbk6he26";
         public const string PACKAGE_NAME = "DressUp";
         public const string RES_NAME = "PartsListItem";
@@ -65,6 +67,7 @@ namespace UI.DressUp
 
         private void Init(GComponent comp)
         {
+            m_itemType = comp.GetController("itemType");
             m_loaBorder = (GLoader)comp.GetChild("loaBorder");
             m_iconSelected = (GImage)comp.GetChild("iconSelected");
             m_icon = (GLoader)comp.GetChild("icon");
@@ -76,9 +79,11 @@ namespace UI.DressUp
             m_imgNew = (GImage)comp.GetChild("imgNew");
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");
             m_btnAni = (GButton)comp.GetChild("btnAni");
+            m_ListTag = (GList)comp.GetChild("ListTag");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_itemType = null;
             m_loaBorder = null;
             m_iconSelected = null;
             m_icon = null;
@@ -90,6 +95,7 @@ namespace UI.DressUp
             m_imgNew = null;
             m_txtTitle = null;
             m_btnAni = null;
+            m_ListTag = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_TypeItem.cs

@@ -7,6 +7,7 @@ namespace UI.DressUp
     public partial class UI_TypeItem
     {
         public GComponent target;
+        public Controller m_itemType;
         public GLoader m_icon;
         public GImage m_imgNeed;
         public GImage m_imgNew;
@@ -58,6 +59,7 @@ namespace UI.DressUp
 
         private void Init(GComponent comp)
         {
+            m_itemType = comp.GetController("itemType");
             m_icon = (GLoader)comp.GetChild("icon");
             m_imgNeed = (GImage)comp.GetChild("imgNeed");
             m_imgNew = (GImage)comp.GetChild("imgNew");
@@ -65,6 +67,7 @@ namespace UI.DressUp
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_itemType = null;
             m_icon = null;
             m_imgNeed = null;
             m_imgNew = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueTeaPartyOverUI.cs

@@ -9,13 +9,15 @@ namespace UI.League
         public GComponent target;
         public GLoader m_loaBg;
         public GButton m_btnBack;
-        public GTextField m_txtTeaName;
         public UI_comTeaPartyOverItem m_TeaPartyOverItem1;
+        public UI_comTeaPartyOverItem m_TeaPartyOverItem2;
         public UI_comTeaPartyOverItem m_TeaPartyOverItem3;
         public UI_comTeaPartyOverItem m_TeaPartyOverItem4;
-        public UI_comTeaPartyOverItem m_TeaPartyOverItem2;
         public UI_comTeaPartyOverItem m_TeaPartyOverItem5;
         public UI_comTeaPartyOverItem m_TeaPartyOverItem6;
+        public GButton m_btnReward;
+        public GButton m_btnRule;
+        public GTextField m_txtTeaName;
         public const string URL = "ui://tw70qm9dic4otq4";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "LeagueTeaPartyOverUI";
@@ -65,31 +67,35 @@ namespace UI.League
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_btnBack = (GButton)comp.GetChild("btnBack");
-            m_txtTeaName = (GTextField)comp.GetChild("txtTeaName");
             m_TeaPartyOverItem1 = (UI_comTeaPartyOverItem)UI_comTeaPartyOverItem.Create(comp.GetChild("TeaPartyOverItem1"));
+            m_TeaPartyOverItem2 = (UI_comTeaPartyOverItem)UI_comTeaPartyOverItem.Create(comp.GetChild("TeaPartyOverItem2"));
             m_TeaPartyOverItem3 = (UI_comTeaPartyOverItem)UI_comTeaPartyOverItem.Create(comp.GetChild("TeaPartyOverItem3"));
             m_TeaPartyOverItem4 = (UI_comTeaPartyOverItem)UI_comTeaPartyOverItem.Create(comp.GetChild("TeaPartyOverItem4"));
-            m_TeaPartyOverItem2 = (UI_comTeaPartyOverItem)UI_comTeaPartyOverItem.Create(comp.GetChild("TeaPartyOverItem2"));
             m_TeaPartyOverItem5 = (UI_comTeaPartyOverItem)UI_comTeaPartyOverItem.Create(comp.GetChild("TeaPartyOverItem5"));
             m_TeaPartyOverItem6 = (UI_comTeaPartyOverItem)UI_comTeaPartyOverItem.Create(comp.GetChild("TeaPartyOverItem6"));
+            m_btnReward = (GButton)comp.GetChild("btnReward");
+            m_btnRule = (GButton)comp.GetChild("btnRule");
+            m_txtTeaName = (GTextField)comp.GetChild("txtTeaName");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
             m_btnBack = null;
-            m_txtTeaName = null;
             m_TeaPartyOverItem1.Dispose();
             m_TeaPartyOverItem1 = null;
+            m_TeaPartyOverItem2.Dispose();
+            m_TeaPartyOverItem2 = null;
             m_TeaPartyOverItem3.Dispose();
             m_TeaPartyOverItem3 = null;
             m_TeaPartyOverItem4.Dispose();
             m_TeaPartyOverItem4 = null;
-            m_TeaPartyOverItem2.Dispose();
-            m_TeaPartyOverItem2 = null;
             m_TeaPartyOverItem5.Dispose();
             m_TeaPartyOverItem5 = null;
             m_TeaPartyOverItem6.Dispose();
             m_TeaPartyOverItem6 = null;
+            m_btnReward = null;
+            m_btnRule = null;
+            m_txtTeaName = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueTeaPartyUI.cs

@@ -12,15 +12,10 @@ namespace UI.League
         public GButton m_btnChallenge;
         public GButton m_btnChat;
         public GButton m_btnReward;
+        public GButton m_btnRule;
         public GTextField m_txtTeaName;
-        public UI_comTeaPartyItem m_teaPartyItem1;
-        public UI_comTeaPartyItem m_teaPartyItem2;
-        public UI_comTeaPartyItem m_teaPartyItem3;
-        public UI_comTeaPartyItem m_teaPartyItem4;
-        public UI_comTeaPartyItem m_teaPartyItem5;
-        public UI_comTeaPartyItem m_teaPartyItem6;
+        public GList m_ListTeaParty;
         public UI_TeaPartyItemTips m_teaPartyItemTips;
-        public GButton m_btnRule;
         public const string URL = "ui://tw70qm9dchwotpk";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "LeagueTeaPartyUI";
@@ -73,15 +68,10 @@ namespace UI.League
             m_btnChallenge = (GButton)comp.GetChild("btnChallenge");
             m_btnChat = (GButton)comp.GetChild("btnChat");
             m_btnReward = (GButton)comp.GetChild("btnReward");
+            m_btnRule = (GButton)comp.GetChild("btnRule");
             m_txtTeaName = (GTextField)comp.GetChild("txtTeaName");
-            m_teaPartyItem1 = (UI_comTeaPartyItem)UI_comTeaPartyItem.Create(comp.GetChild("teaPartyItem1"));
-            m_teaPartyItem2 = (UI_comTeaPartyItem)UI_comTeaPartyItem.Create(comp.GetChild("teaPartyItem2"));
-            m_teaPartyItem3 = (UI_comTeaPartyItem)UI_comTeaPartyItem.Create(comp.GetChild("teaPartyItem3"));
-            m_teaPartyItem4 = (UI_comTeaPartyItem)UI_comTeaPartyItem.Create(comp.GetChild("teaPartyItem4"));
-            m_teaPartyItem5 = (UI_comTeaPartyItem)UI_comTeaPartyItem.Create(comp.GetChild("teaPartyItem5"));
-            m_teaPartyItem6 = (UI_comTeaPartyItem)UI_comTeaPartyItem.Create(comp.GetChild("teaPartyItem6"));
+            m_ListTeaParty = (GList)comp.GetChild("ListTeaParty");
             m_teaPartyItemTips = (UI_TeaPartyItemTips)UI_TeaPartyItemTips.Create(comp.GetChild("teaPartyItemTips"));
-            m_btnRule = (GButton)comp.GetChild("btnRule");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -90,22 +80,11 @@ namespace UI.League
             m_btnChallenge = null;
             m_btnChat = null;
             m_btnReward = null;
+            m_btnRule = null;
             m_txtTeaName = null;
-            m_teaPartyItem1.Dispose();
-            m_teaPartyItem1 = null;
-            m_teaPartyItem2.Dispose();
-            m_teaPartyItem2 = null;
-            m_teaPartyItem3.Dispose();
-            m_teaPartyItem3 = null;
-            m_teaPartyItem4.Dispose();
-            m_teaPartyItem4 = null;
-            m_teaPartyItem5.Dispose();
-            m_teaPartyItem5 = null;
-            m_teaPartyItem6.Dispose();
-            m_teaPartyItem6 = null;
+            m_ListTeaParty = null;
             m_teaPartyItemTips.Dispose();
             m_teaPartyItemTips = null;
-            m_btnRule = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_comTeaPartyItem.cs

@@ -8,10 +8,10 @@ namespace UI.League
     {
         public GComponent target;
         public GLoader m_iconRole;
-        public GLoader m_btnDetail;
         public GTextField m_txtRoleName;
         public GTextField m_txtMaxValue;
         public GImage m_imgChoose;
+        public GLoader m_btnDetail;
         public const string URL = "ui://tw70qm9dchwotpl";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "comTeaPartyItem";
@@ -60,18 +60,18 @@ namespace UI.League
         private void Init(GComponent comp)
         {
             m_iconRole = (GLoader)comp.GetChild("iconRole");
-            m_btnDetail = (GLoader)comp.GetChild("btnDetail");
             m_txtRoleName = (GTextField)comp.GetChild("txtRoleName");
             m_txtMaxValue = (GTextField)comp.GetChild("txtMaxValue");
             m_imgChoose = (GImage)comp.GetChild("imgChoose");
+            m_btnDetail = (GLoader)comp.GetChild("btnDetail");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_iconRole = null;
-            m_btnDetail = null;
             m_txtRoleName = null;
             m_txtMaxValue = null;
             m_imgChoose = null;
+            m_btnDetail = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -93,7 +93,7 @@ namespace GFGGame
         {
             DailyLoginCfg cfg = (context.sender as GObject).data as DailyLoginCfg;
 
-            if (cfg.id < ActivityDataManager.Instance.sevenDayLoginBonusStatusList.Count && ActivityDataManager.Instance.sevenDayLoginBonusStatusList[cfg.id - 1] == ConstBonusStatus.CAN_GET)
+            if (ActivityDataManager.Instance.sevenDayLoginBonusStatusList[cfg.id - 1] == ConstBonusStatus.CAN_GET)
             {
                 bool result = await ActivitySProxy.ReqSevenDayLoginRewards(cfg.id);
                 if (result)

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

@@ -141,6 +141,13 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+
+            _levelID = (int)viewData;
+            if(_levelID > 0)
+                _ui.m_c1.selectedIndex = 0;
+            else
+                _ui.m_c1.selectedIndex = 2;
+
             _ui.m_loaGuide.visible = true;
             InstanceZonesDataManager.usedRecommend = false;
             // _ui.m_comboBox.title = "我的套装";
@@ -150,43 +157,44 @@ namespace GFGGame
             _scoreIndex = _ui.m_partsList.m_comboBoxRarity.selectedIndex;
             _ui.m_btnAutoPlay.selected = FightDataManager.Instance.autoPlay;
             _ui.m_btnAutoPlay.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(ConstFunctionId.FUNCTION_AUTOPLAY_FIGHT, false);
-            _ui.m_btnRecommend.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(ConstFunctionId.FUNCTION_AUTOPLAY_FIGHT, false); ;
+            _ui.m_btnRecommend.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(ConstFunctionId.FUNCTION_AUTOPLAY_FIGHT, false);
 
-            _levelID = (int)viewData;
-            InstanceZonesDataManager.currentLevelCfgId = _levelID;
-            _levelCfg = StoryLevelCfgArray.Instance.GetCfg(_levelID);
-            _fightCfg = StoryFightCfgArray.Instance.GetCfg(_levelCfg.fightID);
-            if (_levelCfg.type == ConstInstanceZonesType.Field)
-            {
-                scoreType = FieldDataManager.Instance.fieldInfos.theme;
-                _ui.m_btnAutoPlay.visible = false;
-            }
-            else {
-                scoreType = _fightCfg.scoreType;
-            }
-            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)
+            if (_levelID > 0) { 
+                InstanceZonesDataManager.currentLevelCfgId = _levelID;
+                _levelCfg = StoryLevelCfgArray.Instance.GetCfg(_levelID);
+                _fightCfg = StoryFightCfgArray.Instance.GetCfg(_levelCfg.fightID);
+                if (_levelCfg.type == ConstInstanceZonesType.Field)
                 {
-                    _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;
+                    scoreType = FieldDataManager.Instance.fieldInfos.theme;
+                    _ui.m_btnAutoPlay.visible = false;
                 }
-                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 {
+                    scoreType = _fightCfg.scoreType;
                 }
-                else
+                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 = 1;
-                    _ui.m_compNeed.m_listTag.numItems = _fightCfg.needTagsArr.Length;
-                    _ui.m_compNeed.m_imgGot.visible = false;
+                    _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;
+                    }
                 }
             }
             InstanceZonesDataManager.currentScoreType = scoreType;
@@ -215,9 +223,11 @@ namespace GFGGame
             _ui.m_txtDressLimit.text = string.Format("饰品穿戴限制：{0}/{1}", MyDressUpHelper.GetCurrentOrnamentCount(), GlobalCfgArray.globalCfg.dressLimitCount);
 
             UpdateStepBtn(true);
-
             UpdateScore();
-            SendLog();
+
+            if (_levelID > 0)
+                SendLog();
+
             Timers.inst.AddUpdate(CheckGuide);
         }
 
@@ -258,7 +268,10 @@ namespace GFGGame
             AlertUI.Show("是否确定退出？")
             .SetLeftButton(true, "否").SetRightButton(true, "是", (object data) =>
             {
-                if (_levelCfg.type == ConstInstanceZonesType.Studio && _levelCfg.subType != ConstInstanceZonesSubType.Hard3)
+                if(_levelCfg == null){ 
+                    ViewManager.Show<LeagueTeaPartyView>();
+                }
+                else if (_levelCfg.type == ConstInstanceZonesType.Studio && _levelCfg.subType != ConstInstanceZonesSubType.Hard3)
                 {
                     ViewManager.Show(StudioDataManager.Instance.VIEW_NAME, StudioDataManager.Instance.PROPERTY_SELECT_INDEX, ViewManager.GetGoBackDatas(StudioDataManager.Instance.VIEW_NAME));
                 }
@@ -781,7 +794,7 @@ namespace GFGGame
             // }
 
             //必穿品放在列表最前面
-            if (_fightCfg.needItemId > 0)
+            if (_fightCfg!= null && _fightCfg.needItemId > 0)
             {
                 int index = _currentList3.IndexOf(_fightCfg.needItemId);
                 if (index >= 0)
@@ -791,7 +804,7 @@ namespace GFGGame
                     _currentList3.Insert(0, item);
                 }
             }
-            else if (_fightCfg.needSuitId > 0)
+            else if (_fightCfg != null && _fightCfg.needSuitId > 0)
             {
                 int index = _currentList3.IndexOf(_fightCfg.needSuitId);
                 if (index >= 0)
@@ -941,7 +954,15 @@ namespace GFGGame
             typeItem.m_txtname.text = item1.name;
             //typeItem.m_imgTitle.url = "ui://DressUp/hz_iconzi_" + item1.id;
             typeItem.target.data = item1.id;
-            typeItem.m_imgNeed.visible = ItemUtil.CheckMenuType1(_fightCfg.needItemId, _fightCfg.needSuitId, item1.id);
+            if (_levelID > 0)
+            {
+                typeItem.m_imgNeed.visible = ItemUtil.CheckMenuType1(_fightCfg.needItemId, _fightCfg.needSuitId, item1.id);
+                typeItem.m_itemType.selectedIndex = 0;
+            }
+            else
+                typeItem.m_itemType.selectedIndex = 1;
+
+
             typeItem.m_imgNew.visible = DressUpMenuItemDataManager.CheckIsFirstMenuNew(item1.id);
             UI_TypeItem.ProxyEnd();
         }
@@ -954,13 +975,32 @@ namespace GFGGame
             typeItem.m_txtname.text = item2.name;
             //typeItem.m_imgTitle.url = "ui://DressUp/hz_iconziej_" + item2.id;
             typeItem.target.data = item2.id;
-            var subType = ItemUtilCS.GetItemSubType(_fightCfg.needItemId);
-            typeItem.m_imgNeed.visible = subType == item2.type;
-            typeItem.m_imgNew.visible = DressUpMenuItemDataManager.CheckIsSecondMenuNew(item2.id);
+            if (_levelID > 0) { 
+                typeItem.m_itemType.selectedIndex = 0;
+                var subType = ItemUtilCS.GetItemSubType(_fightCfg.needItemId);
+                typeItem.m_imgNeed.visible = subType == item2.type;
+                typeItem.m_imgNew.visible = DressUpMenuItemDataManager.CheckIsSecondMenuNew(item2.id);
+            }
+            else
+                typeItem.m_itemType.selectedIndex = 1;
 
             UI_TypeItem.ProxyEnd();
         }
 
+        private void ListTagItem(int index, GObject item)
+        {
+            ItemCfg itemCfg = (ItemCfg)item.parent.data;
+            UI_ComTagItem listItem = UI_ComTagItem.Proxy(item);
+            string name = itemCfg.tagsArr[index][0].ToString();
+            int tagType = TagCfgArray.Instance.GetCfg(name).type;
+            UI.CommonGame.UI_ComTag itemTag = UI.CommonGame.UI_ComTag.Proxy(listItem.m_loaTag);
+            itemTag.m_txtTag.text = name;
+            itemTag.m_loaTag.url = ResPathUtil.GetCommonGameResPath("fzd_bqbq_" + tagType);  
+            UI.CommonGame.UI_ComTag.ProxyEnd();
+            listItem.m_txtScore.text = itemCfg.tagsArr[index][1];
+            UI_ComTagItem.ProxyEnd();
+        }
+
         private void ListPartsItem(int index, GObject item)
         {
             UI_PartsListItem listItem = UI_PartsListItem.Proxy(item);
@@ -985,7 +1025,17 @@ namespace GFGGame
                 iconRes = itemCfg.res;
                 partName = itemCfg.name;
                 listItem.m_iconSelected.visible = MyDressUpHelper.dressUpObj.CheckDressUpItemIsOn(id);
-                listItem.m_txtScore.text = "" + ItemDataManager.GetItemAdditionScore(id, InstanceZonesDataManager.currentScoreType, _fightCfg.needTagsArr);
+                if (_levelID > 0)
+                    listItem.m_txtScore.text = "" + ItemDataManager.GetItemAdditionScore(id, InstanceZonesDataManager.currentScoreType, _fightCfg.needTagsArr);
+                else {
+                    if (listItem.m_ListTag.data == null)
+                    {
+                        listItem.m_ListTag.itemRenderer = ListTagItem;
+                    }
+                    listItem.m_ListTag.data = itemCfg;
+                    listItem.m_ListTag.numItems = itemCfg.tagsArr.Length;
+                }
+
                 listItem.m_loaBorder.url = "ui://DressUp/hz_kuangk_" + itemCfg.rarity;
                 bool isNew = DressUpMenuItemDataManager.CheckIsDressUpItemNew(id);
                 listItem.m_imgNew.visible = isNew;
@@ -1003,12 +1053,18 @@ namespace GFGGame
                 longPressGesture.onAction.Add(OnLongPress);
                 _listLongPress.Add(longPressGesture);
             }
+
+            if (_levelID > 0)
+                listItem.m_itemType.selectedIndex = 0;
+            else
+                listItem.m_itemType.selectedIndex = 1;
+
             listItem.m_btnAni.visible = false;
             listItem.m_icon.url = ResPathUtil.GetIconPath(iconRes, ext);
             listItem.m_ScoreType.url = "ui://CommonGame/kp_sx_" + scoreType;
             listItem.m_txtTitle.text = partName;
             listItem.target.data = id;
-            listItem.m_imgNeed.visible = _fightCfg.needItemId == id || _fightCfg.needSuitId == id;
+            listItem.m_imgNeed.visible = _fightCfg != null && (_fightCfg.needItemId == id || _fightCfg.needSuitId == id);
             UI_PartsListItem.ProxyEnd();
         }
         private void ListParts2Item(int index, GObject item)
@@ -1155,7 +1211,8 @@ namespace GFGGame
 
         private void UpdateScore()
         {
-            _ui.m_txtScore.text = "" + FightDataManager.Instance.GetScore(InstanceZonesDataManager.roleData).ToString();
+            if (_levelID > 0)
+                _ui.m_txtScore.text = "" + FightDataManager.Instance.GetScore(InstanceZonesDataManager.roleData).ToString();
             // GuideController.TryGuideDressUpFightViewBtnNext(_ui.m_btnNext);
         }
 

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

@@ -30,9 +30,11 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
 
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zjm_2_2");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("chahuibg");
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
-          
+            _ui.m_btnReward.onClick.Add(OnBtnRewardClick);
+            _ui.m_btnRule.onClick.Add(RuleController.ShowRuleView);
+            _ui.m_btnRule.data = 300022;
         }
 
         protected override void AddEventListener()
@@ -58,5 +60,10 @@ namespace GFGGame
         {
             ViewManager.GoBackFrom(typeof(LeagueView).FullName);
         }
+
+        private void OnBtnRewardClick()
+        {
+            ViewManager.Show<LeagueTeaPartyRewardView>();
+        }
     }
 }

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

@@ -11,7 +11,7 @@ namespace GFGGame
     {
         private UI_LeagueTeaPartyUI _ui;
         private List<UI_comTeaPartyItem> teaPartyItemList = new List<UI_comTeaPartyItem>();
-
+        private List<TeapartyRoleCfg> teapartyRoleCfg;
         public override void Dispose()
         {
             if (_ui != null)
@@ -30,30 +30,29 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
 
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zjm_2_2");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("chahuibg");
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _ui.m_btnChat.onClick.Add(OnBtnChatClick);
             _ui.m_btnChallenge.onClick.Add(OnBtnChallengeClick);
             _ui.m_btnReward.onClick.Add(OnBtnRewardClick);
+            _ui.m_teaPartyItemTips.target.onClick.Add(OnTeaPartyItemTipsClick);
+            _ui.m_btnRule.onClick.Add(RuleController.ShowRuleView);
+            _ui.m_btnRule.data = 300022;
 
-            teaPartyItemList.Add(_ui.m_teaPartyItem1);
-            teaPartyItemList.Add(_ui.m_teaPartyItem2);
-            teaPartyItemList.Add(_ui.m_teaPartyItem3);
-            teaPartyItemList.Add(_ui.m_teaPartyItem4);
-            teaPartyItemList.Add(_ui.m_teaPartyItem5);
-            teaPartyItemList.Add(_ui.m_teaPartyItem6);
+            _ui.m_ListTeaParty.itemRenderer = ListTeaPartyItemRender;
 
-            _ui.m_teaPartyItemTips.target.onClick.Add(OnTeaPartyItemTipsClick);
+            teapartyRoleCfg = TeapartyRoleCfgArray.Instance.GetCfgsByid(1); //LeagueDataManager.Instance.TeaPartyId
+        }
 
+        private void ListTeaPartyItemRender(int index, GObject obj)
+        {
+            UI_comTeaPartyItem itemObj = UI_comTeaPartyItem.Proxy(obj);
 
-            List<TeapartyRoleCfg> teapartyRoleCfg = TeapartyRoleCfgArray.Instance.GetCfgsByid(1); //LeagueDataManager.Instance.TeaPartyId
-            int index = 0;
-            foreach (var itemObj in teaPartyItemList) {
-                itemObj.m_btnDetail.onClick.Add(OnBtnDetailClick);
-                itemObj.m_iconRole.onClick.Add(OnBtnIconRoleClick);
-                itemObj.m_txtRoleName.text = teapartyRoleCfg[index].name;
-                index += 1;
-            }
+            itemObj.m_btnDetail.onClick.Add(OnBtnDetailClick);
+            itemObj.m_iconRole.onClick.Add(OnBtnIconRoleClick);
+            itemObj.m_txtRoleName.text = teapartyRoleCfg[index].name;
+
+            UI_comTeaPartyItem.ProxyEnd();
         }
 
         protected override void AddEventListener()
@@ -67,8 +66,8 @@ namespace GFGGame
             GetRoleContainerInfos();
             var openCfg = TeapartyOpenCfgArray.Instance.GetCfg(1);//LeagueDataManager.Instance.TeaPartyId
             _ui.m_txtTeaName.text = openCfg.name;
-            _ui.m_btnRule.onClick.Add(RuleController.ShowRuleView);
-            _ui.m_btnRule.data = 300022;
+            _ui.m_teaPartyItemTips.target.visible = false;
+            _ui.m_ListTeaParty.numItems = 6;
         }
 
         private async void GetRoleContainerInfos()
@@ -80,6 +79,7 @@ namespace GFGGame
                 for (int index = 0; index < roleContainerList.Count; index++){
                     teaPartyItemList[index].m_txtMaxValue.text = roleContainerList[index].MaxScore.ToString();
 
+
                 }
             }
         }
@@ -131,7 +131,7 @@ namespace GFGGame
             FieldCfg _curCfg;
             _curCfg = FieldCfgArray.Instance.dataArray[FieldDataManager.Instance.difficulty];
             int curLevelId = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(_curCfg.type, 0, _curCfg.id)[0].id;
-            ViewManager.Show<DressUpFightView>(curLevelId, new object[] { typeof(LeagueTeaPartyView).FullName, null }, true);
+            ViewManager.Show<DressUpFightView>(0, new object[] { typeof(LeagueTeaPartyView).FullName, null }, true);
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/MainStory/StroyFightResultView.cs

@@ -178,7 +178,30 @@ namespace GFGGame
                 else
                 {
                     ViewManager.Show<FieldView>();
-                    ViewManager.Show<FieldFightInfoView>();
+                    bool result = await FieldSProxy.ReqFieldInstanceResult();
+                    FieldDataManager _dataManager = FieldDataManager.Instance;
+                    //这里判断如果获取的马蹄金超过上限了，就终止挑战
+                    if (_dataManager.fieldInfos.bonusWeekly >= _dataManager.fieldInfos.bonusMaxLimit)
+                    {
+                        AlertUI.Show("本周可获得奖励已达上限，是否继续挑战？")
+                        .SetLeftButton(true)
+                        .SetRightButton(true, "确认",(object data) =>
+                        {
+                            if (result)
+                            {
+                                InstanceZonesDataManager.currentCardId = FieldFightDataManager.Instance.CurrentCardId;
+                                InstanceZonesDataManager.currentScoreType = FieldFightDataManager.Instance.CurrentScoreType;
+                                InstanceZonesDataManager.currentLevelCfgId = FieldFightDataManager.Instance.currentLevelCfgId;
+
+                                ViewManager.Hide<FieldView>();
+                                ViewManager.Show<StoryFightTargetView>();
+                            }
+                        });
+                    }
+                    else
+                    { 
+                        ViewManager.Show<FieldFightInfoView>();
+                    }
                 }
             }
             else

GameClient/Assets/ResIn/UI/Studio/Studio_atlas0_3!a.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 895ffd5a0537c3b4a8688dbe83f7ec1c
-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/Studio/Studio_atlas0_3.png.meta

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