1
0
dzduole 1 сар өмнө
parent
commit
a77353b0e5

+ 3 - 2
art/fgui/.objs/metas/isxx5ak7/kt443qc.info

@@ -1,10 +1,12 @@
 {
   "objectStatus": {
     "n76_vhzh": {
-      "collapsed": true,
       "locked": true,
       "hidden": true
     },
+    "n46_ixm4": {
+      "collapsed": true
+    },
     "n84_jpsz": {
       "hidden": true
     },
@@ -13,7 +15,6 @@
       "hidden": true
     },
     "n77_vhzh": {
-      "collapsed": true,
       "locked": true,
       "hidden": true
     }

+ 7 - 29
art/fgui/.objs/workspace.json

@@ -8,50 +8,28 @@
   ],
   "libview.iconScale": 0,
   "doc.openedDocs": [
-    "ui://isxx5ak7kt443qc",
-    "ui://isxx5ak7ixm43xh",
-    "ui://isxx5ak7ixm43xi"
+    "ui://isxx5ak7kt443qc"
   ],
   "test.device": "iPhone Xs Max",
   "canvasColor": 10066329,
   "auxline2": true,
-  "doc.activeDoc": "ui://isxx5ak7ixm43xi",
+  "doc.activeDoc": "ui://isxx5ak7kt443qc",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
     "isxx5ak7",
     "/",
     "isxx5ak7",
-    "/UIMain/",
-    "isxx5ak7",
-    "/UIRepentProp/",
-    "isxx5ak7",
-    "/UIRepentProp/component/",
-    "isxx5ak7",
-    "/UIRodMethod/",
-    "isxx5ak7",
-    "/UIRodMethod/component/",
-    "isxx5ak7",
-    "/UISecretary/",
+    "/UIGame/",
     "isxx5ak7",
-    "/UISign/",
+    "/UIGame/component/",
     "isxx5ak7",
-    "/UISign/component/",
-    "isxx5ak7",
-    "/UISkill/",
-    "isxx5ak7",
-    "/UISkill/component/",
-    "isxx5ak7",
-    "/UITips/",
-    "isxx5ak7",
-    "/UITips/component/",
+    "/UIMain/",
     "isxx5ak7",
-    "/UIWordsList/",
+    "/UIMsg/",
     "isxx5ak7",
     "/_exportasset/",
     "isxx5ak7",
-    "/_sharecomponent/",
-    "isxx5ak7",
-    "/windows/"
+    "/_shareasset/"
   ],
   "auxline1": true,
   "snapToGrid": true,

+ 4 - 4
art/fgui/assets/game/UIGame/component/Component100.xml

@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="275,101">
-  <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="n75_g1gi" name="n75" src="g1giv4ev" fileName="UIGame/asset/yxz_dhk1.png" xy="127,0">
       <relation target="" sidePair="center-center"/>
     </image>
-    <image id="n76_g1gi" name="n76" src="g1giv4ew" fileName="UIGame/asset/yxz_dhk2.png" xy="-185,15" pivot="0.5,0" size="645,52">
+    <image id="n76_g1gi" name="n76" src="g1giv4ew" fileName="UIGame/asset/yxz_dhk2.png" xy="-88,15" pivot="0.5,0" size="451,86">
       <gearDisplay controller="c1" pages="1"/>
       <gearSize controller="c1" pages="0,1" values="451,86,1,1|645,52,1,1"/>
       <relation target="n77_g1gi" sidePair="width-width,center-center"/>
       <relation target="" sidePair="center-center"/>
     </image>
-    <image id="n80_brwt" name="n80" src="g1giv4ew" fileName="UIGame/asset/yxz_dhk2.png" xy="98,15" pivot="0.5,0" size="79,52">
+    <image id="n80_brwt" name="n80" src="g1giv4ew" fileName="UIGame/asset/yxz_dhk2.png" xy="93,15" pivot="0.5,0" size="89,86">
       <gearDisplay controller="c1" pages="0"/>
       <gearSize controller="c1" pages="0,1" values="89,86,1,1|79,52,1,1"/>
       <relation target="" sidePair="center-center"/>
     </image>
-    <text id="n77_g1gi" name="txt" xy="-174,30" size="624,29" fontSize="20" color="#78a3d0" align="center" vAlign="middle" text="哈哈哈,涛哥代码敲得好辣鸡涛哥代码敲得好辣鸡涛哥代码敲得好辣鸡">
+    <text id="n77_g1gi" name="txt" xy="-174,30" size="624,29" font="Arial" fontSize="20" color="#78a3d0" align="center" vAlign="middle" text="哈哈哈,涛哥代码敲得好辣鸡涛哥代码敲得好辣鸡涛哥代码敲得好辣鸡">
       <gearDisplay controller="c1" pages="1"/>
       <relation target="" sidePair="center-center"/>
     </text>

+ 1 - 1
art/fgui/assets/game/UIGame/component/Component113.xml

@@ -4,7 +4,7 @@
     <image id="n85_r5f8" name="n85" src="r5f8v4hu" fileName="UIGame/asset2/xsyd_bk.png" xy="481,191" pivot="0.5,0.5" size="372,66">
       <relation target="" sidePair="center-center,top-top%"/>
     </image>
-    <text id="n86_r5f8" name="n86" xy="501,211" pivot="0.5,0.5" size="332,30" fontSize="21" color="#ffffff" align="center" vAlign="middle" leading="2" letterSpacing="1" text="Now try fine-tuning the angle">
+    <text id="n86_r5f8" name="n86" xy="514,211" pivot="0.5,0.5" size="306,30" font="Arial" fontSize="21" color="#ffffff" align="center" vAlign="middle" leading="2" letterSpacing="1" text="Now try fine-tuning the angle">
       <relation target="" sidePair="center-center"/>
       <relation target="n85_r5f8" sidePair="middle-middle"/>
     </text>

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

@@ -25,7 +25,7 @@
       <relation target="" sidePair="center-center,top-top%"/>
     </image>
     <image id="n56_hxtr" name="n56" src="n0xy3yc" fileName="UIMatching/asset/pp_dk3.png" xy="352,619" size="630,58" group="n59_hxtr"/>
-    <text id="n58_hxtr" name="n58" xy="483,626" size="358,42" group="n59_hxtr" fontSize="26" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="game will start soon"/>
+    <text id="n58_hxtr" name="n58" xy="483,626" size="358,42" group="n59_hxtr" font="Arial" fontSize="26" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="game will start soon"/>
     <group id="n59_hxtr" name="n59" xy="352,619" size="630,58" advanced="true">
       <relation target="" sidePair="center-center,bottom-bottom%"/>
     </group>

+ 2 - 2
art/fgui/assets/game/UIMsg/Component59.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="524,44">
   <displayList>
-    <image id="n3_hkrz" name="n3" src="hkrz3rb" fileName="UIGame/asset/yy_db1.png" xy="-81,-3" pivot="0.5,0.5" size="686,55" alpha="0.6">
+    <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="598,34" 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" 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/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="#093f8b" align="center" vAlign="middle" autoSize="none" text="Restore 2 points of stamina"/>
+    <text id="n24_trk9" name="n24" xy="113,96" size="376,39" font="Arial" 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="1" autoSize="none" bold="true" text="Tip"/>
+    <text id="n12_p4tr" name="titleTxt" xy="194,14" size="215,54" font="Arial" 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">

+ 1 - 1
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="18,371" size="565,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!"/>
+    <text id="n27_trk9" name="n27" xy="18,371" size="565,26" font="Arial" 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=""/>

+ 4 - 4
art/fgui/assets/game/UISkill/component/skillItem_1.xml

@@ -5,15 +5,15 @@
     <image id="n31_qlo0" name="n31" src="qlo041d" fileName="UISkill/asset/gf_k2.png" xy="0,0" size="543,220">
       <gearDisplay controller="c1" pages="1"/>
     </image>
-    <image id="n6_qlo0" name="n6" src="qlo041c" fileName="UISkill/asset/gf_k1.png" xy="0,0" size="543,220">
+    <image id="n6_qlo0" name="n6" src="qlo041c" fileName="UISkill/asset/gf_k1.png" xy="1,0" size="543,220">
       <gearDisplay controller="c1" pages="0"/>
     </image>
     <loader id="n33_tumi" name="skillImg" xy="8,43" size="136,137" url="ui://isxx5ak7qlo0417" autoSize="true" clearOnPublish="true"/>
-    <text id="n24_qlo0" name="nameTxt" xy="3,3" size="192,32" fontSize="22" color="#ffffff" vAlign="middle" autoSize="none" text="Fall from the sky"/>
-    <text id="n25_qlo0" name="levelTxt" xy="211,3" size="95,32" fontSize="22" color="#696b80" vAlign="middle" vars="true" autoSize="none" text="Lv.{ganfa=1}"/>
+    <text id="n24_qlo0" name="nameTxt" xy="3,3" size="192,32" font="Arial" fontSize="22" color="#ffffff" vAlign="middle" autoSize="none" text="Fall from the sky"/>
+    <text id="n25_qlo0" name="levelTxt" xy="211,3" size="95,32" font="Arial" fontSize="22" color="#696b80" vAlign="middle" vars="true" autoSize="none" text="Lv.{ganfa=1}"/>
     <image id="n28_qlo0" name="n28" src="qlo041f" fileName="UISkill/asset/gf_k4.png" xy="148,46" size="374,81"/>
     <text id="n29_qlo0" name="describeTxt" xy="163,53" size="349,79" fontSize="19" color="#696b80" autoSize="none" text="跳杆击球后,球高高跃起,砸在桌面上,直接打进我方除黑八外需进的下一颗球。"/>
-    <text id="n32_qlo0" name="n32" xy="160,190" size="362,22" fontSize="14" color="#ffffff" autoSize="none" bold="true" text="You get one additional ball with each level-up."/>
+    <text id="n32_qlo0" name="n32" xy="160,190" size="362,22" font="Arial" fontSize="14" color="#ffffff" autoSize="none" bold="true" text="You get one additional ball with each level-up."/>
     <text id="n38_lp3l" name="maxTxt" xy="311,150" size="46,22" fontSize="14" color="#696b80" text="已满级"/>
     <component id="n12_qlo0" name="mutiBtn" src="qlo041t" fileName="UISkill/component/Component28.xml" xy="268,138" group="n34_wji1" visible="false"/>
     <component id="n11_qlo0" name="normalBtn" src="qlo041r" fileName="UISkill/component/Component26.xml" xy="268,138" group="n34_wji1"/>

+ 1 - 1
art/fgui/assets/loading/UILoading.xml

@@ -11,7 +11,7 @@
     <image id="n13_hkrz" name="n13" src="hkrz1s" fileName="assets/logo.png" xy="419,89" size="496,200" group="n18_ghnw">
       <relation target="" sidePair="center-center,top-top%"/>
     </image>
-    <text id="n4_g4jo" name="txtLoad" xy="292,599" size="750,36" group="n18_ghnw" font="FangSong" fontSize="26" color="#ffffff" align="center" letterSpacing="6" autoSize="none" bold="true" strokeColor="#000000" text="Loading...">
+    <text id="n4_g4jo" name="txtLoad" xy="292,599" size="750,36" group="n18_ghnw" font="Arial" fontSize="26" color="#ffffff" align="center" letterSpacing="6" autoSize="none" bold="true" strokeColor="#000000" text="Loading...">
       <relation target="" sidePair="center-center"/>
       <relation target="n13_hkrz" sidePair=""/>
     </text>

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