kaka 5 anni fa
parent
commit
c84a8df19f
26 ha cambiato i file con 50 aggiunte e 37 eliminazioni
  1. 0 0
      assets/resources/module/login/hot/project.manifest
  2. 1 1
      assets/resources/module/login/hot/version.manifest
  3. 1 1
      assets/script/game/data/HttpData.ts
  4. 1 1
      build/jsb-link/.cocos-project.json
  5. BIN
      build/jsb-link/assets/main/index.jsc
  6. 0 0
      build/jsb-link/assets/resources/config.json
  7. 0 0
      build/jsb-link/assets/resources/import/4c/4c49ec9e-c64a-4921-84eb-9bdd737656e5.json
  8. 0 0
      build/jsb-link/assets/resources/import/b4/b4dea4a9-29c8-46bc-a50d-5754afa7a2bd.json
  9. 1 1
      build/jsb-link/assets/resources/native/9e/9ed98385-f23f-41b7-a2bc-27a1d4ad9fd6.manifest
  10. 0 0
      build/jsb-link/assets/resources/native/a8/a81eb395-718d-4f3b-958c-cb871f7dd5fa.manifest
  11. 3 3
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/AndroidManifest.xml
  12. 3 3
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/com/aries/qsllx/jsb/wxapi/WXEntryActivity.java
  13. 1 1
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/AppActivity.java
  14. 2 2
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/ThirdSdkMgr.java
  15. 2 2
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/ad/SplashAdShowActivity.java
  16. 0 2
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/aliRisk/AliRiskManager.java
  17. 1 1
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/umeng/UMSDKMgr.java
  18. 0 1
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/util/DeviceUtil.java
  19. 1 1
      build/jsb-link/frameworks/runtime-src/proj.ios_mac/ios/Info.plist
  20. 1 1
      build/jsb-link/frameworks/runtime-src/proj.ios_mac/mac/Info.plist
  21. 25 10
      build/jsb-link/js backups (useful for debugging)/main.index.js
  22. 5 4
      packages-hot-update/cfg.json
  23. 0 0
      packages-hot-update/manifest/project.manifest
  24. 1 1
      packages-hot-update/manifest/version.manifest
  25. BIN
      packages-hot-update/versions/ver_1_0.0.zip
  26. 1 1
      settings/builder.json

File diff suppressed because it is too large
+ 0 - 0
assets/resources/module/login/hot/project.manifest


+ 1 - 1
assets/resources/module/login/hot/version.manifest

@@ -1 +1 @@
-{"version":"1.0.0","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/version.manifest"}
+{"version":"1.0.0","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/jsbRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/jsbRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/jsbRemote/version.manifest"}

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

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

+ 1 - 1
build/jsb-link/.cocos-project.json

@@ -3,5 +3,5 @@
   "has_native": true,
   "project_type": "js",
   "projectName": "EasyEliminate",
-  "packageName": "com.aries.qsllx.mz"
+  "packageName": "com.aries.qsllx.jsb"
 }

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


File diff suppressed because it is too large
+ 0 - 0
build/jsb-link/assets/resources/config.json


File diff suppressed because it is too large
+ 0 - 0
build/jsb-link/assets/resources/import/4c/4c49ec9e-c64a-4921-84eb-9bdd737656e5.json


File diff suppressed because it is too large
+ 0 - 0
build/jsb-link/assets/resources/import/b4/b4dea4a9-29c8-46bc-a50d-5754afa7a2bd.json


+ 1 - 1
build/jsb-link/assets/resources/native/9e/9ed98385-f23f-41b7-a2bc-27a1d4ad9fd6.manifest

@@ -1 +1 @@
-{"version":"1.0.0","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/version.manifest"}
+{"version":"1.0.0","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/jsbRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/jsbRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/jsbRemote/version.manifest"}

File diff suppressed because it is too large
+ 0 - 0
build/jsb-link/assets/resources/native/a8/a81eb395-718d-4f3b-958c-cb871f7dd5fa.manifest


+ 3 - 3
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.aries.qsllx.mz"
+    package="com.aries.qsllx.jsb"
     android:installLocation="auto">
 
     <uses-feature android:glEsVersion="0x00020000" />
@@ -48,11 +48,11 @@
         </activity>
 
         <activity
-            android:name="com.aries.qsllx.mz.wxapi.WXEntryActivity"
+            android:name="com.aries.qsllx.jsb.wxapi.WXEntryActivity"
             android:label="@string/app_name"
             android:theme="@android:style/Theme.Translucent.NoTitleBar"
             android:exported="true"
-            android:taskAffinity="com.aries.qsllx.mz"
+            android:taskAffinity="com.aries.qsllx.jsb"
             android:launchMode="singleTask">
         </activity>
 

+ 3 - 3
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/com/aries/qsllx/mz/wxapi/WXEntryActivity.java → build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/com/aries/qsllx/jsb/wxapi/WXEntryActivity.java

@@ -1,4 +1,4 @@
-package com.aries.qsllx.mz.wxapi;
+package com.aries.qsllx.jsb.wxapi;
 
 import android.app.Activity;
 import android.app.ProgressDialog;
@@ -14,8 +14,8 @@ import android.widget.Toast;
 
 //import org.cocos2dx.javascript.thridSdk.ThirdSdkMgr;
 
-import com.aries.qsllx.mz.BuildConfig;
-import com.aries.qsllx.mz.R;
+import com.aries.qsllx.jsb.BuildConfig;
+import com.aries.qsllx.jsb.R;
 import com.tencent.mm.opensdk.modelbase.BaseReq;
 import com.tencent.mm.opensdk.modelbase.BaseResp;
 import com.tencent.mm.opensdk.modelmsg.SendAuth;

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

@@ -47,7 +47,7 @@ import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 import androidx.core.content.FileProvider;
 
-import com.aries.qsllx.mz.BuildConfig;
+import com.aries.qsllx.jsb.BuildConfig;
 
 import java.io.File;
 

+ 2 - 2
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/ThirdSdkMgr.java

@@ -17,8 +17,8 @@ import org.cocos2dx.javascript.thirdSdk.umeng.UMSDKMgr;
 import org.cocos2dx.javascript.util.DeviceUtil;
 import org.cocos2dx.lib.Cocos2dxJavascriptJavaBridge;
 
-import com.aries.qsllx.mz.BuildConfig;
-import com.aries.qsllx.mz.wxapi.WXEntryActivity;
+import com.aries.qsllx.jsb.BuildConfig;
+import com.aries.qsllx.jsb.wxapi.WXEntryActivity;
 
 public class ThirdSdkMgr {
 

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

@@ -19,8 +19,8 @@ import com.anythink.core.api.ATMediationRequestInfo;
 import com.anythink.core.api.AdError;
 import com.anythink.splashad.api.ATSplashAd;
 import com.anythink.splashad.api.ATSplashAdListener;
-import com.aries.qsllx.mz.BuildConfig;
-import com.aries.qsllx.mz.R;
+import com.aries.qsllx.jsb.BuildConfig;
+import com.aries.qsllx.jsb.R;
 
 import org.cocos2dx.javascript.thirdSdk.ThirdSdkMgr;
 

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

@@ -2,8 +2,6 @@ package org.cocos2dx.javascript.thirdSdk.aliRisk;
 
 import android.util.Log;
 
-import com.aries.qsllx.mz.wxapi.WXEntryActivity;
-
 import net.security.device.api.SecurityCode;
 import net.security.device.api.SecurityDevice;
 import net.security.device.api.SecurityInitListener;

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

@@ -4,7 +4,7 @@ import android.app.Application;
 import android.content.Context;
 import android.util.Log;
 
-import com.aries.qsllx.mz.BuildConfig;
+import com.aries.qsllx.jsb.BuildConfig;
 import com.umeng.analytics.MobclickAgent;
 import com.umeng.commonsdk.UMConfigure;
 

+ 0 - 1
build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/util/DeviceUtil.java

@@ -13,7 +13,6 @@ import android.telephony.TelephonyManager;
 import android.util.Log;
 import android.widget.Toast;
 
-import com.aries.qsllx.mz.R;
 
 import org.cocos2dx.javascript.thirdSdk.oaid.OaidHelper;
 

+ 1 - 1
build/jsb-link/frameworks/runtime-src/proj.ios_mac/ios/Info.plist

@@ -11,7 +11,7 @@
     <key>CFBundleIcons~ipad</key>
     <dict/>
     <key>CFBundleIdentifier</key>
-    <string>com.aries.qsllx.mz</string>
+    <string>com.aries.qsllx.jsb</string>
     <key>CFBundleInfoDictionaryVersion</key>
     <string>6.0</string>
     <key>CFBundleName</key>

+ 1 - 1
build/jsb-link/frameworks/runtime-src/proj.ios_mac/mac/Info.plist

@@ -9,7 +9,7 @@
 	<key>CFBundleIconFile</key>
 	<string>Icon</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.aries.qsllx.mz</string>
+	<string>com.aries.qsllx.jsb</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

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

@@ -2019,7 +2019,7 @@ this.last_time_stamp = 0;
 this.adSdk = t;
 }
 t.prototype.init = function() {
-cc.sys.os == cc.sys.OS_ANDROID ? this.ifShowAd = !0 : this.ifShowAd = !1;
+cc.sys.os, cc.sys.OS_ANDROID, this.ifShowAd = "1" == gData.gameData.configs.ServerConfig.ifShowAd;
 this.adSdk.initSDK();
 };
 t.prototype.watchAd = function(t) {
@@ -7086,22 +7086,26 @@ e.btn5 = null;
 e.btn6 = null;
 e.btn7 = null;
 e.btn8 = null;
-e.btn_redeem = null;
+e.btn9 = null;
+e.btn_pigbank = null;
 return e;
 }
 e.prototype.onLoad = function() {
 gData.gameData.funBtns = this;
 };
-e.prototype.start = function() {};
+e.prototype.start = function() {
+this.init();
+};
 e.prototype.init = function() {
 for (var t = gData.gameData.funOpenData, e = 0; e < t.length; e++) {
 var n = this["btn" + (e + 1)];
 n && (n.active = "1" == t[e]);
 }
+this.btn_pigbank && (this.btn_pigbank.active = "1" == t[3]);
 this.updateRedeem();
 };
 e.prototype.updateRedeem = function() {
-this.btn_redeem.active = gData.redeem.showBtn;
+this.btn9 && (this.btn9.active = gData.redeem.showBtn && "1" == gData.gameData.funOpenData[8]);
 };
 e.prototype.update = function() {
 if (gData.redeem.init_btnChange) {
@@ -7144,7 +7148,11 @@ displayName: "气泡红包组"
 a([ s({
 type: cc.Node,
 displayName: "福利礼包"
-}) ], e.prototype, "btn_redeem", void 0);
+}) ], e.prototype, "btn9", void 0);
+a([ s({
+type: cc.Node,
+displayName: "金猪币按钮"
+}) ], e.prototype, "btn_pigbank", void 0);
 return a([ c ], e);
 }(cc.Component);
 n.default = l;
@@ -7453,6 +7461,7 @@ return [ 2 ];
 }
 mk.console.logSingle("getAllConfigInfo", e.data);
 this.initConfigs(e.data);
+mk.ad.init();
 t = {};
 return [ 4, mk.http.sendData("getInfoCrypt", t) ];
 
@@ -8268,7 +8277,7 @@ this.spr_progress.fillRange = t;
 if (t >= 1) {
 gData.reward.subType = 2;
 mk.ad.videoAdType = f.VideoAdType.LevelScoreRedBag;
-mk.ui.getCurOnPanel("rewardLuck") || mk.ui.openPanel("module/reward/rewardLuck");
+mk.ui.getCurOnPanel("rewardLuck") || "1" != gData.gameData.funOpenData[6] || mk.ui.openPanel("module/reward/rewardLuck");
 }
 };
 e.prototype.initPropNum = function() {
@@ -8599,7 +8608,11 @@ var t = gData.gameData.getProp(f.GameProp.levelNum);
 mk.console.log("[Game]pass passLevelNum", t);
 n.Inst.ifGetPass = !0;
 gData.gameData.setProp(f.GameProp.levelNum, ++t);
-if (!(mk.ui.getCurOnPanel("rewardLuck") || this.finalGetScore >= this.targetScore)) {
+if ("1" == gData.gameData.funOpenData[6]) {
+if (mk.ui.getCurOnPanel("rewardLuck") || this.finalGetScore >= this.targetScore) return;
+this.gameCount();
+console.log("gData.gameData.getProp(GameProp.levelNum)", gData.gameData.getProp(f.GameProp.levelNum));
+} else {
 this.gameCount();
 console.log("gData.gameData.getProp(GameProp.levelNum)", gData.gameData.getProp(f.GameProp.levelNum));
 }
@@ -9008,7 +9021,7 @@ e.prototype.initMusic = function() {
 mk.audio.playMusic("bgm");
 };
 e.prototype.initBtns = function() {
-this.node_btn.getComponent(p.default).init();
+this.node_btn.getComponent(p.default);
 };
 e.prototype.initQiPaos = function() {
 mk.tween.scale(this.btn_getRed1, .6, 0, 1, null, "backOut");
@@ -9778,7 +9791,7 @@ break;
 };
 t.prototype.openPanelByBtn = function() {
 var t = gData.guideWeakData.cur_guide_id;
-gData.gameData.funBtns["btn" + t] && gData.gameData.funBtns["btn" + t].emit("click");
+gData.gameData.funBtns["btn" + t] && "1" == gData.gameData.funOpenData["" + t] && gData.gameData.funBtns["btn" + t].emit("click");
 };
 return t;
 }();
@@ -11526,7 +11539,6 @@ return i(this, function(i) {
 switch (i.label) {
 case 0:
 console.log("uin  ", gData.loginData.uin);
-mk.ad.init();
 mk.console.logSingle("machineInfo", gData.appData.machineInfo);
 return [ 4, mk.http.sendData("user/machine", gData.appData.machineInfo) ];
 
@@ -20453,7 +20465,10 @@ e = mk.math.randomByWeight(this.weights, 100, !1);
 return "<outline color=#000000 width=1><color=#19F7FF>" + n + "</color>成功提现了<color=#FCE300>" + this.moneys[e] + "元</color></outline>";
 };
 e.prototype.onLoad = function() {
+if ("1" == gData.gameData.funOpenData[8]) {
+this.node.active = !0;
 this.play();
+} else this.node.active = !1;
 };
 e.prototype.play = function() {
 this.reset();

+ 5 - 4
packages-hot-update/cfg.json

@@ -1,6 +1,6 @@
 {
     "version": "1.0.0",
-    "serverRootDir": "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/",
+    "serverRootDir": "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/jsbRemote/",
     "resourceRootDir": "D:\\mokaszProjects\\mk_framework\\build\\jsb-link",
     "genManifestDir": "",
     "hotAddressArray": [
@@ -11,9 +11,10 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/baseRemote1/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTestT/baseRemote1/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTestT/baseRemote/",
-        "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/baseRemoteTest/"
+        "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/baseRemoteTest/",
+        "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/jsbRemote/"
     ],
-    "buildTime": 1628490699336,
-    "genTime": 1628490699336,
+    "buildTime": 1628596258118,
+    "genTime": 1628596258118,
     "genVersion": null
 }

File diff suppressed because it is too large
+ 0 - 0
packages-hot-update/manifest/project.manifest


+ 1 - 1
packages-hot-update/manifest/version.manifest

@@ -1 +1 @@
-{"version":"1.0.0","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/version.manifest"}
+{"version":"1.0.0","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/jsbRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/jsbRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/jsbRemote/version.manifest"}

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


+ 1 - 1
settings/builder.json

@@ -22,7 +22,7 @@
   "zipCompressJs": true,
   "fb-instant-games": {},
   "android": {
-    "packageName": "com.aries.qsllx.mz",
+    "packageName": "com.aries.qsllx.jsb",
     "REMOTE_SERVER_ROOT": ""
   },
   "ios": {

Some files were not shown because too many files changed in this diff