分离主界面和副本

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Activit.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/InstanceZones.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6847af71df872b345b64b90ac0addc25
+guid: 255d88060c78fa744b7c5ba05a7724e3
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle7.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/InstanceZones/UI_ButtonModle7.cs

@@ -2,7 +2,7 @@
 
 using FairyGUI;
 
-namespace UI.Main
+namespace UI.InstanceZones
 {
     public partial class UI_ButtonModle7
     {
@@ -11,8 +11,8 @@ namespace UI.Main
         public GGraph m_holder1;
         public GLoader m_icon1;
         public GLoader m_loaLockIcon;
-        public const string URL = "ui://mfvz4q8kmzf8iu";
-        public const string PACKAGE_NAME = "Main";
+        public const string URL = "ui://ez8qotvcmzf8iu";
+        public const string PACKAGE_NAME = "InstanceZones";
         public const string RES_NAME = "ButtonModle7";
         private static UI_ButtonModle7 _proxy;
 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle7.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/InstanceZones/UI_ButtonModle7.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7afd8cb83812c5543b59c0482c674e38
+guid: fe503f05266a43b4bba2c69361cee7b9
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle8.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/InstanceZones/UI_ButtonModle8.cs

@@ -2,7 +2,7 @@
 
 using FairyGUI;
 
-namespace UI.Main
+namespace UI.InstanceZones
 {
     public partial class UI_ButtonModle8
     {
@@ -11,8 +11,8 @@ namespace UI.Main
         public GLoader m_icon1;
         public GGraph m_holder1;
         public GLoader m_loaLockIcon;
-        public const string URL = "ui://mfvz4q8kjx6zpc";
-        public const string PACKAGE_NAME = "Main";
+        public const string URL = "ui://ez8qotvcjx6zpc";
+        public const string PACKAGE_NAME = "InstanceZones";
         public const string RES_NAME = "ButtonModle8";
         private static UI_ButtonModle8 _proxy;
 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle8.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/InstanceZones/UI_ButtonModle8.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 676d22f16cf0a8343b915731a75c25d1
+guid: 0b32a0a44e5817040aa1af8372defda8
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle9.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/InstanceZones/UI_ButtonModle9.cs

@@ -2,7 +2,7 @@
 
 using FairyGUI;
 
-namespace UI.Main
+namespace UI.InstanceZones
 {
     public partial class UI_ButtonModle9
     {
@@ -11,8 +11,8 @@ namespace UI.Main
         public GLoader m_icon1;
         public GGraph m_holder1;
         public GLoader m_loaLockIcon;
-        public const string URL = "ui://mfvz4q8kjx6zpd";
-        public const string PACKAGE_NAME = "Main";
+        public const string URL = "ui://ez8qotvcjx6zpd";
+        public const string PACKAGE_NAME = "InstanceZones";
         public const string RES_NAME = "ButtonModle9";
         private static UI_ButtonModle9 _proxy;
 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonModle9.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/InstanceZones/UI_ButtonModle9.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5225c1b1730e8a346b9fd6c97f8a105a
+guid: d4ff2c0293bb5d945af57fa52d80d581
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/InstanceZones/UI_InstanceZonesUI.cs

@@ -0,0 +1,107 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.InstanceZones
+{
+    public partial class UI_InstanceZonesUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GComponent m_valueBar;
+        public GButton m_btnBack;
+        public UI_ButtonModle7 m_btn1;
+        public UI_ButtonModle9 m_btnStudio;
+        public UI_ButtonModle9 m_btnTravel;
+        public UI_ButtonModle8 m_btnPoem;
+        public UI_ButtonModle9 m_btnField;
+        public UI_ButtonModle8 m_btnArena;
+        public GGroup m_grpRight;
+        public GLoader m_loaGuidestudio;
+        public const string URL = "ui://ez8qotvcyeocfv0";
+        public const string PACKAGE_NAME = "InstanceZones";
+        public const string RES_NAME = "InstanceZonesUI";
+        private static UI_InstanceZonesUI _proxy;
+
+        public static UI_InstanceZonesUI Create(GObject gObject = null)
+        {
+            var ui = new UI_InstanceZonesUI();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_InstanceZonesUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_InstanceZonesUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
+            m_valueBar = (GComponent)comp.GetChild("valueBar");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_btn1 = (UI_ButtonModle7)UI_ButtonModle7.Create(comp.GetChild("btn1"));
+            m_btnStudio = (UI_ButtonModle9)UI_ButtonModle9.Create(comp.GetChild("btnStudio"));
+            m_btnTravel = (UI_ButtonModle9)UI_ButtonModle9.Create(comp.GetChild("btnTravel"));
+            m_btnPoem = (UI_ButtonModle8)UI_ButtonModle8.Create(comp.GetChild("btnPoem"));
+            m_btnField = (UI_ButtonModle9)UI_ButtonModle9.Create(comp.GetChild("btnField"));
+            m_btnArena = (UI_ButtonModle8)UI_ButtonModle8.Create(comp.GetChild("btnArena"));
+            m_grpRight = (GGroup)comp.GetChild("grpRight");
+            m_loaGuidestudio = (GLoader)comp.GetChild("loaGuidestudio");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_valueBar = null;
+            m_btnBack = null;
+            m_btn1.Dispose();
+            m_btn1 = null;
+            m_btnStudio.Dispose();
+            m_btnStudio = null;
+            m_btnTravel.Dispose();
+            m_btnTravel = null;
+            m_btnPoem.Dispose();
+            m_btnPoem = null;
+            m_btnField.Dispose();
+            m_btnField = null;
+            m_btnArena.Dispose();
+            m_btnArena = null;
+            m_grpRight = null;
+            m_loaGuidestudio = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/InstanceZones/UI_InstanceZonesUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_MainUI.cs

@@ -32,20 +32,8 @@ namespace UI.Main
         public UI_BtnModle m_btnGiftBag1;
         public UI_BtnModle m_btnGiftBag2;
         public GGroup m_grpLeft;
-        public GButton m_loaLeft;
-        public UI_ButtonModle7 m_btn1;
-        public UI_ButtonModle9 m_btnStudio;
-        public UI_ButtonModle9 m_btnTravel;
-        public UI_ButtonModle8 m_btnPoem;
-        public UI_ButtonModle9 m_btnField;
-        public UI_ButtonModle8 m_btnArena;
-        public GGroup m_grpRight;
         public GGroup m_grpMove;
         public GLoader m_loaGuidestudio;
-        public Transition m_t1;
-        public Transition m_t2;
-        public Transition m_t3;
-        public Transition m_t4;
         public Transition m_openViewAction;
         public const string URL = "ui://mfvz4q8kq08x0";
         public const string PACKAGE_NAME = "Main";
@@ -119,20 +107,8 @@ namespace UI.Main
             m_btnGiftBag1 = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnGiftBag1"));
             m_btnGiftBag2 = (UI_BtnModle)UI_BtnModle.Create(comp.GetChild("btnGiftBag2"));
             m_grpLeft = (GGroup)comp.GetChild("grpLeft");
-            m_loaLeft = (GButton)comp.GetChild("loaLeft");
-            m_btn1 = (UI_ButtonModle7)UI_ButtonModle7.Create(comp.GetChild("btn1"));
-            m_btnStudio = (UI_ButtonModle9)UI_ButtonModle9.Create(comp.GetChild("btnStudio"));
-            m_btnTravel = (UI_ButtonModle9)UI_ButtonModle9.Create(comp.GetChild("btnTravel"));
-            m_btnPoem = (UI_ButtonModle8)UI_ButtonModle8.Create(comp.GetChild("btnPoem"));
-            m_btnField = (UI_ButtonModle9)UI_ButtonModle9.Create(comp.GetChild("btnField"));
-            m_btnArena = (UI_ButtonModle8)UI_ButtonModle8.Create(comp.GetChild("btnArena"));
-            m_grpRight = (GGroup)comp.GetChild("grpRight");
             m_grpMove = (GGroup)comp.GetChild("grpMove");
             m_loaGuidestudio = (GLoader)comp.GetChild("loaGuidestudio");
-            m_t1 = comp.GetTransition("t1");
-            m_t2 = comp.GetTransition("t2");
-            m_t3 = comp.GetTransition("t3");
-            m_t4 = comp.GetTransition("t4");
             m_openViewAction = comp.GetTransition("openViewAction");
         }
         public void Dispose(bool disposeTarget = false)
@@ -179,26 +155,8 @@ namespace UI.Main
             m_btnGiftBag2.Dispose();
             m_btnGiftBag2 = null;
             m_grpLeft = null;
-            m_loaLeft = null;
-            m_btn1.Dispose();
-            m_btn1 = null;
-            m_btnStudio.Dispose();
-            m_btnStudio = null;
-            m_btnTravel.Dispose();
-            m_btnTravel = null;
-            m_btnPoem.Dispose();
-            m_btnPoem = null;
-            m_btnField.Dispose();
-            m_btnField = null;
-            m_btnArena.Dispose();
-            m_btnArena = null;
-            m_grpRight = null;
             m_grpMove = null;
             m_loaGuidestudio = null;
-            m_t1 = null;
-            m_t2 = null;
-            m_t3 = null;
-            m_t4 = null;
             m_openViewAction = null;
             if(disposeTarget && target != null)
             {

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

@@ -224,9 +224,13 @@ namespace GFGGame
 
         public static int ProgressCalculate(int haveCount, int totalCount)
         {
-            float rate = haveCount * 100.0f / totalCount;
-            int result = 0;
+            if(haveCount > totalCount)
+            {
+                haveCount = totalCount;
+            }
 
+            float rate = haveCount * 100.0f / totalCount;
+            int result;
             if (rate > 0 && rate <= 1)
             {
                 result = 1;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyLogin.meta → GameClient/Assets/Game/HotUpdate/Views/InstanceZones.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: bab7dd4cf19f5d84aad43991fc4faa71
+guid: bd21bbb00d721b343946f4fabb231339
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

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

@@ -0,0 +1,145 @@
+using ET;
+using System.Collections;
+using UnityEngine;
+using FairyGUI;
+using UI.InstanceZones;
+
+namespace GFGGame
+{
+    public class InstanceZonesUIView : BaseView
+    {
+        private UI_InstanceZonesUI _ui;
+        private ValueBarController _valueBarController;
+
+        public override void Dispose()
+        {
+            if (_valueBarController != null)
+            {
+                _valueBarController.Dispose();
+                _valueBarController = null;
+            }
+
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+
+            packageName = UI_InstanceZonesUI.PACKAGE_NAME;
+            _ui = UI_InstanceZonesUI.Create();
+            viewCom = _ui.target;
+            isfullScreen = true;
+            isReturnView = true;
+
+            _valueBarController = new ValueBarController(_ui.m_valueBar);
+            _ui.m_btnStudio.target.onClick.Add(OnClickBtnStudio);
+            _ui.m_btnTravel.target.onClick.Add(OnClickBtnTravel);
+            _ui.m_btnPoem.target.onClick.Add(OnClickBtnPoem);
+            _ui.m_btnField.target.onClick.Add(OnClickBtnField);
+            _ui.m_btnArena.target.onClick.Add(OnClickBtnArena);
+            _ui.m_btnBack.onClick.Add(OnClickBtnBack);
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("fuben_bg");
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _valueBarController.OnShown();
+            CheckFunOpen();
+            UpdateRedDot();
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+            _valueBarController.OnHide();
+        }
+
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+        }
+
+        private void UpdateRedDot()
+        {
+            _valueBarController.UpRead();
+            RedDotController.Instance.SetComRedDot(_ui.m_btnStudio.target, RedDotDataManager.Instance.GetStudioFilingRed(), "", -36, 32);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnTravel.target, RedDotDataManager.Instance.GetTravelRed(), "", -36, 32);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnField.target, RedDotDataManager.Instance.GetFieldRed(), "", -36, 32);
+        }
+
+        private void CheckFunOpen()
+        {
+            _ui.m_btnPoem.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(PoemView).Name, false);
+            _ui.m_btnStudio.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioView).Name, false);
+            _ui.m_btnTravel.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(TravelView).Name, false);
+            _ui.m_btnField.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FieldView).Name, false);
+            _ui.m_btnArena.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(ArenaView).Name, false);
+        }
+
+        private void OnClickBtnBack()
+        {
+            ViewManager.GoBackFrom(typeof(InstanceZonesUIView).FullName);
+        }
+
+        private void OnClickBtnStudio()
+        {
+            ViewManager.Show<StudioView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
+        }
+
+        private void OnClickBtnTravel()
+        {
+            ViewManager.Show<TravelView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
+        }
+
+        private void OnClickBtnPoem()
+        {
+            ViewManager.Show<PoemView>(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[] { typeof(MainUIView).FullName, this.viewData });
+        }
+
+        private void OnClickBtnArena()
+        {
+            if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(ArenaView).Name))
+            {
+                return;
+            }
+            if (!ArenaDataManager.Instance.IsSeasonOpen)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("赛季未开始");
+                return;
+            }
+
+            ViewManager.Show<ArenaView>(null, new object[] { typeof(MainUIView).FullName, this.viewData }, true);
+            ViewManager.Show<ArenaLoadingView>();
+        }
+
+        protected override void UpdateToCheckGuide(object param)
+        {
+            _ui.m_loaGuidestudio.visible = false;
+            GuideController.TryGuide(_ui.m_btnStudio.target, ConstGuideId.STUDIO_PORCELAIN, 3, "工作室开门啦，进去看看~");
+            GuideController.TryGuide(_ui.m_btnStudio.target, ConstGuideId.STUDIO_FILING, 3, "工作室有新的任务啦。");
+            GuideController.TryGuide(_ui.m_btnField.target, ConstGuideId.FIELD, 2, "外出进行历史考察，会有意想不到的收获哦。");
+            GuideController.TryGuide(_ui.m_btnStudio.target, ConstGuideId.STUDIO_PROPERTY, 2, "");
+            GuideController.TryGuide(_ui.m_btnArena.target, ConstGuideId.ARENA_OPEN, 3, "在这里可以与其他小伙伴比拼搭配哦~");
+            GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.ENTER_CHAPTER_5, 1, "", -1, false);
+        }
+
+    }
+}

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

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

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

@@ -70,20 +70,15 @@ namespace GFGGame
             base.Dispose();
         }
 
-        protected override void Init()
+        protected override void OnInit()
         {
-            base.Init();
+            base.OnInit();
+
             packageName = UI_MainUI.PACKAGE_NAME;
             _ui = UI_MainUI.Create();
             viewCom = _ui.target;
             isfullScreen = true;
             isReturnView = true;
-        }
-
-        protected override void OnInit()
-        {
-            base.OnInit();
-
             _valueBarController = new ValueBarController(_ui.m_valueBar);
 
             _btnYouJian = _ui.m_btnYouJian;
@@ -109,12 +104,7 @@ namespace GFGGame
             _ui.m_btnZhaiXing.target.onClick.Add(OnClickBtnZhaiXing);
             _ui.m_btnXiuFang.target.onClick.Add(OnClickBtnXiuFang);
             _ui.m_btnCiPai.target.onClick.Add(OnClickBtnCiPai);
-            _ui.m_btnStudio.target.onClick.Add(OnClickBtnStudio);
-            _ui.m_btnField.target.onClick.Add(OnClickBtnField);
             _ui.m_headBar.target.onClick.Add(OnClickHeadBar);
-            _ui.m_btnPoem.target.onClick.Add(OnClickBtnPoem);
-            _ui.m_btnArena.target.onClick.Add(OnClickBtnArena);
-            _ui.m_btnTravel.target.onClick.Add(OnClickBtnTravel);
             _ui.m_btnDailyWelfare.target.onClick.Add(OnClickBtnDailyWelfare);
             _ui.m_btnActivityLuckyBox.target.onClick.Add(OnClickBtnActivityLuckyBox);
             _ui.m_btnWanShiLi.target.onClick.Add(OnClickBtnWanShiLi);
@@ -132,8 +122,7 @@ namespace GFGGame
             _ui.m_btnGiftBag1.target.onClick.Add(OnClickBtnGiftBag2);
             _ui.m_btnGiftBag2.target.onClick.Add(OnClickBtnGiftBag1);
 
-            _ui.m_btnHaiZhiShi.target.onClick.Add(MoveLeft);
-            _ui.m_loaLeft.onClick.Add(MoveRight);
+            _ui.m_btnHaiZhiShi.target.onClick.Add(OnClickBtnInstanceZones);
 
             _ui.m_comListAd.m_listAd.itemRenderer = RenderListAdItem;
             _ui.m_comListAd.m_listAd.SetVirtualAndLoop();
@@ -210,11 +199,8 @@ namespace GFGGame
                     ViewManager.Show<DailySignView>(new object[] { 1 });
                 }
             }
-            //long lastTime = GameGlobal.lastLoginTime; // GameGlobal.myNumericComponent.GetAsInt(NumericType.OnlineTimeSecs);
-
-
 
-            SetPos();
+            ChangeMainBg();
             GetAdIds();
             _ui.m_comListAd.target.visible = _ui.m_comListAd.m_listAd.numItems > 0;
             if (_ui.m_comListAd.target.visible)
@@ -233,7 +219,7 @@ namespace GFGGame
             {
                 firstIn = false;
                 MainUIAnimFinished();
-                Timers.inst.StartCoroutine(AddEffect());
+                AddEffect();
             }
             else
             {
@@ -255,9 +241,8 @@ namespace GFGGame
             Timers.inst.Remove(UpdateAdListTime);
         }
 
-        private IEnumerator AddEffect()
+        private void AddEffect()
         {
-            yield return new WaitForSeconds(1f);
             _effectUIList.Add(EffectUIPool.CreateEffectUI(_ui.m_btnMain.m_holder, "ui_zjm", "ZJM_szl_down_3"));
             _effectUIList.Add(EffectUIPool.CreateEffectUI(_ui.m_btnMain.m_holder1, "ui_zjm", "ZJM_szl_top_1"));
             _effectUIList.Add(EffectUIPool.CreateEffectUI(_ui.m_btnHaiZhiShi.m_holder, "ui_zjm", "ZJM_hzs_down_3"));
@@ -265,102 +250,20 @@ namespace GFGGame
             _effectUIList.Add(EffectUIPool.CreateEffectUI(_ui.m_BottomEffectHolder, "ui_zjm", "ZJM_DiBan"));
         }
 
-        private void SetPos()
+        private void ChangeMainBg()
         {
             GameObject Scene = _sceneObject.transform.Find("Scene").gameObject;
             GameObject Bg = _sceneObject.transform.Find("Bg").gameObject;
             GameObject Bg1 = _sceneObject.transform.Find("Bg1").gameObject;
-            if (MainDataManager.Instance.ViewType == 0)
-            {
-                Scene.SetActive(true);
-                Bg.SetActive(true);
-                Bg1.SetActive(false);
-                _ui.m_t3.Play();
-                ;
-            }
-            else if (MainDataManager.Instance.ViewType == 1)
-            {
-                Scene.SetActive(false);
-                Bg.SetActive(false);
-                Bg1.SetActive(true);
-                _ui.m_t4.Play();
-                // _sceneObject.transform.position = new Vector2(-GRoot.inst.width / 100f, 0);
-            }
+            Scene.SetActive(true);
+            Bg.SetActive(true);
+            Bg1.SetActive(false);
         }
-        private void OnSwipeBegin()
-        {
-            Vector2 pos = Input.mousePosition;
-            pos.y = Screen.height - pos.y;
 
-            _startPos = _ui.target.GlobalToLocal(pos);
-        }
-        private void OnSwipeEnd()
+        private void OnClickBtnInstanceZones()
         {
-            Vector2 pos = Input.mousePosition;
-            pos.y = Screen.height - pos.y;
-
-            _endPos = _ui.target.GlobalToLocal(pos);
-        }
-        private void OnSwipe(EventContext context)
-        {
-            if (!MainDataManager.Instance.CanSwipe) return;
-            if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(ConstFunctionId.MAIN_SECOND_VIEW, false)) return;
-
-            if (MainDataManager.Instance.ViewType == 0 && _ui.m_comListAd.m_listAd.numItems > 0//滚动广告区域不可切换页面
-            && _startPos.x > _ui.m_comListAd.target.x && _startPos.x < (_ui.m_comListAd.target.x + _ui.m_comListAd.target.width)
-            && _startPos.y > _ui.m_comListAd.target.y && _startPos.y < (_ui.m_comListAd.target.y + _ui.m_comListAd.target.height)) return;
-            // || _endPos.x < (_ui.m_comListAd.target.x + _ui.m_comListAd.target.width)
-            // && _endPos.y > _ui.m_comListAd.target.y && _endPos.y < (_ui.m_comListAd.target.y + _ui.m_comListAd.target.height)) 
-
-            SwipeGesture swipeture = (SwipeGesture)context.sender;
-            if (MainDataManager.Instance.ViewType == 0 && swipeture.position.x < 0 &&
-                swipeture.position.y < -swipeture.position.x && swipeture.position.y > swipeture.position.x)
-            {
-                MoveLeft();
-            }
-            else if (MainDataManager.Instance.ViewType == 1 && swipeture.position.x > 0 &&
-                     swipeture.position.y > -swipeture.position.x && swipeture.position.y < swipeture.position.x)
-            {
-                MoveRight();
-            }
-        }
-
-        private void MoveLeft()
-        {
-            _ui.target.touchable = false;
             TryCompleteGuide();
-
-            Timers.inst.Add(0.5f, 1, ChangeSceneBg);
-            _ui.m_t1.Play(() =>
-            {
-                _ui.target.touchable = true;
-                MainDataManager.Instance.ViewType = 1;
-            });
-        }
-
-        private void ChangeSceneBg(object param)
-        {
-            _sceneObject.transform.Find("Scene").gameObject.SetActive(false);
-            _sceneObject.transform.Find("Bg").gameObject.SetActive(false);
-            _sceneObject.transform.Find("Bg1").gameObject.SetActive(true);
-        }
-
-        private void MoveRight()
-        {
-            _ui.target.touchable = false;
-            Timers.inst.Add(0.5f, 1, ChangeSceneBg1);
-            _ui.m_t2.Play(() =>
-            {
-                _ui.target.touchable = true;
-                MainDataManager.Instance.ViewType = 0;
-            });
-        }
-
-        private void ChangeSceneBg1(object param)
-        {
-            _sceneObject.transform.Find("Scene").gameObject.SetActive(true);
-            _sceneObject.transform.Find("Bg").gameObject.SetActive(true);
-            _sceneObject.transform.Find("Bg1").gameObject.SetActive(false);
+            ViewManager.Show<InstanceZonesUIView>();
         }
 
         private void OnBtnChangClick()
@@ -393,15 +296,6 @@ namespace GFGGame
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.CHUN_ZHONG_LOU, 1);
             if (isOpen) return;
             isOpen = true;
-            // _ui.m_btnMain.m_holder1.visible = true;
-            // Timers.inst.Add(effectTime, 1, (param) =>
-            // {
-            // _ui.m_btnMain.m_holder1.visible = false;
-            // this.Hide();
-            //ViewManager.Show<StoryChapterListView>(null,
-            //    new object[] { typeof(MainUIView).FullName, this.viewData });
-            //isOpen = false;
-            //;
             List<StoryChapterCfg> _chapterCfgs = StoryChapterCfgArray.Instance.GetCfgsBysubType(0);
             for (int i = 0; i < _chapterCfgs.Count; i++)
             {
@@ -419,7 +313,6 @@ namespace GFGGame
                     return;
                 }
             }
-            // });
         }
 
         private void OnClickBtnHuanZhuang()
@@ -427,16 +320,10 @@ namespace GFGGame
             if (isOpen) return;
             isOpen = true;
             _ui.m_btnHuanZhuang.m_holder1.visible = true;
-
-            // Timers.inst.Add(effectTime, 1, (param) =>
-            // {
             _ui.m_btnHuanZhuang.m_holder1.visible = false;
             this.Hide();
             ViewManager.Show<DressUpView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
             isOpen = false;
-
-
-            // });
         }
 
         private void OnClickBtnZhaiXing()
@@ -445,16 +332,9 @@ namespace GFGGame
 
             if (isOpen) return;
             isOpen = true;
-            _ui.m_btnZhaiXing.m_holder1.visible = true;
-
-            // Timers.inst.Add(effectTime, 1, (param) =>
-            // {
             _ui.m_btnZhaiXing.m_holder1.visible = false;
             ViewManager.Show<LuckyBoxView>(null, null, false, true);
             isOpen = false;
-
-
-            // });
         }
 
         private void OnClickBtnXiuFang()
@@ -504,51 +384,6 @@ namespace GFGGame
             isOpen = false;
 
         }
-
-        private void OnClickBtnStudio()
-        {
-            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[] { typeof(MainUIView).FullName, this.viewData });
-        }
-
-        private void OnClickBtnPoem()
-        {
-            // LogServerHelper.SendNodeLog((int)PlayParticipationEnum.TIAN_YE_DIAO_CHA, 1);
-
-            ViewManager.Show<PoemView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
-        }
-
-        private void OnClickBtnArena()
-        {
-            // LogServerHelper.SendNodeLog((int)PlayParticipationEnum.TIAN_YE_DIAO_CHA, 1);
-            if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(ArenaView).Name))
-            {
-                return;
-            }
-            if (!ArenaDataManager.Instance.IsSeasonOpen)
-            {
-                PromptController.Instance.ShowFloatTextPrompt("赛季未开始");
-                return;
-            }
-
-            ViewManager.Show<ArenaView>(null, new object[] { typeof(MainUIView).FullName, this.viewData }, true);
-            ViewManager.Show<ArenaLoadingView>();
-
-        }
-
-        private void OnClickBtnTravel()
-        {
-            // LogServerHelper.SendNodeLog((int)PlayParticipationEnum.TIAN_YE_DIAO_CHA, 1);
-
-            ViewManager.Show<TravelView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
-        }
-
         private void OnClickBtnBag()
         {
             ViewManager.Show<BagView>(null, new object[] { typeof(MainUIView).FullName, this.viewData });
@@ -980,11 +815,6 @@ namespace GFGGame
             _ui.m_btnCiPai.m_loaLockIcons.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(CardDetailView).Name, false);
             _ui.m_btnZhaiXing.m_loaLockIcons.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(LuckyBoxView).Name, false);
             _ui.m_btnMain.m_loaLockIcons.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StoryChapterListView).Name, false);
-            _ui.m_btnStudio.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioView).Name, false);
-            _ui.m_btnField.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FieldView).Name, false);
-            _ui.m_btnPoem.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(PoemView).Name, false);
-            _ui.m_btnTravel.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(TravelView).Name, false);
-            _ui.m_btnArena.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(ArenaView).Name, false);
             _ui.m_btnActivityLuckyBox.target.visible = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox) > 0;
             List<int> actListChargeIds = ActivityGlobalDataManager.Instance.GetActivityInfoIdsByType(ConstLimitTimeActivityType.ActLimitChargeId);
             int actLimitChargeId = actListChargeIds.Count > 0 ? actListChargeIds[0] : 0;
@@ -1018,11 +848,9 @@ namespace GFGGame
             RedDotController.Instance.SetComRedDot(_btnTuJian, RedDotDataManager.Instance.GetFieldGuideRed() || RedDotDataManager.Instance.GetTravelGuideRed(), "", -8);
             RedDotController.Instance.SetComRedDot(_btnHaoYou, RedDotDataManager.Instance.GetFriendRed(), "", -8);
             RedDotController.Instance.SetComRedDot(_btnStore, RedDotDataManager.Instance.GetShopRed(), "", -8);
-            RedDotController.Instance.SetComRedDot(_ui.m_btnField.target, RedDotDataManager.Instance.GetFieldRed(), "", -36, 32);
-            RedDotController.Instance.SetComRedDot(_ui.m_btnStudio.target, RedDotDataManager.Instance.GetStudioFilingRed(), "", -36, 32);
+            
             RedDotController.Instance.SetComRedDot(_ui.m_headBar.m_comHead, RedDotDataManager.Instance.GetHeadRed() || RedDotDataManager.Instance.GetHeadBorderRed(), "", -26, 42);
 
-            RedDotController.Instance.SetComRedDot(_ui.m_btnTravel.target, RedDotDataManager.Instance.GetTravelRed(), "", -36, 32);
             RedDotController.Instance.SetComRedDot(_btnLeague, RedDotDataManager.Instance.GetLeagueRed(), "", -8);
             RedDotController.Instance.SetComRedDot(_ui.m_btnDailyWelfare.target, RedDotDataManager.Instance.GetDailyWelfareRed(), "", 9, -1);
             RedDotController.Instance.SetComRedDot(_ui.m_btnActivityLuckyBox.target, RedDotDataManager.Instance.GetMeiRiTeHuiRed()
@@ -1087,61 +915,48 @@ namespace GFGGame
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            if (MainDataManager.Instance.ViewType == 0)
-            {
-                GuideController.TryGuide(_ui.m_btnHuanZhuang.target, ConstGuideId.FREEDOM_DRESS, 2, "在这里，自由搭配服饰和分享哦~", -1, false);
-                GuideController.TryGuide(_ui.m_btnMain.target, ConstGuideId.ENTER_CHAPTER, 3, "海市蜃楼，镜花水月，是所有故事开始的地方。", -1, false);
+            GuideController.TryGuide(_ui.m_btnHuanZhuang.target, ConstGuideId.FREEDOM_DRESS, 2, "在这里，自由搭配服饰和分享哦~", -1, false);
+            GuideController.TryGuide(_ui.m_btnMain.target, ConstGuideId.ENTER_CHAPTER, 3, "海市蜃楼，镜花水月，是所有故事开始的地方。", -1, false);
 
-                GuideController.TryGuide(_ui.m_btnXiuFang.target, ConstGuideId.CLOTHING_DECOMPOSE, 2, "绣坊里增添了新功能。", -1, false);
+            GuideController.TryGuide(_ui.m_btnXiuFang.target, ConstGuideId.CLOTHING_DECOMPOSE, 2, "绣坊里增添了新功能。", -1, false);
 
-                GuideController.TryGuide(_ui.m_btnXiuFang.target, ConstGuideId.CLOTHING_SYNTHETIC, 1, "进入绣坊界面。", -1, false);
-                GuideController.TryCompleteGuide(ConstGuideId.CLOTHING_SYNTHETIC, 7);
+            GuideController.TryGuide(_ui.m_btnXiuFang.target, ConstGuideId.CLOTHING_SYNTHETIC, 1, "进入绣坊界面。", -1, false);
+            GuideController.TryCompleteGuide(ConstGuideId.CLOTHING_SYNTHETIC, 7);
 
-                GuideController.TryGuide(_ui.m_btnCiPai.target, ConstGuideId.UP_CARD_LV, 2, "“词牌”可进行升级和管理。", -1, false);
-                GuideController.TryGuide(_ui.m_btnMain.target, ConstGuideId.ENTER_CHAPTER_1, 2, "", -1, false);
+            GuideController.TryGuide(_ui.m_btnCiPai.target, ConstGuideId.UP_CARD_LV, 2, "“词牌”可进行升级和管理。", -1, false);
+            GuideController.TryGuide(_ui.m_btnMain.target, ConstGuideId.ENTER_CHAPTER_1, 2, "", -1, false);
 
-                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_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_btnCiPai.target, ConstGuideId.UP_CARD_STAR, 2, "“词牌”可进行升星。", -1, false);
+            GuideController.TryGuide(_ui.m_btnCiPai.target, ConstGuideId.UP_CARD_STAR, 2, "“词牌”可进行升星。", -1, false);
 
-                GuideController.TryGuide(_ui.m_btnMain.target, ConstGuideId.ENTER_CHAPTER_5, 2, "", -1, false);
+            GuideController.TryGuide(_ui.m_btnMain.target, ConstGuideId.ENTER_CHAPTER_5, 2, "", -1, false);
 
-                GuideController.TryGuide(_ui.m_btnXiuFang.target, ConstGuideId.SUIT_LIST_VIEW, 1,
-                    "获得“天衣”服饰后，可进行养护和焕新，到绣坊看看。", -1, false);
-                GuideController.TryGuide(_ui.m_btnHaiZhiShi.target, ConstGuideId.ARENA_OPEN, 2, "新玩法-飞花令开启了哦", -1, false);
+            GuideController.TryGuide(_ui.m_btnXiuFang.target, ConstGuideId.SUIT_LIST_VIEW, 1,
+                "获得“天衣”服饰后，可进行养护和焕新，到绣坊看看。", -1, false);
+            GuideController.TryGuide(_ui.m_btnHaiZhiShi.target, ConstGuideId.ARENA_OPEN, 2, "新玩法-飞花令开启了哦", -1, false);
 
 
-                bool isStudioMetalGuide = GuideController.TryGuide(_ui.m_btnHaiZhiShi.target, ConstGuideId.STUDIO_PORCELAIN, 2, "进入副本", -1,
-                    false, _ui.target.height - 700);
-                bool isStudioFilingGuide = GuideController.TryGuide(_ui.m_btnHaiZhiShi.target, ConstGuideId.STUDIO_FILING, 2, "进入副本", -1,
-                    false, _ui.target.height - 700);
-                bool isFieldGuide = GuideController.TryGuide(_ui.m_btnHaiZhiShi.target, ConstGuideId.FIELD, 1, "进入副本", -1, false, _ui.target.height - 700);
+            bool isStudioMetalGuide = GuideController.TryGuide(_ui.m_btnHaiZhiShi.target, ConstGuideId.STUDIO_PORCELAIN, 2, "进入副本", -1,
+                false, _ui.target.height - 700);
+            bool isStudioFilingGuide = GuideController.TryGuide(_ui.m_btnHaiZhiShi.target, ConstGuideId.STUDIO_FILING, 2, "进入副本", -1,
+                false, _ui.target.height - 700);
+            bool isFieldGuide = GuideController.TryGuide(_ui.m_btnHaiZhiShi.target, ConstGuideId.FIELD, 1, "进入副本", -1, false, _ui.target.height - 700);
 
-                bool isStudioPropertyGuide = GuideController.TryGuide(_ui.m_btnHaiZhiShi.target, ConstGuideId.STUDIO_PROPERTY, 1, "进入副本", -1, false, _ui.target.height - 700);
+            bool isStudioPropertyGuide = GuideController.TryGuide(_ui.m_btnHaiZhiShi.target, ConstGuideId.STUDIO_PROPERTY, 1, "进入副本", -1, false, _ui.target.height - 700);
 
-                _ui.m_loaGuidestudio.visible = false;
-                // if (isStudioMetalGuide || isStudioFilingGuide || isFieldGuide || isStudioPropertyGuide)
-                // {
-                //     _ui.m_loaGuidestudio.visible = true;
-                //     MainDataManager.Instance.CanSwipe = true;
-                // }
-                // else
-                // {
-                //     _ui.m_loaGuidestudio.visible = false;
-                // }
-            }
-            if (MainDataManager.Instance.ViewType == 1)
-            {
-                _ui.m_loaGuidestudio.visible = false;
-                GuideController.TryGuide(_ui.m_btnStudio.target, ConstGuideId.STUDIO_PORCELAIN, 3, "工作室开门啦，进去看看~");
-                GuideController.TryGuide(_ui.m_btnStudio.target, ConstGuideId.STUDIO_FILING, 3, "工作室有新的任务啦。");
-                GuideController.TryGuide(_ui.m_btnField.target, ConstGuideId.FIELD, 2, "外出进行历史考察，会有意想不到的收获哦。");
-                GuideController.TryGuide(_ui.m_btnStudio.target, ConstGuideId.STUDIO_PROPERTY, 2, "");
-                GuideController.TryGuide(_ui.m_btnArena.target, ConstGuideId.ARENA_OPEN, 3, "在这里可以与其他小伙伴比拼搭配哦~");
-                GuideController.TryGuide(_ui.m_loaLeft, ConstGuideId.ENTER_CHAPTER_5, 1, "", -1, false);
-            }
+            _ui.m_loaGuidestudio.visible = false;
+            // if (isStudioMetalGuide || isStudioFilingGuide || isFieldGuide || isStudioPropertyGuide)
+            // {
+            //     _ui.m_loaGuidestudio.visible = true;
+            //     MainDataManager.Instance.CanSwipe = true;
+            // }
+            // else
+            // {
+            //     _ui.m_loaGuidestudio.visible = false;
+            // }
         }
 
         private void MainUIAnimFinished()

GameClient/Assets/ResIn/UI/InstanceZones.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4dee7809ccbb1754fa770f1a6d27a04b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/InstanceZones/InstanceZones2_fui.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f2ec0cfa0c69acf42a2c414e1d8d5f07
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/Main/Main_atlas0_10!a.png.meta → GameClient/Assets/ResIn/UI/InstanceZones/InstanceZones_atlas0!a.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ab7b14b5b29a1f9469ef2ae4d40c7a98
+guid: 343107e85cfa9eb488ffc3622ebb7068
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

GameClient/Assets/ResIn/UI/Main/Main_atlas0_10.png.meta → GameClient/Assets/ResIn/UI/InstanceZones/InstanceZones_atlas0.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 006adc931cebcfc4b9df3bb377cf04f1
+guid: 1f7d395ad2f1b844ba934d3474dd1938
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

GameClient/Assets/ResIn/UI/InstanceZones/InstanceZones_fui.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 18951bde7dc51cd4d85d79d907ea8e7b
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: