zhaoyang 2 年之前
父节点
当前提交
6d30912a18

+ 2 - 1
FGUIProject/assets/Studio/StudioUI.xml

@@ -4,9 +4,10 @@
     <loader id="n8_gbqo" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </loader>
-    <component id="n1_rbxq" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
+    <component id="n1_rbxq" name="btnBack" src="uyuxtj5" fileName="components/BtnBack0.xml" pkg="eg2y0ldp" xy="35,80">
       <Button icon="ui://xz8kxrecysx92u"/>
     </component>
+    <component id="n10_t6j1" name="btnHome" src="qp4l60" fileName="components/ButtonHome.xml" pkg="eg2y0ldp" xy="35,220"/>
     <component id="n2_rbxq" name="comMetal" src="rbxq5" fileName="components/ComEctype.xml" xy="297,1003">
       <relation target="" sidePair="left-left,bottom-middle"/>
       <property target="icon" propertyId="1" value="ui://xz8kxreces2q1e"/>

+ 1 - 0
GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -205,6 +205,7 @@ namespace GFGGame
 
         public static void GoBackToMainView()
         {
+            MainDataManager.Instance.ViewType = 0;
             ViewManager.Show(ViewName.MAINUI_VIEW, null, null, true);
         }
 

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Data/ActivityDay7DataManager.cs

@@ -6,7 +6,7 @@ namespace GFGGame
     {
         public int GetActivityDay7Day()
         {
-            return GameGlobal.myNumericComponent.GetAsInt(NumericType.Day7Activity);
+            return 0;//GameGlobal.myNumericComponent.GetAsInt(NumericType.Day7Activity);
         }
 
         public long GetScore()

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_StudioUI.cs

@@ -9,6 +9,7 @@ namespace UI.Studio
         public GComponent target;
         public GLoader m_loaBg;
         public GButton m_btnBack;
+        public GButton m_btnHome;
         public UI_ComEctype m_comMetal;
         public UI_ComEctype m_comFabric;
         public UI_ComEctype m_comProperty;
@@ -63,6 +64,7 @@ namespace UI.Studio
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_btnHome = (GButton)comp.GetChild("btnHome");
             m_comMetal = (UI_ComEctype)UI_ComEctype.Create(comp.GetChild("comMetal"));
             m_comFabric = (UI_ComEctype)UI_ComEctype.Create(comp.GetChild("comFabric"));
             m_comProperty = (UI_ComEctype)UI_ComEctype.Create(comp.GetChild("comProperty"));
@@ -73,6 +75,7 @@ namespace UI.Studio
         {
             m_loaBg = null;
             m_btnBack = null;
+            m_btnHome = null;
             m_comMetal.Dispose();
             m_comMetal = null;
             m_comFabric.Dispose();

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

@@ -197,9 +197,9 @@ namespace GFGGame
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             GuideController.TryGuide(_ui.m_listChapter, ConstGuideId.ENTER_CHAPTER, 4, "", 0, true, _ui.target.height / 2);
             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, 4, "", 1, 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, 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_5, 2, "", 1, true, _ui.target.height / 2);
             GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.STUDIO_PORCELAIN, 1, "点击返回主界面。");
             GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.STUDIO_FILING, 1, "点击返回主界面。");

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

@@ -305,14 +305,14 @@ namespace GFGGame
 
             bool isGuide6 = GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.CLOTHING_DECOMPOSE, 1, "点击返回主界面。");
 
-            bool isGuide7 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.ENTER_CHAPTER_2, 5, "来继续我们的旅程吧。");
-            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_2, 5);
+            bool isGuide7 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.ENTER_CHAPTER_2, 4, "来继续我们的旅程吧。");
+            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_2, 4);
 
             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, 5, "来继续我们的旅程吧。");
-            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_4, 5);
+            bool isGuide10 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.ENTER_CHAPTER_4, 4, "来继续我们的旅程吧。");
+            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_4, 4);
 
             bool isGuide11 = GuideController.TryGuide(unPasslevelCom, ConstGuideId.ENTER_CHAPTER_5, 3, "来继续我们的旅程吧。");
             GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_5, 3);
@@ -334,11 +334,11 @@ namespace GFGGame
             GuideController.TryCompleteGuideIndex(cfg2.id, 4);
             GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_2, 4);
             GuideCfg cfg3 = GuideCfgArray.Instance.GetCfg(ConstGuideId.ENTER_CHAPTER_3);
-            GuideController.TryCompleteGuideIndex(cfg3.id, 5);
-            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_3, 5);
+            GuideController.TryCompleteGuideIndex(cfg3.id, 3);
+            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_3, 3);
             GuideCfg cfg4 = GuideCfgArray.Instance.GetCfg(ConstGuideId.ENTER_CHAPTER_4);
-            GuideController.TryCompleteGuideIndex(cfg4.id, 5);
-            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_4, 5);
+            GuideController.TryCompleteGuideIndex(cfg4.id, 4);
+            GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_4, 4);
             GuideCfg cfg5 = GuideCfgArray.Instance.GetCfg(ConstGuideId.ENTER_CHAPTER_5);
             GuideController.TryCompleteGuideIndex(cfg5.id, 3);
             GuideController.TryCompleteGuide(ConstGuideId.ENTER_CHAPTER_5, 3);

+ 2 - 14
GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -1013,9 +1013,9 @@ namespace GFGGame
                 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, 3, "", -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, 3, "", -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);
 
@@ -1053,18 +1053,6 @@ namespace GFGGame
                 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.target, ConstGuideId.ENTER_CHAPTER_5, 1, "");
-
-                bool isEnterChapter2 = GuideController.TryGuide(null, ConstGuideId.ENTER_CHAPTER_2, 2, "向右滑动界面。", -1, false, _ui.target.height - 700);
-                bool isEnterChapter4 = GuideController.TryGuide(null, ConstGuideId.ENTER_CHAPTER_4, 2, "向右滑动界面。", -1, false, _ui.target.height - 700);
-                if (isEnterChapter2 || isEnterChapter4)
-                {
-                    _ui.m_loaGuidestudio.visible = true;
-                    MainDataManager.Instance.CanSwipe = true;
-                }
-                else
-                {
-                    _ui.m_loaGuidestudio.visible = false;
-                }
             }
         }
     }

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

@@ -30,6 +30,7 @@ namespace GFGGame
             isfullScreen = true;
 
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
+            _ui.m_btnHome.onClick.Add(OnClickBtnHome);
 
             _ui.m_comMetal.target.onClick.Add(OnClickComMetal);
             _ui.m_comFabric.target.onClick.Add(OnCliclComFabric);
@@ -67,6 +68,10 @@ namespace GFGGame
             TryCompleteGuide();
             Timers.inst.Remove(CheckGuide);
         }
+        private void OnClickBtnHome()
+        {
+            GameController.GoBackToMainView();
+        }
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
@@ -145,13 +150,13 @@ namespace GFGGame
             GuideController.TryGuide(_ui.m_comPorcelain.target, ConstGuideId.STUDIO_PORCELAIN, 4, "通关这个副本可以获得词牌升级材料,快去挑战吧。");
 
             GuideController.TryGuide(_ui.m_comFiling.target, ConstGuideId.STUDIO_FILING, 4, "完成小伙伴的心愿,获得服饰碎片哦。");
-            GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.ENTER_CHAPTER_2, 1, "");
+            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.ENTER_CHAPTER_2, 1, "");
 
             GuideController.TryGuide(_ui.m_comPorcelain.target, ConstGuideId.STUDIO_PORCELAIN, 4, "通关这个副本可以获得词牌升级材料,快去挑战吧。");
 
             GuideController.TryGuide(_ui.m_comProperty.target, ConstGuideId.STUDIO_PROPERTY, 3, "");
 
-            GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.ENTER_CHAPTER_4, 1, "");
+            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.ENTER_CHAPTER_4, 1, "");
         }
 
         protected override void TryCompleteGuide()

二进制
GameClient/Assets/ResIn/UI/Studio/Studio_fui.bytes