1

art/fgui/.objs/workspace.json

@@ -8,25 +8,70 @@
   ],
   "libview.iconScale": 0,
   "doc.openedDocs": [
-    "ui://isxx5ak7kt443qc"
+    "ui://isxx5ak7vhzhv4hq",
+    "ui://isxx5ak7c50vv4y6",
+    "ui://isxx5ak7qlo041r",
+    "ui://isxx5ak7qlo041s",
+    "ui://isxx5ak7qlo041t",
+    "ui://isxx5ak7qlo041w",
+    "ui://isxx5ak7ihpy43t",
+    "ui://isxx5ak7gg0z444",
+    "ui://isxx5ak7gg0z445",
+    "ui://isxx5ak7wp26456",
+    "ui://isxx5ak7g1giv4ed",
+    "ui://isxx5ak7m2h4v4e8",
+    "ui://isxx5ak7qlo041q",
+    "ui://isxx5ak7uqohv4m3",
+    "ui://isxx5ak7jaakv55x",
+    "ui://isxx5ak7j69a40z",
+    "ui://isxx5ak7mnrs431",
+    "ui://isxx5ak7mnrs42z",
+    "ui://isxx5ak7i4k243i",
+    "ui://isxx5ak7hkrz3tj"
   ],
   "test.device": "iPhone Xs Max",
   "canvasColor": 10066329,
   "auxline2": true,
-  "doc.activeDoc": "ui://isxx5ak7kt443qc",
+  "doc.activeDoc": "ui://isxx5ak7i4k243i",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
     "isxx5ak7",
     "/",
     "isxx5ak7",
-    "/UIGame/",
-    "isxx5ak7",
-    "/UIGame/component/",
-    "isxx5ak7",
     "/UIMain/",
     "isxx5ak7",
+    "/UIMain/component/",
+    "isxx5ak7",
     "/UIMsg/",
     "isxx5ak7",
+    "/UIPower/",
+    "isxx5ak7",
+    "/UIPower/component/",
+    "isxx5ak7",
+    "/UISecretary/",
+    "isxx5ak7",
+    "/UISign/",
+    "isxx5ak7",
+    "/UISign/component/",
+    "isxx5ak7",
+    "/UISkill/",
+    "isxx5ak7",
+    "/UISkill/UITry/",
+    "isxx5ak7",
+    "/UISkill/UITry/Component/",
+    "isxx5ak7",
+    "/UISkill/UITry/component/",
+    "isxx5ak7",
+    "/UISkill/component/",
+    "isxx5ak7",
+    "/UITips/",
+    "isxx5ak7",
+    "/UITips/component/",
+    "isxx5ak7",
+    "/UIWordsList/",
+    "isxx5ak7",
+    "/UIWordsList/UIVideoShare/",
+    "isxx5ak7",
     "/_exportasset/",
     "isxx5ak7",
     "/_shareasset/"

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="800,489" designImageLayer="1">
-  <controller name="c1" alias="金币钻石" exported="true" pages="0,金币,1,钻石" selected="0"/>
+  <controller name="c1" alias="金币钻石" exported="true" pages="0,金币,1,钻石" selected="1"/>
   <displayList>
     <image id="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"/>
@@ -14,7 +14,7 @@
     <component id="n44_ehto" name="node5" src="ehtov4gf" fileName="UIAddProp/component/hb_jinbi3.xml" xy="551,19" size="226,448">
       <gearDisplay controller="c1" pages="0"/>
     </component>
-    <component id="n57_ehto" name="node1" src="ehtov4gk" fileName="UIAddProp/component/hb_zs1.xml" xy="83,19" controller="c1,0">
+    <component id="n57_ehto" name="node1" src="ehtov4gk" fileName="UIAddProp/component/hb_zs1.xml" xy="88,20" controller="c1,0">
       <gearDisplay controller="c1" pages="1"/>
     </component>
     <component id="n58_ehto" name="node2" src="ehtov4gu" fileName="UIAddProp/component/hb_zs2.xml" xy="317,19">

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

@@ -19,9 +19,9 @@
       <relation target="n38_ehto" sidePair="center-center"/>
     </group>
     <text id="n42_ehto" name="n42" xy="48,137" size="118,39" font="Arial" fontSize="28" color="#ffffff" align="center" italic="true" text="gold coin"/>
-    <image id="n46_xtc7" name="n46" src="jaakv562" fileName="UIAddProp/asset/biaoqian.png" xy="134,298"/>
-    <text id="n47_xtc7" name="n47" xy="156,335" size="35,23" fontSize="15" color="#ffffff" align="center" vAlign="bottom" leading="0" text="give"/>
-    <text id="n48_xtc7" name="n48" xy="152,351" size="43,26" fontSize="18" color="#ffffff" align="center" vAlign="bottom" leading="0" bold="true" text="25%"/>
+    <image id="n46_xtc7" name="n46" src="jaakv562" fileName="UIAddProp/asset/biaoqian.png" xy="125,298"/>
+    <text id="n47_xtc7" name="n47" xy="147,322" size="30,23" font="Arial" fontSize="15" color="#ffffff" align="center" vAlign="bottom" leading="0" bold="true" text="Gift"/>
+    <text id="n48_xtc7" name="n48" xy="143,338" size="40,26" font="Arial" fontSize="18" color="#ffffff" align="center" vAlign="bottom" leading="0" bold="true" text="25%"/>
   </displayList>
   <Button downEffect="scale" downEffectValue="1.02"/>
   <transition name="t0" autoPlay="true">

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

@@ -15,9 +15,9 @@
       <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"/>
-    <image id="n43_xtc7" name="n43" src="jaakv562" fileName="UIAddProp/asset/biaoqian.png" xy="135,298"/>
-    <text id="n44_xtc7" name="n44" xy="157,335" size="35,23" fontSize="15" color="#ffffff" align="center" vAlign="bottom" leading="0" text="give"/>
-    <text id="n45_xtc7" name="n45" xy="153,351" size="43,26" fontSize="18" color="#ffffff" align="center" vAlign="bottom" leading="0" bold="true" text="25%"/>
+    <image id="n43_xtc7" name="n43" src="jaakv562" fileName="UIAddProp/asset/biaoqian.png" xy="125,298"/>
+    <text id="n44_xtc7" name="n44" xy="145,323" size="30,23" font="Arial" fontSize="15" color="#ffffff" align="center" vAlign="bottom" leading="0" bold="true" text="Gift"/>
+    <text id="n45_xtc7" name="n45" xy="141,339" size="40,26" font="Arial" fontSize="18" color="#ffffff" align="center" vAlign="bottom" leading="0" bold="true" text="25%"/>
   </displayList>
   <Button downEffect="scale" downEffectValue="1.02"/>
   <transition name="t0" autoPlay="true">

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

@@ -15,9 +15,9 @@
       <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"/>
-    <image id="n43_xtc7" name="n43" src="jaakv562" fileName="UIAddProp/asset/biaoqian.png" xy="136,298"/>
-    <text id="n44_xtc7" name="n44" xy="158,335" size="39,23" fontSize="15" color="#ffffff" align="center" vAlign="bottom" leading="0" text="give "/>
-    <text id="n45_xtc7" name="n45" xy="154,351" size="43,26" fontSize="18" color="#ffffff" align="center" vAlign="bottom" leading="0" bold="true" text="25%"/>
+    <image id="n43_xtc7" name="n43" src="jaakv562" fileName="UIAddProp/asset/biaoqian.png" xy="125,298"/>
+    <text id="n44_xtc7" name="n44" xy="147,324" size="30,23" font="Arial" fontSize="15" color="#ffffff" align="center" vAlign="bottom" leading="0" bold="true" text="Gift"/>
+    <text id="n45_xtc7" name="n45" xy="143,340" size="40,26" font="Arial" fontSize="18" color="#ffffff" align="center" vAlign="bottom" leading="0" bold="true" text="25%"/>
   </displayList>
   <Button downEffect="scale" downEffectValue="1.02"/>
   <transition name="t0" autoPlay="true">

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

@@ -1,20 +1,20 @@
 <?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="28" color="#522cce" align="center" vAlign="middle" leading="1" autoSize="none" bold="true" strokeColor="#ffffff" 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>
-    <text id="n27_ehto" name="n27" xy="2,15" pivot="0.5,0.5" size="56,23" rotation="-47" fontSize="15" color="#ffffff" align="center" vAlign="middle" text="activity"/>
+    <text id="n27_ehto" name="n27" xy="1,15" pivot="0.5,0.5" size="57,23" rotation="-47" font="Arial" fontSize="15" color="#ffffff" align="center" vAlign="middle" bold="true" strokeColor="#000000" text="Activity"/>
     <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" strokeColor="#000000" text="+2000">
+    <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">
       <relation target="n39_ehto" sidePair="left-right"/>
     </text>
     <group id="n41_ehto" name="n41" xy="30,407" size="162,43" advanced="true">
@@ -24,7 +24,7 @@
     <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="56,407" group="n50_sw70"/>
     <image id="n48_sw70" name="n48" src="ehtov4fs" fileName="UIAddProp/asset/hb_sp.png" xy="15,411" group="n50_sw70"/>
-    <text id="n49_sw70" name="randTxt" xy="106,405" size="100,39" group="n50_sw70" font="Arial" fontSize="28" color="#ffffff" align="center" vAlign="middle" text="50~100">
+    <text id="n49_sw70" name="randTxt" xy="106,405" size="100,39" group="n50_sw70" font="Arial" fontSize="28" color="#ffffff" align="center" vAlign="middle" bold="true" strokeColor="#000000" text="50~100">
       <relation target="n47_sw70" sidePair="left-right"/>
     </text>
     <group id="n50_sw70" name="n50" xy="15,405" size="190,45" advanced="true">

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

@@ -4,15 +4,15 @@
     <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="#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"/>
+    <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,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">
+    <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">
       <relation target="n39_ehto" sidePair="left-right"/>
     </text>
-    <group id="n41_ehto" name="n41" xy="45,406" size="134,43" advanced="true">
+    <group id="n41_ehto" name="n41" xy="45,401" 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"/>

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

@@ -4,10 +4,10 @@
     <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="#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"/>
+    <text id="n27_ehto" name="n27" xy="-5,21" pivot="0.5,0.5" size="60,23" rotation="-47" font="Arial" fontSize="15" color="#ffffff" align="center" vAlign="middle" bold="true" strokeColor="#000000" text="Hotspot"/>
     <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="7,401" size="211,42" font="Arial" fontSize="30" color="#ffffff" align="center" text="Challenge Now"/>
+    <text id="n47_ehto" name="n47" xy="4,401" size="218,42" font="Arial" fontSize="30" color="#ffffff" align="center" bold="true" strokeColor="#000000" text="Challenge Now"/>
   </displayList>
   <Button downEffect="scale" downEffectValue="1.02"/>
   <transition name="t0" autoPlay="true">

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" 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" 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" 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"/>
     <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/>

art/fgui/assets/game/UIMain/component/Component60.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="261,84">
-  <controller name="c1" alias="对话框" exported="true" pages="0,流程1,1,流程2,2,流程3" selected="2"/>
+  <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"/>
-    <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="Give this skill a try!">
-      <gearText controller="c1" pages="0,1,2" values="hello， I am your thoughtful secretary Xiaoning!|Come and experience the pole mode|Give this skill a try!"/>
+    <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>
   </displayList>
   <transition name="t0" options="2" autoPlay="true">

art/fgui/assets/game/UISkill/UITry/component/try_com1.xml

@@ -7,16 +7,16 @@
     <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!">
+    <text id="n24_trk9" name="n24" xy="105,131" size="391,77" font="Arial" 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" font="Arial" fontSize="36" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="Limited-Time Trial"/>
+    <text id="n32_cj92" name="n32" xy="10,261" size="581,63" font="Arial" 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.">
+    <component id="n29_cj92" name="n29" src="cj92v4o6" fileName="UISkill/UITry/Component/try_com2.xml" xy="5,118" pivot="0.5,0.5"/>
+    <text id="n36_nqcq" name="n36" xy="109,84" size="382,32" font="Arial" 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">
+    <text id="n37_nqcq" name="txtTime" xy="563,28" pivot="1,0.5" size="30,34" font="Arial" fontSize="24" color="#ffffff" align="right" vAlign="middle" bold="true" text="15">
       <relation target="n0_p4tr" sidePair="right-right"/>
     </text>
   </displayList>

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" font="Arial" fontSize="36" color="#ffffff" align="center" vAlign="middle" letterSpacing="1" autoSize="none" bold="true" text="Tip"/>
+    <text id="n2_mnrs" name="n2" xy="195,13" size="215,54" font="Arial" fontSize="36" color="#ffffff" align="center" vAlign="middle" letterSpacing="1" autoSize="none" bold="true" strokeColor="#000000" strokeSize="2" 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" font="Arial" fontSize="30" color="#09348c" 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" font="Arial" fontSize="30" color="#09348c" align="center" vAlign="middle" leading="0" 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>

art/fgui/assets/game/_sharecomponent/cancelBtn.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="165,51" pivot="0.5,0.5" extention="Button">
-  <controller name="c1" alias="按钮" exported="true" pages="0,取消,1,不悔球,2,下次一定" selected="2"/>
+  <controller name="c1" alias="按钮" exported="true" pages="0,取消,1,不悔球,2,下次一定" selected="0"/>
   <displayList>
     <image id="n0_hkrz" name="n0" src="hkrz3ta" fileName="_shareasset/ty_an1.png" xy="0,0" size="165,51" aspect="true"/>
-    <text id="n1_hkrz" name="n1" xy="0,2" size="164,48" font="Arial" fontSize="22" color="#ffffff" align="center" vAlign="middle" leading="1" autoSize="none" bold="true" text="Next time">
+    <text id="n1_hkrz" name="n1" xy="0,2" size="164,48" font="Arial" fontSize="22" color="#ffffff" align="center" vAlign="middle" leading="1" autoSize="none" bold="true" strokeColor="#000000" text="Cancel">
       <gearText controller="c1" pages="0,1,2" values="Cancel|No-regret shot|Next time"/>
     </text>
   </displayList>

art/fgui/assets/game/_sharecomponent/cancelBtn2.xml

@@ -1,13 +1,13 @@
 <?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="8,5" size="223,61" font="Arial" fontSize="31" color="#ffffff" align="center" vAlign="middle" letterSpacing="1" autoSize="none" bold="true" text="三倍领取">
+    <text id="n1_hkrz" name="n1" xy="8,5" size="223,61" font="Arial" fontSize="31" color="#ffffff" align="center" vAlign="middle" letterSpacing="1" autoSize="none" bold="true" strokeColor="#000000" text="Receive">
       <gearDisplay controller="c1" pages="0"/>
       <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="放弃机会">
+    <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" strokeColor="#000000" text="放弃机会">
       <gearDisplay controller="c1" pages="1,4,20"/>
       <gearXY controller="c1" pages="1,4,20" values="2,21|2,14|3,14" default="23,38"/>
       <gearText controller="c1" pages="1,4,20" values="try again|Try again|give up" default="放弃机会"/>
@@ -15,7 +15,7 @@
     <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="9,12" size="220,48" font="Arial" fontSize="31" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="none" bold="true" text="Get triple">
+    <text id="n4_p4tr" name="n4" xy="9,12" size="220,48" font="Arial" fontSize="31" color="#ffffff" align="center" vAlign="middle" leading="0" autoSize="none" bold="true" strokeColor="#000000" text="返回大厅">
       <gearDisplay controller="c1" pages="5,2,18"/>
       <gearXY controller="c1" pages="5,0,1,2,4,18,20" values="9,12|9,12|9,12|9,12|9,12|9,12|3,11"/>
       <gearText controller="c1" pages="5,2,18,20" values="Get triple|Back to home|Try again|Back to home" default="返回大厅"/>

art/fgui/assets/game/_sharecomponent/shareBtn.xml

@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="165,51" pivot="0.5,0.5" extention="Button">
-  <controller name="c1" alias="小按钮" exported="true" pages="0,分享,1,拿来吧你,2,退出,3,悔球,4,使用,5,继续,12,充满体力,13,立即体验,14,确定" selected="6"/>
+  <controller name="c1" alias="小按钮" exported="true" pages="0,分享,1,拿来吧你,2,退出,3,悔球,4,使用,5,继续,12,充满体力,13,立即体验,14,确定" selected="5"/>
   <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="0,3" size="164,48" font="Arial" fontSize="22" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="悔球">
+    <text id="n1_hkrz" name="n1" xy="0,3" size="164,48" font="Arial" fontSize="22" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" strokeColor="#000000" text="悔球">
       <gearDisplay controller="c1" pages="0,3,4"/>
       <gearXY controller="c1" pages="3,4" values="14,-1|23,3" default="0,3"/>
       <gearText controller="c1" pages="0,3,4,14" values="share|undo a shot|USE|确定&#xA;" default="悔球"/>
     </text>
-    <text id="n3_p4tr" name="n3" xy="11,11" size="142,29" font="Arial" fontSize="20" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="Full of energy">
+    <text id="n3_p4tr" name="n3" xy="11,11" size="142,29" font="Arial" fontSize="20" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" strokeColor="#000000" text="充满体力">
       <gearDisplay controller="c1" pages="1,12,13"/>
       <gearText controller="c1" pages="1,12,13" values="Get|Full of energy|Now" default="充满体力"/>
     </text>
-    <image id="n4_p4tr" name="n4" src="hkrz3te" fileName="_shareasset/1.png" xy="2,0" pivot="0.5,0.5" size="28,20" aspect="true">
+    <image id="n4_p4tr" name="n4" src="hkrz3te" fileName="_shareasset/1.png" xy="19,14" pivot="0.5,0.5" size="28,20" aspect="true">
       <gearDisplay controller="c1" pages="1,3,4,12,13"/>
       <gearXY controller="c1" pages="3,4,12" values="1,15|37,14|2,0" default="19,14"/>
     </image>
-    <text id="n5_mnrs" name="n5" xy="1,1" size="164,48" font="Arial" fontSize="26" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="退出&#xA;">
+    <text id="n5_mnrs" name="n5" xy="1,1" size="164,48" font="Arial" fontSize="26" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" strokeColor="#000000" text="退出&#xA;">
       <gearDisplay controller="c1" pages="2,14"/>
       <gearText controller="c1" pages="2,14" values="Exit|OK" default="退出&#xA;"/>
     </text>
-    <text id="n6_s93b" name="n6" xy="0,1" size="164,48" font="Arial" fontSize="26" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="continue">
+    <text id="n6_s93b" name="n6" xy="0,1" size="164,48" font="Arial" fontSize="26" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" strokeColor="#000000" text="continue">
       <gearDisplay controller="c1" pages="5"/>
     </text>
   </displayList>

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="13"/>
+  <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"/>
   <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,28 +8,28 @@
     <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="开始游戏">
+    <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">
       <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" 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">
       <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="1,6" size="232,65" font="Arial" fontSize="31" color="#ffffff" align="center" vAlign="middle" leading="1" autoSize="none" bold="true" 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">
       <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" text="Unpacking">
+    <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">
       <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>
-    <image id="n5_p4tr" name="n5" src="hkrz3te" fileName="_shareasset/1.png" xy="7,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|6,21" default="46,22"/>
     </image>
-    <text id="n6_p4tr" name="n6" xy="0,4" size="228,60" font="Arial" fontSize="31" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" text="开心收下">
+    <text id="n6_p4tr" name="n6" xy="0,4" size="228,60" font="Arial" fontSize="31" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" strokeColor="#000000" text="开心收下">
       <gearDisplay controller="c1" pages="3,10"/>
       <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="开心收下"/>

client/laya/bin/js/cfgTable.js

@@ -837,17 +837,17 @@ cfgTable.secretaryData={
     },
     [16]:{
         id:16,
-        msg:'Boss, you are here. I am your exclusive secretary, Xiao Ning'
+        msg:'Boss, you are here. I am your exclusive secretary, Luna'
     },
 }
 //secretaryshop表数据
 cfgTable.secretaryshopData={
     [1]:{
         id:1,
-        name:'Xiao Ning',
+        name:'Luna',
         height:'164',
         food:'Sichuan cuisine, cantaloupe',
-        history:'Xiaoning was born into a not wealthy family. She studied hard since childhood and wanted to bring a prosperous life to her family with her own hands. This was her first job.',
+        history:'Luna was born into a not wealthy family. She studied hard since childhood and wanted to bring a prosperous life to her family with her own hands. This was her first job.',
         price:2000,
         nameImg:'xiaoning',
         spine:'mishu',