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

# Conflicts:
#	GameClient/Assets/Game/HotUpdate/Utils/ResPathUtil.cs
#	GameClient/Assets/Game/HotUpdate/Views/DressUp/ArenaDressUpFightView.cs
#	GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs
#	GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpView.cs
#	GameClient/Assets/Game/HotUpdate/Views/Friend/FriendView.cs
#	GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

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

@@ -915,7 +915,6 @@ namespace GFGGame
             {
                 haveCount += _itemDatasBySubTypeDic[ConstDressUpItemType.TE_SHU].Count;
             }
-            haveCount -= defaultID.Count;
         }
     }
 }

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

@@ -348,6 +348,16 @@ namespace GFGGame
         // }
 
 
-
+        /// <summary>
+        /// 返回活动商城是否显示
+        /// /// </summary>
+        public bool GetShopActivityIsShow()
+        {
+            List<ShopCfg> shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY);
+            if (ShopDataManager.Instance.RemoveNotOpenCfg(shopCfgs).Count == 0)
+                return false;
+            else
+                return true;
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/BornLimit/UI_ButtonDay.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button24.cs

@@ -2,21 +2,20 @@
 
 using FairyGUI;
 
-namespace UI.BornLimit
+namespace UI.CommonGame
 {
-    public partial class UI_ButtonDay
+    public partial class UI_Button24
     {
         public GButton target;
         public Controller m_c1;
-        public GTextField m_text;
-        public const string URL = "ui://cfkvka81xi0115";
-        public const string PACKAGE_NAME = "BornLimit";
-        public const string RES_NAME = "ButtonDay";
-        private static UI_ButtonDay _proxy;
+        public const string URL = "ui://eg2y0ldp8xjbtpw";
+        public const string PACKAGE_NAME = "CommonGame";
+        public const string RES_NAME = "Button24";
+        private static UI_Button24 _proxy;
 
-        public static UI_ButtonDay Create(GObject gObject = null)
+        public static UI_Button24 Create(GObject gObject = null)
         {
-            var ui = new UI_ButtonDay();
+            var ui = new UI_Button24();
             if(gObject == null)
             	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -25,11 +24,11 @@ namespace UI.BornLimit
             return ui;
         }
 
-        public static UI_ButtonDay Proxy(GObject gObject = null)
+        public static UI_Button24 Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_ButtonDay();
+                _proxy = new UI_Button24();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -57,12 +56,10 @@ namespace UI.BornLimit
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_text = (GTextField)comp.GetChild("text");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
-            m_text = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/BornLimit/UI_ButtonDay.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/CommonGame/UI_Button24.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a39e7f8df6bac1e4792048353c316187
+guid: 303b416066a20df4ba56ba2d818ceb0f
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -8,14 +8,15 @@ namespace UI.DailyWelfare
     {
         public GComponent target;
         public GLoader m_loaBg;
+        public GList m_list;
         public GButton m_btnBack;
+        public GLoader m_name;
         public GTextField m_packageName;
         public GTextField m_txtTime;
         public GGroup m_grpTime;
-        public GList m_list;
         public GButton m_btnRight;
         public GButton m_btnLeft;
-        public GButton m_btnCharge;
+        public GLoader m_btnCharge;
         public const string URL = "ui://t8nwuj7idn9y2h";
         public const string PACKAGE_NAME = "DailyWelfare";
         public const string RES_NAME = "NewLimitChargeUI";
@@ -64,23 +65,25 @@ namespace UI.DailyWelfare
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_list = (GList)comp.GetChild("list");
             m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_name = (GLoader)comp.GetChild("name");
             m_packageName = (GTextField)comp.GetChild("packageName");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_grpTime = (GGroup)comp.GetChild("grpTime");
-            m_list = (GList)comp.GetChild("list");
             m_btnRight = (GButton)comp.GetChild("btnRight");
             m_btnLeft = (GButton)comp.GetChild("btnLeft");
-            m_btnCharge = (GButton)comp.GetChild("btnCharge");
+            m_btnCharge = (GLoader)comp.GetChild("btnCharge");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
+            m_list = null;
             m_btnBack = null;
+            m_name = null;
             m_packageName = null;
             m_txtTime = null;
             m_grpTime = null;
-            m_list = null;
             m_btnRight = null;
             m_btnLeft = null;
             m_btnCharge = null;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComBox.cs

@@ -12,12 +12,14 @@ namespace UI.LuckyBox
         public UI_Button3 m_btnPreview;
         public GTextField m_txtOwned;
         public GLoader m_imgActLuckyBox;
-        public UI_ComCost m_comCostOne;
-        public UI_ComCost m_comCostTen;
-        public UI_Button1 m_btnBuyOne;
-        public UI_Button2 m_btnBuyTen;
-        public GImage m_imgSpecial;
+        public UI_ComCost2 m_comCostOne;
+        public UI_ComCost2 m_comCostTen;
+        public GButton m_btnBuyOne;
+        public GButton m_btnBuyTen;
         public GTextField m_txtRemainTimes;
+        public GImage m_imgSpecial;
+        public GGraph m_holder;
+        public GGroup m_grpSpecial;
         public const string URL = "ui://drx9d1usnjmn2p";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "ComBox";
@@ -70,12 +72,14 @@ namespace UI.LuckyBox
             m_btnPreview = (UI_Button3)UI_Button3.Create(comp.GetChild("btnPreview"));
             m_txtOwned = (GTextField)comp.GetChild("txtOwned");
             m_imgActLuckyBox = (GLoader)comp.GetChild("imgActLuckyBox");
-            m_comCostOne = (UI_ComCost)UI_ComCost.Create(comp.GetChild("comCostOne"));
-            m_comCostTen = (UI_ComCost)UI_ComCost.Create(comp.GetChild("comCostTen"));
-            m_btnBuyOne = (UI_Button1)UI_Button1.Create(comp.GetChild("btnBuyOne"));
-            m_btnBuyTen = (UI_Button2)UI_Button2.Create(comp.GetChild("btnBuyTen"));
-            m_imgSpecial = (GImage)comp.GetChild("imgSpecial");
+            m_comCostOne = (UI_ComCost2)UI_ComCost2.Create(comp.GetChild("comCostOne"));
+            m_comCostTen = (UI_ComCost2)UI_ComCost2.Create(comp.GetChild("comCostTen"));
+            m_btnBuyOne = (GButton)comp.GetChild("btnBuyOne");
+            m_btnBuyTen = (GButton)comp.GetChild("btnBuyTen");
             m_txtRemainTimes = (GTextField)comp.GetChild("txtRemainTimes");
+            m_imgSpecial = (GImage)comp.GetChild("imgSpecial");
+            m_holder = (GGraph)comp.GetChild("holder");
+            m_grpSpecial = (GGroup)comp.GetChild("grpSpecial");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -90,12 +94,12 @@ namespace UI.LuckyBox
             m_comCostOne = null;
             m_comCostTen.Dispose();
             m_comCostTen = null;
-            m_btnBuyOne.Dispose();
             m_btnBuyOne = null;
-            m_btnBuyTen.Dispose();
             m_btnBuyTen = null;
-            m_imgSpecial = null;
             m_txtRemainTimes = null;
+            m_imgSpecial = null;
+            m_holder = null;
+            m_grpSpecial = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComBox1.cs

@@ -13,7 +13,6 @@ namespace UI.LuckyBox
         public GTextField m_txtTsyTime;
         public GTextField m_txtTime;
         public GGroup m_grpTime;
-        public GButton m_btnRule;
         public GGroup m_grpTitle;
         public GButton m_btnGiftBag;
         public UI_ComBagTime m_comBagTime;
@@ -76,7 +75,6 @@ namespace UI.LuckyBox
             m_txtTsyTime = (GTextField)comp.GetChild("txtTsyTime");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_grpTime = (GGroup)comp.GetChild("grpTime");
-            m_btnRule = (GButton)comp.GetChild("btnRule");
             m_grpTitle = (GGroup)comp.GetChild("grpTitle");
             m_btnGiftBag = (GButton)comp.GetChild("btnGiftBag");
             m_comBagTime = (UI_ComBagTime)UI_ComBagTime.Create(comp.GetChild("comBagTime"));
@@ -96,7 +94,6 @@ namespace UI.LuckyBox
             m_txtTsyTime = null;
             m_txtTime = null;
             m_grpTime = null;
-            m_btnRule = null;
             m_grpTitle = null;
             m_btnGiftBag = null;
             m_comBagTime.Dispose();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComCost2.cs

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.LuckyBox
+{
+    public partial class UI_ComCost2
+    {
+        public GComponent target;
+        public Controller m_c1;
+        public GLoader m_loaCost;
+        public GTextField m_txtCost;
+        public GTextField m_txtFree;
+        public const string URL = "ui://drx9d1usgfkstqm";
+        public const string PACKAGE_NAME = "LuckyBox";
+        public const string RES_NAME = "ComCost2";
+        private static UI_ComCost2 _proxy;
+
+        public static UI_ComCost2 Create(GObject gObject = null)
+        {
+            var ui = new UI_ComCost2();
+            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_ComCost2 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ComCost2();
+            }
+            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_c1 = comp.GetController("c1");
+            m_loaCost = (GLoader)comp.GetChild("loaCost");
+            m_txtCost = (GTextField)comp.GetChild("txtCost");
+            m_txtFree = (GTextField)comp.GetChild("txtFree");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_c1 = null;
+            m_loaCost = null;
+            m_txtCost = null;
+            m_txtFree = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComCost2.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxWishUI.cs

@@ -9,6 +9,7 @@ namespace UI.LuckyBox
         public GComponent target;
         public GButton m_btnWish1;
         public GButton m_btnWish2;
+        public GButton m_btnRule;
         public const string URL = "ui://drx9d1usnlyjtqb";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "LuckyBoxWishUI";
@@ -58,11 +59,13 @@ namespace UI.LuckyBox
         {
             m_btnWish1 = (GButton)comp.GetChild("btnWish1");
             m_btnWish2 = (GButton)comp.GetChild("btnWish2");
+            m_btnRule = (GButton)comp.GetChild("btnRule");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_btnWish1 = null;
             m_btnWish2 = null;
+            m_btnRule = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_StudioFilingUI.cs

@@ -14,17 +14,16 @@ namespace UI.Studio
         public GButton m_btnChange;
         public GLoader m_btnChageLine;
         public GLoader m_loaBg;
-        public GTextField m_txtNum;
-        public GButton m_btnAdd;
-        public GGroup m_grpAdd;
+        public GTextField m_activityTitle;
         public GList m_list;
+        public GButton m_btnReward;
         public GButton m_btnSuit;
         public GTextField m_txtSuitName;
         public GTextField m_txtSuitProgress;
         public GLoader m_suitIcon;
-        public GButton m_btnReward;
         public GTextField m_activityTipText;
-        public GTextField m_activityTitle;
+        public GTextField m_txtNum;
+        public GButton m_btnAdd;
         public const string URL = "ui://xz8kxrecrqo41i";
         public const string PACKAGE_NAME = "Studio";
         public const string RES_NAME = "StudioFilingUI";
@@ -79,17 +78,16 @@ namespace UI.Studio
             m_btnChange = (GButton)comp.GetChild("btnChange");
             m_btnChageLine = (GLoader)comp.GetChild("btnChageLine");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_txtNum = (GTextField)comp.GetChild("txtNum");
-            m_btnAdd = (GButton)comp.GetChild("btnAdd");
-            m_grpAdd = (GGroup)comp.GetChild("grpAdd");
+            m_activityTitle = (GTextField)comp.GetChild("activityTitle");
             m_list = (GList)comp.GetChild("list");
+            m_btnReward = (GButton)comp.GetChild("btnReward");
             m_btnSuit = (GButton)comp.GetChild("btnSuit");
             m_txtSuitName = (GTextField)comp.GetChild("txtSuitName");
             m_txtSuitProgress = (GTextField)comp.GetChild("txtSuitProgress");
             m_suitIcon = (GLoader)comp.GetChild("suitIcon");
-            m_btnReward = (GButton)comp.GetChild("btnReward");
             m_activityTipText = (GTextField)comp.GetChild("activityTipText");
-            m_activityTitle = (GTextField)comp.GetChild("activityTitle");
+            m_txtNum = (GTextField)comp.GetChild("txtNum");
+            m_btnAdd = (GButton)comp.GetChild("btnAdd");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -100,17 +98,16 @@ namespace UI.Studio
             m_btnChange = null;
             m_btnChageLine = null;
             m_loaBg = null;
-            m_txtNum = null;
-            m_btnAdd = null;
-            m_grpAdd = null;
+            m_activityTitle = null;
             m_list = null;
+            m_btnReward = null;
             m_btnSuit = null;
             m_txtSuitName = null;
             m_txtSuitProgress = null;
             m_suitIcon = null;
-            m_btnReward = null;
             m_activityTipText = null;
-            m_activityTitle = null;
+            m_txtNum = null;
+            m_btnAdd = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -96,7 +96,7 @@ namespace GFGGame
                 //}
                 List<ItemData> itemDatas = new List<ItemData>();
                 itemDatas.Add(ItemUtil.createItemData(itemCfg.id, times * shopCfg.itemNum * multiple));
-                if (shopCfg.doubleItemId > 0) { 
+                if (shopCfg.doubleItemId > 0 && totalTimes <= shopCfg.doubleTimes) { 
                     ItemCfg doubleItemIdCfg = ItemCfgArray.Instance.GetCfg(shopCfg.doubleItemId);
                     itemDatas.Add(ItemUtil.createItemData(doubleItemIdCfg.id, times * shopCfg.itemNum * multiple));
                 }

GameClient/Assets/Game/HotUpdate/Utils/ResPathUtil.cs

@@ -233,10 +233,14 @@ namespace GFGGame
             return res;
         }
 
-        public static string GetStudioFilingPicPath(string res, string extName = "png")
+        public static string GetStudioChapterPicPath(string res, string extName = "png")
         {
             return $"{STUDIO_FILING_DIR_PATH}{"dangan_"}{res}.{extName}";
         }
 
+        public static string GetStudioFilingPicPath(string res, string extName = "png")
+        {
+            return $"{STUDIO_FILING_DIR_PATH}{res}.{extName}";
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/ActivityAfuGift/ActivityAfuGiftView.cs

@@ -107,7 +107,7 @@ namespace GFGGame
         /// </summary>
         private void ProgressAutoLocate()
         {
-            _ui.m_panel.m_scrollPane.target.scrollPane.posX 
+            _ui.m_panel.m_scrollPane.target.scrollPane.posX
                 = (ActivityAfuGiftDataManager.Instance.GetIndexDay() - 1) * (_rewardListUI.GetChildAt(0).width + _rewardListUI.columnGap);
         }
 
@@ -179,7 +179,7 @@ namespace GFGGame
             // 已经到达的日期
             int passDay = ActivityAfuGiftDataManager.Instance.GetIndexDay();
             bool arrive = dayIndex <= passDay;
-            
+
             // 显示锁/遮罩
             if (isVip)
             {
@@ -281,11 +281,19 @@ namespace GFGGame
 
             if (!ActivityAfuGiftDataManager.Instance.GetIsBuy())
             {
-                // 跳转充值画面
-                ReqShopBuy(990005).Coroutine();
+                var activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.AFZL);
+                if (activityInfo != null)
+                {
+                    var cfg = ActivityOpenCfgArray.Instance.GetCfg(activityInfo.ActivityId);
+                    if (cfg.paramsArr != null && cfg.paramsArr.Length > 0)
+                    {
+                        int id = cfg.paramsArr[0];
+                        // 跳转充值画面
+                        ReqShopBuy(id).Coroutine();
+                    }
+                }
                 return;
             }
-
             ActivityAfuGiftProxy.ReqGetAllReward().Coroutine();
         }
 
@@ -316,7 +324,7 @@ namespace GFGGame
             if (ActivityAfuGiftDataManager.Instance.GetIsBuy())
             {
                 // 0-普通 1-变灰
-                 _ui.m_btnGetState.SetSelectedIndex(ActivityAfuGiftDataManager.Instance.HaveCanGetReward() ? 0 : 1);
+                _ui.m_btnGetState.SetSelectedIndex(ActivityAfuGiftDataManager.Instance.HaveCanGetReward() ? 0 : 1);
             }
             // 没有充值，保持常亮
             else

GameClient/Assets/Game/HotUpdate/Views/ActivityDay7/ActivityDay7View.cs

@@ -39,6 +39,8 @@ namespace GFGGame
             _ui = UI_ActivityDay7UI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
+
             bringToFontOnClick = false;
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("qrhd_banner_yxzy");

GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxView.cs

@@ -30,6 +30,7 @@ namespace GFGGame
             _ui = UI_ActivityThemeLuckyBoxUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
 
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _ui.m_btnTask.target.onClick.Add(OnBtnTaskClick);

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaDressInfoView.cs

@@ -51,6 +51,7 @@ namespace GFGGame
             _ui = UI_ArenaDressInfoUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
 
             _ui.m_c2.onChanged.Add(OnThemeChange);
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaLoadingView.cs

@@ -29,6 +29,7 @@ namespace GFGGame
             _ui = UI_ArenaLoadingUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
 
             _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_holder, "ui_dljm", "ui_dljm_jdt_tw");
         }

GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaView.cs

@@ -48,6 +48,7 @@ namespace GFGGame
             _ui = UI_ArenaUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
 
             _valueBarController = new ValueBarController(_ui.m_valueBar);
 

GameClient/Assets/Game/HotUpdate/Views/Bag/BagView.cs

@@ -43,6 +43,7 @@ namespace GFGGame
             _ui = UI_BagUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
 
             _valueBarController = new ValueBarController(_ui.m_comValueBar);
 

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

@@ -30,6 +30,7 @@ namespace GFGGame
             _ui = UI_CardDetailUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
 
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             // _ui.m_btnHome.onClick.Add(OnClickBtnHome);

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

@@ -98,6 +98,7 @@ namespace GFGGame
             _ui = UI_CardFosterUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
 
             //公共组件：返回，页签，属性列表
             _ui.m_ComFosterTop.m_btnback.onClick.Add(OnClickBtnBack);

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

@@ -25,6 +25,7 @@ namespace GFGGame
             _ui = UI_CardUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
 
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_loaStory1.target.onClick.Add(() => { OnClickLoaStory(1); });

GameClient/Assets/Game/HotUpdate/Views/ClothingDecompose/ClothingDecomposeView.cs

@@ -41,6 +41,8 @@ namespace GFGGame
             _ui = UI_ClothingDecomposeUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
+
             this.clickBlankToClose = false;
             _valueBarController = new ValueBarController(_ui.m_valueBar);
 

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

@@ -36,6 +36,7 @@ namespace GFGGame
             _ui = UI_ClothingListUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
 
             // _valueBarController = new ValueBarController(_ui.m_valueBar);
 

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

@@ -55,6 +55,7 @@ namespace GFGGame
             this.viewCom = _ui.target;
             // this.viewCom.Center();
             isfullScreen = true;
+            isReturnView = true;
             // this.clickBlankToClose = false;
             _valueBarController = new ValueBarController(_ui.m_valueBar);
             _dressUpObjUI = new DressUpObjUI("SceneSuitFoster");

GameClient/Assets/Game/HotUpdate/Views/ClothingShop/ClothingShopView.cs

@@ -69,6 +69,7 @@ namespace GFGGame
             _ui = UI_ClothingShopUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            //isReturnView = true;
 
             _valueBarController = new ValueBarController(_ui.m_valueBar);
             _dressUpObjUI = new DressUpObjUI("SceneDressUp");
@@ -199,8 +200,7 @@ namespace GFGGame
         private void OnClickBtnBack()
         {
             ViewManager.GoBackFrom(typeof(ClothingShopView).FullName);
-            this.Hide();
-
+            //this.Hide();
         }
 
         private void OnclickBtnBuy()

GameClient/Assets/Game/HotUpdate/Views/ClothingShop/GalleryShopView.cs

@@ -60,6 +60,7 @@ namespace GFGGame
             _ui = UI_GalleryShopUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
 
             _valueBarController = new ValueBarController(_ui.m_valueBar);
 

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

@@ -81,6 +81,7 @@ namespace GFGGame
             _ui = UI_ClothingSyntheticUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
             this.clickBlankToClose = false;
 
             _valueBarController = new ValueBarController(_ui.m_valueBar);

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

@@ -30,6 +30,7 @@ namespace GFGGame
             _ui = UI_ClothingSyntheticListUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
 
             _ui.m_listSuit.itemRenderer = ListSuitItemRenderer;
 

GameClient/Assets/Game/HotUpdate/Views/Common/Alert/AlertWindow.cs

@@ -41,8 +41,9 @@ namespace GFGGame
             packageName = UI_AlertUI.PACKAGE_NAME;
             _ui = UI_AlertUI.Create();
             this.viewCom = _ui.target;
-
+            //this.viewCom.sortingOrder = ConstSortingOrder.TOP;
             isfullScreen = true;
+
             layer = ConstViewLayer.TOP;
             // viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
             this.viewCom.Center();

GameClient/Assets/Game/HotUpdate/Views/Common/ModalStatusView.cs

@@ -15,6 +15,7 @@ namespace GFGGame
             _ui = UI_ModalStatusUI.Create();
             viewCom = _ui.target;
             layer = ConstViewLayer.MODAL;
+            //viewCom.sortingOrder = ConstSortingOrder.Modal;
             isfullScreen = true;
         }
 

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

@@ -167,7 +167,7 @@ namespace GFGGame
                     //     isJump = false;
                     //     break;
                     // }
-                    isJump = ViewManager.Show<ClothingShopView>(new object[] { shopId, null, _itemId, needCount }, _fromViewDatas, true, true);
+                    isJump = ViewManager.Show<ClothingShopView>(new object[] { shopId, null, _itemId, needCount }, _fromViewDatas, false, true);
                     break;
                 case ConstFunctionId.FU_ZHUANG_DECOMPOSE:
                     // this.Hide();
@@ -179,9 +179,6 @@ namespace GFGGame
                     int storeSubId = int.Parse(infos[2]);
                     if (storeTabId == ConstStoreTabId.STORE_GIFT_BAG) { 
                         List<ShopCfg> shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY);
-                        //活动商店关闭需要减1
-                        if (ShopDataManager.Instance.RemoveNotOpenCfg(shopCfgs).Count == 0) 
-                            storeSubId -= 1;
                     }
                     isJump = ViewManager.Show<StoreView>(new object[] { storeTabId, storeSubId });
                     return;
@@ -274,7 +271,7 @@ namespace GFGGame
                             //从战斗换装必需品来源跳转到剧情界面，在剧情界面点返回后直接返回章节界面，无需返回换装界面
                             _fromViewDatas = null;
                         }
-                        isJump = ViewManager.Show<StoryChapterView>(levelCfg.chapterId, _fromViewDatas, true);
+                        isJump = ViewManager.Show<StoryChapterView>(levelCfg.chapterId, _fromViewDatas, false);
                         StoryController.ShowLevelView(levelCfgId, _itemId, _needCount);
                         break;
                     }

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

@@ -217,18 +217,18 @@ namespace GFGGame
             int count = int.Parse(_ui.m_txtCount.text.Trim());
             int price = int.Parse(_ui.m_txtPrice.text.Trim());
 
-
             if (_count > 0)
             {
                 long hasCount = ItemDataManager.GetItemNum(_costId);
                 if (price > hasCount)
                 {
-                    // this.Hide();
                     if (!ItemUtil.BuyCurrency(_costId, price - hasCount))
                     {
                         ItemCfg costCfg = ItemCfgArray.Instance.GetCfg(_costId);
                         PromptController.Instance.ShowFloatTextPrompt(string.Format("{0}不足", costCfg.name));
                     }
+                    else
+                        this.Hide();
                     return;
                 }
                 else

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

@@ -41,6 +41,7 @@ namespace GFGGame
             _ui = UI_DailyWelfareUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
 
             _valueBarController = new ValueBarController(_ui.m_comValueBar);
 
@@ -70,6 +71,7 @@ namespace GFGGame
             || ActivityDataManager.Instance.AllSevenDayBonusGot());
 
             _limitChargeInfo = ActivityGlobalDataManager.Instance.GetActivityInfoByType(ActivityType.XSLC);
+            _limitChargeInfo.Add(ActivityGlobalDataManager.Instance.GetActivityInfoByType(ActivityType.OpenServerCharge)[0]);
             _ui.m_comList.m_listLimitCharge.numItems = _limitChargeInfo.Count;
             _ui.m_comList.m_listLimitCharge.ResizeToFit();
 
@@ -121,6 +123,11 @@ namespace GFGGame
                 item.m_loaIcon.url = "ui://DailyWelfare/hdbn_xslc_" + openCfg.res;
                 item.m_loaTitle.url = "ui://DailyWelfare/hdbn_wz_xslc_" + openCfg.res;
             }
+            if (openCfg.id == 501)
+            {
+                item.m_loaIcon.url = "ui://DailyWelfare/hdbn_xslc_xslgt";
+                item.m_loaTitle.url = "ui://DailyWelfare/hdbn_wz_xslc_xslgt";
+            }
             if (item.target.data == null)
             {
                 item.target.onClick.Add(OnBtnLimitChargeAddUpClick);
@@ -135,7 +142,13 @@ namespace GFGGame
         private void OnBtnLimitChargeAddUpClick(EventContext context)
         {
             GObject gObject = context.sender as GObject;
+            int id = (int)gObject.data;
 
+            if (id == 501)
+            {
+                ViewManager.Show<NewLimitChargeView>(new object[] { gObject.data }, new object[] { typeof(DailyWelfareView).FullName, this.viewData });
+                return;
+            }
             ViewManager.Show<LimitChargeView>(new object[] { gObject.data }, new object[] { typeof(DailyWelfareView).FullName, this.viewData });
         }
         private void OnBtnSevenDayLoginClick()

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

@@ -33,6 +33,7 @@ namespace GFGGame
             _ui = UI_LimitChargeUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
             _ui.m_list.itemRenderer = RenderListItem;
 
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);

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

@@ -52,6 +52,7 @@ namespace GFGGame
             _ui = UI_NewLimitChargeUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
             this.clickBlankToClose = false;
             this.bringToFontOnClick = false;
 
@@ -59,7 +60,7 @@ namespace GFGGame
 
             _ui.m_list.itemRenderer = ListItemRenderer;
             _ui.m_list.SetVirtual();
-            _ui.m_list.scrollPane.onScrollEnd.Add(UpdateSuitView);
+            //_ui.m_list.scrollPane.onScrollEnd.Add(UpdateSuitView);
             _ui.m_list.scrollPane.decelerationRate = 0.8f;
 
             _ui.m_btnLeft.onClick.Add(OnBtnLeftClick);
@@ -77,10 +78,11 @@ namespace GFGGame
         {
             base.OnShown();
 
+
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("bg_fhl");
             //_curSelectIndex = Math.Max(0, RoleDataManager.vipLv - 1);
             //_ui.m_list.selectedIndex = _curSelectIndex;
             //_ui.m_list.ScrollToView(_curSelectIndex);
-
             //_activityId = 501;
             _activityId = (int)(this.viewData as object[])[0];
             _rechargeCfgs = ActivityRechargeCfgArray.Instance.GetCfgsByactivityId(_activityId);
@@ -88,9 +90,16 @@ namespace GFGGame
             //UpdateRedDot();
             
             RefreshList();
+
+            string name = SuitCfgArray.Instance.GetCfg(_rechargeCfgs[0].suitId).name;
+            _ui.m_packageName.text = name;
+
             _ui.m_btnLeft.visible = _curSelectIndex == 0 ? false : true;
             _ui.m_btnRight.visible = _curSelectIndex < _ui.m_list.numItems - 1 ? true : false;
 
+            _ui.m_list.ScrollToView(_curSelectIndex);
+            _ui.m_packageName.text = SuitCfgArray.Instance.GetCfg(_rechargeCfgs[_curSelectIndex].suitId).name;
+
             Timers.inst.Add(1, 0, UpdateTime);
         }
 
@@ -126,7 +135,17 @@ namespace GFGGame
             item.m_txtName2.text = name.Length > 2 ? name.Substring(2, 1) : "";
             item.m_txtName3.text = name.Length > 3 ? name.Substring(3, 1) : "";
             item.m_txtName4.text = name.Length > 4 ? name.Substring(4) : "";
-            _ui.m_packageName.text = name;
+            if (vipCfg.res != "")
+            {
+                item.m_cardIcon.visible = true;
+                item.m_cardBg.visible = true;
+                item.m_cardIcon.url = "ui://DailyWelfare/" + vipCfg.res;
+            }
+            else
+            {
+                item.m_cardIcon.visible = false;
+                item.m_cardBg.visible = false;
+            }
             if (item.m_listGiftBag.data == null)
             {
                 item.m_listGiftBag.itemRenderer = ListRewardItemRender;
@@ -210,14 +229,20 @@ namespace GFGGame
 
             if (_curSelectIndex == 0) return;
             _curSelectIndex = _curSelectIndex - 1;
-            _ui.m_list.ScrollToView(_curSelectIndex, true);
+            _ui.m_list.ScrollToView(_curSelectIndex);
+            string name = SuitCfgArray.Instance.GetCfg(_rechargeCfgs[_curSelectIndex].suitId).name;
+            _ui.m_packageName.text = name;
+            UpdateSuitView();
             //UpdateRedDot();
         }
         private void OnBtnRightClick()
         {
             if (_curSelectIndex == _ui.m_list.numItems - 1) return;
             _curSelectIndex = _curSelectIndex + 1;
-            _ui.m_list.ScrollToView(_curSelectIndex, true);
+            _ui.m_list.ScrollToView(_curSelectIndex);
+            string name = SuitCfgArray.Instance.GetCfg(_rechargeCfgs[_curSelectIndex].suitId).name;
+            _ui.m_packageName.text = name;
+            UpdateSuitView();
             //UpdateRedDot();
 
         }

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

@@ -58,6 +58,7 @@ namespace GFGGame
             _ui = UI_ArenaDressUpFightUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
         }
 
         protected override void OnInit()

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

@@ -67,6 +67,7 @@ namespace GFGGame
             _ui = UI_DressUpFightUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
+            //isReturnView = true;
             _ui.m_btnClose.width = GRoot.inst.width;
             _ui.m_btnClose.height = GRoot.inst.height;
             _ui.m_btnClose.AddRelation(GRoot.inst, RelationType.Size);
@@ -331,7 +332,6 @@ namespace GFGGame
                 ViewManager.Show<StoryChapterView>(_levelCfg.chapterId);//, new object[] { typeof(StoryChapterListView).FullName}
             }
             //MyDressUpHelper.dressUpObj.TakeOffAll();
-
             this.Hide();
         }
 
@@ -354,6 +354,7 @@ namespace GFGGame
                     ChangeTeapartyDressup();
                 });
             }
+           
 
         //ViewManager.Show<StoryChapterView>(StoryDataManager.currentChapter);
     }

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

@@ -62,6 +62,7 @@ namespace GFGGame
             _ui = UI_DressUpUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
         }
 
         protected override void OnInit()

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

@@ -24,6 +24,7 @@ namespace GFGGame
             _ui = UI_PhotographSaveUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
 
             _ui.m_btnClose.onClick.Add(this.Hide);
             _ui.m_btnSave.onClick.Add(this.OnClickBtnSave);

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

@@ -74,6 +74,7 @@ namespace GFGGame
             _ui = UI_PhotographUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
+            //isReturnView = true;
 
             _ui.m_btnBg.onClick.Add(OnClickBtnBg);
 

GameClient/Assets/Game/HotUpdate/Views/Field/FieldView.cs

@@ -39,6 +39,7 @@ namespace GFGGame
             _ui = UI_FieldUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
 
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             // _ui.m_btnGo.onClick.Add(OnClickBtnGo);

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/CardGuideView.cs

@@ -35,6 +35,7 @@ namespace GFGGame
             _ui = UI_CardGuideUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("quanping_moren_bg");
 
             _cardList = new List<int>();

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/ChapterItemGuideView.cs

@@ -26,6 +26,7 @@ namespace GFGGame
             _ui = UI_ChapterItemGuideUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
 
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_list.itemRenderer = RenderListItem;

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/ChapterItemShowView.cs

@@ -27,6 +27,7 @@ namespace GFGGame
             _ui = UI_ChapterItemShowUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
 
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
         }

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/DressUpGuideView.cs

@@ -43,6 +43,7 @@ namespace GFGGame
             _ui = UI_DressUpGuideUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("quanping_moren_bg");
 
             _itemIdList = new List<int>();

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/FieldGuideView.cs

@@ -33,16 +33,15 @@ namespace GFGGame
             _ui = UI_FieldGuideUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
 
             _startInAnim = true;
             _ui.m_listGuide.itemRenderer = ListGuideItemRenderer;
 
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_listGuide.onClickItem.Add(OnClickListGuideItem);
-
-
-
         }
+
         protected override void AddEventListener()
         {
             EventAgent.AddEventListener(ConstMessage.SUIT_GUIDE_BOX_BONUS, UpdateList);

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitGuideDetailView.cs

@@ -32,6 +32,8 @@ namespace GFGGame
             _ui = UI_SuitGuideDetailUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
+
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("tjbg");
 
             _ui.m_listSuit.itemRenderer = RenderListSuitItem;

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitGuideView.cs

@@ -31,6 +31,7 @@ namespace GFGGame
             _ui = UI_SuitGuideUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("tjbg");
 
             _ui.m_suitTypeList.itemRenderer = RenderListSuitType;
@@ -41,7 +42,6 @@ namespace GFGGame
             _ui.m_suitTypeList.onClick.Add(OnClickListSuitType);
             InitSuitGuideType();
             UpdateItemsByType(1);
-
         }
         protected override void AddEventListener()
         {

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitShowView.cs

@@ -42,6 +42,7 @@ namespace GFGGame
             _ui = UI_SuitShowUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
             this.clickBlankToClose = false;
 
             _dressUpObjUI = new DressUpObjUI("SceneDressUp");
@@ -76,7 +77,16 @@ namespace GFGGame
                 }
             }
             SuitGuideMenuCfg cfg = SuitGuideMenuCfgArray.Instance.GetCfg(_suitTypeId);
-            _ui.m_txtTypeName.text = cfg.name;
+            if (cfg == null)
+            {
+                SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(_suitId);
+                _ui.m_txtSuitName.text = suitCfg.name;
+            }
+            else
+            {
+                _ui.m_txtTypeName.text = cfg.name;
+            }
+           
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("tjtj_bjbj");
 
             UpdateArrows();

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/TravelGuideView.cs

@@ -25,6 +25,7 @@ namespace GFGGame
             _ui = UI_TravelGuideUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
 
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_list.itemRenderer = RenderListItem;

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/TravelShowView.cs

@@ -29,7 +29,8 @@ namespace GFGGame
             _ui = UI_TravelShowUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
-
+            isReturnView = true;
+            
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_btnReward.target.onClick.Add(OnBtnRewardClick);
 

GameClient/Assets/Game/HotUpdate/Views/Friend/FriendView.cs

@@ -43,6 +43,8 @@ namespace GFGGame
             _ui = UI_FriendUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
+
             _dressUpObj = new DressUpObj();
 
             _ui.m_list.SetVirtual();

GameClient/Assets/Game/HotUpdate/Views/Guide/GuideView.cs

@@ -43,6 +43,7 @@ namespace GFGGame
             _ui = UI_GuideUI.Create();
             this.viewCom = _ui.target;
             this.layer = ConstViewLayer.GUIDE;
+            //this.viewCom.sortingOrder = ConstSortingOrder.Guide;
             isfullScreen = true;
 
             _ui.m_loaMask.onClick.Add(OnClickTarget);

GameClient/Assets/Game/HotUpdate/Views/IUIView.cs

@@ -10,6 +10,7 @@ namespace GFGGame
         object viewData { get; set; }
         string viewName { get; set; }
         long closeTime { get; set; }
+        bool isReturnView { get; set; }
         void Refresh();
         void Show();
         void Hide();

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

@@ -87,6 +87,12 @@ namespace GFGGame
         private void OnBtnTeaPartyClick()
         {
             Hide();
+            var roleTeapartyInfo = LeagueDataManager.Instance.RoleTeapartyInfo;
+            if (roleTeapartyInfo.IsQuitTeaParty && roleTeapartyInfo.LastOpenCfgId != 0 && roleTeapartyInfo.LastOpenCfgId == LeagueDataManager.Instance.TeaPartyId) {
+                PromptController.Instance.ShowFloatTextPrompt("该玩法不可以重复参加哦");
+                return;
+            }
+
             if (LeagueDataManager.Instance.TeaPartyStatus == LeagueTeaPartyStatus.YesGo && !LeagueDataManager.Instance.RoleTeapartyInfo.IsComplete && LeagueDataManager.Instance.RoleTeapartyInfo.Status)
                 ViewManager.Show<LeagueTeaPartyShowView>(null, new object[] { typeof(LeagueView).FullName, null });
             else 

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

@@ -38,7 +38,7 @@ namespace GFGGame
             _ui = UI_LeagueAnsweringUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
-
+            isReturnView = true;
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("lm_beijing2");
 
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);

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

@@ -31,6 +31,7 @@ namespace GFGGame
 
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
             // this.viewCom.Center();
             //   this.viewCom = _ui.target;
             // this.modal = true;

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

@@ -29,6 +29,7 @@ namespace GFGGame
             _ui = UI_LeagueJoinUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            //isReturnView = true;
 
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("lm_beijing");
 
@@ -141,8 +142,8 @@ namespace GFGGame
                 bool result = await LeagueSproxy.ReqJoinLeague(leagueId);
                 if (result)
                 {
-                    OnBtnBackClick();
                     ViewManager.Show<LeagueView>(null, new object[] { typeof(MainUIView).FullName, null });
+                    OnBtnBackClick();
                 }
             }
         }

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

@@ -29,6 +29,7 @@ namespace GFGGame
             _ui = UI_LeagueMemberUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
 
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _ui.m_btnRecruit.target.onClick.Add(OnBtnRecruitClick);

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

@@ -51,6 +51,7 @@ namespace GFGGame
             _ui = UI_LeagueSkillUpUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
 
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _ui.m_comSkill.m_listScore.itemRenderer = RenderListScoreItem;

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

@@ -34,6 +34,7 @@ namespace GFGGame
             _ui = UI_LeagueSkillUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
 
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _ui.m_listScore.itemRenderer = RenderListScoreItem;

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

@@ -30,6 +30,7 @@ namespace GFGGame
             _ui = UI_LeagueTeaPartyOverUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
 
             _ui.m_loaBg.url = ResPathUtil.GetDressUpPath("chahuibg");
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);

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

@@ -31,6 +31,7 @@ namespace GFGGame
             _ui = UI_LeagueTeaPartyShowUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
 
             _ui.m_loaBg.url = ResPathUtil.GetDressUpPath("chahuibg");
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);

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

@@ -31,6 +31,7 @@ namespace GFGGame
             _ui = UI_LeagueTeaPartyUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
 
             _ui.m_loaBg.url = ResPathUtil.GetDressUpPath("chahuibg");
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);

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

@@ -28,6 +28,7 @@ namespace GFGGame
             _ui = UI_LeagueUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
 
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zjm_2_2");
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);

GameClient/Assets/Game/HotUpdate/Views/Loading/LoadingView.cs

@@ -49,6 +49,7 @@ namespace GFGGame
             _ui = UI_LoadingView.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
             _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_holder, "ui_dljm", "ui_dljm_jdt_tw");
 
         }

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

@@ -46,6 +46,7 @@ namespace GFGGame
             _ui = UI_LuckyBoxActivityUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
 
             _valueBarController = new ValueBarController(_ui.m_valueBar);
             _luckyBoxCtrl = new LuckyBoxController(_ui.m_comBox.m_comModel.target);
@@ -120,17 +121,17 @@ namespace GFGGame
             comBox.m_comCostTen.m_txtCost.text = _luckyBoxCfg.costNumTen.ToString();
             comBox.m_comCostTen.m_loaCost.url = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(_luckyBoxCfg.costID).res);
 
-            if (comBox.m_btnBuyOne.target.data == null)
+            if (comBox.m_btnBuyOne.data == null)
             {
-                comBox.m_btnBuyOne.target.onClick.Add(OnClickBtnBuyOne);
+                comBox.m_btnBuyOne.onClick.Add(OnClickBtnBuyOne);
             }
-            comBox.m_btnBuyOne.target.data = _luckyBoxCfg.id;
+            comBox.m_btnBuyOne.data = _luckyBoxCfg.id;
 
-            if (comBox.m_btnBuyTen.target.data == null)
+            if (comBox.m_btnBuyTen.data == null)
             {
-                comBox.m_btnBuyTen.target.onClick.Add(OnClickBtnBuyTen);
+                comBox.m_btnBuyTen.onClick.Add(OnClickBtnBuyTen);
             }
-            comBox.m_btnBuyTen.target.data = _luckyBoxCfg.id;
+            comBox.m_btnBuyTen.data = _luckyBoxCfg.id;
             if (comBox.m_btnPreview.target.data == null)
             {
                 comBox.m_btnPreview.target.onClick.Add(OnClickBtnPreview);

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

@@ -36,7 +36,6 @@ namespace GFGGame
             LuckyBoxCfg cfg = LuckyBoxCfgArray.Instance.GetCfg(boxId);
             string probShow = cfg.probShow.Replace("\\n", "\n");
             _ui.m_compText.m_txtShow.text = probShow;
-
             _bonusList = LuckyBoxDataManager.Instance.GetCurrentShowList(boxId);
             _ui.m_list.RemoveChildrenToPool();
             _ui.m_list.itemRenderer = ListItemRenderer;

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

@@ -67,6 +67,7 @@ namespace GFGGame
             _ui = UI_LuckyBoxUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
 
             _dressUpObjUIXiHe = new DressUpObjUI("SceneDressUp");
             _dressUpObjUIChangXi = new DressUpObjUI("SceneDressUp");
@@ -238,11 +239,6 @@ namespace GFGGame
             {
                 comBox.m_showActivityType.selectedIndex = 1;
                 UpGiftBox(comBox);
-                if (comBox.m_btnRule.data == null)
-                {
-                    comBox.m_btnRule.onClick.Add(RuleController.ShowRuleView);
-                    comBox.m_btnRule.data = 300024;
-                }
             }
             else 
                 comBox.m_showActivityType.selectedIndex = 0;
@@ -333,7 +329,7 @@ namespace GFGGame
 
         private void OnClikcBtnShop()
         {
-            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY }, new object[] { typeof(LuckyBoxView).FullName });
+            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_TSY }, new object[] { typeof(LuckyBoxView).FullName });
         }
 
         //刷新摘星活动期间的数据
@@ -576,6 +572,7 @@ namespace GFGGame
         private void OnClickBtnBack()
         {
             Reset();
+            //this.Hide();
             ViewManager.GoBackFrom(typeof(LuckyBoxView).FullName);
         }
 

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

@@ -26,6 +26,7 @@ namespace GFGGame
             packageName = UI_LuckyBoxWishUI.PACKAGE_NAME;
             _ui = UI_LuckyBoxWishUI.Create();
             this.viewCom = _ui.target;
+            isfullScreen = true;
             this.viewCom.Center();
             this.modal = true;
 
@@ -33,6 +34,8 @@ namespace GFGGame
             _ui.m_btnWish1.onClick.Add(OnClickBtnWish);
             _ui.m_btnWish2.data = 1;
             _ui.m_btnWish2.onClick.Add(OnClickBtnWish);
+            _ui.m_btnRule.onClick.Add(RuleController.ShowRuleView);
+            _ui.m_btnRule.data = 300024;
         }
         protected override void AddEventListener()
         {
@@ -60,8 +63,11 @@ namespace GFGGame
         private void OnClickBtnWish(EventContext context)
         {
             int index = (int)(context.sender as GObject).data;
-            ReqAddWishingPoolInfo(index);
-            this.Hide();
+            int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(_actLimitTsy);
+            ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityId);
+            var suitId = activityOpenCfg.params2Arr[index];
+            var suitCfg = SuitCfgArray.Instance.GetCfg(suitId);
+            AlertUI.Show(string.Format("是否将【{0}】设为许愿套装（许愿后将不可修改，请研究员谨慎选择）", suitCfg.name)).SetLeftButton(true).SetRightButton(true, "确定", (object data) => { onSuccess(index); });
         }
 
         private async void ReqAddWishingPoolInfo(int index)
@@ -74,5 +80,11 @@ namespace GFGGame
              
             }
         }
+
+        private void onSuccess(int index)
+        {
+            ReqAddWishingPoolInfo(index);
+            this.Hide();
+        }
     }
 }

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

@@ -55,7 +55,7 @@ namespace GFGGame
             _ui = UI_ArenaFightResultUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
-
+            isReturnView = true;
         }
 
         protected override void OnInit()

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

@@ -27,6 +27,7 @@ namespace GFGGame
             _ui = UI_StoryChapterListUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
         }
 
         protected override void OnInit()
@@ -45,7 +46,6 @@ namespace GFGGame
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zxian_bg3");
 
             _ui.m_listChapter.scrollPane.onScroll.Add(DoSpecialEffect);//滚动时派发事件
-            //_ui.m_listChapter.scrollPane.onScroll.Add(SetItemColorCallBack);
 
 
         }
@@ -273,7 +273,7 @@ namespace GFGGame
                 UI_ListChapterItem.ProxyEnd();
             }
             _ui.m_listChapter.ScrollToView(currentChapterIndex);
-            int childrenCount = _ui.m_listChapter.numChildren;
+            int childrenCount = _ui.m_listChapter.numChildren - 1;
             if (currentChapterIndex == childrenCount - 1)
             {
                 _time = currentChapterIndex - 2;
@@ -287,7 +287,7 @@ namespace GFGGame
                 _time = currentChapterIndex;
             }
             _timeCount = 0;
-            Timers.inst.Add(0.1f, _ui.m_listChapter.numChildren, OnTimerUpdate, 1);
+            Timers.inst.Add(0.1f, _ui.m_listChapter.numChildren , OnTimerUpdate, 1);
         }
         private void CheckGuide(object param)
         {
@@ -357,7 +357,7 @@ namespace GFGGame
                     listItem.m_content.m_compPic.m_pic.color = new Color(0.4f, 0.4f, 0.4f, 1.000f);
                     item.SetScale(1.0f, 1.0f);
                 }
-                float distanceX = ((1 - (listCenter - itemCenter)) / itemWidth) * 0.05f;//使放大动画有渐进效果
+                float distanceX = ((1 - (listCenter - itemCenter)) / itemWidth) * 0.05f;//使y轴移动有渐进效果
                 item.y = -_ui.m_listChapter.height * distanceX;
             }
         }

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

@@ -47,7 +47,7 @@ namespace GFGGame
             _ui = UI_StoryChapterUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
-
+            isReturnView = true;
         }
 
         protected override void OnInit()

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

@@ -76,6 +76,7 @@ namespace GFGGame
             _ui = UI_StoryDialogUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
 
         }
 

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

@@ -104,6 +104,7 @@ namespace GFGGame
             _ui = UI_StoryFightSingleScoreUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
+            //isReturnView = true;
 
             // _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneFightSingleScore"));
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);

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

@@ -30,6 +30,7 @@ namespace GFGGame
             _ui = UI_StoryFightSingleUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
+            //isReturnView = true;
 
         }
 

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

@@ -116,6 +116,7 @@ namespace GFGGame
             _ui = UI_StoryFightTargetScoreUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
+            //isReturnView = true;
 
             // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("fightBg");
             // _ui.m_LoaMask.url = ResPathUtil.GetBgImgPath("fightBg");

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

@@ -45,6 +45,7 @@ namespace GFGGame
             _ui = UI_StoryFightTargetUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
+            //isReturnView = true;
 
         }
 

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

@@ -93,6 +93,7 @@ namespace GFGGame
                 DressUpFightType dressUpFightType = new DressUpFightType();
                 dressUpFightType.levelID = _levelID;
                 dressUpFightType.teaPartID = 0;
+                this.Hide();
                 ViewManager.Show<DressUpFightView>(dressUpFightType, null, true);
             }
             else

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

@@ -69,6 +69,7 @@ namespace GFGGame
             _ui = UI_StoryFightResultUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
+            //isReturnView = true;
 
         }
 
@@ -181,9 +182,14 @@ namespace GFGGame
                     if (_dataManager.fieldInfos.bonusWeekly >= _dataManager.fieldInfos.bonusMaxLimit)
                     {
                         AlertUI.Show("本周可获得奖励已达上限，是否继续挑战？")
-                        .SetLeftButton(true, "取消", (object data) =>
+                        .SetLeftButton(true, "取消",async (object data) =>
                         {
+                            ViewManager.Show<FieldView>();
+                            bool result = await FieldSProxy.ReqFieldInstanceResult();
+                            if (result)
+                            {
                                 ViewManager.Show<FieldFightEndView>();
+                            }
                         })
                         .SetRightButton(true, "确认",(object data) =>
                         {

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

@@ -79,6 +79,7 @@ namespace GFGGame
             _ui = UI_MainUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
         }
 
         protected override void OnInit()

GameClient/Assets/Game/HotUpdate/Views/Notice/NoticeActivityShowView.cs

@@ -26,8 +26,8 @@ namespace GFGGame
             _ui = UI_NoticeActivityShowUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
             this.clickBlankToClose = false;
-
         }
 
         protected override void OnInit()

GameClient/Assets/Game/HotUpdate/Views/Poem/PoemGalleryPreviewView.cs

@@ -28,6 +28,7 @@ namespace GFGGame
             _ui = UI_PoemGalleryPreviewUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
             // _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("gzs_bjbj");
 
             _ui.m_btnback.onClick.Add(OnBtnBackClick);

GameClient/Assets/Game/HotUpdate/Views/Poem/PoemGalleryView.cs

@@ -86,6 +86,7 @@ namespace GFGGame
             _ui = UI_PoemGalleryUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("hc_bj_1");
 
             _ui.m_comNormal.m_comBoBox.items = new string[] { "推荐", "最新" };
@@ -297,7 +298,7 @@ namespace GFGGame
         private void OnBtnJoinClick()
         {
             object[] gobackParamDatas = new object[] { _tabIndex, _subtabIndex, _ui.m_comNormal.m_comBoBox.selectedIndex };
-            ViewManager.Show<DressUpView>(1, new object[] { typeof(PoemGalleryView).FullName, gobackParamDatas }, true);
+            ViewManager.Show<DressUpView>(1, new object[] { typeof(PoemGalleryView).FullName, gobackParamDatas }, false);
         }
 
         /// <summary>

GameClient/Assets/Game/HotUpdate/Views/Poem/PoemPhotoPreView.cs

@@ -32,6 +32,7 @@ namespace GFGGame
             _ui = UI_PoemPhotoPreviewUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
 
             _ui.m_grhBg.onClick.Add(OnBtnBackClick);
 

GameClient/Assets/Game/HotUpdate/Views/Poem/PoemPhotoShareView.cs

@@ -28,6 +28,7 @@ namespace GFGGame
             _ui = UI_PoemPhotoShareUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("xc_bjbj");
 
             _ui.m_btnback.onClick.Add(OnBtnBackClick);

GameClient/Assets/Game/HotUpdate/Views/Poem/PoemPhotoView.cs

@@ -30,6 +30,7 @@ namespace GFGGame
             _ui = UI_PoemPhotoUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("xc_bjbj");
 
             _ui.m_list.SetVirtual();

GameClient/Assets/Game/HotUpdate/Views/Poem/PoemView.cs

@@ -24,6 +24,7 @@ namespace GFGGame
             _ui = UI_PoemUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
 
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("tjtj_bjbj");
 

GameClient/Assets/Game/HotUpdate/Views/PopWindow/ExchangeGoodsView.cs

@@ -25,6 +25,7 @@ namespace GFGGame
             _ui = UI_ExchangeGoodsUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
             bringToFontOnClick = false;
             //_ui.m_btnBack.onClick.Add(OnBtnBackClick);
         }

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/OtherRoleInfoView.cs

@@ -28,7 +28,7 @@ namespace GFGGame
             _ui = UI_OtherRoleInfoUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
-
+            isReturnView = true;
 
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
 

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/PersonalPhotoView.cs

@@ -27,6 +27,7 @@ namespace GFGGame
             _ui = UI_PersonalPhotoUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
 
             _ui.m_btnback.onClick.Add(OnBtnBackClick);
 

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/RoleInfoView.cs

@@ -27,6 +27,7 @@ namespace GFGGame
             _ui = UI_RoleInfoUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
 
             _ui.m_txtVersion.text = GameGlobal.version;
             _ui.m_txtSlogan.maxLength = GlobalCfgArray.globalCfg.maxSloganWordsCount;
@@ -148,7 +149,6 @@ namespace GFGGame
             }
 
             ViewManager.Show<PersonalPhotoView>(index, new object[] { typeof(RoleInfoView).FullName, this.viewData });
-            this.Hide();
         }
 
         private void OnClickBtnHelp()
@@ -168,8 +168,7 @@ namespace GFGGame
 
         private void OnBtnFieldGuideClick()
         {
-            this.Hide();
-            ViewManager.Show<FieldGuideView>(null, new object[] { typeof(RoleInfoView).FullName, this.viewData });
+            ViewManager.Show<FieldGuideView>();
         }
         private void OnBtnSkillClick()
         {

GameClient/Assets/Game/HotUpdate/Views/Store/StoreChargeAddUpView.cs

@@ -168,8 +168,9 @@ namespace GFGGame
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemData.id);
             item.m_txtCount.text = itemData.num.ToString();
             item.target.data = itemCfg;
-            item.m_QualityType.selectedIndex = itemData.rarity - 1;
             item.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
+            item.m_QualityType.selectedIndex = itemCfg.rarity - 1;
+            RarityIconController.UpdateRarityIcon(item.m_loaRarity, itemCfg.id, false);
             UI_ComItem.ProxyEnd();
         }
 

GameClient/Assets/Game/HotUpdate/Views/Store/StoreView.cs

@@ -38,10 +38,10 @@ namespace GFGGame
             _ui = UI_StoreUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
             this.bringToFontOnClick = false;
 
-
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("sc_beijing");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("bg_fhl");
 
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_comTab.m_c1.onChanged.Add(OnTabChange);
@@ -75,6 +75,9 @@ namespace GFGGame
             _ui.m_comTab.target.scrollPane.SetPercX((float)(_curTabIndex - 1) / (float)StoreTabCfgArray.Instance.dataArray.Length, false);
 
             _curSubTabIndex = this.viewData == null ? 0 : (int)(this.viewData as object[])[1];
+            if (_curTabIndex == ConstStoreTabId.STORE_GIFT_BAG && _curSubTabIndex > 0 && !ShopDataManager.Instance.GetShopActivityIsShow()) {
+                _curSubTabIndex -= 1;
+            }
             if (_ui.m_listSubTab.numItems > _curSubTabIndex)
             {
                 _ui.m_listSubTab.selectedIndex = _curSubTabIndex;
@@ -105,7 +108,7 @@ namespace GFGGame
         {
             ViewManager.Hide(_curViewName);
             this.Hide();
-            ViewManager.GoBackFrom(typeof(StoreView).FullName);
+            //ViewManager.GoBackFrom(typeof(StoreView).FullName);
         }
 
         private void OnTabChange()
@@ -131,8 +134,7 @@ namespace GFGGame
                         int menu2 = int.Parse(tabCfg.subTabArr[i][1]);
                         if (menu2 == ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY)
                         {
-                            List<ShopCfg> shopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_GIFT_BAG, menu2);
-                            if (ShopDataManager.Instance.RemoveNotOpenCfg(shopCfgs).Count == 0) continue;
+                            if (!ShopDataManager.Instance.GetShopActivityIsShow()) continue;
                         }
                         _storeTabCfgs.Add(tabCfg.subTabArr[i]);
                     }
@@ -195,6 +197,7 @@ namespace GFGGame
                 _ui.m_listSubTab.selectedIndex = _curSubTabIndex;
                 return;
             }
+
             ViewManager.Hide(_curViewName);
             if (!string.IsNullOrEmpty(viewName) && viewName != "“”")
             {

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioBaseView.cs

@@ -44,6 +44,7 @@ namespace GFGGame
             _ui = UI_StudioEctypeUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
 
             _valueBarController = new ValueBarController(_ui.m_valueBar);
 

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFilingNpcView.cs

@@ -32,6 +32,7 @@ namespace GFGGame
             _ui = UI_StudioFilingNpcUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
             // this.viewCom.Center();
             // this.modal = true;
             viewAnimationType = EnumViewAnimationType.None;
@@ -76,7 +77,7 @@ namespace GFGGame
             UI_ListNpcItem item = UI_ListNpcItem.Proxy(obj);
             bool isPass = InstanceZonesDataManager.CheckLevelPass(cfg.storyLevelId);
             item.m_ComIcon.m_loaIcon.url = ResPathUtil.GetNpcPicSPath(cfg.res);// isPass ? ResPathUtil.GetNpcPicSPath(cfg.res) : ResPathUtil.GetNpcPicSPath(cfg.inRes);
-            item.m_ComIcon.m_loaIcon.url = ResPathUtil.GetStudioFilingPicPath(cfg.res);
+            item.m_ComIcon.m_loaIcon.url = ResPathUtil.GetStudioChapterPicPath(cfg.res);
             item.m_imgLock.visible = !isPass;
             item.m_txtName.text = cfg.name;
             item.m_grpName.visible = isPass;

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFilingView.cs

@@ -37,6 +37,7 @@ namespace GFGGame
             _ui = UI_StudioFilingUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
             _valueBarController = new ValueBarController(_ui.m_comValueBar);
 
             _ui.m_Bg.url = ResPathUtil.GetBgImgPath("bg_fhl");
@@ -236,11 +237,11 @@ namespace GFGGame
                 long endTime = TimeUtil.DateTimeToTimestamp(_activityCfg.endTime);
                 long curTime = TimeHelper.ServerNow();
                 if (endTime < curTime) return;
-                ViewManager.Show<LuckyBoxActivityView>(_activityId, new object[] { typeof(StudioFilingView).FullName, this.viewData }, true);
+                ViewManager.Show<LuckyBoxActivityView>(_activityId, new object[] { typeof(StudioFilingView).FullName, this.viewData }, false);
             }
             else
             {
-                ViewManager.Show<ClothingSyntheticView>(new object[] { _studioCfg.suitId }, new object[] { typeof(StudioFilingView).FullName, this.viewData }, true);
+                ViewManager.Show<ClothingSyntheticView>(new object[] { _studioCfg.suitId }, new object[] { typeof(StudioFilingView).FullName, this.viewData }, false);
             }
         }
         private void UpdateRedDot()

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioView.cs

@@ -28,6 +28,7 @@ namespace GFGGame
             _ui = UI_StudioUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
 
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_btnHome.onClick.Add(OnClickBtnHome);