博物图鉴

FGUIProject/assets/FieldGuide/SuitGuideUI.xml

@@ -1,29 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
+  <controller name="c1" pages="0,套装图鉴,1,博物图鉴" selected="0"/>
   <displayList>
     <loader id="n18_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="n0_pjip" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="159,90"/>
     <component id="n1_pjip" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
-    <component id="n5_pjip" name="comBoxSort" src="pjipy" fileName="components/ComboBox1.xml" xy="494,262">
-      <ComboBox title="默认排序" visibleItemCount="10" autoClearItems="true">
-        <item title="1"/>
-        <item title="2"/>
-        <item title="3"/>
-      </ComboBox>
-    </component>
-    <component id="n3_pjip" name="btnNotGet" src="pjipu" fileName="components/Button2.xml" xy="63,262">
-      <Button checked="true" title="未获得"/>
-    </component>
-    <component id="n4_pjip" name="btnHaveGot" src="pjipu" fileName="components/Button2.xml" xy="311,262">
-      <Button title="已获得"/>
-    </component>
-    <component id="n6_pjip" name="btnSwitch" src="pjipz" fileName="components/Button3.xml" xy="807,262">
-      <Button title="切换分类"/>
-    </component>
-    <image id="n7_pjip" name="n7" src="pjipk" fileName="images/tujian_diban_2.png" xy="48,376"/>
+    <image id="n7_pjip" name="n7" src="pjipk" fileName="images/tujian_diban_2.png" xy="48,376">
+      <gearDisplay controller="c1" pages="0"/>
+    </image>
     <list id="n10_pjip" name="listType" xy="33,376" size="290,1544" overflow="scroll" defaultItem="ui://vqq9h9h4pjip12" autoClearItems="true">
+      <gearDisplay controller="c1" pages="0"/>
       <relation target="" sidePair="bottomext-bottom"/>
       <item/>
       <item/>
@@ -31,7 +19,9 @@
       <item/>
       <item/>
     </list>
-    <list id="n16_pjip" name="listSuit" xy="352,376" size="728,1544" layout="flow_hz" overflow="scroll" lineGap="48" colGap="55" defaultItem="ui://vqq9h9h4pjip14" autoClearItems="true">
+    <list id="n16_pjip" name="listSuit" xy="360,376" size="700,1544" layout="flow_hz" overflow="scroll" lineGap="48" colGap="40" defaultItem="ui://vqq9h9h4pjip14" autoClearItems="true">
+      <gearXY controller="c1" pages="1" values="25,260" default="360,376"/>
+      <gearSize controller="c1" pages="1" values="1030,1660,1,1" default="700,1544,1,1"/>
       <relation target="" sidePair="bottomext-bottom"/>
       <item/>
       <item/>
@@ -42,5 +32,24 @@
       <item/>
       <item/>
     </list>
+    <component id="n5_pjip" name="comBoxSort" src="pjipy" fileName="components/ComboBox1.xml" xy="494,262" group="n19_s61p">
+      <ComboBox title="默认排序" visibleItemCount="10" autoClearItems="true">
+        <item title="1"/>
+        <item title="2"/>
+        <item title="3"/>
+      </ComboBox>
+    </component>
+    <component id="n3_pjip" name="btnNotGet" src="pjipu" fileName="components/Button2.xml" xy="63,262" group="n19_s61p">
+      <Button checked="true" title="未获得"/>
+    </component>
+    <component id="n4_pjip" name="btnHaveGot" src="pjipu" fileName="components/Button2.xml" xy="311,262" group="n19_s61p">
+      <Button title="已获得"/>
+    </component>
+    <component id="n6_pjip" name="btnSwitch" src="pjipz" fileName="components/Button3.xml" xy="807,262" group="n19_s61p">
+      <Button title="切换分类"/>
+    </component>
+    <group id="n19_s61p" name="n19" xy="63,262" size="954,70" advanced="true">
+      <gearDisplay controller="c1" pages="0"/>
+    </group>
   </displayList>
 </component>

FGUIProject/assets/FieldGuide/package.xml

@@ -54,6 +54,8 @@
     <component id="jj4d1o" name="Button4.xml" path="/components/"/>
     <image id="r0yx1p" name="tujian_qiehuan_3.png" path="/images/"/>
     <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"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\FieldGuide" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

GameClient/Assets/Game/HotUpdate/Data/InstanceZonesDataManager.cs

@@ -289,7 +289,24 @@ namespace GFGGame
                 times = Math.Min(Math.Min(GameConst.MAX_COUNT_FIGHT_QUICKLY, times), studioData.TotalPlayTimes - studioData.PlayTimes);
                 title = string.Format("挑战{0}次", times == 0 ? "十" : NumberUtil.GetChiniseNumberText(times));
             }
-
+        }
+        public static void GetTotalProgress(out int count, out int totalCount)
+        {
+            List<StoryChapterCfg> storyChapters = StoryChapterCfgArray.Instance.GetCfgsBysubType(ConstInstanceZonesSubType.Normal);
+            totalCount = storyChapters.Count - 1;
+            count = 0;
+            for (int i = 1; i < storyChapters.Count; i++)
+            {
+                bool isPass = InstanceZonesDataManager.CheckChapterPass(storyChapters[i].type, storyChapters[i].subType, storyChapters[i].id, storyChapters[i].levelCount);
+                if (isPass)
+                {
+                    count++;
+                }
+                else
+                {
+                    break;
+                }
+            }
         }
     }
 }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/FieldGuide/UI_SuitGuideUI.cs

@@ -7,15 +7,16 @@ namespace UI.FieldGuide
     public partial class UI_SuitGuideUI
     {
         public GComponent target;
+        public Controller m_c1;
         public GLoader m_loaBg;
         public GComponent m_valueBar;
         public GButton m_btnBack;
+        public GList m_listType;
+        public GList m_listSuit;
         public GComboBox m_comBoxSort;
         public GButton m_btnNotGet;
         public GButton m_btnHaveGot;
         public GButton m_btnSwitch;
-        public GList m_listType;
-        public GList m_listSuit;
         public const string URL = "ui://vqq9h9h4z3os0";
         public const string PACKAGE_NAME = "FieldGuide";
         public const string RES_NAME = "SuitGuideUI";
@@ -63,27 +64,29 @@ namespace UI.FieldGuide
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_listType = (GList)comp.GetChild("listType");
+            m_listSuit = (GList)comp.GetChild("listSuit");
             m_comBoxSort = (GComboBox)comp.GetChild("comBoxSort");
             m_btnNotGet = (GButton)comp.GetChild("btnNotGet");
             m_btnHaveGot = (GButton)comp.GetChild("btnHaveGot");
             m_btnSwitch = (GButton)comp.GetChild("btnSwitch");
-            m_listType = (GList)comp.GetChild("listType");
-            m_listSuit = (GList)comp.GetChild("listSuit");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_loaBg = null;
             m_valueBar = null;
             m_btnBack = null;
+            m_listType = null;
+            m_listSuit = null;
             m_comBoxSort = null;
             m_btnNotGet = null;
             m_btnHaveGot = null;
             m_btnSwitch = null;
-            m_listType = null;
-            m_listSuit = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -11,8 +11,8 @@ namespace GFGGame
 
         private UI_FieldGuideUI _ui;
         private int[] _listBannerDatas = new int[3] { ConstBannerId.ZHAI_XING, ConstBannerId.ZHAI_XING, ConstBannerId.ZHAI_XING };
-        private int[] _listGuideDatas = new int[2] { ConstFieldGuideId.SUIT_GUIDE, ConstFieldGuideId.SUIT_GUIDE };
-        GetRedCall[] actions = new GetRedCall[] { RedDotDataManager.Instance.GetFieldGuideRed };
+        private int[] _listGuideDatas = new int[2] { ConstFieldGuideId.SUIT_GUIDE, ConstFieldGuideId.CHAPTER_ITEM };
+        GetRedCall[] actions = new GetRedCall[] { RedDotDataManager.Instance.GetFieldGuideRed, null };
 
         public override void Dispose()
         {
@@ -112,7 +112,7 @@ namespace GFGGame
             listItem.m_loaderTitle.url = "ui://FieldGuide/tujian_taoz_" + id;
             listItem.m_loaderPic.url = "ui://FieldGuide/tujian_tup_" + id;
             listItem.target.data = id;
-            bool red = actions[index]();
+            bool red = actions[index] == null ? false : actions[index]();
             RedDotController.Instance.SetComRedDot(listItem.target, red, "", -20);
             UI_CompGuideItem.ProxyEnd();
         }
@@ -129,6 +129,7 @@ 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;
             }
@@ -141,6 +142,9 @@ namespace GFGGame
                 case ConstFieldGuideId.SUIT_GUIDE:
                     DressUpMenuSuitDataManager.GetTotalProgress(out haveCount, out totalCount);
                     break;
+                case ConstFieldGuideId.CHAPTER_ITEM:
+                    InstanceZonesDataManager.GetTotalProgress(out haveCount, out totalCount);
+                    break;
                 default:
                     haveCount = 0;
                     totalCount = 1;