diff --git a/assets/Scene/GameScene.fire b/assets/Scene/GameScene.fire index 70bd3da..e7b5bae 100644 --- a/assets/Scene/GameScene.fire +++ b/assets/Scene/GameScene.fire @@ -81,22 +81,22 @@ "__id__": 399 }, { - "__id__": 454 + "__id__": 452 } ], "_active": true, "_components": [ + { + "__id__": 455 + }, + { + "__id__": 456 + }, { "__id__": 457 }, { "__id__": 458 - }, - { - "__id__": 459 - }, - { - "__id__": 460 } ], "_prefab": null, @@ -6296,7 +6296,7 @@ "ctor": "Float64Array", "array": [ 0, - 827.971, + 790, 0, 0, 0, @@ -7793,7 +7793,7 @@ "_alignFlags": 1, "_left": 0, "_right": 0, - "_top": 132.029, + "_top": 170, "_bottom": 0, "_verticalCenter": 0, "_horizontalCenter": 0, @@ -9210,8 +9210,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 200, - "height": 200 + "width": 150, + "height": 150 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -9222,15 +9222,15 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - 0, + -11.889, 503.873, 0, 0, 0, 0, 1, - 2, - 2, + 1.2, + 1.2, 2 ] }, @@ -17709,7 +17709,7 @@ "__id__": 395 } ], - "_active": true, + "_active": false, "_components": [], "_prefab": null, "_opacity": 255, @@ -19081,19 +19081,16 @@ "__id__": 430 }, { - "__id__": 432 + "__id__": 437 }, { - "__id__": 439 - }, - { - "__id__": 446 + "__id__": 444 } ], "_active": false, "_components": [ { - "__id__": 453 + "__id__": 451 } ], "_prefab": null, @@ -19941,8 +19938,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 149, - "height": 73 + "width": 150, + "height": 65 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -19994,7 +19991,7 @@ "_srcBlendFactor": 770, "_dstBlendFactor": 771, "_spriteFrame": { - "__uuid__": "d1cb1c61-3ba0-4e4a-a7ec-7734ba8384dd" + "__uuid__": "1e7a4c08-5881-4666-9d03-226bb1eed118" }, "_type": 0, "_sizeMode": 1, @@ -20008,7 +20005,7 @@ "_fillRange": 0, "_isTrimmedMode": true, "_atlas": { - "__uuid__": "d2adfa00-68ea-4d63-97a0-44fca153a2d7" + "__uuid__": "52d3eb5b-948f-403a-aafa-1c8f1a40a8c8" }, "_id": "c19ZQUq4RBHZ2mHtLmPbom" }, @@ -20293,7 +20290,7 @@ }, { "__type__": "cc.Node", - "_name": "yinxiao", + "_name": "zhendong1", "_objFlags": 0, "_parent": { "__id__": 399 @@ -20314,6 +20311,102 @@ "b": 255, "a": 255 }, + "_contentSize": { + "__type__": "cc.Size", + "width": 314, + "height": 117 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + -162.477, + -174.365, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "8cpSuoEYFOyrqeqmMCCRKJ" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 426 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "87fa17a4-5583-43f0-b8b1-8179599ab5a8" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": { + "__uuid__": "52d3eb5b-948f-403a-aafa-1c8f1a40a8c8" + }, + "_id": "09jOeTletFp40ub/tAXm+Q" + }, + { + "__type__": "cc.Node", + "_name": "yinxiao", + "_objFlags": 0, + "_parent": { + "__id__": 399 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 429 + } + ], + "_prefab": null, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, "_contentSize": { "__type__": "cc.Size", "width": 311, @@ -20358,7 +20451,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 426 + "__id__": 428 }, "_enabled": true, "_materials": [ @@ -20387,198 +20480,6 @@ }, "_id": "82Dog920xO9ocfnUSQemCt" }, - { - "__type__": "cc.Node", - "_name": "vibrateOpen", - "_objFlags": 0, - "_parent": { - "__id__": 399 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 429 - } - ], - "_prefab": null, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 136, - "height": 117 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - -255.798, - -172, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1 - ] - }, - "_eulerAngles": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, - "_groupIndex": 0, - "groupIndex": 0, - "_id": "d6vBJjAqlAmYxtzGQlCKEz" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 428 - }, - "_enabled": true, - "_materials": [ - { - "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" - } - ], - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "9563609d-e840-4199-aee3-12e6dfeb7302" - }, - "_type": 0, - "_sizeMode": 1, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_atlas": { - "__uuid__": "d2adfa00-68ea-4d63-97a0-44fca153a2d7" - }, - "_id": "3e9gcCg7NMfKpEGXn64NxX" - }, - { - "__type__": "cc.Node", - "_name": "New Sprite", - "_objFlags": 0, - "_parent": { - "__id__": 399 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 431 - } - ], - "_prefab": null, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 157, - "height": 80 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - -50.737, - -172, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1 - ] - }, - "_eulerAngles": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, - "_groupIndex": 0, - "groupIndex": 0, - "_id": "48eiiVjt9DprVLD3kGOYZa" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 430 - }, - "_enabled": true, - "_materials": [ - { - "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" - } - ], - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "05409d05-c235-4e8a-af70-d5f2b73dd11e" - }, - "_type": 0, - "_sizeMode": 1, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_atlas": { - "__uuid__": "d2adfa00-68ea-4d63-97a0-44fca153a2d7" - }, - "_id": "3cMp6pw39JzJBYVfLoeAtZ" - }, { "__type__": "cc.Node", "_name": "bg", @@ -20588,16 +20489,16 @@ }, "_children": [ { - "__id__": 433 + "__id__": 431 }, { - "__id__": 435 + "__id__": 433 } ], "_active": true, "_components": [ { - "__id__": 437 + "__id__": 435 } ], "_prefab": null, @@ -20653,13 +20554,13 @@ "_name": "open", "_objFlags": 0, "_parent": { - "__id__": 432 + "__id__": 430 }, "_children": [], "_active": true, "_components": [ { - "__id__": 434 + "__id__": 432 } ], "_prefab": null, @@ -20715,7 +20616,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 433 + "__id__": 431 }, "_enabled": true, "_materials": [ @@ -20749,13 +20650,13 @@ "_name": "close", "_objFlags": 0, "_parent": { - "__id__": 432 + "__id__": 430 }, "_children": [], "_active": false, "_components": [ { - "__id__": 436 + "__id__": 434 } ], "_prefab": null, @@ -20811,7 +20712,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 435 + "__id__": 433 }, "_enabled": true, "_materials": [ @@ -20845,7 +20746,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 432 + "__id__": 430 }, "_enabled": true, "_normalMaterial": null, @@ -20909,11 +20810,11 @@ "_N$isChecked": false, "toggleGroup": null, "checkMark": { - "__id__": 436 + "__id__": 434 }, "checkEvents": [ { - "__id__": 438 + "__id__": 436 } ], "_id": "3fz7gcijlI+qGOUbe4LWa1" @@ -20937,16 +20838,16 @@ }, "_children": [ { - "__id__": 440 + "__id__": 438 }, { - "__id__": 442 + "__id__": 440 } ], "_active": true, "_components": [ { - "__id__": 444 + "__id__": 442 } ], "_prefab": null, @@ -21002,13 +20903,13 @@ "_name": "open", "_objFlags": 0, "_parent": { - "__id__": 439 + "__id__": 437 }, "_children": [], "_active": true, "_components": [ { - "__id__": 441 + "__id__": 439 } ], "_prefab": null, @@ -21064,7 +20965,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 440 + "__id__": 438 }, "_enabled": true, "_materials": [ @@ -21098,13 +20999,13 @@ "_name": "close", "_objFlags": 0, "_parent": { - "__id__": 439 + "__id__": 437 }, "_children": [], "_active": false, "_components": [ { - "__id__": 443 + "__id__": 441 } ], "_prefab": null, @@ -21160,7 +21061,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 442 + "__id__": 440 }, "_enabled": true, "_materials": [ @@ -21194,7 +21095,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 439 + "__id__": 437 }, "_enabled": true, "_normalMaterial": null, @@ -21258,11 +21159,11 @@ "_N$isChecked": false, "toggleGroup": null, "checkMark": { - "__id__": 443 + "__id__": 441 }, "checkEvents": [ { - "__id__": 445 + "__id__": 443 } ], "_id": "90o9JpnRdA7qjhtmcUI2gx" @@ -21286,16 +21187,16 @@ }, "_children": [ { - "__id__": 447 + "__id__": 445 }, { - "__id__": 449 + "__id__": 447 } ], "_active": true, "_components": [ { - "__id__": 451 + "__id__": 449 } ], "_prefab": null, @@ -21351,13 +21252,13 @@ "_name": "open", "_objFlags": 0, "_parent": { - "__id__": 446 + "__id__": 444 }, "_children": [], "_active": true, "_components": [ { - "__id__": 448 + "__id__": 446 } ], "_prefab": null, @@ -21413,7 +21314,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 447 + "__id__": 445 }, "_enabled": true, "_materials": [ @@ -21447,13 +21348,13 @@ "_name": "close", "_objFlags": 0, "_parent": { - "__id__": 446 + "__id__": 444 }, "_children": [], "_active": false, "_components": [ { - "__id__": 450 + "__id__": 448 } ], "_prefab": null, @@ -21509,7 +21410,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 449 + "__id__": 447 }, "_enabled": true, "_materials": [ @@ -21543,7 +21444,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 446 + "__id__": 444 }, "_enabled": true, "_normalMaterial": null, @@ -21607,11 +21508,11 @@ "_N$isChecked": false, "toggleGroup": null, "checkMark": { - "__id__": 450 + "__id__": 448 }, "checkEvents": [ { - "__id__": 452 + "__id__": 450 } ], "_id": "7cC5Iauy5Ck4iIEyHeJC0f" @@ -21635,13 +21536,13 @@ }, "_enabled": true, "music": { - "__id__": 432 + "__id__": 430 }, "effect": { - "__id__": 439 + "__id__": 437 }, "vibrate": { - "__id__": 446 + "__id__": 444 }, "_id": "6d0jQLhAdE4oIRvhVjh2ZZ" }, @@ -21656,10 +21557,10 @@ "_active": false, "_components": [ { - "__id__": 455 + "__id__": 453 }, { - "__id__": 456 + "__id__": 454 } ], "_prefab": null, @@ -21715,7 +21616,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 454 + "__id__": 452 }, "_enabled": true, "_materials": [ @@ -21757,7 +21658,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 454 + "__id__": 452 }, "_enabled": false, "_id": "00qpMLeBFNhYRX9r3QZvyP" @@ -21828,6 +21729,9 @@ "pause": { "__id__": 41 }, + "level": { + "__id__": 196 + }, "Block_Array": [], "Wall_Prefab": [], "_id": "4cjBjPtcBO05zIQupw5luh" diff --git a/assets/Scene/HomeScene.fire b/assets/Scene/HomeScene.fire index 5982e45..17a6224 100644 --- a/assets/Scene/HomeScene.fire +++ b/assets/Scene/HomeScene.fire @@ -191,21 +191,18 @@ }, { "__id__": 260 - }, - { - "__id__": 262 } ], "_active": true, "_components": [ + { + "__id__": 262 + }, + { + "__id__": 263 + }, { "__id__": 264 - }, - { - "__id__": 265 - }, - { - "__id__": 266 } ], "_prefab": null, @@ -1219,7 +1216,7 @@ "ctor": "Float64Array", "array": [ 0, - 876.596, + 790, 0, 0, 0, @@ -3017,7 +3014,7 @@ "_alignFlags": 1, "_left": 0, "_right": 0, - "_top": 83.404, + "_top": 170, "_bottom": 0, "_verticalCenter": 0, "_horizontalCenter": 0, @@ -3283,7 +3280,7 @@ "ctor": "Float64Array", "array": [ 0, - -634, + -684.946, 0, 0, 0, @@ -3633,7 +3630,7 @@ "ctor": "Float64Array", "array": [ 0, - 107.967, + 162.097, 0, 0, 0, @@ -3725,7 +3722,7 @@ "ctor": "Float64Array", "array": [ -12, - 111.433, + 182.186, 0, 0, 0, @@ -3787,7 +3784,7 @@ "ctor": "Float64Array", "array": [ 0, - 110.598, + 183.832, 0, 0, 0, @@ -12368,100 +12365,6 @@ "_N$enableBatch": false, "_id": "c8qlI72JZCSKV6jXEK7mpe" }, - { - "__type__": "cc.Node", - "_name": "体力效果01", - "_objFlags": 0, - "_parent": { - "__id__": 4 - }, - "_children": [], - "_active": false, - "_components": [ - { - "__id__": 263 - } - ], - "_prefab": null, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 1080, - "height": 2340 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - 1131.696, - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1 - ] - }, - "_eulerAngles": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, - "_groupIndex": 0, - "groupIndex": 0, - "_id": "1chk9A1f9NoIkfwz7fUbpr" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 262 - }, - "_enabled": true, - "_materials": [ - { - "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" - } - ], - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "9fc5138d-7d91-4862-af7b-7dbdeb95d534" - }, - "_type": 0, - "_sizeMode": 1, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_atlas": null, - "_id": "d1ZfUHyKBM75/O7jxR0N5v" - }, { "__type__": "cc.Canvas", "_name": "", @@ -12543,6 +12446,9 @@ "coin": { "__id__": 49 }, + "health": { + "__uuid__": "1cf82c85-a0c6-42f7-8a9d-e7ed164806d2" + }, "Stamina": { "__id__": 28 }, diff --git a/assets/Script/JiaZai.ts b/assets/Script/JiaZai.ts index 3eeabd0..482e0fe 100644 --- a/assets/Script/JiaZai.ts +++ b/assets/Script/JiaZai.ts @@ -38,7 +38,9 @@ export default class NewClass extends cc.Component { @property(cc.Node) coin: cc.Node = null; - + // 健康值 + @property(cc.Prefab) + health: cc.Prefab = null; @property(cc.Node) Stamina: cc.Node = null; scheduleCallback: any; @@ -104,11 +106,26 @@ export default class NewClass extends cc.Component { //打开heath弹窗 - // this.openHeath(); + this.openHeath(); } + //打开heath弹窗,创建预制体 + openHeath() { + let health = cc.instantiate(this.health); + this.node.addChild(health); + let heathPop =health.getComponent("heathnum").coin ; + heathPop.scale = 0.7; + let swich = health.getComponent("heathnum").switchNode; + let spriteFrames = health.getComponent("heathnum").spriteFrames; + if(cc.fx.GameConfig.GM_INFO.hp <= 0) { + swich.getComponent(cc.Sprite).spriteFrame =spriteFrames[1]; + }else { + swich.getComponent(cc.Sprite).spriteFrame = spriteFrames[0]; + } + NumberToImage.numberToImageNodes(cc.fx.GameConfig.GM_INFO.hp, 40, 20, "time_", heathPop, true); + } //开始倒计时 startTimeCutDown() { diff --git a/assets/Script/SceneManager.ts b/assets/Script/SceneManager.ts index fa57a17..bd09cb9 100644 --- a/assets/Script/SceneManager.ts +++ b/assets/Script/SceneManager.ts @@ -6,6 +6,7 @@ // - https://docs.cocos.com/creator/manual/en/scripting/life-cycle-callbacks.html import MapConroler from "./Map"; +import NumberToImage from "./NumberToImage"; import { MiniGameSdk } from "./Sdk/MiniGameSdk"; const { ccclass, property } = cc._decorator; @@ -31,6 +32,8 @@ export default class SceneManager extends cc.Component { @property(cc.Node) pause: cc.Node = null; + @property(cc.Node) + level: cc.Node = null; @property({ type: [cc.Prefab], tooltip: "方块数组" }) Block_Array: Array = []; @@ -77,6 +80,7 @@ export default class SceneManager extends cc.Component { } this.node.getChildByName("Game").getChildByName("bg").getComponent(cc.Sprite).spriteFrame = spriteFrame; }) + NumberToImage.numberToImageNodes((cc.fx.GameConfig.GM_INFO.level + 1), 25, 15, "level_", this.level, false); } loadParticleEffects() { diff --git a/assets/Script/heathnum.ts b/assets/Script/heathnum.ts index 73c3427..e8eb516 100644 --- a/assets/Script/heathnum.ts +++ b/assets/Script/heathnum.ts @@ -1,4 +1,5 @@ import NumberToImage from "./NumberToImage"; +import JiaZai from "./JiaZai"; const { ccclass, property } = cc._decorator; @@ -8,25 +9,44 @@ export default class NewClass extends cc.Component { //商店界面 @property(cc.Node) heath: cc.Node = null; - - // onLoad () {} - - //金币数量 + //体力数量 @property(cc.Node) coin: cc.Node = null; + //精灵数组 + @property([cc.SpriteFrame]) + spriteFrames: cc.SpriteFrame[] = []; + //切换的节点 + @property(cc.Node) + switchNode: cc.Node = null; start() { - this.openShop(); + this.openPop(); } //打开商店界面 - openShop() { - - NumberToImage.numberToImageNodes(cc.fx.GameConfig.GM_INFO.hp, 30, 15, "coin_", this.coin, true); + openPop() { + console.log("打开heath弹窗",cc.fx.GameConfig.GM_INFO.hp); + + //NumberToImage.numberToImageNodes(cc.fx.GameConfig.GM_INFO.hp, 30, 15, "time_", this.coin, true); + } + startGame() { + // 获取场景中的 JiaZai 组件 + const jiazaiNode = cc.find("Canvas"); // 假设 JiaZai 挂在 Canvas 节点 + if (jiazaiNode) { + const jiazaiComp = jiazaiNode.getComponent(JiaZai); + if (jiazaiComp) { + jiazaiComp.startGame(); + } else { + console.warn("JiaZai 组件未找到"); + } + } else { + console.warn("JiaZai 节点未找到"); + } + this.closePop(); } - - //关闭商店界面 - closeShop() { + //关闭弹窗 + closePop() { //销毁预制体 + console.log("关闭heath弹窗"); this.heath.destroy(); } diff --git a/assets/UI/UI/pop/huifuyidian.png b/assets/UI/UI/pop/huifuyidian.png new file mode 100644 index 0000000..d25b1bf Binary files /dev/null and b/assets/UI/UI/pop/huifuyidian.png differ diff --git a/assets/UI/UI/pop/体力效果03.jpg.meta b/assets/UI/UI/pop/huifuyidian.png.meta similarity index 63% rename from assets/UI/UI/pop/体力效果03.jpg.meta rename to assets/UI/UI/pop/huifuyidian.png.meta index 96243cc..023432b 100644 --- a/assets/UI/UI/pop/体力效果03.jpg.meta +++ b/assets/UI/UI/pop/huifuyidian.png.meta @@ -1,6 +1,6 @@ { "ver": "2.3.7", - "uuid": "cafd940d-f2ee-4bb1-b19d-f71d73ba0ffe", + "uuid": "02fbadbe-ea3f-41a7-a169-04e86e8971d7", "importer": "texture", "type": "sprite", "wrapMode": "clamp", @@ -8,15 +8,15 @@ "premultiplyAlpha": false, "genMipmaps": false, "packable": true, - "width": 1080, - "height": 2340, + "width": 561, + "height": 54, "platformSettings": {}, "subMetas": { - "体力效果03": { + "huifuyidian": { "ver": "1.0.6", - "uuid": "d164a435-db80-48a1-b4c9-3ba2e6ef1ca7", + "uuid": "d89cb39b-0ec8-43c3-bb1a-f1e081938454", "importer": "sprite-frame", - "rawTextureUuid": "cafd940d-f2ee-4bb1-b19d-f71d73ba0ffe", + "rawTextureUuid": "02fbadbe-ea3f-41a7-a169-04e86e8971d7", "trimType": "auto", "trimThreshold": 1, "rotated": false, @@ -24,10 +24,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 1080, - "height": 2340, - "rawWidth": 1080, - "rawHeight": 2340, + "width": 561, + "height": 54, + "rawWidth": 561, + "rawHeight": 54, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, diff --git a/assets/UI/UI/pop/体力效果01.jpg b/assets/UI/UI/pop/体力效果01.jpg deleted file mode 100644 index 83de782..0000000 Binary files a/assets/UI/UI/pop/体力效果01.jpg and /dev/null differ diff --git a/assets/UI/UI/pop/体力效果01.jpg.meta b/assets/UI/UI/pop/体力效果01.jpg.meta deleted file mode 100644 index bd0b84d..0000000 --- a/assets/UI/UI/pop/体力效果01.jpg.meta +++ /dev/null @@ -1,38 +0,0 @@ -{ - "ver": "2.3.7", - "uuid": "9c20d1d1-3fef-4842-bca4-6f282ba6a6ee", - "importer": "texture", - "type": "sprite", - "wrapMode": "clamp", - "filterMode": "bilinear", - "premultiplyAlpha": false, - "genMipmaps": false, - "packable": true, - "width": 1080, - "height": 2340, - "platformSettings": {}, - "subMetas": { - "体力效果01": { - "ver": "1.0.6", - "uuid": "9fc5138d-7d91-4862-af7b-7dbdeb95d534", - "importer": "sprite-frame", - "rawTextureUuid": "9c20d1d1-3fef-4842-bca4-6f282ba6a6ee", - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 1080, - "height": 2340, - "rawWidth": 1080, - "rawHeight": 2340, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "subMetas": {} - } - } -} \ No newline at end of file diff --git a/assets/UI/UI/pop/体力效果02.jpg b/assets/UI/UI/pop/体力效果02.jpg deleted file mode 100644 index ed99c07..0000000 Binary files a/assets/UI/UI/pop/体力效果02.jpg and /dev/null differ diff --git a/assets/UI/UI/pop/体力效果02.jpg.meta b/assets/UI/UI/pop/体力效果02.jpg.meta deleted file mode 100644 index 5948c1b..0000000 --- a/assets/UI/UI/pop/体力效果02.jpg.meta +++ /dev/null @@ -1,38 +0,0 @@ -{ - "ver": "2.3.7", - "uuid": "f15e9253-f466-4753-b99a-4dd36c4f1b4c", - "importer": "texture", - "type": "sprite", - "wrapMode": "clamp", - "filterMode": "bilinear", - "premultiplyAlpha": false, - "genMipmaps": false, - "packable": true, - "width": 1080, - "height": 2340, - "platformSettings": {}, - "subMetas": { - "体力效果02": { - "ver": "1.0.6", - "uuid": "7ad98132-8cd2-4d00-99a2-da132868a7b5", - "importer": "sprite-frame", - "rawTextureUuid": "f15e9253-f466-4753-b99a-4dd36c4f1b4c", - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 1080, - "height": 2340, - "rawWidth": 1080, - "rawHeight": 2340, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "subMetas": {} - } - } -} \ No newline at end of file diff --git a/assets/UI/UI/pop/体力效果03.jpg b/assets/UI/UI/pop/体力效果03.jpg deleted file mode 100644 index bf17aff..0000000 Binary files a/assets/UI/UI/pop/体力效果03.jpg and /dev/null differ diff --git a/assets/prefab/pop/heathpop.prefab b/assets/prefab/pop/heathpop.prefab index bdbf7a1..15c453b 100644 --- a/assets/prefab/pop/heathpop.prefab +++ b/assets/prefab/pop/heathpop.prefab @@ -24,17 +24,20 @@ "__id__": 7 }, { - "__id__": 14 + "__id__": 15 } ], "_active": true, "_components": [ { - "__id__": 47 + "__id__": 51 + }, + { + "__id__": 52 } ], "_prefab": { - "__id__": 48 + "__id__": 53 }, "_opacity": 255, "_color": { @@ -58,8 +61,8 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - 0, - 0, + 540, + 960, 0, 0, 0, @@ -248,11 +251,11 @@ "_active": true, "_components": [ { - "__id__": 12 + "__id__": 13 } ], "_prefab": { - "__id__": 13 + "__id__": 14 }, "_opacity": 255, "_color": { @@ -319,7 +322,7 @@ } ], "_prefab": { - "__id__": 11 + "__id__": 12 }, "_opacity": 255, "_color": { @@ -352,7 +355,7 @@ 1, 1, 1, - 1 + 0 ] }, "_eulerAngles": { @@ -415,12 +418,14 @@ "duration": 0.1, "zoomScale": 1.2, "clickEvents": [ - null + { + "__id__": 11 + } ], "_N$interactable": true, "_N$enableAutoGrayEffect": false, - "_N$transition": 0, - "transition": 0, + "_N$transition": 3, + "transition": 3, "_N$normalColor": { "__type__": "cc.Color", "r": 255, @@ -474,6 +479,16 @@ }, "_id": "" }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 1 + }, + "component": "", + "_componentId": "6624fhcuF5DF67gzSViWhRV", + "handler": "closePop", + "customEventData": "" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -537,31 +552,34 @@ }, "_children": [ { - "__id__": 15 + "__id__": 16 }, { - "__id__": 18 + "__id__": 19 }, { - "__id__": 24 + "__id__": 25 }, { - "__id__": 32 + "__id__": 30 }, { "__id__": 36 }, { - "__id__": 40 + "__id__": 41 }, { - "__id__": 43 + "__id__": 44 + }, + { + "__id__": 47 } ], "_active": true, "_components": [], "_prefab": { - "__id__": 46 + "__id__": 50 }, "_opacity": 255, "_color": { @@ -615,17 +633,17 @@ "_name": "New Sprite", "_objFlags": 0, "_parent": { - "__id__": 14 + "__id__": 15 }, "_children": [], "_active": true, "_components": [ { - "__id__": 16 + "__id__": 17 } ], "_prefab": { - "__id__": 17 + "__id__": 18 }, "_opacity": 255, "_color": { @@ -649,8 +667,8 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - 15.137, - 738.462, + 0, + 757.717, 0, 0, 0, @@ -679,7 +697,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 15 + "__id__": 16 }, "_enabled": true, "_materials": [ @@ -724,21 +742,21 @@ "_name": "yuandi", "_objFlags": 0, "_parent": { - "__id__": 14 + "__id__": 15 }, "_children": [ { - "__id__": 19 + "__id__": 20 } ], "_active": true, "_components": [ { - "__id__": 22 + "__id__": 23 } ], "_prefab": { - "__id__": 23 + "__id__": 24 }, "_opacity": 255, "_color": { @@ -792,17 +810,17 @@ "_name": "guang", "_objFlags": 0, "_parent": { - "__id__": 18 + "__id__": 19 }, "_children": [], "_active": true, "_components": [ { - "__id__": 20 + "__id__": 21 } ], "_prefab": { - "__id__": 21 + "__id__": 22 }, "_opacity": 255, "_color": { @@ -856,7 +874,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 19 + "__id__": 20 }, "_enabled": true, "_materials": [ @@ -899,7 +917,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 18 + "__id__": 19 }, "_enabled": true, "_materials": [ @@ -942,21 +960,21 @@ "_name": "boom_show", "_objFlags": 0, "_parent": { - "__id__": 14 + "__id__": 15 }, "_children": [ { - "__id__": 25 + "__id__": 26 } ], "_active": true, "_components": [ { - "__id__": 30 + "__id__": 28 } ], "_prefab": { - "__id__": 31 + "__id__": 29 }, "_opacity": 255, "_color": { @@ -1010,17 +1028,13 @@ "_name": "heathSHU", "_objFlags": 0, "_parent": { - "__id__": 24 + "__id__": 25 }, - "_children": [ - { - "__id__": 26 - } - ], + "_children": [], "_active": true, "_components": [], "_prefab": { - "__id__": 29 + "__id__": 27 }, "_opacity": 255, "_color": { @@ -1069,115 +1083,6 @@ "groupIndex": 0, "_id": "" }, - { - "__type__": "cc.Node", - "_name": "big_6", - "_objFlags": 0, - "_parent": { - "__id__": 25 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 27 - } - ], - "_prefab": { - "__id__": 28 - }, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 25, - "height": 38 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1 - ] - }, - "_eulerAngles": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, - "_groupIndex": 0, - "groupIndex": 0, - "_id": "" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 26 - }, - "_enabled": true, - "_materials": [ - { - "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" - } - ], - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "65fc153a-4019-4fba-84fc-a75a9e90c479" - }, - "_type": 0, - "_sizeMode": 1, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_atlas": { - "__uuid__": "fa9a438e-1f24-47fe-bbcd-b75abcff2ea8" - }, - "_id": "" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "efutAZuv5NibAt1e9VY04S", - "sync": false - }, { "__type__": "cc.PrefabInfo", "root": { @@ -1194,7 +1099,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 24 + "__id__": 25 }, "_enabled": true, "_materials": [ @@ -1239,16 +1144,19 @@ "_name": "homeBtn", "_objFlags": 0, "_parent": { - "__id__": 14 + "__id__": 15 }, "_children": [], "_active": true, "_components": [ { - "__id__": 33 + "__id__": 31 }, { - "__id__": 34 + "__id__": 32 + }, + { + "__id__": 33 } ], "_prefab": { @@ -1306,7 +1214,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 32 + "__id__": 30 }, "_enabled": true, "_materials": [ @@ -1335,25 +1243,41 @@ }, "_id": "" }, + { + "__type__": "6624fhcuF5DF67gzSViWhRV", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 30 + }, + "_enabled": true, + "heath": null, + "coin": null, + "spriteFrames": [], + "switchNode": null, + "_id": "" + }, { "__type__": "cc.Button", "_name": "", "_objFlags": 0, "node": { - "__id__": 32 + "__id__": 30 }, "_enabled": true, "_normalMaterial": null, "_grayMaterial": null, "duration": 0.1, - "zoomScale": 1.1, + "zoomScale": 1.2, "clickEvents": [ - null + { + "__id__": 34 + } ], "_N$interactable": true, "_N$enableAutoGrayEffect": false, - "_N$transition": 3, - "transition": 3, + "_N$transition": 0, + "transition": 0, "_N$normalColor": { "__type__": "cc.Color", "r": 255, @@ -1402,11 +1326,19 @@ "_N$hoverSprite": null, "hoverSprite": null, "_N$disabledSprite": null, - "_N$target": { - "__id__": 32 - }, + "_N$target": null, "_id": "" }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 1 + }, + "component": "", + "_componentId": "6624fhcuF5DF67gzSViWhRV", + "handler": "closePop", + "customEventData": "" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -1423,7 +1355,7 @@ "_name": "timeBtn", "_objFlags": 0, "_parent": { - "__id__": 14 + "__id__": 15 }, "_children": [], "_active": true, @@ -1436,7 +1368,7 @@ } ], "_prefab": { - "__id__": 39 + "__id__": 40 }, "_opacity": 255, "_color": { @@ -1532,7 +1464,9 @@ "duration": 0.1, "zoomScale": 1.1, "clickEvents": [ - null + { + "__id__": 39 + } ], "_N$interactable": true, "_N$enableAutoGrayEffect": false, @@ -1591,6 +1525,16 @@ }, "_id": "" }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 1 + }, + "component": "", + "_componentId": "6624fhcuF5DF67gzSViWhRV", + "handler": "startGame", + "customEventData": "" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -1602,22 +1546,131 @@ "fileId": "83jWKGZItFub8fImzLXnof", "sync": false }, + { + "__type__": "cc.Node", + "_name": "anniu", + "_objFlags": 0, + "_parent": { + "__id__": 15 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 42 + } + ], + "_prefab": { + "__id__": 43 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 636, + "height": 174 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + -298.516, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 41 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "1fd745f8-009d-4a16-aa79-68e518664e6e" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": { + "__uuid__": "52d3eb5b-948f-403a-aafa-1c8f1a40a8c8" + }, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "6e3FSvFd1OBKZf95RPhXYi", + "sync": false + }, { "__type__": "cc.Node", "_name": "result_title4", "_objFlags": 0, "_parent": { - "__id__": 14 + "__id__": 15 }, "_children": [], "_active": true, "_components": [ { - "__id__": 41 + "__id__": 45 } ], "_prefab": { - "__id__": 42 + "__id__": 46 }, "_opacity": 255, "_color": { @@ -1671,7 +1724,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 40 + "__id__": 44 }, "_enabled": true, "_materials": [ @@ -1716,17 +1769,17 @@ "_name": "tishi", "_objFlags": 0, "_parent": { - "__id__": 14 + "__id__": 15 }, "_children": [], "_active": true, "_components": [ { - "__id__": 44 + "__id__": 48 } ], "_prefab": { - "__id__": 45 + "__id__": 49 }, "_opacity": 255, "_color": { @@ -1780,7 +1833,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 43 + "__id__": 47 }, "_enabled": true, "_materials": [ @@ -1858,6 +1911,33 @@ "_originalHeight": 1920, "_id": "" }, + { + "__type__": "6624fhcuF5DF67gzSViWhRV", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 1 + }, + "_enabled": true, + "heath": { + "__id__": 1 + }, + "coin": { + "__id__": 26 + }, + "spriteFrames": [ + { + "__uuid__": "43fca32a-925b-4ddb-9f96-fa5750d60cfb" + }, + { + "__uuid__": "d89cb39b-0ec8-43c3-bb1a-f1e081938454" + } + ], + "switchNode": { + "__id__": 44 + }, + "_id": "" + }, { "__type__": "cc.PrefabInfo", "root": {