1

assets/script/game/game/Game.ts

@@ -167,14 +167,14 @@ export default class Game extends cc.Component {
         //     }
         //     this.autoPopSign = false;        
         // }
-        if(gData.gameData.funOpenData[11] == "1")
-        {
-            let isTeach = mk.guide.open(10);
-            if (isTeach) {
-                mk.event.register("event_guide", this.initGuideEvent.bind(this), this);
-                //mk.guide.continueCallBack = this.judgeContinueTeach;
-            }
-        }
+        // if(gData.gameData.funOpenData[11] == "1")
+        // {
+        //     let isTeach = mk.guide.open(10);
+        //     if (isTeach) {
+        //         mk.event.register("event_guide", this.initGuideEvent.bind(this), this);
+        //         //mk.guide.continueCallBack = this.judgeContinueTeach;
+        //     }
+        // }
     
         let value = mk.storage.getStorage('loadingFinish');
         if (!value) {
@@ -1116,13 +1116,14 @@ export default class Game extends cc.Component {
                 this.node_getOrderReward.getComponent(cc.Animation).play();
                 this.node_orderHand.active = true;
                 mk.ui.closeAllUI();
-                if(gData.gameData.funOpenData[11] == "1")
+                // if(gData.gameData.funOpenData[11] == "1")
+                // {
+                //     let isGuide = mk.guide.open(12);
+                //     if (!isGuide) {
+                //         mk.tip.pop("订单已完成，快领奖吧!");
+                //     }
+                // }else
                 {
-                    let isGuide = mk.guide.open(12);
-                    if (!isGuide) {
-                        mk.tip.pop("订单已完成，快领奖吧!");
-                    }
-                }else{
                     mk.tip.pop("订单已完成，快领奖吧!");
                 }       
             }

assets/script/game/module/speedUpUI/ProductReward.ts

@@ -64,34 +64,36 @@ export default class ProductReward extends cc.Component {
         }
 
 
-        if (id >= 11) {
+        //if (id >= 11) 
+        {
             mk.ad.showNative();
-        } else {
-            this.btnCanClick = false;
-            this.lbl_taskTimes.string = "1";
-            this.node_Uncomplete.active = true;
-            this.node_complete.active = false;
-
-            this.sp_taskProgress.fillRange = 0.99;
-            this.lbl_progress.string = "99%";
-
-            this.scheduleOnce(() => {
-                this.btnCanClick = true;
-                let data = gData.gameData.playerProp.orderData;
-                let orderData = data.orderTaskList;
-                let copyData = gData.gameData.playerProp.copyOrderData;
-                if (data && orderData && copyData) {
-                    let num = 0;
-                    for (let i = 0; i != orderData.length; ++i) {
-                        num += (orderData[i].taskCount - copyData[i])
-                    }
-                    if (gData.gameData.funOpenData[11] == "1") {
-                        let curDes = `<color=8A4312>再生产${num}次，就可以收获\n啦，完成订单立即<color=ff0000>提现</color>！</color>`;
-                        mk.guide.open(11, curDes);
-                    }
-                }
-            }, 0.2)
-        }
+        } 
+        // else {
+        //     this.btnCanClick = false;
+        //     this.lbl_taskTimes.string = "1";
+        //     this.node_Uncomplete.active = true;
+        //     this.node_complete.active = false;
+
+        //     this.sp_taskProgress.fillRange = 0.99;
+        //     this.lbl_progress.string = "99%";
+
+        //     this.scheduleOnce(() => {
+        //         this.btnCanClick = true;
+        //         let data = gData.gameData.playerProp.orderData;
+        //         let orderData = data.orderTaskList;
+        //         let copyData = gData.gameData.playerProp.copyOrderData;
+        //         if (data && orderData && copyData) {
+        //             let num = 0;
+        //             for (let i = 0; i != orderData.length; ++i) {
+        //                 num += (orderData[i].taskCount - copyData[i])
+        //             }
+        //             if (gData.gameData.funOpenData[11] == "1") {
+        //                 let curDes = `<color=8A4312>再生产${num}次，就可以收获\n啦，完成订单立即<color=ff0000>提现</color>！</color>`;
+        //                 mk.guide.open(11, curDes);
+        //             }
+        //         }
+        //     }, 0.2)
+        // }
     }
 
     update(dt) {

assets/script/mk/system/JsbSystem.ts

@@ -149,8 +149,8 @@ export default class JsbSystem {
         if (CC_DEBUG) {
             //gData.appData.appId = "wx3c0cc2f730c5ad5a";
             //gData.appData.version = "1.0.0";
-            gData.appData.appId = "wxd98fe9d52af10e59";
-            gData.appData.version = "1.1.4";
+            gData.appData.appId = "wxd413dcac1e6a74c9";
+            gData.appData.version = "5.1.";
         }
         // console.log('gData.appData  ', unicodeStr)
         // console.log('gData.appData.appId  ', gData.appData.appId)

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

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

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.aries.kncdsf.mz"
+    package="com.aries.kncdsf.jsb"
     android:installLocation="auto">
 
     <uses-feature android:glEsVersion="0x00020000" />
@@ -66,11 +66,11 @@
         <!-- TODO GAME SDK接入YSDK初始化配置 END -->
 
         <activity
-            android:name="com.aries.kncdsf.mz.wxapi.WXEntryActivity"
+            android:name="com.aries.kncdsf.jsb.wxapi.WXEntryActivity"
             android:label="@string/app_name"
             android:theme="@android:style/Theme.Translucent.NoTitleBar"
             android:exported="true"
-            android:taskAffinity="com.aries.kncdsf.mz"
+            android:taskAffinity="com.aries.kncdsf.jsb"
             android:launchMode="singleTask">
         </activity>
 

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

@@ -7,9 +7,9 @@ KS_CHANNEL="kuaishou";    //快手渠道
 UM_AID="6165593d14e22b6a4f1e16a2"; //友盟appid
 UM_CHANNEL="oppo"; //友盟渠道
 UM_SECRET="";       //友盟秘钥
-WX_APP_ID="wxd98fe9d52af10e59"; //微信appidUM_CHANNEL
+WX_APP_ID="wxd413dcac1e6a74c9"; //微信appidUM_CHANNEL
 MY_APP_NAME=\u5f00\u519c\u573a\u5f53\u9996\u5bcc
-PACKAGE_NAME=com.aries.kncdsf.mz
+PACKAGE_NAME=com.aries.kncdsf.jsb
 VERSION_NAME=1.1.4
 VERSION_CODE=1
 TOPON="a60af425829e4e,66b742dd0e502b64d783d9c66a9d30c4,b60af42bb7253c,b60af42bbb9a8a,b60af42bc3ee53,b60af42bba453f,b60af42bc9e854,b60af42bc0de73,b6167ea26616bf"; //巨量渠道topon的 AppId,AppSecreate,激励视频，插屏，信息流，开屏,banner,全屏,大插屏

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

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

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

@@ -51,7 +51,7 @@ import androidx.core.content.ContextCompat;
 import androidx.core.content.FileProvider;
 
 
-import com.aries.kncdsf.mz.BuildConfig;
+import com.aries.kncdsf.jsb.BuildConfig;
 import com.tencent.ysdk.api.YSDKApi;
 
 import java.io.File;

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

@@ -18,8 +18,8 @@ import org.cocos2dx.javascript.util.DeviceUtil;
 import org.cocos2dx.lib.Cocos2dxJavascriptJavaBridge;
 
 
-import com.aries.kncdsf.mz.BuildConfig;
-import com.aries.kncdsf.mz.wxapi.WXEntryActivity;
+import com.aries.kncdsf.jsb.BuildConfig;
+import com.aries.kncdsf.jsb.wxapi.WXEntryActivity;
 
 public class ThirdSdkMgr {
 

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

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

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

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

@@ -14,7 +14,8 @@ import android.webkit.WebViewClient;
 import android.widget.Button;
 import android.widget.PopupWindow;
 
-import com.aries.kncdsf.mz.R;
+
+import com.aries.kncdsf.jsb.R;
 import com.tencent.ysdk.api.YSDKApi;
 import com.tencent.ysdk.framework.common.ePlatform;
 import com.tencent.ysdk.module.antiaddiction.listener.AntiAddictListener;

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

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

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

@@ -14478,7 +14478,6 @@ this.initInfo();
 this.runGuideWeak();
 this.initLeftTimes();
 this.initFarmExpUI();
-"1" == gData.gameData.funOpenData[11] && mk.guide.open(10) && mk.event.register("event_guide", this.initGuideEvent.bind(this), this);
 if (!mk.storage.getStorage("loadingFinish")) {
 mk.storage.setStorage("loadingFinish", 1);
 mk.data.sendDataEvent(d.DataEventId.loading, "loading结束");
@@ -15328,7 +15327,7 @@ this.node_getOrderReward.setGray(!1, !0);
 this.node_getOrderReward.getComponent(cc.Animation).play();
 this.node_orderHand.active = !0;
 mk.ui.closeAllUI();
-"1" == gData.gameData.funOpenData[11] && mk.guide.open(12) || mk.tip.pop("订单已完成，快领奖吧!");
+mk.tip.pop("订单已完成，快领奖吧!");
 }
 if (i = e.orderTaskList[t]) if (i.completeCount == i.taskCount) {
 this.lbl_progress[t].node.active = !1;
@@ -24538,25 +24537,7 @@ this.node_1.active = !1;
 this.node_2.active = !0;
 }
 }
-if (e >= 11) mk.ad.showNative(); else {
-this.btnCanClick = !1;
-this.lbl_taskTimes.string = "1";
-this.node_Uncomplete.active = !0;
-this.node_complete.active = !1;
-this.sp_taskProgress.fillRange = .99;
-this.lbl_progress.string = "99%";
-this.scheduleOnce(function() {
-t.btnCanClick = !0;
-var e = gData.gameData.playerProp.orderData, a = e.orderTaskList, o = gData.gameData.playerProp.copyOrderData;
-if (e && a && o) {
-for (var n = 0, i = 0; i != a.length; ++i) n += a[i].taskCount - o[i];
-if ("1" == gData.gameData.funOpenData[11]) {
-var r = "<color=8A4312>再生产" + n + "次，就可以收获\n啦，完成订单立即<color=ff0000>提现</color>！</color>";
-mk.guide.open(11, r);
-}
-}
-}, .2);
-}
+mk.ad.showNative();
 };
 e.prototype.update = function() {
 if (gData.gameData.init_productTask) {

packages-hot-update/cfg.json

@@ -12,7 +12,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfTest/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/"
     ],
-    "buildTime": 1635417853674,
-    "genTime": 1635417853674,
+    "buildTime": 1635492910476,
+    "genTime": 1635492910476,
     "genVersion": null
 }

settings/builder.json

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