wuwangdong пре 4 година
родитељ
комит
d1ae7681dc
43 измењених фајлова са 266 додато и 28 уклоњено
  1. BIN
      assets/resources/game/texture/main/piazi.png
  2. 36 0
      assets/resources/game/texture/main/piazi.png.meta
  3. 3 0
      assets/resources/module/authUI/authUI.prefab
  4. 0 0
      assets/resources/module/login/hot/project.manifest
  5. 1 1
      assets/resources/module/login/hot/version.manifest
  6. 5 3
      assets/resources/module/login/login.prefab
  7. BIN
      assets/resources/module/login/texture/logo.png
  8. 8 8
      assets/resources/module/login/texture/logo.png.meta
  9. BIN
      assets/resources/module/warnTip/texture/bg4.png
  10. 36 0
      assets/resources/module/warnTip/texture/bg4.png.meta
  11. 1 0
      assets/script/game/data/AdData.ts
  12. 2 1
      assets/script/game/data/AppData.ts
  13. 14 1
      assets/script/game/module/authUI/AuthUI.ts
  14. 1 0
      assets/script/game/module/gradeReward/GradeReward.ts
  15. 1 0
      assets/script/game/module/gradeReward/GradeRewardItem.ts
  16. 10 0
      assets/script/game/module/newCashUI/WalletCashOut.ts
  17. 3 1
      assets/script/game/module/redBagTask/RedBagTask.ts
  18. 2 0
      assets/script/game/module/setting/Setting.ts
  19. 1 0
      assets/script/game/module/sign/Sign.ts
  20. 4 4
      assets/script/game/module/turntable/Turnablerule.ts
  21. 8 1
      assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATBanner.ts
  22. 14 1
      assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATInterstitial.ts
  23. 8 1
      assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATNative.ts
  24. 8 0
      assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATRewardVideo.ts
  25. 3 0
      assets/script/mk/system/AdSystem.ts
  26. 31 0
      assets/script/mk/system/DataSystem.ts
  27. 53 1
      assets/script/mk/system/HttpSystem.ts
  28. 6 0
      assets/script/mk/system/JsbSystem.ts
  29. 1 1
      build/jsb-link/assets/resources/import/08/08cd98e8-cbd9-44c8-8cb6-09609780aa3c.json
  30. 0 0
      build/jsb-link/assets/resources/import/3a/3a7bf8d2-c130-45c0-b451-f70ecb4c3c25.json
  31. 0 0
      build/jsb-link/assets/resources/import/b4/b4dea4a9-29c8-46bc-a50d-5754afa7a2bd.json
  32. 1 0
      build/jsb-link/assets/resources/import/de/ded8d2bb-9a3a-44b1-9a93-694edc1b693c.json
  33. 0 0
      build/jsb-link/assets/resources/import/f7/f7b563d2-2a35-4ed4-b0b0-05dd74c0033f.json
  34. 1 0
      build/jsb-link/assets/resources/import/ff/fffd5b24-012a-4376-bc20-b889590488b7.json
  35. 1 1
      build/jsb-link/assets/resources/native/9e/9ed98385-f23f-41b7-a2bc-27a1d4ad9fd6.manifest
  36. 0 0
      build/jsb-link/assets/resources/native/a8/a81eb395-718d-4f3b-958c-cb871f7dd5fa.manifest
  37. BIN
      build/jsb-link/assets/resources/native/b6/b6108cc0-6beb-4706-97dc-4756a95bf0d7.png
  38. BIN
      build/jsb-link/assets/resources/native/ff/fffd5b24-012a-4376-bc20-b889590488b7.png
  39. 1 1
      build/jsb-link/frameworks/runtime-src/proj.android-studio/app/gradle.properties
  40. 0 0
      packages-hot-update/manifest/project.manifest
  41. 1 1
      packages-hot-update/manifest/version.manifest
  42. BIN
      packages-hot-update/versions/ver_1_0.1.zip
  43. 1 1
      settings/project.json

BIN
assets/resources/game/texture/main/piazi.png


+ 36 - 0
assets/resources/game/texture/main/piazi.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "fffd5b24-012a-4376-bc20-b889590488b7",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 204,
+  "height": 190,
+  "platformSettings": {},
+  "subMetas": {
+    "piazi": {
+      "ver": "1.0.4",
+      "uuid": "ded8d2bb-9a3a-44b1-9a93-694edc1b693c",
+      "rawTextureUuid": "fffd5b24-012a-4376-bc20-b889590488b7",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 204,
+      "height": 190,
+      "rawWidth": 204,
+      "rawHeight": 190,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

+ 3 - 0
assets/resources/module/authUI/authUI.prefab

@@ -888,6 +888,9 @@
       "__id__": 1
     },
     "_enabled": true,
+    "lbl_des": {
+      "__id__": 8
+    },
     "_id": ""
   },
   {

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
assets/resources/module/login/hot/project.manifest


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

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

+ 5 - 3
assets/resources/module/login/login.prefab

@@ -272,7 +272,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 365,
-      "height": 256
+      "height": 242
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -430,9 +430,11 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_spriteFrame": null,
+    "_spriteFrame": {
+      "__uuid__": "08cd98e8-cbd9-44c8-8cb6-09609780aa3c"
+    },
     "_type": 0,
-    "_sizeMode": 0,
+    "_sizeMode": 1,
     "_fillType": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",

BIN
assets/resources/module/login/texture/logo.png


+ 8 - 8
assets/resources/module/login/texture/logo.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 478,
-  "height": 310,
+  "width": 365,
+  "height": 242,
   "platformSettings": {},
   "subMetas": {
     "logo": {
@@ -18,14 +18,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": -0.5,
-      "offsetY": 1,
+      "offsetX": 0,
+      "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 477,
-      "height": 308,
-      "rawWidth": 478,
-      "rawHeight": 310,
+      "width": 365,
+      "height": 242,
+      "rawWidth": 365,
+      "rawHeight": 242,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/resources/module/warnTip/texture/bg4.png


+ 36 - 0
assets/resources/module/warnTip/texture/bg4.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "da3fb28c-343e-4398-ae63-fff21a0e7fb0",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 640,
+  "height": 380,
+  "platformSettings": {},
+  "subMetas": {
+    "bg4": {
+      "ver": "1.0.4",
+      "uuid": "452dd136-a70e-4541-91a9-a5108df1522f",
+      "rawTextureUuid": "da3fb28c-343e-4398-ae63-fff21a0e7fb0",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 640,
+      "height": 380,
+      "rawWidth": 640,
+      "rawHeight": 380,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

+ 1 - 0
assets/script/game/data/AdData.ts

@@ -156,6 +156,7 @@ export class AdData {
      * @param type 1:激励视频完播、2:插屏展示、3:信息流展示、 4:激励视频展⽰、5:激励视频加载失败、6:开屏展示、7:banner展示、
      * 8:插屏-全屏视频 完播、9:插屏-全屏视频 展示、10:插屏-全屏视频 加载失败、11:插屏加载失败、12:信息流加载失败、13:开屏加载失败、14:banner加载失败、
      * 51:激励视频点击、52:插屏点击、53:信息流点击、54:开屏点击、55:banner点击、56:插屏-全屏视频点击
+     * 71:激励视频去重点击、72:插屏去重点击、73:信息流去重点击、74:开屏去重点击、75:banner去重点击、76:插屏-全屏视频去重点击
      */
     public async updateADLog(type, placementId, data = null) {
         let sData = null

+ 2 - 1
assets/script/game/data/AppData.ts

@@ -60,7 +60,7 @@ export class AppData {
         this.machineInfo.mac = this.mac = arr[3];
         this.machineInfo.oaid = arr[4];
         this.machineInfo.umid = arr[5];
-        this.machineInfo.UA = arr[11];
+
         this.tfChannel = arr[6];
         this.appVersion = arr[7];
 
@@ -70,6 +70,7 @@ export class AppData {
         this.deviceType = arr[9];
         /** 安卓版本号 */
         this.androidVersion = arr[10];
+        this.machineInfo.UA = arr[11];
         this.IP = arr[12]
 
         this.getDeviceInfoCompelete = true;

+ 14 - 1
assets/script/game/module/authUI/AuthUI.ts

@@ -5,11 +5,24 @@
 
 import JsbSystem from "../../../mk/system/JsbSystem";
 
-const { ccclass } = cc._decorator;
+const { ccclass, property} = cc._decorator;
 
 @ccclass
 export default class AuthUI extends cc.Component {
 
+    @property({ type: cc.Label, displayName: '描述' })
+    lbl_des: cc.Label = null;
+    start(){
+        if(gData.gameData.authUIType == 0)
+        {
+            this.lbl_des.string = '红包将提现至微信,登陆后立即到账';
+        }else if(gData.gameData.authUIType == 1){
+            this.lbl_des.string = '登陆后即可邀请微信好友一起玩';         
+        }else{
+            this.lbl_des.string = '登陆后即可提现红包至微信'; 
+        }
+    }
+
     clickAuth() {
         mk.audio.playEffect('button');
         JsbSystem.WxAuth();

+ 1 - 0
assets/script/game/module/gradeReward/GradeReward.ts

@@ -171,6 +171,7 @@ export class GradeReward extends cc.Component {
 
         if (cc.sys.isNative && !gData.loginData.isAuth) {
             // JsbSystem.WxAuth();
+            gData.gameData.authUIType = 0;
             mk.ui.openPanel('module/authUI/authUI');
             return;
         }

+ 1 - 0
assets/script/game/module/gradeReward/GradeRewardItem.ts

@@ -84,6 +84,7 @@ export class GradeRewardItem extends cc.Component{
         
         if (cc.sys.isNative && !gData.loginData.isAuth) {
             // JsbSystem.WxAuth();
+            gData.gameData.authUIType = 0;
             mk.ui.openPanel('module/authUI/authUI');
             return;
         }

+ 10 - 0
assets/script/game/module/newCashUI/WalletCashOut.ts

@@ -238,6 +238,16 @@ export default class WalletCashOut extends cc.Component {
             if (this.checkShowTip()) {
                 mk.tip.pop('请先提现完前一档次数');
             } else {
+
+                if (cc.sys.isNative) {
+                    if (!gData.loginData.isAuth) {
+                        // JsbSystem.WxAuth();
+                        gData.gameData.authUIType = 0;
+                        mk.ui.openPanel('module/authUI/authUI');
+                        return;
+                    }
+                }
+                
                 gData.adData.checkPopCashFull();
                 //this.check_button[this.curChooseIndex].setIsCanNotChoose();
                 gData.walletCashOutData.HttpCashOut2(this.curChooseIndex + 1);

+ 3 - 1
assets/script/game/module/redBagTask/RedBagTask.ts

@@ -265,6 +265,7 @@ export default class RedBagTask extends cc.Component {
             if (cc.sys.isNative) {
                 if (!gData.loginData.isAuth) {
                     // JsbSystem.WxAuth();
+                    gData.gameData.authUIType = 0;
                     mk.ui.openPanel('module/authUI/authUI');
                     return;
                 }
@@ -284,8 +285,9 @@ export default class RedBagTask extends cc.Component {
         mk.console.logSingle('redBagTask=>', response);
         if (response.errcode != 0) {
             // gData.cashPro.init_fail = true;
-            return null;
+            return;
         }
+        mk.console.logSingle('redBagTaskhttpCashOut=>', response.data.userFarmTaskInfo);
         gData.gameData.playerProp.userFarmTaskInfo = response.data.userFarmTaskInfo;
         gData.gameData.playerProp.completeFarmTaskTimes = response.data.completeFarmTaskTimes;
 

+ 2 - 0
assets/script/game/module/setting/Setting.ts

@@ -121,6 +121,7 @@ export default class Setting extends cc.Component {
         if (!gData.loginData.isAuth) {
             // mk.ui.closePanel(this.node.name);
             // JsbSystem.WxAuth();
+            gData.gameData.authUIType = 2;
             mk.ui.openPanel('module/authUI/authUI');
             // this.onClickClose();
         }
@@ -131,6 +132,7 @@ export default class Setting extends cc.Component {
         mk.data.sendDataEvent(DataEventId.button_click, "邀请icon");
         if (!gData.loginData.isAuth) {
             // JsbSystem.WxAuth();
+            gData.gameData.authUIType = 1;
             mk.ui.openPanel('module/authUI/authUI');
             return;
         }

+ 1 - 0
assets/script/game/module/sign/Sign.ts

@@ -100,6 +100,7 @@ export default class Sign extends cc.Component {
             if (gData.sign.c_sign[index_old].rewardType === RewardType.rmb) {
                 if (!gData.loginData.isAuth) {
                     // JsbSystem.WxAuth();
+                    gData.gameData.authUIType = 0;
                     mk.ui.openPanel('module/authUI/authUI');
                     return;
                 }

+ 4 - 4
assets/script/game/module/turntable/Turnablerule.ts

@@ -64,10 +64,10 @@ export default class Turnablerule extends cc.Component {
      */
     private clickCashOut() {
         mk.audio.playEffect("button");
-        gData.reward.addReward();
-        mk.ui.closePanel(this.node.name);
-        // let path = 'module/redBagCash/redBagCash';
-        // mk.ui.openPanel(path);
+        //gData.reward.addReward();
+        //mk.ui.closePanel(this.node.name);
+        // let path = 'module/newCashUI/walletCashOut';
+        mk.ui.openPanel('module/newCashUI/walletCashOut');
     }
 
     onDisable() {

+ 8 - 1
assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATBanner.ts

@@ -19,6 +19,8 @@ export default class ATBanner extends zgSingleton {
     /**是否观看完毕 */
     public ifWatchEnd: boolean = false;
 
+    private singleClick = false;
+
     init() {
 
         this.ATBannerJS = cc["ATBannerJS"];
@@ -130,7 +132,7 @@ export default class ATBanner extends zgSingleton {
         let data = JSON.parse(callbackInfo);
         gData.adData.updateADLog(7, placementId, data);
 
-
+        this.singleClick = true;
     }
 
     /**
@@ -145,6 +147,11 @@ export default class ATBanner extends zgSingleton {
         mk.data.sendDataEvent(DataEventId.Ad_click, mk.ad.bannerAdType);
         let data = JSON.parse(callbackInfo);
         gData.adData.updateADLog(55, placementId, data);
+
+        if (this.singleClick) {
+            this.singleClick = false;
+            gData.adData.updateADLog(75, placementId, data);
+        }
     }
 
     /** banner自动刷新成功 */

+ 14 - 1
assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATInterstitial.ts

@@ -18,6 +18,9 @@ export default class ATInterstitial extends zgSingleton {
     /** 是否加载完显示 */
     private ifLoadShowArr: Array<boolean> = new Array();
 
+    private singleClick = false;
+    private singleClickFull = false;
+
     /** 初始化 */
     async init() {
         this.ATInterstitialJS = cc["ATInterstitialJS"];
@@ -160,11 +163,13 @@ export default class ATInterstitial extends zgSingleton {
         let data = JSON.parse(callbackInfo)
         let id = 2
         mk.console.logSingle('ATInterstitialJS  ', 'onInterstitialAdShow ' + type);
-        if (type == 0) {
+        if (type == 0 || type == 2) {
             id = 2
+            this.singleClick = true;
         }
         else if (type == 1) {
             id = 9
+            this.singleClickFull = true;
             mk.data.sendDataEvent(DataEventId.interstitial2_init, mk.ad.interFullAdType);
         }
         gData.adData.updateADLog(id, placementId, data);
@@ -182,10 +187,18 @@ export default class ATInterstitial extends zgSingleton {
         if (type == 1) {
             mk.data.sendDataEvent(DataEventId.Ad_click, mk.ad.interFullAdType);
             gData.adData.updateADLog(56, placementId, data);
+            if (this.singleClickFull) {
+                this.singleClickFull = false;
+                gData.adData.updateADLog(76, placementId, data);
+            }
         }
         else {
             mk.data.sendDataEvent(DataEventId.Ad_click, mk.ad.interAdType);
             gData.adData.updateADLog(52, placementId, data);
+            if (this.singleClick) {
+                this.singleClick = false;
+                gData.adData.updateADLog(72, placementId, data);
+            }
         }
         // let data = JSON.parse(callbackInfo)
 

+ 8 - 1
assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATNative.ts

@@ -17,7 +17,7 @@ export class ATNative extends zgSingleton {
     /** 是否加载显示 */
     private ifLoadShow: boolean = false;
 
-
+    private singleClick = false;
     /** 初始化 */
     init() {
         this.ATNativeJS = cc["ATNativeJS"];
@@ -192,6 +192,8 @@ export class ATNative extends zgSingleton {
 
         let data = JSON.parse(callbackInfo)
         gData.adData.updateADLog(3, placementId, data);
+
+        this.singleClick = true;
     }
 
     /**
@@ -203,6 +205,11 @@ export class ATNative extends zgSingleton {
         // ATJSSDK.printLog("AnyThinkNativeDemo::onNativeAdClick(" + placementId + ", " + callbackInfo + ")");
         let data = JSON.parse(callbackInfo)
         gData.adData.updateADLog(53, placementId, data);
+
+        if (this.singleClick) {
+            this.singleClick = false;
+            gData.adData.updateADLog(73, placementId, data);
+        }
     }
 }
 

+ 8 - 0
assets/script/mk/sdk/ad/toppon/AnyThinkAdsMgr/ATRewardVideo.ts

@@ -18,6 +18,8 @@ export class ATRewardVideo extends zgSingleton {
     public ifLoadShow: boolean = false;
     /**是否观看完毕 */
     public canGet: boolean = false;
+    /** 去重点击状态 */
+    private singleClick = false;
 
     init() {
         this.ATRewardVideoJS = cc["ATRewardVideoJS"];
@@ -146,6 +148,7 @@ export class ATRewardVideo extends zgSingleton {
 
         //点击关闭的时候重新加载(亲测,即使在start这边 加载 也是在点击关闭时候才返回成功)
         //this.loadAd();
+        this.singleClick = true;
     }
 
     /**
@@ -202,6 +205,11 @@ export class ATRewardVideo extends zgSingleton {
         mk.data.sendDataEvent(DataEventId.Ad_click, mk.ad.videoAdType);
         let data = JSON.parse(callbackInfo)
         gData.adData.updateADLog(51, placementId, data);
+
+        if (this.singleClick) {
+            this.singleClick = false;
+            gData.adData.updateADLog(71, placementId, data);
+        }
     }
 
     /**

+ 3 - 0
assets/script/mk/system/AdSystem.ts

@@ -203,7 +203,10 @@ export default class AdSystem {
         }
 
         if (gap_time_stamp < needTime) {
+            console.log(`AdSystem======curSolution=>${gData.warnTipData.curSolution}`);
+            console.log(`AdSystem======needTime=>${needTime}====gap_time_stamp=>${gap_time_stamp}`)
             const time = Math.ceil((needTime - gap_time_stamp) / 1000);
+            console.log(`AdSystem======time=>${time}`);
             const leftTime = mk.time.formatWithUnit(time);
             mk.tip.pop('当前看视频太频繁了,请' + leftTime + '后再试');
 

+ 31 - 0
assets/script/mk/system/DataSystem.ts

@@ -25,6 +25,7 @@ export default class DataSystem {
         console.log("===[DataSystem", eventId, des);
         if (eventId && des) {
             JsbSystem.sendEvent(eventId, des);
+            this.sendXYTrack(eventId, 'des', des);
         }
     }
 
@@ -37,6 +38,7 @@ export default class DataSystem {
         console.log("===[DataSystem", eventId, des, value);
         if (eventId && des) {
             JsbSystem.sendEventValue(eventId, des, value);
+            this.sendXYTrack(eventId, des, value);
         }
     }
 
@@ -86,4 +88,33 @@ export default class DataSystem {
             mk.http.sendData('cp', data);
         }
     }
+
+    private xyTrackUrl = 'https://hyperion-track-app.mokamrp.com/';
+    /**
+     * 星云打点 Track
+     */
+    public sendXYTrack(eventId: string, des: string, value: number | string) {
+        const event_value = {}
+        event_value[des] = value
+
+        let data = {
+            app_id: '30WAK1lNDc0b99LzSOJqv3TXa',
+            app_type: 1,
+            app_ver: gData.appData.appVersion,
+            app_channel: gData.appData.tfChannel,
+            report_time: Date.now(),
+            user_id: gData.loginData.uin,
+            device_id: "",
+            os_type: 1,
+            user_agent: gData.appData.UA,
+            imei: gData.appData.machineInfo.imei,
+            ifda: gData.appData.machineInfo.idfa,
+            oaid: gData.appData.machineInfo.oaid,
+            event_id: eventId,
+            event_value: JSON.stringify(event_value)
+        }
+
+        let url = this.xyTrackUrl + 'track';
+        mk.http.sendRequestNormal(url, 'POST', JSON.stringify(data));
+    }
 }

+ 53 - 1
assets/script/mk/system/HttpSystem.ts

@@ -108,11 +108,63 @@ export default class HttpSystem {
         response.data = data;
 
         if (response.errcode != 0) {
-            if (response.errcode == -10003 || response.errcode == -20003) {
+            if (response.errcode == 403) {
                 gData.warnTipData.setSolution(4);
             }
         }
 
         return response;
     }
+
+    /**
+     * http普通请求
+     * @param url 请求头
+     * @param method 'GET' || 'POST' 
+     * @param data 数据
+     * @param isRsa 是否加密
+     * @param async 是否异步请求
+     */
+    public sendRequestNormal(url, method: string = 'POST', data: string = null) {
+        return new Promise<any>((resolve: (data: any) => void, reject) => {
+            let requesttimes = 0;
+            let httpRequest = new XMLHttpRequest();
+            let send = () => {
+                httpRequest.open(method, url);
+                httpRequest.setRequestHeader("Content-Type", 'application/json;charset=UTF-8');
+                httpRequest.send(data);
+            };
+
+            // httpRequest.timeout = 30000;
+            httpRequest.onreadystatechange = function () {
+                if (httpRequest.readyState === 4) {
+                    if (httpRequest.status === 200) {
+                        var responseStr = httpRequest.responseText;
+                        let response = JSON.parse(responseStr);
+                        mk.console.logSingle("response:" + url, response)
+                        resolve(response);
+                    }
+                    else {
+                        mk.console.error("httpRequest.status", httpRequest.status);
+                        reject({ errcode: 1, errmsg: "status..." + httpRequest.status });
+                    }
+                }
+            }
+
+            httpRequest.ontimeout = function (e) {
+                requesttimes++;
+                if (requesttimes >= 3) {
+                    mk.console.error("http.ontimeout", url);
+                    reject({ errcode: 1, errmsg: "ontimeout" });
+                }
+                else {
+                    send();
+                }
+            };
+            httpRequest.onerror = function (e) {
+                mk.console.error("http.onerror", url);
+                reject({ errcode: 1, errmsg: "onerror" });
+            };
+            send();
+        });
+    }
 }

+ 6 - 0
assets/script/mk/system/JsbSystem.ts

@@ -513,6 +513,7 @@ export default class JsbSystem {
         }
     }
 
+    private static singleClick = true;
     private static splashADid = '';
     /** 上传开屏广告星云埋点 */
     public static updateSplashAdLog(info) {
@@ -545,6 +546,11 @@ export default class JsbSystem {
     public static clickSplash() {
         mk.data.sendDataEvent(DataEventId.Ad_click, 'splash_click');
         gData.adData.updateADLog(54, this.splashADid);
+
+        if (this.singleClick) {
+            this.singleClick = false;
+            gData.adData.updateADLog(74, this.splashADid);
+        }
     }
 
     /** 获取阿里风控设备token */

+ 1 - 1
build/jsb-link/assets/resources/import/08/08cd98e8-cbd9-44c8-8cb6-09609780aa3c.json

@@ -1 +1 @@
-[1,["b6EIzAa+tHBpfcR1apW/DX"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"logo","rect":[0,0,477,308],"offset":[-0.5,1],"originalSize":[478,310],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]
+[1,["b6EIzAa+tHBpfcR1apW/DX"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"logo","rect":[0,0,365,242],"offset":[0,0],"originalSize":[365,242],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
build/jsb-link/assets/resources/import/3a/3a7bf8d2-c130-45c0-b451-f70ecb4c3c25.json


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
build/jsb-link/assets/resources/import/b4/b4dea4a9-29c8-46bc-a50d-5754afa7a2bd.json


+ 1 - 0
build/jsb-link/assets/resources/import/de/ded8d2bb-9a3a-44b1-9a93-694edc1b693c.json

@@ -0,0 +1 @@
+[1,["ff/VskASpDdrwguIlZBIi3"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"piazi","rect":[0,0,204,190],"offset":[0,0],"originalSize":[204,190],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
build/jsb-link/assets/resources/import/f7/f7b563d2-2a35-4ed4-b0b0-05dd74c0033f.json


+ 1 - 0
build/jsb-link/assets/resources/import/ff/fffd5b24-012a-4376-bc20-b889590488b7.json

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

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

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

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
build/jsb-link/assets/resources/native/a8/a81eb395-718d-4f3b-958c-cb871f7dd5fa.manifest


BIN
build/jsb-link/assets/resources/native/b6/b6108cc0-6beb-4706-97dc-4756a95bf0d7.png


BIN
build/jsb-link/assets/resources/native/ff/fffd5b24-012a-4376-bc20-b889590488b7.png


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

@@ -4,7 +4,7 @@ JL_CHANNEL="juliang";    //巨量渠道
 KS_AID="67132";        //快手appid
 KS_ANAME="EasyEliminate";      //快手appname
 KS_CHANNEL="kuaishou";    //快手渠道
-UM_AID="614a8a112a91a03cef4de02c"; //友盟appid
+UM_AID="6165593d14e22b6a4f1e16a2"; //友盟appid
 UM_CHANNEL="oppo"; //友盟渠道
 UM_SECRET="";       //友盟秘钥
 WX_APP_ID="wxd98fe9d52af10e59"; //微信appidUM_CHANNEL

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
packages-hot-update/manifest/project.manifest


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

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

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


+ 1 - 1
settings/project.json

@@ -36,6 +36,6 @@
       "enable": false
     }
   },
-  "last-module-event-record-time": 1633658448730,
+  "last-module-event-record-time": 1634352566472,
   "start-scene": "6f522a54-3e0e-404d-a06c-bec8b4307c95"
 }

Неке датотеке нису приказане због велике количине промена