Jelajahi Sumber

增加参数isReturnView 判断保存打开窗口数据,处理窗口是否可以返回问题

huangxiaoyue 1 tahun lalu
induk
melakukan
280761bead
93 mengubah file dengan 206 tambahan dan 134 penghapusan
  1. 2 0
      GameClient/Assets/Game/HotUpdate/Views/ActivityDay7/ActivityDay7View.cs
  2. 1 0
      GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxView.cs
  3. 1 0
      GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaDressInfoView.cs
  4. 1 0
      GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaLoadingView.cs
  5. 1 0
      GameClient/Assets/Game/HotUpdate/Views/Arena/ArenaView.cs
  6. 1 0
      GameClient/Assets/Game/HotUpdate/Views/Bag/BagView.cs
  7. 1 0
      GameClient/Assets/Game/HotUpdate/Views/Card/CardDetailView.cs
  8. 1 0
      GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs
  9. 1 0
      GameClient/Assets/Game/HotUpdate/Views/Card/CardView.cs
  10. 2 0
      GameClient/Assets/Game/HotUpdate/Views/ClothingDecompose/ClothingDecomposeView.cs
  11. 1 0
      GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingListView.cs
  12. 1 0
      GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingView.cs
  13. 2 2
      GameClient/Assets/Game/HotUpdate/Views/ClothingShop/ClothingShopView.cs
  14. 1 0
      GameClient/Assets/Game/HotUpdate/Views/ClothingShop/GalleryShopView.cs
  15. 1 0
      GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs
  16. 1 0
      GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/SuitSyntheticView.cs
  17. 2 1
      GameClient/Assets/Game/HotUpdate/Views/Common/Alert/AlertWindow.cs
  18. 1 0
      GameClient/Assets/Game/HotUpdate/Views/Common/ModalStatusView.cs
  19. 2 2
      GameClient/Assets/Game/HotUpdate/Views/CommonGame/ApproachView.cs
  20. 2 2
      GameClient/Assets/Game/HotUpdate/Views/CommonGame/BuyCountView.cs
  21. 1 0
      GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailyWelfareView.cs
  22. 1 0
      GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/LimitChargeView.cs
  23. 1 0
      GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/NewLimitChargeView.cs
  24. 1 0
      GameClient/Assets/Game/HotUpdate/Views/DressUp/ArenaDressUpFightView.cs
  25. 2 1
      GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs
  26. 2 0
      GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpView.cs
  27. 1 0
      GameClient/Assets/Game/HotUpdate/Views/DressUp/PhotographSaveView.cs
  28. 1 0
      GameClient/Assets/Game/HotUpdate/Views/DressUp/PhotographView.cs
  29. 1 0
      GameClient/Assets/Game/HotUpdate/Views/Field/FieldView.cs
  30. 1 0
      GameClient/Assets/Game/HotUpdate/Views/FieldGuide/CardGuideView.cs
  31. 1 0
      GameClient/Assets/Game/HotUpdate/Views/FieldGuide/ChapterItemGuideView.cs
  32. 1 0
      GameClient/Assets/Game/HotUpdate/Views/FieldGuide/ChapterItemShowView.cs
  33. 1 0
      GameClient/Assets/Game/HotUpdate/Views/FieldGuide/DressUpGuideView.cs
  34. 2 3
      GameClient/Assets/Game/HotUpdate/Views/FieldGuide/FieldGuideView.cs
  35. 2 0
      GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitGuideDetailView.cs
  36. 1 1
      GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitGuideView.cs
  37. 1 0
      GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitShowView.cs
  38. 1 0
      GameClient/Assets/Game/HotUpdate/Views/FieldGuide/TravelGuideView.cs
  39. 2 1
      GameClient/Assets/Game/HotUpdate/Views/FieldGuide/TravelShowView.cs
  40. 2 0
      GameClient/Assets/Game/HotUpdate/Views/Friend/FriendView.cs
  41. 1 0
      GameClient/Assets/Game/HotUpdate/Views/Guide/GuideView.cs
  42. 1 0
      GameClient/Assets/Game/HotUpdate/Views/IUIView.cs
  43. 1 1
      GameClient/Assets/Game/HotUpdate/Views/League/LeagueAnsweringView.cs
  44. 1 0
      GameClient/Assets/Game/HotUpdate/Views/League/LeagueChatView.cs
  45. 1 0
      GameClient/Assets/Game/HotUpdate/Views/League/LeagueGiftView.cs
  46. 1 0
      GameClient/Assets/Game/HotUpdate/Views/League/LeagueJoinView.cs
  47. 1 0
      GameClient/Assets/Game/HotUpdate/Views/League/LeagueMemberView.cs
  48. 1 0
      GameClient/Assets/Game/HotUpdate/Views/League/LeagueSkillUpView.cs
  49. 1 0
      GameClient/Assets/Game/HotUpdate/Views/League/LeagueSkillView.cs
  50. 1 0
      GameClient/Assets/Game/HotUpdate/Views/League/LeagueTeaPartyOverView.cs
  51. 1 0
      GameClient/Assets/Game/HotUpdate/Views/League/LeagueTeaPartyShowView.cs
  52. 1 0
      GameClient/Assets/Game/HotUpdate/Views/League/LeagueTeaPartyView.cs
  53. 1 0
      GameClient/Assets/Game/HotUpdate/Views/League/LeagueView.cs
  54. 1 0
      GameClient/Assets/Game/HotUpdate/Views/Loading/LoadingView.cs
  55. 1 0
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxActivityView.cs
  56. 1 1
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxPreShowView.cs
  57. 2 0
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs
  58. 1 1
      GameClient/Assets/Game/HotUpdate/Views/MainStory/ArenaFightResultView.cs
  59. 1 0
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterListView.cs
  60. 1 1
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterView.cs
  61. 1 0
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryDialogView.cs
  62. 1 0
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs
  63. 1 0
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleView.cs
  64. 1 0
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs
  65. 1 0
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetView.cs
  66. 1 0
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryLevelInfoView.cs
  67. 1 0
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StroyFightResultView.cs
  68. 1 0
      GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs
  69. 1 1
      GameClient/Assets/Game/HotUpdate/Views/Notice/NoticeActivityShowView.cs
  70. 1 0
      GameClient/Assets/Game/HotUpdate/Views/Poem/PoemGalleryPreviewView.cs
  71. 2 1
      GameClient/Assets/Game/HotUpdate/Views/Poem/PoemGalleryView.cs
  72. 1 0
      GameClient/Assets/Game/HotUpdate/Views/Poem/PoemPhotoPreView.cs
  73. 1 0
      GameClient/Assets/Game/HotUpdate/Views/Poem/PoemPhotoShareView.cs
  74. 1 0
      GameClient/Assets/Game/HotUpdate/Views/Poem/PoemPhotoView.cs
  75. 1 0
      GameClient/Assets/Game/HotUpdate/Views/Poem/PoemView.cs
  76. 1 0
      GameClient/Assets/Game/HotUpdate/Views/PopWindow/ExchangeGoodsView.cs
  77. 1 1
      GameClient/Assets/Game/HotUpdate/Views/RoleInfo/OtherRoleInfoView.cs
  78. 1 0
      GameClient/Assets/Game/HotUpdate/Views/RoleInfo/PersonalPhotoView.cs
  79. 2 3
      GameClient/Assets/Game/HotUpdate/Views/RoleInfo/RoleInfoView.cs
  80. 4 3
      GameClient/Assets/Game/HotUpdate/Views/Store/StoreView.cs
  81. 1 0
      GameClient/Assets/Game/HotUpdate/Views/Studio/StudioBaseView.cs
  82. 1 0
      GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFilingNpcView.cs
  83. 3 2
      GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFilingView.cs
  84. 1 0
      GameClient/Assets/Game/HotUpdate/Views/Studio/StudioView.cs
  85. 1 0
      GameClient/Assets/Game/HotUpdate/Views/Task/BattlePassTaskView.cs
  86. 4 2
      GameClient/Assets/Game/HotUpdate/Views/Task/TaskAchieveDetailView.cs
  87. 4 2
      GameClient/Assets/Game/HotUpdate/Views/Task/TaskAchieveView.cs
  88. 4 2
      GameClient/Assets/Game/HotUpdate/Views/Task/TaskView.cs
  89. 1 0
      GameClient/Assets/Game/HotUpdate/Views/Travel/TravelRewardView.cs
  90. 2 1
      GameClient/Assets/Game/HotUpdate/Views/Travel/TravelView.cs
  91. 5 0
      GameClient/Assets/Game/HotUpdate/Views/UIView.cs
  92. 79 98
      GameClient/Assets/Game/HotUpdate/Views/ViewManager.cs
  93. 2 1
      GameClient/Assets/Game/HotUpdate/Views/XiuFang/XiuFangView.cs

+ 2 - 0
GameClient/Assets/Game/HotUpdate/Views/ActivityDay7/ActivityDay7View.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxView.cs

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

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

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

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

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

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

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/Bag/BagView.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/Card/CardDetailView.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/Card/CardView.cs

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

+ 2 - 0
GameClient/Assets/Game/HotUpdate/Views/ClothingDecompose/ClothingDecomposeView.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingListView.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingView.cs

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

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/ClothingShop/ClothingShopView.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/ClothingShop/GalleryShopView.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/SuitSyntheticView.cs

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

+ 2 - 1
GameClient/Assets/Game/HotUpdate/Views/Common/Alert/AlertWindow.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/Common/ModalStatusView.cs

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

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/CommonGame/ApproachView.cs

@@ -167,7 +167,7 @@ namespace GFGGame
                     //     isJump = false;
                     //     break;
                     // }
-                    isJump = ViewManager.Show<ClothingShopView>(new object[] { shopId, null, _itemId, needCount }, _fromViewDatas, true, true);
+                    isJump = ViewManager.Show<ClothingShopView>(new object[] { shopId, null, _itemId, needCount }, _fromViewDatas, false, true);
                     break;
                 case ConstFunctionId.FU_ZHUANG_DECOMPOSE:
                     // this.Hide();
@@ -274,7 +274,7 @@ namespace GFGGame
                             //从战斗换装必需品来源跳转到剧情界面,在剧情界面点返回后直接返回章节界面,无需返回换装界面
                             _fromViewDatas = null;
                         }
-                        isJump = ViewManager.Show<StoryChapterView>(levelCfg.chapterId, _fromViewDatas, true);
+                        isJump = ViewManager.Show<StoryChapterView>(levelCfg.chapterId, _fromViewDatas, false);
                         StoryController.ShowLevelView(levelCfgId, _itemId, _needCount);
                         break;
                     }

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/CommonGame/BuyCountView.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailyWelfareView.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/LimitChargeView.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/NewLimitChargeView.cs

@@ -52,6 +52,7 @@ namespace GFGGame
             _ui = UI_NewLimitChargeUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
             this.clickBlankToClose = false;
             this.bringToFontOnClick = false;
 

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

@@ -59,6 +59,7 @@ namespace GFGGame
             _ui = UI_ArenaDressUpFightUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
             _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneArenaDressUpFight"));
         }
 

+ 2 - 1
GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -68,6 +68,7 @@ namespace GFGGame
             _ui = UI_DressUpFightUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
+            //isReturnView = true;
             _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneDressUpFight"));
             _ui.m_btnClose.width = GRoot.inst.width;
             _ui.m_btnClose.height = GRoot.inst.height;
@@ -333,7 +334,6 @@ namespace GFGGame
                 ViewManager.Show<StoryChapterView>(_levelCfg.chapterId);//, new object[] { typeof(StoryChapterListView).FullName}
             }
             //MyDressUpHelper.dressUpObj.TakeOffAll();
-
             this.Hide();
         }
 
@@ -356,6 +356,7 @@ namespace GFGGame
                     ChangeTeapartyDressup();
                 });
             }
+           
 
         //ViewManager.Show<StoryChapterView>(StoryDataManager.currentChapter);
     }

+ 2 - 0
GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpView.cs

@@ -63,6 +63,8 @@ namespace GFGGame
             _ui = UI_DressUpUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
+
             _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneDressUp"));
         }
 

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/DressUp/PhotographSaveView.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/DressUp/PhotographView.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/Field/FieldView.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/FieldGuide/CardGuideView.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/FieldGuide/ChapterItemGuideView.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/FieldGuide/ChapterItemShowView.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/FieldGuide/DressUpGuideView.cs

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

+ 2 - 3
GameClient/Assets/Game/HotUpdate/Views/FieldGuide/FieldGuideView.cs

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

+ 2 - 0
GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitGuideDetailView.cs

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

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitGuideView.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitShowView.cs

@@ -42,6 +42,7 @@ namespace GFGGame
             _ui = UI_SuitShowUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
             this.clickBlankToClose = false;
 
             _dressUpObjUI = new DressUpObjUI("SceneDressUp");

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/FieldGuide/TravelGuideView.cs

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

+ 2 - 1
GameClient/Assets/Game/HotUpdate/Views/FieldGuide/TravelShowView.cs

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

+ 2 - 0
GameClient/Assets/Game/HotUpdate/Views/Friend/FriendView.cs

@@ -44,6 +44,8 @@ namespace GFGGame
             _ui = UI_FriendUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
+
             _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneFriend"));
             _dressUpObj = new DressUpObj();
 

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/Guide/GuideView.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/IUIView.cs

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

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/League/LeagueAnsweringView.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/League/LeagueChatView.cs

@@ -28,6 +28,7 @@ namespace GFGGame
             _ui = UI_LeagueChatUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
 
             _ui.m_loaBg.onClick.Add(Hide);
             _ui.m_list.itemRenderer = RenderListItem;

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/League/LeagueGiftView.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/League/LeagueJoinView.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/League/LeagueMemberView.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/League/LeagueSkillUpView.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/League/LeagueSkillView.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/League/LeagueTeaPartyOverView.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/League/LeagueTeaPartyShowView.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/League/LeagueTeaPartyView.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/League/LeagueView.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/Loading/LoadingView.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxActivityView.cs

@@ -46,6 +46,7 @@ namespace GFGGame
             _ui = UI_LuckyBoxActivityUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
 
             _valueBarController = new ValueBarController(_ui.m_valueBar);
             _luckyBoxCtrl = new LuckyBoxController(_ui.m_comBox.m_comModel.target);

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxPreShowView.cs

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

+ 2 - 0
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs

@@ -67,6 +67,7 @@ namespace GFGGame
             _ui = UI_LuckyBoxUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
 
             _dressUpObjUIXiHe = new DressUpObjUI("SceneDressUp");
             _dressUpObjUIChangXi = new DressUpObjUI("SceneDressUp");
@@ -576,6 +577,7 @@ namespace GFGGame
         private void OnClickBtnBack()
         {
             Reset();
+            //this.Hide();
             ViewManager.GoBackFrom(typeof(LuckyBoxView).FullName);
         }
 

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/MainStory/ArenaFightResultView.cs

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

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

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

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

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryDialogView.cs

@@ -77,6 +77,7 @@ namespace GFGGame
             _ui = UI_StoryDialogUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
 
             _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneStoryDialog"));
         }

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleView.cs

@@ -31,6 +31,7 @@ namespace GFGGame
             _ui = UI_StoryFightSingleUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
+            //isReturnView = true;
 
             _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneFightSingle"));
         }

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetView.cs

@@ -46,6 +46,7 @@ namespace GFGGame
             _ui = UI_StoryFightTargetUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
+            //isReturnView = true;
 
             _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneFightTarget"));
         }

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryLevelInfoView.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/MainStory/StroyFightResultView.cs

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

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

@@ -80,6 +80,7 @@ namespace GFGGame
             _ui = UI_MainUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
             _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneMain"));
         }
 

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Notice/NoticeActivityShowView.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/Poem/PoemGalleryPreviewView.cs

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

+ 2 - 1
GameClient/Assets/Game/HotUpdate/Views/Poem/PoemGalleryView.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/Poem/PoemPhotoPreView.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/Poem/PoemPhotoShareView.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/Poem/PoemPhotoView.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/Poem/PoemView.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/PopWindow/ExchangeGoodsView.cs

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

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/RoleInfo/OtherRoleInfoView.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/RoleInfo/PersonalPhotoView.cs

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

+ 2 - 3
GameClient/Assets/Game/HotUpdate/Views/RoleInfo/RoleInfoView.cs

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

+ 4 - 3
GameClient/Assets/Game/HotUpdate/Views/Store/StoreView.cs

@@ -38,10 +38,10 @@ namespace GFGGame
             _ui = UI_StoreUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
             this.bringToFontOnClick = false;
 
-
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("sc_beijing");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("bg_fhl");
 
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_comTab.m_c1.onChanged.Add(OnTabChange);
@@ -105,7 +105,7 @@ namespace GFGGame
         {
             ViewManager.Hide(_curViewName);
             this.Hide();
-            ViewManager.GoBackFrom(typeof(StoreView).FullName);
+            //ViewManager.GoBackFrom(typeof(StoreView).FullName);
         }
 
         private void OnTabChange()
@@ -195,6 +195,7 @@ namespace GFGGame
                 _ui.m_listSubTab.selectedIndex = _curSubTabIndex;
                 return;
             }
+
             ViewManager.Hide(_curViewName);
             if (!string.IsNullOrEmpty(viewName) && viewName != "“”")
             {

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/Studio/StudioBaseView.cs

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/Studio/StudioFilingNpcView.cs

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

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

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

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

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

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/Task/BattlePassTaskView.cs

@@ -30,6 +30,7 @@ namespace GFGGame
             _ui = UI_BattlePassRewardUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
             clickBlankToClose = false;
             _ui.m_btnOpen.onClick.Add(OnBtnOpenClick);
             _ui.m_btnBuyLevel.onClick.Add(OnBtnBuyLevel);

+ 4 - 2
GameClient/Assets/Game/HotUpdate/Views/Task/TaskAchieveDetailView.cs

@@ -30,6 +30,7 @@ namespace GFGGame
             _ui = UI_TaskAchieveDetailUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("chengjiu_bg");
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _ui.m_listAchieveTask.itemRenderer = RenderListAchieveTask;
@@ -37,8 +38,9 @@ namespace GFGGame
 
         private void OnBtnBackClick()
         {
-            ViewManager.Hide<TaskAchieveDetailView>();
-            ViewManager.Show<TaskAchieveView>();
+            this.Hide();
+            //ViewManager.Hide<TaskAchieveDetailView>();
+            //ViewManager.Show<TaskAchieveView>();
         }
 
         protected override void AddEventListener()

+ 4 - 2
GameClient/Assets/Game/HotUpdate/Views/Task/TaskAchieveView.cs

@@ -25,6 +25,7 @@ namespace GFGGame
             _ui = UI_TaskAchieveUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("chengjiu_bg");
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _ui.m_listAchieveItem.itemRenderer = RenderListAchieveItem;
@@ -33,8 +34,9 @@ namespace GFGGame
 
         private void OnBtnBackClick()
         {
-            ViewManager.Hide<TaskAchieveView>();
-            ViewManager.Show<TaskView>();
+            //ViewManager.Hide<TaskAchieveView>();
+            //ViewManager.Show<TaskView>();
+            this.Hide();
         }
 
         private void OnClickListRarityItem(EventContext context)

+ 4 - 2
GameClient/Assets/Game/HotUpdate/Views/Task/TaskView.cs

@@ -31,6 +31,7 @@ namespace GFGGame
             _ui = UI_TaskUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
             bringToFontOnClick = false;
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("quanping_moren_bg");
@@ -42,15 +43,16 @@ namespace GFGGame
         private void OnBtnBackClick()
         {
             ViewManager.Hide<CombTaskController>();
+            this.Hide();
             //ViewManager.Hide<BattlePassTaskView>();
-            ViewManager.GoBackFrom(typeof(TaskView).FullName);
+            //ViewManager.GoBackFrom(typeof(TaskView).FullName);
         }
 
         private void OnBtnAchieveClick()
         {
             ViewManager.Show<TaskAchieveView>();
         }
-            
+
         protected override void AddEventListener()
         {
             base.AddEventListener();

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Views/Travel/TravelRewardView.cs

@@ -28,6 +28,7 @@ namespace GFGGame
             _ui = UI_TravelRewardUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
 
             _ui.m_list.itemRenderer = RenderListItem;
             _ui.m_list.onClickItem.Add(OnListItemClick);

+ 2 - 1
GameClient/Assets/Game/HotUpdate/Views/Travel/TravelView.cs

@@ -33,7 +33,8 @@ namespace GFGGame
             packageName = UI_TravelUI.PACKAGE_NAME;
             _ui = UI_TravelUI.Create();
             this.viewCom = _ui.target;
-            isfullScreen = true;
+            isfullScreen = true; 
+            isReturnView = true;
 
             _valueBarController = new ValueBarController(_ui.m_comValueBar);
 

+ 5 - 0
GameClient/Assets/Game/HotUpdate/Views/UIView.cs

@@ -30,6 +30,10 @@ namespace GFGGame
         /// </summary>
         public bool isfullScreen { get; set; }
         /// <summary>
+        /// 设置是否可以返回界面
+        /// </summary>
+        public bool isReturnView { get; set; }
+        /// <summary>
         /// FairyGUI包名
         /// </summary>
         public string packageName
@@ -135,6 +139,7 @@ namespace GFGGame
             // UIPackageManager.Instance.AddCloseTime(_descFilePath);
             closeTime = TimeHelper.ClientNowSeconds();
             DoHideAnimation();
+            ViewManager.HideWin(this.viewName);
         }
 
         virtual protected void OnShown()

+ 79 - 98
GameClient/Assets/Game/HotUpdate/Views/ViewManager.cs

@@ -7,12 +7,19 @@ using ET;
 
 namespace GFGGame
 {
+    public class ViewStructure
+    {
+        public string name;
+        public object viewData;
+        public IUIView iUIView;
+    }
     /// <summary>
     /// 视图管理类
     /// 管理视图的显示、隐藏
     /// </summary>
     public class ViewManager
     {
+        private static List<ViewStructure> _viewStack;
         private static Dictionary<string, IUIView> _viewDic;
         private static GComponent _bottomLayer;
         private static GComponent _topLayer;
@@ -53,8 +60,13 @@ namespace GFGGame
             UIConfig.bringWindowToFrontOnClick = false;
 
             _viewDic = new Dictionary<string, IUIView>();
+
+            _viewStack = new List<ViewStructure>();
+
             //初始化视图层容器
             _bottomLayer = CreateLayer("BottomLayer");
+            //_bottomLayer.sortingOrder = ConstSortingOrder.Bottom;
+
             _topLayer = CreateLayer("TopLayer");
             _topLayer.sortingOrder = ConstSortingOrder.TOP;
 
@@ -121,6 +133,11 @@ 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;
@@ -135,6 +152,7 @@ namespace GFGGame
                 obj.viewName = name;
                 _viewDic.Add(name, obj);
             }
+
             if (obj != null)
             {
                 IUIView view = (IUIView)obj;
@@ -147,26 +165,28 @@ namespace GFGGame
                 {
                     view.Refresh();
                 }
-                if (resetGobackParams)
-                {
-                    if (_goBackDatas.ContainsKey(name) == true)
-                    {
-                        _goBackDatas.Remove(name);
-                    }
-                }
-                if (goBackParams != null)
-                {
-                    if (!_goBackDatas.ContainsKey(name))
-                    {
-                        _goBackDatas.Add(name, new List<object[]>());
-                    }
-
-                    _goBackDatas[name].Add(goBackParams);
-                }
                 Debug.Log("当前打开:" + name);
             }
-            return true;
 
+            if (name == "MainUIView")
+            {
+                _viewStack.Clear();
+            }
+
+            //判断是否需要保存界面数据, 会帮助关闭上一个保存界面
+            if (obj.isReturnView && (_viewStack.Count <= 0 || (_viewStack.Count > 0 && _viewStack[_viewStack.Count - 1].name != name)))
+            {
+                ViewStructure viewStructure = new ViewStructure();
+                viewStructure.name = name;
+                viewStructure.viewData = viewData;
+                viewStructure.iUIView = obj;
+                _viewStack.Add(viewStructure);
+
+                if (_viewStack.Count > 1)
+                    _viewStack[_viewStack.Count - 2].iUIView.Hide();
+            }
+
+            return true;
         }
 
         public static bool isViewOpen(string fullViewName)
@@ -185,61 +205,41 @@ 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()
         {
             // string[] names = typeof(T).FullName.Split('.');
             // string viewName = names[names.Length - 1];
-            string name = GetName(typeof(T).FullName);
+            //string name = GetName(typeof(T).FullName);
+            return ViewManager.Show(typeof(T).FullName, viewData, null, hideOthers);
+        }
 
-            if (!GameGlobal.skipCheckOpen && !FunctionOpenDataManager.Instance.CheckIsFunOpenById(name))
-            {
-                return false;
-            }
-            if (hideOthers)
-            {
-                HideAllView(name);
-            }
-            IUIView obj = null;
-            if (_viewDic.ContainsKey(name))
-            {
-                obj = _viewDic[name];
-            }
-            else
-            {
-                obj = new T() as IUIView;
-                obj.viewName = name;
-                _viewDic.Add(name, obj);
-            }
-            if (obj != null)
-            {
-                IUIView view = (IUIView)obj;
-                view.viewData = viewData;
-                if (!view.isShowing)
-                {
-                    view.Show();
-                }
-                else
-                {
-                    view.Refresh();
-                }
-                if (goBackParams != null)
-                {
-                    if (!_goBackDatas.ContainsKey(name))
-                    {
-                        _goBackDatas.Add(name, new List<object[]>());
-                    }
-                    _goBackDatas[name].Add(goBackParams);
-                }
-                else if (resetGobackParams)
+        public static void HideWin(string viewName)
+        {
+            if (_viewStack.Count > 1) {
+                ViewStructure viewStructure = _viewStack[_viewStack.Count - 1];
+                if (viewStructure.iUIView.isReturnView && viewStructure.name == viewName)
                 {
-                    if (_goBackDatas.ContainsKey(name) == true)
+                    _viewStack.RemoveAt(_viewStack.Count - 1);
+                    if (_viewStack.Count >= 1)
                     {
-                        _goBackDatas.Remove(name);
+                        viewStructure = _viewStack[_viewStack.Count - 1];
+                        ViewManager.Show($"GFGGame.{viewStructure.name}", viewStructure.viewData);
+
+                        foreach (var objName in _viewDic.Keys)
+                        {
+                            if (objName != viewStructure.name)
+                            {
+                                IUIView view = (IUIView)_viewDic[objName];
+                                if (view.isShowing)
+                                {
+                                    view.Show();
+                                }
+                            }
+                        }
                     }
                 }
-                Debug.Log("当前打开:" + name);
             }
-            return true;
         }
 
         public static void Hide(string fullViewName)
@@ -249,8 +249,8 @@ namespace GFGGame
             {
                 return;
             }
-            IUIView obj = _viewDic[name];
-            if (obj != null && obj.isShowing)
+            object obj = _viewDic[name];
+            if (obj != null)
             {
                 IUIView view = (IUIView)obj;
                 view.Hide();
@@ -260,54 +260,35 @@ namespace GFGGame
 
         public static void Hide<T>()
         {
-            string name = GetName(typeof(T).FullName);
-            if (!_viewDic.ContainsKey(name))
-            {
-                return;
-            }
-            object obj = _viewDic[name];
-            if (obj != null)
-            {
-                IUIView view = (IUIView)obj;
-                view.Hide();
-                Debug.Log("当前关闭:" + name);
-            }
+            //string name = GetName(typeof(T).FullName);
+            Hide(typeof(T).FullName);
         }
 
         public static void GoBackFrom(string fullViewName, bool hideOther = true)
         {
             string name = GetName(fullViewName);
             ViewManager.Hide(name);
-            if (_goBackDatas.ContainsKey(name) && _goBackDatas[name].Count > 0)
-            {
-                List<object[]> goBackdatas = _goBackDatas[name];
-                object[] gobackItems = goBackdatas[goBackdatas.Count - 1];
-                string tViewName = gobackItems[0] as string;
 
-                object tViewData = null;
-                if (gobackItems.Length > 1)
+            foreach (var info in _viewDic.Keys)
+            {
+                IUIView objIsShowing = _viewDic[info];
+                if (objIsShowing != null && objIsShowing.isShowing)
                 {
-                    tViewData = gobackItems[1];
+                    return;
                 }
-                ViewManager.Show(tViewName, tViewData);
-                _goBackDatas[name].RemoveAt(goBackdatas.Count - 1);
-            }
-            else
-            {
-                MainDataManager.Instance.ViewType = 0;
-
-                ViewManager.Show<MainUIView>(null, null, hideOther);
             }
+            MainDataManager.Instance.ViewType = 0;
+            ViewManager.Show<MainUIView>(null, null, true);
         }
 
         public static object[] GetGoBackDatas(string fullViewName)
         {
-            string name = GetName(fullViewName);
+            //string name = GetName(fullViewName);
             object[] value = null;
-            if (_goBackDatas.ContainsKey(name) && _goBackDatas[name].Count > 0)
-            {
-                value = _goBackDatas[name][_goBackDatas[name].Count - 1];
-            }
+            //if (_goBackDatas.ContainsKey(name) && _goBackDatas[name].Count > 0)
+            //{
+            //    value = _goBackDatas[name][_goBackDatas[name].Count - 1];
+            //}
             return value;
         }
         public static IUIView GetUIView(string viewName)
@@ -424,7 +405,7 @@ namespace GFGGame
         /// 任务界面跳转
         /// </summary>
         /// <param name="jumpId"></param>
-        public static void JumpToView(string jumpId, object[] param, object[] goBackDatas, bool hideOther = true, Action onSuccess = null)
+        public static void JumpToView(string jumpId, object[] param, object[] goBackDatas, bool hideOther = false, Action onSuccess = null)
         {
             switch (jumpId)
             {

+ 2 - 1
GameClient/Assets/Game/HotUpdate/Views/XiuFang/XiuFangView.cs

@@ -28,6 +28,7 @@ namespace GFGGame
             _ui = UI_XiuFangUI.Create();
             this.viewCom = _ui.target;
             isfullScreen = true;
+            isReturnView = true;
 
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_component.m_btnClothingShop.target.onClick.Add(OnClickBtnClothingShop);
@@ -82,7 +83,7 @@ namespace GFGGame
         private void OnClickBtnClothingShop()
         {
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.FU_ZHUANG_DIAN, 1);
-            ViewManager.Show<ClothingShopView>(null, new object[] { typeof(XiuFangView).FullName, this.viewData }, true, true);
+            ViewManager.Show<ClothingShopView>(null, new object[] { typeof(XiuFangView).FullName, this.viewData }, false, true);
         }
 
         private void OnClickBtnSuitSynthetic()