فهرست منبع

工作室替换资源

zhaoyang 3 سال پیش
والد
کامیت
e2b4cb7a69
30فایلهای تغییر یافته به همراه123 افزوده شده و 32 حذف شده
  1. BIN
      FGUIProject/assets/CommonGame/bgimg/ejzjm_bj.jpg
  2. 0 0
      FGUIProject/assets/CommonGame/bgimg/gzs_bjbj.png
  3. 0 0
      FGUIProject/assets/CommonGame/bgimg/zjm_bj_1.jpg
  4. 3 0
      FGUIProject/assets/CommonGame/package.xml
  5. 1 1
      FGUIProject/assets/Studio/StudioEctypeUI.xml
  6. 13 13
      FGUIProject/assets/Studio/StudioUI.xml
  7. 3 6
      FGUIProject/assets/Studio/components/ComEctype.xml
  8. BIN
      FGUIProject/assets/Studio/images/ejzjm_1.png
  9. BIN
      FGUIProject/assets/Studio/images/ejzjm_2.png
  10. BIN
      FGUIProject/assets/Studio/images/ejzjm_3.png
  11. BIN
      FGUIProject/assets/Studio/images/ejzjm_4.png
  12. BIN
      FGUIProject/assets/Studio/images/ejzjm_gbzt.png
  13. BIN
      FGUIProject/assets/Studio/images/zjm_anhui.png
  14. BIN
      FGUIProject/assets/Studio/images/zjm_rk_10.png
  15. BIN
      FGUIProject/assets/Studio/images/zjm_rk_11.png
  16. BIN
      FGUIProject/assets/Studio/images/zjm_rk_8.png
  17. BIN
      FGUIProject/assets/Studio/images/zjm_rk_9.png
  18. 5 7
      FGUIProject/assets/Studio/package.xml
  19. 0 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ComEctype.cs
  20. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_es2qti0.png
  21. 1 1
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_es2qti0.png.meta
  22. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_kqhdp!a.png
  23. 1 1
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_kqhdp!a.png.meta
  24. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_kqhdp.png
  25. 96 0
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_kqhdp.png.meta
  26. BIN
      GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes
  27. BIN
      GameClient/Assets/ResIn/UI/Studio/Studio_atlas0.png
  28. BIN
      GameClient/Assets/ResIn/UI/Studio/Studio_atlas_kqhd1a.png
  29. BIN
      GameClient/Assets/ResIn/UI/Studio/Studio_atlas_kqhdp.png
  30. BIN
      GameClient/Assets/ResIn/UI/Studio/Studio_fui.bytes

BIN
FGUIProject/assets/CommonGame/bgimg/ejzjm_bj.jpg


+ 0 - 0
FGUIProject/assets/Studio/images/gzs_bjbj.png → FGUIProject/assets/CommonGame/bgimg/gzs_bjbj.png


+ 0 - 0
FGUIProject/assets/Studio/images/zjm_bj_1.jpg → FGUIProject/assets/CommonGame/bgimg/zjm_bj_1.jpg


+ 3 - 0
FGUIProject/assets/CommonGame/package.xml

@@ -196,6 +196,9 @@
     <image id="slyzthy" name="yx_yihd.png" path="/images/"/>
     <image id="hibuthz" name="fb_gongzuos.png" path="/imgItemIcon/" exported="true"/>
     <component id="pjip15" name="SuitPartsDetailUI.xml" path="/" exported="true"/>
+    <image id="kqhdp" name="gzs_bjbj.png" path="/bgimg/" exported="true" atlas="alone_npot"/>
+    <image id="es2qti0" name="ejzjm_bj.jpg" path="/bgimg/" exported="true" atlas="alone_npot"/>
+    <image id="kqhd1a" name="zjm_bj_1.jpg" path="/bgimg/" atlas="alone_npot"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

+ 1 - 1
FGUIProject/assets/Studio/StudioEctypeUI.xml

@@ -2,7 +2,7 @@
 <component size="1080,1920">
   <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n24_fa5e" name="n24" src="kqhdp" fileName="images/gzs_bjbj.png" xy="0,-240">
+    <image id="n24_fa5e" name="n24" src="kqhdp" fileName="images/gzs_bjbj.png" xy="0,-240" pkg="eg2y0ldp">
       <relation target="" sidePair="center-center,middle-middle"/>
     </image>
     <image id="n25_kqhd" name="n25" src="kqhdz" fileName="images/gzsxian_2.png" xy="61,162">

+ 13 - 13
FGUIProject/assets/Studio/StudioUI.xml

@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920">
   <displayList>
-    <image id="n6_fa5e" name="n6" src="kqhd1a" fileName="images/zjm_bj_1.jpg" xy="0,-240">
+    <image id="n6_fa5e" name="n6" src="es2qti0" fileName="bgimg/ejzjm_bj.jpg" pkg="eg2y0ldp" xy="0,-240">
       <relation target="" sidePair="center-center,middle-middle"/>
     </image>
     <component id="n1_rbxq" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
-    <component id="n2_rbxq" name="comMetal" src="rbxq5" fileName="components/ComEctype.xml" xy="840,910">
-      <relation target="" sidePair="right-right,bottom-bottom"/>
-      <property target="icon" propertyId="1" value="ui://xz8kxreckqhd17"/>
+    <component id="n2_rbxq" name="comMetal" src="rbxq5" fileName="components/ComEctype.xml" xy="340,1014">
+      <relation target="" sidePair="left-left,bottom-middle"/>
+      <property target="icon" propertyId="1" value="ui://xz8kxreces2q1e"/>
     </component>
-    <component id="n3_rbxq" name="comFabric" src="rbxq5" fileName="components/ComEctype.xml" xy="30,1064">
-      <relation target="" sidePair="left-left,bottom-bottom"/>
-      <property target="icon" propertyId="1" value="ui://xz8kxreckqhd19"/>
+    <component id="n3_rbxq" name="comFabric" src="rbxq5" fileName="components/ComEctype.xml" xy="128,450">
+      <relation target="" sidePair="left-left,bottom-middle"/>
+      <property target="icon" propertyId="1" value="ui://xz8kxreces2q1g"/>
     </component>
-    <component id="n4_rbxq" name="comProperty" src="rbxq5" fileName="components/ComEctype.xml" xy="30,1345">
-      <relation target="" sidePair="left-left,bottom-bottom"/>
-      <property target="icon" propertyId="1" value="ui://xz8kxreckqhd18"/>
+    <component id="n4_rbxq" name="comProperty" src="rbxq5" fileName="components/ComEctype.xml" xy="876,191">
+      <relation target="" sidePair="right-right,bottom-middle"/>
+      <property target="icon" propertyId="1" value="ui://xz8kxreces2q1f"/>
     </component>
-    <component id="n5_rbxq" name="comFiling" src="rbxq5" fileName="components/ComEctype.xml" xy="820,1497">
-      <relation target="" sidePair="right-right,bottom-bottom"/>
-      <property target="icon" propertyId="1" value="ui://xz8kxreckqhd16"/>
+    <component id="n5_rbxq" name="comFiling" src="rbxq5" fileName="components/ComEctype.xml" xy="777,1261">
+      <relation target="" sidePair="right-right,bottom-middle"/>
+      <property target="icon" propertyId="1" value="ui://xz8kxreces2q1d"/>
     </component>
   </displayList>
 </component>

+ 3 - 6
FGUIProject/assets/Studio/components/ComEctype.xml

@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="198,198">
+<component size="84,403">
   <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <loader id="n4_n3xh" name="icon" xy="-23,-9" size="236,218" url="ui://xz8kxreckqhd19" autoSize="true"/>
-    <image id="n3_n3xh" name="img" src="mnxr1c" fileName="images/zjm_anhui.png" xy="0,0">
-      <gearDisplay controller="c1" pages="0"/>
-    </image>
-    <image id="n2_rbxq" name="imgLock" src="rbxq4" fileName="images/zhuxian_shuoto.png" xy="63,80">
+    <loader id="n4_n3xh" name="icon" xy="0,0" size="84,403" url="ui://xz8kxreces2q1e" autoSize="true"/>
+    <image id="n3_n3xh" name="img" src="es2q1h" fileName="images/ejzjm_gbzt.png" xy="0,4">
       <gearDisplay controller="c1" pages="0"/>
     </image>
   </displayList>

BIN
FGUIProject/assets/Studio/images/ejzjm_1.png


BIN
FGUIProject/assets/Studio/images/ejzjm_2.png


BIN
FGUIProject/assets/Studio/images/ejzjm_3.png


BIN
FGUIProject/assets/Studio/images/ejzjm_4.png


BIN
FGUIProject/assets/Studio/images/ejzjm_gbzt.png


BIN
FGUIProject/assets/Studio/images/zjm_anhui.png


BIN
FGUIProject/assets/Studio/images/zjm_rk_10.png


BIN
FGUIProject/assets/Studio/images/zjm_rk_11.png


BIN
FGUIProject/assets/Studio/images/zjm_rk_8.png


BIN
FGUIProject/assets/Studio/images/zjm_rk_9.png


+ 5 - 7
FGUIProject/assets/Studio/package.xml

@@ -11,7 +11,6 @@
     <component id="n3xhi" name="Button12.xml" path="/components/"/>
     <component id="n3xhn" name="ListPropertyItem.xml" path="/components/"/>
     <image id="kqhdo" name="zpsxian_1.png" path="/images/"/>
-    <image id="kqhdp" name="gzs_bjbj.png" path="/images/" atlas="alone_npot"/>
     <image id="kqhdq" name="gzsatb_1.png" path="/images/" exported="true"/>
     <image id="kqhdr" name="gzsatb_2.png" path="/images/" exported="true"/>
     <image id="kqhds" name="gzsdi_1.png" path="/images/"/>
@@ -28,12 +27,11 @@
     <image id="kqhd13" name="gzswtb_2.png" path="/images/" exported="true"/>
     <image id="kqhd14" name="gzswtb_3.png" path="/images/" exported="true"/>
     <image id="kqhd15" name="gzswtb_4.png" path="/images/" exported="true"/>
-    <image id="kqhd16" name="zjm_rk_11.png" path="/images/"/>
-    <image id="kqhd17" name="zjm_rk_8.png" path="/images/"/>
-    <image id="kqhd18" name="zjm_rk_9.png" path="/images/"/>
-    <image id="kqhd19" name="zjm_rk_10.png" path="/images/"/>
-    <image id="kqhd1a" name="zjm_bj_1.jpg" path="/images/" atlas="alone_npot"/>
-    <image id="mnxr1c" name="zjm_anhui.png" path="/images/"/>
+    <image id="es2q1d" name="ejzjm_4.png" path="/images/"/>
+    <image id="es2q1e" name="ejzjm_1.png" path="/images/"/>
+    <image id="es2q1f" name="ejzjm_2.png" path="/images/"/>
+    <image id="es2q1g" name="ejzjm_3.png" path="/images/"/>
+    <image id="es2q1h" name="ejzjm_gbzt.png" path="/images/"/>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\Studio" packageCount="2" genCode="true"/>
 </packageDescription>

+ 0 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Studio/UI_ComEctype.cs

@@ -10,7 +10,6 @@ namespace UI.Studio
         public Controller m_c1;
         public GLoader m_icon;
         public GImage m_img;
-        public GImage m_imgLock;
         public const string URL = "ui://xz8kxrecrbxq5";
         public const string PACKAGE_NAME = "Studio";
         public const string RES_NAME = "ComEctype";
@@ -61,14 +60,12 @@ namespace UI.Studio
             m_c1 = comp.GetController("c1");
             m_icon = (GLoader)comp.GetChild("icon");
             m_img = (GImage)comp.GetChild("img");
-            m_imgLock = (GImage)comp.GetChild("imgLock");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
             m_icon = null;
             m_img = null;
-            m_imgLock = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_es2qti0.png


+ 1 - 1
GameClient/Assets/ResIn/UI/Studio/Studio_atlas_kqhd1a.png.meta → GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_es2qti0.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4bcfcfc65ecec984eb30826cfc6b9140
+guid: 845e52a898fcf7c4a8798884dfe5e770
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_kqhdp!a.png


+ 1 - 1
GameClient/Assets/ResIn/UI/Studio/Studio_atlas_kqhdp.png.meta → GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_kqhdp!a.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3ef20342acda61e4d92c4cbceb81f8a8
+guid: ff995218236889445a810799ed2c14ae
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_kqhdp.png


+ 96 - 0
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas_kqhdp.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 9674e399a3d101e49a2c50eb874ad3b4
+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/CommonGame/CommonGame_fui.bytes


BIN
GameClient/Assets/ResIn/UI/Studio/Studio_atlas0.png


BIN
GameClient/Assets/ResIn/UI/Studio/Studio_atlas_kqhd1a.png


BIN
GameClient/Assets/ResIn/UI/Studio/Studio_atlas_kqhdp.png


BIN
GameClient/Assets/ResIn/UI/Studio/Studio_fui.bytes