fengcong пре 5 година
родитељ
комит
2e199bae0f

+ 1 - 0
assets/script/game/module/reward/Reward.ts

@@ -242,6 +242,7 @@ export default class Reward extends cc.Component {
     private clickGetReward() {
         cc.log('获取奖励:', gData.reward.data);
         gData.reward.flyCoinAnim();
+        this.onClickClose();
     }
 
     /**

+ 1 - 0
assets/script/mk/system/DataSystem.ts

@@ -15,6 +15,7 @@ export default class DataSystem {
      * @param des     事件内容
      */
     public sendDataEvent(eventId: string, des: string) {
+        console.log("===[DataSystem",eventId,des);
         if (eventId && des) {
             JsbSystem.sendEvent(eventId, des);
         }

BIN
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/release/EasyEliminate-release.apk


+ 3 - 0
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/AppActivity.java

@@ -25,6 +25,7 @@ THE SOFTWARE.
 package org.cocos2dx.javascript;
 
 import org.cocos2dx.javascript.thirdSdk.ThirdSdkMgr;
+import org.cocos2dx.javascript.thirdSdk.thinkingdata.TDSDKMgr;
 import org.cocos2dx.lib.Cocos2dxActivity;
 import org.cocos2dx.lib.Cocos2dxGLSurfaceView;
 
@@ -63,6 +64,8 @@ public class AppActivity extends Cocos2dxActivity {
         ThirdSdkMgr.appActivity = this;
         //注册到微信
         ThirdSdkMgr.regToWx();
+
+        TDSDKMgr.getInstance().initSdk(this);
     }
 
     @Override

+ 1 - 1
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/ad/SplashAdShowActivity.java

@@ -155,7 +155,7 @@ public class SplashAdShowActivity extends FragmentActivity implements ATSplashAd
         if (!hasHandleJump) {
             hasHandleJump = true;
             finish();
-            Toast.makeText(this, "start your MainActivity.", Toast.LENGTH_SHORT).show();
+//            Toast.makeText(this, "start your MainActivity.", Toast.LENGTH_SHORT).show();
         }
     }
 

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

@@ -4366,7 +4366,7 @@ if (0 != (t = e.sent()).errcode) return [ 2 ];
 console.log(t.data);
 if (t.data) {
 t.data.forEach(function(t) {
-for (var e in t) t[e] = parseInt(t[e]);
+for (var e in t) "withdrawalCode" != e && (t[e] = parseInt(t[e]));
 });
 this.list_data = t.data;
 this.initReceipTotalRMB();
@@ -5499,6 +5499,7 @@ value: !0
 var o = t("./JsbSystem"), i = function() {
 function t() {}
 t.prototype.sendDataEvent = function(t, e) {
+console.log("===[DataSystem", t, e);
 t && e && o.default.sendEvent(t, e);
 };
 return t;
@@ -7555,7 +7556,7 @@ get: function() {
 return this._piggyBank;
 },
 set: function(t) {
-if (this._piggyBank !== t) {
+if (this._piggyBank !== t && !(gData.gameData.gameData.isWithdrawable && t > 0)) {
 this._piggyBank = t;
 gData.gameData.init_coin = !0;
 gData.pigbank.init_data = !0;
@@ -11682,7 +11683,10 @@ if (gData.appData.getDeviceInfoCompelete) {
 this.login();
 gData.appData.getDeviceInfoCompelete = !1;
 } else if (gData.gameData.dataFinish) {
-if (gData.gameData.isNewPlayer()) mk.ui.openPanel("module/login/agreementTip"); else {
+if (1 != mk.storage.getStorage("agreementTip", !1)) {
+mk.ui.openPanel("module/login/agreementTip");
+mk.storage.setStorage("agreementTip", 1, !1);
+} else {
 mk.ui.openPanel("game/prefab/game");
 console.log("===[Jsbsystem 显示开屏广告================================");
 l.default.showSplash();
@@ -16591,6 +16595,7 @@ return [ 2 ];
 e.prototype.clickGetReward = function() {
 cc.log("获取奖励:", gData.reward.data);
 gData.reward.flyCoinAnim();
+this.onClickClose();
 };
 e.prototype.clickCashOut = function() {
 gData.reward.addReward();

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

@@ -7,7 +7,7 @@
         "http://",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/baseRemote/"
     ],
-    "buildTime": 1625197749282,
-    "genTime": 1625197749282,
+    "buildTime": 1625211314620,
+    "genTime": 1625211314620,
     "genVersion": null
 }