zhaoyang 2 лет назад
Родитель
Сommit
0b2368fc67
48 измененных файлов с 204 добавлено и 20 удалено
  1. 1 1
      FGUIProject/assets/Main/components/ComponentChapterPic.xml
  2. 2 3
      FGUIProject/assets/Main/components/ComponentListChapterItem.xml
  3. BIN
      FGUIProject/assets/Main/imagesExport/zhuxian_jy_1.png
  4. BIN
      FGUIProject/assets/Main/imagesExport/zhuxian_zj_pic_1.jpg
  5. BIN
      FGUIProject/assets/Main/imagesExport/zhuxian_zj_pic_1.png
  6. BIN
      FGUIProject/assets/Main/imagesExport/zhuxian_zj_pic_2.jpg
  7. BIN
      FGUIProject/assets/Main/imagesExport/zhuxian_zj_pic_2.png
  8. BIN
      FGUIProject/assets/Main/imagesExport/zhuxian_zj_pic_3.jpg
  9. BIN
      FGUIProject/assets/Main/imagesExport/zhuxian_zj_pic_3.png
  10. BIN
      FGUIProject/assets/Main/imagesExport/zhuxian_zj_pic_4.jpg
  11. BIN
      FGUIProject/assets/Main/imagesExport/zhuxian_zj_pic_4.png
  12. BIN
      FGUIProject/assets/Main/imagesExport/zhuxian_zj_pic_5.jpg
  13. BIN
      FGUIProject/assets/Main/imagesExport/zhuxian_zj_pic_5.png
  14. BIN
      FGUIProject/assets/Main/imagesExport/zxian_chapter_1.png
  15. BIN
      FGUIProject/assets/Main/imagesExport/zxian_chapter_2.png
  16. BIN
      FGUIProject/assets/Main/imagesExport/zxian_chapter_3.png
  17. BIN
      FGUIProject/assets/Main/imagesExport/zxian_chapter_4.png
  18. BIN
      FGUIProject/assets/Main/imagesExport/zxian_chapter_5.png
  19. BIN
      FGUIProject/assets/Main/imagesExport/zxian_chapter_6.png
  20. BIN
      FGUIProject/assets/Main/imagesExport/zxian_chapter_7.png
  21. BIN
      FGUIProject/assets/Main/imagesExport/zxian_chapter_8.png
  22. BIN
      FGUIProject/assets/Main/imagesNew/zxian_chapter_lock_bg_l.png
  23. 9 11
      FGUIProject/assets/Main/package.xml
  24. 0 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_ComponentListChapterItem.cs
  25. 0 2
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterListView.cs
  26. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png
  27. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0.png
  28. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1!a.png
  29. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_1.png
  30. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_10!a.png
  31. 96 0
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_10!a.png.meta
  32. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_10.png
  33. 96 0
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_10.png.meta
  34. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_3!a.png
  35. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_3.png
  36. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_4!a.png
  37. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_4.png
  38. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_5!a.png
  39. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_5.png
  40. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_6!a.png
  41. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_6.png
  42. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_7!a.png
  43. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_7.png
  44. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_8!a.png
  45. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_8.png
  46. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_9!a.png
  47. BIN
      GameClient/Assets/ResIn/UI/Main/Main_atlas0_9.png
  48. BIN
      GameClient/Assets/ResIn/UI/Main/Main_fui.bytes

+ 1 - 1
FGUIProject/assets/Main/components/ComponentChapterPic.xml

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

+ 2 - 3
FGUIProject/assets/Main/components/ComponentListChapterItem.xml

@@ -29,9 +29,8 @@
     <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级开启">
+    <image id="n1_slb4" name="imgLockBg" src="o4m7fso" fileName="imagesNew/zxian_chapter_lock_bg_l.png" xy="40,275"/>
+    <text id="n10_q8od" name="txtLockDesc" xy="67,808" pivot="0.5,0" size="307,126" fontSize="40" color="#fffcf1" align="center" autoSize="none" text="通关上一章&#xA;并达到x级开启">
       <relation target="" sidePair="center-center"/>
     </text>
   </displayList>

BIN
FGUIProject/assets/Main/imagesExport/zhuxian_jy_1.png


BIN
FGUIProject/assets/Main/imagesExport/zhuxian_zj_pic_1.jpg


BIN
FGUIProject/assets/Main/imagesExport/zhuxian_zj_pic_1.png


BIN
FGUIProject/assets/Main/imagesExport/zhuxian_zj_pic_2.jpg


BIN
FGUIProject/assets/Main/imagesExport/zhuxian_zj_pic_2.png


BIN
FGUIProject/assets/Main/imagesExport/zhuxian_zj_pic_3.jpg


BIN
FGUIProject/assets/Main/imagesExport/zhuxian_zj_pic_3.png


BIN
FGUIProject/assets/Main/imagesExport/zhuxian_zj_pic_4.jpg


BIN
FGUIProject/assets/Main/imagesExport/zhuxian_zj_pic_4.png


BIN
FGUIProject/assets/Main/imagesExport/zhuxian_zj_pic_5.jpg


BIN
FGUIProject/assets/Main/imagesExport/zhuxian_zj_pic_5.png


BIN
FGUIProject/assets/Main/imagesExport/zxian_chapter_1.png


BIN
FGUIProject/assets/Main/imagesExport/zxian_chapter_2.png


BIN
FGUIProject/assets/Main/imagesExport/zxian_chapter_3.png


BIN
FGUIProject/assets/Main/imagesExport/zxian_chapter_4.png


BIN
FGUIProject/assets/Main/imagesExport/zxian_chapter_5.png


BIN
FGUIProject/assets/Main/imagesExport/zxian_chapter_6.png


BIN
FGUIProject/assets/Main/imagesExport/zxian_chapter_7.png


BIN
FGUIProject/assets/Main/imagesExport/zxian_chapter_8.png


BIN
FGUIProject/assets/Main/imagesNew/zxian_chapter_lock_bg_l.png


+ 9 - 11
FGUIProject/assets/Main/package.xml

@@ -163,22 +163,11 @@
     <image id="ed2z8a" name="zhuxian_zixz_3.png" path="/imagesStory/"/>
     <image id="ed2z8b" name="zhuxian_zixz_1.png" path="/imagesStory/"/>
     <image id="ed2z8c" name="zhuxian_zixz_2.png" path="/imagesStory/"/>
-    <image id="pq5x8d" name="zhuxian_jy_1.png" path="/imagesExport/"/>
-    <image id="jvi38d" name="zhuxian_zj_pic_1.png" path="/imagesExport/" exported="true"/>
-    <image id="jvi38e" name="zhuxian_zj_pic_2.png" path="/imagesExport/" exported="true"/>
-    <image id="jvi38f" name="zhuxian_zj_pic_3.png" path="/imagesExport/" exported="true"/>
-    <image id="jvi38g" name="zhuxian_zj_pic_4.png" path="/imagesExport/" exported="true"/>
-    <image id="jvi38h" name="zhuxian_zj_pic_5.png" path="/imagesExport/" exported="true"/>
     <component id="kpb08i" name="CompChapter20002.xml" path="/componentsLevel/" exported="true"/>
     <component id="kpb08j" name="CompChapter20001.xml" path="/componentsLevel/" exported="true"/>
     <component id="kpb08k" name="CompChapter20003.xml" path="/componentsLevel/" exported="true"/>
     <component id="kpb08l" name="CompChapter20004.xml" path="/componentsLevel/" exported="true"/>
     <component id="kpb08m" name="CompChapter20005.xml" path="/componentsLevel/" exported="true"/>
-    <image id="wg7t8n" name="zhuxian_zj_pic_1.jpg" path="/imagesExport/"/>
-    <image id="wg7t8o" name="zhuxian_zj_pic_2.jpg" path="/imagesExport/"/>
-    <image id="wg7t8p" name="zhuxian_zj_pic_3.jpg" path="/imagesExport/"/>
-    <image id="wg7t8q" name="zhuxian_zj_pic_4.jpg" path="/imagesExport/"/>
-    <image id="wg7t8r" name="zhuxian_zj_pic_5.jpg" path="/imagesExport/"/>
     <image id="wg7t8t" name="zjm_gn_dik_1.png" path="/images/" scale="9grid" scale9grid="42,26,84,52"/>
     <image id="wg7t8u" name="zjm_gndj_1.png" path="/images/"/>
     <image id="wg7t8v" name="zjm_gndj_2.png" path="/images/"/>
@@ -724,6 +713,15 @@
     <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/"/>
+    <image id="o4m7fsg" name="zxian_chapter_1.png" path="/imagesExport/" exported="true"/>
+    <image id="o4m7fsh" name="zxian_chapter_2.png" path="/imagesExport/" exported="true"/>
+    <image id="o4m7fsi" name="zxian_chapter_3.png" path="/imagesExport/" exported="true"/>
+    <image id="o4m7fsj" name="zxian_chapter_4.png" path="/imagesExport/" exported="true"/>
+    <image id="o4m7fsk" name="zxian_chapter_5.png" path="/imagesExport/" exported="true"/>
+    <image id="o4m7fsl" name="zxian_chapter_6.png" path="/imagesExport/" exported="true"/>
+    <image id="o4m7fsm" name="zxian_chapter_7.png" path="/imagesExport/" exported="true"/>
+    <image id="o4m7fsn" name="zxian_chapter_8.png" path="/imagesExport/" exported="true"/>
+    <image id="o4m7fso" name="zxian_chapter_lock_bg_l.png" path="/imagesNew/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/Main" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -17,7 +17,6 @@ namespace UI.Main
         public GTextField m_txtCurProgress;
         public GTextField m_txtMaxProgress;
         public GImage m_imgLockBg;
-        public GImage m_imgLock;
         public GTextField m_txtLockDesc;
         public const string URL = "ui://mfvz4q8kslb41t";
         public const string PACKAGE_NAME = "Main";
@@ -76,7 +75,6 @@ namespace UI.Main
             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");
         }
         public void Dispose(bool disposeTarget = false)
@@ -92,7 +90,6 @@ namespace UI.Main
             m_txtCurProgress = null;
             m_txtMaxProgress = null;
             m_imgLockBg = null;
-            m_imgLock = null;
             m_txtLockDesc = null;
             if(disposeTarget && target != null)
             {

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

@@ -152,13 +152,11 @@ namespace GFGGame
                 listItem.m_content.m_txtMaxProgress.text = chapterCfg.bonusStar3.ToString();
                 if (MainStoryDataManager.CheckChapterUnlock(chapterCfg.id))
                 {
-                    listItem.m_content.m_imgLock.visible = false;
                     listItem.m_content.m_imgLockBg.visible = false;
                     listItem.m_content.m_txtLockDesc.visible = false;
                 }
                 else
                 {
-                    listItem.m_content.m_imgLock.visible = true;
                     listItem.m_content.m_imgLockBg.visible = true;
                     listItem.m_content.m_txtLockDesc.visible = true;
                     if (chapterCfg.lvl > GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl))

BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0!a.png


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


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_1!a.png


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


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_10!a.png


+ 96 - 0
GameClient/Assets/ResIn/UI/Main/Main_atlas0_10!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: e461562f60aa7e1488108b5d5bca2318
+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_atlas0_10.png


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

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 7e7265bc38a3ea34baa3ea38ebd5f461
+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_atlas0_3!a.png


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


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_4!a.png


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


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_5!a.png


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


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_6!a.png


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


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_7!a.png


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


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_8!a.png


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


BIN
GameClient/Assets/ResIn/UI/Main/Main_atlas0_9!a.png


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


BIN
GameClient/Assets/ResIn/UI/Main/Main_fui.bytes