kaka 4 лет назад
Родитель
Сommit
a8aea82c99

+ 2 - 1
assets/resources/data/rule_data.json

@@ -258,6 +258,7 @@
 		"4、如用户对轻松连连消作弊行为判定及处罚等行为存有异议,应及时通过在线客服或发送邮件方式向轻松连连消申诉并提交充足证据证明其符合活动规则且不存在作弊或其他违反规则或用户协议的行为。最终用户是否构成作弊应以轻松连连消认定为准。 ",
 		"4、如用户对轻松连连消作弊行为判定及处罚等行为存有异议,应及时通过在线客服或发送邮件方式向轻松连连消申诉并提交充足证据证明其符合活动规则且不存在作弊或其他违反规则或用户协议的行为。最终用户是否构成作弊应以轻松连连消认定为准。 ",
 		"5、如用户发现软件存在漏洞,有义务向车神驾临及时通报,我们将视情况予以奖励。 ",
 		"5、如用户发现软件存在漏洞,有义务向车神驾临及时通报,我们将视情况予以奖励。 ",
 		"",
 		"",
-		"                开发者公司: 苏州白羊座信息科技有限公司"
+		"                开发者公司: 苏州白羊座信息科技有限公司",
+                                "                政策发布时间: 2021年8月5日"
 	]
 	]
 }
 }

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
assets/resources/module/login/hot/project.manifest


+ 2 - 2
assets/script/game/game/FunBtns.ts

@@ -22,12 +22,12 @@ export default class FunBtns extends cc.Component {
     btn8: cc.Node = null;
     btn8: cc.Node = null;
     @property({ type: cc.Node, displayName: "福利礼包" })
     @property({ type: cc.Node, displayName: "福利礼包" })
     btn9: cc.Node = null;
     btn9: cc.Node = null;
-    @property({ type: cc.Node, displayName: "金猪币按钮" })
-    btn_pigbank: cc.Node = null;
     @property({ type: cc.Node, displayName: "富翁银行按钮" })
     @property({ type: cc.Node, displayName: "富翁银行按钮" })
     btn10: cc.Node = null;
     btn10: cc.Node = null;
     @property({ type: cc.Node, displayName: "引导到微信" })
     @property({ type: cc.Node, displayName: "引导到微信" })
     btn11: cc.Node = null;
     btn11: cc.Node = null;
+    @property({ type: cc.Node, displayName: "金猪币按钮" })
+    btn_pigbank: cc.Node = null;
 
 
     onLoad() {
     onLoad() {
         gData.gameData.funBtns = this;
         gData.gameData.funBtns = this;

BIN
build/jsb-link/assets/main/index.jsc


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
build/jsb-link/assets/resources/config.json


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
build/jsb-link/assets/resources/import/b4/b4dea4a9-29c8-46bc-a50d-5754afa7a2bd.json


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
build/jsb-link/assets/resources/import/cc/cc34b721-8635-450d-a8c7-955c7db376ac.json


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
build/jsb-link/assets/resources/native/a8/a81eb395-718d-4f3b-958c-cb871f7dd5fa.manifest


BIN
build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/caches/build_file_checksums.ser


+ 1 - 1
build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/app/EasyEliminate.iml

@@ -301,7 +301,7 @@
     <orderEntry type="library" name="Gradle: ./app/libs/umeng/umeng-abtest-v1.0.0.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/umeng/umeng-abtest-v1.0.0.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/umeng/umeng-asms-armeabi-v1.2.3.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/umeng/umeng-asms-armeabi-v1.2.3.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/aliRisk/Android-AliyunDevice-10017.aar" level="project" />
     <orderEntry type="library" name="Gradle: ./app/libs/aliRisk/Android-AliyunDevice-10017.aar" level="project" />
-    <orderEntry type="library" name="Gradle: com.tencent.mm.opensdk:wechat-sdk-android-without-mta:6.7.9@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.tencent.mm.opensdk:wechat-sdk-android-without-mta:6.8.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.material:material:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.google.android.material:material:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.appcompat:appcompat:1.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.multidex:multidex:2.0.0@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.multidex:multidex:2.0.0@aar" level="project" />

+ 3 - 3
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/gradle.properties

@@ -1,4 +1,4 @@
-TF_CHANNEL="1";        //1 巨量 2 快手 3 广点通 5应用宝
+TF_CHANNEL="29";        //1 巨量 2 快手 3 广点通 5应用宝 22 oppo 29 羊毛党
 JL_AID="194376";       //巨量appid
 JL_AID="194376";       //巨量appid
 JL_CHANNEL="juliang";    //巨量渠道
 JL_CHANNEL="juliang";    //巨量渠道
 KS_AID="67132";        //快手appid
 KS_AID="67132";        //快手appid
@@ -10,7 +10,7 @@ UM_SECRET="";       //友盟秘钥
 WX_APP_ID="wx567b90447250bb4b"; //微信appidUM_CHANNEL
 WX_APP_ID="wx567b90447250bb4b"; //微信appidUM_CHANNEL
 MY_APP_NAME=\u8f7b\u677e\u8fde\u8fde\u6d88
 MY_APP_NAME=\u8f7b\u677e\u8fde\u8fde\u6d88
 PACKAGE_NAME=com.aries.qsllx.jsb
 PACKAGE_NAME=com.aries.qsllx.jsb
-VERSION_NAME=20.3.1
+VERSION_NAME=20.2.1
 VERSION_CODE=2
 VERSION_CODE=2
 TOPON="a61122520bc85e,66b742dd0e502b64d783d9c66a9d30c4,b61122545c7f0a,b61122558edd77,b6112259a01d73,b611225775fc83,b61122587984dd,b611225685f436"; //巨量渠道topon的 AppId,AppSecreate,激励视频,插屏,信息流,开屏,banner,全屏
 TOPON="a61122520bc85e,66b742dd0e502b64d783d9c66a9d30c4,b61122545c7f0a,b61122558edd77,b6112259a01d73,b611225775fc83,b61122587984dd,b611225685f436"; //巨量渠道topon的 AppId,AppSecreate,激励视频,插屏,信息流,开屏,banner,全屏
-APP_CONFIG_CODE="20.3.1"
+APP_CONFIG_CODE="20.2.1"

+ 1 - 1
build/jsb-link/frameworks/runtime-src/proj.android-studio/res/values/strings.xml

@@ -1,3 +1,3 @@
 <resources>
 <resources>
-    <string name="app_name" translatable="false">轻松连连消</string>
+    <string name="app_name" translatable="false">轻松连连消红包版</string>
 </resources>
 </resources>

+ 5 - 5
build/jsb-link/js backups (useful for debugging)/main.index.js

@@ -7525,9 +7525,9 @@ e.btn6 = null;
 e.btn7 = null;
 e.btn7 = null;
 e.btn8 = null;
 e.btn8 = null;
 e.btn9 = null;
 e.btn9 = null;
-e.btn_pigbank = null;
 e.btn10 = null;
 e.btn10 = null;
 e.btn11 = null;
 e.btn11 = null;
+e.btn_pigbank = null;
 return e;
 return e;
 }
 }
 e.prototype.onLoad = function() {
 e.prototype.onLoad = function() {
@@ -7603,16 +7603,16 @@ displayName: "福利礼包"
 }) ], e.prototype, "btn9", void 0);
 }) ], e.prototype, "btn9", void 0);
 i([ l({
 i([ l({
 type: cc.Node,
 type: cc.Node,
-displayName: "金猪币按钮"
-}) ], e.prototype, "btn_pigbank", void 0);
-i([ l({
-type: cc.Node,
 displayName: "富翁银行按钮"
 displayName: "富翁银行按钮"
 }) ], e.prototype, "btn10", void 0);
 }) ], e.prototype, "btn10", void 0);
 i([ l({
 i([ l({
 type: cc.Node,
 type: cc.Node,
 displayName: "引导到微信"
 displayName: "引导到微信"
 }) ], e.prototype, "btn11", void 0);
 }) ], e.prototype, "btn11", void 0);
+i([ l({
+type: cc.Node,
+displayName: "金猪币按钮"
+}) ], e.prototype, "btn_pigbank", void 0);
 return i([ s ], e);
 return i([ s ], e);
 }(cc.Component);
 }(cc.Component);
 n.default = u;
 n.default = u;

+ 2 - 2
packages-hot-update/cfg.json

@@ -19,7 +19,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/jsbRemote1/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/jsbRemote1/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/jsbRemote2/"
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/jsbRemote2/"
     ],
     ],
-    "buildTime": 1631526588258,
-    "genTime": 1631526588258,
+    "buildTime": 1631611107079,
+    "genTime": 1631611107079,
     "genVersion": null
     "genVersion": null
 }
 }

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
packages-hot-update/manifest/project.manifest


BIN
packages-hot-update/versions/ver_1_0.4.zip


Некоторые файлы не были показаны из-за большого количества измененных файлов