zhaoyang 3 роки тому
батько
коміт
3860dc99c7

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

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

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

@@ -95,7 +95,7 @@ namespace GFGGame
         private void OnListMaterialsItem(EventContext context)
         {
             int itemId = (int)(context.data as GComponent).data;
-            ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { itemId, new object[] { typeof(ClothingView).Name, ( this.viewData as object[])[4]  }
+            ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { itemId, new object[] { typeof(ClothingView).FullName, ( this.viewData as object[])[4]  }
     });
         }
 

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

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

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/CommonGame/ApproachOfItemView.cs

@@ -227,7 +227,7 @@ namespace GFGGame
                         string viewName = "GFGGame." + studioCfg.funId;
 
                         ViewManager.Show(viewName, new object[] { type, 0 }, _fromeViewDatas);
-                        StudioDataManager.Instance.VIEW_NAME = studioCfg.funId; ;
+                        StudioDataManager.Instance.VIEW_NAME = viewName;
                         InstanceZonesController.ShowLevelView(levelCfgId, StudioDataManager.Instance.OnFinishStoryLevel);
                         isJump = true;
                         break;

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

@@ -66,6 +66,7 @@ namespace GFGGame
             _ui.m_ComFunctionOpen.m_txtName.text = cfg.name;
             _ui.m_ComFunctionOpen.m_logIcon.url = ResPathUtil.GetCommonGameResPath(cfg.res);
             _funList.RemoveAt(0);
+            ET.Log.Debug("zoya:" + _funList.Count);
             _ui.m_t0.Play(UpdateFunIcon);
         }
 

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/DailyTask/DailyTaskView.cs

@@ -177,7 +177,7 @@ namespace GFGGame
 
         private void OnBtnBackClick()
         {
-            ViewManager.GoBackFrom(typeof(DailyTaskView).Name);
+            ViewManager.GoBackFrom(typeof(DailyTaskView).FullName);
         }
         private async void OnBtnGetAllClick()
         {

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

@@ -163,7 +163,7 @@ namespace GFGGame
         {
             LogServerHelper.SendNodeLog((int)PlayParticipationEnum.TIAN_YE_DIAO_CHA, 2);
             int curLevelId = StoryLevelCfgArray.Instance.GetCfgs(_curCfg.type, 0, _curCfg.id)[0].id;
-            ViewManager.Show(ViewName.DRESS_UP_FIGHT_VIEW, curLevelId, new object[] { typeof(FieldView).Name, this.viewData }, true);
+            ViewManager.Show(ViewName.DRESS_UP_FIGHT_VIEW, curLevelId, new object[] { typeof(FieldView).FullName, this.viewData }, true);
             InstanceZonesDataManager.currentLevelCfgId = curLevelId;
         }
         private void OnBtnTaskClick()

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

@@ -66,7 +66,7 @@ namespace GFGGame
                 GameObject.Destroy(_sceneObject);
                 _sceneObject = null;
             }
-            ViewManager.GoBackFrom(typeof(FriendView).Name);
+            ViewManager.GoBackFrom(typeof(FriendView).FullName);
         }
     }
 }

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

@@ -154,7 +154,7 @@ namespace GFGGame
         private void OnClickBtnBack()
         {
             // this.Hide();
-            ViewManager.GoBackFrom(typeof(StoryDialogView).Name);
+            ViewManager.GoBackFrom(typeof(StoryDialogView).FullName);
             // Over(false);
         }
 

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

@@ -122,7 +122,7 @@ namespace GFGGame
             InstanceZonesDataManager.GetCanFightTime(_type, _storyType, _levelID, out int times, out string title);
             if (times > 0)
             {
-                ViewManager.Show(ViewName.STORY_FIGHT_QUICKLY_VIEW, 1, new object[] { typeof(StoryLevelInfoView).Name, this.viewData });
+                ViewManager.Show(ViewName.STORY_FIGHT_QUICKLY_VIEW, 1, new object[] { typeof(StoryLevelInfoView).FullName, this.viewData });
                 this.Hide();
             }
             else
@@ -168,13 +168,13 @@ namespace GFGGame
                 }
                 else
                 {
-                    ViewManager.Show(ViewName.STORY_FIGHT_QUICKLY_VIEW, times, new object[] { typeof(StoryLevelInfoView).Name, this.viewData });
+                    ViewManager.Show(ViewName.STORY_FIGHT_QUICKLY_VIEW, times, new object[] { typeof(StoryLevelInfoView).FullName, this.viewData });
                     this.Hide();
                 }
             }
             else
             {
-                ViewManager.Show(ViewName.STORY_FIGHT_QUICKLY_VIEW, times, new object[] { typeof(StoryLevelInfoView).Name, this.viewData });
+                ViewManager.Show(ViewName.STORY_FIGHT_QUICKLY_VIEW, times, new object[] { typeof(StoryLevelInfoView).FullName, this.viewData });
                 this.Hide();
 
             }

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

@@ -27,8 +27,8 @@ namespace GFGGame
             _ui.m_c1.selectedIndex = this.viewData == null ? 0 : (int)(this.viewData as object[])[0];
             StudioDataManager.Instance.TYPE_SELECT_INDEX = _ui.m_c1.selectedIndex;
             StudioDataManager.Instance.PROPERTY_SELECT_INDEX = 0;
-            StudioDataManager.Instance.VIEW_NAME = typeof(StudioFabricView).Name;
-            this.studioCfg = StudioCfgArray.Instance.GetCfgs(StudioDataManager.Instance.VIEW_NAME)[0];
+            StudioDataManager.Instance.VIEW_NAME = typeof(StudioFabricView).FullName;
+            this.studioCfg = StudioCfgArray.Instance.GetCfgs(typeof(StudioFabricView).Name)[0];
             this.studioData = StudioDataManager.Instance.GetStudioDataById(this.studioCfg.id);
             this.storyLevelCfgs = StoryLevelCfgArray.Instance.GetCfgs(this.studioCfg.type, this.studioCfg.subType, this.studioCfg.id);
             _ui.m_list.numItems = this.storyLevelCfgs.Count;

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

@@ -27,9 +27,9 @@ namespace GFGGame
             _ui.m_c1.selectedIndex = this.viewData == null ? 0 : (int)(this.viewData as object[])[0];
             StudioDataManager.Instance.TYPE_SELECT_INDEX = _ui.m_c1.selectedIndex;
             StudioDataManager.Instance.PROPERTY_SELECT_INDEX = 0;
-            StudioDataManager.Instance.VIEW_NAME = typeof(StudioMetalView).Name;
+            StudioDataManager.Instance.VIEW_NAME = typeof(StudioMetalView).FullName;
 
-            this.studioCfg = StudioCfgArray.Instance.GetCfgs(StudioDataManager.Instance.VIEW_NAME)[0];
+            this.studioCfg = StudioCfgArray.Instance.GetCfgs(typeof(StudioMetalView).Name)[0];
             this.studioData = StudioDataManager.Instance.GetStudioDataById(this.studioCfg.id);
             this.storyLevelCfgs = StoryLevelCfgArray.Instance.GetCfgs(this.studioCfg.type, this.studioCfg.subType, this.studioCfg.id);
             _ui.m_list.numItems = this.storyLevelCfgs.Count;

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

@@ -32,7 +32,7 @@ namespace GFGGame
             _propertySelectIndex = this.viewData == null ? 0 : (int)(this.viewData as object[])[1];
             _ui.m_c1.selectedIndex = _typeSelectIndex;
 
-            StudioDataManager.Instance.VIEW_NAME = typeof(StudioPropertyView).Name;
+            StudioDataManager.Instance.VIEW_NAME = typeof(StudioPropertyView).FullName;
             List<StudioCfg> studioCfgs = StudioCfgArray.Instance.GetCfgs(typeof(StudioPropertyView).Name);
 
             _ui.m_listProperty.numItems = studioCfgs.Count;

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

@@ -69,7 +69,7 @@ namespace GFGGame
             LogServerHelper.SendNodeLog((int)PlayParticipationEnum.JIN_SHU_XIU_FU, 1);
 
             if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioMetalView).FullName, true)) return;
-            ViewManager.Show<StudioMetalView>(new object[] { 0, 0 }, new object[] { typeof(StudioView).Name, this.viewData });
+            ViewManager.Show<StudioMetalView>(new object[] { 0, 0 }, new object[] { typeof(StudioView).FullName, this.viewData });
             this.Hide();
         }
         private void OnCliclComFabric()
@@ -86,7 +86,7 @@ namespace GFGGame
             LogServerHelper.SendNodeLog((int)PlayParticipationEnum.SHU_HUA_XIU_FU, 1);
 
             if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioPropertyView).FullName, true)) return;
-            ViewManager.Show<StudioPropertyView>(new object[] { 1, 0 }, new object[] { typeof(StudioView).Name, this.viewData });
+            ViewManager.Show<StudioPropertyView>(new object[] { 1, 0 }, new object[] { typeof(StudioView).FullName, this.viewData });
             this.Hide();
 
         }