发包 引导到微信

assets/resources/module/login/hot/version.manifest

@@ -1 +1 @@
-{"version":"1.0.4","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote3/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote3/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote3/version.manifest"}
+{"version":"1.0.5","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote4/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote4/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote4/version.manifest"}

assets/script/game/data/GameData.ts

@@ -103,6 +103,7 @@ export class GameData {
         gData.guideToWxData.guideToWxSwith = this.configs.ServerConfig.guideToWxSwith == '1';
         gData.guideToWxData.money = this.configs.ServerConfig.addfriendmoney;
         gData.guideToWxData.ghId = this.configs.ServerConfig.ghId;
+        gData.guideToWxData.ghIdPath = this.configs.ServerConfig.ghIdPath;
     }
 
     /**

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) {

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

@@ -8,6 +8,7 @@ export default class GuideToWxData {
     public guideState: GuideState = GuideState.none;
     public money = '';
     public ghId = '';
+    public ghIdPath = '';
     public init_state = false;
 
     checkPop() {

assets/script/game/module/guideToWx/GuideToWx.ts

@@ -62,6 +62,11 @@ export default class GuideToWx extends cc.Component {
                 break;
             case 1:
                 gData.guideToWxData.guideState = GuideState.canGetMoney;
+                let stateN = mk.storage.getStorage('canGetMoney');
+                if (!stateN) {
+                    mk.storage.setStorage('canGetMoney', 1);
+                    mk.data.sendDataEvent(DataEventId.guideToWx, "二维码");
+                }
                 break;
             case 2:
                 gData.guideToWxData.guideState = GuideState.gotMoney;
@@ -141,6 +146,7 @@ export default class GuideToWx extends cc.Component {
                 this.fillPer = 1;
                 path = 'module/guideToWx/texture/getSuccess';
                 this.node_target.active = false;
+                this.nodeStateArr[3].active = true;
                 break;
         }
 
@@ -192,7 +198,7 @@ export default class GuideToWx extends cc.Component {
             || gData.guideToWxData.guideState == GuideState.waitForPass) {
             this.lastTimeSpan = Date.now();
             mk.console.logSingle('GuideToWx lastTimeSpan  ', this.lastTimeSpan);
-            JsbSystem.WXLaunchMiniProgram(gData.guideToWxData.ghId);
+            JsbSystem.WXLaunchMiniProgram(gData.guideToWxData.ghId, gData.guideToWxData.ghIdPath);
         }
         else if (gData.guideToWxData.guideState == GuideState.canGetMoney) {
             let response = await mk.http.sendData('customerServiceCash', {});
@@ -215,7 +221,7 @@ export default class GuideToWx extends cc.Component {
             this.setState();
         }
         else if (gData.guideToWxData.guideState == GuideState.gotMoney) {
-            mk.tip.pop('您已经领取成功！');
+            mk.tip.pop('您已经领取成功！', 1);
         }
     }
 

assets/script/mk/system/JsbSystem.ts

@@ -403,9 +403,9 @@ export default class JsbSystem {
         gData.loginData.wxLogin();
     }
 
-    public static WXLaunchMiniProgram(ghId) {
+    public static WXLaunchMiniProgram(ghId, path) {
         if (cc.sys.os == cc.sys.OS_ANDROID) {
-            this.callStaticMethod(this._JSB_ANDROID_PATH, "WXLaunchMiniProgram", "(Ljava/lang/String;)V", ghId);
+            this.callStaticMethod(this._JSB_ANDROID_PATH, "WXLaunchMiniProgram", "(Ljava/lang/String;Ljava/lang/String;)V", ghId, path);
         }
         else if (cc.sys.os == cc.sys.OS_IOS) {
             this.callStaticMethod("AppController", "WXLaunchMiniProgram", "");

assets/script/mk/utils/LogUtil.ts

@@ -9,7 +9,7 @@ export default class LogUtil {
      * 是否显示Log
      * @description
      */
-    public ifShowLog: boolean = true;
+    public ifShowLog: boolean = false;
 
     /**
      * 标签符号

build/jsb-link/assets/resources/import/3b/3b1ef8e2-08a5-43db-8720-1ec86ad5dd13.json

@@ -1 +1 @@
-[1,["99QMlr1FhMjL2LHqVxQvX2"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"弹窗","rect":[0,0,750,1334],"offset":[0,0],"originalSize":[750,1334],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]
+[1,["99QMlr1FhMjL2LHqVxQvX2"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"弹窗","rect":[48,136,655,1055],"offset":[0.5,3.5],"originalSize":[750,1334],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/c4/c46c1f64-f14f-4e56-b337-b6952b34b32c.json

@@ -0,0 +1 @@
+[1,0,0,[["cc.Asset",["_name","_native"],1]],[[0,0,1,3]],[[0,"WxVideo",".mp4"],-1],0,0,[],[],[]]

build/jsb-link/assets/resources/import/d8/d8e27dcf-f1ab-491f-9936-9115de704fd8.json

@@ -0,0 +1 @@
+[1,["eccMVhxI1CObDxDZn5374P"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"加我送钱icon","rect":[0,0,106,93],"offset":[0,0],"originalSize":[106,93],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/ec/ec70c561-c48d-4239-b0f1-0d99f9dfbe0f.json

@@ -0,0 +1 @@
+[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

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

@@ -210,13 +210,15 @@ public class WXEntryActivity extends Activity implements IWXAPIEventHandler {
         return (type == null) ? String.valueOf(System.currentTimeMillis()) : type + System.currentTimeMillis();
     }
 
-    public void WXLaunchMiniProgram(Context context, String ghId){
+    public void WXLaunchMiniProgram(Context context, String ghId, String path){
         IWXAPI api = WXAPIFactory.createWXAPI(context, BuildConfig.WX_APP_ID);
 
         WXLaunchMiniProgram.Req req = new WXLaunchMiniProgram.Req();
         req.userName = ghId; // 填小程序原始id
-//        req.path = path;                  ////拉起小程序页面的可带参路径，不填默认拉起小程序首页，对于小游戏，可以只传入 query 部分，来实现传参效果，如：传入 "?foo=bar"。
+        req.path = path + ThirdSdkMgr.uin + "&gameappid="+BuildConfig.WX_APP_ID;                  ////拉起小程序页面的可带参路径，不填默认拉起小程序首页，对于小游戏，可以只传入 query 部分，来实现传参效果，如：传入 "?foo=bar"。
         req.miniprogramType = WXLaunchMiniProgram.Req.MINIPTOGRAM_TYPE_RELEASE;// 可选打开 开发版，体验版和正式版
         api.sendReq(req);
+
+        Log.d(_tag, "WXLaunchMiniProgram: " + req.path);
     }
 }

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

@@ -39,6 +39,8 @@ public class ThirdSdkMgr {
     //Cocos 对应与Java交互的脚本
     public static String cocosJsbMgrName = "window.JsbMgr.";
 
+    public static String uin = "";
+
     //微信相关---------------------------------------------------------------------------------------
     /** 微信授权 */
     public static void WxAuth()
@@ -46,13 +48,14 @@ public class ThirdSdkMgr {
         WXEntryActivity.getInstance().startWxAuth(ThirdSdkMgr.appActivity);
     }
 
-    public static void WXLaunchMiniProgram(String ghId)
+    public static void WXLaunchMiniProgram(String ghId, String path)
     {
-        WXEntryActivity.getInstance().WXLaunchMiniProgram(ThirdSdkMgr.appActivity, ghId);
+        WXEntryActivity.getInstance().WXLaunchMiniProgram(ThirdSdkMgr.appActivity, ghId, path);
     }
 
     public static void setTAUserID(String id)
     {
+        uin = id;
         TDSDKMgr.getInstance().setTaUserID(id);
     }
 

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

@@ -7976,6 +7976,7 @@ gData.loginData.popIdentifySwitch = "1" == this.configs.ServerConfig.popIdentify
 gData.guideToWxData.guideToWxSwith = "1" == this.configs.ServerConfig.guideToWxSwith;
 gData.guideToWxData.money = this.configs.ServerConfig.addfriendmoney;
 gData.guideToWxData.ghId = this.configs.ServerConfig.ghId;
+gData.guideToWxData.ghIdPath = this.configs.ServerConfig.ghIdPath;
 };
 t.prototype.initPlayerProp = function(t) {
 this.gameData = new c();
@@ -10280,6 +10281,7 @@ this.guideToWxSwith = !1;
 this.guideState = a.none;
 this.money = "";
 this.ghId = "";
+this.ghIdPath = "";
 this.init_state = !1;
 }
 t.prototype.checkPop = function() {
@@ -10482,6 +10484,10 @@ break;
 
 case 1:
 gData.guideToWxData.guideState = u.GuideState.canGetMoney;
+if (!mk.storage.getStorage("canGetMoney")) {
+mk.storage.setStorage("canGetMoney", 1);
+mk.data.sendDataEvent(l.DataEventId.guideToWx, "二维码");
+}
 break;
 
 case 2:
@@ -10562,6 +10568,7 @@ case u.GuideState.gotMoney:
 this.fillPer = 1;
 e = "module/guideToWx/texture/getSuccess";
 this.node_target.active = !1;
+this.nodeStateArr[3].active = !0;
 }
 n = this.sp_getMoney;
 return [ 4, mk.loader.load(e, cc.SpriteFrame) ];
@@ -10620,7 +10627,7 @@ mk.audio.playEffect("button");
 if (gData.guideToWxData.guideState != u.GuideState.none && gData.guideToWxData.guideState != u.GuideState.sendApply && gData.guideToWxData.guideState != u.GuideState.waitForPass) return [ 3, 1 ];
 this.lastTimeSpan = Date.now();
 mk.console.logSingle("GuideToWx lastTimeSpan  ", this.lastTimeSpan);
-s.default.WXLaunchMiniProgram(gData.guideToWxData.ghId);
+s.default.WXLaunchMiniProgram(gData.guideToWxData.ghId, gData.guideToWxData.ghIdPath);
 return [ 3, 4 ];
 
 case 1:
@@ -10641,7 +10648,7 @@ this.setState();
 return [ 3, 4 ];
 
 case 3:
-gData.guideToWxData.guideState == u.GuideState.gotMoney && mk.tip.pop("您已经领取成功！");
+gData.guideToWxData.guideState == u.GuideState.gotMoney && mk.tip.pop("您已经领取成功！", 1);
 e.label = 4;
 
 case 4:
@@ -11533,7 +11540,7 @@ value: !0
 n.ServerUrl = n.HttpData = void 0;
 var o, a = function() {
 function t() {
-this.serverType = 0;
+this.serverType = 1;
 }
 t.prototype.getServerUrl = function() {
 switch (this.serverType) {
@@ -11921,8 +11928,8 @@ gData.wechatData.code = t;
 console.log("=== gData.wechatData.code", gData.wechatData.code);
 gData.loginData.wxLogin();
 };
-t.WXLaunchMiniProgram = function(t) {
-cc.sys.os == cc.sys.OS_ANDROID ? this.callStaticMethod(this._JSB_ANDROID_PATH, "WXLaunchMiniProgram", "(Ljava/lang/String;)V", t) : cc.sys.os == cc.sys.OS_IOS && this.callStaticMethod("AppController", "WXLaunchMiniProgram", "");
+t.WXLaunchMiniProgram = function(t, e) {
+cc.sys.os == cc.sys.OS_ANDROID ? this.callStaticMethod(this._JSB_ANDROID_PATH, "WXLaunchMiniProgram", "(Ljava/lang/String;Ljava/lang/String;)V", t, e) : cc.sys.os == cc.sys.OS_IOS && this.callStaticMethod("AppController", "WXLaunchMiniProgram", "");
 };
 t.OpenMiniGame = function() {
 cc.sys.os == cc.sys.OS_ANDROID ? this.callStaticMethod(this._JSB_ANDROID_PATH, "OpenMiniGame", "()V") : cc.sys.os == cc.sys.OS_IOS && this.callStaticMethod("AppController", "WxAuth", "");
@@ -12121,7 +12128,7 @@ value: !0
 n.LogTagColor = void 0;
 var a, i = function() {
 function t() {
-this.ifShowLog = !0;
+this.ifShowLog = !1;
 this._tagChar = "...";
 this._frontChar = "    ";
 this._keyValueChar = " = ";

packages-hot-update/cfg.json

@@ -1,6 +1,6 @@
 {
-    "version": "1.0.4",
-    "serverRootDir": "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote3/",
+    "version": "1.0.5",
+    "serverRootDir": "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote4/",
     "resourceRootDir": "D:\\copy\\mk_framework\\build\\jsb-link",
     "genManifestDir": "",
     "hotAddressArray": [
@@ -13,9 +13,10 @@
         "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/baseRemote2/",
-        "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote3/"
+        "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote3/",
+        "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote4/"
     ],
-    "buildTime": 1631265054590,
-    "genTime": 1631265054590,
+    "buildTime": 1631364709647,
+    "genTime": 1631364709647,
     "genVersion": null
 }

packages-hot-update/manifest/version.manifest

@@ -1 +1 @@
-{"version":"1.0.4","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote3/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote3/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote3/version.manifest"}
+{"version":"1.0.5","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote4/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote4/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote4/version.manifest"}