fix tween custom easing property (#8321)

cocos · Mar 4, 2021 · 30d27a6 · 30d27a6
1 parent e9a7bea
commit 30d27a6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/cocos/tween/export-api.ts b/cocos/tween/export-api.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/ban-types */
 /*
  Copyright (c) 2020 Xiamen Yaji Software Co., Ltd.
 
@@ -35,7 +36,7 @@
   * 内置缓动函数的字符串值定义。
   */
 export type TweenEasing =
-'linear'    | 'smooth'     | 'fade'         |
+'linear'    | 'smooth'     | 'fade'         | 'constant'     |
 'quadIn'    | 'quadOut'    | 'quadInOut'    | 'quadOutIn'    |
 'cubicIn'   | 'cubicOut'   | 'cubicInOut'   | 'cubicOutIn'   |
 'quartIn'   | 'quartOut'   | 'quartInOut'   | 'quartOutIn'   |

diff --git a/cocos/tween/set-action.ts b/cocos/tween/set-action.ts
@@ -36,6 +36,7 @@ export class SetAction extends ActionInstant {
     constructor (props?: any) {
         super();
         this._props = {};
+        // eslint-disable-next-line @typescript-eslint/no-unused-expressions
         props !== undefined && this.init(props);
     }
 

diff --git a/cocos/tween/tween-action.ts b/cocos/tween/tween-action.ts
@@ -139,21 +139,21 @@ export class TweenAction extends ActionInterval {
             let value = props[name];
             if (value == null || typeof value === 'string' || typeof value === 'function') continue;
             // property may have custom easing or progress function
-            let easing: any; let progress: any;
+            let customEasing: any; let progress: any;
             if (value.value !== undefined && (value.easing || value.progress)) {
                 if (typeof value.easing === 'string') {
-                    easing = easing[value.easing];
-                    if (!easing) warnID(1031, value.easing);
+                    customEasing = easing[value.easing];
+                    if (!customEasing) warnID(1031, value.easing);
                 } else {
-                    easing = value.easing;
+                    customEasing = value.easing;
                 }
                 progress = value.progress;
                 value = value.value;
             }
 
             const prop = Object.create(null);
             prop.value = value;
-            prop.easing = easing;
+            prop.easing = customEasing;
             prop.progress = progress;
             this._props[name] = prop;
         }