dzduole 4 tuần trước cách đây
mục cha
commit
e6d49f7558

+ 12 - 2
art/fgui/.objs/workspace.json

@@ -8,21 +8,31 @@
   ],
   ],
   "libview.iconScale": 0,
   "libview.iconScale": 0,
   "doc.openedDocs": [
   "doc.openedDocs": [
-    "ui://isxx5ak7kt443qc"
+    "ui://isxx5ak7wcn5v4ke"
   ],
   ],
   "test.device": "iPhone Xs Max",
   "test.device": "iPhone Xs Max",
   "canvasColor": 10066329,
   "canvasColor": 10066329,
   "auxline2": true,
   "auxline2": true,
-  "doc.activeDoc": "ui://isxx5ak7kt443qc",
+  "doc.activeDoc": "ui://isxx5ak7wcn5v4ke",
   "libview.twoColumn": false,
   "libview.twoColumn": false,
   "libview.expandedNodes": [
   "libview.expandedNodes": [
     "isxx5ak7",
     "isxx5ak7",
     "/",
     "/",
     "isxx5ak7",
     "isxx5ak7",
+    "/UIDraw/",
+    "isxx5ak7",
+    "/UILevelProp/",
+    "isxx5ak7",
+    "/UILevelProp/component/",
+    "isxx5ak7",
     "/UIMain/",
     "/UIMain/",
     "isxx5ak7",
     "isxx5ak7",
     "/UIMain/component/",
     "/UIMain/component/",
     "isxx5ak7",
     "isxx5ak7",
+    "/UIModeSelection/",
+    "isxx5ak7",
+    "/UIModeSelection/component/",
+    "isxx5ak7",
     "/windows/"
     "/windows/"
   ],
   ],
   "auxline1": true,
   "auxline1": true,

+ 1 - 1
art/fgui/assets/game/UIMain/UIMain.xml

@@ -14,7 +14,7 @@
       <relation target="" sidePair="right-right"/>
       <relation target="" sidePair="right-right"/>
       <relation target="n10_ixm4" sidePair="bottom-bottom"/>
       <relation target="n10_ixm4" sidePair="bottom-bottom"/>
     </component>
     </component>
-    <component id="n23_ixm4" name="moneyNode" src="wehi3ug" fileName="UIMoney/UIMoney.xml" xy="567,39" size="767,37" controller="c1,1">
+    <component id="n23_ixm4" name="moneyNode" src="wehi3ug" fileName="UIMoney/UIMoney.xml" xy="540,39" size="794,46" controller="c1,1">
       <relation target="n10_ixm4" sidePair="right-right%"/>
       <relation target="n10_ixm4" sidePair="right-right%"/>
     </component>
     </component>
     <component id="n26_ixm4" name="headNode" src="ixm43xh" fileName="UIMain/component/Component3.xml" xy="97,19"/>
     <component id="n26_ixm4" name="headNode" src="ixm43xh" fileName="UIMain/component/Component3.xml" xy="97,19"/>

+ 7 - 7
art/fgui/assets/game/UIMoney/UIMoney.xml

@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <component size="900,50">
 <component size="900,50">
-  <controller name="c1" alias="货币栏" exported="true" pages="0,金币,1,金币+钻石,13,金币+体力+钻石,14,金币+体力,15,体力+钻石,16,体力,17,钻石" selected="2"/>
+  <controller name="c1" alias="货币栏" exported="true" pages="0,金币,1,金币+钻石,13,金币+体力+钻石,14,金币+体力,15,体力+钻石,16,体力,17,钻石" selected="3"/>
   <displayList>
   <displayList>
-    <image id="n4_wehi" name="n4" src="wehi3um" fileName="UIMoney/asset/ty_dk.png" xy="350,0" size="219,50">
+    <image id="n4_wehi" name="n4" src="wehi3um" fileName="UIMoney/asset/ty_dk.png" xy="350,0" size="195,50">
       <gearDisplay controller="c1" pages="0,1,13,14"/>
       <gearDisplay controller="c1" pages="0,1,13,14"/>
     </image>
     </image>
     <image id="n1_wehi" name="coinImg" src="wehi3ui" fileName="UIMoney/asset/ty_jb.png" xy="354,6" pivot="0.5,0.5" size="37,37" aspect="true">
     <image id="n1_wehi" name="coinImg" src="wehi3ui" fileName="UIMoney/asset/ty_jb.png" xy="354,6" pivot="0.5,0.5" size="37,37" aspect="true">
       <gearDisplay controller="c1" pages="0,1,13,14"/>
       <gearDisplay controller="c1" pages="0,1,13,14"/>
     </image>
     </image>
-    <component id="n5_wehi" name="addCoinBtn" src="wehi3un" fileName="_sharecomponent/MoneyBtn.xml" xy="519,4" size="42,42">
+    <component id="n5_wehi" name="addCoinBtn" src="wehi3un" fileName="_sharecomponent/MoneyBtn.xml" xy="502,4" size="42,42">
       <gearDisplay controller="c1" pages="0,1,13,14"/>
       <gearDisplay controller="c1" pages="0,1,13,14"/>
     </component>
     </component>
     <text id="n6_wehi" name="coinTxt" xy="393,10" size="90,29" font="Arial" fontSize="20" color="#ffffff" vAlign="middle" leading="0" autoSize="none" bold="true" text="99999">
     <text id="n6_wehi" name="coinTxt" xy="393,10" size="90,29" font="Arial" fontSize="20" color="#ffffff" vAlign="middle" leading="0" autoSize="none" bold="true" text="99999">
       <gearDisplay controller="c1" pages="0,1,13,14"/>
       <gearDisplay controller="c1" pages="0,1,13,14"/>
     </text>
     </text>
-    <image id="n7_wehi" name="n7" src="wehi3um" fileName="UIMoney/asset/ty_dk.png" xy="577,0" size="219,50">
+    <image id="n7_wehi" name="n7" src="wehi3um" fileName="UIMoney/asset/ty_dk.png" xy="577,0" size="195,50">
       <gearDisplay controller="c1" pages="1,13,15,17"/>
       <gearDisplay controller="c1" pages="1,13,15,17"/>
     </image>
     </image>
-    <component id="n9_wehi" name="addDiamondBtn" src="wehi3un" fileName="_sharecomponent/MoneyBtn.xml" xy="746,4" size="42,42">
+    <component id="n9_wehi" name="addDiamondBtn" src="wehi3un" fileName="_sharecomponent/MoneyBtn.xml" xy="729,4" size="42,42">
       <gearDisplay controller="c1" pages="1,13,15,17"/>
       <gearDisplay controller="c1" pages="1,13,15,17"/>
     </component>
     </component>
     <text id="n10_wehi" name="diamondTxt" xy="622,8" size="86,33" font="Arial" fontSize="20" color="#ffffff" vAlign="middle" leading="0" autoSize="none" bold="true" text="99999">
     <text id="n10_wehi" name="diamondTxt" xy="622,8" size="86,33" font="Arial" fontSize="20" color="#ffffff" vAlign="middle" leading="0" autoSize="none" bold="true" text="99999">
@@ -26,13 +26,13 @@
     <image id="n11_wehi" name="diamondImg" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="580,8" pivot="0.5,0.5" size="39,33" aspect="true">
     <image id="n11_wehi" name="diamondImg" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="580,8" pivot="0.5,0.5" size="39,33" aspect="true">
       <gearDisplay controller="c1" pages="1,13,15,17"/>
       <gearDisplay controller="c1" pages="1,13,15,17"/>
     </image>
     </image>
-    <image id="n12_jpsz" name="n12" src="wehi3um" fileName="UIMoney/asset/ty_dk.png" xy="123,-2" size="219,50">
+    <image id="n12_jpsz" name="n12" src="wehi3um" fileName="UIMoney/asset/ty_dk.png" xy="123,-2" size="195,50">
       <gearDisplay controller="c1" pages="13,14,15,16"/>
       <gearDisplay controller="c1" pages="13,14,15,16"/>
     </image>
     </image>
     <image id="n13_jpsz" name="powerImg" src="jpszv4mv" fileName="UIMoney/asset/ty_tl.png" xy="134,5" pivot="0.5,0.5" size="31,36" aspect="true">
     <image id="n13_jpsz" name="powerImg" src="jpszv4mv" fileName="UIMoney/asset/ty_tl.png" xy="134,5" pivot="0.5,0.5" size="31,36" aspect="true">
       <gearDisplay controller="c1" pages="13,14,15,16"/>
       <gearDisplay controller="c1" pages="13,14,15,16"/>
     </image>
     </image>
-    <component id="n14_jpsz" name="addPowerBtn" src="wehi3un" fileName="_sharecomponent/MoneyBtn.xml" xy="292,2" size="42,42">
+    <component id="n14_jpsz" name="addPowerBtn" src="wehi3un" fileName="_sharecomponent/MoneyBtn.xml" xy="275,2" size="42,42">
       <gearDisplay controller="c1" pages="13,14,15,16"/>
       <gearDisplay controller="c1" pages="13,14,15,16"/>
     </component>
     </component>
     <text id="n15_jpsz" name="powerTxt" xy="164,10" size="92,29" font="Arial" fontSize="20" color="#ffffff" vAlign="middle" leading="0" autoSize="none" bold="true" text="99999">
     <text id="n15_jpsz" name="powerTxt" xy="164,10" size="92,29" font="Arial" fontSize="20" color="#ffffff" vAlign="middle" leading="0" autoSize="none" bold="true" text="99999">

BIN
client/laya/bin/asset/fgui/game.obj