dzduole 1 tháng trước cách đây
mục cha
commit
9b439fd120

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

@@ -7,22 +7,22 @@
     "/"
   ],
   "libview.iconScale": 0,
-  "doc.openedDocs": [],
+  "doc.openedDocs": [
+    "ui://isxx5ak7wcn5v4ke",
+    "ui://isxx5ak7wcn5v4ld"
+  ],
   "test.device": "iPhone Xs Max",
   "canvasColor": 10066329,
   "auxline2": true,
+  "doc.activeDoc": "ui://isxx5ak7wcn5v4ke",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
     "isxx5ak7",
     "/",
     "isxx5ak7",
-    "/UIAddProp/",
-    "isxx5ak7",
-    "/UISecretary/",
-    "isxx5ak7",
-    "/UISecretary/component/",
+    "/UIDraw/",
     "isxx5ak7",
-    "/__示意图/"
+    "/UIDraw/component/"
   ],
   "auxline1": true,
   "snapToGrid": true,

+ 1 - 1
art/fgui/assets/game/UIDraw/component/UITurntable_com3.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" leading="0" autoSize="none" bold="true" 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="Arial" fontSize="20" color="#ffffff" vAlign="middle" leading="0" 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"/>

+ 2 - 2
art/fgui/assets/game/UIMain/component/Component60.xml

@@ -2,8 +2,8 @@
 <component size="261,84">
   <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"/>
-    <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!">
+    <image id="n48_hxtr" name="n48" src="brgy3uu" fileName="UIGameEnd/asset/zs4.png" xy="0,-20" pivot="0,0.842" size="261,108"/>
+    <text id="n49_hxtr" name="womanTxt" xy="24,-14" pivot="-0.153,0.875" size="231,98" font="Arial" fontSize="20" color="#ffffff" vAlign="middle" leading="0" 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>

BIN
art/fgui/assets/game/UISkill/asset/gf_jn1.png


BIN
art/fgui/assets/game/UISkill/asset/gf_jn2.png


BIN
art/fgui/assets/game/UISkill/asset/gf_jn4.png


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


BIN
client/laya/bin/asset/fgui/game_atlas0.png


+ 1 - 1
client/laya/bin/js/bundle.js

@@ -1377,7 +1377,7 @@
             this.templet.on(Laya.Event.COMPLETE, this, this.parseComplete);
             this.templet.on(Laya.Event.ERROR, this, this.onError);
             if (name === 'mishu') {
-                this.templet.loadAni('spine/mishu.sk');
+                this.templet.loadAni('spine/nvmishu.sk');
             }
             else {
                 this.templet.loadAni(`spine/${name}.sk`);

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
client/laya/bin/js/bundle.js.map


+ 6 - 2
client/laya/src/core/mgrs/SpineMgr.ts

@@ -10,12 +10,16 @@ export default class SpineMgr {
         this.templet = new Laya.Templet();
         this.templet.on(Laya.Event.COMPLETE, this, this.parseComplete);
         this.templet.on(Laya.Event.ERROR, this, this.onError);
+
+        //zh替换动画
         if(name==='mishu'){
-            this.templet.loadAni('spine/mishu.sk');
+            this.templet.loadAni('spine/nvmishu.sk');
         }else{
             this.templet.loadAni(`spine/${name}.sk`);
         }
-        //this.templet.loadAni(`spine/${name}.sk`);
+        
+        //this.templet.loadAni(`spine/${name}.sk`);   //原先的代码
+
         this.templet.lock = true;
         this.spineName = name;
     }

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác