公用机提交

FGUIProject/assets/XiuFang/XiuFangUI.xml

@@ -4,12 +4,12 @@
     <loader id="n0_9xlo" name="bg" xy="0,-240" size="1080,2400" url="ui://kv0ad4wy9xlo1">
       <relation target="" sidePair="center-center,middle-middle"/>
     </loader>
-    <component id="n1_9xlo" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
+    <component id="n1_9xlo" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80">
       <Button icon="ui://kv0ad4wy9xlo7"/>
     </component>
-    <component id="n4_9xlo" name="component" src="wlc28" fileName="components/Component.xml" xy="74,337" size="932,1246"/>
-    <image id="n2_9xlo" name="n2" src="9xlo5" fileName="images/tzhc_jiazidi.png" xy="9,589">
-      <relation target="n4_9xlo" sidePair="bottom-bottom"/>
-    </image>
+    <image id="n5_o4m7" name="n5" src="o4m7f" fileName="imagesNew/title_img.png" xy="229,55" group="n7_o4m7"/>
+    <image id="n6_o4m7" name="n6" src="o4m7o" fileName="imagesNew/xf_title_txt.png" xy="484,87" group="n7_o4m7"/>
+    <group id="n7_o4m7" name="n7" xy="229,55" size="622,144"/>
+    <component id="n4_9xlo" name="component" src="wlc28" fileName="components/Component.xml" xy="36,337"/>
   </displayList>
 </component>

FGUIProject/assets/XiuFang/components/Component.xml

@@ -1,21 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1000,1246" overflow="scroll" scroll="horizontal">
+<component size="1008,1640" scroll="horizontal">
   <displayList>
-    <component id="n4_9xlo" name="btnClothingShop" src="v95qe" fileName="components/Component1.xml" xy="0,0">
-      <property target="loaIcon" propertyId="1" value="ui://kv0ad4wy9xlo3"/>
-      <property target="loaLockIcon" propertyId="1" value="ui://kv0ad4wyv95qb"/>
-    </component>
-    <component id="n19_v95q" name="btnSuitSynthetic" src="v95qe" fileName="components/Component1.xml" xy="320,0">
-      <property target="loaIcon" propertyId="1" value="ui://kv0ad4wy9xlo6"/>
-      <property target="loaLockIcon" propertyId="1" value="ui://kv0ad4wyv95qa"/>
-    </component>
-    <component id="n20_v95q" name="btnClothingUpgrade" src="v95qe" fileName="components/Component1.xml" xy="640,0">
-      <property target="loaIcon" propertyId="1" value="ui://kv0ad4wy9xlo4"/>
-      <property target="loaLockIcon" propertyId="1" value="ui://kv0ad4wyv95qd"/>
-    </component>
-    <component id="n21_v95q" name="btnDecompose" src="v95qe" fileName="components/Component1.xml" xy="960,0">
-      <property target="loaIcon" propertyId="1" value="ui://kv0ad4wyqyr69"/>
-      <property target="loaLockIcon" propertyId="1" value="ui://kv0ad4wyv95qc"/>
-    </component>
+    <component id="n4_9xlo" name="btnClothingShop" src="v95qe" fileName="components/Component1.xml" xy="0,0" controller="c2,0"/>
+    <component id="n19_v95q" name="btnSuitSynthetic" src="v95qe" fileName="components/Component1.xml" xy="-21,1288" size="1050,288" controller="c2,1"/>
+    <component id="n20_v95q" name="btnClothingUpgrade" src="v95qe" fileName="components/Component1.xml" xy="506,521" size="476,712" controller="c2,2"/>
+    <component id="n21_v95q" name="btnDecompose" src="v95qe" fileName="components/Component1.xml" xy="11,603" size="478,478" controller="c2,3"/>
   </displayList>
 </component>

FGUIProject/assets/XiuFang/components/Component1.xml

@@ -1,12 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="320,1246">
+<component size="478,478">
   <controller name="c1" pages="0,,1," selected="0"/>
+  <controller name="c2" exported="true" pages="0,,1,,2,,3," selected="3">
+    <remark page="0" value="服装店"/>
+    <remark page="1" value="服装合成"/>
+    <remark page="2" value="服装升级"/>
+    <remark page="3" value="服装分解"/>
+  </controller>
   <displayList>
-    <loader id="n4_9xlo" name="loaIcon" xy="0,0" size="320,1246" url="ui://kv0ad4wy9xlo3" autoSize="true"/>
-    <loader id="n9_v95q" name="loaLockIcon" xy="160,623" pivot="0.5,0.5" anchor="true" size="320,1246" touchable="false" url="ui://kv0ad4wyv95qb" autoSize="true">
+    <loader id="n10_o4m7" name="loaBg" xy="0,0" size="478,478" url="ui://kv0ad4wyo4m7g" autoSize="true">
+      <gearIcon controller="c2" pages="1,2,3" values="ui://kv0ad4wyo4m7i|ui://kv0ad4wyo4m7j|ui://kv0ad4wyo4m7g" default="ui://kv0ad4wyo4m7h"/>
+    </loader>
+    <loader id="n4_9xlo" name="loaIcon" xy="-5,181" size="386,356" url="ui://kv0ad4wyo4m7k" align="center" vAlign="middle" autoSize="true">
+      <gearXY controller="c2" pages="0,1,2,3" values="417,-13|510,0|41,8|-5,181"/>
+      <gearIcon controller="c2" pages="0,1,2" values="ui://kv0ad4wyo4m7l|ui://kv0ad4wyo4m7m|ui://kv0ad4wyo4m7n" default="ui://kv0ad4wyo4m7k"/>
+    </loader>
+    <loader id="n9_v95q" name="loaLockIcon" xy="236,270" pivot="0.5,0.5" anchor="true" size="480,532" touchable="false" url="ui://kv0ad4wyo4m7q" autoSize="true">
       <gearDisplay controller="c1" pages="0"/>
+      <gearXY controller="c2" pages="1,2,3" values="524,174|249,355|236,270" default="504,229"/>
+      <gearIcon controller="c2" pages="0,1,2,3" values="ui://kv0ad4wyo4m7r|ui://kv0ad4wyo4m7s|ui://kv0ad4wyo4m7t|ui://kv0ad4wyo4m7q"/>
     </loader>
+    <image id="n11_o4m7" name="n11" src="o4m7p" fileName="imagesNew/xf_wjs.png" xy="42,196">
+      <gearDisplay controller="c1" pages="0"/>
+      <gearXY controller="c2" pages="0,2,3" values="289,208|23,287|42,196" default="289,127"/>
+    </image>
   </displayList>
-  <customProperty target="loaIcon" propertyId="1"/>
-  <customProperty target="loaLockIcon" propertyId="1"/>
+  <relation target="n10_o4m7" sidePair="width-width,height-height"/>
 </component>

FGUIProject/assets/XiuFang/package.xml

@@ -2,19 +2,23 @@
 <packageDescription id="kv0ad4wy">
   <resources>
     <component id="9xlo0" name="XiuFangUI.xml" path="/" exported="true"/>
-    <image id="9xlo1" name="tzhc_bj.jpg" path="/images/" atlas="alone_npot"/>
-    <image id="9xlo3" name="tzhc_fzd.png" path="/images/"/>
-    <image id="9xlo4" name="tzhc_fzsj.png" path="/images/"/>
-    <image id="9xlo5" name="tzhc_jiazidi.png" path="/images/" scale="9grid" scale9grid="66,254,91,512"/>
-    <image id="9xlo6" name="tzhc_tzhc.png" path="/images/"/>
-    <image id="9xlo7" name="tzhc_ziti.png" path="/images/"/>
     <component id="wlc28" name="Component.xml" path="/components/"/>
-    <image id="qyr69" name="tzhc_fzfj.png" path="/images/"/>
-    <image id="v95qa" name="tzhc_tzhc_an.png" path="/images/"/>
-    <image id="v95qb" name="tzhc_fzd_an.png" path="/images/"/>
-    <image id="v95qc" name="tzhc_fzfj_an.png" path="/images/"/>
-    <image id="v95qd" name="tzhc_fzsj_an.png" path="/images/"/>
     <component id="v95qe" name="Component1.xml" path="/components/"/>
+    <image id="o4m7f" name="title_img.png" path="/imagesNew/"/>
+    <image id="o4m7g" name="xf_btn_fj.png" path="/imagesNew/"/>
+    <image id="o4m7h" name="xf_btn_fzd.png" path="/imagesNew/"/>
+    <image id="o4m7i" name="xf_btn_hc.png" path="/imagesNew/"/>
+    <image id="o4m7j" name="xf_btn_sj.png" path="/imagesNew/"/>
+    <image id="o4m7k" name="xf_icon_fj.png" path="/imagesNew/"/>
+    <image id="o4m7l" name="xf_icon_fzd.png" path="/imagesNew/"/>
+    <image id="o4m7m" name="xf_icon_hc.png" path="/imagesNew/"/>
+    <image id="o4m7n" name="xf_icon_sj.png" path="/imagesNew/"/>
+    <image id="o4m7o" name="xf_title_txt.png" path="/imagesNew/"/>
+    <image id="o4m7p" name="xf_wjs.png" path="/imagesNew/"/>
+    <image id="o4m7q" name="xf_icon_fj_zz.png" path="/imagesNew/"/>
+    <image id="o4m7r" name="xf_icon_fzd_zz.png" path="/imagesNew/"/>
+    <image id="o4m7s" name="xf_icon_hc_zz.png" path="/imagesNew/"/>
+    <image id="o4m7t" name="xf_icon_sj_zz.png" path="/imagesNew/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/XiuFang" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/XiuFang/UI_Component1.cs

@@ -8,6 +8,8 @@ namespace UI.XiuFang
     {
         public GComponent target;
         public Controller m_c1;
+        public Controller m_c2;
+        public GLoader m_loaBg;
         public GLoader m_loaIcon;
         public GLoader m_loaLockIcon;
         public const string URL = "ui://kv0ad4wyv95qe";
@@ -58,12 +60,16 @@ namespace UI.XiuFang
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_c2 = comp.GetController("c2");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_loaIcon = (GLoader)comp.GetChild("loaIcon");
             m_loaLockIcon = (GLoader)comp.GetChild("loaLockIcon");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_c2 = null;
+            m_loaBg = null;
             m_loaIcon = null;
             m_loaLockIcon = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/Views/XiuFang/XiuFangView.cs

@@ -34,6 +34,8 @@ namespace GFGGame
             _ui.m_component.m_btnSuitSynthetic.target.onClick.Add(OnClickBtnSuitSynthetic);
             _ui.m_component.m_btnClothingUpgrade.target.onClick.Add(OnClickBtnClothingUpgrade);
             _ui.m_component.m_btnDecompose.target.onClick.Add(OnClickBtnDecompose);
+
+            _ui.m_bg.url = ResPathUtil.GetBgImgPath("xf_bg");
         }
         protected override void AddEventListener()
         {

GameClient/Assets/ResIn/UI/XiuFang/XiuFang_atlas_9xlo1.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 6884a8348a54221449723af1b84236c9
-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: -100
-    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: