Merge branch 'master' of http://10.108.64.190:3000/gfg/client

FGUIProject/assets/Main/StoryChapterListUI.xml

@@ -4,17 +4,17 @@
     <loader id="n19_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>
-    <list id="n11_slb4" name="listChapter" xy="55,-102" size="1025,1693" layout="row" overflow="scroll" scroll="horizontal" lineGap="80" colGap="38" defaultItem="ui://mfvz4q8kslb41r" autoClearItems="true">
+    <list id="n11_slb4" name="listChapter" xy="0,139" size="1080,1564" layout="row" overflow="scroll" scroll="horizontal" lineGap="80" colGap="38" defaultItem="ui://mfvz4q8kslb41r" autoClearItems="true">
       <relation target="" sidePair="top-top"/>
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <component id="n1_slb4" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
+    <component id="n1_slb4" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80">
       <Button icon="ui://mfvz4q8kysx9ig"/>
     </component>
-    <component id="n2_slb4" name="btnHome" src="qp4l60" fileName="components/ButtonHome.xml" pkg="eg2y0ldp" xy="35,220"/>
+    <component id="n2_slb4" name="btnHome" src="qp4l60" fileName="components/ButtonHome.xml" pkg="eg2y0ldp" xy="170,80"/>
     <image id="n7_slb4" name="bgTitle" src="slb41l" fileName="imagesStory/zhuxian_mengban.png" xy="199,90" size="764,70" visible="false"/>
     <list id="n16_ed2z" name="listTab" xy="199,90" size="764,71" visible="false" layout="row" colGap="10">
       <item url="ui://mfvz4q8kslb41q">
@@ -27,16 +27,10 @@
         <property target="imgTitle" propertyId="1" value="ui://mfvz4q8ked2z8a"/>
       </item>
     </list>
-    <list id="n17_ed2z" name="listType" xy="691,1774" size="341,146" layout="row" colGap="-4">
+    <list id="n17_ed2z" name="listType" xy="694,1666" size="341,253" layout="row" colGap="44">
       <relation target="" sidePair="bottom-bottom"/>
-      <item url="ui://mfvz4q8kzjj37x">
-        <property target="up" propertyId="1" value="ui://mfvz4q8kzjj37t"/>
-        <property target="down" propertyId="1" value="ui://mfvz4q8kzjj37w"/>
-      </item>
-      <item url="ui://mfvz4q8kzjj37x">
-        <property target="up" propertyId="1" value="ui://mfvz4q8kzjj37v"/>
-        <property target="down" propertyId="1" value="ui://mfvz4q8kzjj37u"/>
-      </item>
+      <item url="ui://mfvz4q8ko4m7fsf"/>
+      <item url="ui://mfvz4q8kzjj37x"/>
     </list>
   </displayList>
 </component>

FGUIProject/assets/Main/components/ButtonStoryType.xml

@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="184,146" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="0"/>
+<component size="151,254" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="1"/>
   <displayList>
-    <loader id="n2_ed2z" name="up" xy="23,0" size="137,146" url="ui://mfvz4q8kzjj37v" autoSize="true">
+    <image id="n4_o4m7" name="n4" src="o4m7fsd" fileName="imagesNew/zxian_yeqian_select.png" xy="0,0">
+      <gearDisplay controller="button" pages="1"/>
+    </image>
+    <image id="n5_o4m7" name="n5" src="o4m7frw" fileName="imagesNew/zxian_yeqian.png" xy="0,46">
+      <gearDisplay controller="button" pages="0"/>
+    </image>
+    <loader id="n2_ed2z" name="up" xy="21,140" size="108,82" url="ui://mfvz4q8ko4m7frv" autoSize="true">
       <gearDisplay controller="button" pages="0"/>
     </loader>
-    <loader id="n3_ed2z" name="down" xy="0,0" size="184,146" url="ui://mfvz4q8kzjj37u" autoSize="true">
+    <loader id="n3_ed2z" name="down" xy="18,108" size="114,88" url="ui://mfvz4q8ko4m7fse" autoSize="true">
       <gearDisplay controller="button" pages="1"/>
     </loader>
   </displayList>

FGUIProject/assets/Main/components/ButtonStoryType1.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="151,254" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="1"/>
+  <displayList>
+    <image id="n4_o4m7" name="n4" src="o4m7fsd" fileName="imagesNew/zxian_yeqian_select.png" xy="0,0">
+      <gearDisplay controller="button" pages="1"/>
+    </image>
+    <image id="n5_o4m7" name="n5" src="o4m7frw" fileName="imagesNew/zxian_yeqian.png" xy="0,46">
+      <gearDisplay controller="button" pages="0"/>
+    </image>
+    <loader id="n2_ed2z" name="up" xy="21,140" size="108,82" url="ui://mfvz4q8ko4m7fru" autoSize="true">
+      <gearDisplay controller="button" pages="0"/>
+    </loader>
+    <loader id="n3_ed2z" name="down" xy="18,108" size="112,88" url="ui://mfvz4q8ko4m7frt" autoSize="true">
+      <gearDisplay controller="button" pages="1"/>
+    </loader>
+  </displayList>
+  <Button mode="Check"/>
+  <customProperty target="up" propertyId="1"/>
+  <customProperty target="down" propertyId="1"/>
+</component>

FGUIProject/assets/Main/components/ButtonZhaiXing.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="254,260" extention="Button">
-  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <displayList>
-    <image id="n0_q08x" name="n0" src="q08xl" fileName="images/zjm_zx.png" xy="0,0" size="254,260">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-  </displayList>
-  <Button/>
-</component>

FGUIProject/assets/Main/components/ComDialogBg.xml

@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="314,110" mask="n20_o4m7">
+  <controller name="c1" exported="true" pages="0,,1,,2,,3,,4,,5,,6,,7,,8,,9," selected="9"/>
   <displayList>
     <image id="n20_o4m7" name="n20" src="o4m7fr6" fileName="imagesNew/zxian_mask.png" xy="0,0" size="314,110"/>
-    <loader id="n21_o4m7" name="loabg" xy="0,-117" size="314,1006" url="ui://mfvz4q8kwg7t8o" fill="scaleMatchWidth"/>
-    <loader id="n24_o4m7" name="n24" xy="0,-87" size="314,255" url="ui://mfvz4q8ko4m7fri" align="center" vAlign="middle" fill="scaleMatchWidth"/>
+    <loader id="n21_o4m7" name="loabg" xy="0,-198" size="314,698" fill="scaleMatchWidth">
+      <gearXY controller="c1" pages="1,2,3,4,5,6,7,8,9" values="0,-107|0,-256|0,-437|0,-585|0,-136|0,-543|0,-546|0,-429|0,-198" default="0,0"/>
+    </loader>
+    <loader id="n24_o4m7" name="loaIcon" xy="-138,-187" size="463,379" visible="false" url="ui://mfvz4q8ko4m7frp" align="center" vAlign="middle" fill="scaleMatchWidth">
+      <gearXY controller="c1" pages="0,1,2,3,4" values="76,-8|-82,-72|10,-130|-138,-187|-119,-252" default="-138,-187"/>
+    </loader>
   </displayList>
 </component>

FGUIProject/assets/Main/components/CompStoryLevelItem.xml

@@ -9,8 +9,8 @@
     <remark page="1" value="向右"/>
   </controller>
   <displayList>
-    <component id="n12_o4m7" name="comDialogBg" src="o4m7fr5" fileName="components/ComDialogBg.xml" xy="118,74" group="n19_o4m7">
-      <gearXY controller="c2" pages="0" values="118,74" default="104,67"/>
+    <component id="n12_o4m7" name="comDialogBg" src="o4m7fr5" fileName="components/ComDialogBg.xml" xy="118,73" group="n19_o4m7" controller="c1,4">
+      <gearXY controller="c2" pages="0,1" values="118,73|107,73"/>
     </component>
     <loader id="n13_o4m7" name="loaDialogBg" xy="0,0" pivot="0.5,0.5" size="540,216" group="n19_o4m7" scale="-1,1" url="ui://mfvz4q8ko4m7fq2" autoSize="true">
       <gearSize controller="c2" pages="0" values="540,216,-1,1" default="540,216,1,1"/>

FGUIProject/assets/Main/components/ComponentChapterPic.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="290,1591" opaque="false">
+<component size="462,1591" opaque="false">
   <displayList>
-    <loader id="n0_slb4" name="pic" xy="0,586" size="290,1006" url="ui://mfvz4q8kjvi38d" autoSize="true"/>
-    <image id="n3_s17n" name="n3" src="tu967b" fileName="imagesStory/zhuxian_diban_1.png" xy="0,0"/>
+    <loader id="n0_slb4" name="pic" xy="86,292" size="290,1006" url="ui://mfvz4q8kjvi38d" autoSize="true"/>
+    <image id="n3_s17n" name="n3" src="o4m7fsc" fileName="imagesNew/zxian_chapter_frame_l.png" xy="0,33"/>
   </displayList>
 </component>

FGUIProject/assets/Main/components/ComponentListChapterItem.xml

@@ -1,15 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="290,1591" opaque="false">
+<component size="462,1591" opaque="false">
   <displayList>
-    <component id="n0_slb4" name="compPic" src="tu966u" fileName="components/ComponentChapterPic.xml" xy="0,0"/>
-    <image id="n7_tu96" name="n7" src="tu967c" fileName="imagesStory/zhuxian_diban_2.png" xy="0,805"/>
-    <image id="n12_r0yx" name="n12" src="r0yxfg" fileName="images/zhuxian_szdi.png" xy="184,1421"/>
-    <text id="n11_zjj3" name="txtLv" xy="44,833" pivot="0.5,0" anchor="true" size="22,26" skew="0.5,0" font="ui://mfvz4q8ked2z89" fontSize="12" color="#ffffff" align="center" leading="0" text="1"/>
-    <text id="n3_slb4" name="txtTitle" xy="25,905" size="37,239" fontSize="32" color="#ffffff" leading="0" autoSize="height" text="人之初性本善"/>
-    <text id="n4_slb4" name="txtProgress" xy="198,1421" pivot="0.5,0" size="78,34" fontSize="24" color="#ffffff" align="center" text="00/00"/>
-    <image id="n1_slb4" name="imgLockBg" src="slb41n" fileName="imagesStory/zhuxian_zhedang.png" xy="0,585"/>
-    <image id="n2_slb4" name="imgLock" src="slb41m" fileName="imagesStory/zhuxian_shuoto.png" xy="107,1052"/>
-    <text id="n10_q8od" name="txtLockDesc" xy="41,1124" size="202,69" fontSize="26" color="#fffcf1" align="center" autoSize="none" text="通关上一章&#xA;并达到x级开启">
+    <component id="n0_slb4" name="compPic" src="tu966u" fileName="components/ComponentChapterPic.xml" xy="-1,1"/>
+    <text id="n16_o4m7" name="txtChapter" xy="137,383" size="88,60" group="n24_o4m7" font="ui://mfvz4q8ko4m7fqo" fontSize="30" text="03"/>
+    <image id="n18_o4m7" name="n18" src="o4m7fs8" fileName="imagesNew/zxian_chapter_name_deco.png" xy="3,343" group="n24_o4m7">
+      <relation target="" sidePair="center-center,top-top"/>
+    </image>
+    <text id="n19_o4m7" name="txtChapterName0" xy="17,361" size="84,104" group="n24_o4m7" font="ui://eg2y0ldpa0cftkx" fontSize="80" color="#fffae1" align="center" strokeColor="#ffaf51" autoClearText="true" text="草">
+      <relation target="n18_o4m7" sidePair="center-center,middle-middle"/>
+    </text>
+    <text id="n20_o4m7" name="txtChapterName1" xy="82,375" size="64,79" group="n24_o4m7" font="ui://eg2y0ldpa0cftkx" fontSize="60" color="#fffae1" align="center" strokeColor="#ffaf51" autoClearText="true" text="书">
+      <relation target="n18_o4m7" sidePair="center-center,middle-middle"/>
+    </text>
+    <text id="n21_o4m7" name="txtChapterName2" xy="106,427" size="64,79" group="n24_o4m7" font="ui://eg2y0ldpa0cftkx" fontSize="60" color="#fffae1" align="center" strokeColor="#ffaf51" autoClearText="true" text="七">
+      <relation target="n18_o4m7" sidePair="center-center,middle-middle"/>
+    </text>
+    <text id="n22_o4m7" name="txtChapterName3" xy="163,428" size="64,79" group="n24_o4m7" font="ui://eg2y0ldpa0cftkx" fontSize="60" color="#fffae1" align="center" strokeColor="#ffaf51" autoClearText="true" text="绝">
+      <relation target="n18_o4m7" sidePair="center-center,middle-middle"/>
+    </text>
+    <text id="n23_o4m7" name="txtChapterName4" xy="216,406" size="84,104" group="n24_o4m7" font="ui://eg2y0ldpa0cftkx" fontSize="80" color="#fffae1" align="center" strokeColor="#ffaf51" autoClearText="true" text="册">
+      <relation target="n18_o4m7" sidePair="center-center,middle-middle"/>
+    </text>
+    <group id="n24_o4m7" name="n24" xy="3,343" size="297,167" advanced="true">
+      <relation target="" sidePair="right-right,top-top"/>
+    </group>
+    <image id="n25_o4m7" name="n25" src="o4m7frx" fileName="imagesNew/zxian_jindu_bg.png" xy="221,1092" group="n15_o4m7"/>
+    <text id="n4_slb4" name="txtCurProgress" xy="257,1166" pivot="1,0" size="46,56" group="n15_o4m7" fontSize="42" color="#835838" align="right" bold="true" text="23"/>
+    <graph id="n14_o4m7" name="n14" xy="319,1185" size="2,58" group="n15_o4m7" rotation="31" type="rect" lineSize="0" fillColor="#ff906c51"/>
+    <text id="n13_o4m7" name="txtMaxProgress" xy="309,1196" size="31,39" group="n15_o4m7" fontSize="28" color="#906c51" align="center" text="00"/>
+    <group id="n15_o4m7" name="n15" xy="221,1092" size="154,232"/>
+    <image id="n1_slb4" name="imgLockBg" src="slb41n" fileName="imagesStory/zhuxian_zhedang.png" xy="86,259"/>
+    <image id="n2_slb4" name="imgLock" src="slb41m" fileName="imagesStory/zhuxian_shuoto.png" xy="195,743"/>
+    <text id="n10_q8od" name="txtLockDesc" xy="130,717" size="202,89" fontSize="28" color="#fffcf1" align="center" autoSize="none" text="通关上一章&#xA;并达到x级开启">
       <relation target="" sidePair="center-center"/>
     </text>
   </displayList>

FGUIProject/assets/Main/components/ListChapterItem.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="290,1693" opaque="false">
+<component size="462,1446" opaque="false">
   <displayList>
-    <component id="n0_slb4" name="content" src="slb41t" fileName="components/ComponentListChapterItem.xml" xy="0,102"/>
+    <component id="n0_slb4" name="content" src="slb41t" fileName="components/ComponentListChapterItem.xml" xy="0,0"/>
   </displayList>
 </component>

FGUIProject/assets/Main/package.xml

@@ -12,7 +12,6 @@
     <image id="q08xg" name="zjm_tujian.png" path="/images/"/>
     <image id="q08xj" name="zjm_yjian.png" path="/images/"/>
     <image id="q08xk" name="zjm_yying.png" path="/images/"/>
-    <component id="q08xt" name="ButtonZhaiXing.xml" path="/components/"/>
     <component id="q08xu" name="ButtonModle1.xml" path="/components/"/>
     <component id="slb416" name="ComponentHeadBar.xml" path="/components/"/>
     <component id="slb419" name="StoryChapterListUI.xml" path="/" exported="true"/>
@@ -701,6 +700,30 @@
     <image id="o4m7frl" name="zjm_tb_fuben.png" path="/images/"/>
     <image id="o4m7frm" name="sn_img_verzz.png" path="/imagesNew/"/>
     <image id="o4m7frn" name="sn_img_circle_zz.png" path="/imagesNew/"/>
+    <image id="o4m7frr" name="beijing3_bg.png" path="/"/>
+    <image id="o4m7frt" name="zxian_yeqian_select_putong.png" path="/imagesNew/"/>
+    <image id="o4m7fru" name="zxian_yeqian_putong.png" path="/imagesNew/"/>
+    <image id="o4m7frv" name="zxian_yeqian_jianying.png" path="/imagesNew/"/>
+    <image id="o4m7frw" name="zxian_yeqian.png" path="/imagesNew/"/>
+    <image id="o4m7frx" name="zxian_jindu_bg.png" path="/imagesNew/"/>
+    <image id="o4m7fry" name="zxian_chapter_number_9.png" path="/imagesNew/"/>
+    <image id="o4m7frz" name="zxian_chapter_number_8.png" path="/imagesNew/"/>
+    <image id="o4m7fs0" name="zxian_chapter_number_7.png" path="/imagesNew/"/>
+    <image id="o4m7fs1" name="zxian_chapter_number_6.png" path="/imagesNew/"/>
+    <image id="o4m7fs2" name="zxian_chapter_number_5.png" path="/imagesNew/"/>
+    <image id="o4m7fs3" name="zxian_chapter_number_4.png" path="/imagesNew/"/>
+    <image id="o4m7fs4" name="zxian_chapter_number_3.png" path="/imagesNew/"/>
+    <image id="o4m7fs5" name="zxian_chapter_number_2.png" path="/imagesNew/"/>
+    <image id="o4m7fs6" name="zxian_chapter_number_1.png" path="/imagesNew/"/>
+    <image id="o4m7fs7" name="zxian_chapter_number_0.png" path="/imagesNew/"/>
+    <image id="o4m7fs8" name="zxian_chapter_name_deco.png" path="/imagesNew/"/>
+    <image id="o4m7fs9" name="zxian_chapter_lock_s.png" path="/imagesNew/"/>
+    <image id="o4m7fsa" name="zxian_chapter_lock_l.png" path="/imagesNew/"/>
+    <image id="o4m7fsb" name="zxian_chapter_frame_s.png" path="/imagesNew/"/>
+    <image id="o4m7fsc" name="zxian_chapter_frame_l.png" path="/imagesNew/"/>
+    <image id="o4m7fsd" name="zxian_yeqian_select.png" path="/imagesNew/"/>
+    <image id="o4m7fse" name="zxian_yeqian_select_jingying.png" path="/imagesNew/"/>
+    <component id="o4m7fsf" name="ButtonStoryType1.xml" path="/components/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Main
+{
+    public partial class UI_ButtonStoryType1
+    {
+        public GButton target;
+        public GLoader m_up;
+        public GLoader m_down;
+        public const string URL = "ui://mfvz4q8ko4m7fsf";
+        public const string PACKAGE_NAME = "Main";
+        public const string RES_NAME = "ButtonStoryType1";
+        private static UI_ButtonStoryType1 _proxy;
+
+        public static UI_ButtonStoryType1 Create(GObject gObject = null)
+        {
+            var ui = new UI_ButtonStoryType1();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ButtonStoryType1 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ButtonStoryType1();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)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_up = (GLoader)comp.GetChild("up");
+            m_down = (GLoader)comp.GetChild("down");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_up = null;
+            m_down = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ButtonStoryType1.cs.meta

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

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

@@ -7,7 +7,9 @@ namespace UI.Main
     public partial class UI_ComDialogBg
     {
         public GComponent target;
+        public Controller m_c1;
         public GLoader m_loabg;
+        public GLoader m_loaIcon;
         public const string URL = "ui://mfvz4q8ko4m7fr5";
         public const string PACKAGE_NAME = "Main";
         public const string RES_NAME = "ComDialogBg";
@@ -55,11 +57,15 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
+            m_c1 = comp.GetController("c1");
             m_loabg = (GLoader)comp.GetChild("loabg");
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_c1 = null;
             m_loabg = null;
+            m_loaIcon = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -8,9 +8,14 @@ namespace UI.Main
     {
         public GComponent target;
         public UI_ComponentChapterPic m_compPic;
-        public GTextField m_txtLv;
-        public GTextField m_txtTitle;
-        public GTextField m_txtProgress;
+        public GTextField m_txtChapter;
+        public GTextField m_txtChapterName0;
+        public GTextField m_txtChapterName1;
+        public GTextField m_txtChapterName2;
+        public GTextField m_txtChapterName3;
+        public GTextField m_txtChapterName4;
+        public GTextField m_txtCurProgress;
+        public GTextField m_txtMaxProgress;
         public GImage m_imgLockBg;
         public GImage m_imgLock;
         public GTextField m_txtLockDesc;
@@ -62,9 +67,14 @@ namespace UI.Main
         private void Init(GComponent comp)
         {
             m_compPic = (UI_ComponentChapterPic)UI_ComponentChapterPic.Create(comp.GetChild("compPic"));
-            m_txtLv = (GTextField)comp.GetChild("txtLv");
-            m_txtTitle = (GTextField)comp.GetChild("txtTitle");
-            m_txtProgress = (GTextField)comp.GetChild("txtProgress");
+            m_txtChapter = (GTextField)comp.GetChild("txtChapter");
+            m_txtChapterName0 = (GTextField)comp.GetChild("txtChapterName0");
+            m_txtChapterName1 = (GTextField)comp.GetChild("txtChapterName1");
+            m_txtChapterName2 = (GTextField)comp.GetChild("txtChapterName2");
+            m_txtChapterName3 = (GTextField)comp.GetChild("txtChapterName3");
+            m_txtChapterName4 = (GTextField)comp.GetChild("txtChapterName4");
+            m_txtCurProgress = (GTextField)comp.GetChild("txtCurProgress");
+            m_txtMaxProgress = (GTextField)comp.GetChild("txtMaxProgress");
             m_imgLockBg = (GImage)comp.GetChild("imgLockBg");
             m_imgLock = (GImage)comp.GetChild("imgLock");
             m_txtLockDesc = (GTextField)comp.GetChild("txtLockDesc");
@@ -73,9 +83,14 @@ namespace UI.Main
         {
             m_compPic.Dispose();
             m_compPic = null;
-            m_txtLv = null;
-            m_txtTitle = null;
-            m_txtProgress = null;
+            m_txtChapter = null;
+            m_txtChapterName0 = null;
+            m_txtChapterName1 = null;
+            m_txtChapterName2 = null;
+            m_txtChapterName3 = null;
+            m_txtChapterName4 = null;
+            m_txtCurProgress = null;
+            m_txtMaxProgress = null;
             m_imgLockBg = null;
             m_imgLock = null;
             m_txtLockDesc = null;

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

@@ -43,12 +43,13 @@ namespace GFGGame
 
             _ui.m_listTab.selectedIndex = 0;
             _ui.m_listType.selectedIndex = 0;
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zxian_bg3");
+
         }
 
         protected override void OnShown()
         {
             base.OnShown();
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("fuben_bjbj");
 
             subType = 0;//MainStoryDataManager.GetChapterSubType(MainStoryDataManager.currentChapterCfgId);
             if (this.viewData != null && (this.viewData as object[]).Length > 0)
@@ -108,17 +109,24 @@ namespace GFGGame
         private void ListChapterItem(int index, GObject item)
         {
             UI_ListChapterItem listItem = UI_ListChapterItem.Proxy(item);
-            if (index % 2 == 0)
-            {
-                listItem.m_content.target.y = 102;
-            }
-            else
-            {
-                listItem.m_content.target.y = 0;
-            }
+            // if (index % 2 == 0)
+            // {
+            //     listItem.m_content.target.y = 102;
+            // }
+            // else
+            // {
+            //     listItem.m_content.target.y = 0;
+            // }
             StoryChapterCfg chapterCfg = _chapterCfgs[index];
-            listItem.m_content.m_txtLv.text = StoryUtil.GetChapterOrder(chapterCfg.id).ToString();
-            listItem.m_content.m_txtTitle.text = chapterCfg.name;
+            listItem.m_content.m_txtChapterName0.text = chapterCfg.name.Length > 0 ? chapterCfg.name[0].ToString() : "";
+            listItem.m_content.m_txtChapterName1.text = chapterCfg.name.Length > 1 ? chapterCfg.name[1].ToString() : "";
+            listItem.m_content.m_txtChapterName2.text = chapterCfg.name.Length > 2 ? chapterCfg.name[2].ToString() : "";
+            listItem.m_content.m_txtChapterName3.text = chapterCfg.name.Length > 3 ? chapterCfg.name[3].ToString() : "";
+            listItem.m_content.m_txtChapterName4.text = chapterCfg.name.Length > 4 ? chapterCfg.name[4].ToString() : "";
+            int order = StoryUtil.GetChapterOrder(chapterCfg.id);
+            listItem.m_content.m_txtChapter.text = order < 10 ? "0" + order : order.ToString();
+
+            // listItem.m_content.m_txtTitle.text = chapterCfg.name;
             listItem.m_content.m_compPic.m_pic.url = "ui://Main/" + chapterCfg.res;
             if (listItem.m_content.target.data == null)
             {
@@ -126,7 +134,7 @@ namespace GFGGame
             }
             listItem.target.data = chapterCfg.id;
             listItem.m_content.target.data = chapterCfg.id;
-            RedDotController.Instance.SetComRedDot(listItem.m_content.target, RedDotDataManager.Instance.GetChapterRed(chapterCfg.id), "", 0, (int)listItem.m_content.m_txtProgress.y - 20);
+            RedDotController.Instance.SetComRedDot(listItem.m_content.target, RedDotDataManager.Instance.GetChapterRed(chapterCfg.id), "", 0, (int)listItem.m_content.m_txtCurProgress.y - 20);
             UI_ListChapterItem.ProxyEnd();
         }
 
@@ -140,7 +148,8 @@ namespace GFGGame
                 int chapterID = (int)listItem.target.data;
                 StoryChapterCfg chapterCfg = _chapterCfgs[i];
                 int starCountChapter = InstanceZonesDataManager.GetChapterStarCount(chapterCfg.id, chapterCfg.type, chapterCfg.subType);
-                listItem.m_content.m_txtProgress.text = "" + starCountChapter + "/" + chapterCfg.bonusStar3;
+                listItem.m_content.m_txtCurProgress.text = starCountChapter.ToString();
+                listItem.m_content.m_txtMaxProgress.text = chapterCfg.bonusStar3.ToString();
                 if (MainStoryDataManager.CheckChapterUnlock(chapterCfg.id))
                 {
                     listItem.m_content.m_imgLock.visible = false;

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

@@ -76,11 +76,11 @@ namespace GFGGame
             MusicManager.Instance.Play(ResPathUtil.GetMusicPath(ConstMusicName.DEFAULT));
             _chapterID = (int)viewData;
             MainStoryDataManager.currentChapterCfgId = _chapterID;
-            // StoryChapterCfg cfg = StoryChapterCfgArray.Instance.GetCfg(_chapterID);
+
             Timers.inst.StartCoroutine(InitChapter());
-            // InitChapter();
+
             _valueBarController.OnShown();
-            // _valueBarController.Controller(1);
+
             _ui.target.touchable = true;
 
             Timers.inst.AddUpdate(CheckGuide);
@@ -175,6 +175,10 @@ namespace GFGGame
                         levelItem.m_flower.target.visible = false;
                         levelItem.m_txtName.text = levelCfg.name;
 
+                        levelItem.m_comDialogBg.m_loabg.url = ResPathUtil.GetBgImgPath(chapterCfg.bgRes);
+                        levelItem.m_comDialogBg.m_loaIcon.url = ResPathUtil.GetChapterGuideIconPath(chapterCfg.bgRes);
+                        levelItem.m_comDialogBg.m_c1.selectedIndex = Random.Range(0, 10);
+
                     }
                     levelItem.m_holder.visible = !InstanceZonesDataManager.CheckLevelPass(levelCfg.id);
 
@@ -182,10 +186,8 @@ namespace GFGGame
                     {
                         //设置为解锁关卡
                         MainStoryDataManager.currentLevelCfgId = levelCfg.id;
-
                         _unPasslevelItem = levelItem.target;
-                        // _gameObject = null;
-                        // _wrapper = null;
+
                         string resPath = ResPathUtil.GetViewEffectPath("ui_gk", "ui_gk_sg");
                         SceneController.AddObjectToView(_gameObject, _wrapper, levelItem.m_holder, resPath, out _gameObject, out _wrapper);
                     }