zhaoyang 3 gadi atpakaļ
vecāks
revīzija
172149b226
39 mainītis faili ar 63 papildinājumiem un 523 dzēšanām
  1. 4 2
      FGUIProject/assets/Main/componentsLevel/CompChapter10001.xml
  2. 3 1
      FGUIProject/assets/Main/componentsLevel/CompChapter10002.xml
  3. 3 1
      FGUIProject/assets/Main/componentsLevel/CompChapter10003.xml
  4. 3 1
      FGUIProject/assets/Main/componentsLevel/CompChapter10004.xml
  5. 3 1
      FGUIProject/assets/Main/componentsLevel/CompChapter10005.xml
  6. 3 1
      FGUIProject/assets/Main/componentsLevel/CompChapter20001.xml
  7. 3 1
      FGUIProject/assets/Main/componentsLevel/CompChapter20002.xml
  8. 3 1
      FGUIProject/assets/Main/componentsLevel/CompChapter20003.xml
  9. 3 1
      FGUIProject/assets/Main/componentsLevel/CompChapter20004.xml
  10. 3 1
      FGUIProject/assets/Main/componentsLevel/CompChapter20005.xml
  11. BIN
      FGUIProject/assets/Main/imagesStory/beijing0_bg.jpg
  12. BIN
      FGUIProject/assets/Main/imagesStory/beijing1_bg.jpg
  13. BIN
      FGUIProject/assets/Main/imagesStory/beijing2_bg.jpg
  14. BIN
      FGUIProject/assets/Main/imagesStory/beijing3_bg.jpg
  15. BIN
      FGUIProject/assets/Main/imagesStory/beijing4_bg.jpg
  16. 0 5
      FGUIProject/assets/Main/package.xml
  17. 3 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter10001.cs
  18. 3 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter10002.cs
  19. 3 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter10003.cs
  20. 3 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter10004.cs
  21. 3 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter10005.cs
  22. 3 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter20001.cs
  23. 3 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter20002.cs
  24. 3 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter20003.cs
  25. 3 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter20004.cs
  26. 3 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter20005.cs
  27. 2 0
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterView.cs
  28. BIN
      GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes
  29. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas_eq0bf6.png
  30. 0 96
      GameClient/Assets/ResIn/UI/Main/Main_atlas_eq0bf6.png.meta
  31. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas_eq0bf7.png
  32. 0 96
      GameClient/Assets/ResIn/UI/Main/Main_atlas_eq0bf7.png.meta
  33. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas_eq0bf8.png
  34. 0 96
      GameClient/Assets/ResIn/UI/Main/Main_atlas_eq0bf8.png.meta
  35. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas_hky3f9.png
  36. 0 96
      GameClient/Assets/ResIn/UI/Main/Main_atlas_hky3f9.png.meta
  37. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas_n1knde.png
  38. 0 96
      GameClient/Assets/ResIn/UI/Main/Main_atlas_n1knde.png.meta
  39. BIN
      GameClient/Assets/ResIn/UI/Main/Main_fui.bytes

+ 4 - 2
FGUIProject/assets/Main/componentsLevel/CompChapter10001.xml

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1200,2600" scroll="both" designImage="ui://mfvz4q8khky3fb" designImageLayer="1">
+<component size="1200,2600" scroll="both" designImageLayer="1">
   <displayList>
-    <image id="n0_xuzk" name="bg" src="hky3f9" fileName="imagesStory/beijing0_bg.jpg" xy="0,0" size="1197,2601"/>
+    <loader id="n43_fz8v" name="loaBg" xy="600,1300" pivot="0.5,0.5" anchor="true" size="1200,2600" fill="scaleMatchWidth">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </loader>
     <component id="n31_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="378,2112"/>
     <component id="n32_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="552,1948"/>
     <component id="n33_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="672,1729"/>

+ 3 - 1
FGUIProject/assets/Main/componentsLevel/CompChapter10002.xml

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1200,2600" scroll="both">
   <displayList>
-    <image id="n37_n1kn" name="n37" src="eq0bf6" fileName="imagesStory/beijing1_bg.jpg" xy="-4,-3" aspect="true"/>
+    <loader id="n38_fz8v" name="loaBg" xy="600,1300" pivot="0.5,0.5" anchor="true" size="1200,2600" fill="scaleMatchWidth">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </loader>
     <component id="n16_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="731,2325"/>
     <component id="n17_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="518,2250"/>
     <component id="n18_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="338,2133"/>

+ 3 - 1
FGUIProject/assets/Main/componentsLevel/CompChapter10003.xml

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1200,2600" scroll="both">
   <displayList>
-    <image id="n0_xuzk" name="bg" src="n1knde" fileName="imagesStory/beijing2_bg.jpg" xy="0,0"/>
+    <loader id="n41_fz8v" name="loaBg" xy="600,1300" pivot="0.5,0.5" anchor="true" size="1200,2600" fill="scaleMatchWidth">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </loader>
     <component id="n21_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="318,2231"/>
     <component id="n22_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="531,2108"/>
     <component id="n23_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="765,2058"/>

+ 3 - 1
FGUIProject/assets/Main/componentsLevel/CompChapter10004.xml

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1200,2600" scroll="both">
   <displayList>
-    <image id="n0_xuzk" name="bg" src="eq0bf7" fileName="imagesStory/beijing3_bg.jpg" xy="0,0"/>
+    <loader id="n40_fz8v" name="loaBg" xy="600,1300" pivot="0.5,0.5" anchor="true" size="1200,2600" fill="scaleMatchWidth">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </loader>
     <component id="n20_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="578,2386"/>
     <component id="n21_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="237,2111"/>
     <component id="n22_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="428,2224"/>

+ 3 - 1
FGUIProject/assets/Main/componentsLevel/CompChapter10005.xml

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1200,2600" scroll="both">
   <displayList>
-    <image id="n0_xuzk" name="bg" src="eq0bf8" fileName="imagesStory/beijing4_bg.jpg" xy="-7,-24"/>
+    <loader id="n62_fz8v" name="loaBg" xy="600,1300" pivot="0.5,0.5" anchor="true" size="1200,2600" fill="scaleMatchWidth">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </loader>
     <component id="n42_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="466,2331"/>
     <component id="n43_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="657,2218"/>
     <component id="n44_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="805,2095"/>

+ 3 - 1
FGUIProject/assets/Main/componentsLevel/CompChapter20001.xml

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1200,2600" scroll="both">
   <displayList>
-    <image id="n0_xuzk" name="bg" src="hky3f9" fileName="imagesStory/beijing0_bg.jpg" xy="0,0" size="1200,2600"/>
+    <loader id="n37_fz8v" name="loaBg" xy="600,1300" pivot="0.5,0.5" anchor="true" size="1200,2600" fill="scaleMatchWidth">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </loader>
     <component id="n31_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="509,1972"/>
     <component id="n32_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="639,1655"/>
     <component id="n33_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="411,1425"/>

+ 3 - 1
FGUIProject/assets/Main/componentsLevel/CompChapter20002.xml

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1170,2600" scroll="both">
   <displayList>
-    <image id="n0_xuzk" name="bg" src="eq0bf6" fileName="imagesStory/beijing1_bg.jpg" xy="-1,-1" size="1170,2600" aspect="true"/>
+    <loader id="n26_fz8v" name="loaBg" xy="585,1300" pivot="0.5,0.5" anchor="true" size="1200,2600" fill="scaleMatchWidth">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </loader>
     <component id="n16_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="585,2184"/>
     <component id="n17_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="603,1951"/>
     <component id="n18_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="375,1784"/>

+ 3 - 1
FGUIProject/assets/Main/componentsLevel/CompChapter20003.xml

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1200,2600" scroll="both">
   <displayList>
-    <image id="n0_xuzk" name="bg" src="n1knde" fileName="imagesStory/beijing2_bg.jpg" xy="0,0"/>
+    <loader id="n18_fz8v" name="loaBg" xy="600,1300" pivot="0.5,0.5" anchor="true" size="1200,2600" fill="scaleMatchWidth">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </loader>
     <component id="n8_ux8s" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="346,2224"/>
     <component id="n9_ux8s" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="707,2082"/>
     <component id="n10_ux8s" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="927,1803"/>

+ 3 - 1
FGUIProject/assets/Main/componentsLevel/CompChapter20004.xml

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1200,2600" scroll="both">
   <displayList>
-    <image id="n0_xuzk" name="bg" src="eq0bf7" fileName="imagesStory/beijing3_bg.jpg" xy="0,0"/>
+    <loader id="n30_fz8v" name="loaBg" xy="600,1300" pivot="0.5,0.5" anchor="true" size="1200,2600" fill="scaleMatchWidth">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </loader>
     <component id="n20_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="484,2255"/>
     <component id="n21_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="688,2077"/>
     <component id="n22_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="511,1804"/>

+ 3 - 1
FGUIProject/assets/Main/componentsLevel/CompChapter20005.xml

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1200,2600" scroll="both">
   <displayList>
-    <image id="n0_xuzk" name="bg" src="eq0bf8" fileName="imagesStory/beijing4_bg.jpg" xy="0,0"/>
+    <loader id="n54_fz8v" name="loaBg" xy="600,1300" pivot="0.5,0.5" anchor="true" size="1200,2600" fill="scaleMatchWidth">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </loader>
     <component id="n42_oq7r" name="g1" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="570,2167"/>
     <component id="n43_oq7r" name="g2" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="336,1917"/>
     <component id="n44_oq7r" name="g3" src="xuzk2d" fileName="componentsLevel/CompStoryLevelItem.xml" xy="810,1917"/>

BIN
FGUIProject/assets/Main/imagesStory/beijing0_bg.jpg


BIN
FGUIProject/assets/Main/imagesStory/beijing1_bg.jpg


BIN
FGUIProject/assets/Main/imagesStory/beijing2_bg.jpg


BIN
FGUIProject/assets/Main/imagesStory/beijing3_bg.jpg


BIN
FGUIProject/assets/Main/imagesStory/beijing4_bg.jpg


+ 0 - 5
FGUIProject/assets/Main/package.xml

@@ -341,7 +341,6 @@
     <component id="lki4db" name="ComRoleSkill1.xml" path="/components/"/>
     <component id="txgzdc" name="CompChapter10002.xml" path="/componentsLevel/" exported="true"/>
     <component id="txgzdd" name="CompChapter10001.xml" path="/componentsLevel/" exported="true"/>
-    <image id="n1knde" name="beijing2_bg.jpg" path="/imagesStory/" atlas="alone_npot"/>
     <image id="jj0mdf" name="zd_jsjs_2.png" path="/images/"/>
     <image id="jj0mdg" name="zd_jsjs_1.png" path="/images/"/>
     <component id="jj0mdl" name="ButtonSpeedUp1.xml" path="/componentsDialog/"/>
@@ -381,10 +380,6 @@
     <movieclip id="wet2f3" name="MovieClip4.jta" path="/Movie/"/>
     <image id="ox5bf4" name="zjm_hdhd_3.png" path="/images/"/>
     <component id="ox5bf5" name="Button2.xml" path="/components/"/>
-    <image id="eq0bf6" name="beijing1_bg.jpg" path="/imagesStory/" atlas="alone_npot"/>
-    <image id="eq0bf7" name="beijing3_bg.jpg" path="/imagesStory/" atlas="alone_npot"/>
-    <image id="eq0bf8" name="beijing4_bg.jpg" path="/imagesStory/" atlas="alone_npot"/>
-    <image id="hky3f9" name="beijing0_bg.jpg" path="/imagesStory/" atlas="alone_npot"/>
     <image id="hky3fb" name="middle_img_v2_0c0211c4-7f8b-4e04-8f67-bc01ad27e8ag.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Main" packageCount="2" genCode="true" extractAlpha="true"/>

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter10001.cs

@@ -7,7 +7,7 @@ namespace UI.Main
     public partial class UI_CompChapter10001
     {
         public GComponent target;
-        public GImage m_bg;
+        public GLoader m_loaBg;
         public UI_CompStoryLevelItem m_g1;
         public UI_CompStoryLevelItem m_g2;
         public UI_CompStoryLevelItem m_g3;
@@ -67,7 +67,7 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_bg = (GImage)comp.GetChild("bg");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_g1 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g1"));
             m_g2 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g2"));
             m_g3 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g3"));
@@ -83,7 +83,7 @@ namespace UI.Main
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_bg = null;
+            m_loaBg = null;
             m_g1.Dispose();
             m_g1 = null;
             m_g2.Dispose();

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter10002.cs

@@ -7,6 +7,7 @@ namespace UI.Main
     public partial class UI_CompChapter10002
     {
         public GComponent target;
+        public GLoader m_loaBg;
         public UI_CompStoryLevelItem m_g1;
         public UI_CompStoryLevelItem m_g2;
         public UI_CompStoryLevelItem m_g3;
@@ -74,6 +75,7 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_g1 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g1"));
             m_g2 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g2"));
             m_g3 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g3"));
@@ -97,6 +99,7 @@ namespace UI.Main
         }
         public void Dispose(bool disposeTarget = false)
         {
+            m_loaBg = null;
             m_g1.Dispose();
             m_g1 = null;
             m_g2.Dispose();

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter10003.cs

@@ -7,7 +7,7 @@ namespace UI.Main
     public partial class UI_CompChapter10003
     {
         public GComponent target;
-        public GImage m_bg;
+        public GLoader m_loaBg;
         public UI_CompStoryLevelItem m_g1;
         public UI_CompStoryLevelItem m_g2;
         public UI_CompStoryLevelItem m_g3;
@@ -75,7 +75,7 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_bg = (GImage)comp.GetChild("bg");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_g1 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g1"));
             m_g2 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g2"));
             m_g3 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g3"));
@@ -99,7 +99,7 @@ namespace UI.Main
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_bg = null;
+            m_loaBg = null;
             m_g1.Dispose();
             m_g1 = null;
             m_g2.Dispose();

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter10004.cs

@@ -7,7 +7,7 @@ namespace UI.Main
     public partial class UI_CompChapter10004
     {
         public GComponent target;
-        public GImage m_bg;
+        public GLoader m_loaBg;
         public UI_CompStoryLevelItem m_g1;
         public UI_CompStoryLevelItem m_g2;
         public UI_CompStoryLevelItem m_g3;
@@ -75,7 +75,7 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_bg = (GImage)comp.GetChild("bg");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_g1 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g1"));
             m_g2 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g2"));
             m_g3 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g3"));
@@ -99,7 +99,7 @@ namespace UI.Main
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_bg = null;
+            m_loaBg = null;
             m_g1.Dispose();
             m_g1 = null;
             m_g2.Dispose();

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter10005.cs

@@ -7,7 +7,7 @@ namespace UI.Main
     public partial class UI_CompChapter10005
     {
         public GComponent target;
-        public GImage m_bg;
+        public GLoader m_loaBg;
         public UI_CompStoryLevelItem m_g1;
         public UI_CompStoryLevelItem m_g2;
         public UI_CompStoryLevelItem m_g3;
@@ -75,7 +75,7 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_bg = (GImage)comp.GetChild("bg");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_g1 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g1"));
             m_g2 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g2"));
             m_g3 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g3"));
@@ -99,7 +99,7 @@ namespace UI.Main
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_bg = null;
+            m_loaBg = null;
             m_g1.Dispose();
             m_g1 = null;
             m_g2.Dispose();

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter20001.cs

@@ -7,7 +7,7 @@ namespace UI.Main
     public partial class UI_CompChapter20001
     {
         public GComponent target;
-        public GImage m_bg;
+        public GLoader m_loaBg;
         public UI_CompStoryLevelItem m_g1;
         public UI_CompStoryLevelItem m_g2;
         public UI_CompStoryLevelItem m_g3;
@@ -61,7 +61,7 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_bg = (GImage)comp.GetChild("bg");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_g1 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g1"));
             m_g2 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g2"));
             m_g3 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g3"));
@@ -71,7 +71,7 @@ namespace UI.Main
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_bg = null;
+            m_loaBg = null;
             m_g1.Dispose();
             m_g1 = null;
             m_g2.Dispose();

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter20002.cs

@@ -7,7 +7,7 @@ namespace UI.Main
     public partial class UI_CompChapter20002
     {
         public GComponent target;
-        public GImage m_bg;
+        public GLoader m_loaBg;
         public UI_CompStoryLevelItem m_g1;
         public UI_CompStoryLevelItem m_g2;
         public UI_CompStoryLevelItem m_g3;
@@ -65,7 +65,7 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_bg = (GImage)comp.GetChild("bg");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_g1 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g1"));
             m_g2 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g2"));
             m_g3 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g3"));
@@ -79,7 +79,7 @@ namespace UI.Main
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_bg = null;
+            m_loaBg = null;
             m_g1.Dispose();
             m_g1 = null;
             m_g2.Dispose();

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter20003.cs

@@ -7,7 +7,7 @@ namespace UI.Main
     public partial class UI_CompChapter20003
     {
         public GComponent target;
-        public GImage m_bg;
+        public GLoader m_loaBg;
         public UI_CompStoryLevelItem m_g1;
         public UI_CompStoryLevelItem m_g2;
         public UI_CompStoryLevelItem m_g3;
@@ -65,7 +65,7 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_bg = (GImage)comp.GetChild("bg");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_g1 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g1"));
             m_g2 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g2"));
             m_g3 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g3"));
@@ -79,7 +79,7 @@ namespace UI.Main
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_bg = null;
+            m_loaBg = null;
             m_g1.Dispose();
             m_g1 = null;
             m_g2.Dispose();

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter20004.cs

@@ -7,7 +7,7 @@ namespace UI.Main
     public partial class UI_CompChapter20004
     {
         public GComponent target;
-        public GImage m_bg;
+        public GLoader m_loaBg;
         public UI_CompStoryLevelItem m_g1;
         public UI_CompStoryLevelItem m_g2;
         public UI_CompStoryLevelItem m_g3;
@@ -65,7 +65,7 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_bg = (GImage)comp.GetChild("bg");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_g1 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g1"));
             m_g2 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g2"));
             m_g3 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g3"));
@@ -79,7 +79,7 @@ namespace UI.Main
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_bg = null;
+            m_loaBg = null;
             m_g1.Dispose();
             m_g1 = null;
             m_g2.Dispose();

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_CompChapter20005.cs

@@ -7,7 +7,7 @@ namespace UI.Main
     public partial class UI_CompChapter20005
     {
         public GComponent target;
-        public GImage m_bg;
+        public GLoader m_loaBg;
         public UI_CompStoryLevelItem m_g1;
         public UI_CompStoryLevelItem m_g2;
         public UI_CompStoryLevelItem m_g3;
@@ -67,7 +67,7 @@ namespace UI.Main
 
         private void Init(GComponent comp)
         {
-            m_bg = (GImage)comp.GetChild("bg");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_g1 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g1"));
             m_g2 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g2"));
             m_g3 = (UI_CompStoryLevelItem)UI_CompStoryLevelItem.Create(comp.GetChild("g3"));
@@ -83,7 +83,7 @@ namespace UI.Main
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_bg = null;
+            m_loaBg = null;
             m_g1.Dispose();
             m_g1 = null;
             m_g2.Dispose();

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

@@ -68,6 +68,8 @@ namespace GFGGame
             _chapterID = (int)viewData;
             MainStoryDataManager.currentChapterCfgId = _chapterID;
             _compChapter = (GComponent)UIPackage.CreateObject("Main", "CompChapter" + _chapterID);
+            StoryChapterCfg cfg = StoryChapterCfgArray.Instance.GetCfg(_chapterID);
+            _compChapter.GetChild("loaBg").asLoader.url = ResPathUtil.GetBgImgPath(cfg.bgRes);
             _ui.m_chapter.AddChild(_compChapter);
             InitChapter();
             _valueBarController.OnShown();

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


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas_eq0bf6.png


+ 0 - 96
GameClient/Assets/ResIn/UI/Main/Main_atlas_eq0bf6.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: c86bbf81920b10c47afed01dfc71ad42
-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/Main/Main_atlas_eq0bf7.png


+ 0 - 96
GameClient/Assets/ResIn/UI/Main/Main_atlas_eq0bf7.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 7f8606126acb3b443910e38ca77e8553
-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/Main/Main_atlas_eq0bf8.png


+ 0 - 96
GameClient/Assets/ResIn/UI/Main/Main_atlas_eq0bf8.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 8818bf085b75c1d46ae5ab6f884f6fa1
-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/Main/Main_atlas_hky3f9.png


+ 0 - 96
GameClient/Assets/ResIn/UI/Main/Main_atlas_hky3f9.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 591800ec6384bd64f80b78506e7deef1
-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/Main/Main_atlas_n1knde.png


+ 0 - 96
GameClient/Assets/ResIn/UI/Main/Main_atlas_n1knde.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: bda3ea1766aa4ea469a3c07a4b20d1b5
-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/Main/Main_fui.bytes