Sync branch v2.1.3 to v2.2.0

murphy-yy · Aug 6, 2019 · cf0c954 · cf0c954
2 parents 74461ef + 8b9f080
commit cf0c954
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/assets/scripts/Tips/TipsManager.js b/assets/scripts/Tips/TipsManager.js
@@ -18,6 +18,7 @@ const isOPPO = cc.sys.platform === cc.sys.OPPO_GAME;
 const isXiaomi = cc.sys.platform === cc.sys.XIAOMI_GAME;
 const isHuawei = cc.sys.platform === cc.sys.HUAWEI_GAME;
 const isJkw = cc.sys.platform === cc.sys.JKW_GAME;
+const isAlipay = cc.sys.platform === cc.sys.ALIPAY_GAME;
 
 module.exports = {
     tispPrefab: null,
@@ -34,7 +35,7 @@ module.exports = {
             case 'TTFFontLabel':        return !isQQPlay;
             case 'Subpackages':
                 return (!CC_PREVIEW && !CC_JSB && !isBrowser && !isQQPlay && !isVivo && !isJkw);
-            case 'MousePropagation':    return ((isNative && !isMobile && !isWechat && !isQQPlay && !isXiaomi && !isHuawei) || isDesktopBrowser);
+            case 'MousePropagation':    return ((isNative && !isMobile && !isWechat && !isQQPlay && !isXiaomi && !isHuawei && !isAlipay) || isDesktopBrowser);
             case 'downloader-native':
                 return isNative && !CC_RUNTIME;
             // Not support the VIVO_GAME and OPPO_GAME
@@ -57,15 +58,15 @@ module.exports = {
             // Not support isMobile
             case 'KeyboardInput':
             case 'platform':
-                return !isMobile && !isWechat && !isBaidu && !isXiaomi && !isHuawei;
+                return !isMobile && !isWechat && !isBaidu && !isXiaomi && !isHuawei && !isAlipay;
 
             // Not support the Simulator, QQ_PLAY, WECHAT_GAME
             case 'videoPlayer':
-                return (isMobile || isBrowser) && !CC_RUNTIME && !isQQPlay && !isWechat && !isBaidu && !isXiaomi && !isHuawei;
+                return (isMobile || isBrowser) && !CC_RUNTIME && !isQQPlay && !isWechat && !isBaidu && !isXiaomi && !isHuawei && !isAlipay;
 
             // Not support the VIVO_GAME, OPPO_GAME, WECHAT_GAME, QQ_PLAY, CC_RUNTIME
             case 'webview':
-                return (isMobile || isBrowser) && !CC_RUNTIME && !isQQPlay && !isWechat && !isBaidu && !isXiaomi && !isHuawei;
+                return (isMobile || isBrowser) && !CC_RUNTIME && !isQQPlay && !isWechat && !isBaidu && !isXiaomi && !isHuawei && !isAlipay;
             case 'mesh':
                 return !isVivo && !isOPPO;
         }