dzduole 1 月之前
父節點
當前提交
5f7d02d58a

+ 0 - 3
art/fgui/.objs/metas/isxx5ak7/trk948w.info

@@ -3,9 +3,6 @@
     "n27_trk9": {
       "locked": true,
       "hidden": true
-    },
-    "n9_p4tr": {
-      "collapsed": true
     }
   }
 }

+ 2 - 6
art/fgui/.objs/workspace.json

@@ -7,14 +7,10 @@
     "/"
   ],
   "libview.iconScale": 0,
-  "doc.openedDocs": [
-    "ui://isxx5ak7wcn5v4ke",
-    "ui://isxx5ak7wcn5v4ld"
-  ],
+  "doc.openedDocs": [],
   "test.device": "iPhone Xs Max",
   "canvasColor": 10066329,
   "auxline2": true,
-  "doc.activeDoc": "ui://isxx5ak7wcn5v4ke",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
     "isxx5ak7",
@@ -22,7 +18,7 @@
     "isxx5ak7",
     "/UIDraw/",
     "isxx5ak7",
-    "/UIDraw/component/"
+    "/UIWordsList/"
   ],
   "auxline1": true,
   "snapToGrid": true,

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

+ 2 - 2
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="0"/>
+  <controller name="c1" alias="按钮" exported="true" pages="0,取消,1,不悔球,2,下次一定" selected="1"/>
   <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" strokeColor="#000000" text="Cancel">
+    <text id="n1_hkrz" name="n1" xy="0,1" size="164,48" font="Arial" fontSize="22" color="#ffffff" align="center" vAlign="middle" leading="1" autoSize="none" bold="true" strokeColor="#000000" text="No-regret shot">
       <gearText controller="c1" pages="0,1,2" values="Cancel|No-regret shot|Next time"/>
     </text>
   </displayList>

+ 4 - 4
art/fgui/assets/game/_sharecomponent/shareBtn.xml

@@ -1,18 +1,18 @@
 <?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="5"/>
+  <controller name="c1" alias="小按钮" exported="true" pages="0,分享,1,拿来吧你,2,退出,3,悔球,4,使用,5,继续,12,充满体力,13,立即体验,14,确定" selected="3"/>
   <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" strokeColor="#000000" text="悔球">
+    <text id="n1_hkrz" name="n1" xy="14,0" size="164,48" font="Arial" fontSize="22" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" strokeColor="#000000" text="undo a shot">
       <gearDisplay controller="c1" pages="0,3,4"/>
-      <gearXY controller="c1" pages="3,4" values="14,-1|23,3" default="0,3"/>
+      <gearXY controller="c1" pages="3,4" values="14,0|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" 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="19,14" pivot="0.5,0.5" size="28,20" aspect="true">
+    <image id="n4_p4tr" name="n4" src="hkrz3te" fileName="_shareasset/1.png" xy="1,15" 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>

二進制
client/laya/bin/asset/fgui/game.obj