huangxiaoyue 1 vuosi sitten
vanhempi
commit
e1ea9806a5

+ 8 - 8
GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaDressInfoView.cs

@@ -111,12 +111,13 @@ namespace GFGGame
         private void OnClickBtnBack()
         {
             //ViewManager.GoBackFrom(typeof(ArenaDressInfoView).FullName); //返回竞技场主界面
-            this.OnHide();
-            ViewManager.Show<ArenaView>(null, new object[] { typeof(MainUIView).FullName, this.viewData }, true);
-            if (!string.IsNullOrEmpty(_openViewName))
-            {
-                ViewManager.Show(_openViewName); //打开来源界面:如历史记录、排行榜
-            }
+            this.Hide();
+            //this.OnHide();
+            //ViewManager.Show<ArenaView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
+            //if (!string.IsNullOrEmpty(_openViewName))
+            //{
+            //    ViewManager.Show(_openViewName); //打开来源界面:如历史记录、排行榜
+            //}
         }
 
         private void OnThemeChange()
@@ -145,8 +146,7 @@ namespace GFGGame
         {
             ViewManager.Show<ArenaDressUpFightView>(null,
                 new object[]
-                    { typeof(ArenaDressInfoView).FullName, new object[] { _roleType, _themeIndex, _roleDatas, "" } },
-                true);
+                    { typeof(ArenaDressInfoView).FullName, new object[] { _roleType, _themeIndex, _roleDatas, "" } });
         }
 
         private async void OnBtnRecommendClick()

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaView.cs

@@ -217,7 +217,7 @@ namespace GFGGame
                 PromptController.Instance.ShowFloatTextPrompt("本周结算中......");
                 return;
             }
-            ViewManager.Show<ArenaDressInfoView>(new object[] { FightRoleType.MINE, 0, _dataManager.DressupList, "" }, new object[] { typeof(ArenaView).FullName, this.viewData }, true);
+            ViewManager.Show<ArenaDressInfoView>(new object[] { FightRoleType.MINE, 0, _dataManager.DressupList, "" });
         }
 
         private void OnBtnQuickFightClick()

+ 3 - 3
GameClient/Assets/Game/HotUpdate/Views/DressUp/ArenaDressUpFightView.cs

@@ -5,7 +5,7 @@ using System.Collections.Generic;
 
 namespace GFGGame
 {
-    public class ArenaDressUpFightView : BaseView
+    public class ArenaDressUpFightView : BaseWindow
     {
         private UI_ArenaDressUpFightUI _ui;
         // private DressUpObj _dressUpData = new DressUpObj();
@@ -205,12 +205,12 @@ namespace GFGGame
         }
         private void GoBackToView()
         {
-
             _roleData.itemList = _itemList;
             FightDataManager.Instance.SetItemScoreList(_roleData);
             ScoreSystemData.Instance.SetEquipScoresWithPartId(_roleData);
             //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, "" });
+            this.Hide();
         }
         private void OnBtnFightScoreRule()
         {

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/InstanceZones/InstanceZonesUIView.cs

@@ -143,7 +143,7 @@ namespace GFGGame
                 return;
             }
 
-            ViewManager.Show<ArenaView>(null, new object[] { typeof(MainUIView).FullName, this.viewData }, true);
+            ViewManager.Show<ArenaView>(this.viewData);
             ViewManager.Show<ArenaLoadingView>();
         }
 

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterListView.cs

@@ -324,7 +324,7 @@ namespace GFGGame
              || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_1) <= 0
              || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_2) <= 0
              //|| GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_3) <= 0
-             || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_4) <= 0
+             //|| GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_4) <= 0
              || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_5) <= 0
              || GuideDataManager.IsGuideFinish(ConstGuideId.ARENA_OPEN) <= 0
              || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_FILING) <= 0)
@@ -345,7 +345,7 @@ namespace GFGGame
             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_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_4, 3, "", 1, true, _ui.target.height / 2);
             //GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER_5, 3, "", 1, true, _ui.target.height / 2);
             GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.STUDIO_PORCELAIN, 1, "点击返回主界面。");
             GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.STUDIO_FILING, 1, "点击返回主界面。");

+ 4 - 4
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterView.cs

@@ -506,8 +506,8 @@ namespace GFGGame
             //bool isGuide8 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.ENTER_CHAPTER_3, 3, "来继续我们的旅程吧。");
             //GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_3, 3);
 
-            bool isGuide10 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.ENTER_CHAPTER_4, 4, "来继续我们的旅程吧。");
-            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_4, 4);
+            bool isGuide10 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.ENTER_CHAPTER_4, 2, "来继续我们的旅程吧。");
+            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_4, 2);
 
             bool isGuide11 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.ENTER_CHAPTER_5, 3, "来继续我们的旅程吧。");
             GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_5, 3);
@@ -535,8 +535,8 @@ namespace GFGGame
             //GuideController.TryCompleteGuideIndex(ConstGuideId.ENTER_CHAPTER_3, 3);
             //GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_3, 3);
             // GuideCfg cfg4 = GuideCfgArray.Instance.GetCfg(ConstGuideId.ENTER_CHAPTER_4);
-            GuideController.TryCompleteGuideIndex(ConstGuideId.ENTER_CHAPTER_4, 4);
-            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_4, 4);
+            GuideController.TryCompleteGuideIndex(ConstGuideId.ENTER_CHAPTER_4, 2);
+            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_4, 2);
             // GuideCfg cfg5 = GuideCfgArray.Instance.GetCfg(ConstGuideId.ENTER_CHAPTER_5);
             //GuideController.TryCompleteGuideIndex(ConstGuideId.ENTER_CHAPTER_5, 4);
             GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_5, 3);

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -990,7 +990,7 @@ namespace GFGGame
 
             GuideController.TryGuide(_ui.m_btnMain.target, ConstGuideId.ENTER_CHAPTER_2, 2, "", -1, false);
             //GuideController.TryGuide(_ui.m_btnMain.target, ConstGuideId.ENTER_CHAPTER_3, 1, "", -1, false);
-            GuideController.TryGuide(_ui.m_btnMain.target, ConstGuideId.ENTER_CHAPTER_4, 2, "", -1, false);
+            GuideController.TryGuide(_ui.m_btnMain.target, ConstGuideId.ENTER_CHAPTER_4, 1, "", -1, false);
 
             GuideController.TryGuide(_ui.m_btnCiPai.target, ConstGuideId.UP_CARD_STAR, 2, "“词牌”可进行升星。", -1, false);
 

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/Studio/StudioView.cs

@@ -132,7 +132,7 @@ namespace GFGGame
         private void CheckGuide(object param)
         {
             if (GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_PORCELAIN) <= 0
-            || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_4) <= 0
+            //|| GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_4) <= 0
             || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_PROPERTY) <= 0
             || GuideDataManager.IsGuideFinish(ConstGuideId.ENTER_CHAPTER_2) <= 0
             || GuideDataManager.IsGuideFinish(ConstGuideId.STUDIO_FILING) <= 0)
@@ -157,7 +157,7 @@ namespace GFGGame
 
             GuideController.TryGuide(_ui.m_comProperty.target, ConstGuideId.STUDIO_PROPERTY, 3, "");
 
-            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.ENTER_CHAPTER_4, 1, "");
+            //GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.ENTER_CHAPTER_4, 1, "");
         }
 
         protected override void TryCompleteGuide()