修复签到问题

assets/script/game/data/AppData.ts

@@ -36,7 +36,7 @@ export class AppData {
     /** 安卓版本号 */
     public androidVersion: string = '';
 
-    public mac: string = '1e:06:e5:13:b3:23,f6:60:e4:1a:b7:27';
+    public mac: string = '1e:06:e5:13:b3:55,f6:65:e4:1a:b7:27';
 
     /** 设备信息 */
     public machineInfo = {

assets/script/game/data/HttpData.ts

@@ -5,7 +5,7 @@
 export class HttpData {
 
     /** 服务器类型 0测试服 1正式服 2李扬服 3悍国服 */
-    public serverType: number = 1;
+    public serverType: number = 0;
 
     public getServerUrl(): string {
         switch (this.serverType) {

assets/script/game/data/module/PigBankData.ts

@@ -32,7 +32,7 @@ export class PigBankData extends Data {
     public async cashOP() {
         let response = await mk.http.sendData('piggyBankCash', {});
         if (response.errcode != 0) {
-            mk.tip.pop('检测到数据异常，请多看视频后再试')
+            mk.tip.pop('提现排队中，多看视频优先提现')
             return;
         }
 

assets/script/game/data/module/RedBagCashData.ts

@@ -62,7 +62,7 @@ export class RedBagCashData extends Data {
         if (response.errcode != 0) {
             // mk.tip.pop(response.errmsg);
             console.error(response.errmsg);
-            mk.tip.pop('检测到数据异常，请多看视频后再试');
+            mk.tip.pop('提现排队中，多看视频优先提现');
             mk.console.logSingle('提现index', cash_index);
             mk.console.logSingle('提现错误内容：', response);
             return;

assets/script/game/data/module/SignData.ts

@@ -107,38 +107,26 @@ export class SignData extends Data {
      */
     public async signComplete() {
         cc.log('签到奖励', gData.sign.adData)
-        gData.gameData.gameData.signInDay++;
-        gData.gameData.gameData.isSignInToday = 1;
-        // // 自定义状态
-        // let new_data = [
-        //     {
-        //         key: GameProp.sign_can,
-        //         value: gData.gameData.gameData.isSignInToday
-        //     },
-        //     {
-        //         key: GameProp.sign_last_bar,
-        //         value: this.sign_last_bar
-        //     }
-        // ]
-        // gData.gameData.setProps(new_data);
         // 奖励展示
-        let reward_data = this.c_sign[gData.gameData.gameData.signInDay - 1];
+        let reward_data = this.c_sign[gData.gameData.gameData.signInDay];
         if (reward_data.rewardType === RewardType.redBag) {
             // 红包
-            // gData.reward.data = [reward_data];// 数据列表
-            // gData.reward.data = gData.sign.adData.videoRedMoney.videoRewardList[0];
             gData.reward.adData = gData.sign.adData;
             mk.ui.openPanel('module/reward/reward')
         } else if (reward_data.rewardType === RewardType.rmb) {
             const adData = gData.sign.adData;// adData下一帧被清空，此处需要保存数据
 
             // 现金提现
-            // let response = await mk.http.sendRequest('readyCash', 'POST', JSON.stringify(data));
             let response = await mk.http.sendData('readyCash', {});
 
             if (response.errcode != 0) {
-                mk.tip.pop('系统异常');
-                // return;
+                if (response.errcode == 41002) {
+                    mk.tip.pop('提现排队中，多看视频优先提现');
+                }
+                else {
+                    mk.tip.pop(response.errmsg);
+                }
+                return;
             }
 
             if (response.CashMode == 0) {//星云打款
@@ -152,13 +140,12 @@ export class SignData extends Data {
             gData.cashNormal.getRecord();// 请求新的提现记录
         } else if (reward_data.rewardType === RewardType.pigRmb) {
             // 金猪现金
-            // gData.reward.data = [{ rewardNum: reward_data.rewardNum, rewardType: reward_data.rewardType }]
-            // gData.reward.data = gData.sign.adData.data.videoRewardList[0];
             gData.reward.adData = gData.sign.adData;
             mk.ui.openPanel('module/reward/reward');
         }
 
-        // 获得奖励
+        gData.gameData.gameData.signInDay++;
+        gData.gameData.gameData.isSignInToday = 1;
     }
 
     /**

assets/script/game/module/cashPro/CashPro.ts

@@ -92,7 +92,7 @@ export default class CashPro extends cc.Component {
     tixianFail() {
         console.log('tixianFail  ')
         this.loadPart.active = false
-        mk.tip.pop('检测到数据异常，请多看视频后再试')
+        mk.tip.pop('提现排队中，多看视频优先提现')
         mk.ui.closePanel(this.node.name)
     }
 

assets/script/game/module/login/Login.ts

@@ -31,7 +31,13 @@ export default class Login extends cc.Component {
         if (mk.storage.getStorage("alifengkong") == 1) {
             return;
         }
-        mk.aliRiskManager.init();
+
+        if (CC_DEBUG) {
+            mk.aliRiskManager.getRiskCode = true;
+        }
+        else {
+            mk.aliRiskManager.init();
+        }
 
         this.init();
     }
@@ -142,6 +148,8 @@ export default class Login extends cc.Component {
     //发送请求整包更新
     public async getForceVersionInfo() {
         if (CC_DEBUG) {
+            gData.appData.appId = "wxcf31f0e54f7fefda";
+            gData.appData.version = "1.0.0";
             gData.appData.tfChannel = "1";
             gData.appData.appVersion = "1.0.0";
         }

build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/modules/1786486690/libcocos2dx.iml

@@ -33,16 +33,16 @@
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/java/src" isTestSource="false" />
     </content>
     <content url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx">
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/rs/debug" type="java-resource" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/resValues/debug" type="java-resource" generated="true" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
       <sourceFolder url="file://D:/CocosCreatorIDE/CocosDashboard/resources/.editors/Creator/2.4.5/resources/cocos2d-x/cocos/platform/android/libcocos2dx/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />

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

@@ -187,16 +187,16 @@
       <sourceFolder url="file://$MODULE_DIR$/../../../../Classes" isTestSource="false" />
     </content>
     <content url="file://$MODULE_DIR$/../../../app">
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/rs/debug" type="java-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/debug" type="java-resource" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/../../../app/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/aliRisk/AliRiskManager.java

@@ -15,7 +15,7 @@ import org.cocos2dx.javascript.AppActivity;
  * 阿里风控管理类
  */
 public class AliRiskManager {
-    private static final String userAppKey = "5a651f6201384196d5840e78c6d63a5e";
+    private static final String userAppKey = "38ad875e38bea654272bcefc51fc5cac";
 
     //单例模式
     private static AliRiskManager mInstance = null;

build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/thinkingdata/TDSDKMgr.java

@@ -25,7 +25,7 @@ public class TDSDKMgr {
         return mInstace;
     }
 
-    private final String TA_APP_ID = "38ad875e38bea654272bcefc51fc5cac";
+    private final String TA_APP_ID = "ee451573e55144548a0f128467c7f0f7";
     private final String TA_SERVER_URL = "https://taapi.mokagm.com/";
     private ThinkingAnalyticsSDK TDInstance = null;