引导

FGUIProject/assets/DressUp/PhotographUI.xml

@@ -4,8 +4,12 @@
     <loader id="n8_g3xa" name="btnBg" xy="0,0" size="1080,1136">
       <relation target="" sidePair="height-height"/>
     </loader>
-    <loader id="n11_o139" name="loaGuide" xy="128,114" size="783,972"/>
-    <loader id="n12_o139" name="loaGuide1" xy="135,185" size="783,1397"/>
+    <loader id="n11_o139" name="loaGuide" xy="148,153" size="783,972">
+      <relation target="" sidePair="bottom-bottom"/>
+    </loader>
+    <loader id="n12_o139" name="loaGuide1" xy="148,185" size="783,1397">
+      <relation target="" sidePair="bottom-bottom"/>
+    </loader>
     <component id="n9_g3xa" name="comSelectBox" src="g3xa4l" fileName="ComChecked.xml" xy="420,728" pivot="0.5,0.5" anchor="true"/>
     <component id="n1_yd72" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
     <component id="n10_i3ix" name="btnPhotograph" src="g3xa4h" fileName="components/Button8.xml" xy="919,650">

FGUIProject/assets/Main/StoryLevelInfoUI.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1160" designImageOffsetX="-750">
-  <controller name="ctrlNeed" pages="0,,1,,2," selected="0"/>
+  <controller name="ctrlNeed" pages="0,,1,,2," selected="1"/>
   <displayList>
     <loader id="n44_yoe2" name="btnBg" xy="0,-153" size="1080,1414" url="ui://mfvz4q8kj48o94" autoSize="true"/>
     <component id="n0_vxw5" name="btnStart" src="t8o13i" fileName="componentsLevel/ButtonStart.xml" xy="766,864">
@@ -14,10 +14,10 @@
       <gearText controller="ctrlNeed" pages="2" values="通关加分：" default="通关条件："/>
     </text>
     <text id="n7_t8o1" name="txtHighestScore" xy="580,205" size="226,57" fontSize="32" color="#a28d77" ubb="true" autoSize="none" autoClearText="true" text="9999"/>
-    <text id="n41_j48o" name="txtNeed" xy="580,352" size="132,44" fontSize="32" color="#a28d77" leading="10" ubb="true" autoClearText="true" text="赵钱孙李">
+    <richtext id="n45_rfkv" name="txtNeed" xy="580,352" size="132,44" fontSize="32" color="#a28d77" text="赵钱孙李">
       <gearDisplay controller="ctrlNeed" pages="1"/>
-    </text>
-    <list id="n42_j48o" name="listTag" xy="581,357" size="315,41" layout="row" colGap="10" defaultItem="ui://eg2y0ldpih7566" autoClearItems="true">
+    </richtext>
+    <list id="n42_j48o" name="listTag" xy="581,357" size="206,41" layout="row" colGap="10" defaultItem="ui://eg2y0ldpih7566" autoClearItems="true">
       <gearDisplay controller="ctrlNeed" pages="2"/>
       <item/>
       <item/>

GameClient/Assets/Game/HotUpdate/Constant/ConstGuideId.cs

@@ -34,5 +34,6 @@ namespace GFGGame
         public const string SKILL_CARD_FIGHT = "SKILL_CARD_FIGHT";
         public const string OPEN_TAGS = "OPEN_TAGS";
         public const string UP_CARD_STAR = "UP_CARD_STAR";
+        public const string PHOTOGRAPH = "PHOTOGRAPH";
     }
 }

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

@@ -686,8 +686,8 @@ namespace GFGGame
             return false;
         }
         /*********************************************************************************************************************************/
-        public static bool useNewGuide = false;
-        public static bool TryGuide(GObject target, string guideKey, int index, string guideStr = null, bool isList = false, int listIndex = 0, bool checkInde = true, bool needUpdate = false, int yTxt = 0, bool isOptionalGuide = false, float devWidth = 0, float devHeight = 0)
+        public static bool useNewGuide = true;
+        public static bool TryGuide(GObject target, string guideKey, int index, string guideStr = null, bool isList = false, int listIndex = 0, bool checkInde = true, bool needUpdate = false, int yTxt = 0, float devWidth = 0, float devHeight = 0)
         {
             if (!useNewGuide) return false;
 
@@ -720,7 +720,7 @@ namespace GFGGame
                         return false;
                     }
                 }
-                ShowGuideIndex(target, needUpdate, guideStr, yTxt, isOptionalGuide, devWidth, devHeight, GuideDataManager.currentGuideId, GuideDataManager.currentGuideIdIndex);
+                ShowGuideIndex(target, needUpdate, guideStr, yTxt, cfg.optionalGuide == 1, devWidth, devHeight, GuideDataManager.currentGuideId, GuideDataManager.currentGuideIdIndex);
                 if (!checkInde)
                 {
                     for (int i = 1; i < index; i++)

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

@@ -12,7 +12,7 @@ namespace UI.Main
         public GButton m_btnStart;
         public GTextField m_txtTitle;
         public GTextField m_txtHighestScore;
-        public GTextField m_txtNeed;
+        public GRichTextField m_txtNeed;
         public GList m_listTag;
         public GTextField m_txtLevelDesc;
         public GLoader m_loaderHead;
@@ -79,7 +79,7 @@ namespace UI.Main
             m_btnStart = (GButton)comp.GetChild("btnStart");
             m_txtTitle = (GTextField)comp.GetChild("txtTitle");
             m_txtHighestScore = (GTextField)comp.GetChild("txtHighestScore");
-            m_txtNeed = (GTextField)comp.GetChild("txtNeed");
+            m_txtNeed = (GRichTextField)comp.GetChild("txtNeed");
             m_listTag = (GList)comp.GetChild("listTag");
             m_txtLevelDesc = (GTextField)comp.GetChild("txtLevelDesc");
             m_loaderHead = (GLoader)comp.GetChild("loaderHead");

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

@@ -395,15 +395,15 @@ namespace GFGGame
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
-            GuideController.TryGuide(_ui.m_listClothing, ConstGuideId.CLOTHING_SYNTHETIC, 7, "找到需要合成的物品", true, 0);
+            GuideController.TryGuide(_ui.m_listClothing, ConstGuideId.CLOTHING_SYNTHETIC, 8, "找到需要合成的物品", true, 0);
             if (_ui.m_listMaterias.numChildren > 0)
             {
                 listTypeItem_CloSynthetic = UI_MateriasListItem.Proxy(_ui.m_listMaterias.GetChildAt(0));
 
             }
-            if (listTypeItem_CloSynthetic != null) GuideController.TryGuide(listTypeItem_CloSynthetic.m_loaderIcon, ConstGuideId.CLOTHING_SYNTHETIC, 8, "这里可以查看合成需要的材料，和材料的获取途径");
-            GuideController.TryGuide(_ui.m_btnProduction, ConstGuideId.CLOTHING_SYNTHETIC, 9, "点击合成物品");
-            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.CLOTHING_SYNTHETIC, 10, "获得必需品啦，继续通关主线剧情吧");
+            if (listTypeItem_CloSynthetic != null) GuideController.TryGuide(listTypeItem_CloSynthetic.m_loaderIcon, ConstGuideId.CLOTHING_SYNTHETIC, 9, "这里可以查看合成需要的材料，和材料的获取途径");
+            GuideController.TryGuide(_ui.m_btnProduction, ConstGuideId.CLOTHING_SYNTHETIC, 10, "点击合成物品");
+            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.CLOTHING_SYNTHETIC, 11, "获得必需品啦，继续通关主线剧情吧");
         }
     }
 }

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

@@ -184,7 +184,7 @@ namespace GFGGame
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
-            GuideController.TryGuide(_ui.m_listSuit, ConstGuideId.CLOTHING_SYNTHETIC, 6, "查看已解锁的图谱", true, 0);
+            GuideController.TryGuide(_ui.m_listSuit, ConstGuideId.CLOTHING_SYNTHETIC, 7, "查看已解锁的图谱", true, 0);
         }
     }
 }

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

@@ -582,6 +582,8 @@ namespace GFGGame
             GuideController.TryGuide(_ui.m_btnSave, ConstGuideId.FREEDOM_DRESS, 5, "搭配好的服饰，可以保存随时查看");
             GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.FREEDOM_DRESS, 6, "保存成功，回主界面看看吧");
             GuideController.TryCompleteGuide(ConstGuideId.FREEDOM_DRESS, 6);
+            GuideController.TryGuide(_ui.m_btnPhoto, ConstGuideId.PHOTOGRAPH, 3, "点击拍照");
+
         }
     }
 }

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

@@ -122,7 +122,7 @@ namespace GFGGame
             UpdateScene();
             GuideController.TryGuideDressUpViewMenuPart1(_ui.m_ComSelectRes.m_comBtnTab.m_btn2);
             // GuideController.TryGuideBtnPhotograph(_ui.m_btnPhotograph);
-            if (GuideDataManager.GetGuideCount(ConstGuideId.PHOTOGRAPH_GUIDE) > 0)
+            if (GuideDataManager.GetGuideCount(ConstGuideId.PHOTOGRAPH_GUIDE) > 0 && GuideDataManager.GetGuideCountCopy(ConstGuideId.PHOTOGRAPH) > 0)
             {
                 _ui.m_loaGuide.enabled = false;
                 _ui.m_loaGuide1.enabled = false;
@@ -132,6 +132,7 @@ namespace GFGGame
                 _ui.m_loaGuide.enabled = true;
                 _ui.m_loaGuide1.enabled = false;
             }
+            Timers.inst.AddUpdate(UpdateToCheckGuide);
         }
         /************************************************************UI界面*********************************************************/
         private void OnContorllerChanged(EventContext context)
@@ -600,6 +601,8 @@ namespace GFGGame
             rotationGesture.onAction.Remove(OnRotate);
             pinchGesture = null;
             rotationGesture = null;
+
+            Timers.inst.Remove(UpdateToCheckGuide);
         }
         public override void Dispose()
         {
@@ -610,6 +613,15 @@ namespace GFGGame
             }
             base.Dispose();
         }
+        private void UpdateToCheckGuide(object param)
+        {
+            if (!ViewManager.CheckIsTopView(this.viewCom)) return;
+            GuideController.TryGuide(_ui.m_ComSelectRes.m_comBtnTab.m_btn2, ConstGuideId.PHOTOGRAPH, 4, "可以自由添加已有道具");
+            GuideController.TryGuide(_ui.m_loaGuide, ConstGuideId.PHOTOGRAPH, 5, "点击空白处查看整体效果");
+            GuideController.TryGuide(_ui.m_loaGuide1, ConstGuideId.PHOTOGRAPH, 6, "双指可控制放大缩小，或点击边框上的按键控制");
+            GuideController.TryGuide(_ui.m_btnPhotograph, ConstGuideId.PHOTOGRAPH, 7, "点击拍照，可以记录和分享美照啦");
+            GuideController.TryCompleteGuide(ConstGuideId.PHOTOGRAPH, 7);
+        }
 
     }
 }

GameClient/Assets/Game/HotUpdate/Views/Guide/GuideView.cs

@@ -17,6 +17,9 @@ namespace GFGGame
         private int guideId;
         private int guideIndex;
         private bool isOptionalGuide = false;//弱引导，点击任意地方都可关闭
+
+        private GameObject _gameObject;
+        private GoWrapper _wrapper;
         public override void Dispose()
         {
             base.Dispose();

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

@@ -256,7 +256,7 @@ namespace GFGGame
         {
 
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            GuideController.TryGuide(null, ConstGuideId.LUCKY_BOX, 4, "点击将星星链接在一起", false, 0, true, false, 1600);
+            GuideController.TryGuide(null, ConstGuideId.LUCKY_BOX, 4, "点击将星星链接在一起", false, 0, true, false, 1780);
             TryCompleteGuide();
         }
         private void TryCompleteGuide()

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

@@ -200,7 +200,7 @@ namespace GFGGame
         {
             // bool result = GuideController.TryCompleteGuide(ConstGuideId.MAIN_UI_BTN_ZHAI_XING);
             LuckyBoxCfg luckyBoxCfg = LuckyBoxCfgArray.Instance.GetCfg(LuckyBoxBonusDataCache.currentBoxId);
-            if (GuideDataManager.GetGuideCount(ConstGuideId.MAIN_UI_BTN_ZHAI_XING) <= 0)
+            if (GuideDataManager.GetGuideCount(ConstGuideId.MAIN_UI_BTN_ZHAI_XING) <= 0 || GuideDataManager.GetGuideCountCopy(ConstGuideId.LUCKY_BOX) <= 0)
             {
 
                 Timers.inst.AddUpdate(UpdateToCheckGuide);

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

@@ -295,9 +295,13 @@ namespace GFGGame
             GuideController.TryGuide(_unPasslevelItem, ConstGuideId.SINGLE_FIGHT, 1, "遇到意外事件了，暂时解释不清，先按请求换上服饰吧");
             GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.LUCKY_BOX, 1, "点击返回主界面");
 
-            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.CLOTHING_SYNTHETIC, 3, "先回到主界面");
+            GuideController.TryGuide(_unPasslevelItem, ConstGuideId.CLOTHING_SYNTHETIC, 1, "点击下一关");
+            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.CLOTHING_SYNTHETIC, 4, "先回到主界面");
+
             GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.UP_CARD_STAR, 1, "点击返回主界面");
 
+            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.PHOTOGRAPH, 1, "拍照功能已开启，解锁更多搭配和玩法哦");
+
         }
     }
 

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

@@ -288,13 +288,13 @@ namespace GFGGame
             bar.value = 100;
             bar.TweenValue(0, time).OnComplete((GTweener tweener) =>
             {
-                GProgressBar bar = (GProgressBar)tweener.target;
-                UI_ComBtnSkill item = UI_ComBtnSkill.Proxy(bar.parent);
-                int count = (int)item.m_icon.data;
-                RoleSkillCfg cfg = item.target.data as RoleSkillCfg;
-                item.m_c1.selectedIndex = count >= cfg.limiteCount ? 2 : 0;
+                GProgressBar bar1 = (GProgressBar)tweener.target;
+                UI_ComBtnSkill item1 = UI_ComBtnSkill.Proxy(bar1.parent);
+                int count = (int)item1.m_icon.data;
+                RoleSkillCfg cfg = item1.target.data as RoleSkillCfg;
+                item1.m_c1.selectedIndex = count >= cfg.limiteCount ? 2 : 0;
 
-                item.m_proCD.visible = false;
+                item1.m_proCD.visible = false;
             });
         }
 
@@ -508,7 +508,7 @@ namespace GFGGame
 
             if (playStop)
             {
-                GuideController.TryGuide(_ui.m_comMineCircle.target, ConstGuideId.TARGET_FIGHT, 2, "这里可以观察双方的分数计算", false, 0, true, false, 0, false, -128f, -128f);
+                GuideController.TryGuide(_ui.m_comMineCircle.target, ConstGuideId.TARGET_FIGHT, 2, "这里可以观察双方的分数计算", false, 0, true, false, 0, -128f, -128f);
             }
             GuideController.TryGuide(_ui.m_btnSkill0.target, ConstGuideId.TARGET_FIGHT, 3, "使用技能，可以增加胜出的几率哦，点击看看");
             GuideController.TryCompleteGuide(ConstGuideId.TARGET_FIGHT, 3);

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

@@ -261,12 +261,12 @@ namespace GFGGame
             GuideController.TryGuideStoryLevelInfoView(null);
             GuideController.TryGuide(_ui.m_btnStart, ConstGuideId.SINGLE_FIGHT, 2, "点击开启换装");
 
-            if (GuideController.TryGuide(_ui.m_txtNeed, ConstGuideId.CLOTHING_SYNTHETIC, 1, "这次必需品，要通过合成获得", false, 0, true, false, 0, true))
+            if (GuideController.TryGuide(_ui.m_txtNeed, ConstGuideId.CLOTHING_SYNTHETIC, 2, "这次必需品，要通过合成获得"))
             {
                 _ui.m_btnStart.touchable = false;
             }
-            GuideController.TryGuide(null, ConstGuideId.CLOTHING_SYNTHETIC, 2, "点击空白处关闭", false, 0, true, false, 1300);
-            GuideController.TryGuide(_ui.m_listTag, ConstGuideId.OPEN_TAGS, 1, "选择相应的关卡标签，可提高分数", false, 0, true, false, 0, true);
+            GuideController.TryGuide(null, ConstGuideId.CLOTHING_SYNTHETIC, 3, "点击空白处关闭", false, 0, true, false, 1300);
+            GuideController.TryGuide(_ui.m_listTag, ConstGuideId.OPEN_TAGS, 1, "选择相应的关卡标签，可提高分数", false, 0, true, false, 0);
             GuideController.TryCompleteGuide(ConstGuideId.OPEN_TAGS, 1);
 
 
@@ -275,7 +275,7 @@ namespace GFGGame
         private void TryCompleteGuide()
         {
             GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.CLOTHING_SYNTHETIC);
-            GuideController.TryCompleteGuideIndex(cfg.id, 2);
+            GuideController.TryCompleteGuideIndex(cfg.id, 3);
         }
     }
 }

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

@@ -339,12 +339,16 @@ namespace GFGGame
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             GuideController.TryGuide(_ui.m_btnZhaiXing.target, ConstGuideId.LUCKY_BOX, 2, "“摘星”里可以通过星辰的力量获得服饰", false, 0, false);
+
             GuideController.TryCompleteGuide(ConstGuideId.FREEDOM_DRESS, 6);
             GuideController.TryGuide(_ui.m_btnHuanZhuang.target, ConstGuideId.FREEDOM_DRESS, 2, "在这里，可以自由搭配服饰和分享哦~", false, 0, false);
-            GuideController.TryGuide(_ui.m_btnXiuFang.target, ConstGuideId.CLOTHING_SYNTHETIC, 4, "绣坊里增添了新功能", false, 0, false);
-            GuideController.TryCompleteGuide(ConstGuideId.CLOTHING_SYNTHETIC, 10);
+
+            GuideController.TryGuide(_ui.m_btnXiuFang.target, ConstGuideId.CLOTHING_SYNTHETIC, 5, "绣坊里增添了新功能", false, 0, false);
+            GuideController.TryCompleteGuide(ConstGuideId.CLOTHING_SYNTHETIC, 11);
 
             GuideController.TryGuide(_ui.m_btnCiPai.target, ConstGuideId.UP_CARD_STAR, 2, "已经收集了足够的材料，可以给词牌升星了");
+            GuideController.TryGuide(_ui.m_btnHuanZhuang.target, ConstGuideId.PHOTOGRAPH, 2, "点这里看看吧", false, 0, false);
+
         }
     }
 }

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

@@ -69,7 +69,7 @@ namespace GFGGame
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
-            GuideController.TryGuide(_ui.m_btnSuitSynthetic, ConstGuideId.CLOTHING_SYNTHETIC, 5, "这里可以查看已获得的服饰图谱");
+            GuideController.TryGuide(_ui.m_btnSuitSynthetic, ConstGuideId.CLOTHING_SYNTHETIC, 6, "这里可以查看已获得的服饰图谱");
 
         }