dzduole 1 month ago
parent
commit
f1bcfef742
53 changed files with 110 additions and 247 deletions
  1. 1 2
      art/fgui/.objs/metas/isxx5ak7/ehtov4gd.info
  2. 1 7
      art/fgui/.objs/metas/isxx5ak7/uepz49c.info
  3. 12 54
      art/fgui/.objs/workspace.json
  4. 1 1
      art/fgui/assets/game/UIAddProp/UIAddCoin.xml
  5. 3 3
      art/fgui/assets/game/UIAddProp/component/Component41.xml
  6. 2 2
      art/fgui/assets/game/UIAddProp/component/hb_jinbi1.xml
  7. 2 2
      art/fgui/assets/game/UIAddProp/component/hb_jinbi2.xml
  8. 1 1
      art/fgui/assets/game/UIAddProp/component/hb_jinbi3.xml
  9. 8 8
      art/fgui/assets/game/UIAddProp/component/hb_zs1.xml
  10. 4 4
      art/fgui/assets/game/UIAddProp/component/hb_zs2.xml
  11. 1 1
      art/fgui/assets/game/UIAddProp/component/hb_zs3.xml
  12. 1 1
      art/fgui/assets/game/UIDraw/component/UITurntable_com12.xml
  13. 1 1
      art/fgui/assets/game/UIDraw/component/UITurntable_com7.xml
  14. 3 3
      art/fgui/assets/game/UIGetAward/component/Component126.xml
  15. 1 1
      art/fgui/assets/game/UILevelProp/component/Component85.xml
  16. 1 1
      art/fgui/assets/game/UIMatching/MatchingNode.xml
  17. 2 2
      art/fgui/assets/game/UIMatching/component/Component18.xml
  18. 4 4
      art/fgui/assets/game/UIModeSelection/component/ModeSelection_com1.xml
  19. 1 1
      art/fgui/assets/game/UIModeSelection/component/ModeSelection_com123.xml
  20. 4 4
      art/fgui/assets/game/UIModeSelection/component/ModeSelection_com2.xml
  21. 4 4
      art/fgui/assets/game/UIModeSelection/component/ModeSelection_com3.xml
  22. 2 2
      art/fgui/assets/game/UIPower/component/Component41_3.xml
  23. 2 2
      art/fgui/assets/game/UIRepentProp/component/Component41_1.xml
  24. 1 1
      art/fgui/assets/game/UIRepentProp/component/longBtn.xml
  25. 4 4
      art/fgui/assets/game/UISecretary/UIShop/component/BallRodDisplay.xml
  26. 4 4
      art/fgui/assets/game/UISecretary/UIShop/component/Component101.xml
  27. 3 3
      art/fgui/assets/game/UISecretary/UIShop/component/Component28_11.xml
  28. 2 2
      art/fgui/assets/game/UISecretary/UIShop/component/Component98_3.xml
  29. 1 1
      art/fgui/assets/game/UISecretary/component/Component118.xml
  30. 0 8
      art/fgui/assets/game/UISecretary/component/Component122.xml
  31. 1 1
      art/fgui/assets/game/UISkill/component/Component98.xml
  32. 2 2
      art/fgui/assets/game/UITips/component/Component42.xml
  33. 0 14
      art/fgui/assets/game/UITry/UITry.xml
  34. BIN
      art/fgui/assets/game/UITry/asset/biaoqian.png
  35. BIN
      art/fgui/assets/game/UITry/asset/guang.png
  36. BIN
      art/fgui/assets/game/UITry/asset/jdt1.png
  37. BIN
      art/fgui/assets/game/UITry/asset/jdt2.png
  38. BIN
      art/fgui/assets/game/UITry/asset/jdt3.png
  39. BIN
      art/fgui/assets/game/UITry/asset/jdt4.png
  40. BIN
      art/fgui/assets/game/UITry/asset/jiantou.png
  41. BIN
      art/fgui/assets/game/UITry/asset/lv4_top1.png
  42. 0 27
      art/fgui/assets/game/UITry/component/try_com1.xml
  43. 0 15
      art/fgui/assets/game/UITry/component/try_com2.xml
  44. 0 18
      art/fgui/assets/game/UITry/component/try_com3.xml
  45. 5 5
      art/fgui/assets/game/_sharecomponent/cancelBtn2.xml
  46. 2 5
      art/fgui/assets/game/_sharecomponent/drawBtn.xml
  47. 7 7
      art/fgui/assets/game/_sharecomponent/shareBtn2.xml
  48. 16 16
      art/fgui/assets/game/package.xml
  49. BIN
      client/laya/bin/asset/fgui/game.obj
  50. 0 1
      client/laya/bin/js/bundle.js
  51. 0 0
      client/laya/bin/js/bundle.js.map
  52. 0 0
      client/laya/release/bytedancegame/res/json/npc.json
  53. 0 2
      client/laya/src/fgui/res/game/ui_drawBtn.ts

+ 1 - 2
art/fgui/.objs/metas/isxx5ak7/ehtov4gd.info

@@ -1,8 +1,7 @@
 {
   "objectStatus": {
     "n41_ehto": {
-      "hidden": true,
-      "collapsed": true
+      "hidden": true
     }
   }
 }

+ 1 - 7
art/fgui/.objs/metas/isxx5ak7/uepz49c.info

@@ -1,7 +1 @@
-{
-  "objectStatus": {
-    "n61_hxtr": {
-      "collapsed": true
-    }
-  }
-}
+{}

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

@@ -7,74 +7,32 @@
     "/"
   ],
   "libview.iconScale": 0,
-  "doc.openedDocs": [],
+  "doc.openedDocs": [
+    "ui://isxx5ak7g1giv4ep",
+    "ui://isxx5ak7g1giv4el",
+    "ui://isxx5ak7uqohv4lr",
+    "ui://isxx5ak7g1giv4ey"
+  ],
   "test.device": "iPhone Xs Max",
   "canvasColor": 10066329,
   "auxline2": true,
+  "doc.activeDoc": "ui://isxx5ak7g1giv4el",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
     "isxx5ak7",
     "/",
     "isxx5ak7",
-    "/UIGame/",
-    "isxx5ak7",
-    "/UIGame/component/",
-    "isxx5ak7",
-    "/UIGameEnd/",
-    "isxx5ak7",
-    "/UIGameEnd/component/",
-    "isxx5ak7",
-    "/UIGetAward/",
-    "isxx5ak7",
-    "/UIGetAward/component/",
-    "isxx5ak7",
-    "/UIInvitation/",
-    "isxx5ak7",
-    "/UIInvitation/component/",
-    "isxx5ak7",
-    "/UILevelDisplay/",
-    "isxx5ak7",
-    "/UILevelDisplay/component/",
-    "isxx5ak7",
-    "/UILevelProp/",
-    "isxx5ak7",
-    "/UILevelProp/component/",
-    "isxx5ak7",
-    "/UILevelSelect/",
-    "isxx5ak7",
-    "/UILevelSelect/UIMain/",
-    "isxx5ak7",
-    "/UILevelSelect/UIMain/component/",
-    "isxx5ak7",
-    "/UIMain/",
-    "isxx5ak7",
-    "/UIMain/ani/",
-    "isxx5ak7",
-    "/UIMain/component/",
-    "isxx5ak7",
-    "/UIMatching/",
-    "isxx5ak7",
-    "/UIModeSelection/",
-    "isxx5ak7",
-    "/UIMoney/",
-    "isxx5ak7",
-    "/UIMsg/",
-    "isxx5ak7",
-    "/UIRepentProp/",
-    "isxx5ak7",
-    "/UIRepentProp/component/",
-    "isxx5ak7",
-    "/UIRodMethod/",
-    "isxx5ak7",
     "/UISecretary/",
     "isxx5ak7",
-    "/UISign/",
+    "/UISecretary/UIShop/",
+    "isxx5ak7",
+    "/UISecretary/UIShop/component/",
     "isxx5ak7",
-    "/UISkill/",
+    "/UITips/",
     "isxx5ak7",
     "/UIWordsList/",
     "isxx5ak7",
-    "/__示意图/",
+    "/UIWordsList/UIVideoShare/",
     "isxx5ak7",
     "/_exportasset/",
     "isxx5ak7",

+ 1 - 1
art/fgui/assets/game/UIAddProp/UIAddCoin.xml

@@ -4,7 +4,7 @@
     <graph id="n11_p4tr" name="n11" xy="0,0" size="1334,750" alpha="0.6" type="rect" lineSize="0" fillColor="#ff000000">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
-    <component id="n0_p4tr" name="myNode" src="mnrs430" fileName="UIAddProp/component/Component41.xml" xy="365,191" controller="c1,3">
+    <component id="n0_p4tr" name="myNode" src="mnrs430" fileName="UIAddProp/component/Component41.xml" xy="365,190" controller="c1,3">
       <relation target="" sidePair="center-center,middle-middle"/>
     </component>
   </displayList>

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

@@ -3,16 +3,16 @@
   <controller name="c1" alias="货币弹窗" exported="true" pages="0,额外获取的金币,1,钻石,3,失败返回的金币" selected="0"/>
   <displayList>
     <image id="n0_p4tr" name="n0" src="hkrz3tc" fileName="_shareasset/ty_tc1.png" xy="-1,-1" size="601,368" group="n10_p4tr"/>
-    <text id="n1_p4tr" name="titleTxt" xy="154,14" size="291,54" group="n10_p4tr" fontSize="36" color="#ffffff" align="center" vAlign="middle" letterSpacing="1" autoSize="none" bold="true" text="gold coin">
+    <text id="n1_p4tr" name="titleTxt" xy="154,14" size="291,54" group="n10_p4tr" font="Arial" fontSize="36" color="#ffffff" align="center" vAlign="middle" letterSpacing="1" autoSize="none" bold="true" text="gold coin">
       <gearDisplay controller="c1" pages="0,1,3"/>
       <gearText controller="c1" pages="0,1,3" values="gold coin|diamond|gold coin"/>
     </text>
     <image id="n2_p4tr" name="n2" src="brgy3uw" fileName="UIWordsList/UIVideoShare/asset/bq4_5.png" xy="-1,79" size="602,216" group="n10_p4tr"/>
-    <text id="n16_p4tr" name="msgTips" xy="33,91" size="536,32" group="n10_p4tr" fontSize="22" color="#6e7b9a" align="center" vAlign="middle" autoSize="none" text="Watch the video and get coins for free!">
+    <text id="n16_p4tr" name="msgTips" xy="33,91" size="536,32" group="n10_p4tr" fontSize="22" color="#09428f" align="center" vAlign="middle" autoSize="none" text="Watch the video and get coins for free!">
       <gearDisplay controller="c1" pages="0,1,3"/>
       <gearText controller="c1" pages="0,1,3" values="Watch the video and get coins for free!|Watch the video to get diamonds for free!|Watch the video and get back the coins you lost!"/>
     </text>
-    <text id="n19_j0y3" name="numTxt" xy="95,252" size="410,32" group="n10_p4tr" fontSize="22" color="#6e7b9a" align="center" vAlign="middle" autoSize="none" text="2000">
+    <text id="n19_j0y3" name="numTxt" xy="95,252" size="410,32" group="n10_p4tr" font="Arial" fontSize="22" color="#083082" align="center" vAlign="middle" autoSize="none" text="2000">
       <gearDisplay controller="c1" pages="0,1,3"/>
       <gearText controller="c1" pages="0,1,3" values="2000|Watch the video to get diamonds for free!|2000"/>
     </text>

+ 2 - 2
art/fgui/assets/game/UIAddProp/component/hb_jinbi1.xml

@@ -3,7 +3,7 @@
   <displayList>
     <image id="n20_ehto" name="n20" src="ehtov4fi" fileName="UIAddProp/asset/hb_db1.png" xy="0,0"/>
     <image id="n25_ehto" name="n25" src="ehtov4fz" fileName="UIAddProp/asset/hb_yuandian.png" xy="71,153"/>
-    <text id="n26_ehto" name="coinTxt" xy="49,70" pivot="0.5,0.5" size="128,66" fontSize="50" color="#6379ac" align="center" vAlign="middle" bold="true" text="1000"/>
+    <text id="n26_ehto" name="coinTxt" xy="50,70" pivot="0.5,0.5" size="128,66" fontSize="50" color="#5330ce" align="center" vAlign="middle" bold="true" strokeColor="#ffffff" text="1000"/>
     <image id="n28_ehto" name="n28" src="ehtov4fz" fileName="UIAddProp/asset/hb_yuandian.png" xy="150,153"/>
     <component id="n32_ehto" name="n32" src="kys749e" fileName="UIAddProp/component/dh_jingbi1.xml" xy="35,274"/>
     <image id="n38_ehto" name="n38" src="ehtov4ga" fileName="UIAddProp/asset/hb_bz2.png" xy="0,392"/>
@@ -12,7 +12,7 @@
       <relation target="n39_ehto" sidePair="left-right"/>
     </text>
     <image id="n39_ehto" name="n39" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="57,407" group="n41_ehto"/>
-    <text id="n40_ehto" name="diamondTxt" xy="99,403" size="68,39" group="n41_ehto" fontSize="28" color="#c3945c" align="center" vAlign="middle" text="2000">
+    <text id="n40_ehto" name="diamondTxt" xy="99,403" size="68,39" group="n41_ehto" font="Arial" fontSize="28" color="#ffffff" align="center" vAlign="middle" text="2000">
       <relation target="n39_ehto" sidePair="left-right"/>
     </text>
     <group id="n41_ehto" name="n41" xy="57,403" size="110,39" visible="false" advanced="true">

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

@@ -3,12 +3,12 @@
   <displayList>
     <image id="n20_ehto" name="n20" src="ehtov4fi" fileName="UIAddProp/asset/hb_db1.png" xy="0,0"/>
     <image id="n25_ehto" name="n25" src="ehtov4fz" fileName="UIAddProp/asset/hb_yuandian.png" xy="71,153"/>
-    <text id="n26_ehto" name="coinTxt" xy="49,70" pivot="0.5,0.5" size="128,66" fontSize="50" color="#6379ac" align="center" vAlign="middle" bold="true" text="5000"/>
+    <text id="n26_ehto" name="coinTxt" xy="49,70" pivot="0.5,0.5" size="128,66" fontSize="50" color="#5330ce" align="center" vAlign="middle" bold="true" strokeColor="#ffffff" text="5000"/>
     <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="#c3945c" align="center" vAlign="middle" text="200">
+    <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">
       <relation target="n39_ehto" sidePair="left-right"/>
     </text>
     <group id="n41_ehto" name="n41" xy="71,404" size="98,43" advanced="true">

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

@@ -3,7 +3,7 @@
   <displayList>
     <image id="n20_ehto" name="n20" src="ehtov4fi" fileName="UIAddProp/asset/hb_db1.png" xy="0,0"/>
     <image id="n25_ehto" name="n25" src="ehtov4fz" fileName="UIAddProp/asset/hb_yuandian.png" xy="71,153"/>
-    <text id="n26_ehto" name="coinTxt" xy="33,70" pivot="0.5,0.5" size="159,66" fontSize="50" color="#6379ac" align="center" vAlign="middle" bold="true" text="99999"/>
+    <text id="n26_ehto" name="coinTxt" xy="33,70" pivot="0.5,0.5" size="159,66" fontSize="50" color="#5330ce" align="center" vAlign="middle" bold="true" strokeColor="#ffffff" text="99999"/>
     <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"/>

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

@@ -12,22 +12,22 @@
     <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="64,407" group="n41_ehto" scale="0.8,0.8"/>
-    <image id="n44_ehto" name="n44" src="ehtov4fk" fileName="UIAddProp/asset/hb_fx.png" xy="28,411" group="n41_ehto"/>
-    <text id="n40_ehto" name="diamondTxt" xy="106,408" size="89,39" group="n41_ehto" fontSize="28" color="#c3945c" align="center" vAlign="middle" text="+2000">
+    <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" strokeColor="#000000" text="+2000">
       <relation target="n39_ehto" sidePair="left-right"/>
     </text>
-    <group id="n41_ehto" name="n41" xy="28,407" size="167,43" advanced="true">
+    <group id="n41_ehto" name="n41" xy="30,407" size="162,43" advanced="true">
       <gearDisplay controller="c1" pages="0"/>
       <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"/>
-    <image id="n47_sw70" name="n47" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="59,407" group="n50_sw70"/>
-    <image id="n48_sw70" name="n48" src="ehtov4fs" fileName="UIAddProp/asset/hb_sp.png" xy="19,411" group="n50_sw70"/>
-    <text id="n49_sw70" name="randTxt" xy="101,405" size="105,39" group="n50_sw70" fontSize="28" color="#c3945c" align="center" vAlign="middle" text="50~100">
+    <image id="n47_sw70" name="n47" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="61,407" group="n50_sw70"/>
+    <image id="n48_sw70" name="n48" src="ehtov4fs" fileName="UIAddProp/asset/hb_sp.png" xy="21,411" group="n50_sw70"/>
+    <text id="n49_sw70" name="randTxt" xy="103,405" size="100,39" group="n50_sw70" font="Arial" fontSize="28" color="#ffffff" align="center" vAlign="middle" text="50~100">
       <relation target="n47_sw70" sidePair="left-right"/>
     </text>
-    <group id="n50_sw70" name="n50" xy="19,405" size="187,39" advanced="true">
+    <group id="n50_sw70" name="n50" xy="21,405" size="182,45" advanced="true">
       <gearDisplay controller="c1" pages="1"/>
       <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="5,15" pivot="0.5,0.5" size="50,23" rotation="-47" fontSize="15" color="#ffffff" align="center" vAlign="middle" text="Timed"/>
     <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="83,406" group="n41_ehto" scale="0.8,0.8"/>
-    <image id="n44_ehto" name="n44" src="ehtov4fs" fileName="UIAddProp/asset/hb_sp.png" xy="43,411" group="n41_ehto"/>
-    <text id="n40_ehto" name="diamondTxt" xy="125,408" size="57,39" group="n41_ehto" fontSize="28" color="#c3945c" align="center" vAlign="middle" text="+20">
+    <image id="n39_ehto" name="n39" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="85,406" group="n41_ehto" scale="0.8,0.8"/>
+    <image id="n44_ehto" name="n44" src="ehtov4fs" fileName="UIAddProp/asset/hb_sp.png" xy="45,411" group="n41_ehto"/>
+    <text id="n40_ehto" name="diamondTxt" xy="127,408" size="52,39" group="n41_ehto" font="Arial" fontSize="28" color="#ffffff" align="center" vAlign="middle" strokeColor="#000000" text="+20">
       <relation target="n39_ehto" sidePair="left-right"/>
     </text>
-    <group id="n41_ehto" name="n41" xy="43,406" size="139,43" advanced="true">
+    <group id="n41_ehto" name="n41" xy="45,406" size="134,43" 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"/>

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

@@ -7,7 +7,7 @@
     <text id="n27_ehto" name="n27" xy="14,15" pivot="0.5,0.5" size="32,23" rotation="-47" fontSize="15" color="#ffffff" align="center" vAlign="middle" text="Hot"/>
     <component id="n32_ehto" name="n32" src="ehtov4gy" fileName="UIAddProp/component/dh_zs3.xml" xy="29,195"/>
     <image id="n38_ehto" name="n38" src="ehtov4ga" fileName="UIAddProp/asset/hb_bz2.png" xy="0,392"/>
-    <text id="n47_ehto" name="n47" xy="0,401" size="222,42" fontSize="30" color="#c3945c" text="Challenge Now"/>
+    <text id="n47_ehto" name="n47" xy="7,401" size="211,42" font="Arial" fontSize="30" color="#ffffff" text="Challenge Now"/>
   </displayList>
   <Button downEffect="scale" downEffectValue="1.02"/>
   <transition name="t0" autoPlay="true">

+ 1 - 1
art/fgui/assets/game/UIDraw/component/UITurntable_com12.xml

@@ -4,7 +4,7 @@
     <image id="n43_wcn5" name="n43" src="wcn5v4kl" fileName="UIDraw/asset/zp_cj2.png" xy="0,14" size="265,18"/>
     <image id="n42_wcn5" name="barNode" src="wcn5v4kk" fileName="UIDraw/asset/zp_cj1.png" xy="0,15" size="110,16"/>
     <text id="n44_wcn5" name="tipsTxt" xy="137,12" size="34,26" fontSize="18" color="#ffffff" align="center" vAlign="middle" text="1/3"/>
-    <text id="n45_wcn5" name="n45" xy="-4,37" size="316,23" fontSize="15" color="#ffffff" align="center" vAlign="middle" bold="true" text=" 3 lucky draws will receive special rewards"/>
+    <text id="n45_wcn5" name="n45" xy="2,41" size="304,23" font="Arial" fontSize="14" color="#ffffff" vAlign="middle" leading="1" autoSize="none" text="Three lucky draws will result in special rewards"/>
     <component id="n41_wcn5" name="boxBtn" src="wcn5v4lc" fileName="UIDraw/component/UITurntable_com1.xml" xy="248,0"/>
   </displayList>
 </component>

+ 1 - 1
art/fgui/assets/game/UIDraw/component/UITurntable_com7.xml

@@ -3,7 +3,7 @@
   <displayList>
     <image id="n2_wcn5" name="n2" src="wcn5v4kx" fileName="UIDraw/asset/zp_0.png" xy="0,0" pivot="0.5,0.5"/>
     <image id="n35_wcn5" name="n35" src="wcn5v4kn" fileName="UIDraw/asset/zp_sc.png" xy="257,44" pivot="0.5,0.5" rotation="29"/>
-    <loader id="n22_wcn5" name="img1" xy="139,-6" pivot="0.5,0.5" size="160,160" scale="0.6,0.6" url="ui://isxx5ak7mif8v4ma" align="center" vAlign="middle" fill="scale" shrinkOnly="true"/>
+    <loader id="n22_wcn5" name="img1" xy="149,7" pivot="0.5,0.5" size="140,140" scale="0.6,0.6" url="ui://isxx5ak7mif8v4ma" align="center" vAlign="middle" fill="scale" shrinkOnly="true"/>
     <loader id="n31_wcn5" name="img2" xy="10,67" pivot="0.5,0.5" size="160,160" scale="0.6,0.6" rotation="-60" url="ui://isxx5ak7ehtov4fn" align="center" vAlign="middle" fill="scale" shrinkOnly="true"/>
     <loader id="n34_wcn5" name="img3" xy="13,214" pivot="0.5,0.5" size="160,160" scale="0.6,0.6" rotation="-120" url="ui://isxx5ak7ehtov4fo" align="center" vAlign="middle" fill="scale" shrinkOnly="true"/>
     <loader id="n32_wcn5" name="img4" xy="138,286" pivot="0.5,0.5" size="160,160" scale="0.6,0.6" rotation="180" url="ui://isxx5ak7ehtov4gp" align="center" vAlign="middle" fill="scale" shrinkOnly="true"/>

+ 3 - 3
art/fgui/assets/game/UIGetAward/component/Component126.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="503,73">
-  <controller name="c1" exported="true" pages="0,显示3倍领取,1,只显示普通领取" selected="1"/>
+  <controller name="c1" exported="true" pages="0,显示3倍领取,1,只显示普通领取" selected="0"/>
   <displayList>
-    <component id="n18_lhrr" name="normalBtn" src="wehi3ue" fileName="_sharecomponent/cancelBtn2.xml" xy="132,0" size="239,73" scale="0.9,0.9" controller="c1,0">
+    <component id="n18_lhrr" name="normalBtn" src="wehi3ue" fileName="_sharecomponent/cancelBtn2.xml" xy="0,0" size="239,73" scale="0.9,0.9" controller="c1,0">
       <gearDisplay controller="c1" pages="0,1"/>
       <gearXY controller="c1" pages="1" values="132,0" default="0,0"/>
     </component>
-    <component id="n19_lhrr" name="tripleBtn" src="wehi3uf" fileName="_sharecomponent/shareBtn2.xml" xy="132,0" scale="0.9,0.9" controller="c1,24">
+    <component id="n19_lhrr" name="tripleBtn" src="wehi3uf" fileName="_sharecomponent/shareBtn2.xml" xy="264,0" scale="0.9,0.9" controller="c1,24">
       <gearDisplay controller="c1" pages="0"/>
       <gearXY controller="c1" pages="1" values="132,0" default="264,0"/>
     </component>

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

@@ -7,7 +7,7 @@
     <image id="n3_xs1r" name="n3" src="xs1r47t" fileName="UILevelProp/asset/gq5.png" xy="383,96">
       <relation target="" sidePair="left-left"/>
     </image>
-    <text id="n7_xs1r" name="levelTxt" xy="231,20" pivot="0.5,0.5" size="436,54" fontSize="40" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="Level  1"/>
+    <text id="n7_xs1r" name="levelTxt" xy="231,20" pivot="0.5,0.5" size="436,54" font="Arial" fontSize="40" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="Level  1"/>
     <text id="n10_xs1r" name="n10" xy="390,96" size="298,32" fontSize="22" color="#6d85b3" vAlign="middle" leading="0" autoSize="none" text="Level Rules">
       <relation target="n3_xs1r" sidePair="left-left"/>
     </text>

+ 1 - 1
art/fgui/assets/game/UIMatching/MatchingNode.xml

@@ -30,7 +30,7 @@
       <relation target="" sidePair="center-center,bottom-bottom%"/>
     </group>
     <image id="n57_hxtr" name="n57" src="n0xy3yb" fileName="UIMatching/asset/pp_dk2.png" xy="432,433" pivot="0.5,0.5" size="388,43" group="n61_hxtr"/>
-    <text id="n60_hxtr" name="n60" xy="548,442" size="94,26" group="n61_hxtr" fontSize="18" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="胜者奖励:"/>
+    <text id="n60_hxtr" name="n60" xy="548,442" size="94,26" group="n61_hxtr" fontSize="18" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="Winner&apos;s prize:"/>
     <image id="n62_hxtr" name="n62" src="n43d3wq" fileName="UIMain/asset/ty_jb.png" xy="640,442" size="26,26" group="n61_hxtr" aspect="true"/>
     <text id="n63_hxtr" name="n63" xy="667,440" size="56,32" group="n61_hxtr" fontSize="22" color="#fafa7e" align="center" vAlign="middle" text="1000"/>
     <group id="n61_hxtr" name="n61" xy="432,433" size="388,43" advanced="true">

+ 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" fontSize="22" color="#53739f" vAlign="middle" autoSize="ellipsis" text="昵称名字最多9个字哦&#xA;"/>
+    <text id="n9_n0xy" name="nameTxt" xy="116,4" size="227,34" fontSize="22" color="#ffffff" vAlign="middle" autoSize="ellipsis" 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" fontSize="20" color="#58769e" vAlign="middle" vars="true" autoSize="none" text="{jnmz1=Jump}Lv.{jndj1=1}">
+    <text id="n29_hxtr" name="skillTxt" xy="192,90" size="156,29" fontSize="20" color="#ffffff" vAlign="middle" vars="true" autoSize="none" text="{jnmz1=Jump}Lv.{jndj1=1}">
       <gearDisplay controller="c1" pages="1"/>
     </text>
   </displayList>

+ 4 - 4
art/fgui/assets/game/UIModeSelection/component/ModeSelection_com1.xml

@@ -6,11 +6,11 @@
     <image id="n22_lrxg" name="n22" src="lrxgv50g" fileName="UIModeSelection/asset2/tc_ms_5.png" xy="0,0"/>
     <image id="n20_lrxg" name="n20" src="lrxgv50c" fileName="UIModeSelection/asset2/tc_ms_1.png" xy="0,0" size="313,44"/>
     <image id="n23_lrxg" name="n23" src="lrxgv50f" fileName="UIModeSelection/asset2/tc_ms_4.png" xy="22,8"/>
-    <text id="n24_lrxg" name="n24" xy="96,6" size="122,32" fontSize="22" color="#606983" text="8-ball rules">
+    <text id="n24_lrxg" name="n24" xy="120,6" size="74,32" fontSize="22" color="#ffffff" bold="true" text="Rule 8">
       <relation target="" sidePair="center-center"/>
     </text>
     <image id="n26_lrxg" name="n26" src="lrxgv50h" fileName="UIModeSelection/asset2/tc_ms_6.png" xy="30,108"/>
-    <text id="n33_lrxg" name="n33" xy="73,57" size="166,49" fontSize="36" color="#707c9f" align="center" vAlign="middle" bold="true" text="beginner">
+    <text id="n33_lrxg" name="n33" xy="73,57" size="166,49" fontSize="36" color="#ffffff" align="center" vAlign="middle" bold="true" text="beginner">
       <relation target="" sidePair="center-center"/>
     </text>
     <image id="n27_lrxg" name="coinImg" src="wehi3ui" fileName="UIMoney/asset/ty_jb.png" xy="112,295" pivot="0.5,0.5" size="24,24" group="n35_lrxg" aspect="true"/>
@@ -23,11 +23,11 @@
     <image id="n29_lrxg" name="n29" src="avag460" fileName="UIModeSelection/asset2/msxz1_16.png" xy="191,366">
       <relation target="n32_lrxg" sidePair="right-left"/>
     </image>
-    <text id="n32_lrxg" name="tipsTxt" xy="213,361" size="95,29" fontSize="20" color="#707c9f" vAlign="middle" text="Min 2000">
+    <text id="n32_lrxg" name="tipsTxt" xy="213,361" size="95,29" fontSize="20" color="#ffffff" vAlign="middle" text="Min 2000">
       <relation target="" sidePair="right-right"/>
     </text>
     <image id="n30_lrxg" name="n30" src="avag461" fileName="UIModeSelection/asset2/msxz1_17.png" xy="9,367"/>
-    <text id="n31_lrxg" name="peopleTxt" xy="35,361" size="56,32" fontSize="22" color="#707c9f" vAlign="middle" text="9999"/>
+    <text id="n31_lrxg" name="peopleTxt" xy="35,361" size="56,32" fontSize="22" color="#ffffff" vAlign="middle" text="9999"/>
   </displayList>
   <Button downEffect="scale" downEffectValue="1.05"/>
   <transition name="t0">

+ 1 - 1
art/fgui/assets/game/UIModeSelection/component/ModeSelection_com123.xml

@@ -4,7 +4,7 @@
     <component id="n22_lrxg" name="type1" src="lrxgv50m" fileName="UIModeSelection/component/ModeSelection_com1.xml" xy="0,0"/>
     <component id="n36_lrxg" name="type2" src="lrxgv50n" fileName="UIModeSelection/component/ModeSelection_com2.xml" xy="350,0"/>
     <component id="n37_lrxg" name="type3" src="lrxgv50o" fileName="UIModeSelection/component/ModeSelection_com3.xml" xy="698,0"/>
-    <text id="n38_lrxg" name="n38" xy="339,415" size="335,32" alpha="0.6" fontSize="22" color="#ffffff" align="center" text="Click on the blank area to close">
+    <text id="n38_lrxg" name="n38" xy="343,415" size="326,32" alpha="0.6" font="Arial" fontSize="22" color="#ffffff" align="center" bold="true" text="Click on the blank area to close">
       <relation target="n22_lrxg" sidePair="center-center,top-bottom"/>
     </text>
   </displayList>

+ 4 - 4
art/fgui/assets/game/UIModeSelection/component/ModeSelection_com2.xml

@@ -6,11 +6,11 @@
     <image id="n22_lrxg" name="n22" src="lrxgv50g" fileName="UIModeSelection/asset2/tc_ms_5.png" xy="0,0"/>
     <image id="n20_lrxg" name="n20" src="lrxgv50d" fileName="UIModeSelection/asset2/tc_ms_2.png" xy="0,0" size="313,44"/>
     <image id="n23_lrxg" name="n23" src="lrxgv50f" fileName="UIModeSelection/asset2/tc_ms_4.png" xy="22,8"/>
-    <text id="n24_lrxg" name="n24" xy="96,6" size="122,32" fontSize="22" color="#606983" text="8-ball rules">
+    <text id="n24_lrxg" name="n24" xy="120,6" size="74,32" fontSize="22" color="#ffffff" bold="true" text="Rule 8">
       <relation target="" sidePair="center-center"/>
     </text>
     <image id="n26_lrxg" name="n26" src="lrxgv50i" fileName="UIModeSelection/asset2/tc_ms_7.png" xy="22,118"/>
-    <text id="n33_lrxg" name="n33" xy="95,57" size="121,49" fontSize="36" color="#707c9f" align="center" vAlign="middle" bold="true" text="expert">
+    <text id="n33_lrxg" name="n33" xy="95,57" size="121,49" fontSize="36" color="#ffffff" align="center" vAlign="middle" bold="true" text="expert">
       <relation target="" sidePair="center-center"/>
     </text>
     <image id="n27_lrxg" name="coinImg" src="wehi3ui" fileName="UIMoney/asset/ty_jb.png" xy="114,296" pivot="0.5,0.5" size="24,24" group="n35_lrxg" aspect="true"/>
@@ -23,11 +23,11 @@
     <image id="n29_lrxg" name="n29" src="avag460" fileName="UIModeSelection/asset2/msxz1_16.png" xy="190,366">
       <relation target="n32_lrxg" sidePair="right-left"/>
     </image>
-    <text id="n32_lrxg" name="tipsTxt" xy="212,362" size="95,29" fontSize="20" color="#707c9f" align="right" vAlign="middle" text="Min 2000">
+    <text id="n32_lrxg" name="tipsTxt" xy="212,362" size="95,29" fontSize="20" color="#ffffff" align="right" vAlign="middle" text="Min 2000">
       <relation target="" sidePair="right-right"/>
     </text>
     <image id="n30_lrxg" name="n30" src="avag461" fileName="UIModeSelection/asset2/msxz1_17.png" xy="9,367"/>
-    <text id="n31_lrxg" name="peopleTxt" xy="35,361" size="56,32" fontSize="22" color="#707c9f" vAlign="middle" text="9999"/>
+    <text id="n31_lrxg" name="peopleTxt" xy="35,361" size="56,32" fontSize="22" color="#ffffff" vAlign="middle" text="9999"/>
   </displayList>
   <Button downEffect="scale" downEffectValue="1.05"/>
   <transition name="t0">

+ 4 - 4
art/fgui/assets/game/UIModeSelection/component/ModeSelection_com3.xml

@@ -6,11 +6,11 @@
     <image id="n22_lrxg" name="n22" src="lrxgv50g" fileName="UIModeSelection/asset2/tc_ms_5.png" xy="0,0"/>
     <image id="n20_lrxg" name="n20" src="lrxgv50e" fileName="UIModeSelection/asset2/tc_ms_3.png" xy="0,0" size="313,44"/>
     <image id="n23_lrxg" name="n23" src="lrxgv50f" fileName="UIModeSelection/asset2/tc_ms_4.png" xy="22,8"/>
-    <text id="n24_lrxg" name="n24" xy="96,6" size="122,32" fontSize="22" color="#606983" text="8-ball rules">
+    <text id="n24_lrxg" name="n24" xy="120,6" size="74,32" fontSize="22" color="#ffffff" bold="true" text="Rule 8">
       <relation target="" sidePair="center-center"/>
     </text>
     <image id="n26_lrxg" name="n26" src="lrxgv50k" fileName="UIModeSelection/asset2/tc_ms_9.png" xy="13,116"/>
-    <text id="n33_lrxg" name="n33" xy="91,57" size="129,49" fontSize="36" color="#707c9f" align="center" vAlign="middle" bold="true" text="master">
+    <text id="n33_lrxg" name="n33" xy="91,57" size="129,49" fontSize="36" color="#ffffff" align="center" vAlign="middle" bold="true" text="master">
       <relation target="" sidePair="center-center"/>
     </text>
     <image id="n27_lrxg" name="coinImg" src="wehi3ui" fileName="UIMoney/asset/ty_jb.png" xy="112,298" pivot="0.5,0.5" size="24,24" group="n35_lrxg" aspect="true"/>
@@ -23,11 +23,11 @@
     <image id="n29_lrxg" name="n29" src="avag460" fileName="UIModeSelection/asset2/msxz1_16.png" xy="191,366">
       <relation target="n32_lrxg" sidePair="right-left"/>
     </image>
-    <text id="n32_lrxg" name="tipsTxt" xy="213,361" size="95,29" fontSize="20" color="#707c9f" align="right" vAlign="middle" text="Min 2000">
+    <text id="n32_lrxg" name="tipsTxt" xy="213,361" size="95,29" fontSize="20" color="#ffffff" align="right" vAlign="middle" text="Min 2000">
       <relation target="" sidePair="right-right"/>
     </text>
     <image id="n30_lrxg" name="n30" src="avag461" fileName="UIModeSelection/asset2/msxz1_17.png" xy="9,367"/>
-    <text id="n31_lrxg" name="peopleTxt" xy="35,361" size="56,32" fontSize="22" color="#707c9f" vAlign="middle" text="9999"/>
+    <text id="n31_lrxg" name="peopleTxt" xy="35,361" size="56,32" fontSize="22" color="#ffffff" vAlign="middle" text="9999"/>
   </displayList>
   <Button downEffect="scale" downEffectValue="1.05"/>
   <transition name="t0">

+ 2 - 2
art/fgui/assets/game/UIPower/component/Component41_3.xml

@@ -7,11 +7,11 @@
     <component id="n7_p4tr" name="cancelBtn" src="hkrz3tm" fileName="_sharecomponent/cancelBtn.xml" xy="93,311" size="165,51" group="n9_p4tr" controller="c1,0"/>
     <component id="n8_p4tr" name="videoBtn" src="hkrz3tn" fileName="_sharecomponent/shareBtn.xml" xy="344,311" size="165,51" group="n9_p4tr" controller="c1,1"/>
     <group id="n9_p4tr" name="n9" xy="93,311" size="416,51" advanced="true"/>
-    <text id="n24_trk9" name="n24" xy="113,96" size="376,39" fontSize="22" color="#697ab8" align="center" vAlign="middle" autoSize="none" text="Restore 2 points of stamina"/>
+    <text id="n24_trk9" name="n24" xy="113,96" size="376,39" fontSize="22" color="#093f8b" align="center" vAlign="middle" autoSize="none" text="Restore 2 points of stamina"/>
     <text id="n27_trk9" name="n27" xy="141,373" size="324,26" visible="false" fontSize="18" color="#697ab8" align="center" vAlign="middle" vars="true" autoSize="none" text="Remaining times:{cishu=5}">
       <relation target="" sidePair="center-center"/>
     </text>
-    <text id="n12_p4tr" name="titleTxt" xy="194,14" size="215,54" fontSize="36" color="#ffffff" align="center" vAlign="middle" letterSpacing="10" autoSize="none" bold="true" text="prompt"/>
+    <text id="n12_p4tr" name="titleTxt" xy="194,14" size="215,54" fontSize="36" color="#ffffff" align="center" vAlign="middle" letterSpacing="1" autoSize="none" bold="true" text="Tip"/>
     <component id="n28_jpsz" name="n28" src="jpszv4n8" fileName="UIPower/component/Component137.xml" xy="213,140" pivot="0.5,0.5"/>
   </displayList>
   <transition name="t0" autoPlay="true">

+ 2 - 2
art/fgui/assets/game/UIRepentProp/component/Component41_1.xml

@@ -14,7 +14,7 @@
       <gearDisplay controller="c1" pages="0,1"/>
       <gearXY controller="c1" pages="1" values="218,306" default="344,306"/>
     </component>
-    <text id="n27_trk9" name="n27" xy="30,371" size="542,26" fontSize="18" color="#697ab8" align="center" vAlign="middle" autoSize="none" bold="true" text="Activate the assist, make sure to hit the hole with one shot!"/>
+    <text id="n27_trk9" name="n27" xy="30,371" size="542,26" fontSize="18" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="Activate the assist, make sure to hit the hole with one shot!"/>
     <image id="n30_trk9" name="n30" src="trk9496" fileName="UIRepentProp/asset/组 43.png" xy="566,11" pivot="0,0.736"/>
     <image id="n31_trk9" name="n31" src="trk9493" fileName="UIRepentProp/asset/超长路径,.png" xy="617,24" pivot="-0.399,1.339">
       <gearDisplay controller="c1" pages=""/>
@@ -24,7 +24,7 @@
     <image id="n34_trk9" name="n34" src="trk9497" fileName="UIRepentProp/asset/组 44.png" xy="150,124"/>
     <image id="n35_trk9" name="n35" src="trk9499" fileName="UIRepentProp/asset/组 46.png" xy="404,211" pivot="0.5,0.5"/>
     <image id="n36_trk9" name="n36" src="trk949a" fileName="UIRepentProp/asset/组 47.png" xy="159,122" pivot="0.5,0.5"/>
-    <text id="n1_p4tr" name="n1" xy="17,14" size="568,54" fontSize="36" color="#ffffff" align="center" vAlign="middle" letterSpacing="3" autoSize="none" bold="true" text="Auxiliary line prompt"/>
+    <text id="n1_p4tr" name="n1" xy="17,14" size="568,54" fontSize="36" color="#ffffff" align="center" vAlign="middle" letterSpacing="1" autoSize="none" bold="true" text="Auxiliary line prompt"/>
     <loader id="n37_pbej" name="n37" xy="456,-62" pivot="0,1" size="197,356" scale="0.7,0.7" url="ui://isxx5ak7pbejv4lf" align="center" vAlign="bottom" autoSize="true">
       <relation target="n0_p4tr" sidePair="bottom-bottom"/>
     </loader>

+ 1 - 1
art/fgui/assets/game/UIRepentProp/component/longBtn.xml

@@ -6,7 +6,7 @@
   </controller>
   <displayList>
     <image id="n2_hkrz" name="n2" src="hkrz3tb" fileName="_shareasset/ty_an2.png" xy="0,0" size="165,51" aspect="true"/>
-    <text id="n1_hkrz" name="n1" xy="50,2" size="68,48" fontSize="26" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="OK"/>
+    <text id="n1_hkrz" name="n1" xy="50,1" size="68,48" fontSize="26" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="OK"/>
     <image id="n4_p4tr" name="n4" src="hkrz3te" fileName="_shareasset/1.png" xy="14,14" pivot="0.5,0.5" size="31,22" aspect="true">
       <gearDisplay controller="c1" pages="0"/>
     </image>

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

@@ -8,10 +8,10 @@
     <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="0,3" size="216,32" fontSize="20" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="Wooden billiard club"/>
+    <text id="n24_qlo0" name="nameTxt" xy="0,3" size="168,32" fontSize="21" color="#ffffff" align="center" 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="UIShop/component/Component101.xml" xy="405,0" controller="c1,0"/>
-    <loader id="n36_s46i" name="eftRod" xy="0,0" size="543,151" align="center" vAlign="middle"/>
-    <component id="n34_s46i" name="purchaseBtn" src="g1giv4eh" fileName="UIShop/component/Component28_11.xml" xy="205,100"/>
+    <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"/>
+    <component id="n34_s46i" name="purchaseBtn" src="g1giv4eh" fileName="UISecretary/UIShop/component/Component28_11.xml" xy="205,100"/>
   </displayList>
 </component>

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

@@ -2,16 +2,16 @@
 <component size="125,35">
   <controller name="c1" alias="标签" exported="true" pages="0,新手,1,史诗,2,传说" selected="0"/>
   <displayList>
-    <image id="n36_g1gi" name="n36" src="g1giv4es" fileName="UIShop/asset/qg_bq1.png" xy="0,0">
+    <image id="n36_g1gi" name="n36" src="g1giv4es" fileName="UISecretary/UIShop/asset/qg_bq1.png" xy="0,0">
       <gearDisplay controller="c1" pages="2"/>
     </image>
-    <image id="n35_g1gi" name="n35" src="g1giv4eq" fileName="UIShop/asset/qg_bq2.png" xy="0,0">
+    <image id="n35_g1gi" name="n35" src="g1giv4eq" fileName="UISecretary/UIShop/asset/qg_bq2.png" xy="0,0">
       <gearDisplay controller="c1" pages="0"/>
     </image>
-    <image id="n33_g1gi" name="n33" src="g1giv4eu" fileName="UIShop/asset/qg_bq3.png" xy="0,0">
+    <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="17,6" pivot="0.5,0.5" size="109,23" fontSize="15" color="#ffffff" align="center" vAlign="middle" letterSpacing="10" bold="true" text="newbie">
+    <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>
   </displayList>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="132,41" pivot="0.5,0.5" extention="Button">
-  <controller name="c1" alias="按钮" exported="true" pages="0,使用中,1,点击使用,2,钻石购买" selected="1"/>
+  <controller name="c1" alias="按钮" exported="true" pages="0,使用中,1,点击使用,2,钻石购买" selected="2"/>
   <displayList>
     <image id="n12_qlo0" name="n12" src="hkrz3tb" fileName="_shareasset/ty_an2.png" xy="-43,-14" pivot="0.5,0.5" size="218,68" aspect="true" scale="0.6,0.6">
       <gearDisplay controller="c1" pages="1,2"/>
@@ -10,14 +10,14 @@
       <gearDisplay controller="c1" pages="0"/>
     </image>
     <image id="n13_s46i" name="n13" src="wehi3uj" fileName="UIMoney/asset/ty_zs.png" xy="21,8" pivot="0.5,0.5" size="33,27" group="n15_s46i" aspect="true"/>
-    <text id="n14_s46i" name="diamondTxt" xy="59,5" pivot="0.5,0.5" size="56,32" group="n15_s46i" fontSize="22" color="#ffffff" align="center" vAlign="middle" text="3000">
+    <text id="n14_s46i" name="diamondTxt" xy="59,5" pivot="0.5,0.5" size="56,32" group="n15_s46i" fontSize="22" color="#ffffff" align="center" vAlign="middle" strokeColor="#000000" text="3000">
       <relation target="n13_s46i" sidePair="left-left"/>
     </text>
     <group id="n15_s46i" name="n15" xy="21,5" size="93,32" advanced="true">
       <gearDisplay controller="c1" pages="2"/>
       <relation target="n12_qlo0" sidePair="center-center"/>
     </group>
-    <text id="n16_wcn5" name="n16" xy="2,3" pivot="0.5,0.5" size="126,32" fontSize="22" color="#ffffff" text="Click to use">
+    <text id="n16_wcn5" name="n16" xy="29,4" pivot="0.5,0.5" size="70,32" fontSize="22" color="#ffffff" strokeColor="#000000" text="使用中">
       <gearDisplay controller="c1" pages="0,1"/>
       <gearText controller="c1" pages="0,1" values="In use|Click to use" default="使用中"/>
     </text>

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

@@ -8,8 +8,8 @@
     <graph id="n41_s46i" name="n41" xy="0,0" size="56,131" alpha="0.1" type="rect" lineSize="0">
       <gearDisplay controller="c1" pages="1"/>
     </graph>
-    <text id="n40_qlo0" name="n40" xy="14,0" size="31,131" fontSize="22" color="#c26541" align="center" vAlign="middle" leading="0" autoSize="none" text="CUE">
-      <gearColor controller="c1" pages="1" values="#ffffff,#000000" default="#c26541,#000000"/>
+    <text id="n40_qlo0" name="n40" xy="12,5" size="31,120" fontSize="22" color="#ffffff" align="center" leading="0" autoSize="none" bold="true" text="C&#xA;U&#xA;E">
+      <gearColor controller="c1" pages="0,1" values="#ffffff,#000000|#ffffff,#000000"/>
     </text>
   </displayList>
   <Button downEffect="scale" downEffectValue="1.02"/>

+ 1 - 1
art/fgui/assets/game/UISecretary/component/Component118.xml

@@ -16,7 +16,7 @@
       <gearDisplay controller="c1" pages="0"/>
       <relation target="n9_u8ei" sidePair="center-center"/>
     </group>
-    <text id="n15_wcn5" name="n15" xy="41,11" pivot="0.5,0.5" size="201,42" fontSize="30" color="#ffffff" align="center" vAlign="middle" letterSpacing="3" text="Click to use">
+    <text id="n15_wcn5" name="n15" xy="51,10" pivot="0.5,0.5" size="188,42" fontSize="30" color="#ffffff" align="center" vAlign="middle" letterSpacing="1" bold="true" text="Click to use">
       <gearDisplay controller="c1" pages="1,2"/>
       <gearText controller="c1" pages="1,2" values="in use|Click to use" default="已拥有"/>
     </text>

+ 0 - 8
art/fgui/assets/game/UISecretary/component/Component122.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="899,569">
-  <displayList>
-    <component id="n5_olmj" name="gameNode1" src="uqohv4lo" fileName="UISecretary/SecretaryDisplay.xml" xy="-180,0" pivot="0.5,0.5" scale="0.8,0.8" alpha="0.3"/>
-    <component id="n6_olmj" name="gameNode2" src="uqohv4lo" fileName="UISecretary/SecretaryDisplay.xml" xy="180,0" pivot="0.5,0.5" scale="0.8,0.8" alpha="0.3"/>
-    <component id="n7_olmj" name="gameNode3" src="uqohv4lo" fileName="UISecretary/SecretaryDisplay.xml" xy="0,0" pivot="0.5,0.5"/>
-  </displayList>
-</component>

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

@@ -2,7 +2,7 @@
 <component size="56,116" pivot="0.5,0.5" extention="Button">
   <displayList>
     <image id="n8_qlo0" name="n8" src="qlo041e" fileName="UISkill/asset/gf_k3.png" xy="0,0" size="56,116"/>
-    <text id="n40_qlo0" name="n40" xy="14,2" size="31,99" fontSize="24" color="#c26541" align="center" vAlign="middle" autoSize="none" text="CUE"/>
+    <text id="n40_qlo0" name="n40" xy="14,2" size="31,99" fontSize="24" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="CUE"/>
   </displayList>
   <Button downEffect="scale" downEffectValue="1.02"/>
 </component>

+ 2 - 2
art/fgui/assets/game/UITips/component/Component42.xml

@@ -6,9 +6,9 @@
   </controller>
   <displayList>
     <image id="n1_mnrs" name="n1" src="hkrz3tc" fileName="_shareasset/ty_tc1.png" xy="1,-1" size="601,368"/>
-    <text id="n2_mnrs" name="n2" xy="195,13" size="215,54" fontSize="36" color="#ffffff" align="center" vAlign="middle" letterSpacing="10" autoSize="none" bold="true" text="warn"/>
+    <text id="n2_mnrs" name="n2" xy="195,13" size="215,54" fontSize="36" color="#ffffff" align="center" vAlign="middle" letterSpacing="1" autoSize="none" bold="true" text="Tip"/>
     <image id="n3_mnrs" name="n3" src="brgy3uw" fileName="UIWordsList/UIVideoShare/asset/bq4_5.png" xy="1,79" size="602,216"/>
-    <text id="n5_mnrs" name="tipsTxt" xy="129,110" size="343,162" fontSize="30" color="#6e7b9a" align="center" vAlign="middle" autoSize="none" text="Are you sure to exit the game?"/>
+    <text id="n5_mnrs" name="tipsTxt" xy="129,110" size="343,162" fontSize="30" color="#09348c" align="center" vAlign="middle" autoSize="none" text="Are you sure to exit the game?"/>
     <component id="n9_mnrs" name="cancelBtn" src="hkrz3tm" fileName="_sharecomponent/cancelBtn.xml" xy="94,304" size="165,51" group="n11_mnrs">
       <gearDisplay controller="c1" pages="0"/>
     </component>

+ 0 - 14
art/fgui/assets/game/UITry/UITry.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="1334,750" designImageLayer="1">
-  <displayList>
-    <graph id="n11_p4tr" name="n11" xy="-1,0" size="1334,750" alpha="0.6" type="rect" lineSize="0" fillColor="#ff000000">
-      <relation target="" sidePair="width-width,height-height"/>
-    </graph>
-    <component id="n16_jpsz" name="myNode" src="cj92v4o5" fileName="UITry/Component/try_com1.xml" xy="366,90" pivot="0.5,0.5" size="602,488" controller="c1,1">
-      <relation target="" sidePair="center-center,middle-middle"/>
-    </component>
-  </displayList>
-  <transition name="t0">
-    <item time="0" type="Alpha" target="n11_p4tr" tween="true" startValue="0" endValue="0.6" duration="12"/>
-  </transition>
-</component>

BIN
art/fgui/assets/game/UITry/asset/biaoqian.png


BIN
art/fgui/assets/game/UITry/asset/guang.png


BIN
art/fgui/assets/game/UITry/asset/jdt1.png


BIN
art/fgui/assets/game/UITry/asset/jdt2.png


BIN
art/fgui/assets/game/UITry/asset/jdt3.png


BIN
art/fgui/assets/game/UITry/asset/jdt4.png


BIN
art/fgui/assets/game/UITry/asset/jiantou.png


BIN
art/fgui/assets/game/UITry/asset/lv4_top1.png


+ 0 - 27
art/fgui/assets/game/UITry/component/try_com1.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="602,488" designImageLayer="1">
-  <controller name="c1" alias="试用" exported="true" pages="0,试用1" selected="0"/>
-  <displayList>
-    <image id="n0_p4tr" name="n0" src="hkrz3tc" fileName="_shareasset/ty_tc1.png" xy="0,0" size="601,488"/>
-    <image id="n2_p4tr" name="n2" src="brgy3uw" fileName="UIWordsList/UIVideoShare/asset/bq4_5.png" xy="0,78" size="602,256"/>
-    <component id="n7_p4tr" name="cancelBtn" src="hkrz3tm" fileName="_sharecomponent/cancelBtn.xml" xy="218,416" size="165,51" group="n9_p4tr" controller="c1,2"/>
-    <component id="n8_p4tr" name="videoBtn" src="hkrz3tn" fileName="_sharecomponent/shareBtn.xml" xy="218,350" size="165,51" group="n9_p4tr" controller="c1,13"/>
-    <group id="n9_p4tr" name="n9" xy="218,350" size="165,117" advanced="true"/>
-    <text id="n24_trk9" name="n24" xy="105,131" size="391,77" fontSize="24" color="#697ab8" align="center" vAlign="middle" leading="0" autoSize="none" text="Limited-time chance for advanced skills. Congrats!"/>
-    <text id="n12_p4tr" name="titleTxt" xy="27,12" size="547,54" fontSize="36" color="#ffffff" align="center" vAlign="middle" letterSpacing="2" autoSize="none" bold="true" text="Limited-Time Trial"/>
-    <text id="n32_cj92" name="n32" xy="10,261" size="581,63" fontSize="20" color="#f27878" vars="true" autoSize="none" text="Give advanced skills a spin, and your skill level will get a permanent +1 boost!">
-      <relation target="" sidePair="center-center"/>
-    </text>
-    <component id="n29_cj92" name="n29" src="cj92v4o6" fileName="UITry/Component/try_com2.xml" xy="5,118" pivot="0.5,0.5"/>
-    <text id="n36_nqcq" name="n36" xy="92,84" size="416,32" fontSize="22" color="#f27878" vars="true" text="Skill level +5, experience for 5 minutes.">
-      <relation target="" sidePair="center-center"/>
-    </text>
-    <text id="n37_nqcq" name="txtTime" xy="559,28" pivot="1,0.5" size="34,34" fontSize="24" color="#ffffff" align="right" vAlign="middle" bold="true" text="15">
-      <relation target="n0_p4tr" sidePair="right-right"/>
-    </text>
-  </displayList>
-  <transition name="t0" autoPlay="true">
-    <item time="0" type="Scale" target="n29_cj92" value="0,0"/>
-    <item time="4" type="Scale" target="n29_cj92" tween="true" startValue="0,0" endValue="1,1" duration="11"/>
-  </transition>
-</component>

+ 0 - 15
art/fgui/assets/game/UITry/component/try_com2.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="139,138">
-  <displayList>
-    <loader id="n30_cj92" name="skillicon" xy="14,27" size="110,110" url="ui://isxx5ak7qlo0417" align="center" vAlign="middle" fill="scale" shrinkOnly="true"/>
-    <movieclip id="n35_cj92" name="n35" src="p4tr427" fileName="UIGameEnd/component/jiangli.jta" xy="-1,11" size="138,138" aspect="true"/>
-    <image id="n31_cj92" name="n31" src="cj92v4o7" fileName="UITry/asset/biaoqian.png" xy="0,0" size="139,27"/>
-    <text id="n32_cj92" name="n32" xy="49,0" size="19,35" group="n34_cj92" fontSize="25" color="#ffffff" align="center" vAlign="middle" text="5"/>
-    <component id="n33_cj92" name="n33" src="cj92v4o9" fileName="UITry/Component/try_com3.xml" xy="73,2" group="n34_cj92">
-      <relation target="n32_cj92" sidePair="left-right"/>
-    </component>
-    <group id="n34_cj92" name="n34" xy="49,0" size="40,35" advanced="true">
-      <relation target="" sidePair="center-center"/>
-    </group>
-  </displayList>
-</component>

+ 0 - 18
art/fgui/assets/game/UITry/component/try_com3.xml

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="16,22">
-  <displayList>
-    <image id="n33_cj92" name="n33" src="cj92v4o8" fileName="UITry/asset/jiantou.png" xy="0,1"/>
-    <image id="n34_cj92" name="n34" src="cj92v4o8" fileName="UITry/asset/jiantou.png" xy="10,12" scale="0.6,0.6"/>
-    <image id="n35_cj92" name="n35" src="cj92v4o8" fileName="UITry/asset/jiantou.png" xy="11,0" scale="0.4,0.4"/>
-  </displayList>
-  <transition name="t0" autoPlay="true" autoPlayRepeat="-1">
-    <item time="0" type="Alpha" target="n33_cj92" tween="true" startValue="1" endValue="0" duration="17"/>
-    <item time="0" type="Alpha" target="n34_cj92" value="0"/>
-    <item time="0" type="Alpha" target="n35_cj92" tween="true" startValue="1" endValue="1" duration="13"/>
-    <item time="0" type="XY" target="n33_cj92" tween="true" startValue="0,1" endValue="0,-8" duration="17"/>
-    <item time="0" type="XY" target="n35_cj92" tween="true" startValue="11,6" endValue="11,-4" duration="19"/>
-    <item time="11" type="Alpha" target="n34_cj92" tween="true" startValue="1" endValue="0" duration="15"/>
-    <item time="11" type="XY" target="n34_cj92" tween="true" startValue="10,16" endValue="10,9" duration="15"/>
-    <item time="13" type="Alpha" target="n35_cj92" tween="true" startValue="1" endValue="0" duration="6"/>
-  </transition>
-</component>

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

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="238,72" pivot="0.5,0.5" extention="Button">
-  <controller name="c1" alias="结算按钮" exported="true" pages="5,三倍领取,0,领取,1,再试一次 有金币,2,返回大厅,4,再试一次 无金币,18,再试一次+体力,20,放弃机会" selected="0"/>
+  <controller name="c1" alias="结算按钮" exported="true" pages="5,三倍领取,0,领取,1,再试一次 有金币,2,返回大厅,4,再试一次 无金币,18,再试一次+体力,20,放弃机会" selected="1"/>
   <displayList>
     <image id="n0_hkrz" name="n0" src="hkrz3ta" fileName="_shareasset/ty_an1.png" xy="0,0" size="238,73" aspect="true"/>
-    <text id="n1_hkrz" name="n1" xy="0,4" size="238,72" fontSize="32" color="#ffffff" align="center" vAlign="middle" letterSpacing="3" autoSize="none" bold="true" text="三倍领取">
+    <text id="n1_hkrz" name="n1" xy="8,5" size="223,61" font="Arial" fontSize="30" color="#ffffff" align="center" vAlign="middle" letterSpacing="1" autoSize="none" bold="true" text="Receive">
       <gearDisplay controller="c1" pages="0"/>
-      <gearText controller="c1" pages="5,0" values="三倍领取|Get" default="领取"/>
+      <gearText controller="c1" pages="5,0" values="三倍领取|Receive" default="领取"/>
     </text>
     <text id="n2_p4tr" name="n2" xy="23,38" size="233,44" fontSize="32" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="none" bold="true" text="放弃机会">
       <gearDisplay controller="c1" pages="1,4,20"/>
@@ -15,9 +15,9 @@
     <image id="n3_p4tr" name="n3" src="p4tr425" fileName="UIGameEnd/asset/dj2.png" xy="40,20" visible="false">
       <gearDisplay controller="c1" pages="1"/>
     </image>
-    <text id="n4_p4tr" name="n4" xy="70,18" size="131,36" fontSize="23" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="none" bold="true" text="Get triple">
+    <text id="n4_p4tr" name="n4" xy="0,4" size="141,36" font="Arial" fontSize="25" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="none" text="返回大厅">
       <gearDisplay controller="c1" pages="5,2,18"/>
-      <gearXY controller="c1" pages="5,2,18" values="70,18|3,14|70,14" default="0,4"/>
+      <gearXY controller="c1" pages="5,2,18" values="74,18|3,18|70,18" default="0,4"/>
       <gearText controller="c1" pages="5,2,18" values="Get triple|Return to the lobby|try again" default="返回大厅"/>
     </text>
     <text id="n5_trk9" name="n5" xy="112,3" size="52,39" group="n7_vhzh" fontSize="28" color="#ffffff" text="500">

+ 2 - 5
art/fgui/assets/game/_sharecomponent/drawBtn.xml

@@ -5,13 +5,10 @@
     <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="54,10" size="173,44" fontSize="32" color="#ffffff" align="center" vAlign="middle" leading="0" bold="true" text="prize draw">
+    <text id="n1_hkrz" name="n1" xy="6,14" size="227,44" font="Arial" fontSize="30" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="none" bold="true" text="Free prize draw">
       <gearDisplay controller="c1" pages="9,10"/>
-      <gearXY controller="c1" pages="9,10" values="33,16|54,10"/>
+      <gearXY controller="c1" pages="9,10" values="6,14|6,14"/>
     </text>
-    <image id="n5_p4tr" name="n5" src="hkrz3te" fileName="_shareasset/1.png" xy="7,22" size="42,30" aspect="true">
-      <gearDisplay controller="c1" pages="10"/>
-    </image>
   </displayList>
   <Button downEffect="scale" downEffectValue="1.04"/>
 </component>

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

@@ -8,9 +8,9 @@
     <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="235,44" fontSize="21" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="开始游戏">
+    <text id="n1_hkrz" name="n1" xy="0,12" size="224,44" fontSize="21" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="开始游戏">
       <gearDisplay controller="c1" pages="0,4,21"/>
-      <gearXY controller="c1" pages="0,4,21" values="2,16|1,33|0,19" default="0,12"/>
+      <gearXY controller="c1" pages="0,4,21" values="2,16|1,33|7,17" default="0,12"/>
       <gearText controller="c1" pages="0,3,4,5,6,21" values="Change game players|start|next level|Start|Start|Unpacking" default="开始游戏"/>
     </text>
     <text id="n3_p4tr" name="n3" xy="44,11" size="100,44" fontSize="32" color="#ffffff" align="center" vAlign="middle" leading="0" bold="true" text="下一关">
@@ -21,13 +21,13 @@
       <gearDisplay controller="c1" pages="6,7,8"/>
       <gearText controller="c1" pages="0,5,6,7,8" values="OK|OK|OK|receive|Received &#xA;already" default="知道了"/>
     </text>
-    <text id="n4_p4tr" name="n4" xy="44,16" size="198,39" fontSize="28" color="#ffffff" align="center" vAlign="middle" leading="0" bold="true" text="3x the reward">
+    <text id="n4_p4tr" name="n4" xy="52,14" size="183,44" font="Arial" fontSize="32" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="none" bold="true" text="Triple claim">
       <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|3x the reward" default="下一关"/>
+      <gearText controller="c1" pages="0,1,5,6,9,11,22,23,24" values="next level|next level|Next Level|Next Level|Free prize draw|Start|Unpacking|next level|Triple claim" default="下一关"/>
     </text>
-    <image id="n5_p4tr" name="n5" src="hkrz3te" fileName="_shareasset/1.png" xy="1,22" size="42,30" aspect="true">
+    <image id="n5_p4tr" name="n5" src="hkrz3te" fileName="_shareasset/1.png" xy="9,21" size="42,30" aspect="true">
       <gearDisplay controller="c1" pages="1,9,22,24"/>
-      <gearXY controller="c1" pages="1,9,22,24" values="3,22|4,22|1,21|1,22" default="46,22"/>
+      <gearXY controller="c1" pages="1,9,22,24" values="3,22|4,21|7,21|9,21" default="46,22"/>
     </image>
     <text id="n6_p4tr" name="n6" xy="0,4" size="239,73" fontSize="32" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="开心收下">
       <gearDisplay controller="c1" pages="3,10"/>
@@ -44,7 +44,7 @@
     <group id="n22_cy72" name="n22" xy="80,0" size="85,39" advanced="true">
       <relation target="n2_hkrz" sidePair="center-center"/>
     </group>
-    <component id="n25_jpsz" name="powerEft" src="jpszv4mw" fileName="_sharecomponent/Component132_2.xml" xy="8,20" size="40,48" scale="0.8,0.8">
+    <component id="n25_jpsz" name="powerEft" src="jpszv4mw" fileName="_sharecomponent/Component132_2.xml" xy="46,18" size="40,48" scale="0.8,0.8">
       <gearDisplay controller="c1" pages="11,23"/>
     </component>
   </displayList>

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

@@ -672,7 +672,7 @@
     <image id="j979v4i5" name="pqms_btk.png" path="/UISecretary/asset/" scale="9grid" scale9grid="125,0,250,10"/>
     <component id="j979v4i6" name="special.xml" path="/UILevelDisplay/component/"/>
     <component id="cy72v4ib" name="Component121.xml" path="/UISecretary/component/"/>
-    <component id="pf2sv4ic" name="Component122.xml" path="/UISecretary/component/"/>
+    <component id="pf2sv4ic" name="Component122.xml" path="/UISecretary/"/>
     <font id="m0q7v4ic" name="Font2.fnt" path="/UIAddProp/"/>
     <component id="m0q7v4id" name="Component30(1).xml" path="/UIGameEnd/component/"/>
     <component id="m0q7v4ie" name="dh_js_shibai(1).xml" path="/UIGameEnd/component/"/>
@@ -831,25 +831,25 @@
     <component id="wyzsv4o1" name="Component41_3.xml" path="/UIPower/component/"/>
     <component id="wyzsv4o2" name="dh_zs_4.xml" path="/UIPower/component/"/>
     <component id="cj92v4o3" name="main_guang.xml" path="/UIMain/component/"/>
-    <component id="cj92v4o4" name="UITry.xml" path="/UITry/" exported="true"/>
-    <component id="cj92v4o5" name="try_com1.xml" path="/UITry/Component/"/>
-    <component id="cj92v4o6" name="try_com2.xml" path="/UITry/Component/"/>
-    <image id="cj92v4o7" name="biaoqian.png" path="/UITry/asset/" scale="9grid" scale9grid="14,0,4,27"/>
-    <image id="cj92v4o8" name="jiantou.png" path="/UITry/asset/"/>
-    <component id="cj92v4o9" name="try_com3.xml" path="/UITry/Component/"/>
+    <component id="cj92v4o4" name="UITry.xml" path="/UISkill/UITry/" exported="true"/>
+    <component id="cj92v4o5" name="try_com1.xml" path="/UISkill/UITry/Component/"/>
+    <component id="cj92v4o6" name="try_com2.xml" path="/UISkill/UITry/Component/"/>
+    <image id="cj92v4o7" name="biaoqian.png" path="/UISkill/UITry/asset/" scale="9grid" scale9grid="14,0,4,27"/>
+    <image id="cj92v4o8" name="jiantou.png" path="/UISkill/UITry/asset/"/>
+    <component id="cj92v4o9" name="try_com3.xml" path="/UISkill/UITry/Component/"/>
     <component id="nqcqv4oa" name="Component111_1.xml" path="/UIMain/"/>
     <component id="nqcqv4ob" name="Component111_11.xml" path="/UIMain/"/>
     <component id="nqcqv4oc" name="Component112.xml" path="/UIMain/"/>
     <component id="nqcqv4od" name="Component131.xml" path="/UIMain/"/>
-    <image id="nqcqv4oe" name="guang.png" path="/UITry/asset/"/>
-    <image id="nqcqv4of" name="jdt1.png" path="/UITry/asset/"/>
-    <image id="nqcqv4og" name="jdt2.png" path="/UITry/asset/"/>
-    <image id="nqcqv4oh" name="jdt3.png" path="/UITry/asset/"/>
-    <image id="nqcqv4oi" name="jdt4.png" path="/UITry/asset/"/>
-    <image id="nqcqv4oj" name="lv4_top1.png" path="/UITry/asset/"/>
-    <component id="nqcqv4ok" name="try_com1.xml" path="/UITry/component/"/>
-    <component id="nqcqv4ol" name="try_com2.xml" path="/UITry/component/"/>
-    <component id="nqcqv4om" name="try_com3.xml" path="/UITry/component/"/>
+    <image id="nqcqv4oe" name="guang.png" path="/UISkill/UITry/asset/"/>
+    <image id="nqcqv4of" name="jdt1.png" path="/UISkill/UITry/asset/"/>
+    <image id="nqcqv4og" name="jdt2.png" path="/UISkill/UITry/asset/"/>
+    <image id="nqcqv4oh" name="jdt3.png" path="/UISkill/UITry/asset/"/>
+    <image id="nqcqv4oi" name="jdt4.png" path="/UISkill/UITry/asset/"/>
+    <image id="nqcqv4oj" name="lv4_top1.png" path="/UISkill/UITry/asset/"/>
+    <component id="nqcqv4ok" name="try_com1.xml" path="/UISkill/UITry/component/"/>
+    <component id="nqcqv4ol" name="try_com2.xml" path="/UISkill/UITry/component/"/>
+    <component id="nqcqv4om" name="try_com3.xml" path="/UISkill/UITry/component/"/>
     <component id="p7rrv4p8" name="UIRanking.xml" path="/UIPower/UIRanking/" exported="true"/>
     <image id="p7rrv4p9" name="phb_1.png" path="/UIPower/UIRanking/asset/"/>
     <image id="p7rrv4pa" name="phb_2.png" path="/UIPower/UIRanking/asset/"/>

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


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

@@ -12382,7 +12382,6 @@
             this.c1 = this.getController("c1");
             this.n2 = (this.getChild("n2"));
             this.n1 = (this.getChild("n1"));
-            this.n5 = (this.getChild("n5"));
         }
     }
     ui_drawBtn.URL = "ui://isxx5ak7iqrhv4mt";

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


File diff suppressed because it is too large
+ 0 - 0
client/laya/release/bytedancegame/res/json/npc.json


+ 0 - 2
client/laya/src/fgui/res/game/ui_drawBtn.ts

@@ -5,7 +5,6 @@ export default class ui_drawBtn extends fgui.GButton {
 	public c1:fgui.Controller;
 	public n2:fgui.GImage;
 	public n1:fgui.GTextField;
-	public n5:fgui.GImage;
 	public static URL:string = "ui://isxx5ak7iqrhv4mt";
 
 	public static createInstance():ui_drawBtn {
@@ -16,6 +15,5 @@ export default class ui_drawBtn extends fgui.GButton {
 		this.c1 = this.getController("c1");
 		this.n2 = <fgui.GImage>(this.getChild("n2"));
 		this.n1 = <fgui.GTextField>(this.getChild("n1"));
-		this.n5 = <fgui.GImage>(this.getChild("n5"));
 	}
 }

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