diff --git a/assets/resources/game/heros/hero.meta b/assets/resources/game/heros/hero.meta new file mode 100644 index 00000000..6e0afe3d --- /dev/null +++ b/assets/resources/game/heros/hero.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "a3329190-800f-450a-a5a0-90a4b59ddd4b", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/assets/resources/game/heros/hero.prefab b/assets/resources/game/heros/hero.prefab index d00e6637..4fa514f5 100644 --- a/assets/resources/game/heros/hero.prefab +++ b/assets/resources/game/heros/hero.prefab @@ -22,42 +22,48 @@ "__id__": 2 }, { - "__id__": 21 + "__id__": 8 }, { - "__id__": 35 + "__id__": 27 }, { - "__id__": 49 + "__id__": 41 + }, + { + "__id__": 55 + }, + { + "__id__": 63 } ], "_active": true, "_components": [ { - "__id__": 57 + "__id__": 75 }, { - "__id__": 59 + "__id__": 77 }, { - "__id__": 61 + "__id__": 79 }, { - "__id__": 63 + "__id__": 81 }, { - "__id__": 65 + "__id__": 83 }, { - "__id__": 67 + "__id__": 85 } ], "_prefab": { - "__id__": 69 + "__id__": 87 }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, + "x": -0.041, "y": 0, "z": 0 }, @@ -84,6 +90,142 @@ }, "_id": "" }, + { + "__type__": "cc.Node", + "_name": "shadow", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 3 + }, + { + "__id__": 5 + } + ], + "_prefab": { + "__id__": 7 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 3, + "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": 1, + "_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": 54, + "height": 12 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "6dLRTNA41OJbBb4sQRvyx6" + }, + { + "__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__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@34d88", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_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": "30gG80zkxEzo2FMaFRx+C/" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "42lIJv88tJnrxaphLlD8X9", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.Node", "_name": "avatar", @@ -94,23 +236,23 @@ }, "_children": [ { - "__id__": 3 + "__id__": 9 } ], "_active": true, "_components": [ { - "__id__": 13 + "__id__": 19 }, { - "__id__": 15 + "__id__": 21 }, { - "__id__": 18 + "__id__": 24 } ], "_prefab": { - "__id__": 20 + "__id__": 26 }, "_lpos": { "__type__": "cc.Vec3", @@ -147,25 +289,25 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 2 + "__id__": 8 }, "_children": [ { - "__id__": 4 + "__id__": 10 } ], "_active": true, "_components": [ { - "__id__": 10 + "__id__": 16 } ], "_prefab": { - "__id__": 12 + "__id__": 18 }, "_lpos": { "__type__": "cc.Vec3", - "x": -7.450000762939453, + "x": -0.0000010490732620382914, "y": 24, "z": 0 }, @@ -198,20 +340,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 3 + "__id__": 9 }, "_children": [], "_active": true, "_components": [ { - "__id__": 5 + "__id__": 11 }, { - "__id__": 7 + "__id__": 13 } ], "_prefab": { - "__id__": 9 + "__id__": 15 }, "_lpos": { "__type__": "cc.Vec3", @@ -248,11 +390,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 4 + "__id__": 10 }, "_enabled": true, "__prefab": { - "__id__": 6 + "__id__": 12 }, "_contentSize": { "__type__": "cc.Size", @@ -276,11 +418,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 4 + "__id__": 10 }, "_enabled": true, "__prefab": { - "__id__": 8 + "__id__": 14 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -337,11 +479,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 3 + "__id__": 9 }, "_enabled": true, "__prefab": { - "__id__": 11 + "__id__": 17 }, "_contentSize": { "__type__": "cc.Size", @@ -378,21 +520,21 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 8 }, "_enabled": true, "__prefab": { - "__id__": 14 + "__id__": 20 }, "_contentSize": { "__type__": "cc.Size", - "width": 72, - "height": 56.130001068115234 + "width": 15.520000457763672, + "height": 9.600000381469727 }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 0.5, - "y": 0 + "x": 0.05283504952715698, + "y": 2.541666525933483 }, "_id": "" }, @@ -406,11 +548,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 8 }, "_enabled": true, "__prefab": { - "__id__": 16 + "__id__": 22 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -423,7 +565,7 @@ "a": 255 }, "_skeletonData": { - "__uuid__": "4ba2de71-96df-42bd-b2df-7b67756e16e3", + "__uuid__": "a80809a8-64bf-4c66-b49e-7aa837d821dd", "__expectedType__": "sp.SkeletonData" }, "defaultSkin": "default", @@ -434,7 +576,7 @@ "_cacheMode": 1, "_sockets": [ { - "__id__": 17 + "__id__": 23 } ], "_useTint": false, @@ -453,7 +595,7 @@ "__type__": "sp.Skeleton.SpineSocket", "path": "root/bone", "target": { - "__id__": 3 + "__id__": 9 } }, { @@ -462,11 +604,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 8 }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 25 }, "_id": "" }, @@ -497,28 +639,28 @@ }, "_children": [ { - "__id__": 22 + "__id__": 28 } ], "_active": true, "_components": [ { - "__id__": 28 + "__id__": 34 }, { - "__id__": 30 + "__id__": 36 }, { - "__id__": 32 + "__id__": 38 } ], "_prefab": { - "__id__": 34 + "__id__": 40 }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, - "y": 112.378, + "x": 5, + "y": 100, "z": 0 }, "_lrot": { @@ -550,20 +692,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 21 + "__id__": 27 }, "_children": [], "_active": true, "_components": [ { - "__id__": 23 + "__id__": 29 }, { - "__id__": 25 + "__id__": 31 } ], "_prefab": { - "__id__": 27 + "__id__": 33 }, "_lpos": { "__type__": "cc.Vec3", @@ -600,11 +742,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 22 + "__id__": 28 }, "_enabled": true, "__prefab": { - "__id__": 24 + "__id__": 30 }, "_contentSize": { "__type__": "cc.Size", @@ -628,11 +770,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 22 + "__id__": 28 }, "_enabled": true, "__prefab": { - "__id__": 26 + "__id__": 32 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -686,11 +828,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 21 + "__id__": 27 }, "_enabled": true, "__prefab": { - "__id__": 29 + "__id__": 35 }, "_contentSize": { "__type__": "cc.Size", @@ -714,11 +856,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 21 + "__id__": 27 }, "_enabled": true, "__prefab": { - "__id__": 31 + "__id__": 37 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -759,14 +901,14 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 21 + "__id__": 27 }, "_enabled": true, "__prefab": { - "__id__": 33 + "__id__": 39 }, "_barSprite": { - "__id__": 25 + "__id__": 31 }, "_mode": 0, "_totalLength": 50, @@ -801,28 +943,28 @@ }, "_children": [ { - "__id__": 36 + "__id__": 42 } ], "_active": true, "_components": [ { - "__id__": 42 + "__id__": 48 }, { - "__id__": 44 + "__id__": 50 }, { - "__id__": 46 + "__id__": 52 } ], "_prefab": { - "__id__": 48 + "__id__": 54 }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, - "y": 107.378, + "x": 5, + "y": 95, "z": 0 }, "_lrot": { @@ -854,20 +996,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 35 + "__id__": 41 }, "_children": [], "_active": true, "_components": [ { - "__id__": 37 + "__id__": 43 }, { - "__id__": 39 + "__id__": 45 } ], "_prefab": { - "__id__": 41 + "__id__": 47 }, "_lpos": { "__type__": "cc.Vec3", @@ -904,11 +1046,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 36 + "__id__": 42 }, "_enabled": true, "__prefab": { - "__id__": 38 + "__id__": 44 }, "_contentSize": { "__type__": "cc.Size", @@ -932,11 +1074,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 36 + "__id__": 42 }, "_enabled": true, "__prefab": { - "__id__": 40 + "__id__": 46 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -990,11 +1132,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 35 + "__id__": 41 }, "_enabled": true, "__prefab": { - "__id__": 43 + "__id__": 49 }, "_contentSize": { "__type__": "cc.Size", @@ -1018,11 +1160,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 35 + "__id__": 41 }, "_enabled": true, "__prefab": { - "__id__": 45 + "__id__": 51 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1063,14 +1205,14 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 35 + "__id__": 41 }, "_enabled": true, "__prefab": { - "__id__": 47 + "__id__": 53 }, "_barSprite": { - "__id__": 39 + "__id__": 45 }, "_mode": 0, "_totalLength": 50, @@ -1104,20 +1246,20 @@ "__id__": 1 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { - "__id__": 50 + "__id__": 56 }, { - "__id__": 52 + "__id__": 58 }, { - "__id__": 54 + "__id__": 60 } ], "_prefab": { - "__id__": 56 + "__id__": 62 }, "_lpos": { "__type__": "cc.Vec3", @@ -1154,11 +1296,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 49 + "__id__": 55 }, "_enabled": true, "__prefab": { - "__id__": 51 + "__id__": 57 }, "_contentSize": { "__type__": "cc.Size", @@ -1182,11 +1324,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 49 + "__id__": 55 }, "_enabled": true, "__prefab": { - "__id__": 53 + "__id__": 59 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1215,7 +1357,7 @@ "_isUnderline": false, "_underlineHeight": 2, "_cacheMode": 0, - "_enableOutline": true, + "_enableOutline": false, "_outlineColor": { "__type__": "cc.Color", "r": 24, @@ -1250,11 +1392,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 49 + "__id__": 55 }, "_enabled": true, "__prefab": { - "__id__": 55 + "__id__": 61 }, "_id": "" }, @@ -1275,6 +1417,303 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "level", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 64 + } + ], + "_active": true, + "_components": [ + { + "__id__": 70 + }, + { + "__id__": 72 + } + ], + "_prefab": { + "__id__": 74 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -25, + "y": 98.494, + "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": 1, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "Label", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 63 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 65 + }, + { + "__id__": 67 + } + ], + "_prefab": { + "__id__": 69 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -1, + "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": 1, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 64 + }, + "_enabled": true, + "__prefab": { + "__id__": 66 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 10.34228515625, + "height": 20.9 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "83gfGYmNZGpKWJLh4wgKUZ" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 64 + }, + "_enabled": true, + "__prefab": { + "__id__": 68 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "1", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 15, + "_fontSize": 15, + "_fontFamily": "Arial", + "_lineHeight": 15, + "_overflow": 0, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": false, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_enableOutline": true, + "_outlineColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_outlineWidth": 1, + "_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": "0bqKVdOOtB2r6rHTTGYbtk" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "f8+NJtzJRC/ZYoN9vBdj6F", + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 63 + }, + "_enabled": true, + "__prefab": { + "__id__": 71 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 25, + "height": 25 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "156zvtWyZL7JeSq/l8Wq5O" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 63 + }, + "_enabled": true, + "__prefab": { + "__id__": 73 + }, + "_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@a6b9d", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_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": "3bjPXp87JGu52dDySu74sO" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "2dGu24EexKI57EzgA2ECVa", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -1285,7 +1724,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 58 + "__id__": 76 }, "_contentSize": { "__type__": "cc.Size", @@ -1313,7 +1752,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 78 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1355,10 +1794,10 @@ }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 80 }, "animator": { - "__id__": 18 + "__id__": 24 }, "_id": "" }, @@ -1376,7 +1815,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 82 }, "_id": "" }, @@ -1394,23 +1833,23 @@ }, "_enabled": true, "__prefab": { - "__id__": 66 + "__id__": 84 }, "tag": 0, "_group": 2, - "_density": 0, + "_density": 1, "_sensor": false, "_friction": 1, "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": -8.2, - "y": 44.8 + "x": -0.8, + "y": 35.1 }, "_size": { "__type__": "cc.Size", - "width": 58.4, - "height": 101.5 + "width": 61.7, + "height": 72.7 }, "_id": "" }, @@ -1428,7 +1867,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 68 + "__id__": 86 }, "enabledContactListener": true, "bullet": true, @@ -1436,7 +1875,7 @@ "_group": 2, "_type": 2, "_allowSleep": false, - "_gravityScale": 0, + "_gravityScale": 1, "_linearDamping": 0, "_angularDamping": 0, "_linearVelocity": { diff --git a/assets/resources/game/heros/hero/skeleton.atlas b/assets/resources/game/heros/hero/skeleton.atlas new file mode 100644 index 00000000..00c5a2c9 --- /dev/null +++ b/assets/resources/game/heros/hero/skeleton.atlas @@ -0,0 +1,13 @@ + +skeleton.png +size: 86,55 +format: RGBA8888 +filter: Linear,Linear +repeat: none +bb + rotate: false + xy: 2, 2 + size: 82, 51 + orig: 82, 51 + offset: 0, 0 + index: -1 diff --git a/assets/resources/game/heros/hero/skeleton.atlas.meta b/assets/resources/game/heros/hero/skeleton.atlas.meta new file mode 100644 index 00000000..40a111d9 --- /dev/null +++ b/assets/resources/game/heros/hero/skeleton.atlas.meta @@ -0,0 +1,12 @@ +{ + "ver": "1.0.1", + "importer": "*", + "imported": true, + "uuid": "958e8fe7-e356-4285-aa30-1ec62e24f36e", + "files": [ + ".atlas", + ".json" + ], + "subMetas": {}, + "userData": {} +} diff --git a/assets/resources/game/heros/hero/skeleton.json b/assets/resources/game/heros/hero/skeleton.json new file mode 100644 index 00000000..eb6d52c9 --- /dev/null +++ b/assets/resources/game/heros/hero/skeleton.json @@ -0,0 +1,67 @@ +{ +"skeleton": { + "hash": "mTdwPQSy5KxWwnhuf6ECTp8Do1M", + "spine": "3.8.99", + "x": -0.82, + "y": 24.4, + "width": 15.52, + "height": 9.6, + "images": "", + "audio": "" +}, +"bones": [ + { "name": "root" }, + { "name": "bone", "parent": "root", "y": 24, "scaleX": 1.0139, "scaleY": 1.0139 } +], +"slots": [ + { "name": "bb", "bone": "bone", "attachment": "bb" } +], +"skins": [ + { + "name": "default", + "attachments": { + "bb": { + "bb": { "x": 6.85, "y": 5.13, "scaleX": 0.1867, "scaleY": 0.1857, "width": 82, "height": 51 } + } + } + } +], +"animations": { + "atk": { + "bones": { + "bone": { + "scale": [ + {}, + { "time": 0.3, "x": 0.682 }, + { "time": 0.4, "x": 1.06 }, + { "time": 0.5 } + ] + } + } + }, + "magic": { + "bones": { + "bone": { + "scale": [ + { "x": 0.986, "y": 0.986 }, + { "time": 0.2, "x": 1.153, "y": 0.896 }, + { "time": 0.4, "x": 0.789, "y": 1.085, "curve": "stepped" }, + { "time": 0.5333, "x": 0.789, "y": 1.085 }, + { "time": 0.6667, "x": 0.986, "y": 0.986 } + ] + } + } + }, + "move": { + "bones": { + "bone": { + "scale": [ + {}, + { "time": 0.5, "y": 0.96 }, + { "time": 1 } + ] + } + } + } +} +} \ No newline at end of file diff --git a/assets/resources/game/heros/hero/skeleton.json.meta b/assets/resources/game/heros/hero/skeleton.json.meta new file mode 100644 index 00000000..7cb2c91c --- /dev/null +++ b/assets/resources/game/heros/hero/skeleton.json.meta @@ -0,0 +1,11 @@ +{ + "ver": "1.2.6", + "importer": "spine-data", + "imported": true, + "uuid": "a80809a8-64bf-4c66-b49e-7aa837d821dd", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": {} +} diff --git a/assets/resources/game/heros/hero/skeleton.png b/assets/resources/game/heros/hero/skeleton.png new file mode 100644 index 00000000..4409a6ed Binary files /dev/null and b/assets/resources/game/heros/hero/skeleton.png differ diff --git a/assets/resources/game/heros/hero/skeleton.png.meta b/assets/resources/game/heros/hero/skeleton.png.meta new file mode 100644 index 00000000..719b00cf --- /dev/null +++ b/assets/resources/game/heros/hero/skeleton.png.meta @@ -0,0 +1,42 @@ +{ + "ver": "1.0.26", + "importer": "image", + "imported": true, + "uuid": "a2c2ea64-e32d-425c-87be-2e57155a04b2", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "a2c2ea64-e32d-425c-87be-2e57155a04b2@6c48a", + "displayName": "skeleton", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "repeat", + "wrapModeT": "repeat", + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0, + "isUuid": true, + "imageUuidOrDatabaseUri": "a2c2ea64-e32d-425c-87be-2e57155a04b2", + "visible": false + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "hasAlpha": true, + "type": "texture", + "fixAlphaTransparencyArtifacts": false, + "redirect": "a2c2ea64-e32d-425c-87be-2e57155a04b2@6c48a" + } +} diff --git a/assets/resources/game/map/map_rpg.prefab b/assets/resources/game/map/map_rpg.prefab index 67324f85..07a13a1d 100644 --- a/assets/resources/game/map/map_rpg.prefab +++ b/assets/resources/game/map/map_rpg.prefab @@ -442,7 +442,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 79.62, + "y": 0, "z": 0 }, "_lrot": { @@ -455,7 +455,7 @@ "_lscale": { "__type__": "cc.Vec3", "x": 0.7, - "y": 0.7, + "y": 1, "z": 1 }, "_mobility": 0, @@ -595,12 +595,12 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": 310, + "x": -119.1, "y": -459.8 }, "_size": { "__type__": "cc.Size", - "width": 3260.8, + "width": 4118.9, "height": 981.7 }, "_id": "" @@ -617,7 +617,7 @@ "node": { "__id__": 10 }, - "_enabled": true, + "_enabled": false, "__prefab": { "__id__": 20 }, @@ -651,7 +651,7 @@ "node": { "__id__": 10 }, - "_enabled": true, + "_enabled": false, "__prefab": { "__id__": 22 }, diff --git a/assets/resources/game/skills/base.prefab b/assets/resources/game/skills/base.prefab index 0dfb7fb3..214bf110 100644 --- a/assets/resources/game/skills/base.prefab +++ b/assets/resources/game/skills/base.prefab @@ -93,7 +93,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -15, + "y": 0, "z": 0 }, "_lrot": { @@ -133,8 +133,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 64, - "height": 64 + "width": 20, + "height": 72 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -287,13 +287,13 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": 16, - "y": 16 + "x": 10.2, + "y": 33.2 }, "_size": { "__type__": "cc.Size", - "width": 32, - "height": 32 + "width": 20.4, + "height": 66.4 }, "_id": "" }, diff --git a/assets/resources/gui/gui.plist b/assets/resources/gui/gui.plist index cfe7485c..95e6902c 100644 --- a/assets/resources/gui/gui.plist +++ b/assets/resources/gui/gui.plist @@ -15,9 +15,9 @@ spriteSourceSize {94,118} textureRect - {{1573,543},{94,118}} + {{555,811},{94,118}} textureRotated - + 02.png @@ -30,7 +30,7 @@ spriteSourceSize {64,63} textureRect - {{405,443},{64,63}} + {{1591,960},{64,63}} textureRotated @@ -45,7 +45,7 @@ spriteSourceSize {64,62} textureRect - {{1476,898},{64,62}} + {{405,443},{64,62}} textureRotated @@ -75,9 +75,9 @@ spriteSourceSize {190,178} textureRect - {{276,787},{190,178}} + {{1203,730},{190,178}} textureRotated - + 28.png @@ -105,9 +105,9 @@ spriteSourceSize {254,256} textureRect - {{1196,215},{254,256}} + {{1455,215},{254,256}} textureRotated - + 30.png @@ -120,7 +120,7 @@ spriteSourceSize {256,244} textureRect - {{1454,257},{256,244}} + {{746,471},{256,244}} textureRotated @@ -135,9 +135,9 @@ spriteSourceSize {122,98} textureRect - {{1476,774},{122,98}} + {{431,811},{122,98}} textureRotated - + 43.png @@ -150,7 +150,7 @@ spriteSourceSize {100,100} textureRect - {{1786,655},{100,100}} + {{675,811},{100,100}} textureRotated @@ -165,9 +165,9 @@ spriteSourceSize {82,94} textureRect - {{981,841},{82,94}} + {{1283,922},{82,94}} textureRotated - + 57.png @@ -180,7 +180,7 @@ spriteSourceSize {90,104} textureRect - {{767,841},{90,104}} + {{766,915},{90,104}} textureRotated @@ -195,7 +195,7 @@ spriteSourceSize {100,96} textureRect - {{1683,759},{100,96}} + {{664,913},{100,96}} textureRotated @@ -210,7 +210,7 @@ spriteSourceSize {84,106} textureRect - {{873,841},{84,106}} + {{872,915},{84,106}} textureRotated @@ -225,9 +225,9 @@ spriteSourceSize {82,100} textureRect - {{1739,857},{82,100}} + {{980,918},{82,100}} textureRotated - + Artboard 13.png @@ -240,7 +240,7 @@ spriteSourceSize {321,299} textureRect - {{816,582},{257,261}} + {{1004,471},{257,261}} textureRotated @@ -285,9 +285,9 @@ spriteSourceSize {360,112} textureRect - {{772,392},{344,94}} + {{1383,670},{344,94}} textureRotated - + Artboard 18.png @@ -300,9 +300,9 @@ spriteSourceSize {360,114} textureRect - {{746,488},{336,92}} + {{1711,200},{336,92}} textureRotated - + Artboard 27.png @@ -435,7 +435,7 @@ spriteSourceSize {318,335} textureRect - {{1618,1},{254,261}} + {{1192,215},{254,261}} textureRotated @@ -450,7 +450,7 @@ spriteSourceSize {93,95} textureRect - {{1658,889},{79,79}} + {{1716,846},{79,79}} textureRotated @@ -465,9 +465,9 @@ spriteSourceSize {93,94} textureRect - {{1576,889},{79,80}} + {{1716,764},{79,80}} textureRotated - + Artboard 69.png @@ -480,9 +480,9 @@ spriteSourceSize {121,129} textureRect - {{1576,774},{105,113}} + {{222,918},{105,113}} textureRotated - + Artboard 70.png @@ -495,9 +495,9 @@ spriteSourceSize {121,124} textureRect - {{1679,655},{105,102}} + {{448,918},{105,102}} textureRotated - + Artboard 9.png @@ -525,7 +525,7 @@ spriteSourceSize {197,185} textureRect - {{1712,257},{197,185}} + {{1618,1},{197,185}} textureRotated @@ -540,9 +540,9 @@ spriteSourceSize {197,186} textureRect - {{1712,456},{197,186}} + {{1,821},{197,186}} textureRotated - + BtnSmallBlue.png @@ -555,7 +555,7 @@ spriteSourceSize {197,186} textureRect - {{1079,582},{197,186}} + {{1267,471},{197,186}} textureRotated @@ -570,7 +570,7 @@ spriteSourceSize {197,186} textureRect - {{1079,781},{197,186}} + {{1455,473},{197,186}} textureRotated @@ -585,9 +585,9 @@ spriteSourceSize {196,186} textureRect - {{1278,781},{196,186}} + {{816,717},{196,186}} textureRotated - + BtnSmallOrange.png @@ -600,9 +600,9 @@ spriteSourceSize {197,186} textureRect - {{1267,582},{197,186}} + {{1004,730},{197,186}} textureRotated - + Heroes_icon.png @@ -615,7 +615,7 @@ spriteSourceSize {41,48} textureRect - {{1669,543},{41,48}} + {{1336,670},{41,48}} textureRotated @@ -630,7 +630,7 @@ spriteSourceSize {35,32} textureRect - {{234,787},{35,32}} + {{772,341},{35,32}} textureRotated @@ -645,7 +645,7 @@ spriteSourceSize {42,43} textureRect - {{981,925},{42,43}} + {{1567,170},{42,43}} textureRotated @@ -675,7 +675,7 @@ spriteSourceSize {105,10} textureRect - {{627,958},{105,10}} + {{1479,974},{105,10}} textureRotated @@ -690,7 +690,7 @@ spriteSourceSize {111,16} textureRect - {{1454,215},{111,16}} + {{766,1007},{111,16}} textureRotated @@ -705,7 +705,7 @@ spriteSourceSize {92,100} textureRect - {{1084,488},{92,100}} + {{1082,918},{92,100}} textureRotated @@ -720,9 +720,9 @@ spriteSourceSize {138,123} textureRect - {{627,811},{138,123}} + {{1591,820},{138,123}} textureRotated - + bg.png @@ -750,9 +750,9 @@ spriteSourceSize {111,109} textureRect - {{1186,471},{111,109}} + {{1694,538},{111,109}} textureRotated - + cardbg.png @@ -765,7 +765,7 @@ spriteSourceSize {97,97} textureRect - {{1786,757},{97,97}} + {{1184,922},{97,97}} textureRotated @@ -780,9 +780,9 @@ spriteSourceSize {180,38} textureRect - {{1455,503},{180,38}} + {{1654,473},{180,38}} textureRotated - + data_bg1.png @@ -795,7 +795,7 @@ spriteSourceSize {38,38} textureRect - {{1637,503},{38,38}} + {{1654,655},{38,38}} textureRotated @@ -810,9 +810,9 @@ spriteSourceSize {166,20} textureRect - {{627,936},{166,20}} + {{200,821},{166,20}} textureRotated - + gbg.png @@ -825,7 +825,7 @@ spriteSourceSize {212,26} textureRect - {{1,929},{212,26}} + {{746,443},{212,26}} textureRotated @@ -840,7 +840,7 @@ spriteSourceSize {76,76} textureRect - {{1823,856},{76,76}} + {{1716,927},{76,76}} textureRotated @@ -855,9 +855,9 @@ spriteSourceSize {109,108} textureRect - {{1569,663},{109,108}} + {{337,915},{109,108}} textureRotated - + grep.png @@ -870,9 +870,9 @@ spriteSourceSize {112,110} textureRect - {{1455,662},{112,110}} + {{552,911},{112,110}} textureRotated - + infobox.png @@ -885,9 +885,9 @@ spriteSourceSize {273,106} textureRect - {{1,821},{273,106}} + {{1084,171},{273,106}} textureRotated - + kuang.png @@ -900,7 +900,7 @@ spriteSourceSize {110,152} textureRect - {{1084,171},{110,152}} + {{1479,820},{110,152}} textureRotated @@ -915,9 +915,9 @@ spriteSourceSize {77,72} textureRect - {{746,582},{75,68}} + {{960,392},{75,68}} textureRotated - + light.png @@ -930,7 +930,7 @@ spriteSourceSize {76,119} textureRect - {{1118,325},{76,119}} + {{234,797},{76,119}} textureRotated @@ -945,7 +945,7 @@ spriteSourceSize {67,53} textureRect - {{746,659},{67,53}} + {{1267,670},{67,53}} textureRotated @@ -960,7 +960,7 @@ spriteSourceSize {157,157} textureRect - {{468,811},{157,157}} + {{1479,661},{157,157}} textureRotated @@ -975,9 +975,9 @@ spriteSourceSize {111,109} textureRect - {{1299,471},{111,109}} + {{1694,651},{111,109}} textureRotated - + redbar.png @@ -990,9 +990,9 @@ spriteSourceSize {129,8} textureRect - {{1454,233},{129,8}} + {{1638,661},{129,8}} textureRotated - + redbg.png @@ -1005,7 +1005,22 @@ spriteSourceSize {216,8} textureRect - {{1,957},{216,8}} + {{234,787},{216,8}} + textureRotated + + + shadow.png + + aliases + + spriteOffset + {0,0} + spriteSize + {32,12} + spriteSourceSize + {32,12} + textureRect + {{664,1011},{32,12}} textureRotated @@ -1020,9 +1035,9 @@ spriteSourceSize {35,14} textureRect - {{772,341},{35,14}} + {{1367,922},{35,14}} textureRotated - + ybg.png @@ -1035,9 +1050,9 @@ spriteSourceSize {216,14} textureRect - {{1881,1},{216,14}} + {{1,1009},{216,14}} textureRotated - + zhujiemian-6.png @@ -1050,9 +1065,9 @@ spriteSourceSize {116,117} textureRect - {{1455,543},{116,117}} + {{312,797},{116,117}} textureRotated - + metadata @@ -1066,9 +1081,9 @@ realTextureFileName gui.png size - {1900,969} + {1804,1024} smartupdate - $TexturePacker:SmartUpdate:eb60835624a00b4dcb3eb383188374e5:bac7fa6c66460e5b6585da9e4f20e0a1:5f86533554b8a62fd9d2a17dd9533d7c$ + $TexturePacker:SmartUpdate:e1557052be3ccfbe6305f2cc78d158a7:6bd1bb4c2ec245288a1fec69e0989bc2:5f86533554b8a62fd9d2a17dd9533d7c$ textureFileName gui.png diff --git a/assets/resources/gui/gui.plist.meta b/assets/resources/gui/gui.plist.meta index 74d73cc6..51d65aea 100644 --- a/assets/resources/gui/gui.plist.meta +++ b/assets/resources/gui/gui.plist.meta @@ -62,11 +62,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1455, - "trimY": 503, + "trimX": 1654, + "trimY": 473, "width": 180, "height": 38, "rawWidth": 180, @@ -154,11 +154,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 772, - "trimY": 392, + "trimX": 1383, + "trimY": 670, "width": 344, "height": 94, "rawWidth": 360, @@ -200,11 +200,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": -3, "offsetY": 3, - "trimX": 746, - "trimY": 488, + "trimX": 1711, + "trimY": 200, "width": 336, "height": 92, "rawWidth": 360, @@ -246,11 +246,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": -2, "offsetY": 1, - "trimX": 1576, - "trimY": 889, + "trimX": 1716, + "trimY": 764, "width": 79, "height": 80, "rawWidth": 93, @@ -295,8 +295,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1084, - "trimY": 488, + "trimX": 1082, + "trimY": 918, "width": 92, "height": 100, "rawWidth": 92, @@ -338,11 +338,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1569, - "trimY": 663, + "trimX": 337, + "trimY": 915, "width": 109, "height": 108, "rawWidth": 109, @@ -384,11 +384,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1573, - "trimY": 543, + "trimX": 555, + "trimY": 811, "width": 94, "height": 118, "rawWidth": 94, @@ -433,8 +433,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 405, - "trimY": 443, + "trimX": 1591, + "trimY": 960, "width": 64, "height": 63, "rawWidth": 64, @@ -479,8 +479,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1476, - "trimY": 898, + "trimX": 405, + "trimY": 443, "width": 64, "height": 62, "rawWidth": 64, @@ -568,11 +568,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 276, - "trimY": 787, + "trimX": 1203, + "trimY": 730, "width": 190, "height": 178, "rawWidth": 190, @@ -660,10 +660,10 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1196, + "trimX": 1455, "trimY": 215, "width": 254, "height": 256, @@ -709,8 +709,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1454, - "trimY": 257, + "trimX": 746, + "trimY": 471, "width": 256, "height": 244, "rawWidth": 256, @@ -752,11 +752,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1476, - "trimY": 774, + "trimX": 431, + "trimY": 811, "width": 122, "height": 98, "rawWidth": 122, @@ -801,8 +801,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1786, - "trimY": 655, + "trimX": 675, + "trimY": 811, "width": 100, "height": 100, "rawWidth": 100, @@ -844,11 +844,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 981, - "trimY": 841, + "trimX": 1283, + "trimY": 922, "width": 82, "height": 94, "rawWidth": 82, @@ -893,8 +893,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 767, - "trimY": 841, + "trimX": 766, + "trimY": 915, "width": 90, "height": 104, "rawWidth": 90, @@ -939,8 +939,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1683, - "trimY": 759, + "trimX": 664, + "trimY": 913, "width": 100, "height": 96, "rawWidth": 100, @@ -985,8 +985,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 873, - "trimY": 841, + "trimX": 872, + "trimY": 915, "width": 84, "height": 106, "rawWidth": 84, @@ -1028,11 +1028,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1739, - "trimY": 857, + "trimX": 980, + "trimY": 918, "width": 82, "height": 100, "rawWidth": 82, @@ -1077,8 +1077,8 @@ "rotated": true, "offsetX": -1, "offsetY": -8, - "trimX": 816, - "trimY": 582, + "trimX": 1004, + "trimY": 471, "width": 257, "height": 261, "rawWidth": 321, @@ -1583,8 +1583,8 @@ "rotated": true, "offsetX": -3, "offsetY": -3, - "trimX": 1618, - "trimY": 1, + "trimX": 1192, + "trimY": 215, "width": 254, "height": 261, "rawWidth": 318, @@ -1629,8 +1629,8 @@ "rotated": false, "offsetX": -1, "offsetY": 0, - "trimX": 1658, - "trimY": 889, + "trimX": 1716, + "trimY": 846, "width": 79, "height": 79, "rawWidth": 93, @@ -1672,11 +1672,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1576, - "trimY": 774, + "trimX": 222, + "trimY": 918, "width": 105, "height": 113, "rawWidth": 121, @@ -1718,11 +1718,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 1, "offsetY": 4, - "trimX": 1679, - "trimY": 655, + "trimX": 448, + "trimY": 918, "width": 105, "height": 102, "rawWidth": 121, @@ -1767,8 +1767,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1712, - "trimY": 257, + "trimX": 1618, + "trimY": 1, "width": 197, "height": 185, "rawWidth": 197, @@ -1810,11 +1810,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1712, - "trimY": 456, + "trimX": 1, + "trimY": 821, "width": 197, "height": 186, "rawWidth": 197, @@ -1859,8 +1859,8 @@ "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1079, - "trimY": 582, + "trimX": 1267, + "trimY": 471, "width": 197, "height": 186, "rawWidth": 197, @@ -1905,8 +1905,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1079, - "trimY": 781, + "trimX": 1455, + "trimY": 473, "width": 197, "height": 186, "rawWidth": 197, @@ -1948,11 +1948,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1278, - "trimY": 781, + "trimX": 816, + "trimY": 717, "width": 196, "height": 186, "rawWidth": 196, @@ -1994,11 +1994,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1267, - "trimY": 582, + "trimX": 1004, + "trimY": 730, "width": 197, "height": 186, "rawWidth": 197, @@ -2043,8 +2043,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1669, - "trimY": 543, + "trimX": 1336, + "trimY": 670, "width": 41, "height": 48, "rawWidth": 41, @@ -2089,8 +2089,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 234, - "trimY": 787, + "trimX": 772, + "trimY": 341, "width": 35, "height": 32, "rawWidth": 35, @@ -2135,8 +2135,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 981, - "trimY": 925, + "trimX": 1567, + "trimY": 170, "width": 42, "height": 43, "rawWidth": 42, @@ -2181,8 +2181,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 627, - "trimY": 958, + "trimX": 1479, + "trimY": 974, "width": 105, "height": 10, "rawWidth": 105, @@ -2227,8 +2227,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1454, - "trimY": 215, + "trimX": 766, + "trimY": 1007, "width": 111, "height": 16, "rawWidth": 111, @@ -2270,11 +2270,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 627, - "trimY": 811, + "trimX": 1591, + "trimY": 820, "width": 138, "height": 123, "rawWidth": 138, @@ -2325,10 +2325,10 @@ "height": 308, "rawWidth": 231, "rawHeight": 308, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, + "borderTop": 31, + "borderBottom": 39, + "borderLeft": 27, + "borderRight": 31, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, @@ -2362,11 +2362,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1186, - "trimY": 471, + "trimX": 1694, + "trimY": 538, "width": 111, "height": 109, "rawWidth": 111, @@ -2411,8 +2411,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1786, - "trimY": 757, + "trimX": 1184, + "trimY": 922, "width": 97, "height": 97, "rawWidth": 97, @@ -2457,8 +2457,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1637, - "trimY": 503, + "trimX": 1654, + "trimY": 655, "width": 38, "height": 38, "rawWidth": 38, @@ -2500,11 +2500,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 627, - "trimY": 936, + "trimX": 200, + "trimY": 821, "width": 166, "height": 20, "rawWidth": 166, @@ -2549,8 +2549,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 929, + "trimX": 746, + "trimY": 443, "width": 212, "height": 26, "rawWidth": 212, @@ -2595,8 +2595,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1823, - "trimY": 856, + "trimX": 1716, + "trimY": 927, "width": 76, "height": 76, "rawWidth": 76, @@ -2638,11 +2638,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1455, - "trimY": 662, + "trimX": 552, + "trimY": 911, "width": 112, "height": 110, "rawWidth": 112, @@ -2684,19 +2684,19 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 821, + "trimX": 1084, + "trimY": 171, "width": 273, "height": 106, "rawWidth": 273, "rawHeight": 106, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, + "borderTop": 18, + "borderBottom": 22, + "borderLeft": 25, + "borderRight": 31, "packable": true, "pixelsToUnit": 100, "pivotX": 0.5, @@ -2733,8 +2733,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1084, - "trimY": 171, + "trimX": 1479, + "trimY": 820, "width": 110, "height": 152, "rawWidth": 110, @@ -2776,11 +2776,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 746, - "trimY": 582, + "trimX": 960, + "trimY": 392, "width": 75, "height": 68, "rawWidth": 77, @@ -2825,8 +2825,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1118, - "trimY": 325, + "trimX": 234, + "trimY": 797, "width": 76, "height": 119, "rawWidth": 76, @@ -2871,8 +2871,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 746, - "trimY": 659, + "trimX": 1267, + "trimY": 670, "width": 67, "height": 53, "rawWidth": 67, @@ -2917,8 +2917,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 468, - "trimY": 811, + "trimX": 1479, + "trimY": 661, "width": 157, "height": 157, "rawWidth": 157, @@ -2960,11 +2960,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1299, - "trimY": 471, + "trimX": 1694, + "trimY": 651, "width": 111, "height": 109, "rawWidth": 111, @@ -3006,11 +3006,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1454, - "trimY": 233, + "trimX": 1638, + "trimY": 661, "width": 129, "height": 8, "rawWidth": 129, @@ -3055,8 +3055,8 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1, - "trimY": 957, + "trimX": 234, + "trimY": 787, "width": 216, "height": 8, "rawWidth": 216, @@ -3089,6 +3089,52 @@ ], "subMetas": {} }, + "34d88": { + "importer": "sprite-frame", + "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@34d88", + "displayName": "", + "id": "34d88", + "name": "shadow", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 664, + "trimY": 1011, + "width": 32, + "height": 12, + "rawWidth": 32, + "rawHeight": 12, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a", + "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, "44c8a": { "importer": "sprite-frame", "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@44c8a", @@ -3098,11 +3144,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 772, - "trimY": 341, + "trimX": 1367, + "trimY": 922, "width": 35, "height": 14, "rawWidth": 35, @@ -3144,11 +3190,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": true, + "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 1881, - "trimY": 1, + "trimX": 1, + "trimY": 1009, "width": 216, "height": 14, "rawWidth": 216, @@ -3190,11 +3236,11 @@ "userData": { "trimType": "auto", "trimThreshold": 1, - "rotated": false, + "rotated": true, "offsetX": 0, "offsetY": 0, - "trimX": 1455, - "trimY": 543, + "trimX": 312, + "trimY": 797, "width": 116, "height": 117, "rawWidth": 116, diff --git a/assets/resources/gui/gui.png b/assets/resources/gui/gui.png index ccda040a..7aafe34c 100644 Binary files a/assets/resources/gui/gui.png and b/assets/resources/gui/gui.png differ diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab index 9a162e2f..23990479 100644 --- a/assets/resources/gui/role_controller.prefab +++ b/assets/resources/gui/role_controller.prefab @@ -46,32 +46,32 @@ "__id__": 428 }, { - "__id__": 457 + "__id__": 459 }, { - "__id__": 499 + "__id__": 501 }, { - "__id__": 527 + "__id__": 529 }, { - "__id__": 551 + "__id__": 553 } ], "_active": true, "_components": [ - { - "__id__": 557 - }, { "__id__": 559 }, { "__id__": 561 + }, + { + "__id__": 563 } ], "_prefab": { - "__id__": 563 + "__id__": 565 }, "_lpos": { "__type__": "cc.Vec3", @@ -9867,23 +9867,23 @@ "__id__": 429 }, { - "__id__": 441 + "__id__": 443 } ], "_active": true, "_components": [ - { - "__id__": 450 - }, { "__id__": 452 }, { "__id__": 454 + }, + { + "__id__": 456 } ], "_prefab": { - "__id__": 456 + "__id__": 458 }, "_lpos": { "__type__": "cc.Vec3", @@ -9930,14 +9930,14 @@ "_active": true, "_components": [ { - "__id__": 436 + "__id__": 438 }, { - "__id__": 438 + "__id__": 440 } ], "_prefab": { - "__id__": 440 + "__id__": 442 }, "_lpos": { "__type__": "cc.Vec3", @@ -9984,10 +9984,13 @@ }, { "__id__": 433 + }, + { + "__id__": 435 } ], "_prefab": { - "__id__": 435 + "__id__": 437 }, "_lpos": { "__type__": "cc.Vec3", @@ -10114,6 +10117,28 @@ "__type__": "cc.CompPrefabInfo", "fileId": "71i+LduHlOXpKyfYYoHBXu" }, + { + "__type__": "545c05XsG9GDJispEGWKvYv", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 430 + }, + "_enabled": true, + "__prefab": { + "__id__": 436 + }, + "templateMode": false, + "watchPath": "data.gold.ref_cost", + "labelType": "cc.Label", + "watchPathArr": [], + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "65ZNWVdAFFT7I/t//YFAdf" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -10137,7 +10162,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 437 + "__id__": 439 }, "_contentSize": { "__type__": "cc.Size", @@ -10165,7 +10190,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 439 + "__id__": 441 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10224,18 +10249,18 @@ "_children": [], "_active": true, "_components": [ - { - "__id__": 442 - }, { "__id__": 444 }, { "__id__": 446 + }, + { + "__id__": 448 } ], "_prefab": { - "__id__": 449 + "__id__": 451 }, "_lpos": { "__type__": "cc.Vec3", @@ -10272,11 +10297,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 441 + "__id__": 443 }, "_enabled": true, "__prefab": { - "__id__": 443 + "__id__": 445 }, "_contentSize": { "__type__": "cc.Size", @@ -10300,11 +10325,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 441 + "__id__": 443 }, "_enabled": true, "__prefab": { - "__id__": 445 + "__id__": 447 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10345,15 +10370,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 441 + "__id__": 443 }, "_enabled": true, "__prefab": { - "__id__": 447 + "__id__": 449 }, "clickEvents": [ { - "__id__": 448 + "__id__": 450 } ], "_interactable": true, @@ -10393,7 +10418,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 441 + "__id__": 443 }, "_id": "" }, @@ -10434,7 +10459,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 451 + "__id__": 453 }, "_contentSize": { "__type__": "cc.Size", @@ -10462,7 +10487,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 453 + "__id__": 455 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10507,7 +10532,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 455 + "__id__": 457 }, "_alignFlags": 36, "_target": null, @@ -10556,35 +10581,35 @@ }, "_children": [ { - "__id__": 458 + "__id__": 460 }, { - "__id__": 464 + "__id__": 466 }, { - "__id__": 470 + "__id__": 472 }, { - "__id__": 476 + "__id__": 478 }, { - "__id__": 482 + "__id__": 484 }, { - "__id__": 488 + "__id__": 490 } ], "_active": true, "_components": [ { - "__id__": 494 + "__id__": 496 }, { - "__id__": 496 + "__id__": 498 } ], "_prefab": { - "__id__": 498 + "__id__": 500 }, "_lpos": { "__type__": "cc.Vec3", @@ -10621,20 +10646,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 457 + "__id__": 459 }, "_children": [], "_active": true, "_components": [ { - "__id__": 459 + "__id__": 461 }, { - "__id__": 461 + "__id__": 463 } ], "_prefab": { - "__id__": 463 + "__id__": 465 }, "_lpos": { "__type__": "cc.Vec3", @@ -10671,11 +10696,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 458 + "__id__": 460 }, "_enabled": true, "__prefab": { - "__id__": 460 + "__id__": 462 }, "_contentSize": { "__type__": "cc.Size", @@ -10699,11 +10724,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 458 + "__id__": 460 }, "_enabled": true, "__prefab": { - "__id__": 462 + "__id__": 464 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10757,20 +10782,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 457 + "__id__": 459 }, "_children": [], "_active": true, "_components": [ { - "__id__": 465 + "__id__": 467 }, { - "__id__": 467 + "__id__": 469 } ], "_prefab": { - "__id__": 469 + "__id__": 471 }, "_lpos": { "__type__": "cc.Vec3", @@ -10807,11 +10832,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 464 + "__id__": 466 }, "_enabled": true, "__prefab": { - "__id__": 466 + "__id__": 468 }, "_contentSize": { "__type__": "cc.Size", @@ -10835,11 +10860,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 464 + "__id__": 466 }, "_enabled": true, "__prefab": { - "__id__": 468 + "__id__": 470 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10893,20 +10918,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 457 + "__id__": 459 }, "_children": [], "_active": true, "_components": [ { - "__id__": 471 + "__id__": 473 }, { - "__id__": 473 + "__id__": 475 } ], "_prefab": { - "__id__": 475 + "__id__": 477 }, "_lpos": { "__type__": "cc.Vec3", @@ -10943,11 +10968,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 470 + "__id__": 472 }, "_enabled": true, "__prefab": { - "__id__": 472 + "__id__": 474 }, "_contentSize": { "__type__": "cc.Size", @@ -10971,11 +10996,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 470 + "__id__": 472 }, "_enabled": true, "__prefab": { - "__id__": 474 + "__id__": 476 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11029,20 +11054,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 457 + "__id__": 459 }, "_children": [], "_active": true, "_components": [ { - "__id__": 477 + "__id__": 479 }, { - "__id__": 479 + "__id__": 481 } ], "_prefab": { - "__id__": 481 + "__id__": 483 }, "_lpos": { "__type__": "cc.Vec3", @@ -11079,11 +11104,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 476 + "__id__": 478 }, "_enabled": true, "__prefab": { - "__id__": 478 + "__id__": 480 }, "_contentSize": { "__type__": "cc.Size", @@ -11107,11 +11132,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 476 + "__id__": 478 }, "_enabled": true, "__prefab": { - "__id__": 480 + "__id__": 482 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11165,20 +11190,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 457 + "__id__": 459 }, "_children": [], "_active": true, "_components": [ { - "__id__": 483 + "__id__": 485 }, { - "__id__": 485 + "__id__": 487 } ], "_prefab": { - "__id__": 487 + "__id__": 489 }, "_lpos": { "__type__": "cc.Vec3", @@ -11215,11 +11240,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 482 + "__id__": 484 }, "_enabled": true, "__prefab": { - "__id__": 484 + "__id__": 486 }, "_contentSize": { "__type__": "cc.Size", @@ -11243,11 +11268,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 482 + "__id__": 484 }, "_enabled": true, "__prefab": { - "__id__": 486 + "__id__": 488 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11301,20 +11326,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 457 + "__id__": 459 }, "_children": [], "_active": false, "_components": [ { - "__id__": 489 + "__id__": 491 }, { - "__id__": 491 + "__id__": 493 } ], "_prefab": { - "__id__": 493 + "__id__": 495 }, "_lpos": { "__type__": "cc.Vec3", @@ -11351,11 +11376,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 488 + "__id__": 490 }, "_enabled": true, "__prefab": { - "__id__": 490 + "__id__": 492 }, "_contentSize": { "__type__": "cc.Size", @@ -11379,11 +11404,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 488 + "__id__": 490 }, "_enabled": true, "__prefab": { - "__id__": 492 + "__id__": 494 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11437,11 +11462,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 457 + "__id__": 459 }, "_enabled": true, "__prefab": { - "__id__": 495 + "__id__": 497 }, "_contentSize": { "__type__": "cc.Size", @@ -11465,11 +11490,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 457 + "__id__": 459 }, "_enabled": true, "__prefab": { - "__id__": 497 + "__id__": 499 }, "_alignFlags": 12, "_target": null, @@ -11518,17 +11543,14 @@ }, "_children": [ { - "__id__": 500 + "__id__": 502 }, { - "__id__": 509 + "__id__": 511 } ], "_active": true, "_components": [ - { - "__id__": 518 - }, { "__id__": 520 }, @@ -11537,10 +11559,13 @@ }, { "__id__": 524 + }, + { + "__id__": 526 } ], "_prefab": { - "__id__": 526 + "__id__": 528 }, "_lpos": { "__type__": "cc.Vec3", @@ -11577,23 +11602,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 499 + "__id__": 501 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 501 - }, { "__id__": 503 }, { "__id__": 505 + }, + { + "__id__": 507 } ], "_prefab": { - "__id__": 508 + "__id__": 510 }, "_lpos": { "__type__": "cc.Vec3", @@ -11630,11 +11655,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 500 + "__id__": 502 }, "_enabled": true, "__prefab": { - "__id__": 502 + "__id__": 504 }, "_contentSize": { "__type__": "cc.Size", @@ -11658,11 +11683,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 500 + "__id__": 502 }, "_enabled": true, "__prefab": { - "__id__": 504 + "__id__": 506 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11703,15 +11728,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 500 + "__id__": 502 }, "_enabled": true, "__prefab": { - "__id__": 506 + "__id__": 508 }, "clickEvents": [ { - "__id__": 507 + "__id__": 509 } ], "_interactable": true, @@ -11751,7 +11776,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 500 + "__id__": 502 }, "_id": "" }, @@ -11762,7 +11787,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 499 + "__id__": 501 }, "component": "", "_componentId": "bcd8aBpUghL4YyOLO3ds4YK", @@ -11788,23 +11813,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 499 + "__id__": 501 }, "_children": [], "_active": true, "_components": [ - { - "__id__": 510 - }, { "__id__": 512 }, { "__id__": 514 + }, + { + "__id__": 516 } ], "_prefab": { - "__id__": 517 + "__id__": 519 }, "_lpos": { "__type__": "cc.Vec3", @@ -11841,11 +11866,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 509 + "__id__": 511 }, "_enabled": true, "__prefab": { - "__id__": 511 + "__id__": 513 }, "_contentSize": { "__type__": "cc.Size", @@ -11869,11 +11894,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 509 + "__id__": 511 }, "_enabled": true, "__prefab": { - "__id__": 513 + "__id__": 515 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11914,15 +11939,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 509 + "__id__": 511 }, "_enabled": true, "__prefab": { - "__id__": 515 + "__id__": 517 }, "clickEvents": [ { - "__id__": 516 + "__id__": 518 } ], "_interactable": true, @@ -11962,7 +11987,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 509 + "__id__": 511 }, "_id": "" }, @@ -11973,7 +11998,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 499 + "__id__": 501 }, "component": "", "_componentId": "bcd8aBpUghL4YyOLO3ds4YK", @@ -11999,11 +12024,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 499 + "__id__": 501 }, "_enabled": true, "__prefab": { - "__id__": 519 + "__id__": 521 }, "_contentSize": { "__type__": "cc.Size", @@ -12027,11 +12052,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 499 + "__id__": 501 }, "_enabled": true, "__prefab": { - "__id__": 521 + "__id__": 523 }, "_alignFlags": 4, "_target": null, @@ -12063,11 +12088,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 499 + "__id__": 501 }, "_enabled": true, "__prefab": { - "__id__": 523 + "__id__": 525 }, "_id": "" }, @@ -12081,11 +12106,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 499 + "__id__": 501 }, "_enabled": true, "__prefab": { - "__id__": 525 + "__id__": 527 }, "_id": "" }, @@ -12116,20 +12141,20 @@ }, "_children": [ { - "__id__": 528 + "__id__": 530 } ], "_active": true, "_components": [ { - "__id__": 546 + "__id__": 548 }, { - "__id__": 548 + "__id__": 550 } ], "_prefab": { - "__id__": 550 + "__id__": 552 }, "_lpos": { "__type__": "cc.Vec3", @@ -12166,18 +12191,15 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 527 + "__id__": 529 }, "_children": [ { - "__id__": 529 + "__id__": 531 } ], "_active": true, "_components": [ - { - "__id__": 535 - }, { "__id__": 537 }, @@ -12189,10 +12211,13 @@ }, { "__id__": 543 + }, + { + "__id__": 545 } ], "_prefab": { - "__id__": 545 + "__id__": 547 }, "_lpos": { "__type__": "cc.Vec3", @@ -12229,20 +12254,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 528 + "__id__": 530 }, "_children": [], "_active": true, "_components": [ { - "__id__": 530 + "__id__": 532 }, { - "__id__": 532 + "__id__": 534 } ], "_prefab": { - "__id__": 534 + "__id__": 536 }, "_lpos": { "__type__": "cc.Vec3", @@ -12279,11 +12304,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 529 + "__id__": 531 }, "_enabled": true, "__prefab": { - "__id__": 531 + "__id__": 533 }, "_contentSize": { "__type__": "cc.Size", @@ -12307,11 +12332,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 529 + "__id__": 531 }, "_enabled": true, "__prefab": { - "__id__": 533 + "__id__": 535 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12365,11 +12390,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 528 + "__id__": 530 }, "_enabled": true, "__prefab": { - "__id__": 536 + "__id__": 538 }, "_contentSize": { "__type__": "cc.Size", @@ -12393,11 +12418,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 528 + "__id__": 530 }, "_enabled": true, "__prefab": { - "__id__": 538 + "__id__": 540 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -12438,14 +12463,14 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 528 + "__id__": 530 }, "_enabled": true, "__prefab": { - "__id__": 540 + "__id__": 542 }, "_barSprite": { - "__id__": 532 + "__id__": 534 }, "_mode": 2, "_totalLength": 1, @@ -12463,11 +12488,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 528 + "__id__": 530 }, "_enabled": true, "__prefab": { - "__id__": 542 + "__id__": 544 }, "controller": false, "watchPath": "", @@ -12491,11 +12516,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 528 + "__id__": 530 }, "_enabled": true, "__prefab": { - "__id__": 544 + "__id__": 546 }, "_alignFlags": 4, "_target": null, @@ -12540,11 +12565,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 527 + "__id__": 529 }, "_enabled": true, "__prefab": { - "__id__": 547 + "__id__": 549 }, "_contentSize": { "__type__": "cc.Size", @@ -12568,11 +12593,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 527 + "__id__": 529 }, "_enabled": true, "__prefab": { - "__id__": 549 + "__id__": 551 }, "_alignFlags": 44, "_target": null, @@ -12623,14 +12648,14 @@ "_active": true, "_components": [ { - "__id__": 552 + "__id__": 554 }, { - "__id__": 554 + "__id__": 556 } ], "_prefab": { - "__id__": 556 + "__id__": 558 }, "_lpos": { "__type__": "cc.Vec3", @@ -12667,11 +12692,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 551 + "__id__": 553 }, "_enabled": true, "__prefab": { - "__id__": 553 + "__id__": 555 }, "_contentSize": { "__type__": "cc.Size", @@ -12695,11 +12720,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 551 + "__id__": 553 }, "_enabled": true, "__prefab": { - "__id__": 555 + "__id__": 557 }, "_alignFlags": 12, "_target": null, @@ -12748,7 +12773,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 558 + "__id__": 560 }, "_contentSize": { "__type__": "cc.Size", @@ -12776,7 +12801,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 560 + "__id__": 562 }, "_alignFlags": 45, "_target": null, @@ -12812,7 +12837,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 562 + "__id__": 564 }, "_id": "" }, diff --git a/assets/script/game/common/SingletonModuleComp.ts b/assets/script/game/common/SingletonModuleComp.ts index 1822dd25..f3a750ac 100644 --- a/assets/script/game/common/SingletonModuleComp.ts +++ b/assets/script/game/common/SingletonModuleComp.ts @@ -61,6 +61,7 @@ export class SingletonModuleComp extends ecs.Comp { max_limit:10, time:0, cd:10, + ref_cost:0, }, shuaxin: { min: 0, diff --git a/assets/script/game/common/config/BoxSet.ts b/assets/script/game/common/config/BoxSet.ts index 35d6923d..28b076dc 100644 --- a/assets/script/game/common/config/BoxSet.ts +++ b/assets/script/game/common/config/BoxSet.ts @@ -17,10 +17,11 @@ export enum BoxSet { BOX_WIDTH = 64, BOX_HEIGHT = 64, //地图边界 - LETF_END = -400, - RIGHT_END = 400, - HERO_START = -500, - MONSTER_START = 500, + LETF_END = -420, + RIGHT_END = 420, + HERO_START = -360, + MONSTER_START = 360, + END_POINT = 360, //游戏地平线 - GAME_LINE = 30, + GAME_LINE = 0, } \ No newline at end of file diff --git a/assets/script/game/map/CardController.ts b/assets/script/game/map/CardController.ts index 00fd2da0..f053b518 100644 --- a/assets/script/game/map/CardController.ts +++ b/assets/script/game/map/CardController.ts @@ -39,6 +39,11 @@ export class CardControllerComp extends CCComp { if (this.in_load) { return } + if (smc.vm_data.gold.min < smc.vm_data.gold.ref_cost) { + oops.gui.toast("金币不足") + return + } + smc.vm_data.gold.min -= smc.vm_data.gold.ref_cost; this.load_cards() } @@ -47,7 +52,9 @@ export class CardControllerComp extends CCComp { let old_cards = ecs.query(ecs.allOf(HeroCardViewComp)) if (old_cards.length > 0) { old_cards.forEach(element => { - element.destroy(); + if (!element.get(HeroCardViewComp).in_destroy) { + element.destroy(); + } }); } // console.log(old_cards) diff --git a/assets/script/game/monster/Hero.ts b/assets/script/game/monster/Hero.ts index d7c4555b..132e3f53 100644 --- a/assets/script/game/monster/Hero.ts +++ b/assets/script/game/monster/Hero.ts @@ -60,6 +60,7 @@ export class Hero extends ecs.Entity { hero_init(uuid:number=1001,node:Node,pos:Vec3=v3(0,0,0)){ var mv = node.getComponent(MonsterViewComp)!; + mv.hero_uuid=uuid; mv.speed =mv.ospeed = CardSet[uuid].speed; mv.hero_name= CardSet[uuid].name; mv.hp= mv.hp_max = CardSet[uuid].hp; diff --git a/assets/script/game/monster/HeroCardViewComp.ts b/assets/script/game/monster/HeroCardViewComp.ts index b5505f88..926114be 100644 --- a/assets/script/game/monster/HeroCardViewComp.ts +++ b/assets/script/game/monster/HeroCardViewComp.ts @@ -1,4 +1,4 @@ -import { _decorator ,Vec2,NodeEventType,EventTouch} from "cc"; +import { _decorator ,Label} 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 { data } from "../data/data"; @@ -15,7 +15,7 @@ export class HeroCardViewComp extends CCComp { card_name:string = "hero_card"; card_type:string = "hero"; card_uid:number = 1000; - + in_destroy:boolean = false; protected onLoad(): void { // this.node.on(NodeEventType.TOUCH_START, this.onTouch, this); @@ -65,6 +65,7 @@ export class HeroCardViewComp extends CCComp { use_card(){ if(smc.vm_data.gold.min >= CardSet[this.card_uid].level){ + this.in_destroy = true; oops.message.dispatchEvent("do_add_hero",{uuid:this.card_uid}) this.ent.destroy(); smc.vm_data.gold.min -= CardSet[this.card_uid].level; @@ -74,7 +75,8 @@ export class HeroCardViewComp extends CCComp { } /** 视图层逻辑代码分离演示 */ start() { - + + this.node.getChildByName("level").getChildByName("level").getComponent(Label).string = CardSet[this.card_uid].level.toString(); } @@ -88,6 +90,7 @@ export class HeroCardViewComp extends CCComp { /** 视图对象通过 ecs.Entity.remove(ModuleViewComp) 删除组件是触发组件处理自定义释放逻辑 */ reset() { + this.in_destroy = false; this.node.destroy(); } } \ No newline at end of file diff --git a/assets/script/game/monster/MonsterViewComp.ts b/assets/script/game/monster/MonsterViewComp.ts index 4d6e1727..f886a089 100644 --- a/assets/script/game/monster/MonsterViewComp.ts +++ b/assets/script/game/monster/MonsterViewComp.ts @@ -27,6 +27,7 @@ const { ccclass, property } = _decorator; export class MonsterViewComp extends CCComp { /** 角色动画 */ as: MonsterSpine = null!; + hero_uuid:number = 1001; hero_name : string = "hero"; level:number =1; camp: number = 1; /** 角色阵营 1：hero -1 :monster */ @@ -75,6 +76,7 @@ export class MonsterViewComp extends CCComp { // collider.on(Contact2DType.PRE_SOLVE, this.onPreSolve, this); collider.on(Contact2DType.POST_SOLVE, this.onPostSolve, this); } + console.log(' hero_uuid:',this.hero_uuid); } @@ -176,6 +178,10 @@ export class MonsterViewComp extends CCComp { move(dt: number){ this.node.setPosition(this.node.position.x+dt*this.speed*this.camp, this.node.position.y, this.node.position.z); + if(Math.abs(this.node.position.x) >= BoxSet.END_POINT){ + this.node.setPosition(v3(this.camp*-BoxSet.END_POINT,BoxSet.GAME_LINE,this.node.position.z)) + // console.log("speed:"+this.speed+" | stop_cd:"+this.stop_cd); + } } power_change(power: number){ this.power += power; @@ -224,18 +230,18 @@ export class MonsterViewComp extends CCComp { } } in_destroy(){ - switch (this.camp) { - case -1: - if(this.node.position.x < BoxSet.LETF_END){ - this.toDestroy(); - } - break; - case 1: - if(this.node.position.x > BoxSet.RIGHT_END){ - this.toDestroy(); - } - break; - } + // switch (this.camp) { + // case -1: + // if(this.node.position.x < BoxSet.LETF_END){ + // this.toDestroy(); + // } + // break; + // case 1: + // if(this.node.position.x > BoxSet.RIGHT_END){ + // this.toDestroy(); + // } + // break; + // } } update_pos(){ smc.monsters_in.forEach((element,index) => { @@ -247,7 +253,7 @@ export class MonsterViewComp extends CCComp { load_skill(skill_name){ // console.log("load_skill"); let skill = ecs.getEntity(Skill); - let pos = v3(0,30) + let pos = v3(0,0) let speed =150 let scale = this.camp let range = 80 @@ -257,7 +263,7 @@ export class MonsterViewComp extends CCComp { var path = "game/skills/atked"; var prefab: Prefab = oops.res.get(path, Prefab)!; var node = instantiate(prefab); - let pos = v3(0,0) + let pos = v3(0,30) node.setPosition(pos) node.parent = this.node; } @@ -265,7 +271,7 @@ export class MonsterViewComp extends CCComp { var path = "game/skills/dead"; var prefab: Prefab = oops.res.get(path, Prefab)!; var node = instantiate(prefab); - node.setPosition(this.node.position) + node.setPosition(this.node.position.x,this.node.position.y+30,this.node.position.z); node.parent = this.node.parent; } toDestroy(){