1

art/fgui/.objs/workspace.json

@@ -8,73 +8,23 @@
   ],
   "libview.iconScale": 0,
   "doc.openedDocs": [
-    "ui://isxx5ak7vhzhv4hq",
-    "ui://isxx5ak7c50vv4y6",
-    "ui://isxx5ak7qlo041r",
-    "ui://isxx5ak7qlo041s",
-    "ui://isxx5ak7qlo041t",
-    "ui://isxx5ak7qlo041w",
-    "ui://isxx5ak7ihpy43t",
-    "ui://isxx5ak7gg0z444",
-    "ui://isxx5ak7gg0z445",
-    "ui://isxx5ak7wp26456",
-    "ui://isxx5ak7g1giv4ed",
-    "ui://isxx5ak7m2h4v4e8",
-    "ui://isxx5ak7qlo041q",
-    "ui://isxx5ak7uqohv4m3",
-    "ui://isxx5ak7jaakv55x",
-    "ui://isxx5ak7j69a40z",
-    "ui://isxx5ak7mnrs431",
-    "ui://isxx5ak7mnrs42z",
-    "ui://isxx5ak7i4k243i",
-    "ui://isxx5ak7hkrz3tj"
+    "ui://isxx5ak7erstv4nt",
+    "ui://isxx5ak7erstv4nl",
+    "ui://isxx5ak7erstv4ny",
+    "ui://isxx5ak7erstv4nx"
   ],
   "test.device": "iPhone Xs Max",
   "canvasColor": 10066329,
   "auxline2": true,
-  "doc.activeDoc": "ui://isxx5ak7i4k243i",
+  "doc.activeDoc": "ui://isxx5ak7erstv4nx",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
     "isxx5ak7",
     "/",
     "isxx5ak7",
-    "/UIMain/",
+    "/UIBox/",
     "isxx5ak7",
-    "/UIMain/component/",
-    "isxx5ak7",
-    "/UIMsg/",
-    "isxx5ak7",
-    "/UIPower/",
-    "isxx5ak7",
-    "/UIPower/component/",
-    "isxx5ak7",
-    "/UISecretary/",
-    "isxx5ak7",
-    "/UISign/",
-    "isxx5ak7",
-    "/UISign/component/",
-    "isxx5ak7",
-    "/UISkill/",
-    "isxx5ak7",
-    "/UISkill/UITry/",
-    "isxx5ak7",
-    "/UISkill/UITry/Component/",
-    "isxx5ak7",
-    "/UISkill/UITry/component/",
-    "isxx5ak7",
-    "/UISkill/component/",
-    "isxx5ak7",
-    "/UITips/",
-    "isxx5ak7",
-    "/UITips/component/",
-    "isxx5ak7",
-    "/UIWordsList/",
-    "isxx5ak7",
-    "/UIWordsList/UIVideoShare/",
-    "isxx5ak7",
-    "/_exportasset/",
-    "isxx5ak7",
-    "/_shareasset/"
+    "/UIBox/component/"
   ],
   "auxline1": true,
   "snapToGrid": true,

art/fgui/assets/game/UIGameEnd/component/Component97.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="648,80">
-  <controller name="c1" alias="结算" exported="true" pages="0,chenggong,1,shibai,2,完美过关,3,过关,4,闯关失败" selected="0"/>
+  <controller name="c1" alias="结算" exported="true" pages="0,chenggong,1,shibai,2,完美过关,3,过关,4,闯关失败" selected="4"/>
   <displayList>
     <image id="n46_g1gi" name="n46" src="wehi3ub" fileName="UIGameEnd/asset/js_bz1.png" xy="0,0" pivot="0.5,0.5" size="648,80"/>
-    <component id="n48_g1gi" name="diamondNode" src="p4tr41y" fileName="UIGameEnd/component/Component30.xml" xy="255,8" controller="c1,0"/>
-    <component id="n49_g1gi" name="coinNode" src="p4tr41z" fileName="UIGameEnd/component/Component30_1.xml" xy="380,8" controller="c1,0"/>
+    <component id="n48_g1gi" name="diamondNode" src="p4tr41y" fileName="UIGameEnd/component/Component30.xml" xy="231,8" controller="c1,0"/>
+    <component id="n49_g1gi" name="coinNode" src="p4tr41z" fileName="UIGameEnd/component/Component30_1.xml" xy="385,8" controller="c1,0"/>
   </displayList>
   <transition name="t0" autoPlay="true">
     <item time="0" type="Alpha" target="n46_g1gi" tween="true" startValue="0" endValue="1" duration="24"/>

client/laya/bin/fileconfig.json

@@ -1 +1 @@
-{"spine/images/mishu.json":["spine/images/mishu/",[]]}
+{}

client/laya/bin/js/bundle.js

@@ -1376,7 +1376,12 @@
             this.templet = new Laya.Templet();
             this.templet.on(Laya.Event.COMPLETE, this, this.parseComplete);
             this.templet.on(Laya.Event.ERROR, this, this.onError);
-            this.templet.loadAni(`spine/${name}.sk`);
+            if (name === 'mishu') {
+                this.templet.loadAni('spine/mishu.sk');
+            }
+            else {
+                this.templet.loadAni(`spine/${name}.sk`);
+            }
             this.templet.lock = true;
             this.spineName = name;
         }

client/laya/bin/spine/images/mishu.atlas

@@ -1,83 +0,0 @@
-
-mishu.png
-size: 1837,638
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-biyan_you
-  rotate: false
-  xy: 64, 38
-  size: 42, 33
-  orig: 43, 33
-  offset: 0, 0
-  index: -1
-biyan_zuo
-  rotate: false
-  xy: 1714, 155
-  size: 50, 31
-  orig: 52, 32
-  offset: 1, 1
-  index: -1
-qiugan
-  rotate: true
-  xy: 731, 170
-  size: 466, 660
-  orig: 466, 660
-  offset: 0, 0
-  index: -1
-renwu
-  rotate: true
-  xy: 2, 73
-  size: 563, 727
-  orig: 563, 727
-  offset: 0, 0
-  index: -1
-toufa01
-  rotate: false
-  xy: 1714, 303
-  size: 121, 333
-  orig: 121, 333
-  offset: 0, 0
-  index: -1
-toufa02
-  rotate: true
-  xy: 1144, 29
-  size: 139, 225
-  orig: 139, 225
-  offset: 0, 0
-  index: -1
-toufa03
-  rotate: true
-  xy: 731, 15
-  size: 153, 411
-  orig: 153, 411
-  offset: 0, 0
-  index: -1
-toufa04
-  rotate: false
-  xy: 1393, 2
-  size: 319, 634
-  orig: 319, 634
-  offset: 0, 0
-  index: -1
-xingxing1
-  rotate: false
-  xy: 2, 10
-  size: 60, 61
-  orig: 68, 68
-  offset: 3, 3
-  index: -1
-xingxing2
-  rotate: false
-  xy: 1714, 188
-  size: 112, 113
-  orig: 120, 123
-  offset: 2, 4
-  index: -1
-xingxing3
-  rotate: false
-  xy: 1714, 188
-  size: 112, 113
-  orig: 120, 123
-  offset: 2, 4
-  index: -1

client/laya/bin/spine/images/mishu.json

@@ -1,51 +0,0 @@
-{
-"skeleton": { "images": "images/" },
-"bones": [
-	{ "name": "root" }
-],
-"slots": [
-	{ "name": "toufa04", "bone": "root", "attachment": "toufa04" },
-	{ "name": "renwu", "bone": "root", "attachment": "renwu" },
-	{ "name": "toufa03", "bone": "root", "attachment": "toufa03" },
-	{ "name": "toufa02", "bone": "root", "attachment": "toufa02" },
-	{ "name": "toufa01", "bone": "root", "attachment": "toufa01" },
-	{ "name": "qiugan", "bone": "root", "attachment": "qiugan" },
-	{ "name": "xingxing3", "bone": "root", "attachment": "xingxing3" },
-	{ "name": "xingxing2", "bone": "root", "attachment": "xingxing2", "color": "ffffffb3" },
-	{ "name": "xingxing1", "bone": "root", "attachment": "xingxing1" }
-],
-"skins": {
-	"default": {
-		"xingxing1": {
-			"xingxing1": {"x": 215,"y": 459,"width": 68,"height": 68 }
-		},
-		"xingxing2": {
-			"xingxing2": {"x": 385,"y": 818.5,"width": 120,"height": 123 }
-		},
-		"xingxing3": {
-			"xingxing3": {"x": 701,"y": 552.5,"width": 120,"height": 123 }
-		},
-		"qiugan": {
-			"qiugan": {"x": 545,"y": 492,"width": 466,"height": 660 }
-		},
-		"toufa01": {
-			"toufa01": {"x": 457.5,"y": 702.5,"width": 121,"height": 333 }
-		},
-		"toufa02": {
-			"toufa02": {"x": 587.5,"y": 759.5,"width": 139,"height": 225 }
-		},
-		"toufa03": {
-			"toufa03": {"x": 588.5,"y": 681.5,"width": 153,"height": 411 }
-		},
-		"renwu": {
-			"renwu": {"x": 483.5,"y": 525.5,"width": 563,"height": 727 }
-		},
-		"toufa04": {
-			"toufa04": {"x": 449.5,"y": 496,"width": 319,"height": 634 }
-		}
-	}
-},
-"animations":{
-	"animation": {}
-}
-}

client/laya/bin/spine/mishu.atlas

@@ -1,83 +0,0 @@
-
-mishu.png
-size: 1837,638
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-biyan_you
-  rotate: false
-  xy: 64, 38
-  size: 42, 33
-  orig: 43, 33
-  offset: 0, 0
-  index: -1
-biyan_zuo
-  rotate: false
-  xy: 1714, 155
-  size: 50, 31
-  orig: 52, 32
-  offset: 1, 1
-  index: -1
-qiugan
-  rotate: true
-  xy: 731, 170
-  size: 466, 660
-  orig: 466, 660
-  offset: 0, 0
-  index: -1
-renwu
-  rotate: true
-  xy: 2, 73
-  size: 563, 727
-  orig: 563, 727
-  offset: 0, 0
-  index: -1
-toufa01
-  rotate: false
-  xy: 1714, 303
-  size: 121, 333
-  orig: 121, 333
-  offset: 0, 0
-  index: -1
-toufa02
-  rotate: true
-  xy: 1144, 29
-  size: 139, 225
-  orig: 139, 225
-  offset: 0, 0
-  index: -1
-toufa03
-  rotate: true
-  xy: 731, 15
-  size: 153, 411
-  orig: 153, 411
-  offset: 0, 0
-  index: -1
-toufa04
-  rotate: false
-  xy: 1393, 2
-  size: 319, 634
-  orig: 319, 634
-  offset: 0, 0
-  index: -1
-xingxing1
-  rotate: false
-  xy: 2, 10
-  size: 60, 61
-  orig: 68, 68
-  offset: 3, 3
-  index: -1
-xingxing2
-  rotate: false
-  xy: 1714, 188
-  size: 112, 113
-  orig: 120, 123
-  offset: 2, 4
-  index: -1
-xingxing3
-  rotate: false
-  xy: 1714, 188
-  size: 112, 113
-  orig: 120, 123
-  offset: 2, 4
-  index: -1

client/laya/bin/spine/nvmishu.atlas

@@ -1,83 +0,0 @@
-
-nvmishu.png
-size: 2048,1024
-format: RGBA8888
-filter: Linear,Linear
-repeat: none
-biyan_you
-  rotate: false
-  xy: 1356, 641
-  size: 43, 33
-  orig: 43, 33
-  offset: 0, 0
-  index: -1
-biyan_zuo
-  rotate: false
-  xy: 567, 315
-  size: 52, 32
-  orig: 52, 32
-  offset: 0, 0
-  index: -1
-qiugan
-  rotate: false
-  xy: 567, 349
-  size: 466, 660
-  orig: 466, 660
-  offset: 0, 0
-  index: -1
-renwu
-  rotate: false
-  xy: 2, 282
-  size: 563, 727
-  orig: 563, 727
-  offset: 0, 0
-  index: -1
-toufa01
-  rotate: false
-  xy: 1356, 676
-  size: 121, 333
-  orig: 121, 333
-  offset: 0, 0
-  index: -1
-toufa02
-  rotate: false
-  xy: 1479, 784
-  size: 139, 225
-  orig: 139, 225
-  offset: 0, 0
-  index: -1
-toufa03
-  rotate: true
-  xy: 2, 127
-  size: 153, 411
-  orig: 153, 411
-  offset: 0, 0
-  index: -1
-toufa04
-  rotate: false
-  xy: 1035, 375
-  size: 319, 634
-  orig: 319, 634
-  offset: 0, 0
-  index: -1
-xingxing1
-  rotate: false
-  xy: 415, 212
-  size: 68, 68
-  orig: 68, 68
-  offset: 0, 0
-  index: -1
-xingxing2
-  rotate: false
-  xy: 2, 2
-  size: 120, 123
-  orig: 120, 123
-  offset: 0, 0
-  index: -1
-xingxing3
-  rotate: false
-  xy: 2, 2
-  size: 120, 123
-  orig: 120, 123
-  offset: 0, 0
-  index: -1

client/laya/src/core/mgrs/SpineMgr.ts

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

client/laya/src/ui/UISecretary.ts

@@ -35,7 +35,7 @@ export default class UISecretary extends UIBase {
         this.updateData();
     }
     addSecretarySpine(node: fgui.GLoader, spineName) {
-        if (spineName == "mishu") {
+        if (spineName == "mishu") {        
             //小宁
             if (this.secretarySpine1) {
                 node.displayObject.destroyChildren();