diff --git a/assets/resources/game/delivery.meta b/assets/resources/game/delivery.meta deleted file mode 100644 index 07e4c9e0..00000000 --- a/assets/resources/game/delivery.meta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "ver": "1.2.0", - "importer": "directory", - "imported": true, - "uuid": "8353c322-fc26-4f8c-803a-23e4c0c961e4", - "files": [], - "subMetas": {}, - "userData": { - "compressionType": {}, - "isRemoteBundle": {} - } -} diff --git a/assets/resources/game/delivery/Transmission6.atlas b/assets/resources/game/delivery/Transmission6.atlas deleted file mode 100644 index c6a2f0d1..00000000 --- a/assets/resources/game/delivery/Transmission6.atlas +++ /dev/null @@ -1,188 +0,0 @@ - -Transmission6.png -size: 2001,537 -format: RGBA8888 -filter: Linear,Linear -repeat: none -magic2 - rotate: false - xy: 1582, 2 - size: 116, 59 - orig: 116, 59 - offset: 0, 0 - index: -1 -magic2/magic2_00 - rotate: true - xy: 2, 15 - size: 259, 156 - orig: 259, 196 - offset: 0, 3 - index: -1 -magic2/magic2_01 - rotate: true - xy: 160, 276 - size: 259, 156 - orig: 259, 196 - offset: 0, 3 - index: -1 -magic2/magic2_02 - rotate: true - xy: 160, 15 - size: 259, 156 - orig: 259, 196 - offset: 0, 3 - index: -1 -magic2/magic2_03 - rotate: true - xy: 318, 276 - size: 259, 156 - orig: 259, 196 - offset: 0, 3 - index: -1 -magic2/magic2_04 - rotate: true - xy: 318, 15 - size: 259, 156 - orig: 259, 196 - offset: 0, 3 - index: -1 -magic2/magic2_05 - rotate: true - xy: 476, 276 - size: 259, 156 - orig: 259, 196 - offset: 0, 3 - index: -1 -magic2/magic2_06 - rotate: true - xy: 476, 15 - size: 259, 156 - orig: 259, 196 - offset: 0, 3 - index: -1 -magic2/magic2_07 - rotate: true - xy: 634, 276 - size: 259, 156 - orig: 259, 196 - offset: 0, 3 - index: -1 -magic2/magic2_08 - rotate: true - xy: 634, 15 - size: 259, 156 - orig: 259, 196 - offset: 0, 3 - index: -1 -magic2/magic2_09 - rotate: true - xy: 792, 276 - size: 259, 156 - orig: 259, 196 - offset: 0, 3 - index: -1 -magic2/magic2_10 - rotate: true - xy: 792, 15 - size: 259, 156 - orig: 259, 196 - offset: 0, 3 - index: -1 -magic2/magic2_11 - rotate: true - xy: 950, 276 - size: 259, 156 - orig: 259, 196 - offset: 0, 3 - index: -1 -magic2/magic2_12 - rotate: true - xy: 950, 15 - size: 259, 156 - orig: 259, 196 - offset: 0, 3 - index: -1 -magic2/magic2_13 - rotate: true - xy: 1108, 276 - size: 259, 156 - orig: 259, 196 - offset: 0, 3 - index: -1 -magic2/magic2_14 - rotate: true - xy: 1108, 15 - size: 259, 156 - orig: 259, 196 - offset: 0, 3 - index: -1 -magic2/magic2_15 - rotate: true - xy: 1266, 276 - size: 259, 156 - orig: 259, 196 - offset: 0, 3 - index: -1 -magic2/magic2_16 - rotate: true - xy: 1266, 15 - size: 259, 156 - orig: 259, 196 - offset: 0, 3 - index: -1 -magic2/magic2_17 - rotate: true - xy: 1424, 276 - size: 259, 156 - orig: 259, 196 - offset: 0, 3 - index: -1 -magic2/magic2_18 - rotate: true - xy: 1424, 15 - size: 259, 156 - orig: 259, 196 - offset: 0, 3 - index: -1 -magic2/magic2_19 - rotate: false - xy: 1582, 379 - size: 259, 156 - orig: 259, 196 - offset: 0, 3 - index: -1 -magic2/magic2_20 - rotate: true - xy: 1843, 276 - size: 259, 156 - orig: 259, 196 - offset: 0, 3 - index: -1 -magic2/magic2_21 - rotate: false - xy: 1582, 221 - size: 259, 156 - orig: 259, 196 - offset: 0, 3 - index: -1 -magic2/magic2_22 - rotate: true - xy: 1843, 15 - size: 259, 156 - orig: 259, 196 - offset: 0, 3 - index: -1 -magic2/magic2_23 - rotate: false - xy: 1582, 63 - size: 259, 156 - orig: 259, 196 - offset: 0, 3 - index: -1 -magic2/magic2_24 - rotate: true - xy: 2, 276 - size: 259, 156 - orig: 259, 196 - offset: 0, 3 - index: -1 diff --git a/assets/resources/game/delivery/Transmission6.atlas.meta b/assets/resources/game/delivery/Transmission6.atlas.meta deleted file mode 100644 index e97d017a..00000000 --- a/assets/resources/game/delivery/Transmission6.atlas.meta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "ver": "1.0.1", - "importer": "*", - "imported": true, - "uuid": "ac3fcaa3-56b2-4e66-a417-5d3ecf07f3cf", - "files": [ - ".atlas", - ".json" - ], - "subMetas": {}, - "userData": {} -} diff --git a/assets/resources/game/delivery/Transmission6.json b/assets/resources/game/delivery/Transmission6.json deleted file mode 100644 index 6601659f..00000000 --- a/assets/resources/game/delivery/Transmission6.json +++ /dev/null @@ -1 +0,0 @@ -{"skeleton":{"hash":"yDws9oZFD3X0fr9jms6Fz0Ng8SQ","spine":"3.8.99","x":-161.25,"y":-39.88,"width":324.23,"height":245.3,"images":"./cutterman/","audio":""},"bones":[{"name":"root","rotation":-0.05},{"name":"骨骼","parent":"root"},{"name":"骨骼2","parent":"root"},{"name":"骨骼3","parent":"root","rotation":-0.03},{"name":"骨骼4","parent":"root","x":0.79,"y":82.27}],"slots":[{"name":"magic2","bone":"root","attachment":"magic2"},{"name":"magic3","bone":"骨骼","attachment":"magic2","blend":"additive"},{"name":"magic4","bone":"骨骼2","attachment":"magic2","blend":"additive"},{"name":"magic5","bone":"骨骼3","attachment":"magic2","blend":"additive"},{"name":"1","bone":"骨骼4","color":"b9d6ffd3","attachment":"magic2/magic2_24","blend":"additive"}],"skins":[{"name":"default","attachments":{"1":{"magic2/magic2_00":{"y":0.5,"width":324,"height":245},"magic2/magic2_01":{"y":0.5,"width":324,"height":245},"magic2/magic2_02":{"y":0.5,"width":324,"height":245},"magic2/magic2_03":{"y":0.5,"width":324,"height":245},"magic2/magic2_04":{"y":0.5,"width":324,"height":245},"magic2/magic2_05":{"y":0.5,"width":324,"height":245},"magic2/magic2_06":{"y":0.5,"width":324,"height":245},"magic2/magic2_07":{"y":0.5,"width":324,"height":245},"magic2/magic2_08":{"y":0.5,"width":324,"height":245},"magic2/magic2_09":{"y":0.5,"width":324,"height":245},"magic2/magic2_10":{"y":0.5,"width":324,"height":245},"magic2/magic2_11":{"y":0.5,"width":324,"height":245},"magic2/magic2_12":{"y":0.5,"width":324,"height":245},"magic2/magic2_13":{"y":0.5,"width":324,"height":245},"magic2/magic2_14":{"y":0.5,"width":324,"height":245},"magic2/magic2_15":{"y":0.5,"width":324,"height":245},"magic2/magic2_16":{"y":0.5,"width":324,"height":245},"magic2/magic2_17":{"y":0.5,"width":324,"height":245},"magic2/magic2_18":{"y":0.5,"width":324,"height":245},"magic2/magic2_19":{"y":0.5,"width":324,"height":245},"magic2/magic2_20":{"y":0.5,"width":324,"height":245},"magic2/magic2_21":{"y":0.5,"width":324,"height":245},"magic2/magic2_22":{"y":0.5,"width":324,"height":245},"magic2/magic2_23":{"y":0.5,"width":324,"height":245},"magic2/magic2_24":{"y":0.5,"width":324,"height":245}},"magic2":{"magic2":{"x":0.5,"width":145,"height":74}},"magic3":{"magic2":{"x":0.5,"width":145,"height":74}},"magic4":{"magic2":{"x":0.5,"width":145,"height":74}},"magic5":{"magic2":{"x":0.5,"width":145,"height":74}}}}],"animations":{"animation":{"slots":{"1":{"attachment":[{"name":"magic2/magic2_00"},{"time":0.0667,"name":"magic2/magic2_01"},{"time":0.1667,"name":"magic2/magic2_02"},{"time":0.2333,"name":"magic2/magic2_03"},{"time":0.3333,"name":"magic2/magic2_04"},{"time":0.4,"name":"magic2/magic2_05"},{"time":0.4667,"name":"magic2/magic2_06"},{"time":0.5667,"name":"magic2/magic2_07"},{"time":0.6333,"name":"magic2/magic2_08"},{"time":0.7333,"name":"magic2/magic2_09"},{"time":0.8,"name":"magic2/magic2_10"},{"time":0.8667,"name":"magic2/magic2_11"},{"time":0.9667,"name":"magic2/magic2_12"},{"time":1.0333,"name":"magic2/magic2_13"},{"time":1.1333,"name":"magic2/magic2_14"},{"time":1.2,"name":"magic2/magic2_15"},{"time":1.3,"name":"magic2/magic2_16"},{"time":1.3667,"name":"magic2/magic2_17"},{"time":1.4333,"name":"magic2/magic2_18"},{"time":1.5333,"name":"magic2/magic2_19"},{"time":1.6,"name":"magic2/magic2_20"},{"time":1.7,"name":"magic2/magic2_21"},{"time":1.7667,"name":"magic2/magic2_22"},{"time":1.8333,"name":"magic2/magic2_23"},{"time":1.9333,"name":"magic2/magic2_24"},{"time":2,"name":"magic2/magic2_00"}]},"magic3":{"color":[{"color":"ffffff00","curve":0.337,"c2":0.35,"c3":0.671,"c4":0.68},{"time":0.2,"color":"ffffffff","curve":0.354,"c2":0.02,"c3":0.897,"c4":0.65},{"time":1.9667,"color":"ffffff00"}]},"magic4":{"color":[{"color":"ffffffe5","curve":0.436,"c2":0.24,"c3":0.891,"c4":0.71},{"time":1.3,"color":"ffffff00","curve":"stepped"},{"time":1.3333,"color":"ffffff00","curve":0.337,"c2":0.35,"c3":0.671,"c4":0.68},{"time":1.5333,"color":"ffffffff","curve":0.303,"c2":0.04,"c3":0.649,"c4":0.41},{"time":2,"color":"ffffffe5"}]},"magic5":{"color":[{"color":"ffffff91","curve":0.482,"c2":0.35,"c3":0.853,"c4":0.72},{"time":0.6333,"color":"ffffff00","curve":"stepped"},{"time":0.6667,"color":"ffffff00","curve":0.337,"c2":0.35,"c3":0.671,"c4":0.68},{"time":0.8667,"color":"ffffffff","curve":0.303,"c2":0.02,"c3":0.711,"c4":0.5},{"time":2,"color":"ffffff91"}]}},"bones":{"骨骼":{"scale":[{"x":0,"y":0},{"time":1.9667,"x":2,"y":2,"curve":0.197,"c2":0.46,"c3":0.781,"c4":0.94},{"time":2,"x":0,"y":0}]},"骨骼2":{"scale":[{"x":0.678,"y":0.678},{"time":1.3,"x":2,"y":2,"curve":0.197,"c2":0.46,"c3":0.781,"c4":0.94},{"time":1.3333,"x":0,"y":0},{"time":2,"x":0.678,"y":0.678}]},"骨骼3":{"scale":[{"x":1.356,"y":1.356},{"time":0.6333,"x":2,"y":2,"curve":0.197,"c2":0.46,"c3":0.781,"c4":0.94},{"time":0.6667,"x":0,"y":0},{"time":2,"x":1.356,"y":1.356}]}}}}} \ No newline at end of file diff --git a/assets/resources/game/delivery/Transmission6.json.meta b/assets/resources/game/delivery/Transmission6.json.meta deleted file mode 100644 index 4d1197f2..00000000 --- a/assets/resources/game/delivery/Transmission6.json.meta +++ /dev/null @@ -1,11 +0,0 @@ -{ - "ver": "1.2.6", - "importer": "spine-data", - "imported": true, - "uuid": "18246ce5-0d8e-4761-83a7-ce8f25ec56e3", - "files": [ - ".json" - ], - "subMetas": {}, - "userData": {} -} diff --git a/assets/resources/game/delivery/Transmission6.png b/assets/resources/game/delivery/Transmission6.png deleted file mode 100644 index 4376a05b..00000000 Binary files a/assets/resources/game/delivery/Transmission6.png and /dev/null differ diff --git a/assets/resources/game/delivery/Transmission6.png.meta b/assets/resources/game/delivery/Transmission6.png.meta deleted file mode 100644 index 8ff74d9a..00000000 --- a/assets/resources/game/delivery/Transmission6.png.meta +++ /dev/null @@ -1,70 +0,0 @@ -{ - "ver": "1.0.26", - "importer": "image", - "imported": true, - "uuid": "e9b945b5-f30c-4f70-9aca-0f2b5761f065", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "Transmission6": { - "ver": "1.0.4", - "uuid": "d271738b-3cb8-408d-ba61-80e446ce84b0", - "rawTextureUuid": "e9b945b5-f30c-4f70-9aca-0f2b5761f065", - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 2001, - "height": 537, - "rawWidth": 2001, - "rawHeight": 537, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "subMetas": {}, - "importer": "*", - "imported": false, - "files": [], - "userData": {}, - "displayName": "", - "id": "", - "name": "" - }, - "6c48a": { - "importer": "texture", - "uuid": "e9b945b5-f30c-4f70-9aca-0f2b5761f065@6c48a", - "displayName": "Transmission6", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "repeat", - "wrapModeT": "repeat", - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0, - "isUuid": true, - "imageUuidOrDatabaseUri": "e9b945b5-f30c-4f70-9aca-0f2b5761f065", - "visible": false - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "hasAlpha": true, - "type": "texture", - "redirect": "e9b945b5-f30c-4f70-9aca-0f2b5761f065@6c48a", - "fixAlphaTransparencyArtifacts": false - } -} diff --git a/assets/resources/game/delivery/delivery.prefab b/assets/resources/game/delivery/delivery.prefab deleted file mode 100644 index 6052d8b8..00000000 --- a/assets/resources/game/delivery/delivery.prefab +++ /dev/null @@ -1,142 +0,0 @@ -[ - { - "__type__": "cc.Prefab", - "_name": "delivery", - "_objFlags": 0, - "_native": "", - "data": { - "__id__": 1 - }, - "optimizationPolicy": 0, - "asyncLoadAssets": false, - "persistent": false - }, - { - "__type__": "cc.Node", - "_name": "delivery", - "_objFlags": 0, - "_parent": null, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 2 - }, - { - "__id__": 4 - } - ], - "_prefab": { - "__id__": 6 - }, - "_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 - }, - "_layer": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 3 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 324.23, - "height": 245.3 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "47P79dIHRMxZOiTq40gR0Y" - }, - { - "__type__": "sp.Skeleton", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 5 - }, - "_visFlags": 0, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "loop": true, - "_premultipliedAlpha": true, - "_timeScale": 1, - "_useTint": false, - "_preCacheMode": 0, - "_cacheMode": 0, - "_defaultCacheMode": 0, - "_debugBones": false, - "_debugSlots": false, - "_skeletonData": { - "__uuid__": "18246ce5-0d8e-4761-83a7-ce8f25ec56e3", - "__expectedType__": "sp.SkeletonData" - }, - "defaultSkin": "default", - "defaultAnimation": "animation", - "_sockets": [], - "_debugMesh": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "434fYZTjRJN5tvfxpBWfz+" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "d9jZtH5VVGpok+7yAKHG07" - } -] \ No newline at end of file diff --git a/assets/resources/game/delivery/delivery.prefab.meta b/assets/resources/game/delivery/delivery.prefab.meta deleted file mode 100644 index 6f138467..00000000 --- a/assets/resources/game/delivery/delivery.prefab.meta +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ver": "1.1.50", - "importer": "prefab", - "imported": true, - "uuid": "bcf9dfa9-b4a0-4814-a8bf-e004e30c3fcb", - "files": [ - ".json" - ], - "subMetas": {}, - "userData": { - "syncNodeName": "delivery" - } -} diff --git a/assets/script/game/monster/Hero.ts b/assets/script/game/monster/Hero.ts index b47582e4..89a4d59a 100644 --- a/assets/script/game/monster/Hero.ts +++ b/assets/script/game/monster/Hero.ts @@ -46,7 +46,7 @@ export class Hero extends ecs.Entity { node.getChildByName("avatar").setScale(node.getChildByName("avatar").scale.x*camp, node.getChildByName("avatar").scale.y, node.getChildByName("avatar").scale.z); node.setPosition(pos) - console.log(node.getChildByName("avatar").getChildByName("TNode").getChildByName("bb").getComponent(Sprite)) + // console.log(node.getChildByName("avatar").getChildByName("TNode").getChildByName("bb").getComponent(Sprite)) const url = 'game/heros/hero/'+prefab_path+'/spriteFrame'; resources.load(url, SpriteFrame, (err: any, spriteFrame) => { const sprite = node.getChildByName("avatar").getChildByName("TNode").getChildByName("bb").getComponent(Sprite); diff --git a/assets/script/game/monster/Monster.ts b/assets/script/game/monster/Monster.ts index 3405e73b..4c65ca97 100644 --- a/assets/script/game/monster/Monster.ts +++ b/assets/script/game/monster/Monster.ts @@ -48,7 +48,7 @@ export class Monster extends ecs.Entity { node.getChildByName("avatar").setScale(node.getChildByName("avatar").scale.x*camp, node.getChildByName("avatar").scale.y, node.getChildByName("avatar").scale.z); node.setPosition(pos) - console.log(node.getChildByName("avatar").getChildByName("TNode").getChildByName("bb").getComponent(Sprite)) + // console.log(node.getChildByName("avatar").getChildByName("TNode").getChildByName("bb").getComponent(Sprite)) const url = 'game/heros/hero/'+prefab_path+'/spriteFrame'; resources.load(url, SpriteFrame, (err: any, spriteFrame) => { const sprite = node.getChildByName("avatar").getChildByName("TNode").getChildByName("bb").getComponent(Sprite); diff --git a/assets/script/game/monster/MonsterViewComp.ts b/assets/script/game/monster/MonsterViewComp.ts index 9406dca5..0dbac098 100644 --- a/assets/script/game/monster/MonsterViewComp.ts +++ b/assets/script/game/monster/MonsterViewComp.ts @@ -166,7 +166,7 @@ export class MonsterViewComp extends CCComp { switch (this.camp) { case -1: if(this.node.position.x < BoxSet.LETF_END){ - this.node.destroy(); + this.reset(); } break; case 1: @@ -185,7 +185,7 @@ export class MonsterViewComp extends CCComp { } reset() { - console.log("node destroy:",this.node,this.ent) + // console.log("node destroy:",this.node,this.ent) smc.monsters_in = smc.monsters_in.filter(element => element.eid !== this.ent.eid); smc.monsters_in = smc.monsters_in.filter(element => element.eid !== this.ent.eid); this.node.destroy();