Browse Source

博物图鉴

zhaoyang 3 years ago
parent
commit
4816bbc88b
60 changed files with 759 additions and 62 deletions
  1. 22 0
      FGUIProject/assets/FieldGuide/ChapterItemGuideUI.xml
  2. 18 0
      FGUIProject/assets/FieldGuide/ChapterItemShowUI.xml
  3. 10 0
      FGUIProject/assets/FieldGuide/components/ChapterGuideItem.xml
  4. BIN
      FGUIProject/assets/FieldGuide/images/bwtj_bti.png
  5. BIN
      FGUIProject/assets/FieldGuide/images/jbhc_diban_4.png
  6. BIN
      FGUIProject/assets/FieldGuide/imagesExport/beijing1_bg.png
  7. BIN
      FGUIProject/assets/FieldGuide/imagesExport/beijing2_bg.png
  8. BIN
      FGUIProject/assets/FieldGuide/imagesExport/beijing3_bg.png
  9. BIN
      FGUIProject/assets/FieldGuide/imagesExport/beijing4_bg.png
  10. BIN
      FGUIProject/assets/FieldGuide/imagesExport/chapter_2.png
  11. BIN
      FGUIProject/assets/FieldGuide/imagesExport/chapter_3.png
  12. BIN
      FGUIProject/assets/FieldGuide/imagesExport/chapter_4.png
  13. BIN
      FGUIProject/assets/FieldGuide/imagesExport/chapter_5.png
  14. 13 0
      FGUIProject/assets/FieldGuide/package.xml
  15. 77 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_ChapterGuideItem.cs
  16. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_ChapterGuideItem.cs.meta
  17. 77 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_ChapterItemGuideUI.cs
  18. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_ChapterItemGuideUI.cs.meta
  19. 83 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_ChapterItemShowUI.cs
  20. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_ChapterItemShowUI.cs.meta
  21. 1 1
      GameClient/Assets/Game/HotUpdate/Views/Card/CardDetailView.cs
  22. 2 2
      GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs
  23. 3 3
      GameClient/Assets/Game/HotUpdate/Views/ClothingDecompose/ClothingDecomposeView.cs
  24. 1 1
      GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingListView.cs
  25. 2 2
      GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingView.cs
  26. 1 1
      GameClient/Assets/Game/HotUpdate/Views/ClothingShop/ClothingShopView.cs
  27. 4 4
      GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs
  28. 1 1
      GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/SuitSyntheticView.cs
  29. 1 1
      GameClient/Assets/Game/HotUpdate/Views/Common/Alert/AlertWindow.cs
  30. 1 1
      GameClient/Assets/Game/HotUpdate/Views/CommonGame/ApproachOfItemView.cs
  31. 1 1
      GameClient/Assets/Game/HotUpdate/Views/CommonGame/BuyCountView.cs
  32. 2 2
      GameClient/Assets/Game/HotUpdate/Views/CommonGame/GetSuitItemVIew.cs
  33. 7 7
      GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs
  34. 5 5
      GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpView.cs
  35. 2 2
      GameClient/Assets/Game/HotUpdate/Views/DressUp/PhotographView.cs
  36. 81 0
      GameClient/Assets/Game/HotUpdate/Views/FieldGuide/ChapterItemGuideView.cs
  37. 11 0
      GameClient/Assets/Game/HotUpdate/Views/FieldGuide/ChapterItemGuideView.cs.meta
  38. 67 0
      GameClient/Assets/Game/HotUpdate/Views/FieldGuide/ChapterItemShowView.cs
  39. 11 0
      GameClient/Assets/Game/HotUpdate/Views/FieldGuide/ChapterItemShowView.cs.meta
  40. 3 1
      GameClient/Assets/Game/HotUpdate/Views/FieldGuide/FieldGuideView.cs
  41. 1 1
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxStarView.cs
  42. 2 2
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs
  43. 1 1
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryCardChoose.cs
  44. 2 2
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterListView.cs
  45. 3 3
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterView.cs
  46. 1 1
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs
  47. 2 2
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs
  48. 2 2
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryLevelInfoView.cs
  49. 2 2
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StroyFightResultView.cs
  50. 7 7
      GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs
  51. 1 1
      GameClient/Assets/Game/HotUpdate/Views/Studio/StudioView.cs
  52. 3 3
      GameClient/Assets/Game/HotUpdate/Views/XiuFang/XiuFangView.cs
  53. BIN
      GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes
  54. BIN
      GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0!a.png
  55. BIN
      GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0.png
  56. BIN
      GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_1!a.png
  57. 96 0
      GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_1!a.png.meta
  58. BIN
      GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_1.png
  59. 96 0
      GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_1.png.meta
  60. BIN
      GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_fui.bytes

+ 22 - 0
FGUIProject/assets/FieldGuide/ChapterItemGuideUI.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920">
+  <displayList>
+    <loader id="n0_s61p" 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>
+    <image id="n1_s61p" name="n1" src="pq5x5z" fileName="images/kp_bejing_di.png" pkg="eg2y0ldp" xy="28,264" size="1024,1586">
+      <relation target="" sidePair="width-width,height-height,center-center"/>
+    </image>
+    <component id="n2_s61p" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80">
+      <relation target="" sidePair="left-left,top-top"/>
+    </component>
+    <image id="n3_s61p" name="n3" src="s61p24" fileName="images/bwtj_bti.png" xy="162,96"/>
+    <list id="n9_s61p" name="list" xy="56,281" size="967,1536" layout="flow_hz" overflow="scroll" lineGap="40" colGap="50" defaultItem="ui://vqq9h9h4s61p29">
+      <relation target="" sidePair="bottomext-bottom"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+  </displayList>
+</component>

+ 18 - 0
FGUIProject/assets/FieldGuide/ChapterItemShowUI.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1920">
+  <displayList>
+    <loader id="n15_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="n9_pjip" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
+    <loader id="n17_s61p" name="loaItem" xy="540,960" pivot="0.5,0.5" anchor="true" size="740,1210" url="ui://vqq9h9h4s61p2c" autoSize="true">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </loader>
+    <text id="n18_s61p" name="txtTitle" xy="71,1550" size="292,64" fontSize="48" color="#816b4d" text="白金黑松露精">
+      <relation target="" sidePair="left-left,top-bottom"/>
+    </text>
+    <text id="n19_s61p" name="txtDesc" xy="80,1648" size="932,142" fontSize="36" color="#907656" autoSize="none" text="那些打不倒你的,/终将积聚成你内在的能量。当能量足够强 大,何必再借光,你就是光!与我一起开启@雅诗兰黛 全新 #白金黑松露精华# 的强大内核能量">
+      <relation target="" sidePair="left-left,top-bottom"/>
+    </text>
+  </displayList>
+</component>

+ 10 - 0
FGUIProject/assets/FieldGuide/components/ChapterGuideItem.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="457,551">
+  <displayList>
+    <loader id="n5_s61p" name="loaIcon" xy="0,0" size="457,551" url="ui://vqq9h9h4s61p20" autoSize="true"/>
+    <image id="n6_s61p" name="n6" src="s61p23" fileName="images/jbhc_diban_4.png" xy="2,1" size="453,543" group="n9_s61p"/>
+    <image id="n7_s61p" name="n7" src="ohuntac" fileName="imagesExport/zhuxian_shuoto.png" pkg="eg2y0ldp" xy="193,223" group="n9_s61p"/>
+    <text id="n8_s61p" name="txtDesc" xy="64,281" pivot="0.5,0" size="328,49" group="n9_s61p" fontSize="36" color="#f1e6d9" align="center" text="通关主线第六章解锁"/>
+    <group id="n9_s61p" name="grpLock" xy="2,1" size="453,543" advanced="true"/>
+  </displayList>
+</component>

BIN
FGUIProject/assets/FieldGuide/images/bwtj_bti.png


BIN
FGUIProject/assets/FieldGuide/images/jbhc_diban_4.png


BIN
FGUIProject/assets/FieldGuide/imagesExport/beijing1_bg.png


BIN
FGUIProject/assets/FieldGuide/imagesExport/beijing2_bg.png


BIN
FGUIProject/assets/FieldGuide/imagesExport/beijing3_bg.png


BIN
FGUIProject/assets/FieldGuide/imagesExport/beijing4_bg.png


BIN
FGUIProject/assets/FieldGuide/imagesExport/chapter_2.png


BIN
FGUIProject/assets/FieldGuide/imagesExport/chapter_3.png


BIN
FGUIProject/assets/FieldGuide/imagesExport/chapter_4.png


BIN
FGUIProject/assets/FieldGuide/imagesExport/chapter_5.png


+ 13 - 0
FGUIProject/assets/FieldGuide/package.xml

@@ -56,6 +56,19 @@
     <image id="r0yx1v" name="tujian_tup_1.png" path="/imagesExport/" exported="true"/>
     <image id="s61p1w" name="tujian_tup_2.png" path="/imagesExport/" exported="true"/>
     <image id="s61p1x" name="tujian_taoz_6.png" path="/imagesExport/" exported="true"/>
+    <component id="s61p1y" name="ChapterItemGuideUI.xml" path="/" exported="true"/>
+    <image id="s61p23" name="jbhc_diban_4.png" path="/images/" scale="9grid" scale9grid="113,135,226,270"/>
+    <image id="s61p24" name="bwtj_bti.png" path="/images/"/>
+    <component id="s61p29" name="ChapterGuideItem.xml" path="/components/"/>
+    <image id="s61p2a" name="beijing1_bg.png" path="/imagesExport/" exported="true"/>
+    <image id="s61p2b" name="beijing2_bg.png" path="/imagesExport/" exported="true"/>
+    <image id="s61p2c" name="beijing3_bg.png" path="/imagesExport/" exported="true"/>
+    <image id="s61p2d" name="beijing4_bg.png" path="/imagesExport/" exported="true"/>
+    <image id="s61p2e" name="chapter_2.png" path="/imagesExport/" exported="true"/>
+    <image id="s61p2f" name="chapter_3.png" path="/imagesExport/" exported="true"/>
+    <image id="s61p2g" name="chapter_4.png" path="/imagesExport/" exported="true"/>
+    <image id="s61p2h" name="chapter_5.png" path="/imagesExport/" exported="true"/>
+    <component id="s61p2i" name="ChapterItemShowUI.xml" path="/" exported="true"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\FieldGuide" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 77 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_ChapterGuideItem.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.FieldGuide
+{
+    public partial class UI_ChapterGuideItem
+    {
+        public GComponent target;
+        public GLoader m_loaIcon;
+        public GTextField m_txtDesc;
+        public GGroup m_grpLock;
+        public const string URL = "ui://vqq9h9h4s61p29";
+        public const string PACKAGE_NAME = "FieldGuide";
+        public const string RES_NAME = "ChapterGuideItem";
+        private static UI_ChapterGuideItem _proxy;
+
+        public static UI_ChapterGuideItem Create(GObject gObject = null)
+        {
+            var ui = new UI_ChapterGuideItem();
+            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_ChapterGuideItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ChapterGuideItem();
+            }
+            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_loaIcon = (GLoader)comp.GetChild("loaIcon");
+            m_txtDesc = (GTextField)comp.GetChild("txtDesc");
+            m_grpLock = (GGroup)comp.GetChild("grpLock");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaIcon = null;
+            m_txtDesc = null;
+            m_grpLock = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_ChapterGuideItem.cs.meta

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

+ 77 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_ChapterItemGuideUI.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.FieldGuide
+{
+    public partial class UI_ChapterItemGuideUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GButton m_btnBack;
+        public GList m_list;
+        public const string URL = "ui://vqq9h9h4s61p1y";
+        public const string PACKAGE_NAME = "FieldGuide";
+        public const string RES_NAME = "ChapterItemGuideUI";
+        private static UI_ChapterItemGuideUI _proxy;
+
+        public static UI_ChapterItemGuideUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ChapterItemGuideUI();
+            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_ChapterItemGuideUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ChapterItemGuideUI();
+            }
+            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_btnBack = (GButton)comp.GetChild("btnBack");
+            m_list = (GList)comp.GetChild("list");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_btnBack = null;
+            m_list = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_ChapterItemGuideUI.cs.meta

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

+ 83 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_ChapterItemShowUI.cs

@@ -0,0 +1,83 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.FieldGuide
+{
+    public partial class UI_ChapterItemShowUI
+    {
+        public GComponent target;
+        public GLoader m_loaBg;
+        public GButton m_btnBack;
+        public GLoader m_loaItem;
+        public GTextField m_txtTitle;
+        public GTextField m_txtDesc;
+        public const string URL = "ui://vqq9h9h4s61p2i";
+        public const string PACKAGE_NAME = "FieldGuide";
+        public const string RES_NAME = "ChapterItemShowUI";
+        private static UI_ChapterItemShowUI _proxy;
+
+        public static UI_ChapterItemShowUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ChapterItemShowUI();
+            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_ChapterItemShowUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ChapterItemShowUI();
+            }
+            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_btnBack = (GButton)comp.GetChild("btnBack");
+            m_loaItem = (GLoader)comp.GetChild("loaItem");
+            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
+            m_txtDesc = (GTextField)comp.GetChild("txtDesc");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_loaBg = null;
+            m_btnBack = null;
+            m_loaItem = null;
+            m_txtTitle = null;
+            m_txtDesc = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_ChapterItemShowUI.cs.meta

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

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Card/CardDetailView.cs

@@ -158,7 +158,7 @@ namespace GFGGame
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
-            GuideController.TryGuide(_ui.m_listCard, ConstGuideId.UP_CARD_LV, 3, "选择可升级的词牌", 0, true, 0, 0, 0, true, true);
+            GuideController.TryGuide(_ui.m_listCard, ConstGuideId.UP_CARD_LV, 3, "选择可升级的词牌", 0, true, 0, 0, 0, true, true);
         }
     }
 }

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -825,8 +825,8 @@ namespace GFGGame
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            GuideController.TryGuide(_ui.m_ComFosterBottom.m_listLvConsume, ConstGuideId.UP_CARD_LV, 4, "长按材料图标,可持续给词牌增加经验", 0, true, 0, 0, 0, true, true);
-            GuideController.TryGuide(_ui.m_ComFosterBottom.m_btnUpLv, ConstGuideId.UP_CARD_LV, 5, "点击升级", -1, true, 0, 0, 0, true, true);
+            GuideController.TryGuide(_ui.m_ComFosterBottom.m_listLvConsume, ConstGuideId.UP_CARD_LV, 4, "长按材料图标,可持续给词牌增加经验", 0, true, 0, 0, 0, true, true);
+            GuideController.TryGuide(_ui.m_ComFosterBottom.m_btnUpLv, ConstGuideId.UP_CARD_LV, 5, "点击升级", -1, true, 0, 0, 0, true, true);
             // GuideController.TryGuide(_ui.m_ComFosterBottom.m_btnUpStar, ConstGuideId.UP_CARD_STAR, 5, "升满5星后,可解锁词牌的隐藏卡面哦");
             GuideController.TryCompleteGuide(ConstGuideId.UP_CARD_LV, 5);
         }

+ 3 - 3
GameClient/Assets/Game/HotUpdate/Views/ClothingDecompose/ClothingDecomposeView.cs

@@ -315,10 +315,10 @@ namespace GFGGame
 
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
-            GuideController.TryGuide(_ui.m_list, ConstGuideId.CLOTHING_DECOMPOSE, 4, "选择重复获得的服饰部件", 0);
-            GuideController.TryGuide(_ui.m_btnDecompose, ConstGuideId.CLOTHING_DECOMPOSE, 5, "分解获得的材料可用于新服饰合成");
+            GuideController.TryGuide(_ui.m_list, ConstGuideId.CLOTHING_DECOMPOSE, 4, "选择重复获得的服饰部件", 0);
+            GuideController.TryGuide(_ui.m_btnDecompose, ConstGuideId.CLOTHING_DECOMPOSE, 5, "分解获得的材料可用于新服饰合成");
             GuideController.TryCompleteGuide(ConstGuideId.CLOTHING_DECOMPOSE, 5);
-            GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.CLOTHING_SYNTHETIC, 1, "回到绣坊界面");
+            GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.CLOTHING_SYNTHETIC, 1, "回到绣坊界面");
 
         }
     }

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingListView.cs

@@ -200,7 +200,7 @@ namespace GFGGame
                 }
             }
 
-            GuideController.TryGuide(_ui.m_listSuit, ConstGuideId.SUIT_LIST_VIEW, 3, "选择套装", index);
+            GuideController.TryGuide(_ui.m_listSuit, ConstGuideId.SUIT_LIST_VIEW, 3, "选择套装", index);
         }
     }
 }

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingView.cs

@@ -423,8 +423,8 @@ namespace GFGGame
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
-            GuideController.TryGuide(_ui.m_btnTabFoster, ConstGuideId.SUIT_LIST_VIEW, 4, "点击进行服饰养护工作");
-            GuideController.TryGuide(_ui.m_btnTabRenew, ConstGuideId.SUIT_LIST_VIEW, 5, "完成养护流程后,可以对服饰进行焕新,获得更多新的套装配件哦~");
+            GuideController.TryGuide(_ui.m_btnTabFoster, ConstGuideId.SUIT_LIST_VIEW, 4, "点击进行服饰养护工作");
+            GuideController.TryGuide(_ui.m_btnTabRenew, ConstGuideId.SUIT_LIST_VIEW, 5, "完成养护流程后,可以对服饰进行焕新,获得更多新的套装配件哦");
             GuideController.TryCompleteGuide(ConstGuideId.SUIT_LIST_VIEW, 5);
 
         }

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/ClothingShop/ClothingShopView.cs

@@ -414,7 +414,7 @@ namespace GFGGame
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
-            GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.BUY_CLOTHING, 6, "回到换装", -1, true, 140);
+            GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.BUY_CLOTHING, 6, "回到换装", -1, true, 140);
         }
 
 

+ 4 - 4
GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs

@@ -449,7 +449,7 @@ namespace GFGGame
                 }
             }
 
-            bool guide = GuideController.TryGuide(_ui.m_listClothing, ConstGuideId.CLOTHING_SYNTHETIC, 4, "找到需要合成的物品", itemIndex);
+            bool guide = GuideController.TryGuide(_ui.m_listClothing, ConstGuideId.CLOTHING_SYNTHETIC, 4, "找到需要合成的物品", itemIndex);
             if (guide) _ui.m_listClothing.ScrollToView(itemIndex);
 
             if (_ui.m_listMaterias.numChildren > 0)
@@ -459,11 +459,11 @@ namespace GFGGame
             }
             if (listTypeItem_CloSynthetic != null)
             {
-                GuideController.TryGuide(listTypeItem_CloSynthetic.m_loaderIcon, ConstGuideId.CLOTHING_SYNTHETIC, 5, "这里可以查看合成需要的材料,和材料的获取途径");
+                GuideController.TryGuide(listTypeItem_CloSynthetic.m_loaderIcon, ConstGuideId.CLOTHING_SYNTHETIC, 5, "这里可以查看合成需要的材料,和材料的获取途径");
                 UI_MateriasListItem.ProxyEnd();
             }
-            GuideController.TryGuide(_ui.m_btnProduction, ConstGuideId.CLOTHING_SYNTHETIC, 6, "点击获得新的服饰");
-            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.CLOTHING_SYNTHETIC, 7, "获得必需品啦,继续通关主线剧情吧", -1, true, 180);
+            GuideController.TryGuide(_ui.m_btnProduction, ConstGuideId.CLOTHING_SYNTHETIC, 6, "点击获得新的服饰");
+            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.CLOTHING_SYNTHETIC, 7, "获得必需品啦,继续通关主线剧情吧", -1, true, 180);
         }
     }
 }

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/SuitSyntheticView.cs

@@ -209,7 +209,7 @@ namespace GFGGame
                     break;
                 }
             }
-            GuideController.TryGuide(_ui.m_listSuit, ConstGuideId.CLOTHING_SYNTHETIC, 3, "查看已解锁的图谱", suitIndex);
+            GuideController.TryGuide(_ui.m_listSuit, ConstGuideId.CLOTHING_SYNTHETIC, 3, "查看已解锁的图谱", suitIndex);
         }
     }
 }

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Common/Alert/AlertWindow.cs

@@ -223,7 +223,7 @@ namespace GFGGame
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            GuideController.TryGuide(_ui.m_btnRight, ConstGuideId.LUCKY_BOX, 4, "点击确定");
+            GuideController.TryGuide(_ui.m_btnRight, ConstGuideId.LUCKY_BOX, 4, "点击确定");
             GuideController.TryCompleteGuide(ConstGuideId.LUCKY_BOX, 4);
         }
 

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/CommonGame/ApproachOfItemView.cs

@@ -301,7 +301,7 @@ namespace GFGGame
                     break;
                 }
             }
-            GuideController.TryGuide(_ui.m_listApproach, ConstGuideId.BUY_CLOTHING, 4, "该物品可以在服装店购买,点开服装店看看", index, true, (int)(this.viewCom.y + this.viewCom.height + 10));
+            GuideController.TryGuide(_ui.m_listApproach, ConstGuideId.BUY_CLOTHING, 4, "该物品可以在服装店购买,点开服装店看看", index, true, (int)(this.viewCom.y + this.viewCom.height + 10));
         }
     }
 }

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/CommonGame/BuyCountView.cs

@@ -375,7 +375,7 @@ namespace GFGGame
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
-            GuideController.TryGuide(_ui.m_btnSure, ConstGuideId.BUY_CLOTHING, 5, "找到需要的物品了,点击购买吧");
+            GuideController.TryGuide(_ui.m_btnSure, ConstGuideId.BUY_CLOTHING, 5, "找到需要的物品了,点击购买吧");
         }
     }
 }

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/CommonGame/GetSuitItemVIew.cs

@@ -186,8 +186,8 @@ namespace GFGGame
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            if (guideId == 1) GuideController.TryGuide(null, ConstGuideId.GET_SUIT_ITEM_FULL, 1, "恭喜你,集齐了第一套套装,快去换装界面穿上试试吧!点击空白区域继续", -1, true, (int)(this.viewCom.height - 150));
-            if (guideId == 2) GuideController.TryGuide(null, ConstGuideId.GET_SUIT_ITEM_FIRST, 1, "恭喜你,获得了一件套装配件,集齐套装有惊喜哦!点击空白区域继续", -1, true, (int)(this.viewCom.height - 150));
+            if (guideId == 1) GuideController.TryGuide(null, ConstGuideId.GET_SUIT_ITEM_FULL, 1, "恭喜你,集齐了第一套套装,快去换装界面穿上试试吧!点击空白区域继续", -1, true, (int)(this.viewCom.height - 150));
+            if (guideId == 2) GuideController.TryGuide(null, ConstGuideId.GET_SUIT_ITEM_FIRST, 1, "恭喜你,获得了一件套装配件,集齐套装有惊喜哦!点击空白区域继续", -1, true, (int)(this.viewCom.height - 150));
         }
         protected override void TryCompleteGuide()
         {

+ 7 - 7
GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -1047,20 +1047,20 @@ namespace GFGGame
                     buyClothingIdIndex = i;
                 }
             }
-            GuideController.TryGuide(_ui.m_comListType1.m_listType, ConstGuideId.SINGLE_FIGHT, 3, "点击相应的分类,可以快速找到服饰", syIndex);
+            GuideController.TryGuide(_ui.m_comListType1.m_listType, ConstGuideId.SINGLE_FIGHT, 3, "点击相应的分类,可以快速找到服饰", syIndex);
             GuideController.TryGuide(_ui.m_partsList.m_list, ConstGuideId.SINGLE_FIGHT, 4, "", 0, true, (int)_ui.m_partsList.m_list.y);
             GuideController.TryGuide(_ui.m_btnGuide, ConstGuideId.SINGLE_FIGHT, 5, "", -1, true, 0, 0, 0, false);
-            GuideController.TryGuide(_ui.m_comListType1.m_listType, ConstGuideId.SINGLE_FIGHT, 6, "接下来把裙子也换上", xzIndex);
+            GuideController.TryGuide(_ui.m_comListType1.m_listType, ConstGuideId.SINGLE_FIGHT, 6, "接下来把裙子也换上", xzIndex);
             GuideController.TryGuide(_ui.m_partsList.m_list, ConstGuideId.SINGLE_FIGHT, 7, "", 0, true, (int)_ui.m_partsList.m_list.y);
-            GuideController.TryGuide(_ui.m_btnNext, ConstGuideId.SINGLE_FIGHT, 8, "穿着完毕,来验证一下,换上的服饰是否符合需求");
+            GuideController.TryGuide(_ui.m_btnNext, ConstGuideId.SINGLE_FIGHT, 8, "穿着完毕,来验证一下,换上的服饰是否符合需求");
 
-            GuideController.TryGuide(_ui.m_compNeed.target, ConstGuideId.BUY_CLOTHING, 3, "当提示有“必需品”时,需要穿上对应物品才能通关", -1, true, 170);
-            GuideController.TryGuide(_ui.m_comListType1.m_listType, ConstGuideId.BUY_CLOTHING, 7, "按照指示就可以找到必需品啦", buyClothingIndex);
+            GuideController.TryGuide(_ui.m_compNeed.target, ConstGuideId.BUY_CLOTHING, 3, "当提示有“必需品”时,需要穿上对应物品才能通关", -1, true, 170);
+            GuideController.TryGuide(_ui.m_comListType1.m_listType, ConstGuideId.BUY_CLOTHING, 7, "按照指示就可以找到必需品啦", buyClothingIndex);
             GuideController.TryGuide(_ui.m_comListType2.m_listType, ConstGuideId.BUY_CLOTHING, 8, "", buyClothingSubIndex);
-            GuideController.TryGuide(_ui.m_partsList.m_list, ConstGuideId.BUY_CLOTHING, 9, "点击换上吧", buyClothingIdIndex, true, 170);
+            GuideController.TryGuide(_ui.m_partsList.m_list, ConstGuideId.BUY_CLOTHING, 9, "点击换上吧", buyClothingIdIndex, true, 170);
             GuideController.TryCompleteGuide(ConstGuideId.BUY_CLOTHING, 9);
 
-            GuideController.TryGuide(_ui.m_btnHint, ConstGuideId.FIGHT_TIPS, 1, "这次换装需要获得别人的认可呢");
+            GuideController.TryGuide(_ui.m_btnHint, ConstGuideId.FIGHT_TIPS, 1, "这次换装需要获得别人的认可呢");
             GuideController.TryCompleteGuide(ConstGuideId.FIGHT_TIPS, 1);
 
 

+ 5 - 5
GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpView.cs

@@ -843,13 +843,13 @@ namespace GFGGame
                     UI_TypeItem.ProxyEnd();
                 }
             }
-            if (listTypeItem_FreedomDress != null) GuideController.TryGuide(listTypeItem_FreedomDress.target, ConstGuideId.FREEDOM_DRESS, 3, "套装分类里,可以查看集齐成套的服饰");
-            GuideController.TryGuide(_ui.m_partsList.m_list, ConstGuideId.FREEDOM_DRESS, 4, "点击一键换上", 0, true, 330);
-            GuideController.TryGuide(_ui.m_btnSave, ConstGuideId.FREEDOM_DRESS, 5, "搭配好的服饰,可以保存随时查看");
-            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.FREEDOM_DRESS, 6, "保存成功,回主界面看看吧");
+            if (listTypeItem_FreedomDress != null) GuideController.TryGuide(listTypeItem_FreedomDress.target, ConstGuideId.FREEDOM_DRESS, 3, "套装分类里,可以查看集齐成套的服饰");
+            GuideController.TryGuide(_ui.m_partsList.m_list, ConstGuideId.FREEDOM_DRESS, 4, "点击一键换上", 0, true, 330);
+            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, 1, "完成心水搭配后,可以拍照留下纪念哦");
+            GuideController.TryGuide(_ui.m_btnPhoto, ConstGuideId.PHOTOGRAPH, 1, "完成心水搭配后,可以拍照留下纪念哦");
 
         }
     }

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/DressUp/PhotographView.cs

@@ -610,8 +610,8 @@ namespace GFGGame
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            GuideController.TryGuide(_ui.m_ComSelectRes.m_comBtnTab.m_btn0, ConstGuideId.PHOTOGRAPH, 2, "在这里可以选择已获得的背景、道具等,也可以放大缩小物品,增加画面丰富度");
-            GuideController.TryGuide(_ui.m_btnPhotograph, ConstGuideId.PHOTOGRAPH, 3, "来记录下这一刻吧~~");
+            GuideController.TryGuide(_ui.m_ComSelectRes.m_comBtnTab.m_btn0, ConstGuideId.PHOTOGRAPH, 2, "在这里可以选择已获得的背景、道具等,也可以放大缩小物品,增加画面丰富度");
+            GuideController.TryGuide(_ui.m_btnPhotograph, ConstGuideId.PHOTOGRAPH, 3, "来记录下这一刻吧");
             GuideController.TryCompleteGuide(ConstGuideId.PHOTOGRAPH, 3);
         }
     }

+ 81 - 0
GameClient/Assets/Game/HotUpdate/Views/FieldGuide/ChapterItemGuideView.cs

@@ -0,0 +1,81 @@
+using System.Collections.Generic;
+using FairyGUI;
+using UI.FieldGuide;
+
+namespace GFGGame
+{
+    public class ChapterItemGuideView : BaseWindow
+    {
+
+        private UI_ChapterItemGuideUI _ui;
+        private List<StoryChapterCfg> _storychapterDatas = new List<StoryChapterCfg>();
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_ChapterItemGuideUI.PACKAGE_NAME;
+            _ui = UI_ChapterItemGuideUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+
+            _ui.m_btnBack.onClick.Add(OnClickBtnBack);
+            _ui.m_list.itemRenderer = RenderListItem;
+            _ui.m_list.onClickItem.Add(OnListItemClick);
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("hc_bj_1");
+            _storychapterDatas = StoryChapterCfgArray.Instance.GetCfgsBysubType(ConstInstanceZonesSubType.Normal);
+            _ui.m_list.numItems = _storychapterDatas.Count - 1;
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+        }
+        private void OnClickBtnBack()
+        {
+            ViewManager.GoBackFrom(typeof(ChapterItemGuideView).FullName);
+        }
+
+        private void RenderListItem(int index, GObject obj)
+        {
+            StoryChapterCfg cfg = _storychapterDatas[index + 1];
+            UI_ChapterGuideItem item = UI_ChapterGuideItem.Proxy(obj);
+            item.m_loaIcon.url = string.Format("ui://FieldGuide/chapter_{0}", cfg.order);
+            bool isPass = InstanceZonesDataManager.CheckChapterPass(cfg.type, cfg.subType, cfg.id, cfg.levelCount);
+            item.m_grpLock.visible = !isPass;
+            item.m_txtDesc.text = string.Format("通关主线第{0}章解锁", NumberUtil.GetChiniseNumberText(cfg.order));
+            item.target.data = cfg;
+        }
+        private void OnListItemClick(EventContext context)
+        {
+            StoryChapterCfg cfg = (context.data as GObject).data as StoryChapterCfg;
+            bool isPass = InstanceZonesDataManager.CheckChapterPass(cfg.type, cfg.subType, cfg.id, cfg.levelCount);
+            if (!isPass)
+            {
+                PromptController.Instance.ShowFloatTextPrompt("暂未解锁");
+                return;
+            }
+            ViewManager.Show<ChapterItemShowView>(cfg, new object[] { typeof(ChapterItemGuideView).FullName, this.viewData });
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Views/FieldGuide/ChapterItemGuideView.cs.meta

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

+ 67 - 0
GameClient/Assets/Game/HotUpdate/Views/FieldGuide/ChapterItemShowView.cs

@@ -0,0 +1,67 @@
+using UI.FieldGuide;
+using FairyGUI;
+using UnityEngine;
+using System.Collections.Generic;
+
+namespace GFGGame
+{
+    public class ChapterItemShowView : BaseWindow
+    {
+        private UI_ChapterItemShowUI _ui;
+        private StoryChapterCfg _cfg;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            _ui = UI_ChapterItemShowUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+
+            _ui.m_btnBack.onClick.Add(OnClickBtnBack);
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("tjtj_bjbj");
+            _cfg = this.viewData as StoryChapterCfg;
+            UpdateView();
+        }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+
+        }
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+        }
+        private void OnClickBtnBack()
+        {
+            ViewManager.GoBackFrom(typeof(ChapterItemShowView).FullName);
+        }
+
+        private void UpdateView()
+        {
+            _ui.m_loaItem.url = string.Format("ui://FieldGuide/{0}", _cfg.bgRes);
+            _ui.m_txtTitle.text = _cfg.name;
+            _ui.m_txtDesc.text = _cfg.desc;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Views/FieldGuide/ChapterItemShowView.cs.meta

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

+ 3 - 1
GameClient/Assets/Game/HotUpdate/Views/FieldGuide/FieldGuideView.cs

@@ -129,9 +129,11 @@ namespace GFGGame
             switch (id)
             {
                 case ConstFieldGuideId.SUIT_GUIDE:
-                case ConstFieldGuideId.CHAPTER_ITEM:
                     ViewManager.Show(ViewName.SUIT_GUIDE_VIEW, null, new object[] { ViewName.FIELD_GUIDE_VIEW, this.viewData });
                     break;
+                case ConstFieldGuideId.CHAPTER_ITEM:
+                    ViewManager.Show<ChapterItemGuideView>(null, new object[] { ViewName.FIELD_GUIDE_VIEW, this.viewData });
+                    break;
             }
         }
 

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxStarView.cs

@@ -351,7 +351,7 @@ namespace GFGGame
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             GuideCfg cfg = GuideCfgArray.Instance.GetCfg(ConstGuideId.LUCKY_BOX_LINE);
             GuideController.TryCompleteGuide(ConstGuideId.LUCKY_BOX, 4);
-            GuideController.TryGuide(null, ConstGuideId.LUCKY_BOX_LINE, 1, "点击将星星链接在一起", -1, true, (int)(this.viewCom.height - 150));
+            GuideController.TryGuide(null, ConstGuideId.LUCKY_BOX_LINE, 1, "点击将星星链接在一起", -1, true, (int)(this.viewCom.height - 150));
             TryCompleteGuide();
         }
         protected override void TryCompleteGuide()

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs

@@ -309,9 +309,9 @@ namespace GFGGame
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            GuideController.TryGuide(_ui.m_btnBuyTen.target, ConstGuideId.LUCKY_BOX, 3, "点击摘取十次");
+            GuideController.TryGuide(_ui.m_btnBuyTen.target, ConstGuideId.LUCKY_BOX, 3, "点击摘取十次");
 
-            GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.FREEDOM_DRESS, 1, "获得一套完整的服装啦,马上去试穿一下");
+            GuideController.TryGuide(_ui.m_btnBack, ConstGuideId.FREEDOM_DRESS, 1, "获得一套完整的服装啦,马上去试穿一下");
         }
     }
 }

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryCardChoose.cs

@@ -165,7 +165,7 @@ namespace GFGGame
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
-            GuideController.TryGuide(_ui.m_listCard, ConstGuideId.SKILL_CARD_FIGHT, 1, "选择一张合适的词牌,增加过关战斗力", 0);
+            GuideController.TryGuide(_ui.m_listCard, ConstGuideId.SKILL_CARD_FIGHT, 1, "选择一张合适的词牌,增加过关战斗力", 0);
             GuideController.TryCompleteGuide(ConstGuideId.SKILL_CARD_FIGHT, 1);
         }
     }

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

@@ -189,8 +189,8 @@ namespace GFGGame
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
-            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.CLOTHING_DECOMPOSE, 1, "点击返回主界面");
-            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.UP_CARD_LV, 1, "点击返回主界面", -1, true, 0, 0, 0, true, true);
+            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.CLOTHING_DECOMPOSE, 1, "点击返回主界面");
+            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.UP_CARD_LV, 1, "点击返回主界面", -1, true, 0, 0, 0, true, true);
 
         }
 

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

@@ -278,10 +278,10 @@ namespace GFGGame
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            GuideController.TryGuide(_unPasslevelItem, ConstGuideId.START_STORY, 1, "点击关卡,开启新历程");
+            GuideController.TryGuide(_unPasslevelItem, ConstGuideId.START_STORY, 1, "点击关卡,开启新历程");
 
-            GuideController.TryGuide(_unPasslevelItem, ConstGuideId.SINGLE_FIGHT, 1, "遇到意外事件了,暂时解释不清,先按请求换上服饰吧");
-            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.LUCKY_BOX, 1, "点击返回主界面");
+            GuideController.TryGuide(_unPasslevelItem, ConstGuideId.SINGLE_FIGHT, 1, "遇到意外事件了,暂时解释不清,先按请求换上服饰吧");
+            GuideController.TryGuide(_ui.m_btnHome, ConstGuideId.LUCKY_BOX, 1, "点击返回主界面");
 
             GuideController.TryGuide(_unPasslevelItem, ConstGuideId.BUY_CLOTHING, 1, "");
         }

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs

@@ -467,7 +467,7 @@ namespace GFGGame
             float scaleX = _gameObject7.transform.localScale.x;
             if (scaleX == _prefectScale)
             {
-                bool isGuide = GuideController.TryGuide(_ui.m_comClickCircle.target, ConstGuideId.SINGLE_FIGHT, 9, "服饰比较繁琐,适当的整理会更加分,点击为各部位修整吧");
+                bool isGuide = GuideController.TryGuide(_ui.m_comClickCircle.target, ConstGuideId.SINGLE_FIGHT, 9, "服饰比较繁琐,适当的整理会更加分,点击为各部位修整吧");
                 if (isGuide)
                 {
                     _ui.m_comClickCircle.target.touchable = true;

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

@@ -772,9 +772,9 @@ namespace GFGGame
 
             if (playStop)
             {
-                GuideController.TryGuide(_ui.m_comMineCircle.target, ConstGuideId.TARGET_FIGHT, 1, "这里可以观察双方的分数计算", -1, true, 0, -128f, -128f);
+                GuideController.TryGuide(_ui.m_comMineCircle.target, ConstGuideId.TARGET_FIGHT, 1, "这里可以观察双方的分数计算", -1, true, 0, -128f, -128f);
             }
-            GuideController.TryGuide(_ui.m_btnSkill0.target, ConstGuideId.TARGET_FIGHT, 2, "使用技能,可以增加胜出的几率哦,点击看看");
+            GuideController.TryGuide(_ui.m_btnSkill0.target, ConstGuideId.TARGET_FIGHT, 2, "使用技能,可以增加胜出的几率哦,点击看看");
             GuideController.TryCompleteGuide(ConstGuideId.TARGET_FIGHT, 2);
 
         }

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

@@ -328,9 +328,9 @@ namespace GFGGame
 
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
-            GuideController.TryGuide(_ui.m_btnStart, ConstGuideId.SINGLE_FIGHT, 2, "点击开启换装");
+            GuideController.TryGuide(_ui.m_btnStart, ConstGuideId.SINGLE_FIGHT, 2, "点击开启换装");
 
-            GuideController.TryGuide(_ui.m_listTag, ConstGuideId.OPEN_TAGS, 1, "选择相应的关卡标签,可提高分数", -1, true, (int)(this.viewCom.y + _ui.m_listBonus.y), 0, 0, false);
+            GuideController.TryGuide(_ui.m_listTag, ConstGuideId.OPEN_TAGS, 1, "选择相应的关卡标签,可提高分数", -1, true, (int)(this.viewCom.y + _ui.m_listBonus.y), 0, 0, false);
             GuideController.TryCompleteGuide(ConstGuideId.OPEN_TAGS, 1);
             GuideController.TryGuide(_ui.m_btnStart, ConstGuideId.BUY_CLOTHING, 2, "");
 

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

@@ -218,8 +218,8 @@ namespace GFGGame
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             if (!_resultData.Result) GuideController.TryGuide(null, ConstGuideId.FIRST_FIGHT_FAILED, 1, "不要气馁呀,可以通过再次挑战已通关的关卡、摘星、绣坊等途径获取更多的物资来提升自己的战斗力哦!", -1, true, (int)(this.viewCom.height - 150));
-            if (_resultData.Result) GuideController.TryGuide(null, ConstGuideId.FIRST_FIGHT_SINGLE_WIN, 1, "这条连衣裙可真好看!点击空白区域继续", -1, true, (int)(this.viewCom.height - 400));
-            if (_resultData.Result) GuideController.TryGuide(null, ConstGuideId.FIRST_FIGHT_TARGET_WIN, 1, "你太厉害了,初次对战就获得了这么好的战绩,继续加油吧", -1, true, (int)(this.viewCom.height - 400));
+            if (_resultData.Result) GuideController.TryGuide(null, ConstGuideId.FIRST_FIGHT_SINGLE_WIN, 1, "这条连衣裙可真好看!点击空白区域继续", -1, true, (int)(this.viewCom.height - 400));
+            if (_resultData.Result) GuideController.TryGuide(null, ConstGuideId.FIRST_FIGHT_TARGET_WIN, 1, "你太厉害了,初次对战就获得了这么好的战绩,继续加油吧", -1, true, (int)(this.viewCom.height - 400));
         }
 
         protected override void TryCompleteGuide()

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

@@ -455,21 +455,21 @@ namespace GFGGame
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            GuideController.TryGuide(_ui.m_btnZhaiXing.target, ConstGuideId.LUCKY_BOX, 2, "“摘星”里可以通过星辰的力量获得服饰", -1, true);
+            GuideController.TryGuide(_ui.m_btnZhaiXing.target, ConstGuideId.LUCKY_BOX, 2, "“摘星”里可以通过星辰的力量获得服饰", -1, true);
 
             GuideController.TryCompleteGuide(ConstGuideId.FREEDOM_DRESS, 6);
-            GuideController.TryGuide(_ui.m_btnHuanZhuang.target, ConstGuideId.FREEDOM_DRESS, 2, "在这里,可以自由搭配服饰和分享哦~", -1, false);
+            GuideController.TryGuide(_ui.m_btnHuanZhuang.target, ConstGuideId.FREEDOM_DRESS, 2, "在这里,可以自由搭配服饰和分享哦", -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.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, 0, 0, 0, true, true);
+            GuideController.TryGuide(_ui.m_btnCiPai.target, ConstGuideId.UP_CARD_LV, 2, "获得了一张“词牌”,点击查看", -1, false, 0, 0, 0, true, true);
 
-            GuideController.TryGuide(_btnStudio, ConstGuideId.STUDIO_OPEN, 1, "工作室开门啦,进去看看~~");
+            GuideController.TryGuide(_btnStudio, ConstGuideId.STUDIO_OPEN, 1, "工作室开门啦,进去看看");
 
-            GuideController.TryGuide(_ui.m_btnXiuFang.target, ConstGuideId.SUIT_LIST_VIEW, 1, "获得“天衣”服饰后,可进行养护和焕新,到绣坊看看");
+            GuideController.TryGuide(_ui.m_btnXiuFang.target, ConstGuideId.SUIT_LIST_VIEW, 1, "获得“天衣”服饰后,可进行养护和焕新,到绣坊看看");
             GuideController.TryCompleteGuide(ConstGuideId.STUDIO_OPEN, 2);
 
 

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

@@ -109,7 +109,7 @@ namespace GFGGame
         protected override void UpdateToCheckGuide(object param)
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
-            GuideController.TryGuide(_ui.target, ConstGuideId.STUDIO_OPEN, 2, "通关相应副本,可以获得各种升级材料哦,快开始今天的日常工作吧~~", -1, true, (int)(this.viewCom.height - 280), 0, 0, false, false);
+            GuideController.TryGuide(_ui.target, ConstGuideId.STUDIO_OPEN, 2, "通关相应副本,可以获得各种升级材料哦,快开始今天的日常工作吧", -1, true, (int)(this.viewCom.height - 280), 0, 0, false, false);
             GuideController.TryCompleteGuide(ConstGuideId.STUDIO_OPEN, 2);
 
         }

+ 3 - 3
GameClient/Assets/Game/HotUpdate/Views/XiuFang/XiuFangView.cs

@@ -111,11 +111,11 @@ namespace GFGGame
         {
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
 
-            GuideController.TryGuide(_ui.m_component.m_btnSuitSynthetic, ConstGuideId.CLOTHING_SYNTHETIC, 2, "这里可以查看已获得的服饰图谱");
+            GuideController.TryGuide(_ui.m_component.m_btnSuitSynthetic, ConstGuideId.CLOTHING_SYNTHETIC, 2, "这里可以查看已获得的服饰图谱");
 
-            GuideController.TryGuide(_ui.m_component.m_btnDecompose, ConstGuideId.CLOTHING_DECOMPOSE, 3, "这里可以消耗重复获得的服饰");
+            GuideController.TryGuide(_ui.m_component.m_btnDecompose, ConstGuideId.CLOTHING_DECOMPOSE, 3, "这里可以消耗重复获得的服饰");
 
-            GuideController.TryGuide(_ui.m_component.m_btnClothingUpgrade, ConstGuideId.SUIT_LIST_VIEW, 2, "点击服装升级");
+            GuideController.TryGuide(_ui.m_component.m_btnClothingUpgrade, ConstGuideId.SUIT_LIST_VIEW, 2, "点击服装升级");
 
 
         }

BIN
GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes


BIN
GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0.png


BIN
GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_1!a.png


+ 96 - 0
GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_1!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 2a55bfffa6dd2d34897f003f0e413955
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_1.png


+ 96 - 0
GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_atlas0_1.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 76e27a28b911cf94ea8db9357782efea
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
GameClient/Assets/ResIn/UI/FieldGuide/FieldGuide_fui.bytes