fix rotate

assets/scripts/GamePlay/HuController.ts

@@ -5,8 +5,6 @@ const { ccclass, property } = cc._decorator;
 
 @ccclass
 export default class HuController extends cc.Component {
-    @property(sp.Skeleton)
-    private spine2: sp.Skeleton = null;
 
     private _spine: sp.Skeleton = null;
     private _pointStart: cc.Vec2 = null;
@@ -27,7 +25,7 @@ export default class HuController extends cc.Component {
 
         this._spine.setCompleteListener(() => {
             console.log('setCompleteListener',)
-            this.setRotateAnim();
+            this.initBottle();
         });
 
         this.scheduleOnce(this.setDeviceMotion, 2);
@@ -35,40 +33,27 @@ export default class HuController extends cc.Component {
         this.initBottle();
     }
 
-    private onRotateGuild() {
-        this._spine.timeScale = 0.5;
-        this.scheduleOnce(() => {
-            this._track.trackTime = this._track.animationEnd / 4;
-            this._spine.timeScale = 0;
-        }, 1.2);
-    }
-
     private initBottle() {
-        this.setRotateAnim();
-        let state = this._spine.getState();
-        this._track = state.tracks[1];
-        this._track.trackTime = this._track.animationEnd / 4;
+        this._spine.setAnimation(1, "Rotate", false);
+        this._spine.timeScale = this._pointStart ? 0 : 0.5;
+        this._track = this._spine.getState().tracks[1];
         this._spine.timeScale = 0;
     }
 
     private onTouchStart(event: cc.Event.EventTouch): void {
         eventTarget.emit(STOP_GUILD_ROTATE);
 
-        // if (!this._pointStart) {
-        //     this.setRotateAnim();
-        // }
         this._pointStart = event.getLocation();
         this._spine.timeScale = 0;
     }
 
     private onTouchEnd(): void {
-        this.scheduleOnce(() => this._spine.timeScale = 0, 0.5);
-
-        let state = this._spine.getState();
-        let track = state.tracks[1];
-        if (track.trackTime < 0) {
-            track.trackTime = 0;
+        this.scheduleOnce(() => {
+            this._spine.timeScale = 0;
+            if (this._track.trackTime < 0) {
+                this._track.trackTime = this._track.animationEnd - 0.01;
             }
+        }, 0.5);
     }
 
     private onTouchMove(event: cc.Event.EventTouch): void {
@@ -83,9 +68,11 @@ export default class HuController extends cc.Component {
         this._spine.timeScale = distance > 0 ? -1 : 1;
     }
 
-    private setRotateAnim(): void {
-        this._spine.setAnimation(1, "Rotate", false);
-        this._spine.timeScale = this._pointStart ? 0 : 0.5;
+    private onRotateGuild() {
+        this._spine.timeScale = 0.5;
+        this.scheduleOnce(() => {
+            this._spine.timeScale = 0;
+        }, 1.2);
     }
 
     private setDeviceMotion() {