diff --git a/assets/Game/scripts/game/Icon.ts b/assets/Game/scripts/game/Icon.ts index d4d018e..9024185 100644 --- a/assets/Game/scripts/game/Icon.ts +++ b/assets/Game/scripts/game/Icon.ts @@ -371,6 +371,7 @@ export class Icon extends Component { this.showFastIcon(false); if (this._isWildOrScatter) { if (this.index == 0 && this.lHeight > 1) { + this.iconSpine.timeScale = 1 this.iconSpine.setAnimation(0, `${this.lHeight}_3`, false) this.iconSpine.setCompleteListener(() => { this.iconSpine.setAnimation(0, `${this.lHeight}_1`, true) @@ -402,6 +403,7 @@ export class Icon extends Component { this._normalSpriteNode && (this._normalSpriteNode.active = false); this.iconSpine.clearTracks(); this.iconSpine.setCompleteListener(null); + this.iconSpine.timeScale = 1.3 this.iconSpine.setAnimation(0, `${this.lHeight}_2`, false); } } else if (this.iconSpine && this.iconSpine.node) { @@ -416,6 +418,7 @@ export class Icon extends Component { this.iconSpine.setCompleteListener(() => { this.iconSpine.setCompleteListener(null); if (this._isWildOrScatter) { + this.iconSpine.timeScale = 1 this.iconSpine.setAnimation(0, `${this.lHeight}_1`, true); } else { this.iconSpine.clearTracks(); @@ -455,6 +458,7 @@ export class Icon extends Component { if (!this.iconSpine) return; if (this._isWildOrScatter) { + this.iconSpine.timeScale = 1 this.iconSpine.setAnimation(0, `${this.lHeight}_1`, true); } else if (this._isQKJ) { this.iconSpine.setAnimation(0, "animation", false); @@ -480,6 +484,7 @@ export class Icon extends Component { this._normalSpriteNode && (this._normalSpriteNode.active = false); this.iconSpine.clearTracks(); this.iconSpine.setCompleteListener(null); + this.iconSpine.timeScale = 1 this.iconSpine.setAnimation(0, `${this.lHeight}_1`, true); } else if (this.iconSpine) { this.iconSpine.node.active = false; diff --git a/assets/Loading/game.scene b/assets/Loading/game.scene index 14ad038..585bb8f 100644 --- a/assets/Loading/game.scene +++ b/assets/Loading/game.scene @@ -23,7 +23,7 @@ "_active": true, "_components": [], "_prefab": { - "__id__": 89 + "__id__": 92 }, "_lpos": { "__type__": "cc.Vec3", @@ -54,7 +54,7 @@ }, "autoReleaseAssets": false, "_globals": { - "__id__": 90 + "__id__": 93 }, "_id": "6c29a3fe-b10e-44a5-98e3-55595b231767" }, @@ -84,21 +84,24 @@ }, { "__id__": 82 + }, + { + "__id__": 85 } ], "_active": true, "_components": [ - { - "__id__": 85 - }, - { - "__id__": 86 - }, - { - "__id__": 87 - }, { "__id__": 88 + }, + { + "__id__": 89 + }, + { + "__id__": 90 + }, + { + "__id__": 91 } ], "_prefab": null, @@ -3137,7 +3140,7 @@ "defaultSkin": "default", "defaultAnimation": "2_2", "_premultipliedAlpha": false, - "_timeScale": 1, + "_timeScale": 1.3, "_preCacheMode": 0, "_cacheMode": 0, "_sockets": [], @@ -3149,6 +3152,115 @@ "loop": true, "_id": "f3bzODMMVGBLnOXpQyaalG" }, + { + "__type__": "cc.Node", + "_name": "Node-001", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 2 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 86 + }, + { + "__id__": 87 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": 765.471, + "y": -553.126, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "44H75ggXNKeJ/qTT+KtgVA" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 85 + }, + "_enabled": true, + "__prefab": null, + "_contentSize": { + "__type__": "cc.Size", + "width": 172, + "height": 144.74000549316406 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.4265579614157381 + }, + "_id": "2dKnDoK4FIxY9yqtByqEib" + }, + { + "__type__": "sp.Skeleton", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 85 + }, + "_enabled": true, + "__prefab": null, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_skeletonData": { + "__uuid__": "42f1f6b3-4778-4c39-9023-82684d81ef9b", + "__expectedType__": "sp.SkeletonData" + }, + "defaultSkin": "default", + "defaultAnimation": "xiaoshi", + "_premultipliedAlpha": false, + "_timeScale": 1, + "_preCacheMode": 0, + "_cacheMode": 0, + "_sockets": [], + "_useTint": false, + "_debugMesh": false, + "_debugBones": false, + "_debugSlots": false, + "_enableBatch": false, + "loop": true, + "_id": "d2uYUnJzhFmKSXvsgOBZdP" + }, { "__type__": "cc.UITransform", "_name": "", @@ -3262,29 +3374,29 @@ { "__type__": "cc.SceneGlobals", "ambient": { - "__id__": 91 - }, - "shadows": { - "__id__": 92 - }, - "_skybox": { - "__id__": 93 - }, - "fog": { "__id__": 94 }, - "octree": { + "shadows": { "__id__": 95 }, - "skin": { + "_skybox": { "__id__": 96 }, - "lightProbeInfo": { + "fog": { "__id__": 97 }, - "postSettings": { + "octree": { "__id__": 98 }, + "skin": { + "__id__": 99 + }, + "lightProbeInfo": { + "__id__": 100 + }, + "postSettings": { + "__id__": 101 + }, "bakedWithStationaryMainLight": false, "bakedWithHighpLightmap": false },