From 85d7c7e063f35c04e46f2b60b55ab952ac76a46d Mon Sep 17 00:00:00 2001 From: "pan@work" Date: Fri, 23 Aug 2024 14:45:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=80=E8=83=BD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/resources/game/heros/hero.prefab | 4 +- assets/resources/game/skills/base.prefab | 101 +++-- assets/resources/game/skills/base2.prefab | 16 +- assets/resources/game/skills/base3.prefab | 366 ++++++++++++++++++ .../resources/game/skills/base3.prefab.meta | 13 + assets/script/game/common/config/CardSet.ts | 64 --- assets/script/game/common/config/SkillSet.ts | 59 +++ .../game/common/config/SkillSet.ts.meta | 9 + assets/script/game/monster/BoxRangComp.ts | 10 +- assets/script/game/monster/CSkill.ts | 2 +- assets/script/game/monster/CSkillComp.ts | 2 +- assets/script/game/monster/HeroCard.ts | 3 +- .../script/game/monster/HeroCardViewComp.ts | 3 +- assets/script/game/monster/MonsterViewComp.ts | 2 +- 14 files changed, 519 insertions(+), 135 deletions(-) create mode 100644 assets/resources/game/skills/base3.prefab create mode 100644 assets/resources/game/skills/base3.prefab.meta create mode 100644 assets/script/game/common/config/SkillSet.ts create mode 100644 assets/script/game/common/config/SkillSet.ts.meta diff --git a/assets/resources/game/heros/hero.prefab b/assets/resources/game/heros/hero.prefab index bf0cdeba..d2e0171c 100644 --- a/assets/resources/game/heros/hero.prefab +++ b/assets/resources/game/heros/hero.prefab @@ -2160,12 +2160,12 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": 1.9, + "x": 0, "y": 34.8 }, "_size": { "__type__": "cc.Size", - "width": 74.5, + "width": 80, "height": 71.6 }, "_id": "" diff --git a/assets/resources/game/skills/base.prefab b/assets/resources/game/skills/base.prefab index 64c90e86..ec98fd79 100644 --- a/assets/resources/game/skills/base.prefab +++ b/assets/resources/game/skills/base.prefab @@ -109,7 +109,7 @@ "_lscale": { "__type__": "cc.Vec3", "x": -0.5, - "y": 0.5, + "y": 0.4, "z": 1 }, "_mobility": 0, @@ -136,8 +136,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 97, - "height": 143 + "width": 139, + "height": 128 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -150,54 +150,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "43ucwKXvZIjpuRMb6AMdcx" }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 6 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "2e21a159-09af-47d0-b8f3-92f814f4a38a@5e00d", - "__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": { - "__uuid__": "2e21a159-09af-47d0-b8f3-92f814f4a38a", - "__expectedType__": "cc.SpriteAtlas" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "57hoD/3wpHU7ipwKMwKD/k" - }, { "__type__": "cc.Animation", "_name": "", @@ -208,7 +160,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 8 + "__id__": 6 }, "playOnLoad": true, "_clips": [ @@ -227,6 +179,51 @@ "__type__": "cc.CompPrefabInfo", "fileId": "71+bR9yIFIpJpY4muGx9bf" }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 8 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "930f41c2-9ec2-4b26-a832-35e40bdf3afe@c30fb", + "__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": "c3b7BFrzlCXqVSu960MV5K" + }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/skills/base2.prefab b/assets/resources/game/skills/base2.prefab index 01462a7e..ac9a20d6 100644 --- a/assets/resources/game/skills/base2.prefab +++ b/assets/resources/game/skills/base2.prefab @@ -109,7 +109,7 @@ "_lscale": { "__type__": "cc.Vec3", "x": -0.5, - "y": 0.5, + "y": 0.4, "z": 1 }, "_mobility": 0, @@ -136,8 +136,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 97, - "height": 149 + "width": 139, + "height": 128 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -167,13 +167,13 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, + "r": 247, + "g": 23, + "b": 23, "a": 255 }, "_spriteFrame": { - "__uuid__": "2e21a159-09af-47d0-b8f3-92f814f4a38a@104fb", + "__uuid__": "930f41c2-9ec2-4b26-a832-35e40bdf3afe@c30fb", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -187,7 +187,7 @@ "_fillStart": 0, "_fillRange": 0, "_isTrimmedMode": true, - "_useGrayscale": false, + "_useGrayscale": true, "_atlas": null, "_id": "" }, diff --git a/assets/resources/game/skills/base3.prefab b/assets/resources/game/skills/base3.prefab new file mode 100644 index 00000000..45351d39 --- /dev/null +++ b/assets/resources/game/skills/base3.prefab @@ -0,0 +1,366 @@ +[ + { + "__type__": "cc.Prefab", + "_name": "base3", + "_objFlags": 0, + "__editorExtras__": {}, + "_native": "", + "data": { + "__id__": 1 + }, + "optimizationPolicy": 0, + "persistent": false + }, + { + "__type__": "cc.Node", + "_name": "base3", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": null, + "_children": [ + { + "__id__": 2 + } + ], + "_active": true, + "_components": [ + { + "__id__": 10 + }, + { + "__id__": 12 + }, + { + "__id__": 14 + }, + { + "__id__": 16 + } + ], + "_prefab": { + "__id__": 18 + }, + "_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.Node", + "_name": "skill", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 3 + }, + { + "__id__": 5 + }, + { + "__id__": 7 + } + ], + "_prefab": { + "__id__": 9 + }, + "_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__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 4 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 139, + "height": 128 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "43ucwKXvZIjpuRMb6AMdcx" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 6 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 245, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "930f41c2-9ec2-4b26-a832-35e40bdf3afe@c30fb", + "__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": "57hoD/3wpHU7ipwKMwKD/k" + }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": false, + "__prefab": { + "__id__": 8 + }, + "playOnLoad": true, + "_clips": [ + { + "__uuid__": "7a6518aa-87b0-4d48-9460-1ae110cc860f", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": { + "__uuid__": "7a6518aa-87b0-4d48-9460-1ae110cc860f", + "__expectedType__": "cc.AnimationClip" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "71+bR9yIFIpJpY4muGx9bf" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "b05wpkPXFJqK6/PzoIxCfr", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 11 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 286, + "height": 90 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.49664333316829656, + "y": 0.5156666649712457 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "63NP9yq3hEUKD/OZZZ5t7x" + }, + { + "__type__": "cc.RigidBody2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 13 + }, + "enabledContactListener": true, + "bullet": true, + "awakeOnLoad": true, + "_group": 4, + "_type": 2, + "_allowSleep": false, + "_gravityScale": 0, + "_linearDamping": 0, + "_angularDamping": 0, + "_linearVelocity": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_angularVelocity": 0, + "_fixedRotation": false, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f1VxV09PdOkofzgGv1tsZE" + }, + { + "__type__": "cc.BoxCollider2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 15 + }, + "tag": 8, + "_group": 4, + "_density": 1, + "_sensor": true, + "_friction": 0.2, + "_restitution": 0, + "_offset": { + "__type__": "cc.Vec2", + "x": 1.1, + "y": -0.1 + }, + "_size": { + "__type__": "cc.Size", + "width": 61.5, + "height": 80.8 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "23eik112JPZYGiI8mJalTK" + }, + { + "__type__": "45646oIyIdA24W+0c5rdELD", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 17 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "8ahZv91itPcYJm8S0veHYl" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "instance": null, + "targetOverrides": null + } +] \ No newline at end of file diff --git a/assets/resources/game/skills/base3.prefab.meta b/assets/resources/game/skills/base3.prefab.meta new file mode 100644 index 00000000..c4ed6ee8 --- /dev/null +++ b/assets/resources/game/skills/base3.prefab.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.50", + "importer": "prefab", + "imported": true, + "uuid": "b939422e-2fb5-446a-a460-fff1af2744df", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "syncNodeName": "base3" + } +} diff --git a/assets/script/game/common/config/CardSet.ts b/assets/script/game/common/config/CardSet.ts index 51f61960..f112b5e8 100644 --- a/assets/script/game/common/config/CardSet.ts +++ b/assets/script/game/common/config/CardSet.ts @@ -8,7 +8,6 @@ export const CardType = { 1: "前排", 2: "后排", } - export const CardList={ 1:[ {uuid:1101,type:1},{uuid:1102,type:1},{uuid:1201,type:1},{uuid:1202,type:1},{uuid:1301,type:1},{uuid:1302,type:1}, @@ -38,69 +37,6 @@ export const CardList={ // 5:[5001,5002,5003,5004], } -export const HeroSet ={ - - "h001":{ - uuid:"h001", name:'魔法师', path:"h001",atk:6,atk_cd:2, hp:30, power:50, speed:150, - skill:{ } - }, - -} -export const SkillSet={ - 1001:{uuid: 1001,path: "1001",type: 1,level: 1,name: "火球术-初级",sp_name:"fire",dis:1720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 1002:{uuid: 1002,path: "1002",type: 1,level: 1,name: "寒冰箭-初级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 1003:{uuid: 1003,path: "1003",type: 1,level: 1,name: "狂暴-初级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 1004:{uuid: 1004,path: "1004",type: 1,level: 1,name: "守护-初级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 1005:{uuid: 1005,path: "1005",type: 1,level: 1,name: "雷霆-初级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 1006:{uuid: 1006,path: "1006",type: 1,level: 1,name: "再生-初级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 1007:{uuid: 1007,path: "1007",type: 1,level: 1,name: "复生-初级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 1008:{uuid: 1008,path: "1008",type: 1,level: 1,name: "灵巧-初级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 1009:{uuid: 1009,path: "1009",type: 1,level: 1,name: "盾守-初级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 1010:{uuid: 1010,path: "1010",type: 1,level: 1,name: "治愈-初级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 1011:{uuid: 1011,path: "1011",type: 1,level: 3,name: "火焰风暴-初级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 1012:{uuid: 1012,path: "1012",type: 1,level: 3,name: "冰晶风暴-初级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 2001:{uuid: 2001,path: "1001",type: 1,level: 2,name: "火球术-中级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 2002:{uuid: 2002,path: "1002",type: 1,level: 2,name: "寒冰箭-中级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 2003:{uuid: 2003,path: "1003",type: 1,level: 2,name: "狂暴-中级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 2004:{uuid: 2004,path: "1004",type: 1,level: 2,name: "守护-中级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 2005:{uuid: 2005,path: "1005",type: 1,level: 2,name: "雷霆-中级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 2006:{uuid: 2006,path: "1006",type: 1,level: 2,name: "再生-中级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 2007:{uuid: 2007,path: "1007",type: 1,level: 2,name: "复生-中级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 2008:{uuid: 2008,path: "1008",type: 1,level: 2,name: "灵巧-中级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 2009:{uuid: 2009,path: "1009",type: 1,level: 2,name: "盾守-中级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 2010:{uuid: 2010,path: "1010",type: 1,level: 2,name: "治愈-中级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 2011:{uuid: 2011,path: "1011",type: 1,level: 4,name: "火焰风暴-中级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 2012:{uuid: 2012,path: "1012",type: 1,level: 4,name: "冰晶风暴-中级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 3001:{uuid: 3001,path: "1001",type: 1,level: 3,name: "火球术-高级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 3002:{uuid: 3002,path: "1002",type: 1,level: 3,name: "寒冰箭-高级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 3003:{uuid: 3003,path: "1003",type: 1,level: 3,name: "狂暴-高级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 3004:{uuid: 3004,path: "1004",type: 1,level: 3,name: "守护-高级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 3005:{uuid: 3005,path: "1005",type: 1,level: 3,name: "雷霆-高级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 3006:{uuid: 3006,path: "1006",type: 1,level: 3,name: "再生-高级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 3007:{uuid: 3007,path: "1007",type: 1,level: 3,name: "复生-高级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 3008:{uuid: 3008,path: "1008",type: 1,level: 3,name: "灵巧-高级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 3009:{uuid: 3009,path: "1009",type: 1,level: 3,name: "盾守-高级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 3010:{uuid: 3010,path: "1010",type: 1,level: 3,name: "治愈-高级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 3011:{uuid: 3011,path: "1011",type: 1,level: 5,name: "火焰风暴-高级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 3012:{uuid: 3012,path: "1012",type: 1,level: 5,name: "冰晶风暴-高级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 4001:{uuid: 4001,path: "1001",type: 1,level: 4,name: "火球术-终极",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 4002:{uuid: 4002,path: "1002",type: 1,level: 4,name: "寒冰箭-终极",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 4003:{uuid: 4003,path: "1003",type: 1,level: 4,name: "狂暴-终极",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 4004:{uuid: 4004,path: "1004",type: 1,level: 4,name: "守护-终极",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 4005:{uuid: 4005,path: "1005",type: 1,level: 4,name: "雷霆-终极",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 4006:{uuid: 4006,path: "1006",type: 1,level: 4,name: "再生-终极",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 4007:{uuid: 4007,path: "1007",type: 1,level: 4,name: "复生-终极",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 4008:{uuid: 4008,path: "1008",type: 1,level: 4,name: "灵巧-终极",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 4009:{uuid: 4009,path: "1009",type: 1,level: 4,name: "盾守-终极",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 4010:{uuid: 4010,path: "1010",type: 1,level: 4,name: "治愈-终极",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 4011:{uuid: 4011,path: "1011",type: 1,level: 6,name: "火焰风暴-终极",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 4012:{uuid: 4012,path: "1012",type: 1,level: 6,name: "冰晶风暴-终极",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 9001:{uuid: 9001,path: "9001",type: 1,level: 1,name: "基础攻击1",sp_name:"base",dis:90,count:1,atk: 4,sd:10,cd:1,speed:350,}, - 9002:{uuid: 9001,path: "9001",type: 1,level: 1,name: "基础攻击2",sp_name:"base2",dis:90,count:1,atk: 4,sd:10,cd:1,speed:350,}, - -} - - export const CardSet = { 1101:{uuid: 1101,path: "1101",type: 1,level: 1,name: "守护犬",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,skill: "base",max_skill: "base",int1: null,int2: null,dps: 2,word: "守护", info: "自身护盾",atktype: "攻击型", mon: "狗"}, 1102:{uuid: 1102,path: "1102",type: 1,level: 1,name: "狂暴犬",atk: 4,hp: 8,atk_cd: 2,power: 50,speed: 80,skill: "base",max_skill: "base",int1: null,int2: null,dps: 2,word: "狂暴", info: "全体攻击",atktype: "攻击型", mon: "狗"}, diff --git a/assets/script/game/common/config/SkillSet.ts b/assets/script/game/common/config/SkillSet.ts new file mode 100644 index 00000000..e49e1e5f --- /dev/null +++ b/assets/script/game/common/config/SkillSet.ts @@ -0,0 +1,59 @@ +export const CardType = { + 1: "前排", + 2: "后排", +} +export const SkillSet={ + 1001:{uuid: 1001,path: "1001",type: 1,level: 1,name: "火球术-初级",sp_name:"fire",dis:1720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 1002:{uuid: 1002,path: "1002",type: 1,level: 1,name: "寒冰箭-初级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 1003:{uuid: 1003,path: "1003",type: 1,level: 1,name: "狂暴-初级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 1004:{uuid: 1004,path: "1004",type: 1,level: 1,name: "守护-初级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 1005:{uuid: 1005,path: "1005",type: 1,level: 1,name: "雷霆-初级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 1006:{uuid: 1006,path: "1006",type: 1,level: 1,name: "再生-初级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 1007:{uuid: 1007,path: "1007",type: 1,level: 1,name: "复生-初级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 1008:{uuid: 1008,path: "1008",type: 1,level: 1,name: "灵巧-初级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 1009:{uuid: 1009,path: "1009",type: 1,level: 1,name: "盾守-初级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 1010:{uuid: 1010,path: "1010",type: 1,level: 1,name: "治愈-初级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 1011:{uuid: 1011,path: "1011",type: 1,level: 3,name: "火焰风暴-初级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 1012:{uuid: 1012,path: "1012",type: 1,level: 3,name: "冰晶风暴-初级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 2001:{uuid: 2001,path: "1001",type: 1,level: 2,name: "火球术-中级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 2002:{uuid: 2002,path: "1002",type: 1,level: 2,name: "寒冰箭-中级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 2003:{uuid: 2003,path: "1003",type: 1,level: 2,name: "狂暴-中级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 2004:{uuid: 2004,path: "1004",type: 1,level: 2,name: "守护-中级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 2005:{uuid: 2005,path: "1005",type: 1,level: 2,name: "雷霆-中级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 2006:{uuid: 2006,path: "1006",type: 1,level: 2,name: "再生-中级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 2007:{uuid: 2007,path: "1007",type: 1,level: 2,name: "复生-中级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 2008:{uuid: 2008,path: "1008",type: 1,level: 2,name: "灵巧-中级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 2009:{uuid: 2009,path: "1009",type: 1,level: 2,name: "盾守-中级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 2010:{uuid: 2010,path: "1010",type: 1,level: 2,name: "治愈-中级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 2011:{uuid: 2011,path: "1011",type: 1,level: 4,name: "火焰风暴-中级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 2012:{uuid: 2012,path: "1012",type: 1,level: 4,name: "冰晶风暴-中级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 3001:{uuid: 3001,path: "1001",type: 1,level: 3,name: "火球术-高级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 3002:{uuid: 3002,path: "1002",type: 1,level: 3,name: "寒冰箭-高级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 3003:{uuid: 3003,path: "1003",type: 1,level: 3,name: "狂暴-高级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 3004:{uuid: 3004,path: "1004",type: 1,level: 3,name: "守护-高级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 3005:{uuid: 3005,path: "1005",type: 1,level: 3,name: "雷霆-高级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 3006:{uuid: 3006,path: "1006",type: 1,level: 3,name: "再生-高级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 3007:{uuid: 3007,path: "1007",type: 1,level: 3,name: "复生-高级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 3008:{uuid: 3008,path: "1008",type: 1,level: 3,name: "灵巧-高级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 3009:{uuid: 3009,path: "1009",type: 1,level: 3,name: "盾守-高级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 3010:{uuid: 3010,path: "1010",type: 1,level: 3,name: "治愈-高级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 3011:{uuid: 3011,path: "1011",type: 1,level: 5,name: "火焰风暴-高级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 3012:{uuid: 3012,path: "1012",type: 1,level: 5,name: "冰晶风暴-高级",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 4001:{uuid: 4001,path: "1001",type: 1,level: 4,name: "火球术-终极",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 4002:{uuid: 4002,path: "1002",type: 1,level: 4,name: "寒冰箭-终极",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 4003:{uuid: 4003,path: "1003",type: 1,level: 4,name: "狂暴-终极",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 4004:{uuid: 4004,path: "1004",type: 1,level: 4,name: "守护-终极",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 4005:{uuid: 4005,path: "1005",type: 1,level: 4,name: "雷霆-终极",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 4006:{uuid: 4006,path: "1006",type: 1,level: 4,name: "再生-终极",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 4007:{uuid: 4007,path: "1007",type: 1,level: 4,name: "复生-终极",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 4008:{uuid: 4008,path: "1008",type: 1,level: 4,name: "灵巧-终极",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 4009:{uuid: 4009,path: "1009",type: 1,level: 4,name: "盾守-终极",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 4010:{uuid: 4010,path: "1010",type: 1,level: 4,name: "治愈-终极",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 4011:{uuid: 4011,path: "1011",type: 1,level: 6,name: "火焰风暴-终极",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 4012:{uuid: 4012,path: "1012",type: 1,level: 6,name: "冰晶风暴-终极",sp_name:"fire",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 9001:{uuid: 9001,path: "9001",type: 1,level: 1,name: "基础攻击1",sp_name:"base",dis:90,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 9002:{uuid: 9002,path: "9002",type: 1,level: 1,name: "基础攻击2",sp_name:"base2",dis:90,count:1,atk: 4,sd:10,cd:1,speed:350,}, + 9003:{uuid: 9003,path: "9003",type: 1,level: 1,name: "基础攻击3",sp_name:"base3",dis:720,count:1,atk: 4,sd:10,cd:1,speed:350,}, + + +} diff --git a/assets/script/game/common/config/SkillSet.ts.meta b/assets/script/game/common/config/SkillSet.ts.meta new file mode 100644 index 00000000..637fd880 --- /dev/null +++ b/assets/script/game/common/config/SkillSet.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.23", + "importer": "typescript", + "imported": true, + "uuid": "bb894d46-7785-4e72-9314-8e384a338ab3", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/script/game/monster/BoxRangComp.ts b/assets/script/game/monster/BoxRangComp.ts index 0f937936..3a59cf81 100644 --- a/assets/script/game/monster/BoxRangComp.ts +++ b/assets/script/game/monster/BoxRangComp.ts @@ -36,10 +36,12 @@ export class BoxRangComp extends CCComp { this.MonsterViewComp.is_atking = true; } } - // onEndContact (selfCollider: Collider2D, otherCollider: Collider2D, contact: IPhysics2DContact | null) { - // // console.log("range box group: seft:"+selfCollider.group+"|other:"+otherCollider.group+"| range box tag: seft:"+selfCollider.tag+"|other:"+otherCollider.tag); - - // } + onEndContact (selfCollider: Collider2D, otherCollider: Collider2D, contact: IPhysics2DContact | null) { + if(selfCollider.group != otherCollider.group&&otherCollider.tag != BoxSet.ATK_RANGE&&otherCollider.tag != BoxSet.SKILL_TAG){ + // console.log("range box group: seft:"+selfCollider.group+"|other:"+otherCollider.group+"| tag: seft:"+selfCollider.tag+"|other:"+otherCollider.tag); + this.MonsterViewComp.is_atking = false; + } + } // onPreSolve (selfCollider: Collider2D, otherCollider: Collider2D, contact: IPhysics2DContact | null) { diff --git a/assets/script/game/monster/CSkill.ts b/assets/script/game/monster/CSkill.ts index 556229bc..1e8dde4d 100644 --- a/assets/script/game/monster/CSkill.ts +++ b/assets/script/game/monster/CSkill.ts @@ -3,7 +3,7 @@ import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ec import { CSkillComp } from "./CSkillComp"; import { oops } from "../../../../extensions/oops-plugin-framework/assets/core/Oops"; import { smc } from "../common/SingletonModuleComp"; -import { SkillSet } from "../common/config/CardSet"; +import { SkillSet } from "../common/config/SkillSet"; /** CSkill 模块 */ @ecs.register(`CSkill`) diff --git a/assets/script/game/monster/CSkillComp.ts b/assets/script/game/monster/CSkillComp.ts index 5254d680..184596c6 100644 --- a/assets/script/game/monster/CSkillComp.ts +++ b/assets/script/game/monster/CSkillComp.ts @@ -3,7 +3,7 @@ import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ec import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/module/common/CCComp"; import { Timer } from "../../../../extensions/oops-plugin-framework/assets/core/common/timer/Timer"; import { Skill } from "../skills/Skill"; -import { SkillSet } from "../common/config/CardSet"; +import { SkillSet } from "../common/config/SkillSet"; import { Monster } from "./Monster"; import { MonsterModelComp } from "./MonsterModelComp"; import { MonsterViewComp } from "./MonsterViewComp"; diff --git a/assets/script/game/monster/HeroCard.ts b/assets/script/game/monster/HeroCard.ts index a6c80a4c..381f62c0 100644 --- a/assets/script/game/monster/HeroCard.ts +++ b/assets/script/game/monster/HeroCard.ts @@ -12,7 +12,8 @@ import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ec import { UIID } from "../common/config/GameUIConfig"; import { smc } from "../common/SingletonModuleComp"; import{HeroCardViewComp} from "./HeroCardViewComp"; -import { CardSet ,SkillSet} from "../common/config/CardSet"; +import { CardSet } from "../common/config/CardSet"; +import { SkillSet } from "../common/config/SkillSet"; /** 角色实体 */ @ecs.register(`HeroCard`) export class HeroCard extends ecs.Entity { diff --git a/assets/script/game/monster/HeroCardViewComp.ts b/assets/script/game/monster/HeroCardViewComp.ts index b8f488f7..5ddb275d 100644 --- a/assets/script/game/monster/HeroCardViewComp.ts +++ b/assets/script/game/monster/HeroCardViewComp.ts @@ -4,7 +4,8 @@ import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/modu import { data } from "../data/data"; import { oops } from "../../../../extensions/oops-plugin-framework/assets/core/Oops"; import { smc } from "../common/SingletonModuleComp"; -import { CardSet, SkillSet } from "../common/config/CardSet"; +import { CardSet } from "../common/config/CardSet"; +import { SkillSet } from "../common/config/SkillSet"; import { HeroCard } from "./HeroCard"; import { HeroModelComp } from "./HeroModelComp"; import { Hero } from "./Hero"; diff --git a/assets/script/game/monster/MonsterViewComp.ts b/assets/script/game/monster/MonsterViewComp.ts index 6bc2f69e..e0cee6ef 100644 --- a/assets/script/game/monster/MonsterViewComp.ts +++ b/assets/script/game/monster/MonsterViewComp.ts @@ -18,7 +18,7 @@ import { oops } from "../../../../extensions/oops-plugin-framework/assets/core/O import { Skill } from "../skills/Skill"; import { Timer } from "../../../../extensions/oops-plugin-framework/assets/core/common/timer/Timer"; import { SkillCom } from "../skills/SkillCom"; -import { SkillSet } from "../common/config/CardSet"; +import { SkillSet } from "../common/config/SkillSet"; import { BoxRangComp } from "./BoxRangComp"; const { ccclass, property } = _decorator;