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

GameClient/Assets/Editor/BuildEditor/PresetAssetHelper.cs

@@ -72,6 +72,9 @@ namespace GFGEditor
                 }
             }
             string root = $"{AssetBundleBuilderHelper.GetDefaultStreamingAssetsRoot()}/{VersionController.DefaultPackage}";
+            //清空
+            EditorTools.ClearFolder(root);
+
             // 拷贝指定动态加载文件
             foreach (var packageBundle in bundles)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComBox1.cs

@@ -9,7 +9,6 @@ namespace UI.LuckyBox
         public GComponent target;
         public Controller m_showActivityType;
         public UI_ComModel m_comModel;
-        public GLoader m_loaTitle;
         public GTextField m_txtTsyTime;
         public GTextField m_txtTime;
         public GGroup m_grpTime;
@@ -71,7 +70,6 @@ namespace UI.LuckyBox
         {
             m_showActivityType = comp.GetController("showActivityType");
             m_comModel = (UI_ComModel)UI_ComModel.Create(comp.GetChild("comModel"));
-            m_loaTitle = (GLoader)comp.GetChild("loaTitle");
             m_txtTsyTime = (GTextField)comp.GetChild("txtTsyTime");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_grpTime = (GGroup)comp.GetChild("grpTime");
@@ -90,7 +88,6 @@ namespace UI.LuckyBox
             m_showActivityType = null;
             m_comModel.Dispose();
             m_comModel = null;
-            m_loaTitle = null;
             m_txtTsyTime = null;
             m_txtTime = null;
             m_grpTime = null;

GameClient/Assets/Game/HotUpdate/GameGlobal.cs

@@ -6,6 +6,9 @@ namespace GFGGame
 {
     public class GameGlobal
     {
+        //开服时间，单位毫秒
+        public static long OpenServerTime;
+
         public static bool isVisitor = false;
         public static bool isFirstEntry = false;
 

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

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

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

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

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

@@ -5,7 +5,7 @@ using System.Collections.Generic;
 
 namespace GFGGame
 {
-    public class ArenaDressUpFightView : BaseView
+    public class ArenaDressUpFightView : BaseWindow
     {
         private UI_ArenaDressUpFightUI _ui;
         // private DressUpObj _dressUpData = new DressUpObj();
@@ -205,12 +205,12 @@ namespace GFGGame
         }
         private void GoBackToView()
         {
-
             _roleData.itemList = _itemList;
             FightDataManager.Instance.SetItemScoreList(_roleData);
             ScoreSystemData.Instance.SetEquipScoresWithPartId(_roleData);
             //ViewManager.GoBackFrom(typeof(ArenaDressUpFightView).FullName);
-            ViewManager.Show<ArenaDressInfoView>(new object[] { FightRoleType.MINE, 0, ArenaDataManager.Instance.DressupList, "" }, new object[] { typeof(ArenaView).FullName, this.viewData }, true);
+            //ViewManager.Show<ArenaDressInfoView>(new object[] { FightRoleType.MINE, 0, ArenaDataManager.Instance.DressupList, "" });
+            this.Hide();
         }
         private void OnBtnFightScoreRule()
         {

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

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

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

@@ -325,11 +325,11 @@ namespace GFGGame
                 long time = endTime - curTime;
                 string strTime = time > TimeUtil.SECOND_PER_DAY * 100 ? TimeUtil.FormattingTimeTo_DDHHmm(time) : TimeUtil.FormattingTimeTo_HHmmss(time);
                 comBox.m_txtTime.text = string.Format("活动时间:剩余{0}", strTime);
-                comBox.m_loaTitle.url = "ui://LuckyBox/zx_title_1";
+                //comBox.m_loaTitle.url = "ui://LuckyBox/zx_title_1";
             }
             else
             {
-                comBox.m_loaTitle.url = string.Format("ui://LuckyBox/zx_title_{0}", boxId);
+                //comBox.m_loaTitle.url = string.Format("ui://LuckyBox/zx_title_{0}", boxId);
             }
             UI_ComBox1.ProxyEnd();
             UpdateListItemData();

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

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

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

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

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

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

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

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