dzduole hace 3 semanas
padre
commit
250731ebe2

+ 1 - 10
art/fgui/.objs/metas/isxx5ak7/kt443qh.info

@@ -1,10 +1 @@
-{
-  "objectStatus": {
-    "n2_hkrz": {
-      "hidden": true
-    },
-    "n12_hkrz": {
-      "hidden": true
-    }
-  }
-}
+{}

+ 3 - 3
art/fgui/assets/game/UILevelProp/component/Component83.xml

@@ -2,10 +2,10 @@
 <component size="300,37">
   <controller name="c1" alias="规则" exported="true" pages="0,清台模式,1,挑战模式" selected="0"/>
   <displayList>
-    <text id="n17_xs1r" name="n17" xy="47,0" size="246,36" font="Arial" fontSize="26" color="#ffffff" leading="0" vars="true" autoSize="none" bold="true" text="Clear-Table Mode">
-      <gearText controller="c1" pages="0,1" values="Clear-Table Mode|Reward Mode"/>
+    <text id="n17_xs1r" name="n17" xy="43,0" pivot="0.5,0.5" size="254,36" font="Arial" fontSize="26" color="#ffffff" vAlign="middle" leading="0" vars="true" autoSize="none" bold="true" text="Clear-Table Mode">
+      <gearText controller="c1" pages="1" values="Reward Mode" default="Clear-Table Mode"/>
     </text>
-    <image id="n19_xs1r" name="n19" src="xs1r47y" fileName="UILevelProp/asset/tc_gk_tb1.png" xy="0,0" size="38,37" aspect="true">
+    <image id="n19_xs1r" name="n19" src="xs1r47y" fileName="UILevelProp/asset/tc_gk_tb1.png" xy="0,0" pivot="0.5,0.5" size="38,37" aspect="true">
       <gearDisplay controller="c1" pages="0"/>
     </image>
     <image id="n20_xs1r" name="n20" src="xs1r47x" fileName="UILevelProp/asset/tc_gk_tb2.png" xy="0,0" size="36,37" aspect="true">

+ 1 - 3
art/fgui/assets/game/UILevelProp/component/Component85.xml

@@ -19,9 +19,7 @@
     <text id="n14_xs1r" name="n14" xy="390,300" size="490,32" font="Arial" fontSize="22" color="#4480b6" vAlign="middle" leading="0" autoSize="none" bold="true" text="Level Rewards (for Three-Star Clearance)">
       <relation target="n13_xs1r" sidePair="left-left"/>
     </text>
-    <component id="n17_xs1r" name="modeNode" src="xs1r47z" fileName="UILevelProp/component/Component83.xml" xy="393,140" controller="c1,1">
-      <relation target="n3_xs1r" sidePair="left-left"/>
-    </component>
+    <component id="n17_xs1r" name="modeNode" src="xs1r47z" fileName="UILevelProp/component/Component83.xml" xy="390,143" pivot="0.5,0.5" controller="c1,1"/>
     <component id="n18_xs1r" name="n18" src="xs1r47w" fileName="UILevelProp/component/Component71_1.xml" xy="845,98" size="28,28" aspect="true" scale="0.7,0.7"/>
     <text id="n20_xs1r" name="conditionTxt" xy="390,238" size="486,47" font="Arial" fontSize="22" color="#ffffff" vAlign="middle" leading="0" autoSize="none" bold="true" text="test test test balls test test test ">
       <relation target="n11_xs1r" sidePair="left-left"/>

+ 1 - 1
art/fgui/assets/game/UISecretary/SecretaryDisplay.xml

@@ -4,7 +4,7 @@
     <image id="n2_s46i" name="n2" src="xs1r47m" fileName="UILevelProp/asset/gq3.png" xy="0,0" size="899,569"/>
     <text id="n3_s46i" name="levelTxt" xy="232,20" pivot="0.5,0.5" size="436,54" font="Arial" fontSize="40" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="none" bold="true" strokeColor="#000000" text="Hire a secretary"/>
     <image id="n4_s46i" name="n4" src="s46iv4f3" fileName="UISecretary/asset/pqms_rwbg.png" xy="27,101" pivot="0.5,0.5" size="291,433"/>
-    <loader id="n6_s46i" name="secretary" xy="-37,33" pivot="0.5,0.5" size="419,719" aspect="true" scale="0.4,0.4" url="ui://isxx5ak7wehi3ut" align="center" vAlign="middle" clearOnPublish="true">
+    <loader id="n6_s46i" name="secretary" xy="-37,30" pivot="0.5,0.5" size="419,719" aspect="true" scale="0.4,0.4" url="ui://isxx5ak7wehi3ut" align="center" vAlign="middle" clearOnPublish="true">
       <relation target="n4_s46i" sidePair="bottom-bottom"/>
     </loader>
     <component id="n9_u8ei" name="purchaseBtn" src="u8eiv4i2" fileName="UISecretary/component/Component118.xml" xy="27,467" size="291,63"/>

+ 2 - 2
art/fgui/assets/game/UISecretary/UIShop/component/BallRodDisplay.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="543,151" designImageLayer="1">
-  <controller name="c1" alias="杆法列表" exported="true" pages="0,未选中,1,选中" selected="0"/>
+  <controller name="c1" alias="杆法列表" exported="true" pages="0,未选中,1,选中" selected="1"/>
   <displayList>
     <image id="n31_qlo0" name="n31" src="qlo041d" fileName="UISkill/asset/gf_k2.png" xy="0,0" size="543,136">
       <gearDisplay controller="c1" pages="1"/>
@@ -8,7 +8,7 @@
     <image id="n6_qlo0" name="n6" src="qlo041c" fileName="UISkill/asset/gf_k1.png" xy="0,0" size="543,151">
       <gearDisplay controller="c1" pages="0"/>
     </image>
-    <text id="n24_qlo0" name="nameTxt" xy="5,3" size="231,32" font="Arial" fontSize="21" color="#ffffff" vAlign="middle" autoSize="none" text="Wooden cue"/>
+    <text id="n24_qlo0" name="nameTxt" xy="5,2" size="231,32" font="Arial" fontSize="21" color="#ffffff" vAlign="middle" autoSize="none" text="Wooden cue"/>
     <loader id="n32_g1gi" name="rodImg" xy="218,-285" pivot="0.5,0.5" size="106,711" scale="0.7,-0.7" rotation="-90" url="ui://isxx5ak7hkrz3sn" align="center" vAlign="middle"/>
     <component id="n33_g1gi" name="levelNode" src="g1giv4ey" fileName="UISecretary/UIShop/component/Component101.xml" xy="418,0" controller="c1,0"/>
     <loader id="n36_s46i" name="eftRod" xy="-1,1" size="543,151" align="center" vAlign="middle"/>

+ 3 - 3
art/fgui/assets/game/UISecretary/UIShop/component/Component101.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="125,35">
-  <controller name="c1" alias="标签" exported="true" pages="0,新手,1,史诗,2,传说" selected="0"/>
+  <controller name="c1" alias="标签" exported="true" pages="0,新手,1,史诗,2,传说" selected="2"/>
   <displayList>
     <image id="n36_g1gi" name="n36" src="g1giv4es" fileName="UISecretary/UIShop/asset/qg_bq1.png" xy="0,0">
       <gearDisplay controller="c1" pages="2"/>
@@ -11,8 +11,8 @@
     <image id="n33_g1gi" name="n33" src="g1giv4eu" fileName="UISecretary/UIShop/asset/qg_bq3.png" xy="0,0">
       <gearDisplay controller="c1" pages="1"/>
     </image>
-    <text id="n34_g1gi" name="n34" xy="34,4" pivot="0.5,0.5" size="73,26" fontSize="18" color="#ffffff" align="center" vAlign="middle" letterSpacing="1" bold="true" strokeColor="#000000" text="newbie">
-      <gearText controller="c1" pages="0,1,2" values="newbie|epic|legend"/>
+    <text id="n34_g1gi" name="n34" xy="34,4" pivot="0.5,0.5" size="73,26" fontSize="18" color="#ffffff" align="center" vAlign="middle" letterSpacing="1" bold="true" strokeColor="#000000" text="Legend">
+      <gearText controller="c1" pages="0,1,2" values="Newbie|Epic|Legend"/>
     </text>
   </displayList>
 </component>

+ 1 - 2
art/fgui/assets/game/package.xml

@@ -767,7 +767,7 @@
     <component id="uqohv4lo" name="SecretaryDisplay.xml" path="/UISecretary/" exported="true"/>
     <image id="uqohv4lp" name="xiaoning.png" path="/UISecretary/asset/" exported="true"/>
     <image id="uqohv4lq" name="xiaoting.png" path="/UISecretary/asset/" exported="true"/>
-    <component id="uqohv4lr" name="BallRodDisplay.xml" path="/UISecretary/UIShop/component/"/>
+    <component id="uqohv4lr" name="BallRodDisplay.xml" path="/UISecretary/UIShop/component/" favorite="true"/>
     <component id="uqohv4ls" name="Component28_1.xml" path="/UISecretary/UIShop/component/"/>
     <component id="uqohv4lt" name="Component58_1.xml" path="/UISecretary/UIShop/component/"/>
     <component id="uqohv4lu" name="Component98_2.xml" path="/UISecretary/UIShop/component/"/>
@@ -1276,7 +1276,6 @@
     <image id="h498v579" name="234_2025.png" path="/UIRepentProp/asset/"/>
     <font id="d33kv57a" name="arial.ttf" path="/" renderMode="" samplePointSize="16"/>
     <component id="q5n8v57b" name="Component1303.xml" path="/UIGame/component/"/>
-    <image id="tpbsv57c" name="qg5 - 副本.png" path="/_exportasset/"/>
   </resources>
   <publish name="game" path="..\..\client\laya\bin\asset\fgui" packageCount="2" genCode="true" codePath="..\..\client\laya\src\fgui\res"/>
 </packageDescription>

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