Merge branch 'dev_6.6.4_战令'

# Conflicts: # common/src/main/res/values-en-rUS/string.xml # common/src/main/res/values-zh-rHK/strings.xml # common/src/main/res/values-zh-rTW/strings.xml # common/src/main/res/values-zh/strings.xml # common/src/main/res/values/strings.xml # config.gradle
2024-01-05 14:00:39 +08:00
parent f697e650a8 4a5e581978
commit 43d1abbae0
185 changed files with 5907 additions and 710 deletions
--- a/config.gradle
+++ b/config.gradle
@@ -20,11 +20,11 @@ ext {

            baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S",

-//            true表示谷歌支付 false    0 链接包   1 谷歌包   2华为包  3 samsung包
-            isGooglePlay     : 3,
+//            true表示谷歌支付 false    0 链接包   1 谷歌包   2华为包
+            isGooglePlay     : 0,
            //是否上报异常日志
            isUploadLog      : true,
            //是否打包成插件包模式
-            isPluginModel    : false,
+            isPluginModel    : true,
    ]
 }