kaka 5 năm trước cách đây
mục cha
commit
87a337111e

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 151 - 173
assets/resources/game/prefab/game.prefab


+ 1 - 1
assets/script/game/component/BtnOpenPanel.ts

@@ -32,7 +32,7 @@ export default class BtnOpenPanel extends cc.Component {
     }
 
     private async openPanel() {
-        if(!mk.game.checkContinuousClick(this.node)){
+        if (!mk.game.checkContinuousClick(this.node)) {
             return;
         }
         mk.audio.playEffect("button");

+ 1 - 1
assets/script/game/data/GameData.ts

@@ -514,7 +514,7 @@ export enum DataEventId {
 export enum VideoAdType {
     Null = "",
     /** 关卡积分红包 */
-    LevelScoreRedBag = "关卡积分红包",
+    LevelScoreRedBag = "关卡消除红包",
     /** 主界面气泡红包 */
     StartQiPaoRedBag = "主界面气泡红包",
     /** 关卡气泡红包 */

+ 1 - 1
assets/script/game/game/Game.ts

@@ -272,7 +272,7 @@ export default class Game extends cc.Component {
 
     /**点击分享 */
     public onClickShare() {
-        mk.data.sendDataEvent(DataEventId.button_click, "互推icon");
+        mk.data.sendDataEvent(DataEventId.button_click, "邀请icon");
         if (!gData.loginData.isAuth) {
             // mk.tip.pop("请先点击头像,在设置界面授权");
             JsbSystem.WxAuth();

+ 7 - 2
assets/script/game/module/pigBank/PigBank.ts

@@ -84,7 +84,12 @@ export default class PigBank extends cc.Component {
     private clickCashOP() {
         mk.audio.playEffect("button");
         if (!gData.gameData.gameData.isWithdrawable) {
-            mk.tip.pop('明日可提现')
+            if (gData.gameData.gameData.piggyBank < gData.pigbank.cash_min_limit) {
+                mk.tip.pop('满' + (gData.pigbank.cash_min_limit / 100).toFixed(2) + '元可提现')
+            }
+            else {
+                mk.tip.pop('明日可提现')
+            }
             return;
         } else if (gData.gameData.gameData.piggyBank < gData.pigbank.cash_min_limit) {
             mk.tip.pop('满' + (gData.pigbank.cash_min_limit / 100).toFixed(2) + '元可提现')
@@ -94,7 +99,7 @@ export default class PigBank extends cc.Component {
             JsbSystem.WxAuth();
             return;
         }
-        mk.data.sendDataEvent(DataEventId.jarWithDrawal,"存钱罐提现成功");
+        mk.data.sendDataEvent(DataEventId.jarWithDrawal, "存钱罐提现成功");
         gData.pigbank.cashOP();
         mk.ui.closePanel(this.node.name);
     }

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


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
build/jsb-link/assets/resources/config.json


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
build/jsb-link/assets/resources/import/b4/b4dea4a9-29c8-46bc-a50d-5754afa7a2bd.json


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

@@ -193,8 +193,8 @@
       <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/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/buildConfig/androidTest/debug" 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" />

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

@@ -26,7 +26,7 @@ public class MyApplication extends Application {
 //        UMConfigure.setLogEnabled(true);
 
         UMSDKMgr.getInstance()._UMPREInit();
-
+        UMSDKMgr.getInstance()._UMSDKInit();
         UMSDKMgr.getInstance()._UMSDKStartAuto();
     }
 }

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

@@ -7724,7 +7724,7 @@ t.signWithDrawal = "signWithDrawal";
 })(n.DataEventId || (n.DataEventId = {}));
 (function(t) {
 t.Null = "";
-t.LevelScoreRedBag = "关卡积分红包";
+t.LevelScoreRedBag = "关卡消除红包";
 t.StartQiPaoRedBag = "主界面气泡红包";
 t.LevelQiPaoRedBag = "关卡气泡红包";
 t.Turntable = "转盘视频";
@@ -9181,7 +9181,7 @@ e.prototype.onClickFudai = function() {
 mk.data.sendDataEvent(u.DataEventId.button_click, "福袋icon");
 };
 e.prototype.onClickShare = function() {
-mk.data.sendDataEvent(u.DataEventId.button_click, "互推icon");
+mk.data.sendDataEvent(u.DataEventId.button_click, "邀请icon");
 gData.loginData.isAuth ? l.default.sharePic() : l.default.WxAuth();
 };
 a([ f({
@@ -14198,7 +14198,7 @@ if (gData.gameData.gameData.isWithdrawable) if (gData.gameData.gameData.piggyBan
 mk.data.sendDataEvent(l.DataEventId.jarWithDrawal, "存钱罐提现成功");
 gData.pigbank.cashOP();
 mk.ui.closePanel(this.node.name);
-} else s.default.WxAuth(); else mk.tip.pop("明日可提现");
+} else s.default.WxAuth(); else gData.gameData.gameData.piggyBank < gData.pigbank.cash_min_limit ? mk.tip.pop("满" + (gData.pigbank.cash_min_limit / 100).toFixed(2) + "元可提现") : mk.tip.pop("明日可提现");
 };
 e.prototype.clickOpenHelpCall = function() {
 return r(this, void 0, void 0, function() {

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

@@ -8,7 +8,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/"
     ],
-    "buildTime": 1627901105127,
-    "genTime": 1627901105127,
+    "buildTime": 1627981815962,
+    "genTime": 1627981815962,
     "genVersion": null
 }

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
packages-hot-update/manifest/project.manifest


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


Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác