zhaoyang 2 rokov pred
rodič
commit
d8c35add69

+ 2 - 2
FGUIProject/assets/Bag/BagUI.xml

@@ -4,14 +4,14 @@
     <loader id="n13_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>
-    <component id="n5_wet2" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,90" group="n17_si5z">
+    <component id="n5_wet2" name="comValueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" group="n17_si5z">
       <relation target="" sidePair="right-right,top-top"/>
     </component>
     <component id="n6_wet2" name="btnback" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,196" group="n17_si5z">
       <Button icon="ui://2bsz6nelsi5zti3"/>
     </component>
     <image id="n14_si5z" name="n14" src="si5zti6" fileName="images/wpbb_xtxt.png" xy="54,312" group="n17_si5z"/>
-    <group id="n17_si5z" name="grpTop" xy="0,90" size="1080,234"/>
+    <group id="n17_si5z" name="grpTop" xy="0,95" size="1080,229"/>
     <list id="n0_lh8v" name="list" xy="33,390" size="1013,1530" layout="flow_hz" overflow="scroll" lineGap="82" colGap="43" defaultItem="ui://2bsz6nelsi5zti7" autoClearItems="true">
       <relation target="" sidePair="center-center,top-top,bottomext-bottom"/>
       <item/>

+ 6 - 6
FGUIProject/assets/ClothingFoster/ClothingUI.xml

@@ -10,7 +10,7 @@
       <relation target="" sidePair="center-center,middle-middle"/>
     </graph>
     <component id="n9_pjip" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
-    <component id="n42_r9ri" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,90" controller="c1,6"/>
+    <component id="n42_r9ri" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,6"/>
     <loader id="n18_py5g" name="loaRarity" xy="940,140" size="54,224" url="ui://eg2y0ldpqdrt15" autoSize="true"/>
     <image id="n37_l4ui" name="n37" src="l4ui26" fileName="images/fzyc_yhditu_2.png" xy="0,1336">
       <relation target="" sidePair="bottom-bottom"/>
@@ -34,10 +34,10 @@
     <group id="n41_r9ri" name="n41" xy="346,1128" size="387,78" advanced="true">
       <relation target="" sidePair="bottom-bottom"/>
     </group>
-    <text id="n22_nk8d" name="txtRenewProperty" xy="357,1386" size="365,46" group="n29_nk8d" fontSize="34" color="#aa9063" text="套装所有部件属性+10%"/>
-    <component id="n26_nk8d" name="comRenewCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="400,1717" group="n29_nk8d"/>
+    <text id="n22_nk8d" name="txtRenewProperty" xy="357,1386" size="353,46" group="n29_nk8d" fontSize="34" color="#aa9063" text="套装所有部件属性+10%"/>
+    <component id="n26_nk8d" name="comRenewCost" src="n3xha1" fileName="components/ComCostCurrency.xml" pkg="eg2y0ldp" xy="400,1717" size="237,46" group="n29_nk8d"/>
     <component id="n27_nk8d" name="btnRenew" src="bd1c1r" fileName="components/Button8.xml" xy="368,1766" group="n29_nk8d"/>
-    <text id="n28_nk8d" name="txtRenewTips" xy="442,1851" size="196,44" group="n29_nk8d" fontSize="32" color="#bbafa3" text="完成养护阶段"/>
+    <text id="n28_nk8d" name="txtRenewTips" xy="442,1851" size="193,44" group="n29_nk8d" fontSize="32" color="#bbafa3" text="完成养护阶段"/>
     <component id="n23_nk8d" name="comRenewReward" src="nk8d14" fileName="components/ComRenewReward.xml" xy="68,1411" size="300,300" group="n39_l4ui"/>
     <list id="n25_nk8d" name="listRenewMaterial" xy="428,1468" size="584,216" group="n39_l4ui" layout="row" colGap="36" defaultItem="ui://uicwtr5bpy5gu" align="center">
       <item/>
@@ -71,8 +71,8 @@
       <gearDisplay controller="c1" pages="0"/>
       <relation target="" sidePair="bottom-bottom"/>
     </group>
-    <text id="n30_nk8d" name="n30" xy="414,1410" size="252,66" group="n34_nk8d" fontSize="50" color="#aa9063" text="已完成焕新"/>
-    <text id="n31_nk8d" name="txtRenewShow" xy="336,1506" size="408,51" group="n34_nk8d" fontSize="38" color="#aa9063" text="套装所有部件属性+10%"/>
+    <text id="n30_nk8d" name="n30" xy="414,1410" size="248,66" group="n34_nk8d" fontSize="50" color="#aa9063" text="已完成焕新"/>
+    <text id="n31_nk8d" name="txtRenewShow" xy="336,1506" size="395,51" group="n34_nk8d" fontSize="38" color="#aa9063" text="套装所有部件属性+10%"/>
     <component id="n32_nk8d" name="comRenewRewardGet" src="nk8d15" fileName="components/ComRenewRewardGet.xml" xy="390,1578" group="n34_nk8d"/>
     <group id="n34_nk8d" name="grpRenewFinish" xy="336,1410" size="408,468" advanced="true">
       <gearDisplay controller="c1" pages="1"/>

+ 1 - 1
FGUIProject/assets/ClothingShop/GalleryShopUI.xml

@@ -7,7 +7,7 @@
     <component id="n1_yd72" name="btnBack" src="uyuxtj5" fileName="components/ButtonBack.xml" pkg="eg2y0ldp" xy="35,80">
       <Button icon="ui://e5hnfx8ar9rieg"/>
     </component>
-    <component id="n26_r9ri" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="17,105" controller="c1,9"/>
+    <component id="n26_r9ri" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="17,95" controller="c1,9"/>
     <image id="n19_r9ri" name="n19" src="r9rieh" fileName="images/jfsc_dik.png" xy="625,0"/>
     <image id="n22_r9ri" name="n22" src="r9ri6r" fileName="images/jfsc_xiantiao_1.png" xy="665,371" group="n21_r9ri"/>
     <component id="n20_r9ri" name="btnBuy" src="r9ritjq" fileName="components/Button15.xml" pkg="mk0fwx0x" xy="706,636" group="n21_r9ri">

+ 6 - 6
FGUIProject/assets/CommonGame/components/ButtonInValueBar.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="240,62" extention="Button">
+<component size="240,70" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_r9gf" name="n0" src="qqattj2" fileName="images/zjm_gnkuang.png" xy="-7,9" group="n4_qqat"/>
-    <image id="n3_r9gf" name="n3" src="qqattj1" fileName="images/zjm_kuang_2.png" xy="183,7" group="n4_qqat"/>
-    <text id="n1_r9gf" name="title" xy="49,10" pivot="0.5,0" size="126,39" group="n4_qqat" fontSize="28" color="#fdf2df" vAlign="middle" singleLine="true" autoClearText="true" text="1000000"/>
-    <loader id="n2_r9gf" name="icon" xy="4,9" pivot="0.5,0.5" size="42,42" group="n4_qqat" aspect="true" url="ui://eg2y0ldply9g8n" align="center" vAlign="middle" autoSize="true"/>
-    <group id="n4_qqat" name="n4" xy="-7,7" size="236,47"/>
+    <image id="n0_r9gf" name="n0" src="qqattj2" fileName="images/zjm_gnkuang.png" xy="-7,13" group="n4_qqat"/>
+    <image id="n3_r9gf" name="n3" src="qqattj1" fileName="images/zjm_kuang_2.png" xy="183,11" group="n4_qqat"/>
+    <text id="n1_r9gf" name="title" xy="53,14" pivot="0.5,0" size="117,39" group="n4_qqat" fontSize="28" color="#fdf2df" vAlign="middle" singleLine="true" autoClearText="true" text="1000000"/>
+    <loader id="n2_r9gf" name="icon" xy="4,13" pivot="0.5,0.5" size="42,42" group="n4_qqat" aspect="true" url="ui://eg2y0ldply9g8n" align="center" vAlign="middle" autoSize="true"/>
+    <group id="n4_qqat" name="n4" xy="-7,11" size="236,47"/>
   </displayList>
   <Button/>
 </component>

+ 8 - 8
FGUIProject/assets/CommonGame/components/ComponentValueBar.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,62" opaque="false">
-  <controller name="c1" exported="true" pages="0,,1,,3,,4,,5,,6,,7,,8,,9,,10," selected="9">
+<component size="1080,70" opaque="false">
+  <controller name="c1" exported="true" pages="0,,1,,3,,4,,5,,6,,7,,8,,9,,10," selected="0">
     <remark page="0" value="体力金币马蹄珍珠"/>
     <remark page="1" value="体力金币马蹄"/>
     <remark page="2" value="抽卡兑换"/>
@@ -13,32 +13,32 @@
     <remark page="9" value="金币马蹄珍珠"/>
   </controller>
   <displayList>
-    <component id="n43_vek8" name="btnCJLuoXing" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="460,5">
+    <component id="n43_vek8" name="btnCJLuoXing" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="460,0">
       <gearDisplay controller="c1" pages="3"/>
       <gearXY controller="c1" pages="0,3" values="460,0|814,0" default="460,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x4"/>
     </component>
-    <component id="n44_vek8" name="btnCJHuoDong" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="460,5">
+    <component id="n44_vek8" name="btnCJHuoDong" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="460,0">
       <gearDisplay controller="c1" pages="4"/>
       <gearXY controller="c1" pages="0,4" values="460,0|814,0" default="460,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x4"/>
     </component>
-    <component id="n47_wono" name="btnTravel" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="688,5">
+    <component id="n47_wono" name="btnTravel" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="814,0">
       <gearDisplay controller="c1" pages="8"/>
       <gearXY controller="c1" pages="0,1,5,6,8" values="814,0|684,2|684,2|684,2|814,0" default="688,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x5"/>
     </component>
-    <component id="n48_r9ri" name="btnGallery" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="688,5">
+    <component id="n48_r9ri" name="btnGallery" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="814,0">
       <gearDisplay controller="c1" pages="9"/>
       <gearXY controller="c1" pages="0,1,3,5,6,8,9" values="814,0|684,2|814,2|684,2|684,2|814,2|814,0" default="688,5"/>
       <Button title="100" icon="ui://eg2y0ldpdhoatk2"/>
     </component>
-    <component id="n38_r9gf" name="btnPower" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="0,5">
+    <component id="n38_r9gf" name="btnPower" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="37,0">
       <gearDisplay controller="c1" pages="0,1"/>
       <gearXY controller="c1" pages="0,1,5" values="37,0|296,0|296,5" default="0,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x4"/>
     </component>
-    <component id="n46_ighs" name="btnCJ" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="460,5">
+    <component id="n46_ighs" name="btnCJ" src="r9gf5z" fileName="components/ButtonInValueBar.xml" xy="-215,0">
       <gearDisplay controller="c1" pages="5"/>
       <gearXY controller="c1" pages="0,1,3,5" values="-215,0|1079,5|979,5|296,0" default="460,5"/>
       <Button title="100" icon="ui://eg2y0ldpq08x4"/>

+ 4 - 1
FGUIProject/assets/DressUp/DressUpFightUI.xml

@@ -2,6 +2,9 @@
 <component size="1080,1920">
   <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
+    <loader id="n48_mzf8" name="loaBg" xy="0,0" size="1080,1920" touchable="false">
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
     <graph id="n0_qsvd" name="touchPad" xy="0,0" size="1080,1920" alpha="0" type="rect">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
@@ -79,7 +82,7 @@
     <component id="n39_njn2" name="btnAutoPlay" src="jj0mdk" fileName="componentsDialog/Button2.xml" xy="355,1642" group="n38_8lqj">
       <relation target="" sidePair="left-left,bottom-bottom"/>
     </component>
-    <text id="n26_bx8o" name="txtRecommendCount" xy="305,1843" size="327,44" group="n38_8lqj" visible="false" fontSize="32" color="#f0eeee" align="center" vars="true" text="今日剩余次数:{v1=10}/{v2=10}">
+    <text id="n26_bx8o" name="txtRecommendCount" xy="305,1843" size="314,44" group="n38_8lqj" visible="false" fontSize="32" color="#f0eeee" align="center" vars="true" text="今日剩余次数:{v1=10}/{v2=10}">
       <relation target="" sidePair="bottom-bottom"/>
     </text>
     <group id="n38_8lqj" name="graContent" xy="0,0" size="1310,1920" advanced="true">

+ 1 - 1
FGUIProject/assets/Main/MainUI.xml

@@ -59,7 +59,7 @@
     <component id="n70_weok" name="loaLeft" src="weokii" fileName="components/Component7.xml" xy="1140,1565" pivot="0.5,0.5" anchor="true" size="200,234" group="n64_v95q" scale="-1,1"/>
     <group id="n64_v95q" name="n64" xy="918,1447" size="322,235" group="n59_oju1" advanced="true"/>
     <group id="n59_oju1" name="grpMove" xy="0,160" size="2092,1760" advanced="true"/>
-    <component id="n21_q08x" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95"/>
+    <component id="n21_q08x" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,90"/>
     <list id="n41_wg7t" name="list" xy="916,308" size="97,158" group="n57_oju1" overflow="hidden" scroll="horizontal" margin="20,0,0,0" lineGap="20" colGap="14" vAlign="middle" foldInvisibleItems="true">
       <relation target="" sidePair="right-right,top-top"/>
       <item url="ui://mfvz4q8kwg7t8y" icon="ui://mfvz4q8kq08x9" name="btnGongGao"/>

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_DressUpFightUI.cs

@@ -8,6 +8,7 @@ namespace UI.DressUp
     {
         public GComponent target;
         public Controller m_c1;
+        public GLoader m_loaBg;
         public GGraph m_touchPad;
         public GComboBox m_comboBox;
         public GButton m_btnBack;
@@ -82,6 +83,7 @@ namespace UI.DressUp
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_touchPad = (GGraph)comp.GetChild("touchPad");
             m_comboBox = (GComboBox)comp.GetChild("comboBox");
             m_btnBack = (GButton)comp.GetChild("btnBack");
@@ -112,6 +114,7 @@ namespace UI.DressUp
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_loaBg = null;
             m_touchPad = null;
             m_comboBox = null;
             m_btnBack = null;

+ 1 - 1
GameClient/Assets/Game/Launcher/LauncherConfig.cs

@@ -79,7 +79,7 @@ namespace GFGGame
         {
             var result = JsonMapper.ToObject<Result>(json);
             LauncherConfig.CDN_ROOT = result.cdnRoot;
-            //CDN_ROOT = "http://10.108.64.127/";
+            CDN_ROOT = "http://10.108.64.111/";
             LauncherConfig.logApiRootUrl = result.logApiUrl;
             //LauncherConfig.logApiRootUrl = "http://10.108.64.106:8080/api/Log/";
             LauncherConfig.logApiReportLauncherUrl = LauncherConfig.logApiRootUrl + "ReportNode";

BIN
GameClient/Assets/ResIn/UI/Bag/Bag_fui.bytes


BIN
GameClient/Assets/ResIn/UI/ClothingFoster/ClothingFoster_fui.bytes


BIN
GameClient/Assets/ResIn/UI/ClothingShop/ClothingShop_fui.bytes


BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes


BIN
GameClient/Assets/ResIn/UI/DressUp/DressUp_fui.bytes


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