From d43b6895c7659c3ff60f6a69b48e1b276212302b Mon Sep 17 00:00:00 2001 From: "pan@work" Date: Mon, 30 Sep 2024 10:50:57 +0800 Subject: [PATCH] dd --- assets/resources/game/skills/patk.prefab | 11 +- assets/resources/gui/top_inf.prefab | 6 +- assets/resources/gui/victory.prefab | 1357 +++++++---------- .../script/game/common/SingletonModuleComp.ts | 7 +- assets/script/game/common/config/SkillSet.ts | 4 +- assets/script/game/common/config/heroSet.ts | 41 +- assets/script/game/hero/HeroViewComp.ts | 1 + assets/script/game/map/MapMonsterComp.ts | 20 +- assets/script/game/map/VictoryComp.ts | 4 + assets/script/game/mon/MonViewComp.ts | 10 +- assets/script/game/skills/SkillCom.ts | 4 +- 11 files changed, 613 insertions(+), 852 deletions(-) diff --git a/assets/resources/game/skills/patk.prefab b/assets/resources/game/skills/patk.prefab index b16738d1..2b9d85f0 100644 --- a/assets/resources/game/skills/patk.prefab +++ b/assets/resources/game/skills/patk.prefab @@ -319,13 +319,13 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": 0, - "y": 0 + "x": -1.3, + "y": 1 }, "_size": { "__type__": "cc.Size", - "width": 20, - "height": 160 + "width": 35.4, + "height": 39.2 }, "_id": "" }, @@ -360,7 +360,6 @@ "__id__": 0 }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", - "instance": null, - "targetOverrides": null + "instance": null } ] \ No newline at end of file diff --git a/assets/resources/gui/top_inf.prefab b/assets/resources/gui/top_inf.prefab index e1c3ddca..c9c03c3a 100644 --- a/assets/resources/gui/top_inf.prefab +++ b/assets/resources/gui/top_inf.prefab @@ -591,7 +591,7 @@ "__id__": 23 }, "templateMode": false, - "watchPath": "data.gems", + "watchPath": "data.role.energy", "labelType": "cc.Label", "watchPathArr": [ "data.hp_min" @@ -1697,7 +1697,7 @@ "__id__": 73 }, "templateMode": false, - "watchPath": "data.gems", + "watchPath": "data.role.gems", "labelType": "cc.Label", "watchPathArr": [ "data.hp_min" @@ -2803,7 +2803,7 @@ "__id__": 123 }, "templateMode": false, - "watchPath": "data.gems", + "watchPath": "data.role.gold", "labelType": "cc.Label", "watchPathArr": [ "data.hp_min" diff --git a/assets/resources/gui/victory.prefab b/assets/resources/gui/victory.prefab index 98ba2cde..f791f829 100644 --- a/assets/resources/gui/victory.prefab +++ b/assets/resources/gui/victory.prefab @@ -25,17 +25,17 @@ "_active": true, "_components": [ { - "__id__": 141 + "__id__": 133 }, { - "__id__": 143 + "__id__": 135 }, { - "__id__": 145 + "__id__": 137 } ], "_prefab": { - "__id__": 147 + "__id__": 139 }, "_lpos": { "__type__": "cc.Vec3", @@ -81,30 +81,36 @@ { "__id__": 9 }, + { + "__id__": 33 + }, { "__id__": 45 }, { - "__id__": 69 + "__id__": 51 }, { - "__id__": 84 + "__id__": 57 }, { - "__id__": 102 + "__id__": 72 }, { - "__id__": 120 + "__id__": 92 + }, + { + "__id__": 112 } ], - "_active": true, + "_active": false, "_components": [ { - "__id__": 138 + "__id__": 130 } ], "_prefab": { - "__id__": 140 + "__id__": 132 }, "_lpos": { "__type__": "cc.Vec3", @@ -288,30 +294,24 @@ }, { "__id__": 22 - }, + } + ], + "_active": false, + "_components": [ { "__id__": 28 }, { - "__id__": 34 - } - ], - "_active": true, - "_components": [ - { - "__id__": 40 - }, - { - "__id__": 42 + "__id__": 30 } ], "_prefab": { - "__id__": 44 + "__id__": 32 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 200, + "y": 367.51, "z": 0 }, "_lrot": { @@ -323,8 +323,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 0.7, + "y": 0.7, "z": 1 }, "_mobility": 0, @@ -745,31 +745,168 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 9 + }, + "_enabled": true, + "__prefab": { + "__id__": 29 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 419, + "height": 402 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "4eAXBjwupIVaU5Fo/0/r/k" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 9 + }, + "_enabled": true, + "__prefab": { + "__id__": 31 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": null, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "20eux0lo9BT7tFke+s58PY" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "2fiOLWZe1GeZYuO+LAR1b0", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.Node", - "_name": "Title_Ribbon01_Sky", + "_name": "defeat", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 9 + "__id__": 2 + }, + "_children": [ + { + "__id__": 34 + } + ], + "_active": false, + "_components": [ + { + "__id__": 40 + }, + { + "__id__": 42 + } + ], + "_prefab": { + "__id__": 44 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 367.71, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 0.7, + "y": 0.7, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "Image_Bagde_Wing1", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 33 }, "_children": [], "_active": true, "_components": [ { - "__id__": 29 + "__id__": 35 }, { - "__id__": 31 + "__id__": 37 } ], "_prefab": { - "__id__": 33 + "__id__": 39 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -87.854, + "y": 80.377, "z": 0 }, "_lrot": { @@ -801,16 +938,235 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 28 + "__id__": 34 }, "_enabled": true, "__prefab": { - "__id__": 30 + "__id__": 36 }, "_contentSize": { "__type__": "cc.Size", - "width": 600, - "height": 99.9 + "width": 562, + "height": 329 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "16H6Z/8t5PIaqWqJCuf21g" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 34 + }, + "_enabled": true, + "__prefab": { + "__id__": 38 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@8b79a", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "1cf2iOsS5AXYyTF/s0FC4y" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "81brFOtZ9MW5Yla9ttQ1SF", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 33 + }, + "_enabled": true, + "__prefab": { + "__id__": 41 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 419, + "height": 402 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "02DImtbo1PlKj8XgCeUN86" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 33 + }, + "_enabled": true, + "__prefab": { + "__id__": 43 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": null, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "1bN9K8f7pPh4uHlCTfWkJZ" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "dfk/LnUzFLQaJwcuMjdg0T", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "Title_Ribbon01_Sky", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 2 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 46 + }, + { + "__id__": 48 + } + ], + "_prefab": { + "__id__": 50 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 283.725, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 45 + }, + "_enabled": true, + "__prefab": { + "__id__": 47 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 500, + "height": 80 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -829,11 +1185,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 28 + "__id__": 45 }, "_enabled": true, "__prefab": { - "__id__": 32 + "__id__": 49 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -887,25 +1243,25 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 9 + "__id__": 2 }, "_children": [], "_active": true, "_components": [ { - "__id__": 35 + "__id__": 52 }, { - "__id__": 37 + "__id__": 54 } ], "_prefab": { - "__id__": 39 + "__id__": 56 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -77.294, + "y": 294.161, "z": 0 }, "_lrot": { @@ -937,15 +1293,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 34 + "__id__": 51 }, "_enabled": true, "__prefab": { - "__id__": 36 + "__id__": 53 }, "_contentSize": { "__type__": "cc.Size", - "width": 179.5859375, + "width": 164, "height": 54.4 }, "_anchorPoint": { @@ -965,11 +1321,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 34 + "__id__": 51 }, "_enabled": true, "__prefab": { - "__id__": 38 + "__id__": 55 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -981,7 +1337,7 @@ "b": 255, "a": 255 }, - "_string": "VICTORY", + "_string": "战斗结束", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 40, @@ -1040,124 +1396,38 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 9 - }, - "_enabled": true, - "__prefab": { - "__id__": 41 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 419, - "height": 402 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "4eAXBjwupIVaU5Fo/0/r/k" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 9 - }, - "_enabled": true, - "__prefab": { - "__id__": 43 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": null, - "_type": 0, - "_fillType": 0, - "_sizeMode": 1, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "20eux0lo9BT7tFke+s58PY" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "2fiOLWZe1GeZYuO+LAR1b0", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, { "__type__": "cc.Node", - "_name": "defeat", + "_name": "Button", "_objFlags": 0, "__editorExtras__": {}, "_parent": { "__id__": 2 }, "_children": [ - { - "__id__": 46 - }, - { - "__id__": 52 - }, { "__id__": 58 } ], - "_active": false, + "_active": true, "_components": [ { "__id__": 64 }, { "__id__": 66 + }, + { + "__id__": 68 } ], "_prefab": { - "__id__": 68 + "__id__": 71 }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, - "y": 200, + "x": -7.583000000000027, + "y": -198.538, "z": 0 }, "_lrot": { @@ -1185,284 +1455,12 @@ }, { "__type__": "cc.Node", - "_name": "Image_Bagde_Wing1", + "_name": "Label", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 45 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 47 - }, - { - "__id__": 49 - } - ], - "_prefab": { - "__id__": 51 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 80.377, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 46 - }, - "_enabled": true, - "__prefab": { - "__id__": 48 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 562, - "height": 329 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "16H6Z/8t5PIaqWqJCuf21g" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 46 - }, - "_enabled": true, - "__prefab": { - "__id__": 50 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@8b79a", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 1, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "1cf2iOsS5AXYyTF/s0FC4y" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "81brFOtZ9MW5Yla9ttQ1SF", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "Title_Ribbon01_Sky", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 45 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 53 - }, - { - "__id__": 55 - } - ], - "_prefab": { "__id__": 57 }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": -87.854, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 52 - }, - "_enabled": true, - "__prefab": { - "__id__": 54 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 600, - "height": 99.9 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "7b9OX6kIpOc4Js8TVOM+z2" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 52 - }, - "_enabled": true, - "__prefab": { - "__id__": 56 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 162, - "g": 153, - "b": 153, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@c6846", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 1, - "_fillType": 0, - "_sizeMode": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "8fao5m/2VOnozwFuJfY1GC" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "46yeF5HINMpqPJi01H5Hu3", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "name", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 45 - }, "_children": [], "_active": true, "_components": [ @@ -1479,7 +1477,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -77.294, + "y": 0, "z": 0 }, "_lrot": { @@ -1517,305 +1515,6 @@ "__prefab": { "__id__": 60 }, - "_contentSize": { - "__type__": "cc.Size", - "width": 161.03125, - "height": 54.4 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "c280TaEf1F6q0kf2QqbpNy" - }, - { - "__type__": "cc.Label", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 58 - }, - "_enabled": true, - "__prefab": { - "__id__": 62 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_string": "DEFEAT", - "_horizontalAlign": 1, - "_verticalAlign": 1, - "_actualFontSize": 40, - "_fontSize": 40, - "_fontFamily": "Arial", - "_lineHeight": 40, - "_overflow": 0, - "_enableWrapText": true, - "_font": null, - "_isSystemFontUsed": true, - "_spacingX": 0, - "_isItalic": false, - "_isBold": true, - "_isUnderline": false, - "_underlineHeight": 2, - "_cacheMode": 0, - "_enableOutline": true, - "_outlineColor": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_outlineWidth": 2, - "_enableShadow": false, - "_shadowColor": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_shadowOffset": { - "__type__": "cc.Vec2", - "x": 2, - "y": 2 - }, - "_shadowBlur": 2, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "a5PhdpT9BEDpgKSmw/LgRe" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "f37HwGzYFOA4MZGpqKpvaj", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 45 - }, - "_enabled": true, - "__prefab": { - "__id__": 65 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 419, - "height": 402 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "02DImtbo1PlKj8XgCeUN86" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 45 - }, - "_enabled": true, - "__prefab": { - "__id__": 67 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": null, - "_type": 0, - "_fillType": 0, - "_sizeMode": 1, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "1bN9K8f7pPh4uHlCTfWkJZ" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "dfk/LnUzFLQaJwcuMjdg0T", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "Button", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 2 - }, - "_children": [ - { - "__id__": 70 - } - ], - "_active": true, - "_components": [ - { - "__id__": 76 - }, - { - "__id__": 78 - }, - { - "__id__": 80 - } - ], - "_prefab": { - "__id__": 83 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": -7.583000000000027, - "y": -198.538, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.Node", - "_name": "Label", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 69 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 71 - }, - { - "__id__": 73 - } - ], - "_prefab": { - "__id__": 75 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 70 - }, - "_enabled": true, - "__prefab": { - "__id__": 72 - }, "_contentSize": { "__type__": "cc.Size", "width": 106.2265625, @@ -1838,11 +1537,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 70 + "__id__": 58 }, "_enabled": true, "__prefab": { - "__id__": 74 + "__id__": 62 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1919,11 +1618,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 69 + "__id__": 57 }, "_enabled": true, "__prefab": { - "__id__": 77 + "__id__": 65 }, "_contentSize": { "__type__": "cc.Size", @@ -1947,11 +1646,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 69 + "__id__": 57 }, "_enabled": true, "__prefab": { - "__id__": 79 + "__id__": 67 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1992,15 +1691,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 69 + "__id__": 57 }, "_enabled": true, "__prefab": { - "__id__": 81 + "__id__": 69 }, "clickEvents": [ { - "__id__": 82 + "__id__": 70 } ], "_interactable": true, @@ -2079,23 +1778,23 @@ }, "_children": [ { - "__id__": 85 + "__id__": 73 }, { - "__id__": 91 + "__id__": 79 } ], "_active": true, "_components": [ { - "__id__": 97 + "__id__": 87 }, { - "__id__": 99 + "__id__": 89 } ], "_prefab": { - "__id__": 101 + "__id__": 91 }, "_lpos": { "__type__": "cc.Vec3", @@ -2132,20 +1831,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 84 + "__id__": 72 }, "_children": [], "_active": true, "_components": [ { - "__id__": 86 + "__id__": 74 }, { - "__id__": 88 + "__id__": 76 } ], "_prefab": { - "__id__": 90 + "__id__": 78 }, "_lpos": { "__type__": "cc.Vec3", @@ -2182,11 +1881,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 85 + "__id__": 73 }, "_enabled": true, "__prefab": { - "__id__": 87 + "__id__": 75 }, "_contentSize": { "__type__": "cc.Size", @@ -2210,11 +1909,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 85 + "__id__": 73 }, "_enabled": true, "__prefab": { - "__id__": 89 + "__id__": 77 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2268,20 +1967,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 84 + "__id__": 72 }, "_children": [], "_active": true, "_components": [ { - "__id__": 92 + "__id__": 80 }, { - "__id__": 94 + "__id__": 82 + }, + { + "__id__": 84 } ], "_prefab": { - "__id__": 96 + "__id__": 86 }, "_lpos": { "__type__": "cc.Vec3", @@ -2318,11 +2020,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 91 + "__id__": 79 }, "_enabled": true, "__prefab": { - "__id__": 93 + "__id__": 81 }, "_contentSize": { "__type__": "cc.Size", @@ -2346,11 +2048,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 91 + "__id__": 79 }, "_enabled": true, "__prefab": { - "__id__": 95 + "__id__": 83 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2408,6 +2110,28 @@ "__type__": "cc.CompPrefabInfo", "fileId": "cd1c4WgtFNOae8cNuyk0Eh" }, + { + "__type__": "545c05XsG9GDJispEGWKvYv", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 79 + }, + "_enabled": true, + "__prefab": { + "__id__": 85 + }, + "templateMode": false, + "watchPath": "data.mission.reward_gold", + "labelType": "cc.Label", + "watchPathArr": [], + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "018sBkUc9KI7hOUn7nCBfU" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -2427,11 +2151,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 84 + "__id__": 72 }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 88 }, "_contentSize": { "__type__": "cc.Size", @@ -2455,11 +2179,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 84 + "__id__": 72 }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 90 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2517,23 +2241,23 @@ }, "_children": [ { - "__id__": 103 + "__id__": 93 }, { - "__id__": 109 + "__id__": 99 } ], "_active": true, "_components": [ { - "__id__": 115 + "__id__": 107 }, { - "__id__": 117 + "__id__": 109 } ], "_prefab": { - "__id__": 119 + "__id__": 111 }, "_lpos": { "__type__": "cc.Vec3", @@ -2570,20 +2294,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 102 + "__id__": 92 }, "_children": [], "_active": true, "_components": [ { - "__id__": 104 + "__id__": 94 }, { - "__id__": 106 + "__id__": 96 } ], "_prefab": { - "__id__": 108 + "__id__": 98 }, "_lpos": { "__type__": "cc.Vec3", @@ -2620,11 +2344,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 103 + "__id__": 93 }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 95 }, "_contentSize": { "__type__": "cc.Size", @@ -2648,11 +2372,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 103 + "__id__": 93 }, "_enabled": true, "__prefab": { - "__id__": 107 + "__id__": 97 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2706,20 +2430,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 102 + "__id__": 92 }, "_children": [], "_active": true, "_components": [ { - "__id__": 110 + "__id__": 100 }, { - "__id__": 112 + "__id__": 102 + }, + { + "__id__": 104 } ], "_prefab": { - "__id__": 114 + "__id__": 106 }, "_lpos": { "__type__": "cc.Vec3", @@ -2756,11 +2483,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 109 + "__id__": 99 }, "_enabled": true, "__prefab": { - "__id__": 111 + "__id__": 101 }, "_contentSize": { "__type__": "cc.Size", @@ -2784,11 +2511,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 109 + "__id__": 99 }, "_enabled": true, "__prefab": { - "__id__": 113 + "__id__": 103 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2846,6 +2573,28 @@ "__type__": "cc.CompPrefabInfo", "fileId": "d7HrMGw+NONoUsTyomQLF1" }, + { + "__type__": "545c05XsG9GDJispEGWKvYv", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 99 + }, + "_enabled": true, + "__prefab": { + "__id__": 105 + }, + "templateMode": false, + "watchPath": "data.mission.reward_exp", + "labelType": "cc.Label", + "watchPathArr": [], + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f5XhH9clJD9ImoT3A6BP/n" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -2865,11 +2614,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 102 + "__id__": 92 }, "_enabled": true, "__prefab": { - "__id__": 116 + "__id__": 108 }, "_contentSize": { "__type__": "cc.Size", @@ -2893,11 +2642,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 102 + "__id__": 92 }, "_enabled": true, "__prefab": { - "__id__": 118 + "__id__": 110 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2955,23 +2704,23 @@ }, "_children": [ { - "__id__": 121 + "__id__": 113 }, { - "__id__": 127 + "__id__": 119 } ], "_active": true, "_components": [ { - "__id__": 133 + "__id__": 125 }, { - "__id__": 135 + "__id__": 127 } ], "_prefab": { - "__id__": 137 + "__id__": 129 }, "_lpos": { "__type__": "cc.Vec3", @@ -3008,20 +2757,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 120 + "__id__": 112 }, "_children": [], "_active": true, "_components": [ { - "__id__": 122 + "__id__": 114 }, { - "__id__": 124 + "__id__": 116 } ], "_prefab": { - "__id__": 126 + "__id__": 118 }, "_lpos": { "__type__": "cc.Vec3", @@ -3058,11 +2807,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 121 + "__id__": 113 }, "_enabled": true, "__prefab": { - "__id__": 123 + "__id__": 115 }, "_contentSize": { "__type__": "cc.Size", @@ -3086,11 +2835,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 121 + "__id__": 113 }, "_enabled": true, "__prefab": { - "__id__": 125 + "__id__": 117 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3144,20 +2893,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 120 + "__id__": 112 }, "_children": [], "_active": true, "_components": [ { - "__id__": 128 + "__id__": 120 }, { - "__id__": 130 + "__id__": 122 } ], "_prefab": { - "__id__": 132 + "__id__": 124 }, "_lpos": { "__type__": "cc.Vec3", @@ -3194,11 +2943,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 127 + "__id__": 119 }, "_enabled": true, "__prefab": { - "__id__": 129 + "__id__": 121 }, "_contentSize": { "__type__": "cc.Size", @@ -3222,11 +2971,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 127 + "__id__": 119 }, "_enabled": true, "__prefab": { - "__id__": 131 + "__id__": 123 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3303,11 +3052,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 120 + "__id__": 112 }, "_enabled": true, "__prefab": { - "__id__": 134 + "__id__": 126 }, "_contentSize": { "__type__": "cc.Size", @@ -3331,11 +3080,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 120 + "__id__": 112 }, "_enabled": true, "__prefab": { - "__id__": 136 + "__id__": 128 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3393,7 +3142,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 139 + "__id__": 131 }, "_contentSize": { "__type__": "cc.Size", @@ -3434,7 +3183,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 142 + "__id__": 134 }, "_contentSize": { "__type__": "cc.Size", @@ -3462,7 +3211,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 144 + "__id__": 136 }, "_alignFlags": 18, "_target": null, @@ -3498,7 +3247,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 146 + "__id__": 138 }, "_id": "" }, diff --git a/assets/script/game/common/SingletonModuleComp.ts b/assets/script/game/common/SingletonModuleComp.ts index 20a64a92..1133d6ad 100644 --- a/assets/script/game/common/SingletonModuleComp.ts +++ b/assets/script/game/common/SingletonModuleComp.ts @@ -106,6 +106,8 @@ export class SingletonModuleComp extends ecs.Comp { t_dps:0, h_dps:0, m_dps:0, + reward_gold:0, + reward_exp:0, hero:{ atk:1, atk_cd:1, @@ -118,6 +120,9 @@ export class SingletonModuleComp extends ecs.Comp { } }, role:{ + gold:9999999, + gems:0, + energy:0, mission:1, mission_finish:false, mission_num:0, @@ -125,7 +130,7 @@ export class SingletonModuleComp extends ecs.Comp { hero_num:12, hp:300, hp_max:300, - speed:60, + speed:40, atk:10, atk_dis:100, buff_atk:0, diff --git a/assets/script/game/common/config/SkillSet.ts b/assets/script/game/common/config/SkillSet.ts index 92f2a0df..d84eb2b6 100644 --- a/assets/script/game/common/config/SkillSet.ts +++ b/assets/script/game/common/config/SkillSet.ts @@ -24,6 +24,8 @@ sk_uuid:子技能id sk_count:子技能个数 sp_name : 预制体名称 path: 图片地址 +run:number = 0; // 0有目标 带方向，1贝塞尔曲线 2 不动 ,3 直线 + */ export const SkillSet={ 1001:{uuid: 1001,path: "1001",type: 1,tg:3,angle:true,level: 1,name: "火球术",sp_name:"fire",info:"释放一个火球术攻击敌人", @@ -52,7 +54,7 @@ export const SkillSet={ dis:1,count:5,in:0,run:0,atk:10,hp:0,shield:0,sd:10,cd:2,bsd:0,bcd:0,sk_uuid:1001,sk_count:0,speed:600, }, 9001:{uuid: 9001,path: "1001",type: 1,tg:3,angle:true,level: 1,name: "普攻",sp_name:"patk",info:"释放一个魔法球攻击敌人", - dis:1,count:1,in:0,run:3,atk:0,hp:0,shield:0,sd:0,cd:0,bsd:0,bcd:0,sk_uuid:1001,sk_count:0,speed:600,}, + dis:1,count:1,in:0,run:0,atk:0,hp:0,shield:0,sd:0,cd:0,bsd:0,bcd:0,sk_uuid:1001,sk_count:0,speed:600,}, 9002:{uuid: 9002,path: "1001",type: 1,tg:3,angle:true,level: 1,name: "魔法小球",sp_name:"mball",info:"释放一个魔法球攻击敌人", dis:1,count:1,in:0,run:0,atk:0,hp:0,shield:0,sd:0,cd:0,bsd:0,bcd:0,sk_uuid:1001,sk_count:0,speed:600,}, 9003:{uuid: 9003,path: "1001",type: 1,tg:3,angle:true,level: 1,name: "射击",sp_name:"arrow",info:"释放一个魔法球攻击敌人", diff --git a/assets/script/game/common/config/heroSet.ts b/assets/script/game/common/config/heroSet.ts index 466d08d7..ba01580a 100644 --- a/assets/script/game/common/config/heroSet.ts +++ b/assets/script/game/common/config/heroSet.ts @@ -2,66 +2,59 @@ export const HeroSet = { 9001: { uuid: 9001, path: "k3", type: 1, level: 1,cost:2, name: "骑士", atk: 10, hp: 100, atk_dis: 100, atk_cd: 1, power: 0, power_max: 20, speed: 40, - max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 2002, word: "守护", info: "自身护盾", atktype: 1, + skill_uuid: 9001, max_skill_uuid: 2002, atktype: 1, }, - 9002: { uuid: 9002, path: "k1", type: 1, level: 1,cost:2, name: "战士", atk: 20, hp: 50, atk_dis: 100, atk_cd: 1, power: 0, power_max: 20, speed: 40, - max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 2003, word: "守护", info: "自身护盾", atktype: 1, + skill_uuid: 9001, max_skill_uuid: 2003, atktype: 1, }, 9011: { - uuid: 9004, path: "m1", type: 3, level: 1,cost:2, name: "冰法", atk: 25, hp: 50, atk_dis: 260, atk_cd: 2.5, power: 0, power_max: 20, speed: 30, - max_skill: "寒冰箭", skill_uuid: 9002, max_skill_uuid: 1002, word: "守护", info: "自身护盾", atktype: 1, + uuid: 9004, path: "m1", type: 3, level: 1,cost:2, name: "冰法", atk: 25, hp: 50, atk_dis: 260, atk_cd: 2.5, power: 0, power_max: 20, speed: 20, + skill_uuid: 9002, max_skill_uuid: 1002, atktype: 1, }, 9021: { - uuid: 9006, path: "m3", type: 3, level: 1,cost:2, name: "火法", atk: 20, hp: 50, atk_dis: 260, atk_cd: 2, power: 0, power_max: 20, speed: 30, - max_skill: "火球术", skill_uuid: 9002, max_skill_uuid: 1001, word: "守护", info: "自身护盾", atktype: 2 + uuid: 9006, path: "m3", type: 3, level: 1,cost:2, name: "火法", atk: 20, hp: 50, atk_dis: 260, atk_cd: 2, power: 0, power_max: 20, speed: 20, + skill_uuid: 9002, max_skill_uuid: 1001, atktype: 2 }, - 9031: { - uuid: 9005, path: "m2", type: 3, level: 1,cost:2, name: "牧师", atk: 10, hp: 50, atk_dis: 260, atk_cd: 2, power: 1, power_max: 1, speed: 30, - max_skill: "治愈术", skill_uuid: 9002, max_skill_uuid: 2001, word: "守护", info: "自身护盾", atktype: 2 + uuid: 9005, path: "m2", type: 3, level: 1,cost:2, name: "牧师", atk: 10, hp: 50, atk_dis: 260, atk_cd: 2, power: 1, power_max: 1, speed: 20, + skill_uuid: 9002, max_skill_uuid: 2001, atktype: 2 }, - - 9041: { uuid: 9009, path: "arc1", type: 2, level: 1,cost:2, name: "弓箭手", atk: 15, hp: 50, atk_dis: 200, atk_cd: 1.5, power: 0, power_max: 20, speed: 30, - max_skill: "精准射击", skill_uuid: 9003, max_skill_uuid: 1003, word: "狂暴", info: "全体攻击", atktype: 2 + skill_uuid: 9003, max_skill_uuid: 1003, atktype: 2 }, - } + export const MonSet = { - 1011: { uuid: 1011, path: "orc1", type: 1, level: 1,cost:2, name: "森林兽人", atk: 5, hp: 15, atk_dis: 100, atk_cd: 2, power: 0, power_max: 20, speed: 30, - max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 0, word: "守护", info: "自身护盾", atktype: 1 + max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 0, atktype: 1 }, 1012: { uuid: 1012, path: "orc2", type: 1, level: 1,cost:2, name: "荒野兽人", atk: 10, hp: 15, atk_dis: 100, atk_cd: 2, power: 0, power_max: 20, speed: 30, - max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 0, word: "守护", info: "自身护盾", atktype: 1 + max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 0, atktype: 1 }, 1013: { uuid: 1013, path: "orc3", type: 1, level: 1,cost:2, name: "兽人战士", atk: 15, hp: 15, atk_dis: 100, atk_cd: 2, power: 0, power_max: 20, speed: 30, - max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 0, word: "守护", info: "自身护盾", atktype: 1 + max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 0, atktype: 1 }, 1031: { uuid: 1031, path: "du1", type: 1, level: 1,cost:2, name: "独眼巨人", atk: 5, hp: 15, atk_dis: 100, atk_cd: 2, power: 0, power_max: 10, speed: 30, - max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 0, word: "守护", info: "自身护盾", atktype: 1 + max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 0, atktype: 1 }, 1032: { uuid: 1032, path: "du2", type: 1, level: 1,cost:2, name: "狂暴独眼", atk: 10, hp: 15, atk_dis: 100, atk_cd: 2, power: 0, power_max: 10, speed: 30, - max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 0, word: "守护", info: "自身护盾", atktype: 1 + max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 0, atktype: 1 }, 1033: { uuid: 1033, path: "du3", type: 1, level: 1,cost:2, name: "独眼首领", atk: 15, hp: 15, atk_dis: 100, atk_cd: 2, power: 0, power_max: 10, speed: 30, - max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 0, word: "守护", info: "自身护盾", atktype: 1 + max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 0, atktype: 1 }, - - 5001: { uuid: 5001, path: "boss1", type: 1, level: 1,cost:2, name: "骷髅王", atk: 30, hp: 150, atk_dis: 200, atk_cd: 2, power: 0, power_max: 10, speed: 7, - max_skill: "精准打击", skill_uuid: 1001, max_skill_uuid: 1002, word: "守护", info: "自身护盾", atktype: 1 + max_skill: "精准打击", skill_uuid: 1001, max_skill_uuid: 1002, atktype: 1 }, } \ No newline at end of file diff --git a/assets/script/game/hero/HeroViewComp.ts b/assets/script/game/hero/HeroViewComp.ts index 56ebbef6..4bfc0d78 100644 --- a/assets/script/game/hero/HeroViewComp.ts +++ b/assets/script/game/hero/HeroViewComp.ts @@ -214,6 +214,7 @@ export class HeroViewComp extends CCComp { } if(dir < this.atk_dis){ this.is_atking=true + this.stop_cd = 0.1 }else{ this.is_atking=false } diff --git a/assets/script/game/map/MapMonsterComp.ts b/assets/script/game/map/MapMonsterComp.ts index 85595639..cdc6d4d9 100644 --- a/assets/script/game/map/MapMonsterComp.ts +++ b/assets/script/game/map/MapMonsterComp.ts @@ -2,7 +2,7 @@ import { _decorator ,Vec3,v3, Prefab, instantiate,Node} from "cc"; import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS"; import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/module/common/CCComp"; import { Timer } from "../../../../extensions/oops-plugin-framework/assets/core/common/timer/Timer"; -import { BoxSet } from "../common/config/BoxSet"; +import { BoxSet, GameSet } from "../common/config/BoxSet"; import { smc } from "../common/SingletonModuleComp"; import { oops } from "../../../../extensions/oops-plugin-framework/assets/core/Oops"; import { MapViewScene } from "./view/MapViewScene"; @@ -15,6 +15,7 @@ import { Mon } from "../mon/Mon"; import { MonModelComp } from "../mon/MonModelComp"; import { Boss} from "../Boss/Boss"; import { UIID } from "../common/config/GameUIConfig"; +import { Talents } from "../common/config/TalentSet"; const { ccclass, property } = _decorator; /** 视图层对象 */ @@ -59,8 +60,10 @@ export class MapMonsterComp extends CCComp { oops.message.on("do_add_hero", this.on_do_add_hero, this); oops.message.on("mission_start", this.mission_start, this); oops.message.on("normal_call", this.on_normal_call, this); - oops.message.on("better_call", this.on_better_call, this); + oops.message.on("better_call", this.on_better_call, this); + oops.message.on("mon_dead", this.on_mon_dead, this); + } start() { // this.scene = this.getComponent(MapViewScene); @@ -121,7 +124,18 @@ export class MapMonsterComp extends CCComp { smc.vm_data.mission.coin = 0 this.load_role() } - + on_mon_dead(){ + let coin =(GameSet.MON_COIN_ADD*smc.vm_data.mission.coin_reward_add*(1+Talents[1006].bonus*smc.vm_data.talent[1006].lv)).toFixed(0) + smc.vm_data.mission.coin += parseFloat(coin) + smc.vm_data.mission.reward_num += 1; + smc.vm_data.mission.reward_gold +=10+(1-smc.vm_data.mission.mission_lv)*1 + smc.vm_data.mission.reward_exp +=10+(1-smc.vm_data.mission.mission_lv)*1 + smc.vm_data.mission.m_alive -= 1; + if(smc.vm_data.mission.m_alive <= 0){ + smc.vm_data.mission.victory = 1; + oops.message.dispatchEvent("minssion_victory"); + } + } on_normal_call(){ let hero:any =RandomManager.instance.getRandomByObjectList(smc.cards, 1); this.addHero(hero[0].uuid) diff --git a/assets/script/game/map/VictoryComp.ts b/assets/script/game/map/VictoryComp.ts index d209a61e..0ea58418 100644 --- a/assets/script/game/map/VictoryComp.ts +++ b/assets/script/game/map/VictoryComp.ts @@ -39,6 +39,10 @@ export class VictoryComp extends CCComp { } end_mission(){ this.node.getChildByName("Node").active=false + smc.vm_data.role.gold += smc.vm_data.mission.reward_gold + smc.vm_data.role.exp += smc.vm_data.mission.reward_exp + smc.vm_data.mission.reward_gold=0 + smc.vm_data.mission.reward_exp=0 this.empty_mission() oops.message.dispatchEvent("to_mission") console.log("end_mission") diff --git a/assets/script/game/mon/MonViewComp.ts b/assets/script/game/mon/MonViewComp.ts index 5502a0b6..75e5ea8f 100644 --- a/assets/script/game/mon/MonViewComp.ts +++ b/assets/script/game/mon/MonViewComp.ts @@ -430,14 +430,8 @@ export class MonViewComp extends CCComp { } dead(){ - let coin =(GameSet.MON_COIN_ADD*smc.vm_data.mission.coin_reward_add*(1+Talents[1006].bonus*smc.vm_data.talent[1006].lv)).toFixed(0) - smc.vm_data.mission.coin += parseFloat(coin) - smc.vm_data.mission.reward_num += 1; - smc.vm_data.mission.m_alive -= 1; - if(smc.vm_data.mission.m_alive <= 0){ - smc.vm_data.mission.victory = 1; - oops.message.dispatchEvent("minssion_victory"); - } + + oops.message.dispatchEvent("mon_dead"); var path = "game/skills/dead"; var prefab: Prefab = oops.res.get(path, Prefab)!; var node = instantiate(prefab); diff --git a/assets/script/game/skills/SkillCom.ts b/assets/script/game/skills/SkillCom.ts index 6333a11b..3605aea9 100644 --- a/assets/script/game/skills/SkillCom.ts +++ b/assets/script/game/skills/SkillCom.ts @@ -35,7 +35,7 @@ export class SkillCom extends CCComp { box_tag:number=0; type:number = 1; time:Timer = new Timer(0.01); - run_type:number = 0; // 0直线，1贝塞尔曲线 2 不动 + run_type:number = 0; // 0有目标 带方向，1贝塞尔曲线 2 不动 ,3 直线 in_time:number = 0.3; // 不动技能持续时间 start() { // console.log("skill start run_type",this.run_type) @@ -55,7 +55,7 @@ export class SkillCom extends CCComp { collider.on(Contact2DType.POST_SOLVE, this.onPostSolve, this); } - if(this.run_type == 3){ //直线，默认直线，有特定目标 朝向目标直线 + if(this.run_type == 3){ //直线，默认直线 let tx=this.node.position.x+this.dis // console.log("skill tx:"+tx+" node :"+this.node.position.x) let e_pos=v3(tx,this.node.position.y)