wuwangdong před 4 roky
rodič
revize
8c2a9a1bc3
29 změnil soubory, kde provedl 2699 přidání a 177 odebrání
  1. 1983 69
      assets/resources/game/prefab/game.prefab
  2. 0 0
      assets/resources/module/login/hot/project.manifest
  3. 1 1
      assets/resources/module/login/hot/version.manifest
  4. 10 6
      assets/script/before/main/FarmIcon.ts
  5. 2 0
      assets/script/before/view/data/HarvestData.ts
  6. 2 1
      assets/script/before/view/ui/HarvestPanel.ts
  7. 18 1
      assets/script/game/data/GameData.ts
  8. 1 1
      assets/script/game/data/HttpData.ts
  9. 23 1
      assets/script/game/game/Game.ts
  10. 181 0
      assets/script/game/game/HorseRace.ts
  11. 9 0
      assets/script/game/game/HorseRace.ts.meta
  12. 2 1
      assets/script/game/module/blessingBag/BlessingBag.ts
  13. 2 1
      assets/script/game/module/gradeReward/GradeReward.ts
  14. 2 1
      assets/script/game/module/newCashUI/WalletCashOut.ts
  15. 3 0
      assets/script/game/module/newOpenRedBag/NewOpenRedBag.ts
  16. 1 1
      assets/script/mk/utils/LogUtil.ts
  17. binární
      build/jsb-link/assets/main/index.jsc
  18. 0 0
      build/jsb-link/assets/resources/config.json
  19. 0 0
      build/jsb-link/assets/resources/import/b4/b4dea4a9-29c8-46bc-a50d-5754afa7a2bd.json
  20. 1 1
      build/jsb-link/assets/resources/native/9e/9ed98385-f23f-41b7-a2bc-27a1d4ad9fd6.manifest
  21. 0 0
      build/jsb-link/assets/resources/native/a8/a81eb395-718d-4f3b-958c-cb871f7dd5fa.manifest
  22. binární
      build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/caches/build_file_checksums.ser
  23. 59 59
      build/jsb-link/js backups (useful for debugging)/cocos2d-jsb.js
  24. 395 29
      build/jsb-link/js backups (useful for debugging)/main.index.js
  25. binární
      build/jsb-link/src/cocos2d-jsb.jsc
  26. 3 3
      packages-hot-update/cfg.json
  27. 0 0
      packages-hot-update/manifest/project.manifest
  28. 1 1
      packages-hot-update/manifest/version.manifest
  29. binární
      packages-hot-update/versions/ver_1_0.6.zip

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 1983 - 69
assets/resources/game/prefab/game.prefab


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
assets/resources/module/login/hot/project.manifest


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

@@ -1 +1 @@
-{"version":"1.0.6","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"}
+{"version":"1.0.6","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfTest/baseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfTest/baseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfTest/baseRemote/version.manifest"}

+ 10 - 6
assets/script/before/main/FarmIcon.ts

@@ -26,6 +26,7 @@ export class FarmIcon extends cc.Component {
     public get state(): FarmState { return this._state; }
     public data = null;
     onLoad() {
+        //this.plantIcon.node.active = false;
         let helper = this.getComponent(IDHelper);
         this.configID = helper.buildID;
         this.sortID = helper.sortID;
@@ -191,7 +192,7 @@ export class FarmIcon extends cc.Component {
             this.plantIcon.spriteFrame = await mk.loader.load("game/coregame/texture/plant_icons/plantIcon_" + this.plantID, cc.SpriteFrame);
             this.plantIcon.getComponent(cc.Animation).play();
             this.plantIcon.getComponent(cc.Animation).on(cc.Animation.EventType.FINISHED, this.onPlantAnimationFinish, this);
-
+            //this.doMakePlantFinishLogic();
             let flyRed = await gData.gameData.updateNewTaskProgress();
             return flyRed;
         }
@@ -213,10 +214,7 @@ export class FarmIcon extends cc.Component {
         gData.gameData.setFarmDataMap(this.configID, this.data, sendToServer);
     }
 
-    private async onPlantAnimationFinish() {
-        this.plantIcon.getComponent(cc.Animation).off(cc.Animation.EventType.FINISHED, this.onPlantAnimationFinish, this);
-        this.plantIcon.node.active = false;
-
+    private doMakePlantFinishLogic() {
         let config = gData.gameData.getProductMap(this.plantID);
         if (mk.guide.getCurGuideIdString() == "10_2") {
             this.data.growSpan = 0;
@@ -228,10 +226,16 @@ export class FarmIcon extends cc.Component {
         }
         this.data.productID = this.plantID;
         gData.gameData.setFarmDataMap(this.configID, this.data);
-
         gData.gameData.isProducting = false;
     }
 
+    private async onPlantAnimationFinish() {
+        this.plantIcon.getComponent(cc.Animation).off(cc.Animation.EventType.FINISHED, this.onPlantAnimationFinish, this);
+        this.plantIcon.node.active = false;
+
+        this.doMakePlantFinishLogic();
+    }
+
     public novice_plant(): void {
         this.process.setData(this.data);
     }

+ 2 - 0
assets/script/before/view/data/HarvestData.ts

@@ -1,6 +1,7 @@
 /**收获界面数据类 */
 
 import { RateConfig } from "../../../game/data/AdData";
+import { DataEventId } from "../../../game/data/GameData";
 import Guide from "../../../game/module/guide/Guide";
 import { Data } from "../../../mk/data/Data";
 
@@ -124,6 +125,7 @@ export default class HarvestData extends Data {
         if(!isTeaching)
         {
             gData.adData.checkShowFullInter(4);
+            mk.data.sendDataEvent(DataEventId.htRedBag_scene, "点击可收获");
         }
     }
 

+ 2 - 1
assets/script/before/view/ui/HarvestPanel.ts

@@ -3,7 +3,7 @@
  */
 
 import { AdFun } from "../../../game/data/AdData";
-import { BannerAdType, InterFullAdType, VideoAdType } from "../../../game/data/GameData";
+import { BannerAdType, DataEventId, InterFullAdType, VideoAdType } from "../../../game/data/GameData";
 
 const { ccclass, property } = cc._decorator;
 
@@ -71,6 +71,7 @@ export default class HarvestPanel extends cc.Component {
         mk.ad.showNative();
 
         gData.adData.checkShowFullInter(4);
+        mk.data.sendDataEvent(DataEventId.htRedBag_scene, "点击可收获");
     }
 
     onDisable() {

+ 18 - 1
assets/script/game/data/GameData.ts

@@ -116,6 +116,8 @@ export class GameData {
     public productionAdMaxTimes = 20;
 
     public popTipCallBack: Function = null;
+
+    public orderAinFinishNum = 0;
     /**
      * 初始化游戏数据:网络配置信息,用户信息
      * @returns 
@@ -324,6 +326,17 @@ export class GameData {
         }
     }
 
+    public setOrderAniFinishNum()
+    {
+        ++this.orderAinFinishNum;
+        if(this.orderAinFinishNum >= 3){
+            this.orderAinFinishNum = 0;
+            setTimeout(() => {
+                mk.event.emit("flyOrderAni");
+            }, 500)      
+        }
+    }
+
     /**
      * 保存单个数据
      */
@@ -2188,7 +2201,11 @@ export enum DataEventId {
     /** 离线生产次数弹出 */
     offlineProductTimes = "offlineProductTimes",
     /**触发提现到达上限 */
-    cashLimit = "cashLimit"
+    cashLimit = "cashLimit",
+    /**互推红包弹出位置 */
+    htRedBag_scene = "htRedBag_scene",
+    /**互推红包弹出和领取次数 */
+    htRedBag_second = "htRedBag_second"
 }
 
 

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

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

+ 23 - 1
assets/script/game/game/Game.ts

@@ -118,6 +118,12 @@ export default class Game extends cc.Component {
     @property({ displayName: '红包币图标', type: cc.Node })
     node_orderHb: cc.Node = null;
 
+    @property({ displayName: '额外订单ui节点', type: cc.Node })
+    node_extraOrderUi: cc.Node = null;
+    @property({ displayName: '额外订单背景节点', type: cc.Node })
+    node_bgUi: cc.Node = null;
+
+
     posY = 0;
     /** 是否开始增加次数倒计时 */
     private lastTimeSpan = 0;
@@ -1071,10 +1077,23 @@ export default class Game extends cc.Component {
         // mk.ui.openPanel('module/reward/reward');
         
         //处理提现逻辑
-        gData.cashPro.callBack = this.showTips;
+        gData.cashPro.callBack = this.getRewardCallBack.bind(this);
         gData.receiptNotice.receip_rmb = addMoney;
         mk.ui.openPanel('module/newNotice/newNotice');
+        
+    }
+
+    public getRewardCallBack()
+    {
+        this.node_extraOrderUi.active = true;
+        this.node_bgUi.scale = 0;
+        cc.tween(this.node_bgUi).to(0.4, {scale: 1.4}).start();
+    }
+
+    public showRefreshLogic()
+    {
         this.initOrderUI();
+        this.showTips();
         gData.gameData.init_order = true;
         gData.gameData.checkTaskFinishUnLock();
         gData.safeDepositBoxData.updateQipao();
@@ -1202,11 +1221,14 @@ export default class Game extends cc.Component {
     }
 
     public async updataOrderProgress(id) {
+
+        console.log("-=-=-=-=-=-=-=1");
         let data = { "id": id };
         let response = await mk.http.sendData('orderTask/updateUserOrderTaskInfo', data);
         if (response.errcode != 0) {
             return null;
         }
+        console.log("-=-=-=-=-=-=-=2");
 
         gData.gameData.playerProp.orderData = response.data.userOrderTaskInfo;
     }

+ 181 - 0
assets/script/game/game/HorseRace.ts

@@ -0,0 +1,181 @@
+import MathUtil from "../../mk/utils/MathUtil";
+import { ProductType } from "../data/GameData";
+
+const { ccclass, property } = cc._decorator;
+@ccclass
+export default class HorseRace extends cc.Component {
+
+    @property({ displayName: '图片节点1', type: cc.Sprite })
+    sp_icon_1: cc.Sprite = null;
+    @property({ displayName: '图片节点2', type: cc.Sprite })
+    sp_icon_2: cc.Sprite = null;
+    @property({ displayName: '延时(秒)' })
+    delayTime = 0;
+    @property({ displayName: '1与2的之间的距离' })
+    distance = 97;
+    @property({ displayName: '速率' })
+    curSpeed = 5;
+    @property({ displayName: '刷新次数' })
+    refreshTimes = 5;
+    @property({ displayName: '最快速度展示的次数' })
+    maxShowTimes = 10;
+    @property({ displayName: '数据索引' })
+    index = 0;
+
+    @property({ displayName: '飞行动画节点', type: cc.Node })
+    node_fly: cc.Node = null;
+    @property({ displayName: '飞行终点节点', type: cc.Node })
+    node_des: cc.Node = null;
+    @property({ displayName: 'hide节点', type: cc.Node })
+    node_hide: cc.Node = null;
+    @property({ displayName: '回调', type: cc.Component.EventHandler})
+    callBack: cc.Component.EventHandler = null;
+
+    private node_icon_1: cc.Node = null;
+    private node_icon_2: cc.Node = null;
+    private iconPath = "game/coregame/texture/plant_icons/plantIcon_";
+    private times = 0;
+    private arrData = null;
+    private realyPicture = 0;
+    private delay = 0
+    private isFinish = false;
+    private slowSpeedRefreshTimes = 0
+    private randArr = [];
+    private curRand = -1;
+    private speed = 0
+    start() {
+        this.node_icon_1 = this.sp_icon_1.node;
+        this.node_icon_2 = this.sp_icon_2.node;
+        this.node_icon_2.setPosition(new cc.Vec2(0, this.distance));
+        this.delayTime = Math.floor(this.delayTime * 60);
+        this.arrData = gData.gameData.getProductArrByType(ProductType.nzw);
+        this.delay = this.delayTime;
+        this.speed = this.curSpeed;
+        for (let i = 0; i != this.arrData.length; ++i) {
+            this.randArr.push(i);
+        }
+
+        mk.event.register("flyOrderAni", this.doFlyAni.bind(this), this);
+    }
+
+    onEnable() {
+        let orderData = gData.gameData.playerProp.orderData;
+        let productJson = gData.gameData.configs.Product;
+        let id = orderData.orderTaskList[this.index];
+        this.realyPicture = productJson[id.Id - 1].picture;
+    }
+
+    sss = 0;
+    update(dt) {
+        if (this.delay <= 0 && !this.isFinish) {
+            //节点1
+            this.node_icon_1.setPosition(new cc.Vec2(0, this.node_icon_1.position.y - this.speed));
+            if (this.node_icon_1.position.y <= - this.distance) {
+                ++this.times;
+                if (this.times > this.maxShowTimes) {
+                    if (this.speed != 3) {
+                        // let s = ((this.refreshTimes - (this.times - this.maxShowTimes)) / this.refreshTimes);
+                        // if(s > 1){
+                        //     s = 1;
+                        // }
+                        // this.speed *= s;
+                        // this.speed = Math.ceil(this.speed);
+
+                        ++this.sss;
+                        let aa = 2 + this.sss * 0.1;
+                        this.speed -= aa;
+                        if (this.speed < 3) {
+                            this.speed = 2;
+                            ++this.slowSpeedRefreshTimes;
+                        }
+                    } else {
+                        ++this.slowSpeedRefreshTimes;
+                    }
+                }
+
+                this.node_icon_1.setPosition(new cc.Vec2(0, this.distance));
+                if (this.slowSpeedRefreshTimes >= 1) {
+                    this.refreshIcon(1, true);
+                } else {
+                    this.refreshIcon(1);
+                }
+
+            }
+
+            //节点2
+            this.node_icon_2.setPosition(new cc.Vec2(0, this.node_icon_2.position.y - this.speed));
+            if (this.node_icon_2.position.y <= - this.distance) {
+                this.node_icon_2.setPosition(new cc.Vec2(0, this.distance));
+                
+                if (this.slowSpeedRefreshTimes >= 1) {
+                    this.isFinish = true;
+                    this.node_icon_1.setPosition(0, 0);
+                    gData.gameData.setOrderAniFinishNum();
+                } else {
+                    this.refreshIcon(2);
+                }
+            }
+        } else {
+            --this.delay;
+        }
+    }
+
+    tests = 0;
+    private async refreshIcon(index, isOver = false) {
+        if (isOver) {
+            this.sp_icon_1.spriteFrame = await mk.loader.load(this.iconPath + this.realyPicture, cc.SpriteFrame);
+            if (this.curRand != -1) {
+                this.randArr.push(this.curRand);
+            }
+        } else {
+            let rand = mk.math.random(0, this.randArr.length - 1);
+            this.randArr.splice(rand, 1);
+            let picId = this.arrData[rand].picture;
+            if (this.curRand != -1) {
+                this.randArr.push(this.curRand);
+            }
+            this.curRand = rand;
+            if(this.index == 0)
+            {
+                ++this.tests;
+                console.log(`=====${this.tests}====${rand}`);
+            }
+            if (index == 1) {
+                this.sp_icon_1.spriteFrame = await mk.loader.load(this.iconPath + picId, cc.SpriteFrame);
+            } else {
+                this.sp_icon_2.spriteFrame = await mk.loader.load(this.iconPath + picId, cc.SpriteFrame);
+            }
+        }
+    }
+
+    public doFlyAni()
+    {
+        if(this.node_hide ){
+            this.node_hide.active = false
+        }
+        
+        let node = cc.instantiate(this.sp_icon_1.node);
+        node.setScale(0.32);
+        node.parent = this.node_fly;
+        let worldPos = this.sp_icon_1.node.parent.convertToWorldSpaceAR(cc.Vec2.ZERO);
+        let pos = this.node_fly.convertToNodeSpaceAR(worldPos);
+        node.setPosition(pos);
+
+        worldPos = this.node_des.parent.convertToWorldSpaceAR(this.node_des.getPosition())
+        pos = this.node_fly.convertToNodeSpaceAR(worldPos);
+
+        cc.tween(node).to(0.6, {position: cc.v3(pos)}).removeSelf().call(()=>{
+            this.callBack && this.callBack.emit(null);
+        }).start();
+
+    }
+
+    onDisable() {
+        this.delay = this.delayTime;
+        this.isFinish = false;
+        this.slowSpeedRefreshTimes = 0;
+        this.curRand = -1
+        this.times = 0;
+        this.speed = this.curSpeed;
+    }
+}

+ 9 - 0
assets/script/game/game/HorseRace.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "ac69e0aa-ef1a-44b6-9604-d9f84c7cf395",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

+ 2 - 1
assets/script/game/module/blessingBag/BlessingBag.ts

@@ -6,7 +6,7 @@
 import JsbSystem from "../../../mk/system/JsbSystem";
 import SetGray from "../../component/SetGray";
 import TableView from "../../component/TableView";
-import { VideoAdType } from "../../data/GameData";
+import { DataEventId, VideoAdType } from "../../data/GameData";
 
 
 const { ccclass, property } = cc._decorator;
@@ -292,5 +292,6 @@ export default class BlessingBag extends cc.Component {
 
     onDisable() {
         gData.adData.checkShowFullInter(4);
+        mk.data.sendDataEvent(DataEventId.htRedBag_scene, "关闭福利界面");
     }
 }

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

@@ -1,6 +1,6 @@
 import JsbSystem from "../../../mk/system/JsbSystem";
 import { UITween } from "../../component/tween/UITween";
-import { ExpAddType, VideoAdType } from "../../data/GameData";
+import { DataEventId, ExpAddType, VideoAdType } from "../../data/GameData";
 import { GradeRewardItem } from "./GradeRewardItem";
 
 
@@ -191,5 +191,6 @@ export class GradeReward extends cc.Component {
 
     onDisable() {
         gData.adData.checkShowFullInter(4);
+        mk.data.sendDataEvent(DataEventId.htRedBag_scene, "关闭农场等级奖励界面");
     }
 }

+ 2 - 1
assets/script/game/module/newCashUI/WalletCashOut.ts

@@ -1,7 +1,7 @@
 import SetGray from "../../component/SetGray";
 import TweenCast from "../../component/tween/TweenCast";
 import { AdFun } from "../../data/AdData";
-import { GameProp, VideoAdType } from "../../data/GameData";
+import { DataEventId, GameProp, VideoAdType } from "../../data/GameData";
 import CheckButton from "./CheckButton";
 
 
@@ -322,5 +322,6 @@ export default class WalletCashOut extends cc.Component {
 
     onDisable() {
         gData.adData.checkShowFullInter(4);
+        mk.data.sendDataEvent(DataEventId.htRedBag_scene, "关闭提现界面");
     }
 }

+ 3 - 0
assets/script/game/module/newOpenRedBag/NewOpenRedBag.ts

@@ -52,6 +52,8 @@ export default class NewOpenRedBag extends cc.Component {
 
     showElectUI() {
         this.sendRecommendList();
+
+        mk.data.sendDataEvent(DataEventId.htRedBag_second, "互推红包弹出次数");
     }
 
     async sendRecommendList() {
@@ -171,6 +173,7 @@ export default class NewOpenRedBag extends cc.Component {
         mk.ui.closePanel(this.name);
         if (this.sp_icon.node.active) {
             this.creatorDownLoadTask();
+            mk.data.sendDataEvent(DataEventId.htRedBag_second, "互推红包领取次数");
         }
         else {
             mk.ad.watchAd(async (success: boolean) => {

+ 1 - 1
assets/script/mk/utils/LogUtil.ts

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

binární
build/jsb-link/assets/main/index.jsc


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
build/jsb-link/assets/resources/config.json


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 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.6","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"}
+{"version":"1.0.6","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfTest/baseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfTest/baseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfTest/baseRemote/version.manifest"}

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
build/jsb-link/assets/resources/native/a8/a81eb395-718d-4f3b-958c-cb871f7dd5fa.manifest


binární
build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/caches/build_file_checksums.ser


+ 59 - 59
build/jsb-link/js backups (useful for debugging)/cocos2d-jsb.js

@@ -36487,12 +36487,12 @@ return e.join("");
 253: [ (function(t, e, i) {
 "use strict";
 i.__esModule = !0;
-i.default = z;
+i.default = O;
 i.unpackJSONs = function(t, e) {
 if (t[0] < f) throw new Error(cc.debug.getError(5304, t[0]));
-V(t, !0, e);
-N(t);
-for (var i = new k(t[0]), n = t[1], r = t[2], s = t[3], o = t[4], a = t[A], c = 0; c < a.length; ++c) a[c].unshift(i, n, r, s, o);
+P(t, !0, e);
+R(t);
+for (var i = new V(t[0]), n = t[1], r = t[2], s = t[3], o = t[4], a = t[g], c = 0; c < a.length; ++c) a[c].unshift(i, n, r, s, o);
 return a;
 };
 i.packCustomObjData = function(t, e, i) {
@@ -36540,7 +36540,7 @@ t.width = e[3];
 t.height = e[4];
 }, function(t, e) {
 h.default.fromArray(t, e, 1);
-} ], v = 0, g = 1, b = 2, C = 0, x = 0, A = 5, S = (function() {
+} ], v = 0, g = 5, b = (function() {
 function t() {
 this.uuidObjList = null;
 this.uuidPropList = null;
@@ -36564,13 +36564,13 @@ this.uuidList.push(i);
 };
 return t;
 })();
-S.pool = new n.default.Pool(function(t) {
+b.pool = new n.default.Pool(function(t) {
 t.reset();
 }, 5);
-S.pool.get = function() {
-return this._get() || new S();
+b.pool.get = function() {
+return this._get() || new b();
 };
-function T(t, e, i) {
+function C(t, e, i) {
 for (var n = t.length - 1, r = 0, s = 3 * t[n]; r < s; r += 3) {
 var o = t[r], a = e[t[r + 2]], c = t[r + 1];
 c >= 0 ? o[i[c]] = a : o[~c] = a;
@@ -36580,127 +36580,127 @@ var l = e[t[r]], u = e[t[r + 2]], h = t[r + 1];
 h >= 0 ? l[i[h]] = u : l[~h] = u;
 }
 }
-function w(t, e) {
-for (var i = t[4][e[x]], n = i[C], r = new (0, n[v])(), s = n[g], o = n[b], a = i[i.length - 1], c = C + 1; c < a; ++c) r[s[i[c]]] = e[c];
+function x(t, e) {
+for (var i = t[4][e[0]], n = i[0], r = new (0, n[0])(), s = n[1], o = n[2], a = i[i.length - 1], c = 1; c < a; ++c) r[s[i[c]]] = e[c];
 for (;c < e.length; ++c) {
 var l = s[i[c]], u = n[i[c] + o];
-(0, P[u])(t, r, l, e[c]);
+(0, M[u])(t, r, l, e[c]);
 }
 return r;
 }
-function E(t, e, i) {
+function A(t, e, i) {
 var r = new e();
 r._deserialize ? r._deserialize(i, t[0]) : cc.errorID(5303, n.default.getClassName(e));
 return r;
 }
-function M(t, e, i, n) {
+function S(t, e, i, n) {
 n >= 0 ? e[i] = t[5][n] : t[7][3 * ~n] = e;
 }
-function B(t) {
+function T(t) {
 return function(e, i, n, r) {
 i[n] = r;
 for (var s = 0; s < r.length; ++s) t(e, r, s, r[s]);
 };
 }
-function I(t, e, i, n) {
+function w(t, e, i, n) {
 e[i] = null;
 t[8][n] = e;
 }
-function D(t, e, i, n) {
-e[i] = w(t, n);
+function E(t, e, i, n) {
+e[i] = x(t, n);
 }
-var P = new Array(13);
-P[0] = function(t, e, i, n) {
+var M = new Array(13);
+M[0] = function(t, e, i, n) {
 e[i] = n;
 };
-P[1] = M;
-P[2] = B(M);
-P[3] = B(I);
-P[4] = D;
-P[5] = function(t, e, i, n) {
+M[1] = S;
+M[2] = T(S);
+M[3] = T(w);
+M[4] = E;
+M[5] = function(t, e, i, n) {
 y[n[0]](e[i], n);
 };
-P[6] = I;
-P[7] = function(t, e, i, n) {
+M[6] = w;
+M[7] = function(t, e, i, n) {
 e[i].set(n);
 };
-P[8] = function(t, e, i, n) {
+M[8] = function(t, e, i, n) {
 var r = new p[n[0]]();
 y[n[0]](r, n);
 e[i] = r;
 };
-P[9] = B(D);
-P[10] = function(t, e, i, n) {
+M[9] = T(E);
+M[10] = function(t, e, i, n) {
 var r = t[3][n[0]];
-e[i] = E(t, r, n[1]);
+e[i] = A(t, r, n[1]);
 };
-P[11] = function(t, e, i, n) {
+M[11] = function(t, e, i, n) {
 var r = n[0];
 e[i] = r;
 for (var s = 1; s < n.length; s += 3) {
 var o = n[s], a = n[s + 1], c = n[s + 2];
-(0, P[a])(t, r, o, c);
+(0, M[a])(t, r, o, c);
 }
 };
-P[12] = function(t, e, i, n) {
+M[12] = function(t, e, i, n) {
 var r = n[0];
 e[i] = r;
 for (var s = 0; s < r.length; ++s) {
 var o = r[s], a = n[s + 1];
-0 !== a && (0, P[a])(t, r, s, o);
+0 !== a && (0, M[a])(t, r, s, o);
 }
 };
-function R(t) {
+function B(t) {
 var e = t[5], i = t[6], n = i === d ? 0 : i.length, r = e[e.length - 1], s = e.length - n;
 if ("number" != typeof r) r = 0; else {
 r < 0 && (r = ~r);
 --s;
 }
-for (var o = 0; o < s; ++o) e[o] = w(t, e[o]);
+for (var o = 0; o < s; ++o) e[o] = x(t, e[o]);
 for (var a = t[3], c = 0; c < n; ++c, ++o) {
 var l = i[c], u = e[o];
 if (l >= 0) {
 var h = a[l];
-e[o] = E(t, h, u);
-} else (0, P[l = ~l])(t, e, o, u);
+e[o] = A(t, h, u);
+} else (0, M[l = ~l])(t, e, o, u);
 }
 return r;
 }
-function L(t, e) {
-t || z.reportMissingClass(e);
+function I(t, e) {
+t || O.reportMissingClass(e);
 return Object;
 }
-function O(t, e, i, n, r, s) {
+function D(t, e, i, n, r, s) {
 var o = t(e);
 if (!o) {
 if (r) {
 i[n] = (function(e, i, n) {
 return function() {
-var r = t(n) || L(s, n);
+var r = t(n) || I(s, n);
 e[i] = r;
 return new r();
 };
 })(i, n, e);
 return;
 }
-o = L(s, e);
+o = I(s, e);
 }
 i[n] = o;
 }
-function V(t, e, i) {
+function P(t, e, i) {
 for (var r = i || n.default._getClassById, s = t[3], o = 0; o < s.length; ++o) {
 var a = s[o];
-"string" != typeof a ? O(r, a[v], a, v, e, i) : O(r, a, s, o, e, i);
+"string" != typeof a ? D(r, a[0], a, v, e, i) : D(r, a, s, o, e, i);
 }
 }
-function N(t) {
+function R(t) {
 var e = t[4];
 if (e) for (var i = t[3], n = 0; n < e.length; ++n) {
 var r = e[n];
-r[C] = i[r[C]];
+r[0] = i[r[0]];
 }
 }
-function F(t) {
+function L(t) {
 for (var e = t[5], i = t[2], n = t[1], r = t[8], s = t[9], o = t[10], a = 0; a < r.length; ++a) {
 var c = r[a];
 "number" == typeof c && (r[a] = e[c]);
@@ -36713,10 +36713,10 @@ var u = o[a];
 "number" == typeof u && (o[a] = n[u]);
 }
 }
-function z(t, e, i) {
+function O(t, e, i) {
 "string" == typeof t && (t = JSON.parse(t));
 var n = !e;
-(e = e || S.pool.get()).init(t);
+(e = e || b.pool.get()).init(t);
 i = i || {};
 var r = t[0], s = !1;
 if ("object" == typeof r) {
@@ -36728,19 +36728,19 @@ i._version = r;
 i.result = e;
 t[0] = i;
 if (!s) {
-V(t, !1, i.classFinder);
-N(t);
+P(t, !1, i.classFinder);
+R(t);
 }
 cc.game._isCloning = !0;
-var o = t[5], a = R(t);
+var o = t[5], a = B(t);
 cc.game._isCloning = !1;
-t[7] && T(t[7], o, t[2]);
-F(t);
-n && S.pool.put(e);
+t[7] && C(t[7], o, t[2]);
+L(t);
+n && b.pool.put(e);
 return o[a];
 }
-z.Details = S;
-var k = function(t) {
+O.Details = b;
+var V = function(t) {
 this.preprocessed = !0;
 this.version = t;
 };

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 395 - 29
build/jsb-link/js backups (useful for debugging)/main.index.js


binární
build/jsb-link/src/cocos2d-jsb.jsc


+ 3 - 3
packages-hot-update/cfg.json

@@ -1,6 +1,6 @@
 {
     "version": "1.0.6",
-    "serverRootDir": "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsf/baseRemote/",
+    "serverRootDir": "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfTest/baseRemote/",
     "resourceRootDir": "D:\\projects\\team1_nc\\build\\jsb-link",
     "genManifestDir": "",
     "hotAddressArray": [
@@ -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": 1637046508548,
-    "genTime": 1637046508548,
+    "buildTime": 1637304155390,
+    "genTime": 1637304155390,
     "genVersion": null
 }

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
packages-hot-update/manifest/project.manifest


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

@@ -1 +1 @@
-{"version":"1.0.6","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"}
+{"version":"1.0.6","packageUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfTest/baseRemote/","remoteManifestUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfTest/baseRemote/project.manifest","remoteVersionUrl":"https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kncdsfTest/baseRemote/version.manifest"}

binární
packages-hot-update/versions/ver_1_0.6.zip


Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů