dzduole 1 månad sedan
förälder
incheckning
a7245c6c39

+ 1 - 1
art/fgui/assets/game/UISkill/component/Component26.xml

@@ -2,7 +2,7 @@
 <component size="132,40" pivot="0.5,0.5" extention="Button" designImageLayer="1">
   <displayList>
     <image id="n11_qlo0" name="n11" src="hkrz3ta" fileName="_shareasset/ty_an1.png" xy="0,0" size="220,68" aspect="true" scale="0.6,0.6"/>
-    <text id="n30_qlo0" name="n30" xy="0,1" size="131,37" font="Arial" fontSize="19" color="#ffffff" align="center" vAlign="middle" leading="0" vars="true" autoSize="none" bold="true" text="Raise Lv {lan=1}"/>
+    <text id="n30_qlo0" name="n30" xy="0,1" size="131,37" font="Arial" fontSize="19" color="#ffffff" align="center" vAlign="middle" leading="0" vars="true" autoSize="none" bold="true" strokeColor="#000000" text="Raise Lv {lan=1}"/>
     <image id="n34_qlo0" name="n34" src="hkrz3te" fileName="_shareasset/1.png" xy="1,-1" size="18,12" aspect="true"/>
   </displayList>
   <Button downEffect="scale" downEffectValue="1.04"/>

+ 1 - 1
art/fgui/assets/game/UISkill/component/Component52.xml

@@ -2,7 +2,7 @@
 <component size="134,42" pivot="0.5,0.5" extention="Button">
   <displayList>
     <image id="n35_ihpy" name="n35" src="hkrz3tg" fileName="_shareasset/gf_an2.png" xy="0,0" size="134,42" aspect="true"/>
-    <text id="n36_ihpy" name="n36" xy="6,-3" size="122,43" font="Arial" fontSize="19" color="#ffffff" align="center" vAlign="middle" leading="1" autoSize="none" bold="true" text="Start"/>
+    <text id="n36_ihpy" name="n36" xy="6,-3" size="122,43" font="Arial" fontSize="19" color="#ffffff" align="center" vAlign="middle" leading="1" autoSize="none" bold="true" strokeColor="#000000" text="Start"/>
   </displayList>
   <Button downEffect="scale" downEffectValue="1.04"/>
 </component>

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


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

@@ -1376,12 +1376,7 @@
             this.templet = new Laya.Templet();
             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/nvmishu.sk');
-            }
-            else {
-                this.templet.loadAni(`spine/${name}.sk`);
-            }
+            this.templet.loadAni(`spine/${name}.sk`);
             this.templet.lock = true;
             this.spineName = name;
         }

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
client/laya/bin/js/bundle.js.map


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

@@ -12,13 +12,13 @@ export default class SpineMgr {
         this.templet.on(Laya.Event.ERROR, this, this.onError);
 
         //zh替换动画
-        if(name==='mishu'){
-            this.templet.loadAni('spine/nvmishu.sk');
-        }else{
-            this.templet.loadAni(`spine/${name}.sk`);
-        }
+        // if(name==='mishu'){
+        //     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;

Vissa filer visades inte eftersom för många filer har ändrats