diff --git a/assets/Game/prefabs/Icon/Icon1.prefab b/assets/Game/prefabs/Icon/Icon1.prefab index 49c0b50..f3d6ca0 100644 --- a/assets/Game/prefabs/Icon/Icon1.prefab +++ b/assets/Game/prefabs/Icon/Icon1.prefab @@ -239,10 +239,7 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": { - "__uuid__": "7b015c97-60ec-4ce8-bdf3-3dce8e615665", - "__expectedType__": "cc.SpriteAtlas" - }, + "_atlas": null, "_id": "" }, { diff --git a/assets/Game/prefabs/IconWinSpine/winSpine.prefab b/assets/Game/prefabs/IconWinSpine/winSpine.prefab index d9871ab..0b69a0f 100644 --- a/assets/Game/prefabs/IconWinSpine/winSpine.prefab +++ b/assets/Game/prefabs/IconWinSpine/winSpine.prefab @@ -69,7 +69,7 @@ "__id__": 1 }, "_children": [], - "_active": false, + "_active": true, "_components": [ { "__id__": 3 @@ -165,7 +165,7 @@ "__expectedType__": "sp.SkeletonData" }, "defaultSkin": "default", - "defaultAnimation": "", + "defaultAnimation": "anim1", "_premultipliedAlpha": false, "_timeScale": 1, "_preCacheMode": 0, diff --git a/assets/Game/scripts/game/Icon.ts b/assets/Game/scripts/game/Icon.ts index 47573c9..3294904 100644 --- a/assets/Game/scripts/game/Icon.ts +++ b/assets/Game/scripts/game/Icon.ts @@ -431,11 +431,10 @@ export class Icon extends Component { this.iconSpine.clearTracks(); this.iconSpine.setCompleteListener(null); if (this._iconId == 0) { - this.iconSpine.setAnimation(0, 'win', true); + this.iconSpine.setAnimation(0, 'win', false); } else if (this._iconId == 1) { - this.iconSpine.setAnimation(0, 'win_1', true); + this.iconSpine.setAnimation(0, 'win_1', false); } - this.iconSpine.setAnimation(0, 'win_1', false); } } else if (this.iconSpine && this.iconSpine.node) { // this.iconSpine.node.active = true; @@ -565,6 +564,7 @@ export class Icon extends Component { if (this._isWildOrScatter) { // this.iconSpine.setAnimation(0, 'spawn_1', false); // this.iconSpine.setCompleteListener(() => { + // this.iconSpine.node.active = true; if (!this.iconSpine) return; if (this._iconId == 0) { this.iconSpine.setAnimation(0, 'idle', true); @@ -596,9 +596,9 @@ export class Icon extends Component { this.iconSpine.clearTracks(); this.iconSpine.setCompleteListener(null); if (this._iconId == 0) { - this.iconSpine.setAnimation(0, 'idle', true); + this.iconSpine.setAnimation(0, 'idle', false); } else if (this._iconId == 1) { - this.iconSpine.setAnimation(0, 'idle_1', true); + this.iconSpine.setAnimation(0, 'idle_1', false); } } else if (this.iconSpine) { this.iconSpine.node.active = false; diff --git a/assets/Loading/game.scene b/assets/Loading/game.scene index d6cba68..1b21e5a 100644 --- a/assets/Loading/game.scene +++ b/assets/Loading/game.scene @@ -2788,13 +2788,13 @@ "__prefab": null, "_contentSize": { "__type__": "cc.Size", - "width": 174.24000549316406, - "height": 522.280029296875 + "width": 266.489990234375, + "height": 355.0199890136719 }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 0.49988519127737446, - "y": 0.5001339833091739 + "x": 0.4957034445734158, + "y": 0.539406247327176 }, "_id": "5eCOl9iDBOqrx+o9MzHH/Q" }, @@ -2819,11 +2819,11 @@ "a": 255 }, "_skeletonData": { - "__uuid__": "c4c5d54b-a1e3-4eba-b866-11cc9129f20c", + "__uuid__": "4dae9577-b214-4e57-94ad-2f1e9d7c24ed", "__expectedType__": "sp.SkeletonData" }, "defaultSkin": "default", - "defaultAnimation": "anim3", + "defaultAnimation": "idle_1", "_premultipliedAlpha": false, "_timeScale": 1, "_preCacheMode": 0, @@ -2834,7 +2834,7 @@ "_debugBones": false, "_debugSlots": false, "_enableBatch": false, - "loop": false, + "loop": true, "_id": "ab7skyMJ5L9pSQgJ0kmqWb" }, {