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

# Conflicts:
#	GameClient/Packages/manifest.json

GameClient/Assets/Editor/Excel/Scanner/ItemApproachScanner.cs

@@ -294,6 +294,7 @@ namespace GFGEditor
                     return "FU_ZHUANG_DIAN=" + ConstStoreId.GALLERY_STORE_ID;
                 }
             }
+
             return null;
         }
         /// <summary>
@@ -608,6 +609,16 @@ namespace GFGEditor
                 }
             }
 
+            List<ShopCfg> storyActivityCfg = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_EXCHANGE, ConstStoreSubId.STORE_ACTIVITY_EXCHANGE);
+            for (int i = 0; i < storyActivityCfg.Count; i++)
+            {
+                if (CheckIsHasItem(itemId, storyActivityCfg[i].itemId))
+                {
+                    approachs.Add(ConstFunctionId.STORE + "=" + ConstStoreTabId.STORE_EXCHANGE + "=" + ConstStoreSubId.STORE_ACTIVITY_EXCHANGE);
+                    break;
+                }
+            }
+
             List<ShopCfg> exchangetShopCfgs = ShopCfgArray.Instance.GetCfgsBymenu1Andmenu2(ConstStoreTabId.STORE_EXCHANGE, ConstStoreSubId.STORE_EXCHANGE_LEAGUE);
             for (int i = 0; i < exchangetShopCfgs.Count; i++)
             {

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

@@ -190,11 +190,11 @@ namespace GFGGame
                     }
                     else
                     {
-                        ViewManager.Show<StoryChapterView>(MainStoryDataManager.currentChapterCfgId, new object[] { typeof(StoryChapterListView).FullName});
+                        ViewManager.Show<StoryChapterView>(MainStoryDataManager.currentChapterCfgId);
 
                         //ViewManager.Show<StoryChapterView>(StudioDataManager.Instance.luckyBoxFilingChapterId, new object[] { typeof(ActivityThemeLuckyBoxView).FullName, this.viewData });
 
-                        ViewManager.Show<StoryChapterView>(MainStoryDataManager.currentChapterCfgId, ViewManager.GetGoBackDatas(typeof(StoryChapterListView).FullName), true);
+                        ViewManager.Show<StoryChapterView>(MainStoryDataManager.currentChapterCfgId);
                     }
                 }
                 GMController.AddShowGMViewEventListener();
@@ -288,6 +288,7 @@ namespace GFGGame
             RoleDataHandler.StopUpdate();
             CardDataManager.Clear();
             ItemDataManager.Clear();
+            ViewManager.Clear();
             DecomposeDataManager.Instance.Clear();
             PhotographDataManager.Instance.Clear();
             SkillDataManager.Instance.Clear();
@@ -332,7 +333,7 @@ namespace GFGGame
                 }
             }
             ViewManager.Hide<GuideView>();
-            ViewManager.Show<LoginView>(null, null, true);
+            ViewManager.Show<LoginView>(null, true);
         }
 
         //断线重连后需要处理的事情
@@ -349,7 +350,7 @@ namespace GFGGame
         public static void GoBackToMainView()
         {
             MainDataManager.Instance.ViewType = 0;
-            ViewManager.Show<MainUIView>(null, null, true);
+            ViewManager.Show<MainUIView>(null, true);
         }
 
         public static void ShowExitAlert(Action sureCallback = null)

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

@@ -21,11 +21,16 @@ namespace GFGGame
         public static bool isResultFighting = false;
         //战斗场景
         public static int FightScene;
-
+        //战斗结算数据
+        public static StoryFightResultData resultData;
+        //是否战斗结算界面关闭
+        public static bool isFightResultHide = false;
 
         public static string[] currentFightTags;
 
         private static int _currentLevelCfgId;
+
+
         //所有副本关卡通用配置表的id
         public static int currentLevelCfgId
         {

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

@@ -137,11 +137,11 @@ namespace GFGGame
 
         public void OnFinishStudioStoryLevel(int levelCfgId, bool firstPass, bool success)
         {
-            ViewManager.Show(VIEW_NAME, PROPERTY_SELECT_INDEX, ViewManager.GetGoBackDatas(VIEW_NAME));
+            ViewManager.Show(VIEW_NAME, PROPERTY_SELECT_INDEX);
         }
         public void OnFinishFilingStoryLevel(int levelCfgId, bool firstPass, bool success)
         {
-            ViewManager.Show<StudioFilingView>(MainStoryDataManager.currentChapterCfgId, ViewManager.GetGoBackDatas(typeof(StudioFilingView).FullName), true);
+            ViewManager.Show<StudioFilingView>(MainStoryDataManager.currentChapterCfgId, true);
         }
 
         private float GetAdditionBySuitId(int suitId)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityWanShiLi/UI_ActivityWanShiLiUI.cs

@@ -7,15 +7,17 @@ namespace UI.ActivityWanShiLi
     public partial class UI_ActivityWanShiLiUI
     {
         public GComponent target;
+        public GGraph m_holder;
         public UI_ProgressBar2 m_progress;
+        public GTextField m_txtTime;
+        public GGroup m_grpTime;
+        public GButton m_btnBack;
         public UI_item m_DBGiftItem0;
         public UI_item m_DBGiftItem1;
         public UI_item m_DBGiftItem2;
         public UI_item m_DBGiftItem3;
         public GGroup m_DBGiftItemGroup;
-        public GTextField m_txtTime;
-        public GGroup m_grpTime;
-        public GButton m_btnBack;
+        public Transition m_t0;
         public const string URL = "ui://z8lqda6wc82k0";
         public const string PACKAGE_NAME = "ActivityWanShiLi";
         public const string RES_NAME = "ActivityWanShiLiUI";
@@ -63,20 +65,26 @@ namespace UI.ActivityWanShiLi
 
         private void Init(GComponent comp)
         {
+            m_holder = (GGraph)comp.GetChild("holder");
             m_progress = (UI_ProgressBar2)UI_ProgressBar2.Create(comp.GetChild("progress"));
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_grpTime = (GGroup)comp.GetChild("grpTime");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
             m_DBGiftItem0 = (UI_item)UI_item.Create(comp.GetChild("DBGiftItem0"));
             m_DBGiftItem1 = (UI_item)UI_item.Create(comp.GetChild("DBGiftItem1"));
             m_DBGiftItem2 = (UI_item)UI_item.Create(comp.GetChild("DBGiftItem2"));
             m_DBGiftItem3 = (UI_item)UI_item.Create(comp.GetChild("DBGiftItem3"));
             m_DBGiftItemGroup = (GGroup)comp.GetChild("DBGiftItemGroup");
-            m_txtTime = (GTextField)comp.GetChild("txtTime");
-            m_grpTime = (GGroup)comp.GetChild("grpTime");
-            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_holder = null;
             m_progress.Dispose();
             m_progress = null;
+            m_txtTime = null;
+            m_grpTime = null;
+            m_btnBack = null;
             m_DBGiftItem0.Dispose();
             m_DBGiftItem0 = null;
             m_DBGiftItem1.Dispose();
@@ -86,9 +94,7 @@ namespace UI.ActivityWanShiLi
             m_DBGiftItem3.Dispose();
             m_DBGiftItem3 = null;
             m_DBGiftItemGroup = null;
-            m_txtTime = null;
-            m_grpTime = null;
-            m_btnBack = null;
+            m_t0 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Bag/UI_ListSelectorItem.cs

@@ -10,6 +10,7 @@ namespace UI.Bag
         public GTextInput m_txtSelNum;
         public GButton m_btnReduce;
         public GButton m_btnAdd;
+        public GLoader m_loaBg;
         public GLoader m_loaIcon;
         public GTextField m_txtNum;
         public const string URL = "ui://2bsz6nelv5notmb";
@@ -62,6 +63,7 @@ namespace UI.Bag
             m_txtSelNum = (GTextInput)comp.GetChild("txtSelNum");
             m_btnReduce = (GButton)comp.GetChild("btnReduce");
             m_btnAdd = (GButton)comp.GetChild("btnAdd");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_txtNum = (GTextField)comp.GetChild("txtNum");
         }
@@ -70,6 +72,7 @@ namespace UI.Bag
             m_txtSelNum = null;
             m_btnReduce = null;
             m_btnAdd = null;
+            m_loaBg = null;
             m_loaIcon = null;
             m_txtNum = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/InstanceZones/UI_ButtonModle8.cs

@@ -1,80 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.InstanceZones
-{
-    public partial class UI_ButtonModle8
-    {
-        public GButton target;
-        public GGraph m_holder;
-        public GLoader m_icon1;
-        public GGraph m_holder1;
-        public GLoader m_loaLockIcon;
-        public const string URL = "ui://ez8qotvcjx6zpc";
-        public const string PACKAGE_NAME = "InstanceZones";
-        public const string RES_NAME = "ButtonModle8";
-        private static UI_ButtonModle8 _proxy;
-
-        public static UI_ButtonModle8 Create(GObject gObject = null)
-        {
-            var ui = new UI_ButtonModle8();
-            if(gObject == null)
-            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GButton)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static UI_ButtonModle8 Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ButtonModle8();
-            }
-            var ui = _proxy;
-            if(gObject == null)
-            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GButton)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_holder = (GGraph)comp.GetChild("holder");
-            m_icon1 = (GLoader)comp.GetChild("icon1");
-            m_holder1 = (GGraph)comp.GetChild("holder1");
-            m_loaLockIcon = (GLoader)comp.GetChild("loaLockIcon");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_holder = null;
-            m_icon1 = null;
-            m_holder1 = null;
-            m_loaLockIcon = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/InstanceZones/UI_ButtonModle9.cs

@@ -7,8 +7,8 @@ namespace UI.InstanceZones
     public partial class UI_ButtonModle9
     {
         public GButton target;
+        public Controller m_type;
         public GGraph m_holder;
-        public GLoader m_icon1;
         public GGraph m_holder1;
         public GLoader m_loaLockIcon;
         public const string URL = "ui://ez8qotvcjx6zpd";
@@ -58,15 +58,15 @@ namespace UI.InstanceZones
 
         private void Init(GComponent comp)
         {
+            m_type = comp.GetController("type");
             m_holder = (GGraph)comp.GetChild("holder");
-            m_icon1 = (GLoader)comp.GetChild("icon1");
             m_holder1 = (GGraph)comp.GetChild("holder1");
             m_loaLockIcon = (GLoader)comp.GetChild("loaLockIcon");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_type = null;
             m_holder = null;
-            m_icon1 = null;
             m_holder1 = null;
             m_loaLockIcon = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/InstanceZones/UI_InstanceZonesUI.cs

@@ -13,12 +13,9 @@ namespace UI.InstanceZones
         public UI_ButtonModle7 m_btn1;
         public UI_ButtonModle9 m_btnStudio;
         public UI_ButtonModle9 m_btnTravel;
-        public UI_ButtonModle8 m_btnPoem;
+        public UI_ButtonModle9 m_btnPoem;
         public UI_ButtonModle9 m_btnField;
-        public UI_ButtonModle8 m_btnArena;
-        public GGroup m_grpRight;
-        public GLoader m_loaGuidestudio;
-        public Transition m_t0;
+        public UI_ButtonModle9 m_btnArena;
         public const string URL = "ui://ez8qotvcyeocfv0";
         public const string PACKAGE_NAME = "InstanceZones";
         public const string RES_NAME = "InstanceZonesUI";
@@ -72,12 +69,9 @@ namespace UI.InstanceZones
             m_btn1 = (UI_ButtonModle7)UI_ButtonModle7.Create(comp.GetChild("btn1"));
             m_btnStudio = (UI_ButtonModle9)UI_ButtonModle9.Create(comp.GetChild("btnStudio"));
             m_btnTravel = (UI_ButtonModle9)UI_ButtonModle9.Create(comp.GetChild("btnTravel"));
-            m_btnPoem = (UI_ButtonModle8)UI_ButtonModle8.Create(comp.GetChild("btnPoem"));
+            m_btnPoem = (UI_ButtonModle9)UI_ButtonModle9.Create(comp.GetChild("btnPoem"));
             m_btnField = (UI_ButtonModle9)UI_ButtonModle9.Create(comp.GetChild("btnField"));
-            m_btnArena = (UI_ButtonModle8)UI_ButtonModle8.Create(comp.GetChild("btnArena"));
-            m_grpRight = (GGroup)comp.GetChild("grpRight");
-            m_loaGuidestudio = (GLoader)comp.GetChild("loaGuidestudio");
-            m_t0 = comp.GetTransition("t0");
+            m_btnArena = (UI_ButtonModle9)UI_ButtonModle9.Create(comp.GetChild("btnArena"));
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -96,9 +90,6 @@ namespace UI.InstanceZones
             m_btnField = null;
             m_btnArena.Dispose();
             m_btnArena = null;
-            m_grpRight = null;
-            m_loaGuidestudio = null;
-            m_t0 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -8,8 +8,11 @@ namespace UI.Studio
     {
         public GComponent target;
         public Controller m_c1;
+        public GGraph m_effect;
+        public GImage m_bg;
         public GTextField m_name;
         public GImage m_img;
+        public Transition m_t0;
         public const string URL = "ui://xz8kxrecrbxq5";
         public const string PACKAGE_NAME = "Studio";
         public const string RES_NAME = "ComEctype";
@@ -58,14 +61,20 @@ namespace UI.Studio
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_effect = (GGraph)comp.GetChild("effect");
+            m_bg = (GImage)comp.GetChild("bg");
             m_name = (GTextField)comp.GetChild("name");
             m_img = (GImage)comp.GetChild("img");
+            m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_effect = null;
+            m_bg = null;
             m_name = null;
             m_img = null;
+            m_t0 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Travel/UI_TravelUI.cs

@@ -13,6 +13,7 @@ namespace UI.Travel
         public GGraph m_bg_eff;
         public GComponent m_comValueBar;
         public GButton m_btnback;
+        public GGraph m_db_loadingEff_holder;
         public GGraph m_travellingDB_eff;
         public GTextField m_txtTime;
         public GGraph m_txt_eff;
@@ -76,6 +77,7 @@ namespace UI.Travel
             m_bg_eff = (GGraph)comp.GetChild("bg_eff");
             m_comValueBar = (GComponent)comp.GetChild("comValueBar");
             m_btnback = (GButton)comp.GetChild("btnback");
+            m_db_loadingEff_holder = (GGraph)comp.GetChild("db_loadingEff_holder");
             m_travellingDB_eff = (GGraph)comp.GetChild("travellingDB_eff");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_txt_eff = (GGraph)comp.GetChild("txt_eff");
@@ -95,6 +97,7 @@ namespace UI.Travel
             m_bg_eff = null;
             m_comValueBar = null;
             m_btnback = null;
+            m_db_loadingEff_holder = null;
             m_travellingDB_eff = null;
             m_txtTime = null;
             m_txt_eff = null;

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

@@ -105,7 +105,7 @@ namespace GFGGame
                         FirstPass = response.HasOnceBonus,
                         Star = response.Star,
                         BonusList = bonusList
-                    }, null, true);
+                    }, true);
                     if (response.HasOnceBonus)
                     {
                         FunctionOpenDataManager.Instance.CheckHasChapterFunOpen(response.LevelCfgId);

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

@@ -67,7 +67,7 @@ namespace GFGGame
             {
                 if (ViewManager.isViewOpen(typeof(LeagueView).FullName))
                 {
-                    ViewManager.Show<MainUIView>(null, null, true);
+                    ViewManager.Show<MainUIView>(null, true);
                     PromptController.Instance.ShowFloatTextPrompt("您的雅集已解散");
                 }
                 LeagueDataManager.Instance.Clear();
@@ -114,7 +114,7 @@ namespace GFGGame
                     LeagueSproxy.ReqGetLeagueInfo().Coroutine();
                     if (ViewManager.isViewOpen(typeof(LeagueView).FullName))
                     {
-                        ViewManager.Show<MainUIView>(null, null, true);
+                        ViewManager.Show<MainUIView>(null, true);
                     }
                     PromptController.Instance.ShowFloatTextPrompt("您已离开雅集");
                     return;
@@ -156,7 +156,7 @@ namespace GFGGame
                 bool result = await LeagueSproxy.ReqGetLeagueInfo();
                 if (result && ViewManager.isViewOpen(typeof(LeagueJoinView).FullName))
                 {
-                    ViewManager.Show<LeagueView>(null, new object[] { typeof(MainUIView).FullName, null }, true);
+                    ViewManager.Show<LeagueView>(null, true);
                 }
             }
             else

GameClient/Assets/Game/HotUpdate/Sound/VoiceManager.cs

@@ -74,11 +74,20 @@ namespace GFGGame
             player.clip = null;
         }
 
-        public int GetClipLength()
+        public float GetClipLength()
         {
             if (player.clip != null)
             {
-                return (int)Mathf.Ceil(player.clip.length);
+                return player.clip.length;
+            }
+            return 0;
+        }
+
+        public float GetClipRemainingLength()
+        {
+            if (player.clip != null)
+            {
+                return Mathf.Ceil(player.clip.length - player.time);
             }
             return 0;
         }

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

@@ -234,8 +234,7 @@ namespace GFGGame
             {
                 param[i] = taskCfg.jumpParamArr[i];
             }
-            ViewManager.JumpToView(taskCfg.jumpId, param,
-                new[] { typeof(ActivityDay7View).FullName, viewData });
+            ViewManager.JumpToView(taskCfg.jumpId, param);
         }
 
         private List<GComponent> components = new List<GComponent>();

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

@@ -125,8 +125,7 @@ namespace GFGGame
             {
                 param[i] = taskCfg.jumpParamArr[i];
             }
-            ViewManager.JumpToView(taskCfg.jumpId, param,
-                new object[] { typeof(ActivityThemeLuckyBoxView).FullName, true });
+            ViewManager.JumpToView(taskCfg.jumpId, param);
             Hide();
         }
     }

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

@@ -98,20 +98,19 @@ namespace GFGGame
         }
         private void OnBtnChapterClick()
         {
-            ViewManager.Show<StudioFilingView>(StudioDataManager.Instance.GetLuckyBoxActivityID(), new object[] { typeof(ActivityThemeLuckyBoxView).FullName, this.viewData });
+            ViewManager.Show<StudioFilingView>(StudioDataManager.Instance.GetLuckyBoxActivityID());
         }
         private void OnBtnLuckyBoxClick()
         {
             long endTime = TimeUtil.DateTimeToTimestamp(_activityCfg.endTime);
             long curTime = TimeHelper.ServerNow();
             if (endTime < curTime) return;
-            ViewManager.Show<LuckyBoxActivityView>(_activityId, new object[] { typeof(ActivityThemeLuckyBoxView).FullName, this.viewData });
+            ViewManager.Show<LuckyBoxActivityView>(_activityId);
         }
 
         private void OnBtnShopClick()
         {
-            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY }
- , new object[] { typeof(ActivityThemeLuckyBoxView).FullName, viewData });
+            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY });
         }
 
         private void UpdateTime(object param = null)

GameClient/Assets/Game/HotUpdate/Views/ActivityWanShiLiUI/ActivityWanShiLiView.cs

@@ -15,9 +15,13 @@ namespace GFGGame
         private int _maxProgressOffset = -11;
         private ActivityInfo _activityInfo;
         private ActivityRecharge2Cfg[] _rechargeCfgs;
+        private EffectUI effect;
 
         public override void Dispose()
         {
+            EffectUIPool.Recycle(effect);
+            effect = null;
+
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -34,7 +38,6 @@ namespace GFGGame
             this.viewCom = _ui.target;
             this.viewCom.Center();
             this.modal = true;
-            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
 
             _activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfoOneByType(ActivityType.WanShiLi);
             _rechargeCfgs = ActivityRecharge2CfgArray.Instance.GetCfgsByactivityId(_activityInfo.ActivityId).ToArray();
@@ -42,6 +45,7 @@ namespace GFGGame
             InitReward();
 
             _ui.m_btnBack.onClick.Add(Hide);
+            effect = EffectUIPool.CreateEffectUI(_ui.m_holder, "ui_Activity", "Activity_18_CQ");
         }
 
         protected override void AddEventListener()
@@ -284,7 +288,7 @@ namespace GFGGame
             else
             {
                 // 显示奖励详细列表
-                ViewManager.Show<GiftDetailView>(getState.rewardID, ViewManager.GetGoBackDatas(typeof(ActivityWanShiLiView).FullName));
+                ViewManager.Show<GiftDetailView>(getState.rewardID);
             }
         }
 

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

@@ -144,9 +144,7 @@ namespace GFGGame
 
         private void OnBtnDressClick()
         {
-            ViewManager.Show<ArenaDressUpFightView>(null,
-                new object[]
-                    { typeof(ArenaDressInfoView).FullName, new object[] { _roleType, _themeIndex, _roleDatas, "" } });
+            ViewManager.Show<ArenaDressUpFightView>();
         }
 
         private async void OnBtnRecommendClick()

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

@@ -102,7 +102,7 @@ namespace GFGGame
             bool result = await ArenaSproxy.ReqArenaFightAttr(targetData.RoleInfo.roleId, targetData.FightDatas);
             if (result)
             {
-                ViewManager.Show<ArenaDressInfoView>(new object[] { FightRoleType.TAEGET, 0, targetData.FightDatas, typeof(ArenaFightRecordView).FullName }, new object[] { typeof(ArenaView).FullName, ViewManager.GetUIView(typeof(ArenaView).Name).viewData }, true);
+                ViewManager.Show<ArenaDressInfoView>(new object[] { FightRoleType.TAEGET, 0, targetData.FightDatas, typeof(ArenaFightRecordView).FullName }, true);
             }
 
         }

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

@@ -338,7 +338,7 @@ namespace GFGGame
             bool result = await ArenaSproxy.ReqArenaFightAttr(targetData.RoleInfo.roleId, targetData.FightDatas);
             if (result)
             {
-                ViewManager.Show<ArenaDressInfoView>(new object[] { FightRoleType.TAEGET, 0, targetData.FightDatas, typeof(ArenaRankView).FullName }, new object[] { typeof(ArenaView).FullName, ViewManager.GetUIView(typeof(ArenaView).Name).viewData }, true);
+                ViewManager.Show<ArenaDressInfoView>(new object[] { FightRoleType.TAEGET, 0, targetData.FightDatas, typeof(ArenaRankView).FullName }, true);
             }
         }
     }

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

@@ -90,7 +90,7 @@ namespace GFGGame
         {
             ArenaTargetData targetData = _dataManager.LastTargets[_dataManager.SelectTargetIndex];
 
-            ViewManager.Show<StoryFightTargetScoreView>(new object[] { _dataManager.DressupList[_dataManager.CurFightIndex], targetData.FightDatas[_dataManager.CurFightIndex] }, null, true);
+            ViewManager.Show<StoryFightTargetScoreView>(new object[] { _dataManager.DressupList[_dataManager.CurFightIndex], targetData.FightDatas[_dataManager.CurFightIndex] }, true);
         }
         private void FinishFight()
         {

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

@@ -155,7 +155,7 @@ namespace GFGGame
         }
         private void OnBtnShopClick()
         {
-            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_ARENA, ConstStoreSubId.STORE_ARENA_ITEM }, new object[] { typeof(ArenaView).FullName, this.viewData });
+            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_ARENA, ConstStoreSubId.STORE_ARENA_ITEM });
         }
         private void OnBtnRewardClick()
         {
@@ -267,7 +267,7 @@ namespace GFGGame
             }
             else
             {
-                ViewManager.Show<StoryFightTargetView>(null, null, true);
+                ViewManager.Show<StoryFightTargetView>(null, true);
             }
         }
         private async ETTask<bool> GetFightResult()
@@ -446,7 +446,7 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("玩家不在线，无法查看搭配");
                 return;
             }
-            ViewManager.Show<ArenaDressInfoView>(new object[] { FightRoleType.TAEGET, 0, targetData.FightDatas, "" }, new object[] { typeof(ArenaView).FullName, this.viewData }, true);
+            ViewManager.Show<ArenaDressInfoView>(new object[] { FightRoleType.TAEGET, 0, targetData.FightDatas, "" }, true);
         }
         private void CheckGuide(object param)
         {

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

@@ -18,6 +18,13 @@ namespace GFGGame
         private int _selCount; //选择的数量
         private Dictionary<int, int> _selDic; //选择礼包内的物品<物品id,数量>
         private List<LongPressGesture> _listLongPress = new List<LongPressGesture>();
+        private List<string> _itemQualityRes = new List<string>() 
+                      { "",
+                        "wpk_db_fp", 
+                        "wpk_db_zx",
+                        "wpk_db_dc", 
+                        "wpk_db_ty",
+                        "wp_baseboard1"};
         private EffectUI _effectUI1;
         private EffectUI _effectUI2;
 
@@ -138,6 +145,7 @@ namespace GFGGame
 
             int[] itemChildArr = itemCfg.itemsArr[index];
             ItemCfg itemCfgChild = ItemCfgArray.Instance.GetCfg(itemChildArr[0]);
+            uiItemChild.m_loaBg.url = ResPathUtil.GetCommonGameResPath(_itemQualityRes[itemCfgChild.rarity]);
             uiItemChild.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfgChild);
             uiItemChild.m_loaIcon.onClick.Add(OnListSelectorItemClick);
             uiItemChild.m_txtNum.text = itemChildArr[1].ToString();

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

@@ -104,6 +104,18 @@ namespace GFGGame
             }
         }
 
+
+        /// <summary>
+        /// 刷新界面
+        /// </summary>
+        protected override void BringToFront()
+        {
+            if (_window != null)
+            {
+                this._window.BringToFront();
+            }
+        }
+
         protected override void OnInit()
         {
             base.OnInit();
@@ -119,7 +131,7 @@ namespace GFGGame
             base.OnShown();
             CheckCreateCloseButton();
         }
-
+        
         protected override void OnHide()
         {
             base.OnHide();

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

@@ -150,7 +150,7 @@ namespace GFGGame
         {
             CardData cardData = (CardData)(context.data as GObject).data;
             cardData.fromUIType = typeof(CardDetailView).FullName;
-            ViewManager.Show<CardFosterView>((context.data as GObject).data, new object[] { typeof(CardDetailView).FullName, _ui.m_listRole.selectedIndex });
+            ViewManager.Show<CardFosterView>((context.data as GObject).data);
             // this.Clear();
 
         }
@@ -178,7 +178,7 @@ namespace GFGGame
         /*******************************************************监听函数**************************************************/
         private void OnclickBtnFilter()
         {
-            ViewManager.Show<CardFilterView>(null, new object[] {typeof(CardDetailView).FullName, _ui.m_listRole.selectedIndex });
+            ViewManager.Show<CardFilterView>();
         }
         private void OnClickBtnBack()
         {

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

@@ -99,7 +99,7 @@ namespace GFGGame
             _ui = UI_CardFosterUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
-            //isReturnView = true;
+            isReturnView = true;
 
             //公共组件：返回，页签，属性列表
             _ui.m_ComFosterTop.m_btnback.onClick.Add(OnClickBtnBack);
@@ -685,7 +685,7 @@ namespace GFGGame
                     if (_showLv - lv >= 1)
                     {
                         // this._selectTab = _comFosterBottom.m_ctrlTab.selectedIndex;
-                        ViewManager.Show<CardUpView>(new object[] { _cardData.scores, "lv", lv, _showLv , _cardData.id }, new object[] { typeof(CardFosterView).FullName, _cardData });
+                        ViewManager.Show<CardUpView>(new object[] { _cardData.scores, "lv", lv, _showLv , _cardData.id });
                     }
                     this.UpdateCommon();
                     this.UpdateUpLvView(false, 0, 0, true);
@@ -1014,7 +1014,7 @@ namespace GFGGame
 
         private void OpenCardUp(string strType)
         {
-            ViewManager.Show<CardUpView>(new object[] { _cardData.scores, strType, _cardData.star - 1, _cardData.star, _cardData.id , _fromUIType }, new object[] { typeof(CardFosterView).FullName, _cardData });
+            ViewManager.Show<CardUpView>(new object[] { _cardData.scores, strType, _cardData.star - 1, _cardData.star, _cardData.id , _fromUIType });
         }
         /***********************************************************升技能***************************************************/
 

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

@@ -78,7 +78,7 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt(string.Format("词牌星级达到{0}级解锁", _viewData.itemCfg.cardMoodStar));
                 return;
             }
-            ViewManager.Show<CardMoodView>(_viewData, new object[] { typeof(CardStoryView).FullName, _viewData });
+            ViewManager.Show<CardMoodView>(_viewData);
         }
         protected override void OnHide()
         {

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

@@ -64,7 +64,7 @@ namespace GFGGame
             });
             _ui.m_t0.SetHook("open", () =>
             {
-                ViewManager.Show<CardDetailView>(null, new object[] { typeof(CardView).FullName, this.viewData });
+                ViewManager.Show<CardDetailView>();
             });
         }
         protected override void OnHide()

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

@@ -153,7 +153,12 @@ namespace GFGGame
 
             for (int i = 0; i < cfg.materialsArr.Length; i++)
             {
-                if (!ItemUtil.CheckItemEnough(cfg.materialsArr[i][0], cfg.materialsArr[i][1], true)) return;
+                if (!ItemUtil.CheckItemEnough(cfg.materialsArr[i][0], cfg.materialsArr[i][1], true))
+                {
+                    object[] sourceDatas = new object[] { cfg.materialsArr[i][0], new object[] { typeof(ClothingView).FullName, (this.viewData as object[])[3] }, cfg.materialsArr[i][1] };
+                    GoodsItemTipsController.ShowItemTips(cfg.materialsArr[i][0], sourceDatas);
+                    return;
+                }      
             }
 
             int result = await SuitFosterProxy.SendMaintainSuit(_suitId, _index + 1);

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

@@ -167,11 +167,11 @@ namespace GFGGame
             {
                 if (haveSuit)
                 {
-                    ViewManager.Show<ClothingView>(new object[] { suitId, _suitIds }, new object[] { typeof(ClothingListView).FullName, this.viewData });
+                    ViewManager.Show<ClothingView>(new object[] { suitId, _suitIds });
                 }
                 else
                 {
-                    ViewManager.Show<SuitPartsDetailView>(suitId, new object[] { typeof(ClothingListView).FullName, this.viewData });
+                    ViewManager.Show<SuitPartsDetailView>(suitId);
                 }
             });
 

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

@@ -404,7 +404,12 @@ namespace GFGGame
 
             for (int i = 0; i < renewCfg.materialsArr.Length; i++)
             {
-                if (!ItemUtil.CheckItemEnough(renewCfg.materialsArr[i][0], renewCfg.materialsArr[i][1], true)) return;
+                if (!ItemUtil.CheckItemEnough(renewCfg.materialsArr[i][0], renewCfg.materialsArr[i][1], true))
+                {
+                    object[] sourceDatas = new object[] {renewCfg.materialsArr[i][0], new object[] { typeof(ClothingView).FullName, (this.viewData as object[])[3] }, renewCfg.materialsArr[i][1] };
+                    GoodsItemTipsController.ShowItemTips(renewCfg.materialsArr[i][0], sourceDatas);
+                    return;
+                }
             }
 
 

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

@@ -82,7 +82,7 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
             //layer = ConstViewLayer.TOP;
-            //isReturnView = true;
+            isReturnView = true;
             //this.clickBlankToClose = false;
 
             _valueBarController = new ValueBarController(_ui.m_valueBar);

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

@@ -171,7 +171,7 @@ namespace GFGGame
             {
                 if (!isLock)
                 {
-                    ViewManager.Show<ClothingSyntheticView>(new object[] { suitId }, new object[] { typeof(SuitSyntheticView).FullName, suitId });
+                    ViewManager.Show<ClothingSyntheticView>(new object[] { suitId });
                 }
             });
             // 提示合成物品的红点

GameClient/Assets/Game/HotUpdate/Views/Common/Controller/ValueBarController.cs

@@ -196,7 +196,17 @@ namespace GFGGame
         private void UpdateButton(GObject obj, int itemId)
         {
             UI_ButtonInValueBar button = UI_ButtonInValueBar.Proxy(obj);
-            button.target.text = "" + ItemDataManager.GetItemNum(itemId);
+
+            // 体力特殊处理
+            if(itemId == ConstItemID.POWER)
+            {
+                button.target.text = string.Format("{0}/{1}", RoleDataManager.power, RoleDataManager.powerLimit);
+            }
+            else
+            {
+                button.target.text = "" + ItemDataManager.GetItemNum(itemId);
+            }
+            
             button.target.icon = ResPathUtil.GetCommonGameResPath(ItemCfgArray.Instance.GetCfg(itemId).res);
             switch (itemId)
             {

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

@@ -169,11 +169,11 @@ namespace GFGGame
                     //     isJump = false;
                     //     break;
                     // }
-                    isJump = ViewManager.Show<ClothingShopView>(new object[] { shopId, null, _itemId, needCount }, _fromViewDatas, false, true);
+                    isJump = ViewManager.Show<ClothingShopView>(new object[] { shopId, null, _itemId, needCount }, false, true);
                     break;
                 case ConstFunctionId.FU_ZHUANG_DECOMPOSE:
                     // this.Hide();
-                    isJump = ViewManager.Show<ClothingDecomposeView>(null, _fromViewDatas);
+                    isJump = ViewManager.Show<ClothingDecomposeView>();
                     break;
                 case ConstFunctionId.STORE:
 
@@ -225,13 +225,14 @@ namespace GFGGame
                         if (studioCfg.funId == typeof(StudioFilingView).Name)
                         {
                             StudioDataManager.Instance.filingChapterId = studioCfg.id;
+                            StudioDataManager.Instance.npcFilingChapterId = studioCfg.id;
                             if (StudioDataManager.Instance.IsluckyBoxFilingChapter())
                             {
-                                ViewManager.Show<StudioFilingView>(studioCfg.id, _fromViewDatas);
+                                ViewManager.Show<StudioFilingView>(studioCfg.id);
                             }
                             else
                             {
-                                ViewManager.Show<StudioFilingView>(null, _fromViewDatas);
+                                ViewManager.Show<StudioFilingView>();
                             }
                             MainStoryDataManager.currentLevelCfgId = levelCfg.id;
                             InstanceZonesController.ShowLevelView(levelCfg.id, StudioDataManager.Instance.OnFinishFilingStoryLevel, _itemId, _needCount);
@@ -254,7 +255,7 @@ namespace GFGGame
                             }
                             string viewName = "GFGGame." + studioCfg.funId;
 
-                            ViewManager.Show(viewName, StudioDataManager.Instance.PROPERTY_SELECT_INDEX, _fromViewDatas);
+                            ViewManager.Show(viewName, StudioDataManager.Instance.PROPERTY_SELECT_INDEX);
                             StudioDataManager.Instance.VIEW_NAME = viewName;
                             InstanceZonesController.ShowLevelView(levelCfgId, StudioDataManager.Instance.OnFinishStudioStoryLevel, _itemId, _needCount);
                             isJump = true;
@@ -280,7 +281,7 @@ namespace GFGGame
                             //从战斗换装必需品来源跳转到剧情界面，在剧情界面点返回后直接返回章节界面，无需返回换装界面
                             _fromViewDatas = null;
                         }
-                        isJump = ViewManager.Show<StoryChapterView>(levelCfg.chapterId, _fromViewDatas, false);
+                        isJump = ViewManager.Show<StoryChapterView>(levelCfg.chapterId, false);
                         StoryController.ShowLevelView(levelCfgId, _itemId, _needCount);
                         break;
                     }
@@ -294,17 +295,17 @@ namespace GFGGame
                         bool isPass = InstanceZonesDataManager.CheckLevelPass(suitCfg.syntheticStoryLevelId);
                         if (suitCfg.syntheticStoryLevelId > 0 && !isPass)
                         {
-                            isJump = ViewManager.Show<SuitSyntheticView>(suitId, _fromViewDatas);
+                            isJump = ViewManager.Show<SuitSyntheticView>(suitId);
                         }
                         else
                         {
-                            isJump = ViewManager.Show<ClothingSyntheticView>(new object[] { suitId, _itemId }, _fromViewDatas);
+                            isJump = ViewManager.Show<ClothingSyntheticView>(new object[] { suitId, _itemId });
                         }
                     }
                     break;
                 case ConstFunctionId.ZHAI_XING:
                     // this.Hide();
-                    isJump = ViewManager.Show<LuckyBoxView>(null, _fromViewDatas, true);
+                    isJump = ViewManager.Show<LuckyBoxView>(null, true);
                     break;
                 case ConstFunctionId.TAO_ZHUANG_TU_JIAN:
                     isJump = false;
@@ -312,28 +313,37 @@ namespace GFGGame
                     {
                         return;
                     }
-                    isJump = ViewManager.Show<SuitGuideView>(null, _fromViewDatas);
+                    isJump = ViewManager.Show<SuitGuideView>();
 
                     break;
                 case ConstFunctionId.TAO_ZHUANG_HE_CHENG:
                     isJump = ViewManager.Show<SuitSyntheticView>();
                     break;
                 case ConstFunctionId.SUIT_FOSTER:
-                    isJump = ViewManager.Show<ClothingListView>(null, _fromViewDatas);
+                    isJump = ViewManager.Show<ClothingListView>();
                     break;
                 case ConstFunctionId.DAILY_TASK:
-                    isJump = ViewManager.Show<TaskView>(null, _fromViewDatas);
+                    isJump = ViewManager.Show<TaskView>();
                     break;
                 case ConstFunctionId.WEEKLY_TASK:
-                    isJump = ViewManager.Show<TaskView>(new object[] { 1 }, _fromViewDatas);
+                    isJump = ViewManager.Show<TaskView>(new object[] { 1 });
                     break;
                 case ConstFunctionId.LEAGUE_PRAY:
-                    isJump = ViewManager.Show<LeaguePrayView>(null, _fromViewDatas);
+                    if (LeagueDataManager.Instance.Type == LeagueJoinType.Join)
+                    {
+                        ViewManager.Show<LeagueView>();
+                        isJump = ViewManager.Show<LeaguePrayView>();
+                    }
+                    else
+                    {
+                        if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(nameof(LeagueView))) return;
+                        PromptController.Instance.ShowFloatTextPrompt("暂未加入雅集");
+                    }
                     break;
                 case ConstFunctionId.LEAGUE_ANSWER:
                     if (LeagueDataManager.Instance.Type == LeagueJoinType.Join)
                     {
-                        ViewManager.Show<LeagueView>(null, _fromViewDatas);
+                        ViewManager.Show<LeagueView>();
                         isJump = ViewManager.Show<LeagueAnswerView>();
                     }
                     else
@@ -341,7 +351,6 @@ namespace GFGGame
                         if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(nameof(LeagueView))) return;
                         PromptController.Instance.ShowFloatTextPrompt("暂未加入雅集");
                     }
-
                     break;
             }
             if (isJump)

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

@@ -155,10 +155,10 @@ namespace GFGGame
 
             if (id == 501)
             {
-                ViewManager.Show<NewLimitChargeView>(new object[] { gObject.data }, new object[] { typeof(DailyWelfareView).FullName, this.viewData });
+                ViewManager.Show<NewLimitChargeView>(new object[] { gObject.data });
                 return;
             }
-            ViewManager.Show<LimitChargeView>(new object[] { gObject.data }, new object[] { typeof(DailyWelfareView).FullName, this.viewData });
+            ViewManager.Show<LimitChargeView>(new object[] { gObject.data });
         }
         private void OnBtnSevenDayLoginClick()
         {

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

@@ -974,7 +974,7 @@ namespace GFGGame
 
         private void OnClickBtnSearch()
         {
-            ViewManager.Show<DressFilterView>(false, new object[] { typeof(DressUpView).FullName});
+            ViewManager.Show<DressFilterView>(false);
         }
         private void OnClickBtnLastStep()
         {

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

@@ -67,7 +67,7 @@ namespace GFGGame
             _ui = UI_DressUpFightUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
-            //isReturnView = 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);
@@ -302,36 +302,39 @@ namespace GFGGame
 
         private void backView()
         {
-            if (_IsTeaParty)
-            {
-                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));
-            }
-            else if (_levelCfg.type == ConstInstanceZonesType.Studio && _levelCfg.subType == ConstInstanceZonesSubType.Hard3)
-            {
-                if (StudioDataManager.Instance.IsluckyBoxFilingChapter())
-                {
-                    ViewManager.Show<StudioFilingView>(StudioDataManager.Instance.GetLuckyBoxActivityID(), ViewManager.GetGoBackDatas(typeof(StudioFilingView).FullName));
-                }
-                else
-                {
-                    ViewManager.Show<StudioFilingView>(null, ViewManager.GetGoBackDatas(typeof(StudioFilingView).FullName));
-                }
-            }
-            else if (_levelCfg.type == ConstInstanceZonesType.Field)
-            {
-                ViewManager.GoBackFrom(typeof(DressUpFightView).FullName);
-            }
-            else
-            {
-                 //ViewManager.GoBackFrom(typeof(StoryChapterView).FullName);
-                ViewManager.Show<StoryChapterView>(_levelCfg.chapterId);//, new object[] { typeof(StoryChapterListView).FullName}
-            }
-            //MyDressUpHelper.dressUpObj.TakeOffAll();
             this.Hide();
+
+            //if (_IsTeaParty)
+            //{
+            //    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));
+            //}
+            //else if (_levelCfg.type == ConstInstanceZonesType.Studio && _levelCfg.subType == ConstInstanceZonesSubType.Hard3)
+            //{
+            //    if (StudioDataManager.Instance.IsluckyBoxFilingChapter())
+            //    {
+            //        ViewManager.Show<StudioFilingView>(StudioDataManager.Instance.GetLuckyBoxActivityID(), ViewManager.GetGoBackDatas(typeof(StudioFilingView).FullName));
+            //    }
+            //    else
+            //    {
+            //        ViewManager.Show<StudioFilingView>(null, ViewManager.GetGoBackDatas(typeof(StudioFilingView).FullName));
+            //    }
+            //}
+            //else if (_levelCfg.type == ConstInstanceZonesType.Field)
+            //{
+            //    ViewManager.Show<FieldView>(null, ViewManager.GetGoBackDatas(typeof(FieldView).FullName));
+            //    //ViewManager.GoBackFrom(typeof(DressUpFightView).FullName);
+            //}
+            //else
+            //{
+            //     //ViewManager.GoBackFrom(typeof(StoryChapterView).FullName);
+            //    ViewManager.Show<StoryChapterView>(_levelCfg.chapterId);//, new object[] { typeof(StoryChapterListView).FullName}
+            //}
+            ////MyDressUpHelper.dressUpObj.TakeOffAll();
+            //this.Hide();
         }
 
         private void OnClickBtnBack()
@@ -372,7 +375,7 @@ namespace GFGGame
 
         private void OnClickBtnClothingShop()
         {
-            ViewManager.Show<ClothingShopView>(new object[] { null, scoreType }, null, false, true);
+            ViewManager.Show<ClothingShopView>(new object[] { null, scoreType }, false, true);
         }
 
         private void OnClickListType1Item(EventContext context)
@@ -684,17 +687,12 @@ namespace GFGGame
                 FieldFightDataManager.Instance.currentLevelCfgId = InstanceZonesDataManager.currentLevelCfgId;
             }
 
-
             if (hasFightTarget)
-            {
-                ViewManager.Show<StoryFightTargetView>();
-            }
+                ViewManager.Show<StoryFightTargetView>(null,true);
             else
-            {
-                ViewManager.Show<StoryFightSingleView>();
-            }
-            this.Hide();
+                ViewManager.Show<StoryFightSingleView>(null, true);
 
+            ViewManager.DeleteViewStackCountDown(1);
         }
         private void OnClickBtnRecommend()
         {
@@ -1365,7 +1363,7 @@ namespace GFGGame
             int type = 0;
             if (_IsTeaParty)
                 type = 1;
-            ViewManager.Show<DressFilterView>(new object[] { 0, 0, type}, new object[] { typeof(DressUpView).FullName});
+            ViewManager.Show<DressFilterView>(new object[] { 0, 0, type});
         }
         private void OnClickBtnAutoPlay()
         {
@@ -1381,7 +1379,7 @@ namespace GFGGame
             }
             if (_fightCfg.needSuitId > 0)
             {
-                ViewManager.Show<SuitPartsDetailView>(_fightCfg.needSuitId, new object[] { typeof(DressUpFightView).FullName, this.viewData });
+                ViewManager.Show<SuitPartsDetailView>(_fightCfg.needSuitId);
             }
             else
             {

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

@@ -456,7 +456,7 @@ namespace GFGGame
         }
         private void OnClickBtnSearch()
         {
-            ViewManager.Show<DressFilterView>(true, new object[] { typeof(DressUpView).FullName});
+            ViewManager.Show<DressFilterView>(true);
         }
 
 

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

@@ -67,14 +67,13 @@ namespace GFGGame
             if (_time == 0)
             {
                 Timers.inst.Remove(OnTimerUpdate);
-                this.Hide();
 
                 InstanceZonesDataManager.currentCardId = FieldFightDataManager.Instance.CurrentCardId;
                 InstanceZonesDataManager.currentScoreType = FieldFightDataManager.Instance.CurrentScoreType;
                 InstanceZonesDataManager.currentLevelCfgId = FieldFightDataManager.Instance.currentLevelCfgId;
 
-                ViewManager.Hide<FieldView>();
-                ViewManager.Show<StoryFightTargetView>();
+                ViewManager.Show<StoryFightTargetView>(null,true);
+                this.Hide();
             }
             _ui.m_txtTime.text = string.Format("{0}秒后自动进入下一轮", _time);
         }

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

@@ -39,7 +39,7 @@ namespace GFGGame
             _ui = UI_FieldUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
-            //isReturnView = true;
+            isReturnView = true;
 
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             // _ui.m_btnGo.onClick.Add(OnClickBtnGo);
@@ -82,6 +82,9 @@ namespace GFGGame
 
             Timers.inst.Add(1, 0, UpdateShowTime);
             Timers.inst.AddUpdate(CheckGuide);
+
+            if (InstanceZonesDataManager.isFightResultHide)
+                UpdateStroyFightResult();
         }
 
         protected override void OnHide()
@@ -137,6 +140,63 @@ namespace GFGGame
                 GuideController.TryCompleteGuide(ConstGuideId.FIELD, 1);
             }
         }
+
+        private  async void UpdateStroyFightResult()
+        {
+            var resultData = InstanceZonesDataManager.resultData;
+            FieldCfg fieldCfg = FieldCfgArray.Instance.GetCfg(FieldDataManager.Instance.chapterId);
+            int needPower = 0;
+            for (int i = 0; i < FieldDataManager.Instance.currFightLv + 1; i++)
+            {
+                needPower += fieldCfg.needPower;
+            }
+            if (!resultData.Result || FieldDataManager.Instance.currFightLv == fieldCfg.num || RoleDataManager.power < needPower)
+            {
+                bool result = await FieldSProxy.ReqFieldInstanceResult();
+                if (result)
+                {
+                    ViewManager.Show<FieldFightEndView>();
+                }
+            }
+            else
+            {
+                FieldDataManager _dataManager = FieldDataManager.Instance;
+                _dataManager.accumulateReward += (FieldDataManager.Instance.difficulty + 1) * 5;
+                //这里判断如果获取的马蹄金超过上限了，就终止挑战
+                if (_dataManager.fieldInfos.bonusWeekly + _dataManager.accumulateReward >= _dataManager.fieldInfos.bonusMaxLimit)
+                {
+                    AlertUI.Show("本周可获得奖励已达上限，是否继续挑战？")
+                    .SetLeftButton(true, "取消", async (object data) =>
+                    {
+                        _dataManager.accumulateReward = 0;
+                        bool result = await FieldSProxy.ReqFieldInstanceResult();
+                        if (result)
+                        {
+                            ViewManager.Show<FieldFightEndView>();
+                        }
+                    })
+                    .SetRightButton(true, "确认", async (object data) =>
+                    {
+                        bool result = await FieldSProxy.ReqFieldInstanceResult();
+                        _dataManager.accumulateReward = 0;
+                        FieldCfg _curCfg = FieldCfgArray.Instance.dataArray[FieldDataManager.Instance.difficulty];
+                        LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.TIAN_YE_DIAO_CHA, 2);
+                        int curLevelId = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(_curCfg.type, 0, _curCfg.id)[0].id;
+                        DressUpFightType dressUpFightType = new DressUpFightType();
+                        dressUpFightType.levelID = curLevelId;
+                        dressUpFightType.teaPartID = 0;
+                        ViewManager.Show<DressUpFightView>(dressUpFightType, true);
+                        InstanceZonesDataManager.currentLevelCfgId = curLevelId;
+                    });
+                }
+                else
+                {
+                    ViewManager.Show<FieldFightInfoView>();
+                }
+            }
+            InstanceZonesDataManager.isFightResultHide = false;
+        }
+
         private void UpdateView()
         {
             _ui.m_loaIcon.url = string.Format("ui://Field/tydc_zizi_{0}", _dataManager.fieldInfos.theme);
@@ -196,7 +256,7 @@ namespace GFGGame
             DressUpFightType dressUpFightType = new DressUpFightType();
             dressUpFightType.levelID = curLevelId;
             dressUpFightType.teaPartID = 0;
-            ViewManager.Show<DressUpFightView>(dressUpFightType, new object[] { typeof(FieldView).FullName, this.viewData }, true);
+            ViewManager.Show<DressUpFightView>(dressUpFightType, true);
             InstanceZonesDataManager.currentLevelCfgId = curLevelId;
         }
         private void OnBtnTaskClick()

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

@@ -137,7 +137,7 @@ namespace GFGGame
             {
                 CardData cardData = CardDataManager.GetCardDataById(_cardList[index]);
                 cardData.fromUIType = typeof(CardGuideView).FullName;
-                ViewManager.Show<CardFosterView>(cardData, new object[] { typeof(CardGuideView).FullName, _ui.m_listRole.selectedIndex });
+                ViewManager.Show<CardFosterView>(cardData);
             }   
         }
 

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

@@ -82,7 +82,7 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("暂未解锁");
                 return;
             }
-            ViewManager.Show<ChapterItemShowView>(cfg, new object[] { typeof(ChapterItemGuideView).FullName, this.viewData });
+            ViewManager.Show<ChapterItemShowView>(cfg);
         }
     }
 }

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

@@ -336,7 +336,7 @@ namespace GFGGame
 
         private void OnClickBtnSearch()
         {
-            ViewManager.Show<DressFilterView>(false, new object[] {typeof(DressUpView).FullName});
+            ViewManager.Show<DressFilterView>(false);
         }
 
         private void FilterItems(EventContext context)

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

@@ -134,22 +134,23 @@ namespace GFGGame
             switch (id)
             {
                 case ConstFieldGuideId.SUIT_GUIDE:
-                    ViewManager.Show<SuitGuideView>(null, new object[] { typeof(FieldGuideView).FullName, this.viewData });
+                    ViewManager.Show<SuitGuideView>();
                     break;
                 case ConstFieldGuideId.CHAPTER_ITEM:
-                    ViewManager.Show<ChapterItemGuideView>(null, new object[] { typeof(FieldGuideView).FullName, this.viewData });
+                    ViewManager.Show<ChapterItemGuideView>();
                     break;
                 case ConstFieldGuideId.TRAVEL_GUIDE:
-                    ViewManager.Show<TravelGuideView>(null, new object[] { typeof(FieldGuideView).FullName, this.viewData });
+                    ViewManager.Show<TravelGuideView>();
+                    ViewManager.Show<TravelGuideView>();
                     break;
                 case ConstFieldGuideId.DRESS_UP_GUIDE:
-                    ViewManager.Show<DressUpGuideView>(null, new object[] { typeof(FieldGuideView).FullName, this.viewData });
+                    ViewManager.Show<DressUpGuideView>();
                     break;
                 case ConstFieldGuideId.CARD_GUIDE:
                     bool open = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(CardDetailView).Name, false);
                     if (open)
                     {
-                        ViewManager.Show<CardGuideView>(null, new object[] { typeof(FieldGuideView).FullName, this.viewData });
+                        ViewManager.Show<CardGuideView>();
                     }
                     else
                     {

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

@@ -106,7 +106,7 @@ namespace GFGGame
 
         private void OnClickBtnSearch()
         {
-            ViewManager.Show<DressFilterView>(new object[] { 0, 2 }, new object[] { typeof(SuitGuideDetailView).FullName });
+            ViewManager.Show<DressFilterView>(new object[] { 0, 2 });
         }
 
         private void UpdateListSuit()
@@ -180,11 +180,11 @@ namespace GFGGame
             {
                 if (haveSuit)
                 {
-                    ViewManager.Show<SuitShowView>(new object[] { _suitTypeId, suitId, _suitIds }, new object[] { typeof(SuitGuideDetailView).FullName, this.viewData });
+                    ViewManager.Show<SuitShowView>(new object[] { _suitTypeId, suitId, _suitIds });
                 }
                 else
                 {
-                    ViewManager.Show<SuitPartsDetailView>(suitId, new object[] { typeof(SuitGuideDetailView).FullName, this.viewData });
+                    ViewManager.Show<SuitPartsDetailView>(suitId);
                 }
             });
         }

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

@@ -162,7 +162,7 @@ namespace GFGGame
             item.m_icon.url = string.Format("ui://FieldGuide/tj_tz_{0}", typeId);
             item.target.onClick.Add(() =>
             {
-                ViewManager.Show<SuitGuideDetailView>(typeId, new object[] { typeof(SuitGuideView).FullName, this.viewData });
+                ViewManager.Show<SuitGuideDetailView>(typeId);
             });
 
             _suitTypeItems.Add(item);
@@ -205,7 +205,7 @@ namespace GFGGame
         {
             GObject obj = eventContext.data as GObject;
             int index = _ui.m_suitType2Items.GetChildIndex(obj);
-            ViewManager.Show<SuitGuideDetailView>(_menuTypeAllDataDic[_ui.m_c1.selectedIndex + 1][index], new object[] { typeof(SuitGuideView).FullName, this.viewData });
+            ViewManager.Show<SuitGuideDetailView>(_menuTypeAllDataDic[_ui.m_c1.selectedIndex + 1][index]);
         }
 
         private void OnClickBtnBack()

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

@@ -73,7 +73,7 @@ namespace GFGGame
             GObject obj = context.data as GObject;
             TravelGuideCfg cfg = obj.data as TravelGuideCfg;
 
-            ViewManager.Show<TravelShowView>(cfg, new object[] { typeof(TravelGuideView).FullName, this.viewData });
+            ViewManager.Show<TravelShowView>(cfg);
         }
     }
 }

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

@@ -308,12 +308,12 @@ namespace GFGGame
         {
             if (_friendRoleId == 0)
             {
-                ViewManager.Show<RoleInfoView>(null, new object[] { typeof(FriendView).FullName, _friendRoleId });
+                ViewManager.Show<RoleInfoView>();
             }
             else
             {
                 FriendInfoData friendInfoData = FriendDataManager.Instance.GetFriendDataById(_friendRoleId);
-                ViewManager.Show<OtherRoleInfoView>(new object[] { friendInfoData.roleInfo, friendInfoData.roleDetailInfo }, new object[] { typeof(FriendView).FullName, _friendRoleId });
+                ViewManager.Show<OtherRoleInfoView>(new object[] { friendInfoData.roleInfo, friendInfoData.roleDetailInfo });
             }
         }
         private void OnBtnAddClick()

GameClient/Assets/Game/HotUpdate/Views/InstanceZones/InstanceZonesUIView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/InstanceZones/InstanceZonesUIView.cs → GameClient/Assets/Game/HotUpdate/Views/InstanceZones/InstanceZonesView.cs

@@ -3,10 +3,11 @@ using System.Collections;
 using UnityEngine;
 using FairyGUI;
 using UI.InstanceZones;
+using System.Collections.Generic;
 
 namespace GFGGame
 {
-    public class InstanceZonesUIView : BaseView
+    public class InstanceZonesView : BaseView
     {
         private UI_InstanceZonesUI _ui;
         private ValueBarController _valueBarController;
@@ -44,13 +45,14 @@ namespace GFGGame
             _ui.m_btnField.target.onClick.Add(OnClickBtnField);
             _ui.m_btnArena.target.onClick.Add(OnClickBtnArena);
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("fuben_bg");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("hzs_bg");
         }
 
         protected override void OnShown()
         {
             base.OnShown();
             _valueBarController.OnShown();
+            _valueBarController.UpdateList(new List<int>() { ConstItemID.POWER });
             CheckFunOpen();
             UpdateRedDot();
             Timers.inst.AddUpdate(CheckGuide);
@@ -91,9 +93,9 @@ namespace GFGGame
         private void UpdateRedDot()
         {
             _valueBarController.UpdateRedPoint();
-            RedDotController.Instance.SetComRedDot(_ui.m_btnStudio.target, RedDotDataManager.Instance.GetStudioFilingRed(), "", -36, 32);
-            RedDotController.Instance.SetComRedDot(_ui.m_btnTravel.target, RedDotDataManager.Instance.GetTravelRed(), "", -36, 32);
-            RedDotController.Instance.SetComRedDot(_ui.m_btnField.target, RedDotDataManager.Instance.GetFieldRed(), "", -36, 32);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnStudio.target, RedDotDataManager.Instance.GetStudioFilingRed(), "", -126, 22);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnTravel.target, RedDotDataManager.Instance.GetTravelRed(), "", -152, 85);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnField.target, RedDotDataManager.Instance.GetFieldRed(), "", -103, 43);
         }
 
         private void CheckFunOpen()
@@ -112,23 +114,23 @@ namespace GFGGame
 
         private void OnClickBtnStudio()
         {
-            ViewManager.Show<StudioView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
+            ViewManager.Show<StudioView>();
         }
 
         private void OnClickBtnTravel()
         {
-            ViewManager.Show<TravelView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
+            ViewManager.Show<TravelView>();
         }
 
         private void OnClickBtnPoem()
         {
-            ViewManager.Show<PoemView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
+            ViewManager.Show<PoemView>();
         }
 
         private void OnClickBtnField()
         {
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.TIAN_YE_DIAO_CHA, 1);
-            ViewManager.Show<FieldView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
+            ViewManager.Show<FieldView>();
         }
 
         private void OnClickBtnArena()

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/InstanceZones/UI_ButtonModle8.cs.meta → GameClient/Assets/Game/HotUpdate/Views/InstanceZones/InstanceZonesView.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0b32a0a44e5817040aa1af8372defda8
+guid: 6c1ceb0004f4a10478c35a357faf892c
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

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

@@ -100,9 +100,9 @@ namespace GFGGame
             }
 
             if (LeagueDataManager.Instance.TeaPartyStatus == LeagueTeaPartyStatus.YesGo && !LeagueDataManager.Instance.RoleTeapartyInfo.IsComplete && LeagueDataManager.Instance.RoleTeapartyInfo.Status)
-                ViewManager.Show<LeagueTeaPartyShowView>(null, new object[] { typeof(LeagueView).FullName, null });
+                ViewManager.Show<LeagueTeaPartyShowView>();
             else 
-                ViewManager.Show<LeagueTeaPartyView>(null, new object[] { typeof(LeagueView).FullName, null });
+                ViewManager.Show<LeagueTeaPartyView>();
         }
         
         private void UpdateView()

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

@@ -94,7 +94,7 @@ namespace GFGGame
             bool result = await LeagueSproxy.ReqCreateLeague(leagueName, GlobalCfgArray.globalCfg.badgeResArr[_ui.m_listIcon.selectedIndex]);
             if (result)
             {
-                ViewManager.Show<LeagueView>(null, new object[] { typeof(MainUIView).FullName, null }, true);
+                ViewManager.Show<LeagueView>(null, true);
             }
         }
 

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

@@ -83,7 +83,7 @@ namespace GFGGame
         }
         private void OnBtnCreatClick()
         {
-            ViewManager.Show<LeagueCreatView>(null, new object[] { typeof(LeagueJoinView).FullName, null });
+            ViewManager.Show<LeagueCreatView>();
         }
         private async void ReqLeagueList(string leagueName)
         {
@@ -142,7 +142,7 @@ namespace GFGGame
                 bool result = await LeagueSproxy.ReqJoinLeague(leagueId);
                 if (result)
                 {
-                    ViewManager.Show<LeagueView>(null, new object[] { typeof(MainUIView).FullName, null });
+                    ViewManager.Show<LeagueView>();
                     OnBtnBackClick();
                 }
             }

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

@@ -103,12 +103,12 @@ namespace GFGGame
         //申请列表
         private void OnBtnApplyListClick()
         {
-            ViewManager.Show<LeagueApplyView>(null, new object[] { typeof(LeagueMemberView).FullName, null });
+            ViewManager.Show<LeagueApplyView>();
         }
         //联盟日志
         private void OnBtnMemberLogClick()
         {
-            ViewManager.Show<LeagueMemberLogView>(null, new object[] { typeof(LeagueMemberView).FullName, null });
+            ViewManager.Show<LeagueMemberLogView>();
         }
         //退出联盟
         private void OnBtnExitClick()
@@ -143,7 +143,7 @@ namespace GFGGame
                     bool result = await LeagueSproxy.ReqQuitLeague();
                     if (result)
                     {
-                        ViewManager.Show<MainUIView>(null, null, true);
+                        ViewManager.Show<MainUIView>(null, true);
                     }
                 });
             }
@@ -242,7 +242,7 @@ namespace GFGGame
             long roleId = (long)gObject.data;
             OtherRoleInfoData roleInfoData = LeagueDataManager.Instance.GetMemberRoleInfo(roleId);
             OtherRoleInfoDetailData detailData = await RoleInfoSProxy.ReqOtherRoleDetailInfo(roleId);
-            ViewManager.Show<OtherRoleInfoView>(new object[] { roleInfoData, detailData }, new object[] { typeof(LeagueView).FullName, null });
+            ViewManager.Show<OtherRoleInfoView>(new object[] { roleInfoData, detailData });
         }
         private void RenderListItem(int index, GObject obj)
         {
@@ -291,7 +291,7 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("该玩家已离开雅集");
                 return;
             }
-            ViewManager.Show<LeagueMemberAppointView>(memberData, new object[] { typeof(LeagueMemberView).FullName, null });
+            ViewManager.Show<LeagueMemberAppointView>(memberData);
         }
 
         private List<long> SortMemberIds(List<long> memberIds)

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

@@ -120,7 +120,7 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("学完前一类所有技能开启");
                 return;
             }
-            ViewManager.Show<LeagueSkillUpView>(type, new object[] { typeof(LeagueSkillView).FullName });
+            ViewManager.Show<LeagueSkillUpView>(type);
         }
     }
 }

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

@@ -111,7 +111,7 @@ namespace GFGGame
 
         private void OnBtnBackClick()
         {
-            ViewManager.Show<LeagueTeaPartyView>(null,null,true);
+            ViewManager.Show<LeagueTeaPartyView>(null,true);
         }
 
         private void OnBtnRewardClick()

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

@@ -111,12 +111,12 @@ namespace GFGGame
         {
             var openCfg = TeapartyOpenCfgArray.Instance.GetCfg(LeagueDataManager.Instance.TeaPartyId);
             string stroyStartID = openCfg.storyId.ToString();
-            ViewManager.Show<StoryDialogView>(new object[] { stroyStartID, false, new OnCompleteStoryDialogCall(OnCompletePriorStoryDialog), null, true }, null, true);
+            ViewManager.Show<StoryDialogView>(new object[] { stroyStartID, false, new OnCompleteStoryDialogCall(OnCompletePriorStoryDialog), null, true }, true);
         }
 
         private static void OnCompletePriorStoryDialog(bool isSkip, object param)
         {
-            ViewManager.Show<LeagueTeaPartyOverView>(null, new object[] { typeof(LeagueView).FullName, null });
+            //ViewManager.Show<LeagueTeaPartyOverView>(null, new object[] { typeof(LeagueView).FullName, null });
         }
 
         private void UpdateTime(object param)

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

@@ -233,7 +233,7 @@ namespace GFGGame
             DressUpFightType dressUpFightType = new DressUpFightType();
             dressUpFightType.levelID = 0;
             dressUpFightType.teaPartID = LeagueDataManager.Instance.ChooseTeaPartId;
-            ViewManager.Show<DressUpFightView>(dressUpFightType, new object[] { typeof(LeagueTeaPartyView).FullName, null }, true);
+            ViewManager.Show<DressUpFightView>(dressUpFightType, true);
         }
 
         private void UpDataTime(object param = null)

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

@@ -94,26 +94,26 @@ namespace GFGGame
         }
         private void OnBtnMemberClick()
         {
-            ViewManager.Show<LeagueMemberView>(null, new object[] { typeof(LeagueView).FullName, null });
+            ViewManager.Show<LeagueMemberView>();
         }
         private void OnBtnConstructClick()
         {
-            ViewManager.Show<LeagueConstructView>(null, new object[] { typeof(LeagueView).FullName, null });
+            ViewManager.Show<LeagueConstructView>();
         }
         private void OnComLeagueHeadClick()
         {
-            ViewManager.Show<LeagueChangeNameView>(null, new object[] { typeof(LeagueView).FullName, null });
+            ViewManager.Show<LeagueChangeNameView>();
         }
         private void OnBtnChangeNoticeClick()
         {
-            ViewManager.Show<LeagueChangeNoticeView>(null, new object[] { typeof(LeagueView).FullName, null });
+            ViewManager.Show<LeagueChangeNoticeView>();
         }
         private async void OnShowOhterInfo()
         {
             long roleId = LeagueDataManager.Instance.LeagueData.OwnerId;
             OtherRoleInfoData roleInfoData = LeagueDataManager.Instance.GetMemberRoleInfo(roleId);
             OtherRoleInfoDetailData detailData = await RoleInfoSProxy.ReqOtherRoleDetailInfo(roleId);
-            ViewManager.Show<OtherRoleInfoView>(new object[] { roleInfoData, detailData }, new object[] { typeof(LeagueView).FullName, null });
+            ViewManager.Show<OtherRoleInfoView>(new object[] { roleInfoData, detailData });
         }
         private void OnBtnChatClick()
         {
@@ -121,7 +121,7 @@ namespace GFGGame
         }
         private void OnBtnPrayClick()
         {
-            ViewManager.Show<LeaguePrayView>(null, new object[] { typeof(LeagueView).FullName, null });
+            ViewManager.Show<LeaguePrayView>();
         }
         private void OnBtnPartyClick()
         {
@@ -133,15 +133,15 @@ namespace GFGGame
         }
         private void OnBtnSkillClick()
         {
-            ViewManager.Show<LeagueSkillView>(null, new object[] { typeof(LeagueView).FullName, null });
+            ViewManager.Show<LeagueSkillView>();
         }
         private void OnBtnAnswerClick()
         {
-            ViewManager.Show<LeagueAnswerView>(null, new object[] { typeof(LeagueView).FullName, null });
+            ViewManager.Show<LeagueAnswerView>();
         }
         private void OnBtnGiftClick()
         {
-            ViewManager.Show<LeagueGiftView>(null, new object[] { typeof(LeagueView).FullName, null });
+            ViewManager.Show<LeagueGiftView>();
         }
         private void UpdateView()
         {

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

@@ -231,7 +231,7 @@ namespace GFGGame
                  bool result = await LuckyBoxSProxy.ReqGetBonus(_luckyBoxCfg.id, LuckyBoxDataManager.ONCE_TIME,false, _activityId);
                  if (result)
                  {
-                     ViewManager.Show<LuckyBoxStarView>(null, new object[] { typeof(LuckyBoxActivityView).FullName, _activityId });
+                     ViewManager.Show<LuckyBoxStarView>();
                      //  LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.ZAI_XING, 2);
                      GetSuitItemController.showSingle = false;
                  }
@@ -253,7 +253,7 @@ namespace GFGGame
                 bool result = await LuckyBoxSProxy.ReqGetBonus(this._luckyBoxCfg.id, LuckyBoxDataManager.TEN_TIME,false, _activityId);
                 if (result)
                 {
-                    ViewManager.Show<LuckyBoxStarView>(null, new object[] { typeof(LuckyBoxActivityView).FullName, _activityId });
+                    ViewManager.Show<LuckyBoxStarView>();
                     // LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.ZAI_XING, 2);
                     GetSuitItemController.showSingle = false;
                 }
@@ -266,8 +266,7 @@ namespace GFGGame
         }
         private void OnClickBtnShop()
         {
-            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY }
-            , new object[] { typeof(LuckyBoxActivityView).FullName, viewData});
+            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_ACTIVITY });
         }
 
         //限时礼包按钮点击执行方法

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

@@ -383,7 +383,7 @@ namespace GFGGame
 
         private void OnClikcBtnShop()
         {
-            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_TSY }, new object[] { typeof(LuckyBoxView).FullName });
+            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_GIFT_BAG, ConstStoreSubId.STORE_GIFT_BAG_TSY });
         }
 
         //刷新摘星活动期间的数据
@@ -552,7 +552,7 @@ namespace GFGGame
                  bool result = await LuckyBoxSProxy.ReqGetBonus(boxId, LuckyBoxDataManager.ONCE_TIME, freeType, activityId);
                  if (result)
                  {
-                     ViewManager.Show<LuckyBoxStarView>(null, new object[] { typeof(LuckyBoxView).FullName, boxId });
+                     ViewManager.Show<LuckyBoxStarView>();
                      LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.ZAI_XING, 2);
                      GetSuitItemController.showSingle = false;
                  }
@@ -589,7 +589,7 @@ namespace GFGGame
                 bool result = await LuckyBoxSProxy.ReqGetBonus(boxId, LuckyBoxDataManager.TEN_TIME,false, activityId);
                 if (result)
                 {
-                    ViewManager.Show<LuckyBoxStarView>(null, new object[] { typeof(LuckyBoxView).FullName, boxId });
+                    ViewManager.Show<LuckyBoxStarView>();
                     LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.ZAI_XING, 2);
                     GetSuitItemController.showSingle = false;
                 }

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;
+            //isReturnView = true;
         }
 
         protected override void OnInit()
@@ -125,7 +125,7 @@ namespace GFGGame
             if (ArenaDataManager.Instance.CurFightIndex > 2)
             {
                 object[] goBackDatas = ViewManager.GetGoBackDatas(typeof(ArenaView).FullName);
-                ViewManager.Show<ArenaView>(null, goBackDatas, true);
+                ViewManager.Show<ArenaView>(null, true);
             }
         }
 

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

@@ -38,24 +38,12 @@ namespace GFGGame
                     Debug.LogError(string.Format("剧情id：{0}  无配置", levelCfg.storyStartID));
                     return;
                 }
-                object[] gobackparams;
-                if (levelCfg.type == ConstInstanceZonesType.Studio && levelCfg.subType == ConstInstanceZonesSubType.Hard3)
-                {
-                    object param = ViewManager.GetUIView(nameof(StudioFilingView)).viewData;
-                    gobackparams = new object[] { typeof(StudioFilingView).FullName, param };
-                }
-                else
-                {
-                    gobackparams = new object[] { typeof(StoryChapterView).FullName, MainStoryDataManager.currentChapterCfgId };
-                }
                 //, new object[] { typeof(StoryChapterView).FullName, MainStoryDataManager.currentChapterCfgId }
                 bool skipable = MainStoryDataManager.CheckCurrentLevelPass();
-                ViewManager.Show<StoryDialogView>(new object[] { levelCfg.storyStartID, skipable, new OnCompleteStoryDialogCall(OnCompleteChapterStoryDialog),null,false }, gobackparams, true);
+                ViewManager.Show<StoryDialogView>(new object[] { levelCfg.storyStartID, skipable, new OnCompleteStoryDialogCall(OnCompleteChapterStoryDialog),null,false }, true);
             }
         }
 
-
-
         public static async ETTask CheckStoryFightResult()
         {
             StoryLevelCfg storyLevelCfg = StoryLevelCfgArray.Instance.GetCfg(InstanceZonesDataManager.currentLevelCfgId);
@@ -80,7 +68,7 @@ namespace GFGGame
                     Score = score,
                     FirstPass = false,
                     Star = 0
-                }, null, true);
+                }, true);
                 //失败仅判断并更新最高分
                 if (score > InstanceZonesDataManager.GetScoreHighest(InstanceZonesDataManager.currentCardId))
                 {
@@ -97,7 +85,7 @@ namespace GFGGame
             }
             else
             {
-                OnFinishStoryLevel(InstanceZonesDataManager.currentLevelCfgId, false, false);
+                //OnFinishStoryLevel(InstanceZonesDataManager.currentLevelCfgId, false, false);
             }
         }
 

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

@@ -264,8 +264,7 @@ namespace GFGGame
         {
             if (cardList.Count == 0) return;
             cardList[_ui.m_listCard.selectedIndex].fromUIType = typeof(StoryCardChoose).FullName;
-            ViewManager.Show<CardFosterView>(cardList[_ui.m_listCard.selectedIndex],
-                new object[] { typeof(StoryCardChoose).FullName, _scoreType });
+            ViewManager.Show<CardFosterView>(cardList[_ui.m_listCard.selectedIndex]);
             this.Hide();
         }
 
@@ -276,7 +275,7 @@ namespace GFGGame
             {
                 if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena)
                 {
-                    ViewManager.Show<ArenaDressInfoView>(new object[] { FightRoleType.MINE, 0, ArenaDataManager.Instance.DressupList, "" }, new object[] { typeof(ArenaView).FullName, this.viewData }, true);
+                    ViewManager.Show<ArenaDressInfoView>(new object[] { FightRoleType.MINE, 0, ArenaDataManager.Instance.DressupList, "" }, true);
                 }
                 this.Hide();
                 return;
@@ -292,7 +291,7 @@ namespace GFGGame
                 if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena)
                 {
                     //ViewManager.GoBackFrom(typeof(ArenaDressUpFightView).FullName);
-                    ViewManager.Show<ArenaDressInfoView>(new object[] { FightRoleType.MINE, 0, ArenaDataManager.Instance.DressupList, "" }, new object[] { typeof(ArenaView).FullName, this.viewData }, true);
+                    ViewManager.Show<ArenaDressInfoView>(new object[] { FightRoleType.MINE, 0, ArenaDataManager.Instance.DressupList, "" },true);
                 }
             }
             else

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

@@ -343,7 +343,7 @@ namespace GFGGame
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             //GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER, 4, "", 0, true, _ui.target.height / 2);
             GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER_1, 3, "", 0, true, _ui.target.height / 2);
-            GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER_2, 3, "", 1, true, _ui.target.height / 2);
+            //GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER_2, 3, "", 1, true, _ui.target.height / 2);
             //GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER_3, 2, "", 1, true, _ui.target.height / 2);
             //GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER_4, 3, "", 1, true, _ui.target.height / 2);
             //GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER_5, 3, "", 1, true, _ui.target.height / 2);

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

@@ -71,7 +71,7 @@ namespace GFGGame
             _ui = UI_StoryChapterUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
-            //isReturnView = false;
+            isReturnView = true;
         }
 
         protected override void OnInit()
@@ -181,7 +181,7 @@ namespace GFGGame
         private void OnClickSwitchBack()
         {
             Timers.inst.Remove(SetContainerY);
-            ViewManager.Show<StoryChapterListView>(new object[] {Mathf.Max(0, currentDifficulty) , newIndex }, new object[] { typeof(StoryChapterView).FullName, this.viewData });
+            ViewManager.Show<StoryChapterListView>(new object[] {Mathf.Max(0, currentDifficulty) , newIndex });
         }
 
         private void OnClickBtnHome()
@@ -516,8 +516,8 @@ namespace GFGGame
 
             //bool isGuide6 = GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.CLOTHING_DECOMPOSE, 1, "点击返回主界面。");
 
-            bool isGuide7 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.ENTER_CHAPTER_2, 4, "来继续我们的旅程吧。");
-            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_2, 4);
+            bool isGuide7 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.ENTER_CHAPTER_2, 3, "来继续我们的旅程吧。");
+            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_2, 3);
 
             //bool isGuide8 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.ENTER_CHAPTER_3, 3, "来继续我们的旅程吧。");
             //GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_3, 3);
@@ -545,8 +545,8 @@ namespace GFGGame
             GuideController.TryCompleteGuideIndex(ConstGuideId.ENTER_CHAPTER_1, 4);
             GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_1, 4);
             // GuideCfg cfg2 = GuideCfgArray.Instance.GetCfg(ConstGuideId.ENTER_CHAPTER_2);
-            GuideController.TryCompleteGuideIndex(ConstGuideId.ENTER_CHAPTER_2, 4);
-            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_2, 4);
+            GuideController.TryCompleteGuideIndex(ConstGuideId.ENTER_CHAPTER_2, 3);
+            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_2, 3);
             // GuideCfg cfg3 = GuideCfgArray.Instance.GetCfg(ConstGuideId.ENTER_CHAPTER_3);
             //GuideController.TryCompleteGuideIndex(ConstGuideId.ENTER_CHAPTER_3, 3);
             //GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_3, 3);

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

@@ -41,23 +41,23 @@ namespace GFGGame
                     if (nextStoryChapterCfg == null)
                     {
                         StoryChapterCfg lastChapter = StoryChapterCfgArray.Instance.GetCfg(levelCfg.chapterId);
-                        ViewManager.Show<StoryChapterListView>(new object[] { index, lastChapter.order }, null, true);
+                        ViewManager.Show<StoryChapterListView>(new object[] { index, lastChapter.order }, true);
                     }
                     else
                     {
-                        ViewManager.Show<StoryChapterListView>(new object[] { index , nextStoryChapterCfg.order}, null, true);
+                        ViewManager.Show<StoryChapterListView>(new object[] { index , nextStoryChapterCfg.order},true);
                     }
                     
                 }
                 else
                 {
-                    ViewManager.Show<StoryChapterView>(MainStoryDataManager.currentChapterCfgId, ViewManager.GetGoBackDatas(typeof(StoryChapterView).FullName), true);
+                    ViewManager.Show<StoryChapterView>(MainStoryDataManager.currentChapterCfgId);
                 }
             }
             else
             {
                 //异常返回到关卡列表界面
-                ViewManager.Show<StoryChapterView>(MainStoryDataManager.currentChapterCfgId, ViewManager.GetGoBackDatas(typeof(StoryChapterView).FullName), true);
+                ViewManager.Show<StoryChapterView>(MainStoryDataManager.currentChapterCfgId);
             }
         }
 
@@ -65,13 +65,13 @@ namespace GFGGame
 
         public static void ShowCardStoryDialog(CardStoryCfg cardStoryCfg, CardData cardData)
         {
-            ViewManager.Show<StoryDialogView>(new object[] { cardStoryCfg.storyStartID, true, new OnCompleteStoryDialogCall(OnCompleteCardStoryDialog), cardData ,false}, new object[] { typeof(CardFosterView).FullName, cardData }, true);
+            ViewManager.Show<StoryDialogView>(new object[] { cardStoryCfg.storyStartID, true, new OnCompleteStoryDialogCall(OnCompleteCardStoryDialog), cardData ,false}, true);
         }
         private static void OnCompleteCardStoryDialog(bool isSkip, object param)
         {
-            CardData cardData = param as CardData;
-            ViewManager.Show<CardFosterView>(cardData, new object[] { typeof(CardDetailView).FullName}, true);
-            ViewManager.Show<CardStoryView>(cardData);
+            //CardData cardData = param as CardData;
+            //ViewManager.Show<CardFosterView>(cardData, new object[] { typeof(CardDetailView).FullName}, true);
+            //ViewManager.Show<CardStoryView>(cardData);
         }
 
 
@@ -80,12 +80,12 @@ namespace GFGGame
             InstanceZonesDataManager.currentLevelCfgId = 100001001;
             string stroyStartID = "1";
             // string stroyStartID = MainStoryDataManager.priorId;
-            ViewManager.Show<StoryDialogView>(new object[] { stroyStartID, false, new OnCompleteStoryDialogCall(OnCompletePriorStoryDialog),null,false }, null, true);
+            ViewManager.Show<StoryDialogView>(new object[] { stroyStartID, false, new OnCompleteStoryDialogCall(OnCompletePriorStoryDialog),null,false }, true);
         }
 
         private static void OnCompletePriorStoryDialog(bool isSkip, object param)
         {
-            ViewManager.Show<StoryChapterView>(MainStoryDataManager.currentChapterCfgId, ViewManager.GetGoBackDatas(typeof(StoryChapterView).FullName), true);
+            //ViewManager.Show<StoryChapterView>(MainStoryDataManager.currentChapterCfgId, ViewManager.GetGoBackDatas(typeof(StoryChapterView).FullName), true);
         }
 
 
@@ -94,15 +94,15 @@ namespace GFGGame
 
             InstanceZonesDataManager.currentLevelCfgId = storyLevelCfg.id;
 
-            ViewManager.Show<StoryDialogView>(new object[] { storyLevelCfg.storyStartID, false, new OnCompleteStoryDialogCall(OnCompleteFilingStoryDialog) ,null,false}, null, true);
+            ViewManager.Show<StoryDialogView>(new object[] { storyLevelCfg.storyStartID, false, new OnCompleteStoryDialogCall(OnCompleteFilingStoryDialog) ,null,false}, true);
 
         }
 
         private static void OnCompleteFilingStoryDialog(bool isSkip, object param)
         {
-            InstanceZonesController.OnCompleteChapterStoryDialog(isSkip, param);
+            //InstanceZonesController.OnCompleteChapterStoryDialog(isSkip, param);
 
-            ViewManager.Show<StudioFilingView>(MainStoryDataManager.currentChapterCfgId, null, true);
+            //ViewManager.Show<StudioFilingView>(MainStoryDataManager.currentChapterCfgId, null, true);
             //, ViewManager.GetGoBackDatas(typeof(StudioFilingView).FullName)
         }
     }

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

@@ -63,9 +63,6 @@ namespace GFGGame
                 _animObject = null;
             }
 
-            _dressUpObj?.Dispose();
-            _dressUpObj = null;
-
             _wordTextField = null;
             _arrow = null;
             _isShowLetters = false;
@@ -88,7 +85,6 @@ namespace GFGGame
             _ui = UI_StoryDialogUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
-
             isReturnView = true;
             _ui.m_dialogText.target.visible = false;
             _ui.m_dialogName.target.visible = false;
@@ -109,11 +105,6 @@ namespace GFGGame
 
             _ui.m_btnSpeedUp.onClick.Add(OnClickBtnSpeedUp);
             _ui.m_btnAutoPlay.onClick.Add(OnClickBtnAutoPlay);
-
-            if (_dressUpObj == null)
-            {
-                _dressUpObj = new DressUpObj();
-            }
         }
 
         protected override void OnShown()
@@ -129,7 +120,11 @@ namespace GFGGame
             if (_sceneObject == null)
             {
                 _sceneObject = PrefabManager.Instance.InstantiateSync(ResPathUtil.GetPrefabPath("SceneStoryDialog"));
+            }
 
+            if (_dressUpObj == null)
+            {
+                _dressUpObj = new DressUpObj();
             }
 
             CreateHeadImg();
@@ -147,7 +142,8 @@ namespace GFGGame
             }
 
             IsTeaParty = (bool)datas[4];
-            _autoPlay = IsTeaParty;
+            _autoPlay = _lastStartAutoPlay;
+            _ui.m_btnAutoPlay.selected = _autoPlay;
 
             if (LauncherConfig.netType == LauncherConfig.EnumNetType.TEMP && !InstanceZonesDataManager.CheckLevelPass(MainStoryDataManager.currentLevelCfgId))
             {
@@ -161,7 +157,6 @@ namespace GFGGame
 
             _ui.m_btnSkip.visible = skipable;
             _ui.m_c1.selectedIndex = 0;
-            _ui.m_btnAutoPlay.selected = false;
 
             if (_storyStartID == MainStoryDataManager.priorId)
             {
@@ -185,13 +180,14 @@ namespace GFGGame
             Timers.inst.StartCoroutine(CheckResLoad());
         }
 
+        private bool _lastStartAutoPlay = false;
         protected override void OnHide()
         {
             base.OnHide();
             Timers.inst.Remove(UpdateShake);
             Timers.inst.Remove(OnScreenEffectComplete);
-            Timers.inst.Remove(ShowNextWords);
             ScreenBlackController.Instance.HideBlack();
+            _lastStartAutoPlay = _autoPlay;
             StopAutoPlay();
             VoiceManager.Instance.StopVoice();
 
@@ -412,7 +408,7 @@ namespace GFGGame
             _canClickBtnNext = true;
             if (content.IndexOf("//") >= 0)
             {
-                showList(content);
+                ShowList(content);
             }
             else
             {
@@ -420,7 +416,7 @@ namespace GFGGame
             }
         }
 
-        private void showList(string content)
+        private void ShowList(string content)
         {
             StopAutoPlay();
             _ui.m_btnAutoPlay.enabled = false;
@@ -482,8 +478,14 @@ namespace GFGGame
             string[] effectInfo = storyDialogCfg.effectInfoArr;
 
             VoiceManager.Instance.StopVoice();
-            // 如果配置了语音，读取语音
-            VoiceManager.Instance.LoadRes(ResPathUtil.GetVoicePath(storyDialogCfg.voiceRes));
+
+            // 如果没开倍速才加载语音
+            if(_speedAutoPlay == 1 || !_autoPlay)
+            {
+                // 如果配置了语音，读取语音
+                VoiceManager.Instance.LoadRes(ResPathUtil.GetVoicePath(storyDialogCfg.voiceRes));
+            }
+
             _wordList = Regex.Split(words, "&&");
 
             // 有对话
@@ -674,7 +676,7 @@ namespace GFGGame
             _wordIndex++;
             if (_autoPlay)
             {
-                int interval = (int)Mathf.Max(VoiceManager.Instance.GetClipLength(), GameConst.NEXT_WORDS_INTERVAL_MAX / _speedAutoPlay);
+                float interval = Mathf.Max(VoiceManager.Instance.GetClipRemainingLength(), GameConst.NEXT_WORDS_INTERVAL_MAX / _speedAutoPlay);
                 Timers.inst.Add(interval, 1, ShowNextWords);
             }
         }
@@ -886,6 +888,7 @@ namespace GFGGame
             {
                 _onCompleteStoryDialogCall(isSkip, _onCompleteStoryDialogCallParam);
             }
+            this.Hide();
         }
 
         private void UpdateSpeedUpBtn()
@@ -1008,12 +1011,22 @@ namespace GFGGame
             );
         }
 
+        private RenderTexture renderTexure;
         private void CreateHeadImg()
         {
+            // 创建render texture
+            renderTexure = new RenderTexture(550, 760, 24);
+
             // 换装父节点 + 相机
             _dressUpSceneObj = PrefabManager.Instance.InstantiateSync(ResPathUtil.GetPrefabPath("StoryDialogSelfImg/StoryDialogDressUpObj"));
+            Camera camera = _dressUpSceneObj.transform.Find("Camera").GetComponent<Camera>();
+            camera.targetTexture = renderTexure;
+
             // 创建RawImg
             _selfHeadImgObj = PrefabManager.Instance.InstantiateSync(ResPathUtil.GetPrefabPath("StoryDialogSelfImg/Canvas"));
+            RawImage rawImage = _selfHeadImgObj.transform.Find("mask/RawImage").GetComponent<RawImage>();
+            rawImage.texture = renderTexure;
+
             // 将RawImg放在FGUI上
             GoWrapper goWrapper = new GoWrapper(_selfHeadImgObj);
             _ui.m_dialogHead.m_compDressUp.m_holder.SetNativeObject(goWrapper);
@@ -1026,12 +1039,26 @@ namespace GFGGame
 
         private void DestroyHeadImg()
         {
+            // 清空render Texture
+            Camera camera = _dressUpSceneObj.transform.Find("Camera").GetComponent<Camera>();
+            camera.targetTexture = null;
+            RawImage rawImage = _selfHeadImgObj.transform.Find("mask/RawImage").GetComponent<RawImage>();
+            rawImage.texture = null;
+            renderTexure.Release();
+            renderTexure = null;
+
+            // 回收人物
+            _dressUpObj?.Dispose();
+            _dressUpObj = null;
+
+            // 回收RawImage
             if (_selfHeadImgObj != null)
             {
                 PrefabManager.Instance.Restore(_selfHeadImgObj);
                 _selfHeadImgObj = null;
             }
 
+            // 回收相机预制
             if (_dressUpSceneObj != null)
             {
                 PrefabManager.Instance.Restore(_dressUpSceneObj);

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

@@ -105,7 +105,7 @@ namespace GFGGame
                 Hide();
             }
 
-            ViewManager.JumpToView(cfg.jumpId, param, null);
+            ViewManager.JumpToView(cfg.jumpId, param);
 
             if (cfg.jumpId == nameof(LuckyBoxView))
                 ViewManager.Hide<StoryChapterView>();

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

@@ -56,8 +56,8 @@ namespace GFGGame
             _ui.m_roleName.m_txtName.text = RoleDataManager.roleName;
             Timers.inst.Add(0.9f, 1, (object param) =>
             {
-                this.Hide();
                 ViewManager.Show<StoryFightSingleScoreView>();
+                this.Hide();
             });
         }
 

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

@@ -863,7 +863,7 @@ namespace GFGGame
         {
             if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Arena)
             {
-                ViewManager.Show<ArenaFightResultView>(new object[] { _score, _targetScore }, null, true);
+                ViewManager.Show<ArenaFightResultView>(new object[] { _score, _targetScore }, true);
             }
             else
             {

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

@@ -122,8 +122,8 @@ namespace GFGGame
 
             Timers.inst.Add(1.1f, 1, (object param) =>
             {
-                this.Hide();
                 ViewManager.Show<StoryFightTargetScoreView>(new object[] { roleFightData, targetFightData });
+                this.Hide();
             });
         }
 

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

@@ -93,7 +93,7 @@ namespace GFGGame
                 DressUpFightType dressUpFightType = new DressUpFightType();
                 dressUpFightType.levelID = _levelID;
                 dressUpFightType.teaPartID = 0;
-                ViewManager.Show<DressUpFightView>(dressUpFightType, null, true);
+                ViewManager.Show<DressUpFightView>(dressUpFightType);
                 this.Hide();
             }
             else
@@ -134,7 +134,7 @@ namespace GFGGame
             InstanceZonesDataManager.GetCanFightTime(_type, _storyType, _levelID, out int times, out string title);
             if (times > 0)
             {
-                ViewManager.Show<StoryFightQuicklyView>(new object[] { 1, _needItemId, _needItemCount }, new object[] { typeof(StoryLevelInfoView).FullName, this.viewData });
+                ViewManager.Show<StoryFightQuicklyView>(new object[] { 1, _needItemId, _needItemCount });
                 this.Hide();
             }
             else
@@ -162,7 +162,7 @@ namespace GFGGame
         {
             //只要按钮显示说明一定可以速刷多次
             InstanceZonesDataManager.GetCanFightTime(_type, _storyType, _levelID, out int times, out string title);
-            ViewManager.Show<StoryFightQuicklyView>(new object[] { times, _needItemId, _needItemCount }, new object[] { typeof(StoryLevelInfoView).FullName, this.viewData });
+            ViewManager.Show<StoryFightQuicklyView>(new object[] { times, _needItemId, _needItemCount });
             this.Hide();
 
         }

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

@@ -142,78 +142,27 @@ namespace GFGGame
             _ui.m_comResult.m_t0.Play(AddExp);
         }
 
-        protected override async void OnHide()
+        protected override void OnHide()
         {
             base.OnHide();
+
             if (_sceneObject != null)
             {
                 PrefabManager.Instance.Restore(_sceneObject);
                 _sceneObject = null;
             }
-            InstanceZonesDataManager.isResultFighting = false;
             MusicManager.Instance.PlayCroutine(ResPathUtil.GetMusicPath(ConstMusicName.DEFAULT));
             _ui.m_comResult.m_t1.Play();
             _ui.m_comExpBar.m_proExp.m_comHolder.target.width = 0;
 
-
+            InstanceZonesDataManager.isResultFighting = false;
             if (InstanceZonesDataManager.FightScene == ConstInstanceZonesType.Field)
             {
+                InstanceZonesDataManager.isFightResultHide = true;
+                InstanceZonesDataManager.resultData = this._resultData;
+                //ViewManager.DeleteViewStackCountDown(1);
+                //ViewManager.Show<FieldView>();
                 Timers.inst.Remove(OnClickBtnClose);
-
-                FieldCfg fieldCfg = FieldCfgArray.Instance.GetCfg(FieldDataManager.Instance.chapterId);
-                int needPower = 0;
-                for (int i = 0; i < FieldDataManager.Instance.currFightLv + 1; i++)
-                {
-                    needPower += fieldCfg.needPower;
-                }
-                if (!this._resultData.Result || FieldDataManager.Instance.currFightLv == fieldCfg.num || RoleDataManager.power < needPower)
-                {
-                    ViewManager.Show<FieldView>();
-                    bool result = await FieldSProxy.ReqFieldInstanceResult();
-                    if (result)
-                    {
-                        ViewManager.Show<FieldFightEndView>();
-                    }
-                }
-                else
-                {
-                    ViewManager.Show<FieldView>();
-                    FieldDataManager _dataManager = FieldDataManager.Instance;
-                    _dataManager.accumulateReward += (FieldDataManager.Instance.difficulty + 1) * 5;
-                    //这里判断如果获取的马蹄金超过上限了，就终止挑战
-                    if (_dataManager.fieldInfos.bonusWeekly + _dataManager.accumulateReward >= _dataManager.fieldInfos.bonusMaxLimit)
-                    {
-                        AlertUI.Show("本周可获得奖励已达上限，是否继续挑战？")
-                        .SetLeftButton(true, "取消",async (object data) =>
-                        {
-                            _dataManager.accumulateReward = 0;
-                            ViewManager.Show<FieldView>();
-                            bool result = await FieldSProxy.ReqFieldInstanceResult();
-                            if (result)
-                            {
-                                ViewManager.Show<FieldFightEndView>();
-                            }
-                        })
-                        .SetRightButton(true, "确认", async (object data) =>
-                        {
-                            bool result = await FieldSProxy.ReqFieldInstanceResult();
-                            _dataManager.accumulateReward = 0;
-                            ViewManager.Hide<FieldView>();
-                            FieldCfg _curCfg = FieldCfgArray.Instance.dataArray[FieldDataManager.Instance.difficulty]; 
-                            LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.TIAN_YE_DIAO_CHA, 2);
-                            int curLevelId = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(_curCfg.type, 0, _curCfg.id)[0].id;
-                            DressUpFightType dressUpFightType = new DressUpFightType();
-                            dressUpFightType.levelID = curLevelId;
-                            dressUpFightType.teaPartID = 0;
-                            ViewManager.Show<DressUpFightView>(dressUpFightType, new object[] { typeof(FieldView).FullName, this.viewData }, true);
-                            InstanceZonesDataManager.currentLevelCfgId = curLevelId;
-                        });
-                    }
-                    else
-                    { 
-                        ViewManager.Show<FieldFightInfoView>();
-                    }
-                }
             }
             else
             {

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

@@ -278,7 +278,7 @@ namespace GFGGame
         private void OnClickBtnInstanceZones()
         {
             TryCompleteGuide();
-            ViewManager.Show<InstanceZonesUIView>();
+            ViewManager.Show<InstanceZonesView>();
         }
 
         private void OnBtnChangClick()
@@ -347,7 +347,7 @@ namespace GFGGame
             _ui.m_btnHuanZhuang.m_holder1.visible = true;
             _ui.m_btnHuanZhuang.m_holder1.visible = false;
             this.Hide();
-            ViewManager.Show<DressUpView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
+            ViewManager.Show<DressUpView>();
             isOpen = false;
         }
 
@@ -358,7 +358,7 @@ namespace GFGGame
             if (isOpen) return;
             isOpen = true;
             _ui.m_btnZhaiXing.m_holder1.visible = false;
-            ViewManager.Show<LuckyBoxView>(null, null, false, true);
+            ViewManager.Show<LuckyBoxView>(null, false, true);
             isOpen = false;
         }
 
@@ -368,7 +368,7 @@ namespace GFGGame
             isOpen = true;
             _ui.m_btnXiuFang.m_holder1.visible = true;
             _ui.m_btnXiuFang.m_holder1.visible = false;
-            ViewManager.Show<XiuFangView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
+            ViewManager.Show<XiuFangView>();
             isOpen = false;
         }
 
@@ -376,23 +376,22 @@ namespace GFGGame
         {
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.MEI_RI_DNEG_LU, 1);
 
-            ViewManager.Show<SevenDayLoginView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
+            ViewManager.Show<SevenDayLoginView>();
         }
 
         private void OnClickBtnDailyWelfare()
         {
-            ViewManager.Show<DailyWelfareView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
+            ViewManager.Show<DailyWelfareView>();
         }
 
         private void OnClickBtnActivityLuckyBox()
         {
-            ViewManager.Show<ActivityThemeLuckyBoxView>(null, new object[] { typeof(MainUIView).FullName, this.viewData },
-                true);
+            ViewManager.Show<ActivityThemeLuckyBoxView>(null,true);
         }
 
         private void OnClickBtnWanShiLi()
         {
-            ViewManager.Show<ActivityWanShiLiView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
+            ViewManager.Show<ActivityWanShiLiView>();
         }
 
         private void OnClickBtnCiPai()
@@ -405,13 +404,13 @@ namespace GFGGame
             _ui.m_btnCiPai.m_holder1.visible = false;
 
             CardDataManager.isFilter = false;
-            ViewManager.Show<CardDetailView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
+            ViewManager.Show<CardDetailView>();
             isOpen = false;
 
         }
         private void OnClickBtnBag()
         {
-            ViewManager.Show<BagView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
+            ViewManager.Show<BagView>();
         }
 
         private void OnClickBtnLeague()
@@ -437,13 +436,13 @@ namespace GFGGame
         {
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHANG_CHENG, 1);
 
-            ViewManager.Show<StoreView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
+            ViewManager.Show<StoreView>();
         }
 
         private void OnClickBtnTuJian()
         {
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.TU_JIAN, 1);
-            ViewManager.Show<FieldGuideView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
+            ViewManager.Show<FieldGuideView>();
         }
 
         private void OnClickBtnYouJian()
@@ -453,7 +452,7 @@ namespace GFGGame
 
         private void OnClickBtnHaoYou()
         {
-            ViewManager.Show<FriendView>(null, new object[] { typeof(MainUIView).FullName, this.viewData }, true);
+            ViewManager.Show<FriendView>(null, true);
         }
 
         private void OnClickBtnGongGao()
@@ -463,7 +462,7 @@ namespace GFGGame
 
         private void OnClickBtnRenWu()
         {
-            ViewManager.Show<TaskView>(null, new[] { typeof(MainUIView).FullName, this.viewData });
+            ViewManager.Show<TaskView>();
         }
 
         private void OnClickBtnAfuGift()
@@ -472,11 +471,11 @@ namespace GFGGame
             {
                 return;
             }
-            ViewManager.Show<ActivityAfuGiftView>(null, new[] { typeof(MainUIView).FullName, this.viewData });
+            ViewManager.Show<ActivityAfuGiftView>();
         }
         private void OnClickBtnDay7()
         {
-            ViewManager.Show<ActivityDay7View>(null, new[] { typeof(MainUIView).FullName, this.viewData });
+            ViewManager.Show<ActivityDay7View>();
         }
 
         private void OnClickBtnFirstRecharge()

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

@@ -141,12 +141,12 @@ namespace GFGGame
                 bool result = await NoticeSProxy.ReqSystemNotice(noticeInfo.noticeId);
                 if (result)
                 {
-                    ViewManager.Show<NoticeSystemShowView>(NoticeDataManager.Instance.GetNoticeInfoById(noticeInfo.noticeId), new object[] { typeof(NoticeView).Name, this.viewData });
+                    ViewManager.Show<NoticeSystemShowView>(NoticeDataManager.Instance.GetNoticeInfoById(noticeInfo.noticeId));
                 }
             }
             else
             {
-                ViewManager.Show<NoticeSystemShowView>(noticeInfo, new object[] { typeof(NoticeView).Name, this.viewData });
+                ViewManager.Show<NoticeSystemShowView>(noticeInfo);
             }
         }
     }

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

@@ -28,7 +28,7 @@ namespace GFGGame
             _ui = UI_PoemGalleryPreviewUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
-            isReturnView = 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

@@ -250,7 +250,7 @@ namespace GFGGame
         private void OnBtnShopClick()
         {
             object[] gobackParamDatas = new object[] { _tabIndex, _subtabIndex, _ui.m_comNormal.m_comBoBox.selectedIndex };
-            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_EXCHANGE, ConstStoreSubId.STORE_EXCHANGE_GALLERY }, new object[] { typeof(PoemGalleryView).FullName, gobackParamDatas });
+            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_EXCHANGE, ConstStoreSubId.STORE_EXCHANGE_GALLERY });
         }
 
         /// <summary>
@@ -258,7 +258,7 @@ namespace GFGGame
         /// </summary>
         private void OnBtnRewardClick()
         {
-            ViewManager.Show<PoemGalleryRewardView>(null, new object[] { typeof(PoemGalleryView).FullName, this.viewData });
+            ViewManager.Show<PoemGalleryRewardView>();
         }
 
 
@@ -298,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 }, false);
+            ViewManager.Show<DressUpView>(1,false);
         }
 
         /// <summary>
@@ -581,7 +581,7 @@ namespace GFGGame
             GObject obj = context.sender as GObject;
             long workId = (long)obj.data;
             object[] gobackParamDatas = new object[] { _tabIndex, _subtabIndex, _ui.m_comNormal.m_comBoBox.selectedIndex };
-            ViewManager.Show<PoemGalleryPreviewView>(new object[] { _sortType, workId }, new object[] { typeof(PoemGalleryView).FullName, gobackParamDatas });
+            ViewManager.Show<PoemGalleryPreviewView>(new object[] { _sortType, workId });
         }
 
         private async void OnBtnCollectClick(EventContext context)

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

@@ -243,7 +243,7 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("暂时没有可以分享的对象");
                 return;
             }
-            ViewManager.Show<PoemPhotoShareView>(_curPhotoData, new object[] { typeof(PoemPhotoPreView).FullName, new object[] { _curIndex, _photoInfos, _sourceType } });
+            ViewManager.Show<PoemPhotoShareView>(_curPhotoData);
         }
     }
 }

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

@@ -227,7 +227,7 @@ namespace GFGGame
             PoemPhotoData photoData = _photoInfos[index];
             if (_ui.m_c2.selectedIndex == 0)
             {
-                ViewManager.Show<PoemPhotoPreView>(new object[] { index, _photoInfos, _sourceType }, new object[] { typeof(PoemPhotoView).FullName, _sourceType });
+                ViewManager.Show<PoemPhotoPreView>(new object[] { index, _photoInfos, _sourceType });
             }
             else if (_ui.m_c2.selectedIndex == 1)
             {

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

@@ -69,11 +69,11 @@ namespace GFGGame
         }
         private void OnComPhotoClick()
         {
-            ViewManager.Show<PoemPhotoView>(null, new object[] { typeof(PoemView).FullName, this.viewData });
+            ViewManager.Show<PoemPhotoView>();
         }
         private void OnComGalleryClick()
         {
-            ViewManager.Show<PoemGalleryView>(null, new object[] { typeof(PoemView).FullName, this.viewData });
+            ViewManager.Show<PoemGalleryView>();
         }
 
         private void CheckGuide(object param)

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

@@ -137,19 +137,17 @@ namespace GFGGame
             if (RoleInfoManager.GetPosType(index) == MonthCardType.Gold && !RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.Gold))
             {
                 // PromptController.Instance.ShowFloatTextPrompt("灵犀卡开启");
-                ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_MONTH_CARD, ConstStoreSubId.STORE_MONTH_GOLD_CARD }
-                , new object[] { typeof(RoleInfoView).FullName, this.viewData });
+                ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_MONTH_CARD, ConstStoreSubId.STORE_MONTH_GOLD_CARD });
                 return;
             }
             if (RoleInfoManager.GetPosType(index) == MonthCardType.BlackGold && !RoleDataManager.CheckIsMonthCardOpenByType(MonthCardType.BlackGold))
             {
                 // PromptController.Instance.ShowFloatTextPrompt("璇玑卡开启");
-                ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_MONTH_CARD, ConstStoreSubId.STORE_MONTH_BLACK_CARD }
-                , new object[] { typeof(RoleInfoView).FullName, this.viewData });
+                ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_MONTH_CARD, ConstStoreSubId.STORE_MONTH_BLACK_CARD });
                 return;
             }
 
-            ViewManager.Show<PersonalPhotoView>(index, new object[] { typeof(RoleInfoView).FullName, this.viewData });
+            ViewManager.Show<PersonalPhotoView>(index);
         }
 
         private async void OnFocuseOut()
@@ -159,7 +157,7 @@ namespace GFGGame
 
         private void OnClickLoaChangeName()
         {
-            ViewManager.Show<ChangeNameView>(null, new object[] { typeof(RoleInfoView).FullName, this.viewData });
+            ViewManager.Show<ChangeNameView>();
         }
 
         private void OnBtnFieldGuideClick()
@@ -168,16 +166,16 @@ namespace GFGGame
         }
         private void OnBtnSkillClick()
         {
-            ViewManager.Show<PersonalSkillView>(null, new object[] { typeof(RoleInfoView).FullName, this.viewData });
+            ViewManager.Show<PersonalSkillView>();
         }
         private void OnBtnSettingClick()
         {
-            ViewManager.Show<SettingView>(null, new object[] { typeof(RoleInfoView).FullName, this.viewData });
+            ViewManager.Show<SettingView>();
         }
         private void OnComHeadClick()
         {
             GUIUtility.systemCopyBuffer = RoleDataManager.roleName;
-            ViewManager.Show<ChangeHeadView>(null, new object[] { typeof(RoleInfoView).FullName, this.viewData });
+            ViewManager.Show<ChangeHeadView>();
         }
 
         private void UpdateRedDot()

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

@@ -178,7 +178,7 @@ namespace GFGGame
             {
                 param[i] = taskCfg.jumpParamArr[i];
             }
-            ViewManager.JumpToView(taskCfg.jumpId, param, new[] { typeof(StoreView).FullName, viewData });
+            ViewManager.JumpToView(taskCfg.jumpId, param,true);
         }
 
         private async void OnBtnGetAllClick()

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

@@ -113,7 +113,7 @@ namespace GFGGame
         //开启通行证
         private void OnBtnOpenClick(EventContext context)
         {
-            ViewManager.Show<OpenBattlePassView>(null, new object[] { typeof(StoreBrocadeWeavView).FullName, null });
+            ViewManager.Show<OpenBattlePassView>();
         }
 
         private void OnBtnBuyLevel(EventContext context)
@@ -127,7 +127,7 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("已经满级");
                 return;
             }
-            ViewManager.Show<BuyBattlePassLevelView>(null, new object[] { typeof(StoreBrocadeWeavView).FullName, null });
+            ViewManager.Show<BuyBattlePassLevelView>();
         }
 
         //领取奖励
@@ -148,7 +148,7 @@ namespace GFGGame
             // var isBuy = BattlePassTaskDataManager.Instance.GetIsBuy();
             // if (!isBuy)
             // {
-            ViewManager.Show<OpenBattlePassView>(null, new object[] { typeof(StoreBrocadeWeavView).FullName, null });
+            ViewManager.Show<OpenBattlePassView>();
             // return;
             // }
             // var get = await BattlePassTaskSProxy.GetBattlePassReward(id);
@@ -182,8 +182,7 @@ namespace GFGGame
             {
                 var isBuy = BattlePassTaskDataManager.Instance.GetIsBuy();
                 if (isBuy) return;
-                ViewManager.Show<OpenBattlePassView>(null,
-                    new object[] { typeof(StoreBrocadeWeavView).FullName, null });
+                ViewManager.Show<OpenBattlePassView>();
             });
             if (!get) return;
             SetBattlePassLevel();

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

@@ -127,6 +127,8 @@ namespace GFGGame
 
             if (type == BUY_TYPE_0 && ItemDataManager.GetItemNum(_limitCfg.itemID) < _limitCfg.itemNum || type == BUY_TYPE_1 && ItemDataManager.GetItemNum(moneyId) < moneyNum)
             {
+                object[] sourceDatas = new object[]{ _limitCfg.itemID, new object[] { typeof(BagView).FullName, this.viewData } };
+                GoodsItemTipsController.ShowItemTips(_limitCfg.itemID, sourceDatas);
                 PromptController.Instance.ShowFloatTextPrompt("道具不足", MessageType.ERR);
                 return;
             }

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

@@ -32,7 +32,7 @@ namespace GFGGame
             _ui = UI_StudioFilingNpcUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
-            isReturnView = true;
+            //isReturnView = true;
             // this.viewCom.Center();
             // this.modal = true;
             viewAnimationType = EnumViewAnimationType.None;

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

@@ -37,7 +37,7 @@ namespace GFGGame
             _ui = UI_StudioFilingUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
-            isReturnView = false;
+            isReturnView = true;
             _valueBarController = new ValueBarController(_ui.m_comValueBar);
 
             _ui.m_Bg.url = ResPathUtil.GetBgImgPath("bg_fhl");
@@ -231,7 +231,7 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt(string.Format("需通关{0}关卡解锁", cfg.name));
                 return;
             }
-            ViewManager.Show<ClothingSyntheticView>(new object[] { _studioCfg.suitId }, new object[] { typeof(StudioFilingView).FullName, this.viewData }, false);
+            ViewManager.Show<ClothingSyntheticView>(new object[] { _studioCfg.suitId }, false);
             EventAgent.AddEventListener(ConstMessage.STUDIO_FILING_UPDATE, UpdateView);
             //if (_viewData == StudioDataManager.Instance.GetLuckyBoxActivityID())
             //{

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

@@ -133,14 +133,14 @@ namespace GFGGame
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             GuideController.TryGuide(list, ConstGuideId.STUDIO_PROPERTY, 4, "通关这个副本可以获得风系词牌的升星材料哦~", 0);
             GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.STUDIO_PROPERTY, 6, "挑战成功啦，让我们继续新旅程~");
-            GuideController.TryCompleteGuide(ConstGuideId.STUDIO_PROPERTY, 6);
+            //GuideController.TryCompleteGuide(ConstGuideId.STUDIO_PROPERTY, 6);
         }
         protected override void TryCompleteGuide()
         {
             base.TryCompleteGuide();
             // GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.STUDIO_PROPERTY);
-            GuideController.TryCompleteGuideIndex(ConstGuideId.STUDIO_PROPERTY, 6);
-            GuideController.TryCompleteGuide(ConstGuideId.STUDIO_PROPERTY, 6);
+            //GuideController.TryCompleteGuideIndex(ConstGuideId.STUDIO_PROPERTY, 6);
+            //GuideController.TryCompleteGuide(ConstGuideId.STUDIO_PROPERTY, 6);
         }
         protected override void ListItemRender(int index, GObject obj)
         {

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

@@ -3,16 +3,31 @@ using ET;
 using FairyGUI;
 using UI.Studio;
 using UnityEngine;
+using System.Collections.Generic;
 
 namespace GFGGame
 {
     public class StudioView : BaseWindow
     {
         private UI_StudioUI _ui;
-
-
+        private EffectUI _effectUI1;
+        private EffectUI _effectUI2;
+        private EffectUI _effectUI3;
+        private EffectUI _effectUI4;
+        private EffectUI _effectUI5;
+        private Dictionary<string, UI_ComEctype> comEctypeDic = new Dictionary<string, UI_ComEctype>();
         public override void Dispose()
         {
+            EffectUIPool.Recycle(_effectUI1);
+            _effectUI1 = null;
+            EffectUIPool.Recycle(_effectUI2);
+            _effectUI2 = null;
+            EffectUIPool.Recycle(_effectUI3);
+            _effectUI3 = null;
+            EffectUIPool.Recycle(_effectUI4);
+            _effectUI4 = null;
+            EffectUIPool.Recycle(_effectUI5);
+            _effectUI5 = null;
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -38,6 +53,18 @@ namespace GFGGame
             _ui.m_comProperty.target.onClick.Add(OnComProperty);
             _ui.m_comFiling.target.onClick.Add(OnClickComFilling);
             _ui.m_comPorcelain.target.onClick.Add(OnComPorceLain);
+
+            comEctypeDic.Add(typeof(StudioMetalView).FullName, _ui.m_comMetal);
+            comEctypeDic.Add(typeof(StudioFabricView).FullName, _ui.m_comFabric);
+            comEctypeDic.Add(typeof(StudioPropertyView).FullName, _ui.m_comProperty);
+            comEctypeDic.Add(typeof(StudioFilingView).FullName, _ui.m_comFiling);
+            comEctypeDic.Add(typeof(StudioPorcelainView).FullName, _ui.m_comPorcelain);
+
+            _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_comFiling.m_effect, "ui_Small_parts", "YaJi_TuBiao");
+            _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_comMetal.m_effect, "ui_Small_parts", "YaJi_TuBiao");
+            _effectUI3 = EffectUIPool.CreateEffectUI(_ui.m_comFabric.m_effect, "ui_Small_parts", "YaJi_TuBiao");
+            _effectUI4 = EffectUIPool.CreateEffectUI(_ui.m_comProperty.m_effect, "ui_Small_parts", "YaJi_TuBiao");
+            _effectUI5 = EffectUIPool.CreateEffectUI(_ui.m_comPorcelain.m_effect, "ui_Small_parts", "YaJi_TuBiao");
         }
         protected override void AddEventListener()
         {
@@ -48,16 +75,35 @@ namespace GFGGame
         {
             base.OnShown();//1;//
             StudioSProxy.ReqStudioInfos().Coroutine();
-            int isopen = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioMetalView).FullName, false) ? 1 : 0;
-            _ui.m_comMetal.m_c1.selectedIndex = isopen;
-            isopen = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioFabricView).FullName, false) ? 1 : 0; ;
-            _ui.m_comFabric.m_c1.selectedIndex = isopen;
-            isopen = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioPropertyView).FullName, false) ? 1 : 0;
-            _ui.m_comProperty.m_c1.selectedIndex = isopen;
-            isopen = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioFilingView).FullName, false) ? 1 : 0;
-            _ui.m_comFiling.m_c1.selectedIndex = isopen;
-            isopen = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioPorcelainView).FullName, false) ? 1 : 0;
-            _ui.m_comPorcelain.m_c1.selectedIndex = isopen;
+            //int isopen = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioMetalView).FullName, false) ? 1 : 0;
+            //_ui.m_comMetal.m_c1.selectedIndex = isopen;
+            //isopen = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioFabricView).FullName, false) ? 1 : 0; ;
+            //_ui.m_comFabric.m_c1.selectedIndex = isopen;
+            //isopen = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioPropertyView).FullName, false) ? 1 : 0;
+            //_ui.m_comProperty.m_c1.selectedIndex = isopen;
+            //isopen = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioFilingView).FullName, false) ? 1 : 0;
+            //_ui.m_comFiling.m_c1.selectedIndex = isopen;
+            //isopen = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioPorcelainView).FullName, false) ? 1 : 0;
+            //_ui.m_comPorcelain.m_c1.selectedIndex = isopen;
+
+            int isopen = 1;
+            foreach(var com in comEctypeDic)
+            {
+                isopen = FunctionOpenDataManager.Instance.CheckIsFunOpenById(com.Key, false) ? 1 : 0;
+                com.Value.m_c1.selectedIndex = isopen;
+                if(isopen == 0)
+                {
+                    com.Value.m_effect.visible = false;
+                    com.Value.m_bg.visible = true;
+                }
+                else
+                {
+                    com.Value.m_bg.visible = false;
+                    com.Value.m_t0.Play();
+                    com.Value.m_effect.visible = true;
+                }
+            }
+
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("ejzjm_bj");
             UpdateRedDot();
             Timers.inst.AddUpdate(CheckGuide);
@@ -89,7 +135,7 @@ namespace GFGGame
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.JIN_SHU_XIU_FU, 1);
 
             if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioMetalView).FullName, true)) return;
-            ViewManager.Show<StudioMetalView>(null, new object[] { typeof(StudioView).FullName, this.viewData });
+            ViewManager.Show<StudioMetalView>();
             this.Hide();
         }
         private void OnCliclComFabric()
@@ -97,7 +143,7 @@ namespace GFGGame
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.ZHI_WU_XIU_FU, 1);
 
             if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioFabricView).FullName, true)) return;
-            ViewManager.Show<StudioFabricView>(null, new object[] { typeof(StudioView).FullName, this.viewData });
+            ViewManager.Show<StudioFabricView>();
             this.Hide();
 
         }
@@ -106,7 +152,7 @@ namespace GFGGame
             //LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHU_HUA_XIU_FU, 1);
 
             if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioPropertyView).FullName, true)) return;
-            ViewManager.Show<StudioPropertyView>(null, new object[] { typeof(StudioView).FullName, this.viewData });
+            ViewManager.Show<StudioPropertyView>();
             this.Hide();
 
         }
@@ -116,14 +162,14 @@ namespace GFGGame
             // LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHU_HUA_XIU_FU, 1);
 
             if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioPorcelainView).FullName, true)) return;
-            ViewManager.Show<StudioPorcelainView>(null, new object[] { typeof(StudioView).FullName, this.viewData });
+            ViewManager.Show<StudioPorcelainView>();
             this.Hide();
 
         }
         private void OnClickComFilling()
         {
 
-            ViewManager.Show<StudioFilingView>(StudioDataManager.Instance.npcFilingChapterId, new object[] { typeof(StudioView).FullName, this.viewData });
+            ViewManager.Show<StudioFilingView>(StudioDataManager.Instance.npcFilingChapterId);
         }
         private void UpdateRedDot()
         {
@@ -157,12 +203,17 @@ namespace GFGGame
 
             GuideController.TryGuide(_ui.m_comProperty.target, ConstGuideId.STUDIO_PROPERTY, 3, "");
 
+            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.STUDIO_PROPERTY,7);
+            GuideController.TryCompleteGuide(ConstGuideId.STUDIO_PROPERTY, 7);
+
             //GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.ENTER_CHAPTER_4, 1, "");
         }
 
         protected override void TryCompleteGuide()
         {
-
+            base.TryCompleteGuide();
+            GuideController.TryCompleteGuideIndex(ConstGuideId.STUDIO_PROPERTY, 7);
+            GuideController.TryCompleteGuide(ConstGuideId.STUDIO_PROPERTY, 7);
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Task/BattlePassTaskView.cs

@@ -105,7 +105,7 @@ namespace GFGGame
         //开启通行证
         private void OnBtnOpenClick(EventContext context)
         {
-            ViewManager.Show<OpenBattlePassView>(null, new object[] { typeof(BattlePassTaskView).FullName, null });
+            ViewManager.Show<OpenBattlePassView>();
         }
 
         private void OnBtnBuyLevel(EventContext context)
@@ -119,7 +119,7 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("已经满级");
                 return;
             }
-            ViewManager.Show<BuyBattlePassLevelView>(null, new object[] { typeof(BattlePassTaskView).FullName, null });
+            ViewManager.Show<BuyBattlePassLevelView>();
         }
 
         //领取奖励
@@ -140,7 +140,7 @@ namespace GFGGame
             // var isBuy = BattlePassTaskDataManager.Instance.GetIsBuy();
             // if (!isBuy)
             // {
-            ViewManager.Show<OpenBattlePassView>(null, new object[] { typeof(BattlePassTaskView).FullName, null });
+            ViewManager.Show<OpenBattlePassView>();
             // return;
             // }
             // var get = await BattlePassTaskSProxy.GetBattlePassReward(id);
@@ -155,8 +155,7 @@ namespace GFGGame
             {
                 var isBuy = BattlePassTaskDataManager.Instance.GetIsBuy();
                 if (isBuy) return;
-                ViewManager.Show<OpenBattlePassView>(null,
-                    new object[] { typeof(BattlePassTaskView).FullName, null });
+                ViewManager.Show<OpenBattlePassView>();
             });
             if (!get) return;
             SetBattlePassLevel();

GameClient/Assets/Game/HotUpdate/Views/Task/CombTaskController.cs

@@ -204,7 +204,7 @@ namespace GFGGame
             {
                 param[i] = taskCfg.jumpParamArr[i];
             }
-            ViewManager.JumpToView(taskCfg.jumpId, param, new object[] { typeof(TaskView).FullName, new[] { _ui.m_c1.selectedIndex } });
+            ViewManager.JumpToView(taskCfg.jumpId, param);
         }
 
         private async void OnBtnGetAllClick()

GameClient/Assets/Game/HotUpdate/Views/Task/TaskAchieveDetailView.cs

@@ -163,7 +163,7 @@ namespace GFGGame
                 param[i] = taskCfg.jumpParamArr[i];
             }
 
-            ViewManager.JumpToView(taskCfg.jumpId, param, new object[] { typeof(TaskAchieveDetailView).FullName});
+            ViewManager.JumpToView(taskCfg.jumpId, param);
         }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Travel/TravelView.cs

@@ -58,6 +58,9 @@ namespace GFGGame
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("cj_bg_ychm");
 
             _effectUIDic.Add("XQFS_Kuang_All", EffectUIPool.CreateEffectUI(_ui.m_bg_eff, "ui_HaiZhiShi", "XQFS_Kuang_All"));
+            _effectUIDic.Add("XQFS_DouBao01", EffectUIPool.CreateEffectUI(_ui.m_btnGo.m_btnGo_db_eff, "ui_HaiZhiShi", "XQFS_DouBao01"));
+            _effectUIDic.Add("XQFS_DouBao_Loading", EffectUIPool.CreateEffectUI(_ui.m_db_loadingEff_holder, "ui_HaiZhiShi", "XQFS_DouBao_Loading"));
+
             // 省略号特效
             _effectUIDic.Add("XQFS_Text_Loading", EffectUIPool.CreateEffectUI(_ui.m_txt_eff, "ui_HaiZhiShi", "XQFS_Text_Loading"));
             _effectUIDic.Add("XQFS_Button_YouLi", EffectUIPool.CreateEffectUI(_ui.m_btnGo.m_btnGo_eff, "ui_HaiZhiShi", "XQFS_Button_YouLi"));
@@ -155,23 +158,22 @@ namespace GFGGame
                 return;
             }
 
-            ViewManager.Show<TravelDressupView>(null, new object[] { typeof(TravelView).FullName, this.viewData });
+            ViewManager.Show<TravelDressupView>();
         }
 
         private void OnBtnGetClick()
         {
-            ViewManager.Show<TravelRewardView>(null, new object[] { typeof(TravelView).FullName, this.viewData });
+            ViewManager.Show<TravelRewardView>();
         }
 
         private void OnBtnPhotoClick()
         {
-            ViewManager.Show<PoemPhotoView>(PictureSourceType.WanShuiQianShan,
-                new object[] { typeof(TravelView).FullName, this.viewData });
+            ViewManager.Show<PoemPhotoView>(PictureSourceType.WanShuiQianShan);
         }
 
         private void OnBtnFieldGuideClick()
         {
-            ViewManager.Show<TravelGuideView>(null, new object[] { typeof(TravelView).FullName, this.viewData });
+            ViewManager.Show<TravelGuideView>();
         }
 
         private void CheckGuide(object param)

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

@@ -126,6 +126,7 @@ namespace GFGGame
             object temp = viewData;
             this.OnHide();
             this.viewData = temp;
+            this.BringToFront();
             this.OnShown();
         }
 
@@ -133,6 +134,10 @@ namespace GFGGame
         {
         }
 
+        virtual protected void BringToFront()
+        {
+        }
+
         public virtual void Hide()
         {
             // UIPackageManager.Instance.RemovePackageView(_descFilePath, viewName);

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

@@ -30,8 +30,14 @@ namespace GFGGame
         private static GComponent _alertLayer;
         private static GComponent _debugLayer;
         private static GComponent _floatLayer;
+        private static bool _nowHideOthers = false;
 
         private static Dictionary<string, List<object[]>> _goBackDatas = new Dictionary<string, List<object[]>>();
+       
+        public static void Clear()
+        {
+            _viewStack.Clear();
+        }
 
         public static void Init()
         {
@@ -114,7 +120,7 @@ namespace GFGGame
         /// <param name="viewData">要传递给视图的参数</param>
         /// <param name="goBackParams">从该视图返回的视图信息</param>
         /// <param name="hideOthers">是否关闭其他视图</param>
-        public static bool Show(string fullViewName, object viewData = null, object[] goBackParams = null, bool hideOthers = false, bool resetGobackParams = false)
+        public static bool Show(string fullViewName, object viewData = null, bool hideOthers = false, bool resetGobackParams = false)
         {
             string name = GetName(fullViewName);
             if (!GameGlobal.skipCheckOpen && !FunctionOpenDataManager.Instance.CheckIsFunOpenById(name))
@@ -123,11 +129,6 @@ namespace GFGGame
             }
             if (hideOthers)
             {
-                for (int i = _viewStack.Count - 1; i >= 0; i--)
-                {
-                    if (_viewStack[i].name != "MainUIView")
-                        _viewStack.RemoveAt(i);
-                }
                 HideAllView(name);
             }
             IUIView obj = null;
@@ -171,14 +172,21 @@ namespace GFGGame
                 viewStructure.viewData = viewData;
                 viewStructure.iUIView = obj;
                 _viewStack.Add(viewStructure);
-
-                if (_viewStack.Count > 1)
+                if (_viewStack.Count > 1 && !hideOthers)
                     _viewStack[_viewStack.Count - 2].iUIView.Hide();
             }
 
             return true;
         }
 
+        //删除队列中的倒数几个
+        public static void DeleteViewStackCountDown(int count)
+        {
+            for (int i = 0; i < count; i++) {
+                _viewStack.RemoveAt(_viewStack.Count-1);
+            }
+        }
+
         public static bool isViewOpen(string fullViewName)
         {
             string name = GetName(fullViewName);
@@ -196,26 +204,38 @@ namespace GFGGame
             return false;
         }
 
-        public static bool Show<T>(object viewData = null, object[] goBackParams = null, bool hideOthers = false, bool resetGobackParams = false) where T : class, new()
+        public static bool Show<T>(object viewData = null, bool hideOthers = false, bool resetGobackParams = false) where T : class, new()
         {
             // string[] names = typeof(T).FullName.Split('.');
             // string viewName = names[names.Length - 1];
             //string name = GetName(typeof(T).FullName);
-            return ViewManager.Show(typeof(T).FullName, viewData, null, hideOthers);
+            return ViewManager.Show(typeof(T).FullName, viewData, hideOthers);
         }
 
         public static void HideWin(string viewName)
         {
-            if (_viewStack.Count > 1) {
+            if (_viewStack.Count > 1 && !_nowHideOthers) {
                 ViewStructure viewStructure = _viewStack[_viewStack.Count - 1];
-                if (viewStructure.iUIView.isReturnView && viewStructure.name == viewName)
+                bool hasShowingView = false;
+                foreach (var info in _viewDic.Keys)
                 {
-                    _viewStack.RemoveAt(_viewStack.Count - 1);
+                    IUIView objIsShowing = _viewDic[info];
+                    if (objIsShowing != null && objIsShowing.isShowing)
+                    {
+                        hasShowingView = true;
+                        break;
+                    }
+                }
+                if (!hasShowingView || (viewStructure.iUIView.isReturnView && viewStructure.name == viewName))
+                {
+                    //关闭自己，在队列里去除
+                    if(viewStructure.iUIView.isReturnView && viewStructure.name == viewName)
+                        _viewStack.RemoveAt(_viewStack.Count - 1);
+
                     if (_viewStack.Count >= 1)
                     {
                         viewStructure = _viewStack[_viewStack.Count - 1];
                         ViewManager.Show($"GFGGame.{viewStructure.name}", viewStructure.viewData);
-
                         foreach (var objName in _viewDic.Keys)
                         {
                             if (objName != viewStructure.name)
@@ -268,7 +288,7 @@ namespace GFGGame
                 }
             }
             MainDataManager.Instance.ViewType = 0;
-            ViewManager.Show<MainUIView>(null, null, true);
+            ViewManager.Show<MainUIView>(null, true);
         }
 
         public static object[] GetGoBackDatas(string fullViewName)
@@ -313,9 +333,11 @@ namespace GFGGame
                 if (kv.Key != excludeViewName)
                 {
                     if (kv.Key == typeof(FunctionOpenView).Name) continue;//功能开启界面不能强制关闭
+                    _nowHideOthers = true;
                     Hide(kv.Key);
                 }
             }
+            _nowHideOthers = false;
             // _viewDic.Clear();
             // foreach (string viewName in _viewDic.Keys)
             // {
@@ -398,7 +420,7 @@ namespace GFGGame
         /// 任务界面跳转
         /// </summary>
         /// <param name="jumpId"></param>
-        public static void JumpToView(string jumpId, object[] param, object[] goBackDatas, bool hideOther = false, Action onSuccess = null)
+        public static void JumpToView(string jumpId, object[] param, bool hideOther = false, Action onSuccess = null)
         {
             switch (jumpId)
             {
@@ -406,13 +428,13 @@ namespace GFGGame
 
                     if (LeagueDataManager.Instance.Type == LeagueJoinType.Join)
                     {
-                        ViewManager.Show<LeagueView>(null, goBackDatas, hideOther);
+                        ViewManager.Show<LeagueView>(null, hideOther);
                         ViewManager.Show($"GFGGame.{jumpId}");
                     }
                     else
                     {
                         if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(nameof(LeagueView))) return;
-                        ViewManager.Show<LeagueJoinView>(null, goBackDatas, hideOther, true);
+                        ViewManager.Show<LeagueJoinView>(null, hideOther, true);
                     }
 
                     break;
@@ -420,36 +442,36 @@ namespace GFGGame
                     if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(nameof(LeagueView))) return;
                     if (LeagueDataManager.Instance.Type == LeagueJoinType.Join)
                     {
-                        ViewManager.Show<LeagueView>(null, goBackDatas, hideOther);
+                        ViewManager.Show<LeagueView>(null, hideOther);
                     }
                     else
                     {
-                        ViewManager.Show<LeagueJoinView>(null, goBackDatas, hideOther, true);
+                        ViewManager.Show<LeagueJoinView>(null, hideOther, true);
                     }
                     break;
                 case nameof(StoreView):
-                    ViewManager.Show<StoreView>(param, goBackDatas, hideOther);
+                    ViewManager.Show<StoreView>(param, hideOther);
                     break;
                 case nameof(StoryChapterListView):
-                    ViewManager.Show($"GFGGame.{jumpId}", param, goBackDatas, hideOther, true);
+                    ViewManager.Show($"GFGGame.{jumpId}", param, hideOther, true);
                     break;
                 case nameof(StoryChapterView):
-                    ViewManager.Show<StoryChapterView>(param[0], goBackDatas, hideOther);
+                    ViewManager.Show<StoryChapterView>(param[0], hideOther);
                     break;
                 case nameof(FirstChargeBonusView):
-                    ViewManager.Show<FirstChargeBonusView>(param, goBackDatas, false);
+                    ViewManager.Show<FirstChargeBonusView>(param, false);
                     break;
                 case nameof(ClothingSyntheticView):
-                    ViewManager.Show<ClothingSyntheticView>(param, goBackDatas, false);
+                    ViewManager.Show<ClothingSyntheticView>(param, hideOther);
                     break;
                 case nameof(LuckyBoxView):
                     if(param.Length > 0)
-                        ViewManager.Show<LuckyBoxView>(param[0], goBackDatas, false);
+                        ViewManager.Show<LuckyBoxView>(param[0], hideOther);
                     else
-                        ViewManager.Show<LuckyBoxView>(null, goBackDatas, false);
+                        ViewManager.Show<LuckyBoxView>(null, hideOther);
                     break;
                 default:
-                    ViewManager.Show($"GFGGame.{jumpId}", null, goBackDatas, hideOther, true);
+                    ViewManager.Show($"GFGGame.{jumpId}", null, hideOther, true);
                     break;
             }
             onSuccess?.Invoke();

GameClient/Assets/Game/HotUpdate/Views/XiuFang/XiuFangView.cs

@@ -83,21 +83,21 @@ namespace GFGGame
         private void OnClickBtnClothingShop()
         {
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.FU_ZHUANG_DIAN, 1);
-            ViewManager.Show<ClothingShopView>(null, new object[] { typeof(XiuFangView).FullName, this.viewData }, false, true);
+            ViewManager.Show<ClothingShopView>(null, true);
         }
 
         private void OnClickBtnSuitSynthetic()
         {
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.FU_ZHUANG_HE_CHENG, 1);
 
-            ViewManager.Show<SuitSyntheticView>(null, new object[] { typeof(XiuFangView).FullName, this.viewData });
+            ViewManager.Show<SuitSyntheticView>();
         }
 
         private void OnClickBtnClothingUpgrade()
         {
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.FU_ZHUANG_YANG_CHENG, 1);
 
-            ViewManager.Show<ClothingListView>(null, new object[] { typeof(XiuFangView).FullName, this.viewData }, false, true);
+            ViewManager.Show<ClothingListView>(null, true);
 
             // PromptController.Instance.ShowFloatTextPrompt("暂未开放", MessageType.WARNING);
         }
@@ -105,8 +105,7 @@ namespace GFGGame
         {
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.FU_ZHUANG_FEN_JIE, 1);
 
-            ViewManager.Show<ClothingDecomposeView>(null, new object[] { typeof(XiuFangView).FullName, this.viewData });
-
+            ViewManager.Show<ClothingDecomposeView>();
         }
         private void CheckGuide(object param)
         {

GameClient/Assets/ResIn/Prefab/StoryDialogSelfImg/Canvas.prefab

@@ -65,7 +65,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Texture: {fileID: 8400000, guid: d75358a96d5bdc349947ff8414ae83f6, type: 2}
+  m_Texture: {fileID: 0}
   m_UVRect:
     serializedVersion: 2
     x: 0