小秘書在抽獎和簽到頁面的修改

art/fgui/.objs/metas/isxx5ak7/bf9jv4jj.info

@@ -13,6 +13,5 @@
       "hidden": true
     }
   },
-  "adaptiveTest": true,
   "fitScreen": "FitSize"
 }

art/fgui/.objs/metas/isxx5ak7/kt443qc.info

@@ -5,22 +5,19 @@
       "locked": true,
       "hidden": true
     },
-    "n77_vhzh": {
-      "locked": true,
+    "n83_jpsz": {
       "hidden": true
     },
     "n84_jpsz": {
       "hidden": true
     },
-    "n83_jpsz": {
-      "hidden": true
-    },
     "n48_hxtr": {
       "locked": true,
       "hidden": true
     },
-    "n45_ixm4": {
-      "collapsed": true
+    "n77_vhzh": {
+      "locked": true,
+      "hidden": true
     }
   },
   "fitScreen": "FitSize",

art/fgui/.objs/workspace.json

@@ -8,44 +8,19 @@
   ],
   "libview.iconScale": 0,
   "doc.openedDocs": [
-    "ui://isxx5ak7uxuev4hs",
-    "ui://isxx5ak7p4tr42k",
-    "ui://isxx5ak7ehtov4gk",
-    "ui://isxx5ak7ehtov4gu",
-    "ui://isxx5ak7ehtov4gv"
+    "ui://isxx5ak7bf9jv4jj",
+    "ui://isxx5ak7wcn5v4ke"
   ],
-  "test.device": "iPhone Xs Max",
+  "test.device": "Huawei Mate20 Pro",
   "canvasColor": 10066329,
   "auxline2": true,
-  "doc.activeDoc": "ui://isxx5ak7ehtov4gv",
+  "doc.activeDoc": "ui://isxx5ak7wcn5v4ke",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
     "isxx5ak7",
     "/",
     "isxx5ak7",
-    "/UIAddProp/",
-    "isxx5ak7",
-    "/UIAddProp/component/",
-    "isxx5ak7",
-    "/UILevelSelect/",
-    "isxx5ak7",
-    "/UIMain/",
-    "isxx5ak7",
-    "/UIMatching/",
-    "isxx5ak7",
-    "/UIModeSelection/",
-    "isxx5ak7",
-    "/UIRepentProp/",
-    "isxx5ak7",
-    "/UIRodMethod/",
-    "isxx5ak7",
-    "/UIRodMethod/component/",
-    "isxx5ak7",
-    "/UISecretary/",
-    "isxx5ak7",
-    "/UISkill/",
-    "isxx5ak7",
-    "/UISkill/component/"
+    "/UIDraw/"
   ],
   "auxline1": true,
   "snapToGrid": true,

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

@@ -22,14 +22,13 @@
       <relation target="n4_wcn5" sidePair="center-center"/>
       <relation target="n1_wcn5" sidePair="top-top"/>
     </component>
-    <loader id="n46_wcn5" name="secretary" xy="720,82" size="626,951" scale="0.9,0.9" url="ui://isxx5ak7wehi3ut" clearOnPublish="true">
-      <relation target="" sidePair="right-right%"/>
-      <relation target="n1_wcn5" sidePair="bottom-bottom"/>
+    <loader id="n46_wcn5" name="secretary" xy="720,165" size="626,834" scale="0.7,0.7" url="ui://isxx5ak7wehi3ut" playing="false" clearOnPublish="true">
+      <relation target="" sidePair="left-center%,bottom-bottom"/>
     </loader>
     <component id="n51_iqrh" name="drawBtn" src="iqrhv4mt" fileName="_sharecomponent/drawBtn.xml" xy="580,630" controller="c1,9">
       <relation target="n4_wcn5" sidePair="center-center,top-bottom"/>
     </component>
-    <component id="n47_wcn5" name="talkNode" src="wcn5v4ld" fileName="UIDraw/component/UITurntable_com3.xml" xy="1045,60">
+    <component id="n47_wcn5" name="talkNode" src="wcn5v4ld" fileName="UIDraw/component/UITurntable_com3.xml" xy="1045,143">
       <relation target="n46_wcn5" sidePair="left-left,top-top"/>
     </component>
   </displayList>

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

@@ -2,24 +2,24 @@
 <component size="244,96">
   <controller name="c1" alias="设置" exported="true" pages="0,关闭,1,打开" selected="1"/>
   <displayList>
-    <image id="n4_mnrs" name="n4" src="mnrs42u" fileName="UIMain/asset/zy_sztb_4(1).png" xy="0,3" size="153,39">
+    <image id="n4_mnrs" name="n4" src="mnrs42u" fileName="UIMain/asset/zy_sztb_4(1).png" xy="0,28" size="153,39">
       <gearDisplay controller="c1" pages="1"/>
       <gearSize controller="c1" pages="1" values="153,39,1,1" default="6,39,1,1" tween="true"/>
     </image>
-    <component id="n1_mnrs" name="soundBtn" src="mnrs42s" fileName="UIMain/component/Component37.xml" xy="96,6" controller="c1,1">
+    <component id="n1_mnrs" name="soundBtn" src="mnrs42s" fileName="UIMain/component/Component37.xml" xy="96,31" controller="c1,1">
       <gearDisplay controller="c1" pages="1"/>
-      <gearXY controller="c1" pages="0,1" values="50,6|96,6" tween="true"/>
+      <gearXY controller="c1" pages="0,1" values="50,6|96,31" tween="true"/>
       <gearLook controller="c1" pages="0" values="0,0,0,1" default="1,0,0,1" tween="true"/>
     </component>
-    <component id="n2_mnrs" name="shakeBtn" src="mnrs42r" fileName="UIMain/component/Component36.xml" xy="147,6" controller="c1,0">
+    <component id="n2_mnrs" name="shakeBtn" src="mnrs42r" fileName="UIMain/component/Component36.xml" xy="156,31" controller="c1,0">
       <gearDisplay controller="c1" pages="0,1"/>
-      <gearXY controller="c1" pages="0,1" values="101,6|147,6" tween="true"/>
+      <gearXY controller="c1" pages="0,1" values="101,6|156,31" tween="true"/>
       <gearLook controller="c1" pages="0" values="0,0,0,1" default="1,0,0,1" tween="true"/>
     </component>
     <component id="n3_mnrs" name="clickNode" src="ixm43xt" fileName="UIMain/component/Component10.xml" xy="0,0"/>
-    <component id="n5_yjr4" name="xyBtn" src="yjr4v4m6" fileName="UIMain/component/Component127.xml" xy="204,8">
+    <component id="n5_yjr4" name="xyBtn" src="yjr4v4m6" fileName="UIMain/component/Component127.xml" xy="204,32">
       <gearDisplay controller="c1" pages="1"/>
-      <gearXY controller="c1" pages="0,1" values="161,8|204,8" tween="true"/>
+      <gearXY controller="c1" pages="0,1" values="161,8|204,32" tween="true"/>
       <gearLook controller="c1" pages="0" values="0,0,0,1" default="1,0,0,1" tween="true"/>
     </component>
   </displayList>

art/fgui/assets/game/UIMsg/Component59.xml

@@ -4,7 +4,7 @@
     <image id="n3_hkrz" name="n3" src="hkrz3rb" fileName="UIGame/asset/yy_db1.png" xy="-63,-3" pivot="0.5,0.5" size="650,55" alpha="0.6">
       <relation target="n1_hkrz" sidePair="width-width,center-center,middle-middle"/>
     </image>
-    <text id="n1_hkrz" name="msgTxt" xy="262,23" pivot="0.5,0.5" anchor="true" size="562,34" font="Arial" fontSize="24" color="#ffffff" align="center" vAlign="middle" leading="0" singleLine="true" text="对手开球成对手对手开=开=开=开=开=开=开=开=开="/>
+    <text id="n1_hkrz" name="msgTxt" xy="262,23" pivot="0.5,0.5" anchor="true" size="562,34" font="Arial" fontSize="24" color="#ffffff" align="center" vAlign="middle" leading="0" bold="true" strokeColor="#000000" singleLine="true" text="对手开球成对手对手开=开=开=开=开=开=开=开=开="/>
   </displayList>
   <transition name="t0" autoPlay="true">
     <item time="0" type="Alpha" target="n1_hkrz" tween="true" startValue="0" endValue="1" duration="12"/>

art/fgui/assets/game/UISign/UISign.xml

@@ -14,11 +14,10 @@
     <component id="n32_lj6t" name="moneyNode" src="wehi3ug" fileName="UIMoney/UIMoney.xml" xy="434,12" controller="c1,1">
       <relation target="n0_bf9j" sidePair="center-center,top-top"/>
     </component>
-    <loader id="n28_wcn5" name="secretary" xy="725,110" size="626,951" scale="0.9,0.9" url="ui://isxx5ak7wehi3ut" clearOnPublish="true">
-      <relation target="" sidePair="left-center%"/>
-      <relation target="n6_bf9j" sidePair="bottom-bottom"/>
+    <loader id="n28_wcn5" name="secretary" xy="768,102" size="626,926" scale="0.7,0.7" url="ui://isxx5ak7wehi3ut" align="right" clearOnPublish="true">
+      <relation target="" sidePair="left-center%,bottom-bottom"/>
     </loader>
-    <component id="n29_wcn5" name="talkNode" src="wcn5v4ka" fileName="UISign/component/Sign_com8.xml" xy="1054,83">
+    <component id="n29_wcn5" name="talkNode" src="wcn5v4ka" fileName="UISign/component/Sign_com8.xml" xy="1065,72">
       <relation target="n28_wcn5" sidePair="left-left,top-top"/>
     </component>
     <component id="n30_wcn5" name="tripleBtn" src="wehi3ue" fileName="_sharecomponent/cancelBtn2.xml" xy="83,608" size="239,73" scale="0.9,0.9" visible="false" controller="c1,5">

art/fgui/assets/game/UISign/component/Sign_com8.xml

@@ -2,7 +2,7 @@
 <component size="261,84">
   <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="29,9" pivot="-0.153,0.875" size="221,69" font="Arial" fontSize="20" color="#ffffff" vAlign="middle" autoSize="none" bold="true" strokeColor="#000000" text="I will also wait for you tomorrow"/>
+    <text id="n49_hxtr" name="womanTxt" xy="29,9" pivot="-0.153,0.875" size="221,69" font="ui://isxx5ak7d33kv57a" fontSize="20" color="#ffffff" vAlign="middle" autoSize="none" bold="true" strokeColor="#000000" text="I will also wait for you tomorrow"/>
   </displayList>
   <transition name="t0" options="2" autoPlay="true">
     <item time="0" type="Rotation" target="n48_hxtr" tween="true" startValue="0" endValue="-0.71" duration="30"/>

client/laya/bin/js/bundle.js

@@ -6908,7 +6908,6 @@
                             console.log('zh:判断是否可以玩该模式classic =NO');
                             let tipStr = 'You must complete ' + DataMgr.DIY_challengeMode_overLev_jieSuo_Classic + ' levels in Challenge Mode to unlock Classic Mode.';
                             xGame.uiMgr.Show(UIMsg, tipStr);
-                            console.log('zh:返回');
                             return;
                         }
                         else {
@@ -22323,7 +22322,6 @@
                             console.log('zh:判断是否可以玩该模式classic =NO');
                             let tipStr = 'You must complete ' + DataMgr.DIY_challengeMode_overLev_jieSuo_Classic + ' levels in Challenge Mode to unlock Classic Mode.';
                             xGame.uiMgr.Show(UIMsg$1, tipStr);
-                            console.log('zh:返回');
                             return;
                         }
                         else {

client/laya/src/fgui/core/UIMgr.ts

@@ -206,6 +206,7 @@ export default class UIMgr {
 	public showTip(msg: string, time: number = 600, size: number = 30) {
 		//TipsMgr.inst.showMsg(msg, time, size);
 	}
+
 }
 
 class UIShowList {

client/laya/src/ui/UIMain.ts

@@ -349,7 +349,6 @@ export default class UIMain extends UIBase {
                         console.log('zh:判断是否可以玩该模式classic =NO');
                         let tipStr = 'You must complete ' + DataMgr.DIY_challengeMode_overLev_jieSuo_Classic + ' levels in Challenge Mode to unlock Classic Mode.';
                         xGame.uiMgr.Show(UIMsg, tipStr);
-                        console.log('zh:返回');
                         return;
                     } else {
                         console.log('zh:可以玩该模式classic  66666666666666');