Просмотр исходного кода

轻松连连消抢先版
wx6438b2697e818b24
com.aries.qsllx.qxb
热更地址
https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/qxbRemote/
1.0.0

kaka 4 лет назад
Родитель
Сommit
ea36ef7588
27 измененных файлов с 57 добавлено и 41 удалено
  1. 0 0
      assets/resources/module/login/hot/project.manifest
  2. 1 1
      assets/resources/module/login/hot/version.manifest
  3. 3 1
      assets/script/game/module/login/Login.ts
  4. 6 1
      assets/script/game/module/setting/Setting.ts
  5. 12 6
      assets/script/mk/system/GuideSystem.ts
  6. 1 1
      build/jsb-link/.cocos-project.json
  7. BIN
      build/jsb-link/assets/main/index.jsc
  8. 0 0
      build/jsb-link/assets/resources/config.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. BIN
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/caches/build_file_checksums.ser
  12. 3 3
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/AndroidManifest.xml
  13. 4 6
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/gradle.properties
  14. 3 3
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/com/aries/qsllx/qxb/wxapi/WXEntryActivity.java
  15. 2 1
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/AppActivity.java
  16. 2 2
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/ThirdSdkMgr.java
  17. 2 2
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/ad/SplashAdShowActivity.java
  18. 1 1
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/src/org/cocos2dx/javascript/thirdSdk/umeng/UMSDKMgr.java
  19. 1 1
      build/jsb-link/frameworks/runtime-src/proj.android-studio/res/values/strings.xml
  20. 1 1
      build/jsb-link/frameworks/runtime-src/proj.ios_mac/ios/Info.plist
  21. 1 1
      build/jsb-link/frameworks/runtime-src/proj.ios_mac/mac/Info.plist
  22. 6 3
      build/jsb-link/js backups (useful for debugging)/main.index.js
  23. 5 4
      packages-hot-update/cfg.json
  24. 0 0
      packages-hot-update/manifest/project.manifest
  25. 1 1
      packages-hot-update/manifest/version.manifest
  26. BIN
      packages-hot-update/versions/ver_1_0.0.zip
  27. 1 1
      settings/builder.json

Разница между файлами не показана из-за своего большого размера
+ 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/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"}
+{"version":"1.0.0","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/qxbRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/qxbRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/qxbRemote/version.manifest"}

+ 3 - 1
assets/script/game/module/login/Login.ts

@@ -83,7 +83,9 @@ export default class Login extends cc.Component {
                 else {
                     mk.ui.openPanel("game/prefab/game");
                     console.log("===[Jsbsystem 显示开屏广告================================")
-                    JsbSystem.showSplash();
+                    if (mk.ad.ifShowAd) {
+                        JsbSystem.showSplash();
+                    }
                 }
 
                 gData.gameData.dataFinish = false;

+ 6 - 1
assets/script/game/module/setting/Setting.ts

@@ -38,7 +38,12 @@ export default class Setting extends cc.Component {
         console.log("=== gData.wechatData.unionid", gData.wechatData.unionid);
         console.log("=== gData.wechatData.nickName", gData.wechatData.nickName);
         this.lbl_id.string = "ID:" + mk.string.getNewLimitStr(gData.wechatData.unionid, 10);// 14 
-        this.lbl_nickname.string = gData.wechatData.nickName;
+        if (gData.gameData.funOpenData['6'] != "1") {
+            this.lbl_nickname.string = '';
+        }
+        else {
+            this.lbl_nickname.string = gData.wechatData.nickName;
+        }
         this.lbl_version.string = gData.appData.appVersion;
 
         let music = "module/setting/texture/" + (mk.audio.getSwitchMusic() ? "on" : "off");

+ 12 - 6
assets/script/mk/system/GuideSystem.ts

@@ -8,10 +8,16 @@ import { OpenActionType } from "./UISystem";
 export default class GuideSystem {
 
     private crtGuideID: number;
-    public ui:cc.Node;
+    public ui: cc.Node;
 
     public open(id) {
-        this.crtGuideID = gData.gameData.getProp(GameProp.guideID);
+        if (gData.gameData.funOpenData['6'] != 1) {
+            this.crtGuideID = 9999;
+            gData.gameData.setProp(GameProp.guideID, this.crtGuideID);
+        }
+        else {
+            this.crtGuideID = gData.gameData.getProp(GameProp.guideID);
+        }
         //测试永远新手引导,永远第一关
         if (!cc.sys.isNative) {
             this.crtGuideID = 1;
@@ -27,7 +33,7 @@ export default class GuideSystem {
         }
         gData.guideData.crtID = id;
         this.crtGuideID = id;
-        mk.ui.openPanel("module/guide/guide",OpenActionType.normal,this.ui);
+        mk.ui.openPanel("module/guide/guide", OpenActionType.normal, this.ui);
         this.setGuideID(this.crtGuideID++);
         return true
     }
@@ -37,9 +43,9 @@ export default class GuideSystem {
         let guide = gData.guideData.getGuidesByID(id);
         if (id == 2) {
             id = 9999;
-            mk.data.sendXYEvent("guide_end","新手引导结束");
+            mk.data.sendXYEvent("guide_end", "新手引导结束");
         }
-       
+
         gData.gameData.setProp(GameProp.guideID, id);
     }
 
@@ -63,7 +69,7 @@ export default class GuideSystem {
      * 当前是否正在引导
      * @returns 
      */
-    public isGuiding():boolean{
+    public isGuiding(): boolean {
         return mk.ui.getCurOnPanel("guide") != null;
     }
 }

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

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

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


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
build/jsb-link/assets/resources/config.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/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"}
+{"version":"1.0.0","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/qxbRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/qxbRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/qxbRemote/version.manifest"}

Разница между файлами не показана из-за своего большого размера
+ 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


+ 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.jsb"
+    package="com.aries.qsllx.qxb"
     android:installLocation="auto">
 
     <uses-feature android:glEsVersion="0x00020000" />
@@ -48,11 +48,11 @@
         </activity>
 
         <activity
-            android:name="com.aries.qsllx.jsb.wxapi.WXEntryActivity"
+            android:name="com.aries.qsllx.qxb.wxapi.WXEntryActivity"
             android:label="@string/app_name"
             android:theme="@android:style/Theme.Translucent.NoTitleBar"
             android:exported="true"
-            android:taskAffinity="com.aries.qsllx.jsb"
+            android:taskAffinity="com.aries.qsllx.qxb"
             android:launchMode="singleTask">
         </activity>
 

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

@@ -7,12 +7,10 @@ KS_CHANNEL="kuaishou";    //快手渠道
 UM_AID="60c17c51e044530ff09f30a3"; //友盟appid
 UM_CHANNEL="ttaxx_juliang"; //友盟渠道
 UM_SECRET="";       //友盟秘钥
-WX_APP_ID="wxcf31f0e54f7fefda"; //微信appidUM_CHANNEL
+WX_APP_ID="wx6438b2697e818b24"; //微信appidUM_CHANNEL
 MY_APP_NAME=\u5929\u5929\u7231\u6d88\u6d88
-PACKAGE_NAME=com.aries.qsllx.mz
-VERSION_NAME=1.0.2
+PACKAGE_NAME=com.aries.qsllx.qxb
+VERSION_NAME=16.1.1
 VERSION_CODE=2
 TOPON="a60cac090a6eb0,66b742dd0e502b64d783d9c66a9d30c4,b60cac0e43c0e1,b60cac0e4892fa,b60cac0e4d08e8,b60cac0e5754fc,b60cac0e524313"; //巨量渠道topon的 AppId,AppSecreate,激励视频,插屏,信息流,开屏,banner
-APP_CONFIG_CODE="1.1.1"
-
-
+APP_CONFIG_CODE="16.1.1"

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

@@ -1,4 +1,4 @@
-package com.aries.qsllx.jsb.wxapi;
+package com.aries.qsllx.qxb.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.jsb.BuildConfig;
-import com.aries.qsllx.jsb.R;
+import com.aries.qsllx.qxb.BuildConfig;
+import com.aries.qsllx.qxb.R;
 import com.tencent.mm.opensdk.modelbase.BaseReq;
 import com.tencent.mm.opensdk.modelbase.BaseResp;
 import com.tencent.mm.opensdk.modelmsg.SendAuth;

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

@@ -47,7 +47,8 @@ import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 import androidx.core.content.FileProvider;
 
-import com.aries.qsllx.jsb.BuildConfig;
+
+import com.aries.qsllx.qxb.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.jsb.BuildConfig;
-import com.aries.qsllx.jsb.wxapi.WXEntryActivity;
+import com.aries.qsllx.qxb.BuildConfig;
+import com.aries.qsllx.qxb.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.jsb.BuildConfig;
-import com.aries.qsllx.jsb.R;
+import com.aries.qsllx.qxb.BuildConfig;
+import com.aries.qsllx.qxb.R;
 
 import org.cocos2dx.javascript.thirdSdk.ThirdSdkMgr;
 

+ 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.jsb.BuildConfig;
+import com.aries.qsllx.qxb.BuildConfig;
 import com.umeng.analytics.MobclickAgent;
 import com.umeng.commonsdk.UMConfigure;
 

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

@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name" translatable="false">轻松连连消极速版</string>
+    <string name="app_name" translatable="false">轻松连连消抢先版</string>
 </resources>

+ 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.jsb</string>
+    <string>com.aries.qsllx.qxb</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.jsb</string>
+	<string>com.aries.qsllx.qxb</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

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

@@ -9690,7 +9690,10 @@ value: !0
 var o = t("../../game/data/GameData"), i = t("./UISystem"), a = function() {
 function t() {}
 t.prototype.open = function(t) {
-this.crtGuideID = gData.gameData.getProp(o.GameProp.guideID);
+if (1 != gData.gameData.funOpenData[6]) {
+this.crtGuideID = 9999;
+gData.gameData.setProp(o.GameProp.guideID, this.crtGuideID);
+} else this.crtGuideID = gData.gameData.getProp(o.GameProp.guideID);
 if (!cc.sys.isNative) {
 this.crtGuideID = 1;
 gData.gameData.setProp(o.GameProp.levelNum, 0);
@@ -11797,7 +11800,7 @@ mk.storage.setStorage("agreementTip", 1, !1);
 } else {
 mk.ui.openPanel("game/prefab/game");
 console.log("===[Jsbsystem 显示开屏广告================================");
-l.default.showSplash();
+mk.ad.ifShowAd && l.default.showSplash();
 }
 gData.gameData.dataFinish = !1;
 }
@@ -17612,7 +17615,7 @@ case 0:
 console.log("=== gData.wechatData.unionid", gData.wechatData.unionid);
 console.log("=== gData.wechatData.nickName", gData.wechatData.nickName);
 this.lbl_id.string = "ID:" + mk.string.getNewLimitStr(gData.wechatData.unionid, 10);
-this.lbl_nickname.string = gData.wechatData.nickName;
+"1" != gData.gameData.funOpenData[6] ? this.lbl_nickname.string = "" : this.lbl_nickname.string = gData.wechatData.nickName;
 this.lbl_version.string = gData.appData.appVersion;
 t = "module/setting/texture/" + (mk.audio.getSwitchMusic() ? "on" : "off");
 e = "module/setting/texture/" + (mk.audio.getSwitchEffect() ? "on" : "off");

+ 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/jsbRemote/",
+    "serverRootDir": "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/qxbRemote/",
     "resourceRootDir": "D:\\mokaszProjects\\mk_framework\\build\\jsb-link",
     "genManifestDir": "",
     "hotAddressArray": [
@@ -12,9 +12,10 @@
         "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/EasyEliminate/jsbRemote/"
+        "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/jsbRemote/",
+        "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/qxbRemote/"
     ],
-    "buildTime": 1628733437541,
-    "genTime": 1628733437541,
+    "buildTime": 1628822880552,
+    "genTime": 1628822880552,
     "genVersion": null
 }

Разница между файлами не показана из-за своего большого размера
+ 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/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"}
+{"version":"1.0.0","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/qxbRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/qxbRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/qxbRemote/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.jsb",
+    "packageName": "com.aries.qsllx.qxb",
     "REMOTE_SERVER_ROOT": ""
   },
   "ios": {

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