1

art/fgui/.objs/workspace.json

@@ -7,38 +7,16 @@
     "/"
   ],
   "libview.iconScale": 0,
-  "doc.openedDocs": [
-    "ui://isxx5ak7g1giv4ep",
-    "ui://isxx5ak7g1giv4el",
-    "ui://isxx5ak7uqohv4lr",
-    "ui://isxx5ak7g1giv4ey"
-  ],
+  "doc.openedDocs": [],
   "test.device": "iPhone Xs Max",
   "canvasColor": 10066329,
   "auxline2": true,
-  "doc.activeDoc": "ui://isxx5ak7g1giv4el",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
     "isxx5ak7",
     "/",
     "isxx5ak7",
-    "/UISecretary/",
-    "isxx5ak7",
-    "/UISecretary/UIShop/",
-    "isxx5ak7",
-    "/UISecretary/UIShop/component/",
-    "isxx5ak7",
-    "/UITips/",
-    "isxx5ak7",
-    "/UIWordsList/",
-    "isxx5ak7",
-    "/UIWordsList/UIVideoShare/",
-    "isxx5ak7",
-    "/_exportasset/",
-    "isxx5ak7",
-    "/_shareasset/",
-    "isxx5ak7",
-    "/_sharecomponent/",
+    "/UIDraw/",
     "isxx5ak7",
     "/windows/"
   ],

art/fgui/assets/game/UIAddProp/component/Component104.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="800,489" designImageLayer="1">
-  <controller name="c1" alias="金币钻石" exported="true" pages="0,金币,1,钻石" selected="1"/>
+  <controller name="c1" alias="金币钻石" exported="true" pages="0,金币,1,钻石" selected="0"/>
   <displayList>
     <image id="n12_ehto" name="n12" src="ehtov4fv" fileName="UIAddProp/asset/hb_bz1.png" xy="0,0" size="800,489"/>
     <component id="n18_ehto" name="coinBtn" src="ehtov4gh" fileName="UIAddProp/component/Component105.xml" xy="0,0" controller="c1,1"/>
     <component id="n50_ehto" name="diamondBtn" src="ehtov4gj" fileName="UIAddProp/component/Component106.xml" xy="0,245" controller="c1,0"/>
-    <component id="n20_ehto" name="node3" src="ehtov4gd" fileName="UIAddProp/component/hb_jinbi1.xml" xy="83,19" size="226,448">
+    <component id="n20_ehto" name="node3" src="ehtov4gd" fileName="UIAddProp/component/hb_jinbi1.xml" xy="87,18" size="226,448">
       <gearDisplay controller="c1" pages="0"/>
     </component>
     <component id="n43_ehto" name="node4" src="ehtov4ge" fileName="UIAddProp/component/hb_jinbi2.xml" xy="317,19">

art/fgui/assets/game/UIAddProp/component/hb_jinbi1.xml

@@ -8,7 +8,7 @@
     <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"/>
     <image id="n45_u58x" name="n45" src="ehtov4fs" fileName="UIAddProp/asset/hb_sp.png" xy="53,409"/>
-    <text id="n44_u58x" name="getTips" xy="105,405" size="46,35" fontSize="25" color="#c3945c" align="center" vAlign="middle" text="Get">
+    <text id="n44_u58x" name="getTips" xy="105,405" size="46,35" fontSize="25" color="#ffffff" align="center" vAlign="middle" strokeColor="#000000" text="Get">
       <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"/>

art/fgui/assets/game/UIAddProp/component/hb_jinbi3.xml

@@ -8,7 +8,7 @@
     <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="#c3945c" align="center" vAlign="middle" text="200">
+    <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">
       <relation target="n39_ehto" sidePair="left-right"/>
     </text>
     <group id="n41_ehto" name="n41" xy="65,404" size="96,43" advanced="true">

art/fgui/assets/game/UIAddProp/component/hb_zs1.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="226,448" pivot="0.5,0.5" extention="Button">
-  <controller name="c1" exported="true" pages="0,分享得钻石,1,看视频获得随机钻石" selected="1"/>
+  <controller name="c1" exported="true" pages="0,分享得钻石,1,看视频获得随机钻石" selected="0"/>
   <displayList>
     <image id="n20_ehto" name="n20" src="ehtov4fi" fileName="UIAddProp/asset/hb_db1.png" xy="0,0"/>
     <image id="n21_ehto" name="n21" src="ehtov4fe" fileName="UIAddProp/asset/hb_bq_hs.png" xy="0,0"/>
-    <text id="n26_ehto" name="n26" xy="2,50" pivot="0.5,0.5" size="221,104" fontSize="20" color="#6379ac" align="center" vAlign="middle" leading="1" autoSize="none" bold="true" text="Watch a Video to Get&#xA; Random Diamonds">
+    <text id="n26_ehto" name="n26" xy="2,50" pivot="0.5,0.5" size="221,104" fontSize="28" color="#522cce" align="center" vAlign="middle" leading="1" autoSize="none" bold="true" strokeColor="#ffffff" text="Share to &#xA;Earn Diamonds">
       <gearDisplay controller="c1" pages="0,1"/>
       <gearText controller="c1" pages="0,1" values="Share to &#xA;Earn Diamonds|Watch a Video to Get&#xA; Random Diamonds"/>
     </text>

art/fgui/assets/game/UIAddProp/component/hb_zs2.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="n21_ehto" name="n21" src="ehtov4ff" fileName="UIAddProp/asset/hb_bq_ls.png" xy="0,0"/>
-    <text id="n26_ehto" name="n26" xy="10,44" pivot="0.5,0.5" size="206,116" fontSize="28" color="#6379ac" align="center" vAlign="middle" autoSize="none" bold="true" text="Get diamonds by &#xA;watching videos."/>
+    <text id="n26_ehto" name="n26" xy="10,44" pivot="0.5,0.5" size="206,116" fontSize="28" color="#522cce" align="center" vAlign="middle" autoSize="none" bold="true" strokeColor="#ffffff" text="Get diamonds by &#xA;watching videos."/>
     <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"/>

art/fgui/assets/game/UIAddProp/component/hb_zs3.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="n21_ehto" name="n21" src="ehtov4fg" fileName="UIAddProp/asset/hb_bq_zs.png" xy="0,0"/>
-    <text id="n26_ehto" name="n26" xy="15,46" pivot="0.5,0.5" size="195,113" fontSize="28" color="#6379ac" align="center" vAlign="middle" autoSize="none" bold="true" text="Challenge the Cue Ball &#xA;Arrangement Master!"/>
+    <text id="n26_ehto" name="n26" xy="15,46" pivot="0.5,0.5" size="195,113" fontSize="28" color="#522cce" align="center" vAlign="middle" autoSize="none" bold="true" strokeColor="#ffffff" text="Challenge the Cue Ball &#xA;Arrangement Master!"/>
     <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"/>

art/fgui/assets/game/UIDraw/component/UITurntable_com7.xml

@@ -9,11 +9,11 @@
     <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"/>
     <loader id="n26_wcn5" name="img6" xy="265,64" pivot="0.5,0.5" size="160,160" scale="0.6,0.6" rotation="60" url="ui://isxx5ak7ehtov4gr" align="center" vAlign="middle" fill="scale" shrinkOnly="true"/>
     <loader id="n33_wcn5" name="img5" xy="264,215" pivot="0.5,0.5" size="160,160" scale="0.6,0.6" rotation="120" url="ui://isxx5ak7ehtov4fp" align="center" vAlign="middle" fill="scale" shrinkOnly="true"/>
-    <text id="n23_wcn5" name="txt1" xy="180,122" pivot="0.5,0.5" size="76,26" fontSize="18" color="#b46638" align="center" vAlign="middle" text="魔法球杆"/>
-    <text id="n30_wcn5" name="txt2" xy="133,168" pivot="0.5,0.5" size="37,26" rotation="-60" fontSize="18" color="#b46638" align="center" vAlign="middle" text="999"/>
-    <text id="n29_wcn5" name="txt3" xy="134,244" pivot="0.5,0.5" size="37,26" rotation="-120" fontSize="18" color="#b46638" align="center" vAlign="middle" text="128"/>
-    <text id="n27_wcn5" name="txt4" xy="192,289" pivot="0.5,0.5" size="48,26" rotation="180" fontSize="18" color="#b46638" align="center" vAlign="middle" text="1230"/>
-    <text id="n28_wcn5" name="txt5" xy="282,244" pivot="0.5,0.5" size="37,26" rotation="120" fontSize="18" color="#b46638" align="center" vAlign="middle" text="188"/>
-    <text id="n25_wcn5" name="txt6" xy="282,159" pivot="0.5,0.5" size="26,26" rotation="60" fontSize="18" color="#b46638" align="center" vAlign="middle" text="99"/>
+    <text id="n23_wcn5" name="txt1" xy="180,122" pivot="0.5,0.5" size="76,26" fontSize="18" color="#ffffff" align="center" vAlign="middle" text="魔法球杆"/>
+    <text id="n30_wcn5" name="txt2" xy="133,168" pivot="0.5,0.5" size="37,26" rotation="-60" fontSize="18" color="#ffffff" align="center" vAlign="middle" text="999"/>
+    <text id="n29_wcn5" name="txt3" xy="134,244" pivot="0.5,0.5" size="37,26" rotation="-120" fontSize="18" color="#ffffff" align="center" vAlign="middle" text="128"/>
+    <text id="n27_wcn5" name="txt4" xy="192,289" pivot="0.5,0.5" size="48,26" rotation="180" fontSize="18" color="#ffffff" align="center" vAlign="middle" text="1230"/>
+    <text id="n28_wcn5" name="txt5" xy="282,244" pivot="0.5,0.5" size="37,26" rotation="120" fontSize="18" color="#ffffff" align="center" vAlign="middle" text="188"/>
+    <text id="n25_wcn5" name="txt6" xy="282,159" pivot="0.5,0.5" size="26,26" rotation="60" fontSize="18" color="#ffffff" align="center" vAlign="middle" text="99"/>
   </displayList>
 </component>

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="15"/>
+  <controller name="c1" alias="按钮" exported="true" pages="0,换人再战,1,下一关要看视频,2,下一关不用看视频,3,开心收下,4,下一关要花费金币,5,立即挑战,6,知道了,7,领取,8,已领取,9,免费抽奖,10,普通领取,11,体力+开始游戏,21,连点开箱,22,连点开箱+视频,23,体力挑战下一关,24,三倍领取" selected="8"/>
   <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,43 +8,43 @@
     <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,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,43" font="Arial" fontSize="31" 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|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="开始游戏"/>
+      <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 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="下一关">
       <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="8,-5" size="239,75" fontSize="28" color="#ffffff" align="center" vAlign="middle" letterSpacing="1" autoSize="none" bold="true" text="知道了">
+    <text id="n23_lp3l" name="n23" xy="0,7" size="234,57" font="Arial" fontSize="27" color="#ffffff" align="center" vAlign="middle" leading="1" autoSize="none" bold="true" text="Received already">
       <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="知道了"/>
+      <gearText controller="c1" pages="0,5,6,7,8" values="OK|OK|OK|receive|Received already" default="知道了"/>
     </text>
-    <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">
+    <text id="n4_p4tr" name="n4" xy="53,14" size="180,44" font="Arial" fontSize="30" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="none" bold="true" text="下一关">
       <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|Free prize draw|Start|Unpacking|next level|Triple claim" default="下一关"/>
     </text>
-    <image id="n5_p4tr" name="n5" src="hkrz3te" fileName="_shareasset/1.png" xy="9,21" size="42,30" aspect="true">
+    <image id="n5_p4tr" name="n5" src="hkrz3te" fileName="_shareasset/1.png" xy="46,22" 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,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="开心收下">
+    <text id="n6_p4tr" name="n6" xy="0,4" size="228,60" fontSize="27" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="开心收下">
       <gearDisplay controller="c1" pages="3,10"/>
-      <gearXY controller="c1" default="0,4"/>
+      <gearXY controller="c1" pages="10" values="5,6" default="0,4"/>
       <gearText controller="c1" pages="3,6,10" values="Next Level|Cheerfully Receive|receive" default="开心收下"/>
     </text>
-    <text id="n20_cy72" name="n20" xy="113,0" size="52,39" group="n22_cy72" fontSize="28" color="#ffffff" vAlign="middle" leading="0" text="500">
+    <text id="n20_cy72" name="n20" xy="110,0" size="52,39" group="n22_cy72" fontSize="28" color="#ffffff" vAlign="middle" leading="0" text="500">
       <gearDisplay controller="c1" pages="4,5"/>
       <relation target="n21_cy72" sidePair="left-right"/>
     </text>
-    <image id="n21_cy72" name="n21" src="wehi3ui" fileName="UIMoney/asset/ty_jb.png" xy="80,2" size="31,31" group="n22_cy72" aspect="true">
+    <image id="n21_cy72" name="n21" src="wehi3ui" fileName="UIMoney/asset/ty_jb.png" xy="77,2" size="31,31" group="n22_cy72" aspect="true">
       <gearDisplay controller="c1" pages="4,5"/>
     </image>
-    <group id="n22_cy72" name="n22" xy="80,0" size="85,39" advanced="true">
+    <group id="n22_cy72" name="n22" xy="77,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="46,18" size="40,48" scale="0.8,0.8">
+    <component id="n25_jpsz" name="powerEft" src="jpszv4mw" fileName="_sharecomponent/Component132_2.xml" xy="6,18" size="40,48" scale="0.8,0.8">
       <gearDisplay controller="c1" pages="11,23"/>
     </component>
   </displayList>