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

# Conflicts:
#	GameClient/Assets/Game/HotUpdate/Views/CommonGame/ApproachView.cs
#	GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

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

@@ -174,7 +174,7 @@ namespace GFGGame
                     }
                     else
                     {
-                        ViewManager.Show<StoryChapterView>(MainStoryDataManager.currentChapterCfgId, new object[] { ViewName.STORY_CHAPTER_LIST_VIEW });
+                        ViewManager.Show<StoryChapterView>(MainStoryDataManager.currentChapterCfgId, new object[] { typeof(StoryChapterListView).FullName});
 
                         //ViewManager.Show<StoryChapterView>(StudioDataManager.Instance.luckyBoxFilingChapterId, new object[] { typeof(ActivityThemeLuckyBoxView).FullName, this.viewData });
 

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

@@ -314,7 +314,11 @@ namespace GFGGame
                 if (CheckIsRightTime(mySkillLvlCfg, currentTime, roundId))
                 {
                     bool isProbability = UnityEngine.Random.Range(0, 10000) < mySkillLvlCfg.probability;
-                    if (mySkillLvlCfg.beginTime == SkillBeginTime.FIGHT_BEGIN && roundTimes != null && roundId < roundTimes[i]) isProbability = true;
+                    if ((mySkillLvlCfg.beginTime == currentTime || roundId == mySkillLvlCfg.beginTime) && roundTimes != null /*&& roundId < roundTimes[i]*/) 
+                        isProbability = true;
+                    else
+                        isProbability = false;
+
                     if (isProbability) skillCfgs.Add(mySkillLvlCfg);
                 }
             }
@@ -329,6 +333,7 @@ namespace GFGGame
           || skillLvlCfg.beginTime == SkillBeginTime.ERVERY_ROUND_BEGIN && currentTime == SkillBeginTime.ERVERY_ROUND_BEGIN
           || skillLvlCfg.beginTime == SkillBeginTime.ERVERY_ROUND_END && currentTime == SkillBeginTime.ERVERY_ROUND_END
           || skillLvlCfg.beginTime == SkillBeginTime.ALL_PERFECT_START && currentTime == SkillBeginTime.ALL_PERFECT_START
+          || skillLvlCfg.beginTime == SkillBeginTime.FIGHT_BEGIN && currentTime == SkillBeginTime.FIGHT_BEGIN
           || skillLvlCfg.beginTime <= SkillBeginTime.ROUND_6 && currentTime == SkillBeginTime.ERVERY_ROUND_BEGIN && roundId == skillLvlCfg.beginTime)
             {
                 return true;

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

@@ -11,6 +11,7 @@ namespace GFGGame
         {
             LeagueDataManager.Instance.TeaPartyId = message.TeapartyId;
             LeagueDataManager.Instance.TeaPartyStatus = message.Status;
+            LeagueDataManager.Instance.TeaPartyCloseTime = message.TeaPartyCloseTime;
             EventAgent.DispatchEvent(ConstMessage.TEA_PARTY_STATU);
             await ETTask.CompletedTask;
         }

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

@@ -140,7 +140,7 @@ namespace GFGGame
 
         private void OnClickListCardItem(EventContext context)
         {
-            ViewManager.Show<CardFosterView>((context.data as GObject).data, new object[] { ViewName.CARD_DETAIL_VIEW, _ui.m_listRole.selectedIndex });
+            ViewManager.Show<CardFosterView>((context.data as GObject).data, new object[] { typeof(CardDetailView).FullName, _ui.m_listRole.selectedIndex });
             // this.Clear();
 
         }
@@ -168,11 +168,11 @@ namespace GFGGame
         /*******************************************************监听函数**************************************************/
         private void OnclickBtnFilter()
         {
-            ViewManager.Show<CardFilterView>(null, new object[] { ViewName.CARD_DETAIL_VIEW, _ui.m_listRole.selectedIndex });
+            ViewManager.Show<CardFilterView>(null, new object[] {typeof(CardDetailView).FullName, _ui.m_listRole.selectedIndex });
         }
         private void OnClickBtnBack()
         {
-            ViewManager.GoBackFrom(ViewName.CARD_DETAIL_VIEW);
+            ViewManager.GoBackFrom(typeof(CardDetailView).FullName);
             _startInAnim = true;
         }
 

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

@@ -180,7 +180,7 @@ namespace GFGGame
 
         private void OnClickBtnGo()
         {
-            // ViewManager.GoBackFrom(ViewName.CARD_FILTER_VIEW);
+             //ViewManager.GoBackFrom(typeof(CardFilterView).FullName);
             EventAgent.DispatchEvent(ConstMessage.CARD_FILTER);
             this.Hide();
         }

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

@@ -471,7 +471,7 @@ namespace GFGGame
 
                 if (ItemDataManager.GetItemNum(itemId) == 0)
                 {
-                    object[] sourceDatas = new object[] { itemId, new object[] { ViewName.CARD_FOSTER_VIEW, _cardData } };
+                    object[] sourceDatas = new object[] { itemId, new object[] { typeof(CardFosterView).FullName, _cardData } };
                     GoodsItemTipsController.ShowItemTips(itemId, sourceDatas);
                 }
             }
@@ -677,7 +677,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[] { ViewName.CARD_FOSTER_VIEW, _cardData });
+                        ViewManager.Show<CardUpView>(new object[] { _cardData.scores, "lv", lv, _showLv , _cardData.id }, new object[] { typeof(CardFosterView).FullName, _cardData });
                     }
                     this.UpdateCommon();
                     this.UpdateUpLvView(false, 0, 0, true);
@@ -872,8 +872,8 @@ namespace GFGGame
         {
             int itemId = int.Parse(UI_ComStarConsume.Proxy(_comFosterBottom.m_listStarConsume.GetChildAt(index)).target.data.ToString());
 
-            //ViewManager.Show<ApproachOfItemView>(new object[] { itemId, new object[] { ViewName.CARD_FOSTER_VIEW, _cardData } });
-            object[] sourceDatas = new object[] { itemId, new object[] { ViewName.CARD_FOSTER_VIEW, _cardData } };
+            //ViewManager.Show<ApproachOfItemView>(new object[] { itemId, new object[] { typeof(CardFosterView).FullName, _cardData } });
+            object[] sourceDatas = new object[] { itemId, new object[] { typeof(CardFosterView).FullName, _cardData } };
             GoodsItemTipsController.ShowItemTips(itemId, sourceDatas);
         }
 
@@ -1004,7 +1004,7 @@ namespace GFGGame
 
         private void OpenCardUp(string strType)
         {
-            ViewManager.Show<CardUpView>(new object[] { _cardData.scores, strType, _cardData.star - 1, _cardData.star, _cardData.id }, new object[] { ViewName.CARD_FOSTER_VIEW, _cardData });
+            ViewManager.Show<CardUpView>(new object[] { _cardData.scores, strType, _cardData.star - 1, _cardData.star, _cardData.id }, new object[] { typeof(CardFosterView).FullName, _cardData });
         }
         /***********************************************************升技能***************************************************/
 
@@ -1234,7 +1234,7 @@ namespace GFGGame
         }
         private void OnClickBtnBack()
         {
-            ViewManager.GoBackFrom(ViewName.CARD_FOSTER_VIEW);
+            ViewManager.GoBackFrom(typeof(CardFosterView).FullName);
             this._selectTab = 0;
         }
         private void UpdateRedDot()

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

@@ -86,7 +86,7 @@ namespace GFGGame
         private void OnClickBtnBack()
         {
 
-            ViewManager.GoBackFrom(ViewName.CARD_Mood_VIEW);
+            ViewManager.GoBackFrom(typeof(CardMoodView).FullName);
 
         }
 

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

@@ -47,7 +47,7 @@ namespace GFGGame
         private void OnClickBtnBack()
         {
 
-            ViewManager.GoBackFrom(ViewName.CARD_SHOW_VIEW);
+            ViewManager.GoBackFrom(typeof(CardShowView).FullName);
             EventAgent.DispatchEvent(ConstMessage.PLAT_CARDFOSTER_T1);
             _ui.target.scrollPane.SetPercX(0.5f, true);
 

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

@@ -123,8 +123,8 @@ namespace GFGGame
             int itemId = int.Parse(comStarConsume.target.data.ToString());
             UI_ComStarConsume.ProxyEnd();
             CardData cardData = CardDataManager.GetCardDataById(_cardId);
-            //ViewManager.Show<ApproachOfItemView>(new object[] { itemId, new object[] { ViewName.CARD_FOSTER_VIEW, cardData } });
-            object[] sourceDatas = new object[] { itemId, new object[] { ViewName.CARD_FOSTER_VIEW, cardData } };
+            //ViewManager.Show<ApproachOfItemView>(new object[] { itemId, new object[] { typeof(CardFosterView).FullName, cardData } });
+            object[] sourceDatas = new object[] { itemId, new object[] { typeof(CardFosterView).FullName, cardData } };
             GoodsItemTipsController.ShowItemTips(itemId, sourceDatas);
         }
         private async void OnClickBtnUp()

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

@@ -46,7 +46,7 @@ namespace GFGGame
         /*******************************************************¼àÌýº¯Êý**************************************************/
         private void OnClickBtnBack()
         {
-            ViewManager.GoBackFrom(ViewName.CARD_VIEW);
+            ViewManager.GoBackFrom(typeof(CardView).FullName);
             _ui.m_c1.selectedIndex = 0;
             _ui.m_t0.Stop(true, false);
         }
@@ -63,7 +63,7 @@ namespace GFGGame
             });
             _ui.m_t0.SetHook("open", () =>
             {
-                ViewManager.Show<CardDetailView>(null, new object[] { ViewName.CARD_VIEW, this.viewData });
+                ViewManager.Show<CardDetailView>(null, new object[] { typeof(CardView).FullName, this.viewData });
             });
         }
         protected override void OnHide()

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

@@ -198,7 +198,7 @@ namespace GFGGame
         }
         private void OnClickBtnBack()
         {
-            ViewManager.GoBackFrom(ViewName.CLOTHING_SHOP_VIEW);
+            ViewManager.GoBackFrom(typeof(ClothingShopView).FullName);
             this.Hide();
 
         }

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

@@ -136,7 +136,7 @@ namespace GFGGame
         }
         private void OnClickBtnBack()
         {
-            ViewManager.GoBackFrom(ViewName.CLOTHING_SYNTHETIC_VIEW);
+            ViewManager.GoBackFrom(typeof(ClothingSyntheticView).FullName);
         }
 
         private void OnClickListClothingItem(EventContext context)
@@ -348,7 +348,7 @@ namespace GFGGame
             int index = (int)(context.data as GObject).data;
             _ui.m_listMaterias.selectedIndex = index;
             ItemData itemData = _materiarsOfSelectedItem[index];
-            object[] sourceDatas = new object[] { itemData.id, new object[] { ViewName.CLOTHING_SYNTHETIC_VIEW, new object[] { _suitId, _selectedItemId } }, (int)itemData.num };
+            object[] sourceDatas = new object[] { itemData.id, new object[] { typeof(ClothingSyntheticView).FullName, new object[] { _suitId, _selectedItemId } }, (int)itemData.num };
             GoodsItemTipsController.ShowItemTips(itemData.id, sourceDatas);
         }
 

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

@@ -76,7 +76,7 @@ namespace GFGGame
         }
         private void OnClickBtnBack()
         {
-            ViewManager.GoBackFrom(ViewName.SUIT_SYNTHETIC_LIST_VIEW);
+            ViewManager.GoBackFrom(typeof(SuitSyntheticView).FullName);
         }
 
         private void OnClickListMenuItem()
@@ -168,7 +168,7 @@ namespace GFGGame
             {
                 if (!isLock)
                 {
-                    ViewManager.Show<ClothingSyntheticView>(new object[] { suitId }, new object[] { ViewName.SUIT_SYNTHETIC_LIST_VIEW, suitId });
+                    ViewManager.Show<ClothingSyntheticView>(new object[] { suitId }, new object[] { typeof(SuitSyntheticView).FullName, suitId });
                 }
             });
             RedDotController.Instance.SetComRedDot(listItem.target, RedDotDataManager.Instance.GetClothingSyntheticRed(suitId), "", 0, 0);

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

@@ -259,7 +259,7 @@ namespace GFGGame
                     {
                         // if (levelCfg.type == ConstInstanceZonesType.Story)
                         // {
-                        if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(ViewName.STORY_CHAPTER_VIEW))
+                        if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StoryChapterView).FullName))
                         {
                             break;
                         }
@@ -269,7 +269,7 @@ namespace GFGGame
                             break;
                         }
 
-                        if ((string)_fromViewDatas[0] == ViewName.DRESS_UP_FIGHT_VIEW)
+                        if ((string)_fromViewDatas[0] == typeof(DressUpFightView).FullName)
                         {
                             //从战斗换装必需品来源跳转到剧情界面，在剧情界面点返回后直接返回章节界面，无需返回换装界面
                             _fromViewDatas = null;
@@ -302,7 +302,7 @@ namespace GFGGame
                     break;
                 case ConstFunctionId.TAO_ZHUANG_TU_JIAN:
                     isJump = false;
-                    if (ViewManager.isViewOpen(ViewName.SUIT_GUIDE_VIEW))
+                    if (ViewManager.isViewOpen(typeof(SuitGuideView).FullName))
                     {
                         return;
                     }

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

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

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

@@ -316,12 +316,12 @@ namespace GFGGame
             }
             else if (_levelCfg.type == ConstInstanceZonesType.Field)
             {
-                ViewManager.GoBackFrom(ViewName.DRESS_UP_FIGHT_VIEW);
+                ViewManager.GoBackFrom(typeof(DressUpFightView).FullName);
             }
             else
             {
-                // ViewManager.GoBackFrom(ViewName.STORY_CHAPTER_VIEW);
-                ViewManager.Show<StoryChapterView>(_levelCfg.chapterId);//, new object[] { ViewName.STORY_CHAPTER_LIST_VIEW }
+                 //ViewManager.GoBackFrom(typeof(StoryChapterView).FullName);
+                ViewManager.Show<StoryChapterView>(_levelCfg.chapterId);//, new object[] { typeof(StoryChapterListView).FullName}
             }
             //MyDressUpHelper.dressUpObj.TakeOffAll();
 
@@ -1331,7 +1331,7 @@ namespace GFGGame
 
         private void OnClickBtnSearch()
         {
-            ViewManager.Show<DressFilterView>(false, new object[] { ViewName.DRESS_UP_VIEW });
+            ViewManager.Show<DressFilterView>(false, new object[] { typeof(DressUpView).FullName});
         }
         private void OnClickBtnAutoPlay()
         {
@@ -1352,7 +1352,7 @@ namespace GFGGame
             else
             {
                 int itemId = (int)_ui.m_compNeed.target.data;
-                object[] sourceDatas = new object[] { itemId, new object[] { ViewName.DRESS_UP_FIGHT_VIEW, this.viewData }, 1 };
+                object[] sourceDatas = new object[] { itemId, new object[] { typeof(DressUpFightView).FullName, this.viewData }, 1 };
                 GoodsItemTipsController.ShowItemTips(itemId, sourceDatas);
             }
         }

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

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

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

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

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

@@ -74,7 +74,7 @@ namespace GFGGame
         private void OnClickBtnBack()
         {
             _startInAnim = true;
-            ViewManager.GoBackFrom(ViewName.FIELD_GUIDE_VIEW);
+            ViewManager.GoBackFrom(typeof(FieldGuideView).FullName);
             HideAllRedDot();
         }
 
@@ -129,19 +129,19 @@ namespace GFGGame
             switch (id)
             {
                 case ConstFieldGuideId.SUIT_GUIDE:
-                    ViewManager.Show<SuitGuideView>(null, new object[] { ViewName.FIELD_GUIDE_VIEW, this.viewData });
+                    ViewManager.Show<SuitGuideView>(null, new object[] { typeof(FieldGuideView).FullName, this.viewData });
                     break;
                 case ConstFieldGuideId.CHAPTER_ITEM:
-                    ViewManager.Show<ChapterItemGuideView>(null, new object[] { ViewName.FIELD_GUIDE_VIEW, this.viewData });
+                    ViewManager.Show<ChapterItemGuideView>(null, new object[] { typeof(FieldGuideView).FullName, this.viewData });
                     break;
                 case ConstFieldGuideId.TRAVEL_GUIDE:
-                    ViewManager.Show<TravelGuideView>(null, new object[] { ViewName.FIELD_GUIDE_VIEW, this.viewData });
+                    ViewManager.Show<TravelGuideView>(null, new object[] { typeof(FieldGuideView).FullName, this.viewData });
                     break;
                 case ConstFieldGuideId.DRESS_UP_GUIDE:
-                    ViewManager.Show<DressUpGuideView>(null, new object[] { ViewName.FIELD_GUIDE_VIEW, this.viewData });
+                    ViewManager.Show<DressUpGuideView>(null, new object[] { typeof(FieldGuideView).FullName, this.viewData });
                     break;
                 case ConstFieldGuideId.CARD_GUIDE:
-                    ViewManager.Show<CardGuideView>(null, new object[] { ViewName.FIELD_GUIDE_VIEW, this.viewData });
+                    ViewManager.Show<CardGuideView>(null, new object[] { typeof(FieldGuideView).FullName, this.viewData });
                     break;
             }
         }

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

@@ -155,7 +155,7 @@ namespace GFGGame
             item.target.data = typeId;
             item.target.onClick.Add(() =>
             {
-                ViewManager.Show<SuitGuideDetailView>(typeId, new object[] { ViewName.SUIT_GUIDE_VIEW, this.viewData });
+                ViewManager.Show<SuitGuideDetailView>(typeId, new object[] { typeof(SuitGuideView).FullName, this.viewData });
             });
 
             _suitTypeItems.Add(item);
@@ -198,14 +198,14 @@ 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[] { ViewName.SUIT_GUIDE_VIEW, this.viewData });
+            ViewManager.Show<SuitGuideDetailView>(_menuTypeAllDataDic[_ui.m_c1.selectedIndex + 1][index], new object[] { typeof(SuitGuideView).FullName, this.viewData });
         }
 
         private void OnClickBtnBack()
         {
             UpdateItemsByType(1);
             _ui.m_suitTypeItems.target.scrollPane.ScrollTop();
-            ViewManager.GoBackFrom(ViewName.SUIT_GUIDE_VIEW);
+            ViewManager.GoBackFrom(typeof(SuitGuideView).FullName);
         }
 
         private IEnumerator UpdateRedDot()

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

@@ -94,7 +94,7 @@ namespace GFGGame
             else
             {
                 // this.Hide();
-                //ViewManager.Show<ApproachOfItemView>(new object[] { itemId, new object[] { ViewName.SUIT_GUIDE_VIEW, this.viewData } });
+                //ViewManager.Show<ApproachOfItemView>(new object[] { itemId, new object[] { typeof(SuitGuideView).FullName, this.viewData } });
                 object[] goBackDatas = ViewManager.GetGoBackDatas(typeof(SuitPartsDetailView).Name);
                 object[] sourceDatas = new object[] { itemId, goBackDatas, 1 };
                 GoodsItemTipsController.ShowItemTips(itemId, sourceDatas);

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

@@ -345,7 +345,7 @@ namespace GFGGame
 
                  if (result)
                  {
-                     ViewManager.Show<LuckyBoxStarView>(null, new object[] { ViewName.LUCKY_BOX_VIEW, boxId });
+                     ViewManager.Show<LuckyBoxStarView>(null, new object[] { typeof(LuckyBoxView).FullName, boxId });
                      LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.ZAI_XING, 2);
                  }
              });
@@ -375,7 +375,7 @@ namespace GFGGame
                 bool result = await LuckyBoxSProxy.ReqGetBonus(boxId, LuckyBoxDataManager.TEN_TIME);
                 if (result)
                 {
-                    ViewManager.Show<LuckyBoxStarView>(null, new object[] { ViewName.LUCKY_BOX_VIEW, boxId });
+                    ViewManager.Show<LuckyBoxStarView>(null, new object[] { typeof(LuckyBoxView).FullName, boxId });
                     LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.ZAI_XING, 2);
 
                 }
@@ -410,7 +410,7 @@ namespace GFGGame
         private void OnClickBtnBack()
         {
             Reset();
-            ViewManager.GoBackFrom(ViewName.LUCKY_BOX_VIEW);
+            ViewManager.GoBackFrom(typeof(LuckyBoxView).FullName);
 
         }
 

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

@@ -101,7 +101,7 @@ namespace GFGGame
             StoryChapterCfg chapterCfg = StoryChapterCfgArray.Instance.GetCfg(chapterID);
             if (MainStoryDataManager.CheckChapterUnlock(chapterID))
             {
-                ViewManager.Show<StoryChapterView>(chapterID, new object[] { ViewName.STORY_CHAPTER_LIST_VIEW, new object[] { _ui.m_listType.selectedIndex } });
+                ViewManager.Show<StoryChapterView>(chapterID, new object[] { typeof(StoryChapterListView).FullName, new object[] { _ui.m_listType.selectedIndex } });
                 this.Hide();
             }
             else

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

@@ -112,7 +112,7 @@ namespace GFGGame
         }
         private void OnClickBtnBack()
         {
-            ViewManager.GoBackFrom(ViewName.STORY_CHAPTER_VIEW);
+            ViewManager.GoBackFrom(typeof(StoryChapterView).FullName);
         }
 
         private void OnClickBtnHome()

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

@@ -41,13 +41,13 @@ namespace GFGGame
                 }
                 else
                 {
-                    ViewManager.Show<StoryChapterView>(MainStoryDataManager.currentChapterCfgId, ViewManager.GetGoBackDatas(ViewName.STORY_CHAPTER_VIEW), true);
+                    ViewManager.Show<StoryChapterView>(MainStoryDataManager.currentChapterCfgId, ViewManager.GetGoBackDatas(typeof(StoryChapterView).FullName), true);
                 }
             }
             else
             {
                 //异常返回到关卡列表界面
-                ViewManager.Show<StoryChapterView>(MainStoryDataManager.currentChapterCfgId, ViewManager.GetGoBackDatas(ViewName.STORY_CHAPTER_VIEW), true);
+                ViewManager.Show<StoryChapterView>(MainStoryDataManager.currentChapterCfgId, ViewManager.GetGoBackDatas(typeof(StoryChapterView).FullName), true);
             }
         }
 
@@ -60,7 +60,7 @@ namespace GFGGame
         private static void OnCompleteCardStoryDialog(bool isSkip, object param)
         {
             CardData cardData = param as CardData;
-            ViewManager.Show<CardFosterView>(cardData, new object[] { ViewName.CARD_DETAIL_VIEW }, true);
+            ViewManager.Show<CardFosterView>(cardData, new object[] { typeof(CardDetailView).FullName}, true);
             ViewManager.Show<CardStoryView>(cardData);
         }
 
@@ -75,7 +75,7 @@ namespace GFGGame
 
         private static void OnCompletePriorStoryDialog(bool isSkip, object param)
         {
-            ViewManager.Show<StoryChapterView>(MainStoryDataManager.currentChapterCfgId, ViewManager.GetGoBackDatas(ViewName.STORY_CHAPTER_VIEW), true);
+            ViewManager.Show<StoryChapterView>(MainStoryDataManager.currentChapterCfgId, ViewManager.GetGoBackDatas(typeof(StoryChapterView).FullName), true);
         }
 
 

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

@@ -415,7 +415,7 @@ namespace GFGGame
             // _ui.m_btnMain.m_holder1.visible = false;
             // this.Hide();
             ViewManager.Show<StoryChapterListView>(null,
-                new object[] { ViewName.MAINUI_VIEW, this.viewData });
+                new object[] { typeof(MainUIView).FullName, this.viewData });
             isOpen = false;
             ;
 
@@ -433,7 +433,7 @@ namespace GFGGame
             // {
             _ui.m_btnHuanZhuang.m_holder1.visible = false;
             this.Hide();
-            ViewManager.Show<DressUpView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
+            ViewManager.Show<DressUpView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
             isOpen = false;
 
 
@@ -464,30 +464,31 @@ namespace GFGGame
             isOpen = true;
             _ui.m_btnXiuFang.m_holder1.visible = true;
             _ui.m_btnXiuFang.m_holder1.visible = false;
-            ViewManager.Show<XiuFangView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
+            ViewManager.Show<XiuFangView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
             isOpen = false;
         }
 
         private void OnClickBtnDailyLogin()
         {
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.MEI_RI_DNEG_LU, 1);
-            ViewManager.Show<SevenDayLoginView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
+
+            ViewManager.Show<SevenDayLoginView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
         }
 
         private void OnClickBtnDailyWelfare()
         {
-            ViewManager.Show<DailyWelfareView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
+            ViewManager.Show<DailyWelfareView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
         }
 
         private void OnClickBtnActivityLuckyBox()
         {
-            ViewManager.Show<ActivityThemeLuckyBoxView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData },
+            ViewManager.Show<ActivityThemeLuckyBoxView>(null, new object[] { typeof(MainUIView).FullName, this.viewData },
                 true);
         }
 
         private void OnClickBtnLimitedRechargeDBGift()
         {
-            ViewManager.Show<LimitedRechargeDBGiftView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
+            ViewManager.Show<LimitedRechargeDBGiftView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
         }
 
         private void OnClickBtnCiPai()
@@ -500,27 +501,28 @@ namespace GFGGame
             _ui.m_btnCiPai.m_holder1.visible = false;
 
             CardDataManager.isFilter = false;
-            ViewManager.Show<CardDetailView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
+            ViewManager.Show<CardDetailView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
             isOpen = false;
 
         }
 
         private void OnClickBtnStudio()
         {
-            ViewManager.Show<StudioView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
+            ViewManager.Show<StudioView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
         }
 
         private void OnClickBtnField()
         {
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.TIAN_YE_DIAO_CHA, 1);
 
-            ViewManager.Show<FieldView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
+            ViewManager.Show<FieldView>(null, new object[] {typeof(MainUIView).FullName, this.viewData });
         }
 
         private void OnClickBtnPoem()
         {
             // LogServerHelper.SendNodeLog((int)PlayParticipationEnum.TIAN_YE_DIAO_CHA, 1);
-            ViewManager.Show<PoemView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
+
+            ViewManager.Show<PoemView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
         }
 
         private void OnClickBtnArena()
@@ -536,7 +538,7 @@ namespace GFGGame
                 return;
             }
 
-            ViewManager.Show<ArenaView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData }, true);
+            ViewManager.Show<ArenaView>(null, new object[] { typeof(MainUIView).FullName, this.viewData }, true);
             ViewManager.Show<ArenaLoadingView>();
 
         }
@@ -545,12 +547,12 @@ namespace GFGGame
         {
             // LogServerHelper.SendNodeLog((int)PlayParticipationEnum.TIAN_YE_DIAO_CHA, 1);
 
-            ViewManager.Show<TravelView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
+            ViewManager.Show<TravelView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
         }
 
         private void OnClickBtnBag()
         {
-            ViewManager.Show<BagView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
+            ViewManager.Show<BagView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
         }
 
         private void OnClickBtnLeague()
@@ -576,13 +578,13 @@ namespace GFGGame
         {
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHANG_CHENG, 1);
 
-            ViewManager.Show<StoreView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
+            ViewManager.Show<StoreView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
         }
 
         private void OnClickBtnTuJian()
         {
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.TU_JIAN, 1);
-            ViewManager.Show<FieldGuideView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
+            ViewManager.Show<FieldGuideView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
         }
 
         private void OnClickBtnYouJian()
@@ -592,7 +594,7 @@ namespace GFGGame
 
         private void OnClickBtnHaoYou()
         {
-            ViewManager.Show<FriendView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData }, true);
+            ViewManager.Show<FriendView>(null, new object[] { typeof(MainUIView).FullName, this.viewData }, true);
         }
 
         private void OnClickBtnGongGao()
@@ -602,15 +604,15 @@ namespace GFGGame
 
         private void OnClickBtnRenWu()
         {
-            ViewManager.Show<TaskView>(null, new[] { ViewName.MAINUI_VIEW, this.viewData });
-            // ViewManager.Show<ActivityDay7View>(null, new[] { ViewName.MAINUI_VIEW, this.viewData });
+            ViewManager.Show<TaskView>(null, new[] { typeof(MainUIView).FullName, this.viewData });
+            // ViewManager.Show<ActivityDay7View>(null, new[] { typeof(MainUIView).FullName, this.viewData });
             // LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.MEI_RI_REN_WU, 1);
             // ViewManager.Show<DailyTaskView>();
         }
 
         private void OnClickBtnDay7()
         {
-            ViewManager.Show<ActivityDay7View>(null, new[] { ViewName.MAINUI_VIEW, this.viewData });
+            ViewManager.Show<ActivityDay7View>(null, new[] { typeof(MainUIView).FullName, this.viewData });
         }
 
         private void OnClickBtnFirstRecharge()

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

@@ -1,55 +0,0 @@
-namespace GFGGame
-{
-    public class ViewName
-    {
-        public static string MAINUI_VIEW = "GFGGame.MainUIView";
-        public static string DRESS_UP_VIEW = "GFGGame.DressUpView";
-        public static string STORY_CHAPTER_LIST_VIEW = "GFGGame.StoryChapterListView";
-        public static string STORY_CHAPTER_VIEW = "GFGGame.StoryChapterView";
-        public static string STORY_DIALOG_VIEW = "GFGGame.StoryDialogView";
-        public static string STORY_LOOK_BACK_VIEW = "GFGGame.StoryLookBackView";
-        public static string CREATE_ROLE_VIEW = "GFGGame.CreateRoleView";
-        public static string STORY_LEVEL_INFO_VIEW = "GFGGame.StoryLevelInfoView";
-        public static string DRESS_UP_FIGHT_VIEW = "GFGGame.DressUpFightView";
-        public static string STORY_FIGHT_TARGET_VIEW = "GFGGame.StoryFightTargetView";
-        public static string STORY_FIGHT_SINGLE_VIEW = "GFGGame.StoryFightSingleView";
-        public static string STORY_FIGHT_TARGET_SCORE_VIEW = "GFGGame.StoryFightTargetScoreView";
-        public static string STORY_FIGHT_SINGLE_SCORE_VIEW = "GFGGame.StoryFightSingleScoreView";
-        public static string STORY_FIGHT_RESULT_VIEW = "GFGGame.StroyFightResultView";
-        public static string GET_BONUS_VIEW = "GFGGame.GetBonusView";
-        public static string GOODS_ITEM_TIPS_VIEW = "GFGGame.GoodsItemTipsView";
-        public static string DRESS_UP_ITEM_TIPS_VIEW = "GFGGame.DressUpItemTipsView";
-        public static string STORY_FIGHT_QUICKLY_VIEW = "GFGGame.StoryFightQuicklyView";
-        public static string RECHARGE_STORE_VIEW = "GFGGame.RechargeStoreView";
-        public static string ROLE_INFO_VIEW = "GFGGame.RoleInfoView";
-        public static string GM_PANEL_VIEW = "GFGGame.GMPanelView";
-        public static string GUIDE_VIEW = "GFGGame.GuideView";
-        public static string LUCKY_BOX_VIEW = "GFGGame.LuckyBoxView";
-        public static string LUCKY_BOX_BONUS_VIEW = "GFGGame.LuckyBoxBonusView";
-        public static string LUCKY_BOX_PRE_SHOW_VIEW = "GFGGame.LuckyBoxPreShowView";
-        public static string LUCKY_BOX_STAR_VIEW = "GFGGame.LuckyBoxStarView";
-        public static string GET_SUIT_ITEM_VIEW = "GFGGame.GetSuitItemVIew";
-        public static string CLOTHING_SHOP_VIEW = "GFGGame.ClothingShopView";
-        public static string BUY_COUNT_VIEW = "GFGGame.BuyCountView";
-        public static string FIELD_GUIDE_VIEW = "GFGGame.FieldGuideView";
-        public static string SUIT_GUIDE_VIEW = "GFGGame.SuitGuideView";
-        public static string SUIT_SHOW_VIEW = "GFGGame.SuitShowView";
-        public static string SUIT_PARTS_DETAIL_VIEW = "GFGGame.SuitPartsDetailView";
-        public static string BONUS_BOX_DETAIL_VIEW = "GFGGame.BonusBoxDetailView";
-        public static string XIU_FANG_VIEW = "GFGGame.XiuFangView";
-        public static string SUIT_SYNTHETIC_LIST_VIEW = "GFGGame.SuitSyntheticView";
-        public static string CLOTHING_SYNTHETIC_VIEW = "GFGGame.ClothingSyntheticView";
-        public static string APPROACH_OF_ITEM_VIEW = "GFGGame.ApproachOfItemView";
-        public static string CARD_VIEW = "GFGGame.CardView";
-        public static string CARD_DETAIL_VIEW = "GFGGame.CardDetailView";
-        public static string CARD_FOSTER_VIEW = "GFGGame.CardFosterView";
-        public static string CARD_FILTER_VIEW = "GFGGame.CardFilterView";
-        public static string CARD_STORY_VIEW = "GFGGame.CardStoryView";
-        public static string CARD_Mood_VIEW = "GFGGame.CardMoodView";
-        public static string CARD_SHOW_VIEW = "GFGGame.CardShowView";
-        public static string CARD_UP_VIEW = "GFGGame.CardUpView";
-        public static string LOG_VIEW = "GFGGame.LogView";
-        public static string DRESS_FILTER_VIEW = "GFGGame.DressFilterView";
-
-    }
-}

GameClient/Assets/Game/HotUpdate/Views/ViewName.cs.meta

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

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

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