diff --git a/assets/Scene/HomeScene.fire b/assets/Scene/HomeScene.fire index 0cf0e62..93003aa 100644 --- a/assets/Scene/HomeScene.fire +++ b/assets/Scene/HomeScene.fire @@ -24212,7 +24212,8 @@ }, { "__uuid__": "9e768017-b9e7-4003-94dc-2f90936f098f" - } + }, + null ], "liuGuang": null, "avatarUI": { diff --git a/assets/Script/Block.ts b/assets/Script/Block.ts index f21814c..31ea31a 100644 --- a/assets/Script/Block.ts +++ b/assets/Script/Block.ts @@ -1007,7 +1007,7 @@ export default class Block extends cc.Component { clearTimeout(this.scheduleCallback3); let self = this; //锤子状态消失 - MapConroler._instance.pause = true; + if (MapConroler && MapConroler._instance) MapConroler._instance.pause = true; if (MapConroler._instance.ismagic) { this.scheduleCallback = setTimeout(() => { @@ -1121,7 +1121,7 @@ export default class Block extends cc.Component { let self = this; this.isEliminatedByHammer = true; //锤子状态消失 - MapConroler._instance.pause = true; + if (MapConroler && MapConroler._instance) MapConroler._instance.pause = true; if (MapConroler._instance.ishammer == true) { let parentSize = this.node.getContentSize(); setTimeout(() => { diff --git a/assets/Script/GameManager.ts b/assets/Script/GameManager.ts index 6fb79e7..5fa13bb 100644 --- a/assets/Script/GameManager.ts +++ b/assets/Script/GameManager.ts @@ -237,10 +237,13 @@ export default class GameManager extends cc.Component { if (data.data.onlyId) { cc.fx.GameConfig.GM_INFO.userId = data.data.onlyId; } - if (data.data.outTradeNo.length > 0) { - cc.fx.GameConfig.GM_INFO.allOutTradeNo = []; - cc.fx.GameConfig.GM_INFO.allOutTradeNo = data.data.outTradeNo; + if (data.data.outTradeNo) { + if (data.data.outTradeNo.length > 0) { + cc.fx.GameConfig.GM_INFO.allOutTradeNo = []; + cc.fx.GameConfig.GM_INFO.allOutTradeNo = data.data.outTradeNo; + } } + if (data.data.shareLv) { if (data.data.shareLv.length > 0) { cc.fx.GameConfig.GM_INFO.helpLevel = data.data.shareLv[0].lv; @@ -251,8 +254,11 @@ export default class GameManager extends cc.Component { } if (data.data.useravatar) { cc.fx.GameConfig.GM_INFO.useravatarIcon = data.data.useravatar; - if (cc.fx.GameConfig.GM_INFO.useravatarIcon.length < 10) - cc.fx.GameConfig.GM_INFO.useravatarIcon = "icon_" + cc.fx.GameConfig.GM_INFO.useravatarIcon + if (cc.fx.GameConfig.GM_INFO.useravatarIcon) { + if (cc.fx.GameConfig.GM_INFO.useravatarIcon.length < 10) + cc.fx.GameConfig.GM_INFO.useravatarIcon = "icon_" + cc.fx.GameConfig.GM_INFO.useravatarIcon + } + } if (data.data.useravatarIcon) { cc.fx.GameConfig.GM_INFO.useravaterkuang = data.data.useravatarIcon; diff --git a/assets/Script/JiaZai.ts b/assets/Script/JiaZai.ts index cce97da..398c987 100644 --- a/assets/Script/JiaZai.ts +++ b/assets/Script/JiaZai.ts @@ -352,8 +352,10 @@ export default class JiaZai extends cc.Component { cc.fx.GameTool.getHealth((data) => { if (this.level) { NumberToImage.numberToImageNodesShop((cc.fx.GameConfig.GM_INFO.level + 1), 43, 15, "custom", this.level, true); - for (let i = 0; i < this.level.children.length; i++) { - this.level.children[i].color = cc.Color.BLACK; + if (this.level.children) { + for (let i = 0; i < this.level.children.length; i++) { + this.level.children[i].color = cc.Color.BLACK; + } } } if (this.coin) { @@ -388,8 +390,10 @@ export default class JiaZai extends cc.Component { cc.fx.GameTool.getHealth((data) => { NumberToImage.numberToImageNodesShop((cc.fx.GameConfig.GM_INFO.level + 1), 43, 15, "custom", this.level, true); - for (let i = 0; i < this.level.children.length; i++) { - this.level.children[i].color = cc.Color.BLACK; + if (this.level.children) { + for (let i = 0; i < this.level.children.length; i++) { + this.level.children[i].color = cc.Color.BLACK; + } } NumberToImage.numberToImageNodes5(cc.fx.GameConfig.GM_INFO.coin, 30, 15, "Black", this.coin, true); this.setHealthInfo(true); @@ -611,22 +615,25 @@ export default class JiaZai extends cc.Component { console.log("最终头像框:", cc.fx.GameConfig.GM_INFO.useravaterkuang); let top = this.node.getChildByName("Load").getChildByName("Top"); if (this.AvatarNode) this.AvatarNode.active = false; - if (cc.fx.GameConfig.GM_INFO.useravatarIcon.length > 10) { - console.log("获取头像链接:", cc.fx.GameConfig.GM_INFO.useravatarIcon); - cc.assetManager.loadRemote(cc.fx.GameConfig.GM_INFO.useravatarIcon, { ext: '.png' }, (err, texture: cc.Texture2D) => { - if (texture) { - top.getChildByName("avatar").getChildByName("avatar").getComponent(cc.Sprite).spriteFrame = new cc.SpriteFrame(texture); - } + if (cc.fx.GameConfig.GM_INFO.useravatarIcon) { + if (cc.fx.GameConfig.GM_INFO.useravatarIcon.length > 10) { + console.log("获取头像链接:", cc.fx.GameConfig.GM_INFO.useravatarIcon); + cc.assetManager.loadRemote(cc.fx.GameConfig.GM_INFO.useravatarIcon, { ext: '.png' }, (err, texture: cc.Texture2D) => { + if (texture) { + top.getChildByName("avatar").getChildByName("avatar").getComponent(cc.Sprite).spriteFrame = new cc.SpriteFrame(texture); + } + top.getChildByName("avatar").opacity = 255; + top.getChildByName("kuang1").opacity = 255; + }) + } else { + top.getChildByName("avatar").getChildByName("avatar").getComponent(cc.Sprite).spriteFrame = + this.avatarUI.getSpriteFrame(cc.fx.GameConfig.GM_INFO.useravatarIcon); top.getChildByName("avatar").opacity = 255; top.getChildByName("kuang1").opacity = 255; - }) - } else { - top.getChildByName("avatar").getChildByName("avatar").getComponent(cc.Sprite).spriteFrame = - this.avatarUI.getSpriteFrame(cc.fx.GameConfig.GM_INFO.useravatarIcon); - top.getChildByName("avatar").opacity = 255; - top.getChildByName("kuang1").opacity = 255; + } } + top.getChildByName("kuang").getComponent(cc.Sprite).spriteFrame = this.avatarUI.getSpriteFrame(cc.fx.GameConfig.GM_INFO.useravaterkuang); top.getChildByName("kuang").opacity = 255; @@ -781,20 +788,22 @@ export default class JiaZai extends cc.Component { this.scheduleCallback2 = function () { let nowTime = Math.floor(Date.now() / 1000); if (cc.fx.GameConfig.GM_INFO.userPowerTime < nowTime) { - this.Stamina.getChildByName("skyLine").active = false; + if (this.Stamina) this.Stamina.getChildByName("skyLine").active = false; this.stopPowerTime(); this.setHealthInfo(true); return; } else { - this.Stamina.getChildByName("skyLine").active = true; - this.Stamina.getChildByName("time").opacity = 0; - this.Stamina.getChildByName("man").active = false; + if (this.Stamina) { + this.Stamina.getChildByName("skyLine").active = true; + this.Stamina.getChildByName("time").opacity = 0; + this.Stamina.getChildByName("man").active = false; + } } let time = cc.fx.GameConfig.GM_INFO.userPowerTime - nowTime; if (time <= 0) { time = 0; - this.Stamina.getChildByName("skyLine").active = false; + if (this.Stamina) this.Stamina.getChildByName("skyLine").active = false; this.stopPowerTime(); this.setHealthInfo(true); var timeTemp = cc.fx.GameTool.getTimeMargin2(time); @@ -845,35 +854,44 @@ export default class JiaZai extends cc.Component { this.stopPowerTime(); this.startPowerTime(); //console.log("还有无限体力时间_____________", (cc.fx.GameConfig.GM_INFO.userPowerTime - nowTime)); - this.Stamina.getChildByName("skyLine").active = true; - this.Stamina.getChildByName("time").opacity = 0; - this.Stamina.getChildByName("man").active = false; + if (this.Stamina) { + this.Stamina.getChildByName("skyLine").active = true; + this.Stamina.getChildByName("time").opacity = 0; + this.Stamina.getChildByName("man").active = false; + } } else { - this.Stamina.getChildByName("skyLine").active = false; - //console.log("无限体力时间已过期"); - this.Stamina.getChildByName("man").active = true; + if (this.Stamina) { + this.Stamina.getChildByName("skyLine").active = false; + //console.log("无限体力时间已过期"); + this.Stamina.getChildByName("man").active = true; + } } } else { - this.Stamina.getChildByName("man").active = true; + if (this.Stamina) this.Stamina.getChildByName("man").active = true; + } + if (this.Stamina) { + this.Stamina.getChildByName("health").active = true; + NumberToImage.numberToImageNodes(cc.fx.GameConfig.GM_INFO.hp, 25, 15, "hp_", this.Stamina.getChildByName("health"), false); + this.Stamina.getChildByName("time").active = false; } - - this.Stamina.getChildByName("health").active = true; - NumberToImage.numberToImageNodes(cc.fx.GameConfig.GM_INFO.hp, 25, 15, "hp_", this.Stamina.getChildByName("health"), false); - this.Stamina.getChildByName("time").active = false; } else { - this.Stamina.getChildByName("man").active = false; - this.Stamina.getChildByName("health").active = true; - NumberToImage.numberToImageNodes(cc.fx.GameConfig.GM_INFO.hp, 25, 15, "hp_", this.Stamina.getChildByName("health"), false); - this.Stamina.getChildByName("time").active = true; + if (this.Stamina) { + this.Stamina.getChildByName("man").active = false; + this.Stamina.getChildByName("health").active = true; + NumberToImage.numberToImageNodes(cc.fx.GameConfig.GM_INFO.hp, 25, 15, "hp_", this.Stamina.getChildByName("health"), false); + this.Stamina.getChildByName("time").active = true; + } if (cc.fx.GameConfig.GM_INFO.min_Time != 0) { let time = cc.fx.GameTool.getTimeMargin(cc.fx.GameConfig.GM_INFO.min_Time); - this.Stamina.getChildByName("time").getComponent(cc.Label).string = time; - let power = cc.fx.GameTool.getUserPowerTime(); - if (!power) this.Stamina.getChildByName("time").opacity = 255; - else this.Stamina.getChildByName("time").opacity = 0; + if (this.Stamina) { + this.Stamina.getChildByName("time").getComponent(cc.Label).string = time; + let power = cc.fx.GameTool.getUserPowerTime(); + if (!power) this.Stamina.getChildByName("time").opacity = 255; + else this.Stamina.getChildByName("time").opacity = 0; + } // console.log("______________________启动计时器"); this.stopTimeCutDown(); this.startTimeCutDown(); @@ -1276,106 +1294,109 @@ export default class JiaZai extends cc.Component { } catch (e) { console.error('获取系统信息失败', e); } - if (cc.fx.GameConfig.GM_INFO.allOutTradeNo.length != 0) { - console.log("有需要补发数据", cc.fx.GameConfig.GM_INFO.allOutTradeNo); + if (cc.fx.GameConfig.GM_INFO.allOutTradeNo) { + if (cc.fx.GameConfig.GM_INFO.allOutTradeNo.length != 0) { + console.log("有需要补发数据", cc.fx.GameConfig.GM_INFO.allOutTradeNo); - // 递归函数，按顺序处理每个订单 - const processOrder = (index: number) => { - if (index >= cc.fx.GameConfig.GM_INFO.allOutTradeNo.length) { - return; // 所有订单处理完成 - } + // 递归函数，按顺序处理每个订单 + const processOrder = (index: number) => { + if (index >= cc.fx.GameConfig.GM_INFO.allOutTradeNo.length) { + return; // 所有订单处理完成 + } - let order = cc.fx.GameConfig.GM_INFO.allOutTradeNo[index]; - console.log("需要补发数据", order); - if (order.itemid == "gold_1" || order.itemid == "gold_2" || order.itemid == "gold_3" - || order.itemid == "gold_4" || order.itemid == "gold_5" || order.itemid == "gold_6" - || order.itemid == "unlimited_health_bundle_10" || order.itemid == "unlimited_health_bundle_20" - || order.itemid == "unlimited_health_bundle_30" || order.itemid == "month_Card" || "reborn_Gift" - || order.itemid == "starter_pack" || order.itemid == "battlepass" - ) { - this.openLoad(); - console.log("补发名称:", order.itemid); - let productId = order.itemid; - Utils.setPayInfo( - (res) => { - console.log("设置轮训结果:", res); - this.closeLoad(); - if (res.code === 1) { - console.log("7.14_________正式发货"); - let coinTemp = 0; - if (order.itemid == "gold_1") { coinTemp = 1200; } - else if (order.itemid == "gold_2") { coinTemp = 8000; } - else if (order.itemid == "gold_3") { coinTemp = 16000; } - else if (order.itemid == "gold_4") { coinTemp = 32000; } - else if (order.itemid == "gold_5") { coinTemp = 100000; } - else if (order.itemid == "gold_6") { coinTemp = 240000; } - else if (order.itemid == "unlimited_health_bundle_10") { coinTemp = 2500; } - else if (order.itemid == "unlimited_health_bundle_20") { coinTemp = 5000; } - else if (order.itemid == "unlimited_health_bundle_30") { coinTemp = 7500; } - else if (order.itemid == "month_Card") { - coinTemp = 6000; - cc.fx.GameConfig.GM_INFO.doubleCoin = 2; - cc.fx.GameConfig.GM_INFO.hp_Max = 7; - cc.fx.GameConfig.GM_INFO.hp = 7; - this.openLoad(); - this.buyMonthCard(productId); - } - else if (order.itemid == "reborn_Gift") { - coinTemp = 1000; - } - else if (order.itemid == "starter_pack") { - coinTemp = 3000; - cc.fx.GameConfig.GM_INFO.doubleCoin = 5; - cc.fx.GameConfig.GM_INFO.hp_Max = 5; - cc.fx.GameConfig.GM_INFO.hp = 5; - } else if (order.itemid == "battlepass") { - // 通行证订单 - this.reissuePaaCheck(); - } - let title = "充值补发奖励金币：" + coinTemp; - // MiniGameSdk.API.showToast(title); - if (order.itemid != "month_Card") cc.fx.GameTool.shopBuy(productId, true); - console.log("充值成功获得金币"); - let price = parseInt(order.goodsPrice) || 0; - // const dataSuccess = { - // outTradeNo: order.outTradeNo, - // pay_amount: price, - // payment_name: productId, - // payment_num: 1, - // type: systemType, - // } - let name = "补发充值成功" + productId; - // cc.fx.GameTool.shushu_Track("payment", dataSuccess); + let order = cc.fx.GameConfig.GM_INFO.allOutTradeNo[index]; + console.log("需要补发数据", order); + if (order.itemid == "gold_1" || order.itemid == "gold_2" || order.itemid == "gold_3" + || order.itemid == "gold_4" || order.itemid == "gold_5" || order.itemid == "gold_6" + || order.itemid == "unlimited_health_bundle_10" || order.itemid == "unlimited_health_bundle_20" + || order.itemid == "unlimited_health_bundle_30" || order.itemid == "month_Card" || "reborn_Gift" + || order.itemid == "starter_pack" || order.itemid == "battlepass" + ) { + this.openLoad(); + console.log("补发名称:", order.itemid); + let productId = order.itemid; + Utils.setPayInfo( + (res) => { + console.log("设置轮训结果:", res); + this.closeLoad(); + if (res.code === 1) { + console.log("7.14_________正式发货"); + let coinTemp = 0; + if (order.itemid == "gold_1") { coinTemp = 1200; } + else if (order.itemid == "gold_2") { coinTemp = 8000; } + else if (order.itemid == "gold_3") { coinTemp = 16000; } + else if (order.itemid == "gold_4") { coinTemp = 32000; } + else if (order.itemid == "gold_5") { coinTemp = 100000; } + else if (order.itemid == "gold_6") { coinTemp = 240000; } + else if (order.itemid == "unlimited_health_bundle_10") { coinTemp = 2500; } + else if (order.itemid == "unlimited_health_bundle_20") { coinTemp = 5000; } + else if (order.itemid == "unlimited_health_bundle_30") { coinTemp = 7500; } + else if (order.itemid == "month_Card") { + coinTemp = 6000; + cc.fx.GameConfig.GM_INFO.doubleCoin = 2; + cc.fx.GameConfig.GM_INFO.hp_Max = 7; + cc.fx.GameConfig.GM_INFO.hp = 7; + this.openLoad(); + this.buyMonthCard(productId); + } + else if (order.itemid == "reborn_Gift") { + coinTemp = 1000; + } + else if (order.itemid == "starter_pack") { + coinTemp = 3000; + cc.fx.GameConfig.GM_INFO.doubleCoin = 5; + cc.fx.GameConfig.GM_INFO.hp_Max = 5; + cc.fx.GameConfig.GM_INFO.hp = 5; + } else if (order.itemid == "battlepass") { + // 通行证订单 + this.reissuePaaCheck(); + } + let title = "充值补发奖励金币：" + coinTemp; + // MiniGameSdk.API.showToast(title); + if (order.itemid != "month_Card") cc.fx.GameTool.shopBuy(productId, true); + console.log("充值成功获得金币"); + let price = parseInt(order.goodsPrice) || 0; + // const dataSuccess = { + // outTradeNo: order.outTradeNo, + // pay_amount: price, + // payment_name: productId, + // payment_num: 1, + // type: systemType, + // } + let name = "补发充值成功" + productId; + // cc.fx.GameTool.shushu_Track("payment", dataSuccess); - // console.log("引力付费透传", price, order.outTradeNo, name); - MiniGameSdk.API.yinli_Pay(price, order.outTradeNo, name); - } - else { - MiniGameSdk.API.showToast("网络异常，充值奖励将在登录后再次发放"); - const dataFail4 = { - outTradeNo: order.outTradeNo, - pay_amount: parseInt(order.goodsPrice) || 0, - payment_name: productId, - payment_num: 1, - type: systemType, - fail_reason: "成功付款，但是发货时请求服务器失败，重新进入游戏后轮训发货又失败", + // console.log("引力付费透传", price, order.outTradeNo, name); + MiniGameSdk.API.yinli_Pay(price, order.outTradeNo, name); } - cc.fx.GameTool.shushu_Track("payment_fail", dataFail4); - } - NumberToImage.numberToImageNodes5(cc.fx.GameConfig.GM_INFO.coin, 30, 15, "Black", this.coin, true); - this.updateCoin(); - // 处理下一个订单 - processOrder(index + 1); - }, order.outTradeNo); - } else { - // 如果当前订单不处理，直接处理下一个订单 - processOrder(index + 1); - } - }; + else { + MiniGameSdk.API.showToast("网络异常，充值奖励将在登录后再次发放"); + const dataFail4 = { + outTradeNo: order.outTradeNo, + pay_amount: parseInt(order.goodsPrice) || 0, + payment_name: productId, + payment_num: 1, + type: systemType, + fail_reason: "成功付款，但是发货时请求服务器失败，重新进入游戏后轮训发货又失败", + } + cc.fx.GameTool.shushu_Track("payment_fail", dataFail4); + } + NumberToImage.numberToImageNodes5(cc.fx.GameConfig.GM_INFO.coin, 30, 15, "Black", this.coin, true); + this.updateCoin(); + // 处理下一个订单 + processOrder(index + 1); + }, order.outTradeNo); + } else { + // 如果当前订单不处理，直接处理下一个订单 + processOrder(index + 1); + } + }; - // 从第一个订单开始处理 - processOrder(0); + // 从第一个订单开始处理 + processOrder(0); + } } + } } @@ -1406,21 +1427,25 @@ export default class JiaZai extends cc.Component { if (cc.fx.GameConfig.GM_INFO.userPowerTime > nowTime) { this.stopPowerTime(); this.startPowerTime(); - //("还有无限体力时间_____________", (cc.fx.GameConfig.GM_INFO.userPowerTime - nowTime)); - this.Stamina.getChildByName("skyLine").active = true; - this.Stamina.getChildByName("time").opacity = 0; - this.Stamina.getChildByName("man").active = false; + if (this.Stamina) { + //("还有无限体力时间_____________", (cc.fx.GameConfig.GM_INFO.userPowerTime - nowTime)); + this.Stamina.getChildByName("skyLine").active = true; + this.Stamina.getChildByName("time").opacity = 0; + this.Stamina.getChildByName("man").active = false; + } } else { - this.Stamina.getChildByName("skyLine").active = false; + if (this.Stamina) this.Stamina.getChildByName("skyLine").active = false; //console.log("无限体力时间已过期"); this.setHealthInfo(true); } } else { - this.Stamina.getChildByName("skyLine").active = false; - this.Stamina.getChildByName("time").opacity = 255; - this.Stamina.getChildByName("man").active = true; + if (this.Stamina) { + this.Stamina.getChildByName("skyLine").active = false; + this.Stamina.getChildByName("time").opacity = 255; + this.Stamina.getChildByName("man").active = true; + } //console.log("没有无限体力时间"); this.setHealthInfo(true); } @@ -1822,9 +1847,12 @@ export default class JiaZai extends cc.Component { }; cc.fx.StorageMessage.setStorage("level", levelInfo); NumberToImage.numberToImageNodesShop((cc.fx.GameConfig.GM_INFO.level + 1), 43, 15, "custom", this.level, true); - for (let i = 0; i < this.level.children.length; i++) { - this.level.children[i].color = cc.Color.BLACK; + if (this.level.children) { + for (let i = 0; i < this.level.children.length; i++) { + this.level.children[i].color = cc.Color.BLACK; + } } + Utils.setUserLevel((data) => { }) } diff --git a/assets/Script/SceneManager.ts b/assets/Script/SceneManager.ts index b9544d4..2e06751 100644 --- a/assets/Script/SceneManager.ts +++ b/assets/Script/SceneManager.ts @@ -352,7 +352,7 @@ export default class SceneManager extends cc.Component { .start(); - MapConroler._instance.pause = true; + if (MapConroler && MapConroler._instance) MapConroler._instance.pause = true; MapConroler._instance.stopBoom(); } } @@ -362,7 +362,7 @@ export default class SceneManager extends cc.Component { this.shopNode.active = false; var pause = MapConroler._instance.iceTrue(); if (pause == false) { - MapConroler._instance.pause = false; + if (MapConroler && MapConroler._instance) MapConroler._instance.pause = false; if (MapConroler._instance.gameStart == true) MapConroler._instance.startBoom(); } } @@ -374,13 +374,13 @@ export default class SceneManager extends cc.Component { this.node.getChildByName("Pause").active = false; var pause = MapConroler._instance.iceTrue(); if (pause == false) { - MapConroler._instance.pause = false; + if (MapConroler && MapConroler._instance) MapConroler._instance.pause = false; if (MapConroler._instance.gameStart == true) MapConroler._instance.startBoom(); } } openPropBuy(name) { - MapConroler._instance.pause = true; + if (MapConroler && MapConroler._instance) MapConroler._instance.pause = true; MapConroler._instance.stopBoom(); this.btnName = name; @@ -458,7 +458,7 @@ export default class SceneManager extends cc.Component { } cc.fx.GameTool.shushu_Track("interface_exposure", dataInfo); cc.fx.GameConfig.GM_INFO.shopDouble = res.data.shopDouble; - MapConroler._instance.pause = true; + if (MapConroler && MapConroler._instance) MapConroler._instance.pause = true; MapConroler._instance.stopBoom(); if (!this.shopNode) { // 第一次使用，创建节点 @@ -525,7 +525,7 @@ export default class SceneManager extends cc.Component { else { var pause = MapConroler._instance.iceTrue(); if (pause == false) { - MapConroler._instance.pause = false; + if (MapConroler && MapConroler._instance) MapConroler._instance.pause = false; if (MapConroler._instance.gameStart == true) MapConroler._instance.startBoom(); } } diff --git a/assets/Script/module/Pay/Utils.ts b/assets/Script/module/Pay/Utils.ts index b29a0ca..f61e0be 100644 --- a/assets/Script/module/Pay/Utils.ts +++ b/assets/Script/module/Pay/Utils.ts @@ -1435,10 +1435,10 @@ export default class Utils { console.log("_______________s:", setData); Utils.POST("getAddressRank", setData, res => { if (res.code === 1) { - console.log("1设置城市信息成功", res); + // console.log("1设置城市信息成功", res); if (callBack) callBack(res); } else { - console.log("1设置城市信息失败", res); + // console.log("1设置城市信息失败", res); } }) diff --git a/assets/TextureBlock/block/block7.plist b/assets/TextureBlock/block/block7.plist new file mode 100644 index 0000000..5c589fc --- /dev/null +++ b/assets/TextureBlock/block/block7.plist @@ -0,0 +1,620 @@ + + + + + frames + + 11color0.png + + frame + {{128,1878},{124,132}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{124,132}} + sourceSize + {124,132} + + 11color1.png + + frame + {{1624,255},{251,128}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{251,128}} + sourceSize + {251,128} + + 11color10.png + + frame + {{374,376},{247,372}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{247,372}} + sourceSize + {247,372} + + 11color11.png + + frame + {{1128,374},{368,255}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{368,255}} + sourceSize + {368,255} + + 11color12.png + + frame + {{870,2},{250,371}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{250,371}} + sourceSize + {250,371} + + 11color13.png + + frame + {{1137,744},{364,252}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{364,252}} + sourceSize + {364,252} + + 11color14.png + + frame + {{253,1502},{372,248}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{372,248}} + sourceSize + {372,248} + + 11color15.png + + frame + {{628,1121},{370,251}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{370,251}} + sourceSize + {370,251} + + 11color16.png + + frame + {{623,2},{245,372}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{245,372}} + sourceSize + {245,372} + + 11color17.png + + frame + {{374,2},{247,372}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{247,372}} + sourceSize + {247,372} + + 11color18.png + + frame + {{2,378},{370,374}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{370,374}} + sourceSize + {370,374} + + 11color19.png + + frame + {{1755,752},{250,251}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{250,251}} + sourceSize + {250,251} + + 11color2.png + + frame + {{1385,372},{128,256}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{128,256}} + sourceSize + {128,256} + + 11color20.png + + frame + {{1755,251},{247,252}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{247,252}} + sourceSize + {247,252} + + 11color21.png + + frame + {{1258,1740},{248,255}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{248,255}} + sourceSize + {248,255} + + 11color22.png + + frame + {{1504,1364},{249,252}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{249,252}} + sourceSize + {249,252} + + 11color3.png + + frame + {{627,1876},{371,130}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{371,130}} + sourceSize + {371,130} + + 11color4.png + + frame + {{2,1129},{125,373}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{125,373}} + sourceSize + {125,373} + + 11color5.png + + frame + {{1755,1254},{251,248}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{251,248}} + sourceSize + {251,248} + + 11color6.png + + frame + {{129,754},{249,372}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{249,372}} + sourceSize + {249,372} + + 11color7.png + + frame + {{881,1117},{367,252}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{367,252}} + sourceSize + {367,252} + + 11color8.png + + frame + {{752,1493},{247,368}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{247,368}} + sourceSize + {247,368} + + 11color9.png + + frame + {{1122,2},{370,251}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{370,251}} + sourceSize + {370,251} + + 12color0.png + + frame + {{2,1878},{124,132}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{124,132}} + sourceSize + {124,132} + + 12color1.png + + frame + {{1624,2},{251,128}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{251,128}} + sourceSize + {251,128} + + 12color10.png + + frame + {{503,1502},{247,372}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{247,372}} + sourceSize + {247,372} + + 12color11.png + + frame + {{880,747},{368,255}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{368,255}} + sourceSize + {368,255} + + 12color12.png + + frame + {{623,376},{250,371}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{250,371}} + sourceSize + {250,371} + + 12color13.png + + frame + {{1135,1117},{364,252}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{364,252}} + sourceSize + {364,252} + + 12color14.png + + frame + {{129,1128},{372,248}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{372,248}} + sourceSize + {372,248} + + 12color15.png + + frame + {{875,375},{370,251}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{370,251}} + sourceSize + {370,251} + + 12color16.png + + frame + {{380,750},{245,372}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{245,372}} + sourceSize + {245,372} + + 12color17.png + + frame + {{379,1128},{247,372}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{247,372}} + sourceSize + {247,372} + + 12color18.png + + frame + {{2,2},{370,374}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{370,374}} + sourceSize + {370,374} + + 12color19.png + + frame + {{1755,500},{250,251}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{250,251}} + sourceSize + {250,251} + + 12color2.png + + frame + {{1000,1863},{128,256}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{128,256}} + sourceSize + {128,256} + + 12color20.png + + frame + {{1755,2},{247,252}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{247,252}} + sourceSize + {247,252} + + 12color21.png + + frame + {{1254,1483},{248,255}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{248,255}} + sourceSize + {248,255} + + 12color22.png + + frame + {{1389,1110},{249,252}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{249,252}} + sourceSize + {249,252} + + 12color3.png + + frame + {{254,1876},{371,130}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{371,130}} + sourceSize + {371,130} + + 12color4.png + + frame + {{2,754},{125,373}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{125,373}} + sourceSize + {125,373} + + 12color5.png + + frame + {{1755,1004},{251,248}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{251,248}} + sourceSize + {251,248} + + 12color6.png + + frame + {{2,1504},{249,372}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{249,372}} + sourceSize + {249,372} + + 12color7.png + + frame + {{1001,1486},{367,251}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{367,251}} + sourceSize + {367,251} + + 12color8.png + + frame + {{1375,2},{247,368}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{247,368}} + sourceSize + {247,368} + + 12color9.png + + frame + {{627,749},{370,251}} + offset + {0,0} + rotated + + sourceColorRect + {{0,0},{370,251}} + sourceSize + {370,251} + + + metadata + + format + 2 + realTextureFileName + block7.png + size + {2048,2048} + smartupdate + $TexturePacker:SmartUpdate:9fb9c6e2d7ec59c8a227c1b26407d2a4$ + textureFileName + block7.png + + + diff --git a/assets/TextureBlock/block/block7.plist.meta b/assets/TextureBlock/block/block7.plist.meta new file mode 100644 index 0000000..05cd4a1 --- /dev/null +++ b/assets/TextureBlock/block/block7.plist.meta @@ -0,0 +1,1071 @@ +{ + "ver": "1.2.6", + "uuid": "355fefe2-cb1b-4a3c-bc18-275da1e79b67", + "importer": "asset", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "size": { + "width": 2048, + "height": 2048 + }, + "type": "Texture Packer", + "subMetas": { + "11color0.png": { + "ver": "1.0.6", + "uuid": "53e5cc1e-d5c0-4fc7-83bd-263e437a219c", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 128, + "trimY": 1878, + "width": 124, + "height": 132, + "rawWidth": 124, + "rawHeight": 132, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "11color1.png": { + "ver": "1.0.6", + "uuid": "5ff35504-4d91-47a2-bb5c-ed48fef6327c", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 1624, + "trimY": 255, + "width": 251, + "height": 128, + "rawWidth": 251, + "rawHeight": 128, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "11color10.png": { + "ver": "1.0.6", + "uuid": "0696cf97-3a8a-44c0-9baa-2491f25b5ec2", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 374, + "trimY": 376, + "width": 247, + "height": 372, + "rawWidth": 247, + "rawHeight": 372, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "11color11.png": { + "ver": "1.0.6", + "uuid": "bfdf02f9-bda7-46a2-9cf8-311d8c98f523", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 1128, + "trimY": 374, + "width": 368, + "height": 255, + "rawWidth": 368, + "rawHeight": 255, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "11color12.png": { + "ver": "1.0.6", + "uuid": "043ddcfd-32ac-462c-9229-9e949a95957c", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 870, + "trimY": 2, + "width": 250, + "height": 371, + "rawWidth": 250, + "rawHeight": 371, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "11color13.png": { + "ver": "1.0.6", + "uuid": "92261483-c3bc-4c22-97b0-5b11dd31601e", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 1137, + "trimY": 744, + "width": 364, + "height": 252, + "rawWidth": 364, + "rawHeight": 252, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "11color14.png": { + "ver": "1.0.6", + "uuid": "07c47d6c-1737-400b-9ee6-77f709436634", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 253, + "trimY": 1502, + "width": 372, + "height": 248, + "rawWidth": 372, + "rawHeight": 248, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "11color15.png": { + "ver": "1.0.6", + "uuid": "44b15998-4bdd-43ee-aaeb-7ab5369aaa5c", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 628, + "trimY": 1121, + "width": 370, + "height": 251, + "rawWidth": 370, + "rawHeight": 251, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "11color16.png": { + "ver": "1.0.6", + "uuid": "90775b60-9c93-4794-96bd-1ce56492ca10", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 623, + "trimY": 2, + "width": 245, + "height": 372, + "rawWidth": 245, + "rawHeight": 372, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "11color17.png": { + "ver": "1.0.6", + "uuid": "e3694c17-dd61-40ac-a2b2-0507197448c5", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 374, + "trimY": 2, + "width": 247, + "height": 372, + "rawWidth": 247, + "rawHeight": 372, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "11color18.png": { + "ver": "1.0.6", + "uuid": "c620a884-3d2b-4a19-a905-1cfc01c407f9", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 2, + "trimY": 378, + "width": 370, + "height": 374, + "rawWidth": 370, + "rawHeight": 374, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "11color19.png": { + "ver": "1.0.6", + "uuid": "424bcfea-defb-4230-84a7-73d040d31953", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 1755, + "trimY": 752, + "width": 250, + "height": 251, + "rawWidth": 250, + "rawHeight": 251, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "11color2.png": { + "ver": "1.0.6", + "uuid": "606a1362-4530-4541-b326-382f2c5cc36a", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 1385, + "trimY": 372, + "width": 128, + "height": 256, + "rawWidth": 128, + "rawHeight": 256, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "11color20.png": { + "ver": "1.0.6", + "uuid": "62b772c9-489f-4035-9173-251cd06395f7", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 1755, + "trimY": 251, + "width": 247, + "height": 252, + "rawWidth": 247, + "rawHeight": 252, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "11color21.png": { + "ver": "1.0.6", + "uuid": "1c58ca10-6eee-4057-9d8e-a6131735dcb0", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 1258, + "trimY": 1740, + "width": 248, + "height": 255, + "rawWidth": 248, + "rawHeight": 255, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "11color22.png": { + "ver": "1.0.6", + "uuid": "a3ba25a4-8cb0-47e7-b982-c188ef1623da", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 1504, + "trimY": 1364, + "width": 249, + "height": 252, + "rawWidth": 249, + "rawHeight": 252, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "11color3.png": { + "ver": "1.0.6", + "uuid": "cd2c76c2-ef9e-43c8-901d-ee38f489b173", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 627, + "trimY": 1876, + "width": 371, + "height": 130, + "rawWidth": 371, + "rawHeight": 130, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "11color4.png": { + "ver": "1.0.6", + "uuid": "7d345682-d45b-4519-8a26-5d6c38c9e23d", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 2, + "trimY": 1129, + "width": 125, + "height": 373, + "rawWidth": 125, + "rawHeight": 373, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "11color5.png": { + "ver": "1.0.6", + "uuid": "4f7310c4-6e3c-4e82-8ce4-ee02733cef3d", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 1755, + "trimY": 1254, + "width": 251, + "height": 248, + "rawWidth": 251, + "rawHeight": 248, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "11color6.png": { + "ver": "1.0.6", + "uuid": "2b3f13f7-30f2-4a47-ac07-a0114b6c300d", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 129, + "trimY": 754, + "width": 249, + "height": 372, + "rawWidth": 249, + "rawHeight": 372, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "11color7.png": { + "ver": "1.0.6", + "uuid": "9a65a9de-3841-4c91-9dd6-05795dd46b69", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 881, + "trimY": 1117, + "width": 367, + "height": 252, + "rawWidth": 367, + "rawHeight": 252, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "11color8.png": { + "ver": "1.0.6", + "uuid": "ce4736c0-0e01-4f69-a3c3-a0ad8a582fc8", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 752, + "trimY": 1493, + "width": 247, + "height": 368, + "rawWidth": 247, + "rawHeight": 368, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "11color9.png": { + "ver": "1.0.6", + "uuid": "6404770a-4cfd-4a5c-b4ea-42b926d7adf6", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 1122, + "trimY": 2, + "width": 370, + "height": 251, + "rawWidth": 370, + "rawHeight": 251, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "12color0.png": { + "ver": "1.0.6", + "uuid": "b638ab53-19bf-484f-b4a4-1213ad08727d", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 2, + "trimY": 1878, + "width": 124, + "height": 132, + "rawWidth": 124, + "rawHeight": 132, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "12color1.png": { + "ver": "1.0.6", + "uuid": "08cc9690-bd74-4b82-b09d-357987628e4c", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 1624, + "trimY": 2, + "width": 251, + "height": 128, + "rawWidth": 251, + "rawHeight": 128, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "12color10.png": { + "ver": "1.0.6", + "uuid": "532ada72-a161-43df-b757-300863bb2b33", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 503, + "trimY": 1502, + "width": 247, + "height": 372, + "rawWidth": 247, + "rawHeight": 372, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "12color11.png": { + "ver": "1.0.6", + "uuid": "12394b41-87a3-49fc-a406-db9a657bdc65", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 880, + "trimY": 747, + "width": 368, + "height": 255, + "rawWidth": 368, + "rawHeight": 255, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "12color12.png": { + "ver": "1.0.6", + "uuid": "84ac3a0d-7ef9-42a6-a8f7-53d6a28b849c", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 623, + "trimY": 376, + "width": 250, + "height": 371, + "rawWidth": 250, + "rawHeight": 371, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "12color13.png": { + "ver": "1.0.6", + "uuid": "de48a8e3-9470-44c4-b270-a490f7569a04", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 1135, + "trimY": 1117, + "width": 364, + "height": 252, + "rawWidth": 364, + "rawHeight": 252, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "12color14.png": { + "ver": "1.0.6", + "uuid": "34fe07fa-d8b0-4d92-bc2d-bb222bcb999d", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 129, + "trimY": 1128, + "width": 372, + "height": 248, + "rawWidth": 372, + "rawHeight": 248, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "12color15.png": { + "ver": "1.0.6", + "uuid": "18acaf3d-a1e6-4fe0-81cc-b149f64a785d", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 875, + "trimY": 375, + "width": 370, + "height": 251, + "rawWidth": 370, + "rawHeight": 251, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "12color16.png": { + "ver": "1.0.6", + "uuid": "5ae339a6-bed0-4e42-8f5d-5aa3d823e99f", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 380, + "trimY": 750, + "width": 245, + "height": 372, + "rawWidth": 245, + "rawHeight": 372, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "12color17.png": { + "ver": "1.0.6", + "uuid": "6738b73c-5fdb-49e1-a112-7e4e39aaf6c5", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 379, + "trimY": 1128, + "width": 247, + "height": 372, + "rawWidth": 247, + "rawHeight": 372, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "12color18.png": { + "ver": "1.0.6", + "uuid": "f13154cf-2568-4490-a9dc-cacd6e24cfb4", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 2, + "trimY": 2, + "width": 370, + "height": 374, + "rawWidth": 370, + "rawHeight": 374, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "12color19.png": { + "ver": "1.0.6", + "uuid": "8899abf4-6355-4593-8b79-f3410ff25376", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 1755, + "trimY": 500, + "width": 250, + "height": 251, + "rawWidth": 250, + "rawHeight": 251, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "12color2.png": { + "ver": "1.0.6", + "uuid": "4809b457-7a93-43fa-bdff-04c8b204d9b0", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 1000, + "trimY": 1863, + "width": 128, + "height": 256, + "rawWidth": 128, + "rawHeight": 256, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "12color20.png": { + "ver": "1.0.6", + "uuid": "34c531f3-533f-4fdf-9a6b-4f9dd0757705", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 1755, + "trimY": 2, + "width": 247, + "height": 252, + "rawWidth": 247, + "rawHeight": 252, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "12color21.png": { + "ver": "1.0.6", + "uuid": "c34e00c6-20be-49e0-a63e-cc799c807bb6", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 1254, + "trimY": 1483, + "width": 248, + "height": 255, + "rawWidth": 248, + "rawHeight": 255, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "12color22.png": { + "ver": "1.0.6", + "uuid": "773fd668-fe11-4e82-9587-f6e044694c16", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 1389, + "trimY": 1110, + "width": 249, + "height": 252, + "rawWidth": 249, + "rawHeight": 252, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "12color3.png": { + "ver": "1.0.6", + "uuid": "7738dd06-50d0-4317-8834-ed142af0b4d4", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 254, + "trimY": 1876, + "width": 371, + "height": 130, + "rawWidth": 371, + "rawHeight": 130, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "12color4.png": { + "ver": "1.0.6", + "uuid": "6e0e5f2f-e4da-411a-946c-d07f9f91c9f0", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 2, + "trimY": 754, + "width": 125, + "height": 373, + "rawWidth": 125, + "rawHeight": 373, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "12color5.png": { + "ver": "1.0.6", + "uuid": "eeb982c0-8e89-4c20-a95f-e56c901db03f", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 1755, + "trimY": 1004, + "width": 251, + "height": 248, + "rawWidth": 251, + "rawHeight": 248, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "12color6.png": { + "ver": "1.0.6", + "uuid": "5a18cf6b-f8a0-44a2-bb76-33e92356d1e2", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 2, + "trimY": 1504, + "width": 249, + "height": 372, + "rawWidth": 249, + "rawHeight": 372, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "12color7.png": { + "ver": "1.0.6", + "uuid": "79c58f79-8a6a-46fc-a571-1db2c0e1d9d4", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 1001, + "trimY": 1486, + "width": 367, + "height": 251, + "rawWidth": 367, + "rawHeight": 251, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "12color8.png": { + "ver": "1.0.6", + "uuid": "89e10b79-e4e8-4435-8d31-350a346d4b08", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 1375, + "trimY": 2, + "width": 247, + "height": 368, + "rawWidth": 247, + "rawHeight": 368, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "12color9.png": { + "ver": "1.0.6", + "uuid": "f6ef4bd9-b252-412d-a271-7651407c2a28", + "importer": "sprite-frame", + "rawTextureUuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 627, + "trimY": 749, + "width": 370, + "height": 251, + "rawWidth": 370, + "rawHeight": 251, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/TextureBlock/block/block7.png b/assets/TextureBlock/block/block7.png new file mode 100644 index 0000000..d79aaee Binary files /dev/null and b/assets/TextureBlock/block/block7.png differ diff --git a/assets/TextureBlock/block/block7.png.meta b/assets/TextureBlock/block/block7.png.meta new file mode 100644 index 0000000..d2c9ee2 --- /dev/null +++ b/assets/TextureBlock/block/block7.png.meta @@ -0,0 +1,15 @@ +{ + "ver": "2.3.7", + "uuid": "3f42bcd7-c693-416d-a6ed-2717160493a8", + "importer": "texture", + "type": "raw", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 2048, + "height": 2048, + "platformSettings": {}, + "subMetas": {} +} \ No newline at end of file diff --git a/assets/shop/script/shop.ts b/assets/shop/script/shop.ts index 973cd7d..5e0f670 100644 --- a/assets/shop/script/shop.ts +++ b/assets/shop/script/shop.ts @@ -370,11 +370,11 @@ export default class NewClass extends cc.Component { } setHealthInfo(type) { - if (cc.fx.GameConfig.GM_INFO.hp >= cc.fx.GameConfig.GM_INFO.hp_Max) { + if (cc.fx.GameConfig.GM_INFO.hp >= cc.fx.GameConfig.GM_INFO.hp_Max && this.Stamina) { this.Stamina.getChildByName("man").active = true; this.Stamina.getChildByName("health").active = true; - NumberToImage.numberToImageNodes(cc.fx.GameConfig.GM_INFO.hp, 25, 15, "hp_", this.Stamina.getChildByName("health"), false); this.Stamina.getChildByName("time").active = false; + NumberToImage.numberToImageNodes(cc.fx.GameConfig.GM_INFO.hp, 25, 15, "hp_", this.Stamina.getChildByName("health"), false); } else { const winCOIN = cc.find("Canvas"); // 假设 Canvas 节点 @@ -384,34 +384,39 @@ export default class NewClass extends cc.Component { MapConroler._instance.setPropNum(); console.log("局内"); cc.fx.GameTool.getHealth((data) => { - this.Stamina.getChildByName("time").active = true; + if (this.Stamina) this.Stamina.getChildByName("time").active = true; if (cc.fx.GameConfig.GM_INFO.min_Time != 0) { let time = cc.fx.GameTool.getTimeMargin(cc.fx.GameConfig.GM_INFO.min_Time); - this.Stamina.getChildByName("time").getComponent(cc.Label).string = time; - let power = cc.fx.GameTool.getUserPowerTime(); - if (!power) this.Stamina.getChildByName("time").opacity = 255; - else this.Stamina.getChildByName("time").opacity = 0; + if (this.Stamina) { + this.Stamina.getChildByName("time").getComponent(cc.Label).string = time; + let power = cc.fx.GameTool.getUserPowerTime(); + if (!power) this.Stamina.getChildByName("time").opacity = 255; + else this.Stamina.getChildByName("time").opacity = 0; + } this.stopTimeCutDown(); this.startTimeCutDown(); } }); } else { - this.Stamina.getChildByName("time").active = true; + if (this.Stamina) this.Stamina.getChildByName("time").active = true; if (cc.fx.GameConfig.GM_INFO.min_Time != 0) { let time = cc.fx.GameTool.getTimeMargin(cc.fx.GameConfig.GM_INFO.min_Time); - this.Stamina.getChildByName("time").getComponent(cc.Label).string = time; - let power = cc.fx.GameTool.getUserPowerTime(); - if (!power) this.Stamina.getChildByName("time").opacity = 255; - else this.Stamina.getChildByName("time").opacity = 0; + if (this.Stamina) { + this.Stamina.getChildByName("time").getComponent(cc.Label).string = time; + let power = cc.fx.GameTool.getUserPowerTime(); + if (!power) this.Stamina.getChildByName("time").opacity = 255; + else this.Stamina.getChildByName("time").opacity = 0; + } this.stopTimeCutDown(); this.startTimeCutDown(); } } } - - this.Stamina.getChildByName("man").active = false; - this.Stamina.getChildByName("health").active = true; - NumberToImage.numberToImageNodes(cc.fx.GameConfig.GM_INFO.hp, 25, 15, "hp_", this.Stamina.getChildByName("health"), false); + if (this.Stamina) { + this.Stamina.getChildByName("man").active = false; + this.Stamina.getChildByName("health").active = true; + NumberToImage.numberToImageNodes(cc.fx.GameConfig.GM_INFO.hp, 25, 15, "hp_", this.Stamina.getChildByName("health"), false); + } } } @@ -711,18 +716,20 @@ export default class NewClass extends cc.Component { this.stopPowerTime(); this.startPowerTime(); console.log("还有无限体力时间_____________", (cc.fx.GameConfig.GM_INFO.userPowerTime - nowTime)); - this.Stamina.getChildByName("skyLine").active = true; - this.Stamina.getChildByName("time").opacity = 0; - this.Stamina.getChildByName("man").active = false; + if (this.Stamina) { + this.Stamina.getChildByName("skyLine").active = true; + this.Stamina.getChildByName("time").opacity = 0; + this.Stamina.getChildByName("man").active = false; + } } else { - this.Stamina.getChildByName("skyLine").active = false; + if (this.Stamina) this.Stamina.getChildByName("skyLine").active = false; console.log("无限体力时间已过期"); this.setHealthInfo(true); } } else { - this.Stamina.getChildByName("skyLine").active = false; + if (this.Stamina) this.Stamina.getChildByName("skyLine").active = false; this.setHealthInfo(true); console.log("没有无限体力时间"); } @@ -733,20 +740,22 @@ export default class NewClass extends cc.Component { this.scheduleCallback2 = function () { let nowTime = Math.floor(Date.now() / 1000); if (cc.fx.GameConfig.GM_INFO.userPowerTime < nowTime) { - this.Stamina.getChildByName("skyLine").active = false; + if (this.Stamina) this.Stamina.getChildByName("skyLine").active = false; this.stopPowerTime(); this.setHealthInfo(true); return; } else { - this.Stamina.getChildByName("skyLine").active = true; - this.Stamina.getChildByName("time").opacity = 0; - this.Stamina.getChildByName("man").active = false; + if (this.Stamina) { + this.Stamina.getChildByName("skyLine").active = true; + this.Stamina.getChildByName("time").opacity = 0; + this.Stamina.getChildByName("man").active = false; + } } let time = cc.fx.GameConfig.GM_INFO.userPowerTime - nowTime; if (time <= 0) { time = 0; - this.Stamina.getChildByName("skyLine").active = false; + if (this.Stamina) this.Stamina.getChildByName("skyLine").active = false; this.stopPowerTime(); this.setHealthInfo(true); var timeTemp = cc.fx.GameTool.getTimeMargin2(time);