dzduole 1 month ago
parent
commit
d39db60c42

+ 14 - 3
art/fgui/.objs/metas/isxx5ak7/kt443qc.info

@@ -1,22 +1,33 @@
 {
   "objectStatus": {
+    "n87_r4l5": {
+      "collapsed": true
+    },
     "n76_vhzh": {
+      "collapsed": true,
       "locked": true,
       "hidden": true
     },
-    "n46_ixm4": {
+    "n44_ixm4": {
       "collapsed": true
     },
     "n84_jpsz": {
       "hidden": true
     },
-    "n48_hxtr": {
+    "n77_vhzh": {
+      "collapsed": true,
       "locked": true,
       "hidden": true
     },
-    "n77_vhzh": {
+    "n48_hxtr": {
       "locked": true,
       "hidden": true
+    },
+    "n45_ixm4": {
+      "collapsed": true
+    },
+    "n46_ixm4": {
+      "collapsed": true
     }
   },
   "fitScreen": "FitSize",

+ 34 - 8
art/fgui/.objs/workspace.json

@@ -7,24 +7,50 @@
     "/"
   ],
   "libview.iconScale": 0,
-  "doc.openedDocs": [
-    "ui://isxx5ak7erstv4nt",
-    "ui://isxx5ak7erstv4nl",
-    "ui://isxx5ak7erstv4ny",
-    "ui://isxx5ak7erstv4nx"
-  ],
+  "doc.openedDocs": [],
   "test.device": "iPhone Xs Max",
   "canvasColor": 10066329,
   "auxline2": true,
-  "doc.activeDoc": "ui://isxx5ak7erstv4nx",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
     "isxx5ak7",
     "/",
     "isxx5ak7",
+    "/UIAddProp/",
+    "isxx5ak7",
+    "/UIAddProp/component/",
+    "isxx5ak7",
     "/UIBox/",
     "isxx5ak7",
-    "/UIBox/component/"
+    "/UIBox/component/",
+    "isxx5ak7",
+    "/UIGetAward/",
+    "isxx5ak7",
+    "/UIInvitation/",
+    "isxx5ak7",
+    "/UIPower/",
+    "isxx5ak7",
+    "/UIPower/component/",
+    "isxx5ak7",
+    "/UIRepentProp/",
+    "isxx5ak7",
+    "/UIRepentProp/component/",
+    "isxx5ak7",
+    "/UIRodMethod/",
+    "isxx5ak7",
+    "/UIRodMethod/component/",
+    "isxx5ak7",
+    "/UISecretary/",
+    "isxx5ak7",
+    "/UISign/",
+    "isxx5ak7",
+    "/UISkill/",
+    "isxx5ak7",
+    "/UITips/",
+    "isxx5ak7",
+    "/UITips/component/",
+    "isxx5ak7",
+    "/__示意图/"
   ],
   "auxline1": true,
   "snapToGrid": true,

+ 1 - 1
art/fgui/assets/game/UIAddProp/component/Component102.xml

@@ -9,7 +9,7 @@
     <image id="n28_ehto" name="n28" src="ehtov4fz" fileName="UIAddProp/asset/hb_yuandian.png" xy="152,143"/>
     <component id="n32_ehto" name="n32" src="kys749e" fileName="UIAddProp/component/dh_jingbi1.xml" xy="27,274"/>
     <image id="n39_ehto" name="n39" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="59,407" group="n41_ehto"/>
-    <text id="n40_ehto" name="n40" xy="101,408" size="68,39" group="n41_ehto" fontSize="28" color="#c3945c" align="center" vAlign="middle" text="2000">
+    <text id="n40_ehto" name="n40" xy="101,408" size="68,39" group="n41_ehto" font="Arial" fontSize="28" color="#c3945c" align="center" vAlign="middle" text="2000">
       <relation target="n39_ehto" sidePair="left-right"/>
     </text>
     <group id="n41_ehto" name="n41" xy="59,407" size="110,40" advanced="true"/>

+ 3 - 3
art/fgui/assets/game/UIAddProp/component/hb_jinbi2.xml

@@ -7,11 +7,11 @@
     <image id="n28_ehto" name="n28" src="ehtov4fz" fileName="UIAddProp/asset/hb_yuandian.png" xy="150,153"/>
     <component id="n32_ehto" name="n32" src="ehtov4g0" fileName="UIAddProp/component/dh_jingbi2.xml" xy="28,246"/>
     <image id="n38_ehto" name="n38" src="ehtov4ga" fileName="UIAddProp/asset/hb_bz2.png" xy="0,392"/>
-    <image id="n39_ehto" name="n39" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="71,404" group="n41_ehto" scale="0.9,0.9"/>
-    <text id="n40_ehto" name="diamondTxt" xy="117,407" size="52,39" group="n41_ehto" fontSize="28" color="#ffffff" align="center" vAlign="middle" strokeColor="#000000" text="200">
+    <image id="n39_ehto" name="n39" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="68,404" size="51,43" group="n41_ehto" scale="0.9,0.9"/>
+    <text id="n40_ehto" name="diamondTxt" xy="120,404" size="52,39" group="n41_ehto" fontSize="28" color="#ffffff" align="center" vAlign="middle" strokeColor="#000000" text="200">
       <relation target="n39_ehto" sidePair="left-right"/>
     </text>
-    <group id="n41_ehto" name="n41" xy="71,404" size="98,43" advanced="true">
+    <group id="n41_ehto" name="n41" xy="68,404" size="104,43" advanced="true">
       <relation target="n38_ehto" sidePair="center-center"/>
     </group>
     <text id="n42_ehto" name="n42" xy="48,137" size="129,39" fontSize="28" color="#ffffff" align="center" italic="true" text="gold coin"/>

+ 3 - 3
art/fgui/assets/game/UIAddProp/component/hb_jinbi3.xml

@@ -7,11 +7,11 @@
     <image id="n28_ehto" name="n28" src="ehtov4fz" fileName="UIAddProp/asset/hb_yuandian.png" xy="150,153"/>
     <component id="n32_ehto" name="n32" src="ehtov4g2" fileName="UIAddProp/component/dh_jingbi3.xml" xy="28,208"/>
     <image id="n38_ehto" name="n38" src="ehtov4ga" fileName="UIAddProp/asset/hb_bz2.png" xy="0,392"/>
-    <image id="n39_ehto" name="n39" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="65,404" group="n41_ehto" scale="0.9,0.9"/>
-    <text id="n40_ehto" name="diamondTxt" xy="109,406" size="52,39" group="n41_ehto" fontSize="28" color="#ffffff" align="center" vAlign="middle" strokeColor="#000000" text="200">
+    <image id="n39_ehto" name="n39" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="62,404" group="n41_ehto" scale="0.9,0.9"/>
+    <text id="n40_ehto" name="diamondTxt" xy="112,406" size="52,39" group="n41_ehto" fontSize="28" color="#ffffff" align="center" vAlign="middle" strokeColor="#000000" text="200">
       <relation target="n39_ehto" sidePair="left-right"/>
     </text>
-    <group id="n41_ehto" name="n41" xy="65,404" size="96,43" advanced="true">
+    <group id="n41_ehto" name="n41" xy="62,404" size="102,43" advanced="true">
       <relation target="n38_ehto" sidePair="center-center"/>
     </group>
     <text id="n42_ehto" name="n42" xy="48,137" size="129,39" fontSize="28" color="#ffffff" align="center" italic="true" text="gold coin"/>

+ 4 - 4
art/fgui/assets/game/UIAddProp/component/hb_zs1.xml

@@ -12,12 +12,12 @@
     <text id="n46_lgji" name="shareTxt" xy="2,174" pivot="0.5,0.5" size="221,39" fontSize="26" color="#6379ac" align="center" vAlign="middle" autoSize="none" bold="true" text="(0/3)"/>
     <component id="n32_ehto" name="n32" src="ehtov4gm" fileName="UIAddProp/component/dh_zs1.xml" xy="35,274"/>
     <image id="n38_ehto" name="n38" src="ehtov4ga" fileName="UIAddProp/asset/hb_bz2.png" xy="0,392"/>
-    <image id="n39_ehto" name="n39" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="66,407" group="n41_ehto" scale="0.8,0.8"/>
-    <image id="n44_ehto" name="n44" src="ehtov4fk" fileName="UIAddProp/asset/hb_fx.png" xy="30,411" group="n41_ehto"/>
-    <text id="n40_ehto" name="diamondTxt" xy="108,408" size="84,39" group="n41_ehto" font="Arial" fontSize="28" color="#ffffff" align="center" vAlign="middle" bold="true" strokeColor="#000000" text="+2000">
+    <image id="n39_ehto" name="n39" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="65,407" group="n41_ehto" scale="0.8,0.8"/>
+    <image id="n44_ehto" name="n44" src="ehtov4fk" fileName="UIAddProp/asset/hb_fx.png" xy="29,411" group="n41_ehto"/>
+    <text id="n40_ehto" name="diamondTxt" xy="109,403" size="84,39" group="n41_ehto" font="Arial" fontSize="28" color="#ffffff" align="center" vAlign="middle" bold="true" strokeColor="#000000" text="+2000">
       <relation target="n39_ehto" sidePair="left-right"/>
     </text>
-    <group id="n41_ehto" name="n41" xy="30,407" size="162,43" advanced="true">
+    <group id="n41_ehto" name="n41" xy="29,403" size="164,47" advanced="true">
       <gearDisplay controller="c1" pages="0"/>
       <relation target="n38_ehto" sidePair="center-center"/>
     </group>

+ 4 - 4
art/fgui/assets/game/UIAddProp/component/hb_zs2.xml

@@ -7,12 +7,12 @@
     <text id="n27_ehto" name="n27" xy="-11,19" pivot="0.5,0.5" size="81,23" rotation="-47" font="Arial" fontSize="15" color="#ffffff" align="center" vAlign="middle" leading="0" bold="true" strokeColor="#000000" text="Timed limit"/>
     <component id="n32_ehto" name="n32" src="ehtov4gw" fileName="UIAddProp/component/dh_zs2.xml" xy="29,191"/>
     <image id="n38_ehto" name="n38" src="ehtov4ga" fileName="UIAddProp/asset/hb_bz2.png" xy="0,392"/>
-    <image id="n39_ehto" name="n39" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="85,401" group="n41_ehto" scale="0.8,0.8"/>
-    <image id="n44_ehto" name="n44" src="ehtov4fs" fileName="UIAddProp/asset/hb_sp.png" xy="45,406" group="n41_ehto"/>
-    <text id="n40_ehto" name="diamondTxt" xy="127,403" size="52,39" group="n41_ehto" font="Arial" fontSize="28" color="#ffffff" align="center" vAlign="middle" bold="true" strokeColor="#000000" text="+20">
+    <image id="n39_ehto" name="n39" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="83,401" size="51,43" group="n41_ehto" scale="0.8,0.8"/>
+    <image id="n44_ehto" name="n44" src="ehtov4fs" fileName="UIAddProp/asset/hb_sp.png" xy="43,406" size="33,24" group="n41_ehto"/>
+    <text id="n40_ehto" name="diamondTxt" xy="128,400" size="52,39" group="n41_ehto" font="Arial" fontSize="28" color="#ffffff" align="center" vAlign="middle" bold="true" strokeColor="#000000" text="+20">
       <relation target="n39_ehto" sidePair="left-right"/>
     </text>
-    <group id="n41_ehto" name="n41" xy="45,401" size="134,43" advanced="true">
+    <group id="n41_ehto" name="n41" xy="43,400" size="137,44" advanced="true">
       <relation target="n38_ehto" sidePair="center-center"/>
     </group>
     <image id="n45_ehto" name="n45" src="ehtov4fh" fileName="UIAddProp/asset/hb_bq_s.png" xy="197,392"/>

+ 2 - 2
art/fgui/assets/game/UIGame/component/topNode.xml

@@ -13,8 +13,8 @@
     <loader id="n8_hkrz" name="aiHeadLoader" xy="748,6" size="80,80" fill="scaleMatchHeight"/>
     <image id="n33_hkrz" name="n33" src="hkrz3rk" fileName="UIGame/asset/yy_txk.png" xy="501,0" size="90,90"/>
     <image id="n34_hkrz" name="n34" src="hkrz3rk" fileName="UIGame/asset/yy_txk.png" xy="744,0" size="90,90"/>
-    <text id="n25_hkrz" name="selfNameTxt" xy="329,6" pivot="1,0.5" size="164,32" font="Arial" fontSize="22" color="#ffffff" align="right" vAlign="middle" leading="0" text="我的名字123123"/>
-    <text id="n26_hkrz" name="aiNameTxt" xy="842,7" pivot="0,0.5" size="164,32" font="Arial" fontSize="22" color="#ffffff" align="right" vAlign="middle" leading="0" text="我的名字123123"/>
+    <text id="n25_hkrz" name="selfNameTxt" xy="329,6" pivot="1,0.5" size="164,32" font="Arial" fontSize="22" color="#ffffff" align="right" vAlign="middle" leading="0" strokeColor="#000000" text="我的名字123123"/>
+    <text id="n26_hkrz" name="aiNameTxt" xy="842,7" pivot="0,0.5" size="164,32" font="Arial" fontSize="22" color="#ffffff" align="right" vAlign="middle" leading="0" strokeColor="#000000" text="我的名字123123"/>
     <list id="n31_hkrz" name="selfBallList" xy="211,38" pivot="1,0.5" size="282,46" layout="row" overflow="scroll" scrollBarFlags="416" colGap="6" defaultItem="ui://isxx5ak7hkrz3sk" autoItemSize="false" align="right" vAlign="middle" autoClearItems="true" scrollItemToViewOnClick="false">
       <item/>
       <item/>

+ 8 - 8
art/fgui/assets/game/UIGameEnd/UIGameEnd.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1334,750" designImageAlpha="0" designImageLayer="1">
-  <controller name="c1" alias="结算" exported="true" pages="0,chenggong,1,shibai,2,完美过关,3,过关,4,闯关失败" selected="0"/>
+  <controller name="c1" alias="结算" exported="true" pages="0,chenggong,1,shibai,2,完美过关,3,过关,4,闯关失败" selected="1"/>
   <displayList>
     <graph id="n22_wehi" name="n22" xy="0,0" size="1334,750" type="rect" fillColor="#ff000000">
       <relation target="" sidePair="width-width,height-height"/>
@@ -16,7 +16,7 @@
       <gearDisplay controller="c1" pages="4"/>
       <relation target="n14_wehi" sidePair="center-center"/>
     </image>
-    <component id="n5_wehi" name="coinNode" src="mnrs42v" fileName="UIGameEnd/component/Component39.xml" xy="567,384" pivot="0.5,0.5">
+    <component id="n5_wehi" name="coinNode" src="mnrs42v" fileName="UIGameEnd/component/Component39.xml" xy="458,384" pivot="0.5,0.5" size="1056,80">
       <gearDisplay controller="c1" pages="0,1"/>
       <relation target="n2_wehi" sidePair="middle-middle"/>
       <relation target="n29_mhti" sidePair="center-center"/>
@@ -37,7 +37,7 @@
       <relation target="n2_wehi" sidePair="top-top%"/>
       <relation target="n14_wehi" sidePair="center-center"/>
     </component>
-    <component id="n29_mhti" name="n29" src="n43d3v2" fileName="UIGameEnd/component/dh_js_shibai.xml" xy="646,81">
+    <component id="n29_mhti" name="n29" src="n43d3v2" fileName="UIGameEnd/component/dh_js_shibai.xml" xy="647,81" size="499,335">
       <gearDisplay controller="c1" pages="0,1"/>
       <gearDisplay2 controller="c1" pages="1" condition="0"/>
       <relation target="n2_wehi" sidePair="left-center"/>
@@ -58,23 +58,23 @@
       <gearDisplay controller="c1" pages="4"/>
       <relation target="n14_wehi" sidePair="center-center"/>
     </component>
-    <component id="n45_g1gi" name="starNumNode" src="j69a40r" fileName="UIGameEnd/component/dh_js_xingxing2.xml" xy="781,291" controller="c1,1">
+    <component id="n46_g1gi" name="awardNode" src="g1giv4eb" fileName="UIGameEnd/component/Component97.xml" xy="563,451" controller="c1,0">
       <gearDisplay controller="c1" pages="2,3,4"/>
       <relation target="n14_wehi" sidePair="center-center"/>
     </component>
-    <component id="n46_g1gi" name="awardNode" src="g1giv4eb" fileName="UIGameEnd/component/Component97.xml" xy="563,451" controller="c1,0">
+    <component id="n45_g1gi" name="starNumNode" src="j69a40r" fileName="UIGameEnd/component/dh_js_xingxing2.xml" xy="781,291" controller="c1,1">
       <gearDisplay controller="c1" pages="2,3,4"/>
       <relation target="n14_wehi" sidePair="center-center"/>
     </component>
-    <text id="n47_g1gi" name="n47" xy="828,419" size="154,34" font="Arial" fontSize="24" color="#ffffff" align="center" vAlign="middle" autoSize="none" italic="true" text="3-Star Reward">
+    <text id="n47_g1gi" name="n47" xy="808,417" size="210,34" font="Arial" fontSize="24" color="#ffffff" align="center" vAlign="middle" autoSize="none" italic="true" text="3-Star reward">
       <gearDisplay controller="c1" pages="2"/>
       <relation target="n14_wehi" sidePair="center-center"/>
     </text>
-    <component id="n54_g1gi" name="conditionNode" src="p4tr423" fileName="UIGameEnd/component/Component31.xml" xy="722,410">
+    <component id="n54_g1gi" name="conditionNode" src="p4tr423" fileName="UIGameEnd/component/Component31.xml" xy="722,416">
       <gearDisplay controller="c1" pages="4"/>
       <relation target="n14_wehi" sidePair="center-center"/>
     </component>
-    <text id="n55_g1gi" name="isGetAward" xy="812,533" size="352,29" visible="false" fontSize="20" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="Rewards Already Claimed">
+    <text id="n55_g1gi" name="isGetAward" xy="726,551" size="352,29" visible="false" font="Arial" fontSize="20" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="Rewards Already Claimed">
       <gearDisplay controller="c1" pages="2"/>
       <relation target="n14_wehi" sidePair="center-center"/>
     </text>

+ 3 - 3
art/fgui/assets/game/UIGameEnd/component/Component31.xml

@@ -2,11 +2,11 @@
 <component size="368,33">
   <displayList>
     <image id="n55_p4tr" name="n55" src="p4tr422" fileName="UIGameEnd/asset/js_tb_db4.png" xy="0,0" pivot="0.5,0.5"/>
-    <image id="n54_p4tr" name="n54" src="p4tr421" fileName="UIGameEnd/asset/js_tb_gb.png" xy="70,7" group="n57_g1gi"/>
-    <text id="n56_p4tr" name="conditionTxt" xy="94,1" size="202,32" group="n57_g1gi" font="Arial" fontSize="22" color="#ffffff" align="center" vAlign="bottom" leading="0" vars="true" text="过关条件:{tiaojian=一杆清台}">
+    <image id="n54_p4tr" name="n54" src="p4tr421" fileName="UIGameEnd/asset/js_tb_gb.png" xy="66,7" group="n57_g1gi"/>
+    <text id="n56_p4tr" name="conditionTxt" xy="90,1" size="209,32" group="n57_g1gi" font="Arial" fontSize="22" color="#ffffff" align="center" vAlign="bottom" leading="0" vars="true" text="Objectives:{tiaojian=Run Out}">
       <relation target="n55_p4tr" sidePair=""/>
     </text>
-    <group id="n57_g1gi" name="n57" xy="70,1" size="226,32" advanced="true">
+    <group id="n57_g1gi" name="n57" xy="66,1" size="233,32" advanced="true">
       <relation target="n55_p4tr" sidePair="center-center"/>
     </group>
   </displayList>

+ 1 - 1
art/fgui/assets/game/UIGameEnd/component/Component55.xml

@@ -3,7 +3,7 @@
   <controller name="c1" alias="结算" exported="true" pages="0,chenggong,1,shibai" selected="0"/>
   <displayList>
     <image id="n30_g4yb" name="n30" src="brgy3uu" fileName="UIGameEnd/asset/zs4.png" xy="0,0" size="270,58" group="n33_anpx" alpha="0.4"/>
-    <text id="n31_g4yb" name="n31" xy="24,-4" size="230,65" group="n33_anpx" font="Arial" fontSize="22" color="#52719d" align="center" vAlign="middle" autoSize="none" bold="true" text="Great, keep up the&#xA; good work!">
+    <text id="n31_g4yb" name="n31" xy="24,-4" size="230,65" group="n33_anpx" font="Arial" fontSize="22" color="#52719d" vAlign="middle" autoSize="none" bold="true" text="Great, keep up the&#xA; good work!">
       <gearDisplay controller="c1" pages="0,1"/>
       <gearDisplay2 controller="c1" pages="0" condition="0"/>
     </text>

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

@@ -2,7 +2,7 @@
 <component size="261,84">
   <controller name="c1" alias="对话框" exported="true" pages="0,流程1,1,流程2,2,流程3" selected="0"/>
   <displayList>
-    <image id="n48_hxtr" name="n48" src="brgy3uu" fileName="UIGameEnd/asset/zs4.png" xy="0,0" pivot="0,0.842" size="261,84" alpha="0.3"/>
+    <image id="n48_hxtr" name="n48" src="brgy3uu" fileName="UIGameEnd/asset/zs4.png" xy="0,0" pivot="0,0.842" size="261,84"/>
     <text id="n49_hxtr" name="womanTxt" xy="24,1" pivot="-0.153,0.875" size="231,81" font="Arial" fontSize="20" color="#ffffff" vAlign="middle" leading="2" autoSize="none" bold="true" strokeColor="#000000" text="hello, I am your thoughtful secretary Luna!">
       <gearText controller="c1" pages="0,1,2" values="hello, I am your thoughtful secretary Luna!|Come and experience the pole mode|Give this skill a try!"/>
     </text>

+ 2 - 2
art/fgui/assets/game/UIMatching/component/Component18.xml

@@ -2,13 +2,13 @@
 <component size="347,116">
   <controller name="c1" exported="true" pages="0,不显示,1,显示" selected="1"/>
   <displayList>
-    <text id="n9_n0xy" name="nameTxt" xy="116,4" size="227,34" font="Arial" fontSize="22" color="#ffffff" vAlign="middle" autoSize="ellipsis" text="playerxxxxx"/>
+    <text id="n9_n0xy" name="nameTxt" xy="116,4" size="227,34" font="Arial" fontSize="22" color="#ffffff" vAlign="middle" autoSize="ellipsis" strokeColor="#000000" text="playerxxxxx"/>
     <loader id="n26_hxtr" name="headImg" xy="0,7" size="107,107" url="ui://isxx5ak7ixm43xl" align="center" vAlign="middle" fill="scaleMatchHeight" clearOnPublish="true"/>
     <image id="n24_hxtr" name="n24" src="hxtr3yr" fileName="UIMatching/asset/txk.png" xy="0,7" size="107,107"/>
     <loader id="n27_hxtr" name="skillImg" xy="118,49" size="170,170" scale="0.4,0.4" url="ui://isxx5ak7qlo0417" align="center" vAlign="middle" fill="scale" clearOnPublish="true">
       <gearDisplay controller="c1" pages="1"/>
     </loader>
-    <text id="n29_hxtr" name="skillTxt" xy="192,90" size="156,29" font="Arial" fontSize="20" color="#ffffff" vAlign="middle" vars="true" autoSize="none" text="{jnmz1=Jump}Lv.{jndj1=1}">
+    <text id="n29_hxtr" name="skillTxt" xy="192,90" size="156,29" font="Arial" fontSize="20" color="#ffffff" vAlign="middle" vars="true" autoSize="none" strokeColor="#000000" text="{jnmz1=Jump}Lv.{jndj1=1}">
       <gearDisplay controller="c1" pages="1"/>
     </text>
   </displayList>

+ 1 - 1
art/fgui/assets/game/UIMatching/component/dh_zy_jiazai.xml

@@ -11,7 +11,7 @@
     <image id="n5_nsoo" name="n5" src="j69a40c" fileName="UIGameEnd/asset/wz2(1).png" xy="451,217"/>
     <image id="n6_nsoo" name="n6" src="j69a40c" fileName="UIGameEnd/asset/wz2(1).png" xy="463,217"/>
     <image id="n8_j69a" name="n8" src="n0xy3ya" fileName="UIMatching/asset/pp_dk1.png" xy="225,191"/>
-    <text id="n7_j69a" name="n7" xy="272,196" size="256,32" font="Arial" fontSize="20" color="#ffffff" vAlign="middle" autoSize="none" text="Searching for opponents"/>
+    <text id="n7_j69a" name="n7" xy="272,196" size="256,32" font="Arial" fontSize="20" color="#ffffff" vAlign="middle" autoSize="none" strokeColor="#000000" text="Searching for opponents"/>
   </displayList>
   <transition name="t0" autoPlay="true" autoPlayRepeat="-1">
     <item time="0" type="Alpha" target="n4_nsoo" tween="true" startValue="0" endValue="1" duration="12"/>

+ 6 - 6
art/fgui/assets/game/UIRepentProp/component/Component41_2.xml

@@ -8,18 +8,18 @@
     <component id="n7_p4tr" name="cancelBtn" src="hkrz3tm" fileName="_sharecomponent/cancelBtn.xml" xy="90,310" size="171,51" group="n9_p4tr" controller="c1,1"/>
     <component id="n8_p4tr" name="videoBtn" src="hkrz3tn" fileName="_sharecomponent/shareBtn.xml" xy="341,310" size="171,51" group="n9_p4tr" controller="c1,3"/>
     <group id="n9_p4tr" name="n9" xy="90,310" size="422,51" advanced="true"/>
-    <image id="n22_trk9" name="n22" src="trk948z" fileName="UIRepentProp/asset/bq4_3.png" xy="145,90" group="n23_trk9">
+    <image id="n22_trk9" name="n22" src="trk948z" fileName="UIRepentProp/asset/bq4_3.png" xy="103,94" size="24,24" group="n23_trk9">
       <relation target="n13_p4tr" sidePair="right-left"/>
     </image>
-    <text id="n13_p4tr" name="tipsTxt" xy="180,92" size="275,32" group="n23_trk9" fontSize="22" color="#6e7b9a" align="center" vAlign="middle" autoSize="none" text="White ball into the hole"/>
-    <group id="n23_trk9" name="n23" xy="145,90" size="310,34" advanced="true" layout="hz" colGap="10" excludeInvisibles="true">
+    <text id="n13_p4tr" name="tipsTxt" xy="137,90" size="354,32" group="n23_trk9" font="Arial" fontSize="22" color="#6e7b9a" vAlign="middle" autoSize="none" text="White ball into the hole"/>
+    <group id="n23_trk9" name="n23" xy="103,90" size="388,32" advanced="true" layout="hz" colGap="10" excludeInvisibles="true">
       <relation target="" sidePair="center-center"/>
     </group>
-    <text id="n24_trk9" name="n24" xy="131,170" size="339,39" fontSize="28" color="#697ab8" align="center" vAlign="middle" autoSize="none" bold="true" text="Do you regret the ball?"/>
-    <text id="n26_trk9" name="n26" xy="140,211" size="320,26" fontSize="18" color="#697ab8" align="center" vAlign="middle" autoSize="none" text="Try again, create brilliance again"/>
+    <text id="n24_trk9" name="n24" xy="131,170" size="339,39" font="Arial" fontSize="28" color="#697ab8" align="center" vAlign="middle" leading="0" autoSize="none" bold="true" text="Do you regret the ball?"/>
+    <text id="n26_trk9" name="n26" xy="140,211" size="320,26" font="Arial" fontSize="18" color="#697ab8" align="center" vAlign="middle" leading="0" autoSize="none" text="Try again, create brilliance again"/>
     <text id="n27_trk9" name="n27" xy="141,371" size="324,26" visible="false" fontSize="18" color="#697ab8" align="center" vAlign="middle" vars="true" autoSize="none" text="本局剩余次数:{cishu=5}">
       <relation target="" sidePair="center-center"/>
     </text>
-    <text id="n12_p4tr" name="titleTxt" xy="52,11" size="498,54" fontSize="36" color="#ffffff" align="center" vAlign="middle" letterSpacing="3" autoSize="none" bold="true" text="Regret ball reminder"/>
+    <text id="n12_p4tr" name="titleTxt" xy="52,11" size="498,54" font="Arial" fontSize="36" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="none" bold="true" strokeColor="#000000" text="Regret ball reminder"/>
   </displayList>
 </component>

+ 1 - 1
art/fgui/assets/game/UISkill/component/skillDisplay.xml

@@ -11,7 +11,7 @@
     <loader id="n33_vu0p" name="skillImg" xy="6,47" size="136,137" url="ui://isxx5ak7qlo0417" autoSize="true"/>
     <component id="n11_qlo0" name="normalBtn" src="qlo041r" fileName="UISkill/component/Component26.xml" xy="247,125"/>
     <component id="n12_qlo0" name="mutiBtn" src="qlo041t" fileName="UISkill/component/Component28.xml" xy="388,126" visible="false"/>
-    <text id="n24_qlo0" name="nameTxt" xy="3,2" size="280,32" font="Arial" fontSize="22" color="#ffffff" vAlign="middle" autoSize="none" text="come down from heaven"/>
+    <text id="n24_qlo0" name="nameTxt" xy="3,2" size="280,32" font="Arial" fontSize="22" color="#ffffff" vAlign="middle" leading="0" autoSize="none" text="come down from heaven"/>
     <text id="n25_qlo0" name="levelTxt" xy="289,2" size="95,32" font="Arial" fontSize="22" color="#696b80" vAlign="middle" vars="true" autoSize="none" text="Lv.{ganfa=1}"/>
     <image id="n28_qlo0" name="n28" src="qlo041f" fileName="UISkill/asset/gf_k4.png" xy="148,46" size="374,70"/>
     <text id="n29_qlo0" name="describeTxt" xy="146,48" size="378,69" font="Arial" fontSize="16" color="#ff33cc" align="center" vAlign="middle" leading="0" autoSize="none" bold="true" text="After hitting the cue ball with a jump shot, the ball bounced high into the air, landed on the table, and directly pocketed the next ball we needed to make "/>

+ 2 - 2
art/fgui/assets/game/UISkill/component/skillItem.xml

@@ -8,8 +8,8 @@
     <image id="n31_qlo0" name="n31" src="qlo041d" fileName="UISkill/asset/gf_k2.png" xy="0,0" size="543,220"/>
     <image id="n6_qlo0" name="n6" src="qlo041c" fileName="UISkill/asset/gf_k1.png" xy="0,-1" size="543,220"/>
     <loader id="n33_tumi" name="skillImg" xy="8,51" size="136,137" url="ui://isxx5ak7qlo0417" autoSize="true" clearOnPublish="true"/>
-    <text id="n24_qlo0" name="nameTxt" xy="3,3" size="200,32" font="Arial" fontSize="22" color="#ffffff" vAlign="middle" leading="0" autoSize="none" bold="true" text="Fall from the sky"/>
-    <text id="n39_lp3l" name="levelTxt" xy="210,3" size="95,32" font="Arial" fontSize="22" color="#ffffff" vAlign="middle" vars="true" autoSize="none" bold="true" text="Lv.{ganfa=1}">
+    <text id="n24_qlo0" name="nameTxt" xy="3,3" size="200,32" font="Arial" fontSize="22" color="#ffffff" vAlign="middle" leading="0" autoSize="none" bold="true" strokeColor="#000000" text="Fall from the sky"/>
+    <text id="n39_lp3l" name="levelTxt" xy="210,3" size="95,32" font="Arial" fontSize="22" color="#ffffff" vAlign="middle" vars="true" autoSize="none" bold="true" strokeColor="#000000" text="Lv.{ganfa=1}">
       <gearDisplay controller="c1" pages="0"/>
     </text>
     <image id="n28_qlo0" name="n28" src="qlo041f" fileName="UISkill/asset/gf_k4.png" xy="148,51" size="374,81"/>

+ 1 - 1
art/fgui/assets/game/_sharecomponent/drawBtn.xml

@@ -5,7 +5,7 @@
     <image id="n2_hkrz" name="n2" src="hkrz3tb" fileName="_shareasset/ty_an2.png" xy="0,0" size="239,73" aspect="true">
       <gearDisplay controller="c1" pages="0,1,2,3,4,5,6,7,9,10"/>
     </image>
-    <text id="n1_hkrz" name="n1" xy="6,14" size="227,44" font="Arial" fontSize="31" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="none" bold="true" text="Prize draw">
+    <text id="n1_hkrz" name="n1" xy="6,14" size="227,44" font="Arial" fontSize="31" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="none" bold="true" strokeColor="#000000" text="Prize draw">
       <gearDisplay controller="c1" pages="9,10"/>
       <gearXY controller="c1" pages="9,10" values="6,14|6,14"/>
     </text>

+ 5 - 5
art/fgui/assets/game/_sharecomponent/shareBtn2.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="239,73" pivot="0.5,0.5" extention="Button" designImageLayer="1">
-  <controller name="c1" alias="按钮" exported="true" pages="0,换人再战,1,下一关要看视频,2,下一关不用看视频,3,开心收下,4,下一关要花费金币,5,立即挑战,6,知道了,7,领取,8,已领取,9,免费抽奖,10,普通领取,11,体力+开始游戏,21,连点开箱,22,连点开箱+视频,23,体力挑战下一关,24,三倍领取" selected="5"/>
+  <controller name="c1" alias="按钮" exported="true" pages="0,换人再战,1,下一关要看视频,2,下一关不用看视频,3,开心收下,4,下一关要花费金币,5,立即挑战,6,知道了,7,领取,8,已领取,9,免费抽奖,10,普通领取,11,体力+开始游戏,21,连点开箱,22,连点开箱+视频,23,体力挑战下一关,24,三倍领取" selected="14"/>
   <displayList>
     <image id="n2_hkrz" name="n2" src="hkrz3tb" fileName="_shareasset/ty_an2.png" xy="0,0" size="239,73" aspect="true">
       <gearDisplay controller="c1" pages="0,1,2,3,4,5,6,7,9,10,11,21,22,23,24"/>
@@ -8,20 +8,20 @@
     <image id="n24_wcn5" name="n24" src="hkrz3tb" fileName="_shareasset/ty_an2.png" xy="0,0" size="239,73" aspect="true" grayed="true">
       <gearDisplay controller="c1" pages="8"/>
     </image>
-    <text id="n1_hkrz" name="n1" xy="0,12" size="224,43" font="Arial" fontSize="31" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" strokeColor="#000000" text="Start">
+    <text id="n1_hkrz" name="n1" xy="0,12" size="224,43" font="Arial" fontSize="31" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" strokeColor="#000000" text="开始游戏">
       <gearDisplay controller="c1" pages="0,4,21"/>
       <gearXY controller="c1" pages="0,4,21" values="7,16|7,27|7,11" default="0,12"/>
       <gearText controller="c1" pages="0,3,4,5,6,21" values="Change player|start|next level|Start|Start|Unpacking" default="开始游戏"/>
     </text>
-    <text id="n3_p4tr" name="n3" xy="44,11" size="189,44" font="Arial" fontSize="32" color="#ffffff" vAlign="middle" leading="0" autoSize="none" bold="true" strokeColor="#000000" text="Start">
+    <text id="n3_p4tr" name="n3" xy="44,11" size="189,44" font="Arial" fontSize="32" color="#ffffff" vAlign="middle" leading="0" autoSize="none" bold="true" strokeColor="#000000" text="下一关">
       <gearDisplay controller="c1" pages="2,5,6"/>
       <gearText controller="c1" pages="0,2,5,6" values="next level|next level|Start|" default="下一关"/>
     </text>
-    <text id="n23_lp3l" name="n23" xy="2,6" size="232,65" font="Arial" fontSize="31" color="#ffffff" align="center" vAlign="middle" leading="1" autoSize="none" bold="true" strokeColor="#000000" text="OK">
+    <text id="n23_lp3l" name="n23" xy="2,6" size="232,65" font="Arial" fontSize="31" color="#ffffff" align="center" vAlign="middle" leading="1" autoSize="none" bold="true" strokeColor="#000000" text="知道了">
       <gearDisplay controller="c1" pages="6,7,8"/>
       <gearText controller="c1" pages="0,5,6,7,8" values="OK|OK|OK|receive|Receive" default="知道了"/>
     </text>
-    <text id="n4_p4tr" name="n4" xy="50,14" size="185,44" font="Arial" fontSize="30" color="#ffffff" vAlign="middle" leading="0" autoSize="none" bold="true" strokeColor="#000000" text="Next Level">
+    <text id="n4_p4tr" name="n4" xy="39,14" size="196,44" font="Arial" fontSize="30" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="none" bold="true" strokeColor="#000000" text="Next level">
       <gearDisplay controller="c1" pages="1,9,11,22,23,24"/>
       <gearText controller="c1" pages="0,1,5,6,9,11,22,23,24" values="next level|next level|Next Level|Next Level|Prize draw|Start|Unpacking|Next level|Triple claim" default="下一关"/>
     </text>

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

@@ -510,7 +510,7 @@
     <image id="luq648s" name="bq2_3_1.png" path="/UIGame/asset2/"/>
     <component id="luq648t" name="Component87_1.xml" path="/UIGame/component/" favorite="true"/>
     <component id="trk948v" name="UIRepentProp.xml" path="/UIRepentProp/" exported="true"/>
-    <component id="trk948w" name="Component41_2.xml" path="/UIRepentProp/component/"/>
+    <component id="trk948w" name="Component41_2.xml" path="/UIRepentProp/component/" favorite="true"/>
     <image id="trk948x" name="bq4_8.png" path="/UIRepentProp/asset/" scale="9grid" scale9grid="32,0,15,38"/>
     <image id="trk948y" name="bq4_2.png" path="/UIRepentProp/asset/"/>
     <image id="trk948z" name="bq4_3.png" path="/UIRepentProp/asset/"/>

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


+ 1 - 1
client/laya/bin/js/bundle.js

@@ -3966,8 +3966,8 @@
             this.n38 = (this.getChild("n38"));
             this.n39 = (this.getChild("n39"));
             this.n40 = (this.getChild("n40"));
-            this.starNumNode = (this.getChild("starNumNode"));
             this.awardNode = (this.getChild("awardNode"));
+            this.starNumNode = (this.getChild("starNumNode"));
             this.n47 = (this.getChild("n47"));
             this.conditionNode = (this.getChild("conditionNode"));
             this.isGetAward = (this.getChild("isGetAward"));

File diff suppressed because it is too large
+ 0 - 0
client/laya/bin/js/bundle.js.map


+ 3 - 3
client/laya/src/fgui/res/game/ui_UIGameEnd.ts

@@ -9,8 +9,8 @@ import ui_Component60 from "./ui_Component60";
 import ui_dh_js_tuowei from "./ui_dh_js_tuowei";
 import ui_dh_js_tuowei2 from "./ui_dh_js_tuowei2";
 import ui_dh_js_shibai_1 from "./ui_dh_js_shibai_1";
-import ui_dh_js_xingxing2 from "./ui_dh_js_xingxing2";
 import ui_Component97 from "./ui_Component97";
+import ui_dh_js_xingxing2 from "./ui_dh_js_xingxing2";
 import ui_Component31 from "./ui_Component31";
 import ui_cancelBtn2 from "./ui_cancelBtn2";
 import ui_shareBtn2 from "./ui_shareBtn2";
@@ -32,8 +32,8 @@ export default class ui_UIGameEnd extends fgui.GComponent {
 	public n38:ui_dh_js_tuowei;
 	public n39:ui_dh_js_tuowei2;
 	public n40:ui_dh_js_shibai_1;
-	public starNumNode:ui_dh_js_xingxing2;
 	public awardNode:ui_Component97;
+	public starNumNode:ui_dh_js_xingxing2;
 	public n47:fgui.GTextField;
 	public conditionNode:ui_Component31;
 	public isGetAward:fgui.GTextField;
@@ -62,8 +62,8 @@ export default class ui_UIGameEnd extends fgui.GComponent {
 		this.n38 = <ui_dh_js_tuowei>(this.getChild("n38"));
 		this.n39 = <ui_dh_js_tuowei2>(this.getChild("n39"));
 		this.n40 = <ui_dh_js_shibai_1>(this.getChild("n40"));
-		this.starNumNode = <ui_dh_js_xingxing2>(this.getChild("starNumNode"));
 		this.awardNode = <ui_Component97>(this.getChild("awardNode"));
+		this.starNumNode = <ui_dh_js_xingxing2>(this.getChild("starNumNode"));
 		this.n47 = <fgui.GTextField>(this.getChild("n47"));
 		this.conditionNode = <ui_Component31>(this.getChild("conditionNode"));
 		this.isGetAward = <fgui.GTextField>(this.getChild("isGetAward"));

+ 2 - 2
client/laya/src/ui/UIMain.ts

@@ -235,12 +235,12 @@ export default class UIMain extends UIBase {
         });
     }
     startGlobal() {
-        xGame.uiMgr.Show(UIMsg, "Coming Soon~")
+        xGame.uiMgr.Show(UIMsg, "Coming Soon")
         //xGame.uiMgr.Show(UITry);
     }
     startWeekly() {
         //xGame.uiMgr.Show(UIBox);
-        xGame.uiMgr.Show(UIMsg, "Coming Soon~")
+        xGame.uiMgr.Show(UIMsg, "Coming Soon")
     }
     startPlaceBall() {
         xGame.uiMgr.Show(UILevelDisplay);

Some files were not shown because too many files changed in this diff