diff --git a/assets/resources/game/heros/hero.prefab b/assets/resources/game/heros/hero.prefab
index d041996c..20adab2a 100644
--- a/assets/resources/game/heros/hero.prefab
+++ b/assets/resources/game/heros/hero.prefab
@@ -25,53 +25,41 @@
"__id__": 8
},
{
- "__id__": 17
+ "__id__": 33
},
{
- "__id__": 36
+ "__id__": 37
},
{
- "__id__": 50
- },
- {
- "__id__": 64
- },
- {
- "__id__": 78
- },
- {
- "__id__": 84
- },
- {
- "__id__": 88
+ "__id__": 47
}
],
"_active": true,
"_components": [
{
- "__id__": 98
+ "__id__": 105
},
{
- "__id__": 100
+ "__id__": 107
},
{
- "__id__": 102
+ "__id__": 109
},
{
- "__id__": 104
+ "__id__": 111
},
{
- "__id__": 106
+ "__id__": 113
},
{
- "__id__": 108
+ "__id__": 115
},
{
- "__id__": 110
+ "__id__": 117
}
],
"_prefab": {
- "__id__": 112
+ "__id__": 119
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -126,7 +114,7 @@
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
- "y": 0,
+ "y": 5,
"z": 0
},
"_lrot": {
@@ -166,7 +154,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 72,
+ "width": 96,
"height": 12
},
"_anchorPoint": {
@@ -238,136 +226,6 @@
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
- {
- "__type__": "cc.Node",
- "_objFlags": 0,
- "_parent": {
- "__id__": 1
- },
- "_prefab": {
- "__id__": 9
- },
- "__editorExtras__": {}
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 8
- },
- "asset": {
- "__uuid__": "023d1dc1-af98-4903-9d00-986c2f16b982",
- "__expectedType__": "cc.Prefab"
- },
- "fileId": "c46/YsCPVOJYA4mWEpNYRx",
- "instance": {
- "__id__": 10
- },
- "targetOverrides": null
- },
- {
- "__type__": "cc.PrefabInstance",
- "fileId": "a5oXeK0zNLdLef1tMR8AvI",
- "prefabRootNode": {
- "__id__": 1
- },
- "mountedChildren": [],
- "mountedComponents": [],
- "propertyOverrides": [
- {
- "__id__": 11
- },
- {
- "__id__": 13
- },
- {
- "__id__": 14
- },
- {
- "__id__": 15
- },
- {
- "__id__": 16
- }
- ],
- "removedComponents": []
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 12
- },
- "propertyPath": [
- "_name"
- ],
- "value": "speed"
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "c46/YsCPVOJYA4mWEpNYRx"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 12
- },
- "propertyPath": [
- "_lpos"
- ],
- "value": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 15.724,
- "z": 0
- }
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 12
- },
- "propertyPath": [
- "_lrot"
- ],
- "value": {
- "__type__": "cc.Quat",
- "x": 0,
- "y": 0,
- "z": 0,
- "w": 1
- }
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 12
- },
- "propertyPath": [
- "_euler"
- ],
- "value": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- }
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 12
- },
- "propertyPath": [
- "_lscale"
- ],
- "value": {
- "__type__": "cc.Vec3",
- "x": 0.6,
- "y": 0.3,
- "z": 1
- }
- },
{
"__type__": "cc.Node",
"_name": "avatar",
@@ -378,28 +236,28 @@
},
"_children": [
{
- "__id__": 18
+ "__id__": 9
}
],
"_active": true,
"_components": [
{
- "__id__": 28
+ "__id__": 25
+ },
+ {
+ "__id__": 27
},
{
"__id__": 30
- },
- {
- "__id__": 33
}
],
"_prefab": {
- "__id__": 35
+ "__id__": 32
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
- "y": -20,
+ "y": 0,
"z": 0
},
"_lrot": {
@@ -431,21 +289,24 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 17
+ "__id__": 8
},
"_children": [
{
- "__id__": 19
+ "__id__": 10
+ },
+ {
+ "__id__": 16
}
],
"_active": true,
"_components": [
{
- "__id__": 25
+ "__id__": 22
}
],
"_prefab": {
- "__id__": 27
+ "__id__": 24
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -478,24 +339,160 @@
},
{
"__type__": "cc.Node",
- "_name": "bb",
+ "_name": "bg",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 18
+ "__id__": 9
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 20
+ "__id__": 11
},
{
- "__id__": 22
+ "__id__": 13
}
],
"_prefab": {
- "__id__": 24
+ "__id__": 15
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": -6,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 0.65,
+ "y": 0.65,
+ "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__": 10
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 12
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 138,
+ "height": 138
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "629ty+D39MwLh62SmpAZXg"
+ },
+ {
+ "__type__": "cc.Sprite",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 10
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 14
+ },
+ "_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@eb602",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ "_type": 0,
+ "_fillType": 0,
+ "_sizeMode": 0,
+ "_fillCenter": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_fillStart": 0,
+ "_fillRange": 0,
+ "_isTrimmedMode": true,
+ "_useGrayscale": true,
+ "_atlas": null,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "c6SBgOWh9JQIngldmaNYeq"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "9d/QmUWFZA7Jf2yqLg5gYd",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "bb",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 9
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 17
+ },
+ {
+ "__id__": 19
+ }
+ ],
+ "_prefab": {
+ "__id__": 21
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -532,11 +529,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 19
+ "__id__": 16
},
"_enabled": true,
"__prefab": {
- "__id__": 21
+ "__id__": 18
},
"_contentSize": {
"__type__": "cc.Size",
@@ -560,11 +557,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 19
+ "__id__": 16
},
"_enabled": true,
"__prefab": {
- "__id__": 23
+ "__id__": 20
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -618,11 +615,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 18
+ "__id__": 9
},
"_enabled": true,
"__prefab": {
- "__id__": 26
+ "__id__": 23
},
"_contentSize": {
"__type__": "cc.Size",
@@ -659,11 +656,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 17
+ "__id__": 8
},
"_enabled": true,
"__prefab": {
- "__id__": 29
+ "__id__": 26
},
"_contentSize": {
"__type__": "cc.Size",
@@ -687,11 +684,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 17
+ "__id__": 8
},
"_enabled": true,
"__prefab": {
- "__id__": 31
+ "__id__": 28
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -715,7 +712,7 @@
"_cacheMode": 1,
"_sockets": [
{
- "__id__": 32
+ "__id__": 29
}
],
"_useTint": false,
@@ -734,7 +731,7 @@
"__type__": "sp.Skeleton.SpineSocket",
"path": "root/bone",
"target": {
- "__id__": 18
+ "__id__": 9
}
},
{
@@ -743,11 +740,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 17
+ "__id__": 8
},
"_enabled": true,
"__prefab": {
- "__id__": 34
+ "__id__": 31
},
"_id": ""
},
@@ -770,7 +767,278 @@
},
{
"__type__": "cc.Node",
- "_name": "hp",
+ "_name": "buff_icons",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 1
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 34
+ }
+ ],
+ "_prefab": {
+ "__id__": 36
+ },
+ "_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": 1,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 33
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 35
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 100,
+ "height": 100
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "b4Dy2iOhdGNIRklJZWrCG/"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "63odueI6BBfZ9G4QIJALMy",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "range_box",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 1
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 38
+ },
+ {
+ "__id__": 40
+ },
+ {
+ "__id__": 42
+ },
+ {
+ "__id__": 44
+ }
+ ],
+ "_prefab": {
+ "__id__": 46
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 50,
+ "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__": 37
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 39
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 20,
+ "height": 100
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "a7v65R9FlK35rDSodMKBaf"
+ },
+ {
+ "__type__": "cc.RigidBody2D",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 37
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 41
+ },
+ "enabledContactListener": true,
+ "bullet": true,
+ "awakeOnLoad": true,
+ "_group": 2,
+ "_type": 1,
+ "_allowSleep": false,
+ "_gravityScale": 1,
+ "_linearDamping": 0,
+ "_angularDamping": 0,
+ "_linearVelocity": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_angularVelocity": 0,
+ "_fixedRotation": false,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "1dGvLlJTxIyqWs7tv5eOjk"
+ },
+ {
+ "__type__": "cc.BoxCollider2D",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 37
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 43
+ },
+ "tag": 4,
+ "_group": 2,
+ "_density": 1,
+ "_sensor": false,
+ "_friction": 0.2,
+ "_restitution": 0,
+ "_offset": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_size": {
+ "__type__": "cc.Size",
+ "width": 120,
+ "height": 80
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "c1dqgNlJdOJJzLITAnZIRf"
+ },
+ {
+ "__type__": "330a4VcViNGVIep43vzoib3",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 37
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 45
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "2175joY25A3ZkpTMPMM3QI"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "efBGnhxpVAs6aCGcg6inWm",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "top",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
@@ -778,28 +1046,31 @@
},
"_children": [
{
- "__id__": 37
+ "__id__": 48
+ },
+ {
+ "__id__": 62
+ },
+ {
+ "__id__": 76
+ },
+ {
+ "__id__": 90
}
],
"_active": true,
"_components": [
{
- "__id__": 43
- },
- {
- "__id__": 45
- },
- {
- "__id__": 47
+ "__id__": 102
}
],
"_prefab": {
- "__id__": 49
+ "__id__": 104
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
- "y": 120,
+ "y": 0,
"z": 0
},
"_lrot": {
@@ -825,26 +1096,83 @@
},
"_id": ""
},
+ {
+ "__type__": "cc.Node",
+ "_name": "hp",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 47
+ },
+ "_children": [
+ {
+ "__id__": 49
+ }
+ ],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 55
+ },
+ {
+ "__id__": 57
+ },
+ {
+ "__id__": 59
+ }
+ ],
+ "_prefab": {
+ "__id__": 61
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 1.1368683772161603e-13,
+ "y": 131.02400000000011,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 1.0000000000000002,
+ "y": 1.0000000000000002,
+ "z": 1
+ },
+ "_mobility": 0,
+ "_layer": 1,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_id": ""
+ },
{
"__type__": "cc.Node",
"_name": "Bar",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 36
+ "__id__": 48
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 38
+ "__id__": 50
},
{
- "__id__": 40
+ "__id__": 52
}
],
"_prefab": {
- "__id__": 42
+ "__id__": 54
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -881,15 +1209,15 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 37
+ "__id__": 49
},
"_enabled": true,
"__prefab": {
- "__id__": 39
+ "__id__": 51
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 60,
+ "width": 80,
"height": 10
},
"_anchorPoint": {
@@ -909,11 +1237,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 37
+ "__id__": 49
},
"_enabled": true,
"__prefab": {
- "__id__": 41
+ "__id__": 53
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -967,15 +1295,15 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 36
+ "__id__": 48
},
"_enabled": true,
"__prefab": {
- "__id__": 44
+ "__id__": 56
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 60,
+ "width": 80,
"height": 10
},
"_anchorPoint": {
@@ -995,11 +1323,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 36
+ "__id__": 48
},
"_enabled": true,
"__prefab": {
- "__id__": 46
+ "__id__": 58
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -1040,17 +1368,17 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 36
+ "__id__": 48
},
"_enabled": true,
"__prefab": {
- "__id__": 48
+ "__id__": 60
},
"_barSprite": {
- "__id__": 40
+ "__id__": 52
},
"_mode": 0,
- "_totalLength": 60,
+ "_totalLength": 80,
"_progress": 1,
"_reverse": false,
"_id": ""
@@ -1078,32 +1406,32 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 1
+ "__id__": 47
},
"_children": [
{
- "__id__": 51
+ "__id__": 63
}
],
"_active": true,
"_components": [
{
- "__id__": 57
+ "__id__": 69
},
{
- "__id__": 59
+ "__id__": 71
},
{
- "__id__": 61
+ "__id__": 73
}
],
"_prefab": {
- "__id__": 63
+ "__id__": 75
},
"_lpos": {
"__type__": "cc.Vec3",
- "x": 0,
- "y": 110,
+ "x": 1.1368683772161603e-13,
+ "y": 121.02400000000011,
"z": 0
},
"_lrot": {
@@ -1115,8 +1443,8 @@
},
"_lscale": {
"__type__": "cc.Vec3",
- "x": 1,
- "y": 1,
+ "x": 1.0000000000000002,
+ "y": 1.0000000000000002,
"z": 1
},
"_mobility": 0,
@@ -1135,20 +1463,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 50
+ "__id__": 62
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 52
+ "__id__": 64
},
{
- "__id__": 54
+ "__id__": 66
}
],
"_prefab": {
- "__id__": 56
+ "__id__": 68
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -1185,15 +1513,15 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 51
+ "__id__": 63
},
"_enabled": true,
"__prefab": {
- "__id__": 53
+ "__id__": 65
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 60,
+ "width": 80,
"height": 10
},
"_anchorPoint": {
@@ -1213,11 +1541,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 51
+ "__id__": 63
},
"_enabled": true,
"__prefab": {
- "__id__": 55
+ "__id__": 67
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -1271,15 +1599,15 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 50
+ "__id__": 62
},
"_enabled": true,
"__prefab": {
- "__id__": 58
+ "__id__": 70
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 60,
+ "width": 80,
"height": 10
},
"_anchorPoint": {
@@ -1299,11 +1627,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 50
+ "__id__": 62
},
"_enabled": true,
"__prefab": {
- "__id__": 60
+ "__id__": 72
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -1344,17 +1672,17 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 50
+ "__id__": 62
},
"_enabled": true,
"__prefab": {
- "__id__": 62
+ "__id__": 74
},
"_barSprite": {
- "__id__": 54
+ "__id__": 66
},
"_mode": 0,
- "_totalLength": 60,
+ "_totalLength": 80,
"_progress": 1,
"_reverse": false,
"_id": ""
@@ -1382,32 +1710,32 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 1
+ "__id__": 47
},
"_children": [
{
- "__id__": 65
+ "__id__": 77
}
],
"_active": true,
"_components": [
{
- "__id__": 71
+ "__id__": 83
},
{
- "__id__": 73
+ "__id__": 85
},
{
- "__id__": 75
+ "__id__": 87
}
],
"_prefab": {
- "__id__": 77
+ "__id__": 89
},
"_lpos": {
"__type__": "cc.Vec3",
- "x": 0,
- "y": 130,
+ "x": 1.1368683772161603e-13,
+ "y": 141.02400000000011,
"z": 0
},
"_lrot": {
@@ -1419,8 +1747,8 @@
},
"_lscale": {
"__type__": "cc.Vec3",
- "x": 1,
- "y": 1,
+ "x": 1.0000000000000002,
+ "y": 1.0000000000000002,
"z": 1
},
"_mobility": 0,
@@ -1439,20 +1767,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 64
+ "__id__": 76
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 66
+ "__id__": 78
},
{
- "__id__": 68
+ "__id__": 80
}
],
"_prefab": {
- "__id__": 70
+ "__id__": 82
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -1489,15 +1817,15 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 65
+ "__id__": 77
},
"_enabled": true,
"__prefab": {
- "__id__": 67
+ "__id__": 79
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 60,
+ "width": 80,
"height": 10
},
"_anchorPoint": {
@@ -1517,11 +1845,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 65
+ "__id__": 77
},
"_enabled": true,
"__prefab": {
- "__id__": 69
+ "__id__": 81
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -1548,7 +1876,7 @@
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
- "_useGrayscale": false,
+ "_useGrayscale": true,
"_atlas": null,
"_id": ""
},
@@ -1575,15 +1903,15 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 64
+ "__id__": 76
},
"_enabled": true,
"__prefab": {
- "__id__": 72
+ "__id__": 84
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 60,
+ "width": 80,
"height": 10
},
"_anchorPoint": {
@@ -1603,11 +1931,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 64
+ "__id__": 76
},
"_enabled": true,
"__prefab": {
- "__id__": 74
+ "__id__": 86
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -1645,17 +1973,17 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 64
+ "__id__": 76
},
"_enabled": true,
"__prefab": {
- "__id__": 76
+ "__id__": 88
},
"_barSprite": {
- "__id__": 68
+ "__id__": 80
},
"_mode": 0,
- "_totalLength": 60,
+ "_totalLength": 80,
"_progress": 1,
"_reverse": false,
"_id": ""
@@ -1683,25 +2011,79 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 1
+ "__id__": 47
},
- "_children": [],
- "_active": false,
+ "_children": [
+ {
+ "__id__": 91
+ }
+ ],
+ "_active": true,
"_components": [
{
- "__id__": 79
+ "__id__": 97
},
{
- "__id__": 81
+ "__id__": 99
}
],
"_prefab": {
- "__id__": 83
+ "__id__": 101
},
"_lpos": {
"__type__": "cc.Vec3",
- "x": -25,
- "y": 98.494,
+ "x": -40.76699999999994,
+ "y": 130.33400000000006,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 1.0000000000000002,
+ "y": 1.0000000000000002,
+ "z": 1
+ },
+ "_mobility": 0,
+ "_layer": 1,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "lv",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 90
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 92
+ },
+ {
+ "__id__": 94
+ }
+ ],
+ "_prefab": {
+ "__id__": 96
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 1.946,
"z": 0
},
"_lrot": {
@@ -1733,16 +2115,125 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 78
+ "__id__": 91
},
"_enabled": true,
"__prefab": {
- "__id__": 80
+ "__id__": 93
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 25,
- "height": 25
+ "width": 13.123046875,
+ "height": 27.2
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "3cvW5jQN1CIJcWX3xZLX0j"
+ },
+ {
+ "__type__": "cc.Label",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 91
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 95
+ },
+ "_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": 20,
+ "_fontSize": 20,
+ "_fontFamily": "Arial",
+ "_lineHeight": 20,
+ "_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": "f8tsfC+H9FsbO27b4DOB4A"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "9cKpkh1BBPo7XbkNqn15Up",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 90
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 98
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 30,
+ "height": 30
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -1761,11 +2252,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 78
+ "__id__": 90
},
"_enabled": true,
"__prefab": {
- "__id__": 82
+ "__id__": 100
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -1778,7 +2269,7 @@
"a": 255
},
"_spriteFrame": {
- "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@a6b9d",
+ "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@86c70",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 0,
@@ -1813,64 +2304,17 @@
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
- {
- "__type__": "cc.Node",
- "_name": "buff_icons",
- "_objFlags": 0,
- "__editorExtras__": {},
- "_parent": {
- "__id__": 1
- },
- "_children": [],
- "_active": true,
- "_components": [
- {
- "__id__": 85
- }
- ],
- "_prefab": {
- "__id__": 87
- },
- "_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": 1,
- "_euler": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- },
- "_id": ""
- },
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 84
+ "__id__": 47
},
"_enabled": true,
"__prefab": {
- "__id__": 86
+ "__id__": 103
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1886,7 +2330,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
- "fileId": "b4Dy2iOhdGNIRklJZWrCG/"
+ "fileId": "87TOHvukJEtaMdt++5klVw"
},
{
"__type__": "cc.PrefabInfo",
@@ -1896,190 +2340,7 @@
"asset": {
"__id__": 0
},
- "fileId": "63odueI6BBfZ9G4QIJALMy",
- "instance": null,
- "targetOverrides": null,
- "nestedPrefabInstanceRoots": null
- },
- {
- "__type__": "cc.Node",
- "_name": "range_box",
- "_objFlags": 0,
- "__editorExtras__": {},
- "_parent": {
- "__id__": 1
- },
- "_children": [],
- "_active": true,
- "_components": [
- {
- "__id__": 89
- },
- {
- "__id__": 91
- },
- {
- "__id__": 93
- },
- {
- "__id__": 95
- }
- ],
- "_prefab": {
- "__id__": 97
- },
- "_lpos": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": -7.143,
- "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__": 88
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 90
- },
- "_contentSize": {
- "__type__": "cc.Size",
- "width": 20,
- "height": 100
- },
- "_anchorPoint": {
- "__type__": "cc.Vec2",
- "x": 0.5,
- "y": 0
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "a7v65R9FlK35rDSodMKBaf"
- },
- {
- "__type__": "cc.RigidBody2D",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 88
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 92
- },
- "enabledContactListener": true,
- "bullet": true,
- "awakeOnLoad": true,
- "_group": 2,
- "_type": 1,
- "_allowSleep": false,
- "_gravityScale": 1,
- "_linearDamping": 0,
- "_angularDamping": 0,
- "_linearVelocity": {
- "__type__": "cc.Vec2",
- "x": 0,
- "y": 0
- },
- "_angularVelocity": 0,
- "_fixedRotation": false,
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "1dGvLlJTxIyqWs7tv5eOjk"
- },
- {
- "__type__": "cc.BoxCollider2D",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 88
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 94
- },
- "tag": 4,
- "_group": 2,
- "_density": 1,
- "_sensor": false,
- "_friction": 0.2,
- "_restitution": 0,
- "_offset": {
- "__type__": "cc.Vec2",
- "x": 0,
- "y": 50
- },
- "_size": {
- "__type__": "cc.Size",
- "width": 120,
- "height": 80
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "c1dqgNlJdOJJzLITAnZIRf"
- },
- {
- "__type__": "330a4VcViNGVIep43vzoib3",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 88
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 96
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "2175joY25A3ZkpTMPMM3QI"
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 1
- },
- "asset": {
- "__id__": 0
- },
- "fileId": "efBGnhxpVAs6aCGcg6inWm",
+ "fileId": "dan9CUjmhFipAW7pXgUTOt",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
@@ -2094,7 +2355,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 99
+ "__id__": 106
},
"_contentSize": {
"__type__": "cc.Size",
@@ -2122,10 +2383,10 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 101
+ "__id__": 108
},
"animator": {
- "__id__": 33
+ "__id__": 30
},
"_id": ""
},
@@ -2143,14 +2404,14 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 103
+ "__id__": 110
},
"hitFlashMaterial": {
"__uuid__": "a8f34051-ccff-4050-b9d9-234f62977264",
"__expectedType__": "cc.Material"
},
"BoxRang": {
- "__id__": 88
+ "__id__": 37
},
"_id": ""
},
@@ -2168,7 +2429,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 105
+ "__id__": 112
},
"_id": ""
},
@@ -2186,7 +2447,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 107
+ "__id__": 114
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -2228,7 +2489,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 109
+ "__id__": 116
},
"enabledContactListener": true,
"bullet": true,
@@ -2262,7 +2523,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 111
+ "__id__": 118
},
"tag": 0,
"_group": 2,
@@ -2296,11 +2557,6 @@
},
"fileId": "fdklpBwCBM/qJ4WFlQF3kT",
"instance": null,
- "targetOverrides": null,
- "nestedPrefabInstanceRoots": [
- {
- "__id__": 8
- }
- ]
+ "targetOverrides": null
}
]
\ No newline at end of file
diff --git a/assets/resources/game/heros/hero_card.prefab b/assets/resources/game/heros/hero_card.prefab
index f46fcbf7..df55e264 100644
--- a/assets/resources/game/heros/hero_card.prefab
+++ b/assets/resources/game/heros/hero_card.prefab
@@ -114,8 +114,8 @@
},
"_lscale": {
"__type__": "cc.Vec3",
- "x": 1.0000000000000002,
- "y": 1.0000000000000002,
+ "x": 1,
+ "y": 1,
"z": 1
},
"_mobility": 0,
@@ -142,7 +142,7 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 138,
+ "width": 128,
"height": 138
},
"_anchorPoint": {
@@ -154,7 +154,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
- "fileId": "98iGc3EdxJG6wem+4QD0kL"
+ "fileId": "c61hjfQjNJLZ7tiGmDDVkl"
},
{
"__type__": "cc.Sprite",
@@ -179,10 +179,10 @@
"a": 255
},
"_spriteFrame": {
- "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@59775",
+ "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@98971",
"__expectedType__": "cc.SpriteFrame"
},
- "_type": 1,
+ "_type": 0,
"_fillType": 0,
"_sizeMode": 0,
"_fillCenter": {
@@ -199,7 +199,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
- "fileId": "95KIf1WTFJUJBapgMClaii"
+ "fileId": "ddyxIhgvlBgqrb/ug6n4ZA"
},
{
"__type__": "cc.PrefabInfo",
@@ -209,7 +209,7 @@
"asset": {
"__id__": 0
},
- "fileId": "8at0kvKwNHvrpHcYsSWcp5",
+ "fileId": "c7BafFI5dJuZepqpsvvJRr",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
@@ -764,8 +764,8 @@
},
"_lpos": {
"__type__": "cc.Vec3",
- "x": 10,
- "y": 130,
+ "x": 15,
+ "y": 120,
"z": 0
},
"_lrot": {
@@ -814,8 +814,8 @@
},
"_lpos": {
"__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
+ "x": -2,
+ "y": 2,
"z": 0
},
"_lrot": {
@@ -1001,7 +1001,7 @@
"a": 255
},
"_spriteFrame": {
- "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@a6b9d",
+ "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@64e6d",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 0,
diff --git a/assets/resources/game/heros/role2.prefab b/assets/resources/game/heros/item_card.prefab
similarity index 54%
rename from assets/resources/game/heros/role2.prefab
rename to assets/resources/game/heros/item_card.prefab
index c90dbbbd..b4e01cd6 100644
--- a/assets/resources/game/heros/role2.prefab
+++ b/assets/resources/game/heros/item_card.prefab
@@ -1,7 +1,7 @@
[
{
"__type__": "cc.Prefab",
- "_name": "role2",
+ "_name": "item_card",
"_objFlags": 0,
"__editorExtras__": {},
"_native": "",
@@ -13,7 +13,7 @@
},
{
"__type__": "cc.Node",
- "_name": "role2",
+ "_name": "item_card",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": null,
@@ -25,48 +25,33 @@
"__id__": 8
},
{
- "__id__": 22
+ "__id__": 14
},
{
- "__id__": 36
+ "__id__": 24
},
{
- "__id__": 44
- },
- {
- "__id__": 56
- },
- {
- "__id__": 60
+ "__id__": 30
}
],
"_active": true,
"_components": [
{
- "__id__": 68
+ "__id__": 42
},
{
- "__id__": 70
+ "__id__": 44
},
{
- "__id__": 72
- },
- {
- "__id__": 74
- },
- {
- "__id__": 76
- },
- {
- "__id__": 78
+ "__id__": 46
}
],
"_prefab": {
- "__id__": 80
+ "__id__": 49
},
"_lpos": {
"__type__": "cc.Vec3",
- "x": -0.041,
+ "x": 0,
"y": 0,
"z": 0
},
@@ -84,7 +69,7 @@
"z": 1
},
"_mobility": 0,
- "_layer": 1,
+ "_layer": 1073741824,
"_euler": {
"__type__": "cc.Vec3",
"x": 0,
@@ -95,14 +80,14 @@
},
{
"__type__": "cc.Node",
- "_name": "shadow",
+ "_name": "card_green",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 1
},
"_children": [],
- "_active": false,
+ "_active": true,
"_components": [
{
"__id__": 3
@@ -117,7 +102,7 @@
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
- "y": 3,
+ "y": 0,
"z": 0
},
"_lrot": {
@@ -134,7 +119,7 @@
"z": 1
},
"_mobility": 0,
- "_layer": 1,
+ "_layer": 1073741824,
"_euler": {
"__type__": "cc.Vec3",
"x": 0,
@@ -157,19 +142,19 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 54,
- "height": 12
+ "width": 138,
+ "height": 138
},
"_anchorPoint": {
"__type__": "cc.Vec2",
- "x": 0.5,
- "y": 0.5
+ "x": 0,
+ "y": 0
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
- "fileId": "6dLRTNA41OJbBb4sQRvyx6"
+ "fileId": "36rxb9+o9E5rB9ComMCAig"
},
{
"__type__": "cc.Sprite",
@@ -194,7 +179,7 @@
"a": 255
},
"_spriteFrame": {
- "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@34d88",
+ "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@279e3",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 0,
@@ -214,7 +199,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
- "fileId": "30gG80zkxEzo2FMaFRx+C/"
+ "fileId": "ffD+v5TzZH57R1R/EuEFaI"
},
{
"__type__": "cc.PrefabInfo",
@@ -224,204 +209,61 @@
"asset": {
"__id__": 0
},
- "fileId": "42lIJv88tJnrxaphLlD8X9",
+ "fileId": "0axXyrK4FK2p6WCE4+Rtmx",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
"__type__": "cc.Node",
- "_name": "hp",
+ "_name": "hero",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 1
},
- "_children": [
+ "_children": [],
+ "_active": true,
+ "_components": [
{
"__id__": 9
- }
- ],
- "_active": true,
- "_components": [
- {
- "__id__": 15
},
{
- "__id__": 17
- },
- {
- "__id__": 19
+ "__id__": 11
}
],
"_prefab": {
- "__id__": 21
- },
- "_lpos": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 132.061,
- "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": "Bar",
- "_objFlags": 0,
- "__editorExtras__": {},
- "_parent": {
- "__id__": 8
- },
- "_children": [],
- "_active": true,
- "_components": [
- {
- "__id__": 10
- },
- {
- "__id__": 12
- }
- ],
- "_prefab": {
- "__id__": 14
- },
- "_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": 33554432,
- "_euler": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- },
- "_id": ""
- },
- {
- "__type__": "cc.UITransform",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 9
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 11
- },
- "_contentSize": {
- "__type__": "cc.Size",
- "width": 40,
- "height": 5
- },
- "_anchorPoint": {
- "__type__": "cc.Vec2",
- "x": 0.5,
- "y": 0.5
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "64oRBs3hJO3LA5VFslDpOO"
- },
- {
- "__type__": "cc.Sprite",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 9
- },
- "_enabled": true,
- "__prefab": {
"__id__": 13
},
- "_customMaterial": null,
- "_srcBlendFactor": 2,
- "_dstBlendFactor": 4,
- "_color": {
- "__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
- "a": 255
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 69,
+ "y": 69,
+ "z": 0
},
- "_spriteFrame": {
- "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@dfad9",
- "__expectedType__": "cc.SpriteFrame"
- },
- "_type": 1,
- "_fillType": 0,
- "_sizeMode": 0,
- "_fillCenter": {
- "__type__": "cc.Vec2",
+ "_lrot": {
+ "__type__": "cc.Quat",
"x": 0,
- "y": 0
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 1.0000000000000002,
+ "y": 1.0000000000000002,
+ "z": 1
+ },
+ "_mobility": 0,
+ "_layer": 1073741824,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
},
- "_fillStart": 0,
- "_fillRange": 0,
- "_isTrimmedMode": true,
- "_useGrayscale": false,
- "_atlas": null,
"_id": ""
},
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "1b7JSpvcxOhplKvSN0EmRv"
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 1
- },
- "asset": {
- "__id__": 0
- },
- "fileId": "1eXXKteoBAvo0Hvio77rEU",
- "instance": null,
- "targetOverrides": null,
- "nestedPrefabInstanceRoots": null
- },
{
"__type__": "cc.UITransform",
"_name": "",
@@ -432,12 +274,12 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 16
+ "__id__": 10
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 40,
- "height": 5
+ "width": 86,
+ "height": 84
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -448,7 +290,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
- "fileId": "2bnXpjeBpLVb3bBNHoJ7Ml"
+ "fileId": "8bgoQxEz9CJ6MqVzQGw9u6"
},
{
"__type__": "cc.Sprite",
@@ -460,7 +302,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 18
+ "__id__": 12
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -473,10 +315,10 @@
"a": 255
},
"_spriteFrame": {
- "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@cf09c",
+ "__uuid__": "56fae78e-4db4-4ef1-be24-d030fc909ed1@b3f5a",
"__expectedType__": "cc.SpriteFrame"
},
- "_type": 1,
+ "_type": 0,
"_fillType": 0,
"_sizeMode": 0,
"_fillCenter": {
@@ -493,32 +335,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
- "fileId": "81qai2QVVH/ZHainysEVfg"
- },
- {
- "__type__": "cc.ProgressBar",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 8
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 20
- },
- "_barSprite": {
- "__id__": 12
- },
- "_mode": 0,
- "_totalLength": 40,
- "_progress": 1,
- "_reverse": false,
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "679kvexftOP5THClBTLwgV"
+ "fileId": "d5L797MaBIFIzPt5U7xIBZ"
},
{
"__type__": "cc.PrefabInfo",
@@ -528,14 +345,14 @@
"asset": {
"__id__": 0
},
- "fileId": "e0uLHlpWdNPYyGkO1b43Fw",
+ "fileId": "405w7ydPNAu72YwPuVk9kW",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
"__type__": "cc.Node",
- "_name": "power",
+ "_name": "active",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
@@ -543,328 +360,22 @@
},
"_children": [
{
- "__id__": 23
+ "__id__": 15
}
],
- "_active": true,
- "_components": [
- {
- "__id__": 29
- },
- {
- "__id__": 31
- },
- {
- "__id__": 33
- }
- ],
- "_prefab": {
- "__id__": 35
- },
- "_lpos": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 127.061,
- "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": "Bar",
- "_objFlags": 0,
- "__editorExtras__": {},
- "_parent": {
- "__id__": 22
- },
- "_children": [],
- "_active": true,
- "_components": [
- {
- "__id__": 24
- },
- {
- "__id__": 26
- }
- ],
- "_prefab": {
- "__id__": 28
- },
- "_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": 33554432,
- "_euler": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- },
- "_id": ""
- },
- {
- "__type__": "cc.UITransform",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 23
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 25
- },
- "_contentSize": {
- "__type__": "cc.Size",
- "width": 40,
- "height": 5
- },
- "_anchorPoint": {
- "__type__": "cc.Vec2",
- "x": 0.5,
- "y": 0.5
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "813TIYW4hFE51fj5XnIM7U"
- },
- {
- "__type__": "cc.Sprite",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 23
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 27
- },
- "_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@44c8a",
- "__expectedType__": "cc.SpriteFrame"
- },
- "_type": 1,
- "_fillType": 0,
- "_sizeMode": 0,
- "_fillCenter": {
- "__type__": "cc.Vec2",
- "x": 0,
- "y": 0
- },
- "_fillStart": 0,
- "_fillRange": 0,
- "_isTrimmedMode": true,
- "_useGrayscale": false,
- "_atlas": null,
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "a6uKKYR+hOwqOSPSq7AlvQ"
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 1
- },
- "asset": {
- "__id__": 0
- },
- "fileId": "b3LJ0VG0VFrYRVjfPY427V",
- "instance": null,
- "targetOverrides": null,
- "nestedPrefabInstanceRoots": null
- },
- {
- "__type__": "cc.UITransform",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 22
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 30
- },
- "_contentSize": {
- "__type__": "cc.Size",
- "width": 40,
- "height": 5
- },
- "_anchorPoint": {
- "__type__": "cc.Vec2",
- "x": 0.5,
- "y": 0.5
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "09RqqG2gdIyLDPmkOnUl7P"
- },
- {
- "__type__": "cc.Sprite",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 22
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 32
- },
- "_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@0e130",
- "__expectedType__": "cc.SpriteFrame"
- },
- "_type": 1,
- "_fillType": 0,
- "_sizeMode": 0,
- "_fillCenter": {
- "__type__": "cc.Vec2",
- "x": 0,
- "y": 0
- },
- "_fillStart": 0,
- "_fillRange": 0,
- "_isTrimmedMode": true,
- "_useGrayscale": false,
- "_atlas": null,
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "36zTet8jxGlIf/W9fQOS9R"
- },
- {
- "__type__": "cc.ProgressBar",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 22
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 34
- },
- "_barSprite": {
- "__id__": 26
- },
- "_mode": 0,
- "_totalLength": 40,
- "_progress": 1,
- "_reverse": false,
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "b9C5D8jvtF/JEjVlHBhBdr"
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 1
- },
- "asset": {
- "__id__": 0
- },
- "fileId": "b5rEuqD9FEYYP4Im0qXER9",
- "instance": null,
- "targetOverrides": null,
- "nestedPrefabInstanceRoots": null
- },
- {
- "__type__": "cc.Node",
- "_name": "lab_name",
- "_objFlags": 0,
- "__editorExtras__": {},
- "_parent": {
- "__id__": 1
- },
- "_children": [],
"_active": false,
"_components": [
{
- "__id__": 37
- },
- {
- "__id__": 39
- },
- {
- "__id__": 41
+ "__id__": 21
}
],
"_prefab": {
- "__id__": 43
+ "__id__": 23
},
"_lpos": {
"__type__": "cc.Vec3",
- "x": 0,
- "y": 84.999,
+ "x": 69,
+ "y": 69,
"z": 0
},
"_lrot": {
@@ -881,7 +392,57 @@
"z": 1
},
"_mobility": 0,
- "_layer": 1,
+ "_layer": 1073741824,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "rund_bg",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 14
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 16
+ },
+ {
+ "__id__": 18
+ }
+ ],
+ "_prefab": {
+ "__id__": 20
+ },
+ "_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,
@@ -896,27 +457,204 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 36
+ "__id__": 15
},
"_enabled": true,
"__prefab": {
- "__id__": 38
+ "__id__": 17
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 70.84750248055802,
+ "width": 143,
+ "height": 143
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "7bmFjyZTZK/It8XNBVOOwL"
+ },
+ {
+ "__type__": "cc.Sprite",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 15
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 19
+ },
+ "_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@c55cc",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ "_type": 1,
+ "_fillType": 0,
+ "_sizeMode": 0,
+ "_fillCenter": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_fillStart": 0,
+ "_fillRange": 0,
+ "_isTrimmedMode": true,
+ "_useGrayscale": false,
+ "_atlas": null,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "71Gv5L1OtBXLURhBgbih0n"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "b1YW1/metDO6WiGT9UD9wz",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 14
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 22
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 138,
+ "height": 138
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "6dXzPh2dJNapyAy6zJaHBo"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "5565a2qcVBeofOrnv6zBx1",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "name",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 1
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 25
+ },
+ {
+ "__id__": 27
+ }
+ ],
+ "_prefab": {
+ "__id__": 29
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 69,
+ "y": 10,
+ "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__": 24
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 26
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 102,
"height": 27.2
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
- "y": 0.5
+ "y": 0
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
- "fileId": "c68UOAlNhN171Umca6yVvF"
+ "fileId": "75059gcB9MoaDSQDX/+vPN"
},
{
"__type__": "cc.Label",
@@ -924,11 +662,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 36
+ "__id__": 24
},
"_enabled": true,
"__prefab": {
- "__id__": 40
+ "__id__": 28
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -940,11 +678,11 @@
"b": 255,
"a": 255
},
- "_string": "monster",
- "_horizontalAlign": 1,
+ "_string": "这里是名字",
+ "_horizontalAlign": 2,
"_verticalAlign": 1,
- "_actualFontSize": 18,
- "_fontSize": 18,
+ "_actualFontSize": 20,
+ "_fontSize": 20,
"_fontFamily": "Arial",
"_lineHeight": 20,
"_overflow": 0,
@@ -952,237 +690,6 @@
"_font": null,
"_isSystemFontUsed": true,
"_spacingX": 0,
- "_isItalic": true,
- "_isBold": false,
- "_isUnderline": false,
- "_underlineHeight": 2,
- "_cacheMode": 0,
- "_enableOutline": false,
- "_outlineColor": {
- "__type__": "cc.Color",
- "r": 24,
- "g": 25,
- "b": 27,
- "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": "2frm37uaJHQr0AEEaYyM82"
- },
- {
- "__type__": "cc.LabelOutline",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 36
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 42
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "aeeDsd9JVLMK0M/n2WTVl7"
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 1
- },
- "asset": {
- "__id__": 0
- },
- "fileId": "31uZ7ewvdKoKWqTJ+narWR",
- "instance": null,
- "targetOverrides": null,
- "nestedPrefabInstanceRoots": null
- },
- {
- "__type__": "cc.Node",
- "_name": "level",
- "_objFlags": 0,
- "__editorExtras__": {},
- "_parent": {
- "__id__": 1
- },
- "_children": [
- {
- "__id__": 45
- }
- ],
- "_active": false,
- "_components": [
- {
- "__id__": 51
- },
- {
- "__id__": 53
- }
- ],
- "_prefab": {
- "__id__": 55
- },
- "_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": "level",
- "_objFlags": 0,
- "__editorExtras__": {},
- "_parent": {
- "__id__": 44
- },
- "_children": [],
- "_active": true,
- "_components": [
- {
- "__id__": 46
- },
- {
- "__id__": 48
- }
- ],
- "_prefab": {
- "__id__": 50
- },
- "_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__": 45
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 47
- },
- "_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__": 45
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 49
- },
- "_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,
@@ -1215,7 +722,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
- "fileId": "0bqKVdOOtB2r6rHTTGYbtk"
+ "fileId": "7d8neipd5K/LUVOiAkLK5C"
},
{
"__type__": "cc.PrefabInfo",
@@ -1225,27 +732,131 @@
"asset": {
"__id__": 0
},
- "fileId": "f8+NJtzJRC/ZYoN9vBdj6F",
+ "fileId": "edcZgcbeNANo6WUsPdwC9H",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
+ {
+ "__type__": "cc.Node",
+ "_name": "level",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 1
+ },
+ "_children": [
+ {
+ "__id__": 31
+ }
+ ],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 37
+ },
+ {
+ "__id__": 39
+ }
+ ],
+ "_prefab": {
+ "__id__": 41
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 15,
+ "y": 120,
+ "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": "level",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 30
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 32
+ },
+ {
+ "__id__": 34
+ }
+ ],
+ "_prefab": {
+ "__id__": 36
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": -2,
+ "y": 2,
+ "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__": 44
+ "__id__": 31
},
"_enabled": true,
"__prefab": {
- "__id__": 52
+ "__id__": 33
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 25,
- "height": 25
+ "width": 17.903809,
+ "height": 35.5
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -1256,7 +867,116 @@
},
{
"__type__": "cc.CompPrefabInfo",
- "fileId": "156zvtWyZL7JeSq/l8Wq5O"
+ "fileId": "11iUCjfFBLFoZprI1Lw3m1"
+ },
+ {
+ "__type__": "cc.Label",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 31
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 35
+ },
+ "_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": 25,
+ "_fontSize": 25,
+ "_fontFamily": "Arial",
+ "_lineHeight": 25,
+ "_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": 2,
+ "_enableShadow": false,
+ "_shadowColor": {
+ "__type__": "cc.Color",
+ "r": 0,
+ "g": 0,
+ "b": 0,
+ "a": 255
+ },
+ "_shadowOffset": {
+ "__type__": "cc.Vec2",
+ "x": 2,
+ "y": 2
+ },
+ "_shadowBlur": 2,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "18aL3UBfVCdK4v3f+oUDwJ"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "c7S0sxW3hK5KhMOGS7InIp",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 30
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 38
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 48,
+ "height": 48
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "5fSwlCTMRNJLpM1xZhfcmu"
},
{
"__type__": "cc.Sprite",
@@ -1264,11 +984,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 44
+ "__id__": 30
},
"_enabled": true,
"__prefab": {
- "__id__": 54
+ "__id__": 40
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -1281,7 +1001,7 @@
"a": 255
},
"_spriteFrame": {
- "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@a6b9d",
+ "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@64e6d",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 0,
@@ -1301,7 +1021,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
- "fileId": "3bjPXp87JGu52dDySu74sO"
+ "fileId": "e1NfurQKBBiJBml5UGvFng"
},
{
"__type__": "cc.PrefabInfo",
@@ -1311,252 +1031,7 @@
"asset": {
"__id__": 0
},
- "fileId": "2dGu24EexKI57EzgA2ECVa",
- "instance": null,
- "targetOverrides": null,
- "nestedPrefabInstanceRoots": null
- },
- {
- "__type__": "cc.Node",
- "_name": "buff",
- "_objFlags": 0,
- "__editorExtras__": {},
- "_parent": {
- "__id__": 1
- },
- "_children": [],
- "_active": true,
- "_components": [
- {
- "__id__": 57
- }
- ],
- "_prefab": {
- "__id__": 59
- },
- "_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": 1,
- "_euler": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- },
- "_id": ""
- },
- {
- "__type__": "cc.UITransform",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 56
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 58
- },
- "_contentSize": {
- "__type__": "cc.Size",
- "width": 100,
- "height": 100
- },
- "_anchorPoint": {
- "__type__": "cc.Vec2",
- "x": 0.5,
- "y": 0.5
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "b4Dy2iOhdGNIRklJZWrCG/"
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 1
- },
- "asset": {
- "__id__": 0
- },
- "fileId": "63odueI6BBfZ9G4QIJALMy",
- "instance": null,
- "targetOverrides": null,
- "nestedPrefabInstanceRoots": null
- },
- {
- "__type__": "cc.Node",
- "_name": "avatar",
- "_objFlags": 0,
- "__editorExtras__": {},
- "_parent": {
- "__id__": 1
- },
- "_children": [],
- "_active": true,
- "_components": [
- {
- "__id__": 61
- },
- {
- "__id__": 63
- },
- {
- "__id__": 65
- }
- ],
- "_prefab": {
- "__id__": 67
- },
- "_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": 0.5,
- "y": 0.5,
- "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__": 60
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 62
- },
- "_contentSize": {
- "__type__": "cc.Size",
- "width": 788,
- "height": 504
- },
- "_anchorPoint": {
- "__type__": "cc.Vec2",
- "x": 0.5226015197444083,
- "y": 0.10537698533799914
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "33FM35BLtHW4ffxAmoi5dz"
- },
- {
- "__type__": "sp.Skeleton",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 60
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 64
- },
- "_customMaterial": null,
- "_srcBlendFactor": 2,
- "_dstBlendFactor": 4,
- "_color": {
- "__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
- "a": 255
- },
- "_skeletonData": {
- "__uuid__": "943b6c87-0ccd-4144-a084-bb43d1bf772a",
- "__expectedType__": "sp.SkeletonData"
- },
- "defaultSkin": "Character03",
- "defaultAnimation": "Idle",
- "_premultipliedAlpha": true,
- "_timeScale": 1,
- "_preCacheMode": 0,
- "_cacheMode": 0,
- "_sockets": [],
- "_useTint": false,
- "_debugMesh": false,
- "_debugBones": false,
- "_debugSlots": false,
- "_enableBatch": false,
- "loop": true,
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "6cmy75WhZAA5aufepZHOPs"
- },
- {
- "__type__": "93179qWRoNNLYU8oPch8Z8C",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 60
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 66
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "88NNJTGjNKr72HynKo0HEO"
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 1
- },
- "asset": {
- "__id__": 0
- },
- "fileId": "0fFoSO/2JEubITxTd+W4LA",
+ "fileId": "e92r6wrmRAQovadWBnKXX8",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
@@ -1571,102 +1046,26 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 69
+ "__id__": 43
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 100,
- "height": 100
+ "width": 138,
+ "height": 138
},
"_anchorPoint": {
- "__type__": "cc.Vec2",
- "x": 0.5,
- "y": 0.10537698533799914
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "14OhXRCixNOaApgow/hFbp"
- },
- {
- "__type__": "sp.Skeleton",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 1
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 71
- },
- "_customMaterial": null,
- "_srcBlendFactor": 2,
- "_dstBlendFactor": 4,
- "_color": {
- "__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
- "a": 255
- },
- "_skeletonData": null,
- "defaultSkin": "",
- "defaultAnimation": "",
- "_premultipliedAlpha": true,
- "_timeScale": 1,
- "_preCacheMode": -1,
- "_cacheMode": 0,
- "_sockets": [],
- "_useTint": false,
- "_debugMesh": false,
- "_debugBones": false,
- "_debugSlots": false,
- "_enableBatch": false,
- "loop": true,
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "0fWlGTQg1Iyoa8tbx8j5rL"
- },
- {
- "__type__": "cc.RigidBody2D",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 1
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 73
- },
- "enabledContactListener": true,
- "bullet": true,
- "awakeOnLoad": true,
- "_group": 4,
- "_type": 1,
- "_allowSleep": false,
- "_gravityScale": 1,
- "_linearDamping": 0,
- "_angularDamping": 0,
- "_linearVelocity": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
- "_angularVelocity": 0,
- "_fixedRotation": true,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
- "fileId": "d8rVs6intBQ7lRU8Dw4zXV"
+ "fileId": "10FOdA4JlCO7yvtiz10/Pn"
},
{
- "__type__": "cc.BoxCollider2D",
+ "__type__": "ad422rQFOdFR4cDG7TVsQ0B",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
@@ -1675,32 +1074,16 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 75
- },
- "tag": 0,
- "_group": 4,
- "_density": 1,
- "_sensor": false,
- "_friction": 1,
- "_restitution": 0,
- "_offset": {
- "__type__": "cc.Vec2",
- "x": 1.9,
- "y": 34.8
- },
- "_size": {
- "__type__": "cc.Size",
- "width": 74.5,
- "height": 71.6
+ "__id__": 45
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
- "fileId": "b2Dt9lJI9FyJCDezkDBPBl"
+ "fileId": "5cziae6FNK4LiAaF6qi4ql"
},
{
- "__type__": "4810cOtgodPzb2z3UQkfWHt",
+ "__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
@@ -1709,38 +1092,67 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 77
+ "__id__": 47
},
- "hitFlashMaterial": {
- "__uuid__": "a8f34051-ccff-4050-b9d9-234f62977264",
- "__expectedType__": "cc.Material"
+ "clickEvents": [
+ {
+ "__id__": 48
+ }
+ ],
+ "_interactable": true,
+ "_transition": 3,
+ "_normalColor": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
},
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "c9DJUHWnZH8ab4bO2wtpdu"
- },
- {
- "__type__": "a1232G12bBOuKpMnbF10Pmo",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
+ "_hoverColor": {
+ "__type__": "cc.Color",
+ "r": 211,
+ "g": 211,
+ "b": 211,
+ "a": 255
+ },
+ "_pressedColor": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
+ },
+ "_disabledColor": {
+ "__type__": "cc.Color",
+ "r": 124,
+ "g": 124,
+ "b": 124,
+ "a": 255
+ },
+ "_normalSprite": null,
+ "_hoverSprite": null,
+ "_pressedSprite": null,
+ "_disabledSprite": null,
+ "_duration": 0.1,
+ "_zoomScale": 1.2,
+ "_target": {
"__id__": 1
},
- "_enabled": true,
- "__prefab": {
- "__id__": 79
- },
- "animator": {
- "__id__": 65
- },
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
- "fileId": "d1exA+n29MTr3hzlp0uqSW"
+ "fileId": "9fSQB3lv9GyYiqEQ0Xwiek"
+ },
+ {
+ "__type__": "cc.ClickEvent",
+ "target": {
+ "__id__": 1
+ },
+ "component": "",
+ "_componentId": "ad422rQFOdFR4cDG7TVsQ0B",
+ "handler": "doit",
+ "customEventData": ""
},
{
"__type__": "cc.PrefabInfo",
@@ -1750,7 +1162,7 @@
"asset": {
"__id__": 0
},
- "fileId": "fdklpBwCBM/qJ4WFlQF3kT",
+ "fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": null,
"targetOverrides": null
}
diff --git a/assets/resources/game/heros/role2.prefab.meta b/assets/resources/game/heros/item_card.prefab.meta
similarity index 62%
rename from assets/resources/game/heros/role2.prefab.meta
rename to assets/resources/game/heros/item_card.prefab.meta
index 9ebefe16..70dbb505 100644
--- a/assets/resources/game/heros/role2.prefab.meta
+++ b/assets/resources/game/heros/item_card.prefab.meta
@@ -2,12 +2,12 @@
"ver": "1.1.50",
"importer": "prefab",
"imported": true,
- "uuid": "4a868137-3302-45c1-817b-10566090c295",
+ "uuid": "e92a4676-2650-4241-b991-c5f822a20372",
"files": [
".json"
],
"subMetas": {},
"userData": {
- "syncNodeName": "role2"
+ "syncNodeName": "item_card"
}
}
diff --git a/assets/resources/game/heros/role.prefab b/assets/resources/game/heros/role.prefab
index e633dbce..0a4981bd 100644
--- a/assets/resources/game/heros/role.prefab
+++ b/assets/resources/game/heros/role.prefab
@@ -25,41 +25,50 @@
"__id__": 8
},
{
- "__id__": 16
+ "__id__": 18
},
{
- "__id__": 30
+ "__id__": 43
},
{
- "__id__": 44
+ "__id__": 57
},
{
- "__id__": 56
+ "__id__": 71
+ },
+ {
+ "__id__": 85
+ },
+ {
+ "__id__": 91
}
],
"_active": true,
"_components": [
{
- "__id__": 60
+ "__id__": 95
},
{
- "__id__": 62
+ "__id__": 97
},
{
- "__id__": 64
+ "__id__": 99
},
{
- "__id__": 66
+ "__id__": 101
},
{
- "__id__": 68
+ "__id__": 103
},
{
- "__id__": 70
+ "__id__": 105
+ },
+ {
+ "__id__": 107
}
],
"_prefab": {
- "__id__": 72
+ "__id__": 109
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -76,8 +85,8 @@
},
"_lscale": {
"__type__": "cc.Vec3",
- "x": 1,
- "y": 1,
+ "x": 0.7,
+ "y": 0.7,
"z": 1
},
"_mobility": 0,
@@ -99,7 +108,7 @@
"__id__": 1
},
"_children": [],
- "_active": false,
+ "_active": true,
"_components": [
{
"__id__": 3
@@ -114,7 +123,7 @@
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
- "y": 3,
+ "y": 0,
"z": 0
},
"_lrot": {
@@ -154,13 +163,13 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 54,
+ "width": 112,
"height": 12
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
- "y": 0.5
+ "y": 0
},
"_id": ""
},
@@ -226,6 +235,149 @@
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 9
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 8
+ },
+ "asset": {
+ "__uuid__": "023d1dc1-af98-4903-9d00-986c2f16b982",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "c46/YsCPVOJYA4mWEpNYRx",
+ "instance": {
+ "__id__": 10
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "a5oXeK0zNLdLef1tMR8AvI",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 11
+ },
+ {
+ "__id__": 13
+ },
+ {
+ "__id__": 14
+ },
+ {
+ "__id__": 15
+ },
+ {
+ "__id__": 16
+ },
+ {
+ "__id__": 17
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 12
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "speed"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "c46/YsCPVOJYA4mWEpNYRx"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 12
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 15.724,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 12
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 12
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 12
+ },
+ "propertyPath": [
+ "_lscale"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0.6,
+ "y": 0.3,
+ "z": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 12
+ },
+ "propertyPath": [
+ "_active"
+ ],
+ "value": false
+ },
{
"__type__": "cc.Node",
"_name": "avatar",
@@ -234,26 +386,30 @@
"_parent": {
"__id__": 1
},
- "_children": [],
+ "_children": [
+ {
+ "__id__": 19
+ }
+ ],
"_active": true,
"_components": [
{
- "__id__": 9
+ "__id__": 35
},
{
- "__id__": 11
+ "__id__": 37
},
{
- "__id__": 13
+ "__id__": 40
}
],
"_prefab": {
- "__id__": 15
+ "__id__": 42
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
- "y": -10,
+ "y": 18,
"z": 0
},
"_lrot": {
@@ -265,8 +421,112 @@
},
"_lscale": {
"__type__": "cc.Vec3",
- "x": 0.4,
- "y": 0.4,
+ "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": "TNode",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 18
+ },
+ "_children": [
+ {
+ "__id__": 20
+ },
+ {
+ "__id__": 26
+ }
+ ],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 32
+ }
+ ],
+ "_prefab": {
+ "__id__": 34
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": -0.0000010490732620382914,
+ "y": 24,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 2.1855693419110223e-8,
+ "w": 0.9999999999999996
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 1.0139000415802002,
+ "y": 1.013900041580204,
+ "z": 1
+ },
+ "_mobility": 0,
+ "_layer": 1,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0.000002504477982493727
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "card_red",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 19
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 21
+ },
+ {
+ "__id__": 23
+ }
+ ],
+ "_prefab": {
+ "__id__": 25
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": -30,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 0.7,
+ "y": 0.7,
"z": 1
},
"_mobility": 0,
@@ -285,21 +545,284 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 8
+ "__id__": 20
},
"_enabled": true,
"__prefab": {
- "__id__": 10
+ "__id__": 22
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 788,
- "height": 504
+ "width": 152,
+ "height": 210
},
"_anchorPoint": {
"__type__": "cc.Vec2",
- "x": 0.5286040717575151,
- "y": 0.11595237822759719
+ "x": 0.5,
+ "y": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "ebu7Sp8wFIN7ZmUFGtYU7F"
+ },
+ {
+ "__type__": "cc.Sprite",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 20
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 24
+ },
+ "_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@eb602",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ "_type": 0,
+ "_fillType": 0,
+ "_sizeMode": 0,
+ "_fillCenter": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_fillStart": 0,
+ "_fillRange": 0,
+ "_isTrimmedMode": true,
+ "_useGrayscale": true,
+ "_atlas": null,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "f0+tylBxNFQ7ScaAPFw2u2"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "9bjP0VxsBM1o5Jq3fzYMnJ",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "bb",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 19
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 27
+ },
+ {
+ "__id__": 29
+ }
+ ],
+ "_prefab": {
+ "__id__": 31
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 44.369,
+ "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__": 26
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 28
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 98,
+ "height": 124
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "24FVcI0itBJJRiT+hIWJYd"
+ },
+ {
+ "__type__": "cc.Sprite",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 26
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 30
+ },
+ "_customMaterial": null,
+ "_srcBlendFactor": 2,
+ "_dstBlendFactor": 4,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
+ },
+ "_spriteFrame": {
+ "__uuid__": "7b95dfa5-c844-44d4-8d63-302f57da2ba2@29d0d",
+ "__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": "bei9NlpS9BaaubTbxHUuoi"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "2f5FnCThhHbaJomT/wex0h",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 19
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 33
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 100,
+ "height": 100
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "8fFWkeDr5AaYKs8TtHfljd"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "5f3pVfF0FPz6BzPApw1y12",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 18
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 36
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 83.13999938964844,
+ "height": 51.709999084472656
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.00986288187235107,
+ "y": 0.3422935810543142
},
"_id": ""
},
@@ -313,11 +836,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 8
+ "__id__": 18
},
"_enabled": true,
"__prefab": {
- "__id__": 12
+ "__id__": 38
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -330,16 +853,20 @@
"a": 255
},
"_skeletonData": {
- "__uuid__": "92581e9d-4c0a-4a59-b5af-5f7b2a16f923",
+ "__uuid__": "a80809a8-64bf-4c66-b49e-7aa837d821dd",
"__expectedType__": "sp.SkeletonData"
},
- "defaultSkin": "Character07",
- "defaultAnimation": "Idle",
- "_premultipliedAlpha": true,
+ "defaultSkin": "default",
+ "defaultAnimation": "",
+ "_premultipliedAlpha": false,
"_timeScale": 1,
"_preCacheMode": 1,
"_cacheMode": 1,
- "_sockets": [],
+ "_sockets": [
+ {
+ "__id__": 39
+ }
+ ],
"_useTint": false,
"_debugMesh": false,
"_debugBones": false,
@@ -352,23 +879,30 @@
"__type__": "cc.CompPrefabInfo",
"fileId": "d6Qb8NhhhN1ascGn7UPZok"
},
+ {
+ "__type__": "sp.Skeleton.SpineSocket",
+ "path": "root/bone",
+ "target": {
+ "__id__": 19
+ }
+ },
{
"__type__": "72385Js7gdNOL4w7CpKU1nE",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 8
+ "__id__": 18
},
"_enabled": true,
"__prefab": {
- "__id__": 14
+ "__id__": 41
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
- "fileId": "8cU8ZmTBNOT6wHEWkP9rgf"
+ "fileId": "44yZr3eN9ENpvyp8fTw7ex"
},
{
"__type__": "cc.PrefabInfo",
@@ -393,28 +927,28 @@
},
"_children": [
{
- "__id__": 17
+ "__id__": 44
}
],
"_active": true,
"_components": [
{
- "__id__": 23
+ "__id__": 50
},
{
- "__id__": 25
+ "__id__": 52
},
{
- "__id__": 27
+ "__id__": 54
}
],
"_prefab": {
- "__id__": 29
+ "__id__": 56
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
- "y": 132.061,
+ "y": 161.486,
"z": 0
},
"_lrot": {
@@ -446,20 +980,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 16
+ "__id__": 43
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 18
+ "__id__": 45
},
{
- "__id__": 20
+ "__id__": 47
}
],
"_prefab": {
- "__id__": 22
+ "__id__": 49
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -496,16 +1030,16 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 17
+ "__id__": 44
},
"_enabled": true,
"__prefab": {
- "__id__": 19
+ "__id__": 46
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 40,
- "height": 5
+ "width": 80,
+ "height": 10
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -524,11 +1058,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 17
+ "__id__": 44
},
"_enabled": true,
"__prefab": {
- "__id__": 21
+ "__id__": 48
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -582,16 +1116,16 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 16
+ "__id__": 43
},
"_enabled": true,
"__prefab": {
- "__id__": 24
+ "__id__": 51
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 40,
- "height": 5
+ "width": 80,
+ "height": 10
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -610,11 +1144,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 16
+ "__id__": 43
},
"_enabled": true,
"__prefab": {
- "__id__": 26
+ "__id__": 53
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -655,17 +1189,17 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 16
+ "__id__": 43
},
"_enabled": true,
"__prefab": {
- "__id__": 28
+ "__id__": 55
},
"_barSprite": {
- "__id__": 20
+ "__id__": 47
},
"_mode": 0,
- "_totalLength": 40,
+ "_totalLength": 80,
"_progress": 1,
"_reverse": false,
"_id": ""
@@ -697,28 +1231,28 @@
},
"_children": [
{
- "__id__": 31
+ "__id__": 58
}
],
"_active": true,
"_components": [
{
- "__id__": 37
+ "__id__": 64
},
{
- "__id__": 39
+ "__id__": 66
},
{
- "__id__": 41
+ "__id__": 68
}
],
"_prefab": {
- "__id__": 43
+ "__id__": 70
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
- "y": 127.061,
+ "y": 151.486,
"z": 0
},
"_lrot": {
@@ -750,20 +1284,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 30
+ "__id__": 57
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 32
+ "__id__": 59
},
{
- "__id__": 34
+ "__id__": 61
}
],
"_prefab": {
- "__id__": 36
+ "__id__": 63
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -800,16 +1334,16 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 31
+ "__id__": 58
},
"_enabled": true,
"__prefab": {
- "__id__": 33
+ "__id__": 60
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 40,
- "height": 5
+ "width": 80,
+ "height": 10
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -828,11 +1362,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 31
+ "__id__": 58
},
"_enabled": true,
"__prefab": {
- "__id__": 35
+ "__id__": 62
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -886,16 +1420,16 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 30
+ "__id__": 57
},
"_enabled": true,
"__prefab": {
- "__id__": 38
+ "__id__": 65
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 40,
- "height": 5
+ "width": 80,
+ "height": 10
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -914,11 +1448,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 30
+ "__id__": 57
},
"_enabled": true,
"__prefab": {
- "__id__": 40
+ "__id__": 67
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -959,17 +1493,17 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 30
+ "__id__": 57
},
"_enabled": true,
"__prefab": {
- "__id__": 42
+ "__id__": 69
},
"_barSprite": {
- "__id__": 34
+ "__id__": 61
},
"_mode": 0,
- "_totalLength": 40,
+ "_totalLength": 80,
"_progress": 1,
"_reverse": false,
"_id": ""
@@ -993,7 +1527,7 @@
},
{
"__type__": "cc.Node",
- "_name": "level",
+ "_name": "shield",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
@@ -1001,20 +1535,317 @@
},
"_children": [
{
- "__id__": 45
+ "__id__": 72
}
],
- "_active": false,
+ "_active": true,
"_components": [
{
- "__id__": 51
+ "__id__": 78
},
{
- "__id__": 53
+ "__id__": 80
+ },
+ {
+ "__id__": 82
}
],
"_prefab": {
- "__id__": 55
+ "__id__": 84
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 171.486,
+ "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": "Bar",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 71
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 73
+ },
+ {
+ "__id__": 75
+ }
+ ],
+ "_prefab": {
+ "__id__": 77
+ },
+ "_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": 33554432,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 72
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 74
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 80,
+ "height": 10
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "fd3dH6jldPsa66Ci7KUVI3"
+ },
+ {
+ "__type__": "cc.Sprite",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 72
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 76
+ },
+ "_customMaterial": null,
+ "_srcBlendFactor": 2,
+ "_dstBlendFactor": 4,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
+ },
+ "_spriteFrame": {
+ "__uuid__": "24a704da-2867-446d-8d1a-5e920c75e09d@f9941",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ "_type": 1,
+ "_fillType": 0,
+ "_sizeMode": 0,
+ "_fillCenter": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_fillStart": 0,
+ "_fillRange": 0,
+ "_isTrimmedMode": true,
+ "_useGrayscale": false,
+ "_atlas": null,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "42nR/FpVZByb+otJaujBAU"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "82t+mKrT1NDK/FLaizJqmu",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 71
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 79
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 80,
+ "height": 10
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "d0Vsb23mxLQp4brp5KrYoI"
+ },
+ {
+ "__type__": "cc.Sprite",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 71
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 81
+ },
+ "_customMaterial": null,
+ "_srcBlendFactor": 2,
+ "_dstBlendFactor": 4,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
+ },
+ "_spriteFrame": null,
+ "_type": 1,
+ "_fillType": 0,
+ "_sizeMode": 0,
+ "_fillCenter": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_fillStart": 0,
+ "_fillRange": 0,
+ "_isTrimmedMode": true,
+ "_useGrayscale": false,
+ "_atlas": null,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "817EmqwtZOoo1jCiT331/h"
+ },
+ {
+ "__type__": "cc.ProgressBar",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 71
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 83
+ },
+ "_barSprite": {
+ "__id__": 75
+ },
+ "_mode": 0,
+ "_totalLength": 80,
+ "_progress": 1,
+ "_reverse": false,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "03p2B8lt5IL6sqNzysZUD4"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "f5X0rdMcFOMZ0GRx4uHEc0",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "level",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 1
+ },
+ "_children": [],
+ "_active": false,
+ "_components": [
+ {
+ "__id__": 86
+ },
+ {
+ "__id__": 88
+ }
+ ],
+ "_prefab": {
+ "__id__": 90
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -1045,176 +1876,17 @@
},
"_id": ""
},
- {
- "__type__": "cc.Node",
- "_name": "level",
- "_objFlags": 0,
- "__editorExtras__": {},
- "_parent": {
- "__id__": 44
- },
- "_children": [],
- "_active": true,
- "_components": [
- {
- "__id__": 46
- },
- {
- "__id__": 48
- }
- ],
- "_prefab": {
- "__id__": 50
- },
- "_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__": 45
+ "__id__": 85
},
"_enabled": true,
"__prefab": {
- "__id__": 47
- },
- "_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__": 45
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 49
- },
- "_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",
- "instance": null,
- "targetOverrides": null,
- "nestedPrefabInstanceRoots": null
- },
- {
- "__type__": "cc.UITransform",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 44
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 52
+ "__id__": 87
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1238,11 +1910,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 44
+ "__id__": 85
},
"_enabled": true,
"__prefab": {
- "__id__": 54
+ "__id__": 89
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -1292,7 +1964,7 @@
},
{
"__type__": "cc.Node",
- "_name": "buff",
+ "_name": "buff_icons",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
@@ -1302,11 +1974,11 @@
"_active": true,
"_components": [
{
- "__id__": 57
+ "__id__": 92
}
],
"_prefab": {
- "__id__": 59
+ "__id__": 94
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -1343,11 +2015,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 56
+ "__id__": 91
},
"_enabled": true,
"__prefab": {
- "__id__": 58
+ "__id__": 93
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1388,12 +2060,12 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 61
+ "__id__": 96
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 100,
- "height": 100
+ "width": 80,
+ "height": 80
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -1416,7 +2088,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 63
+ "__id__": 98
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -1458,7 +2130,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 65
+ "__id__": 100
},
"enabledContactListener": true,
"bullet": true,
@@ -1492,7 +2164,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 67
+ "__id__": 102
},
"tag": 0,
"_group": 4,
@@ -1502,13 +2174,13 @@
"_restitution": 0,
"_offset": {
"__type__": "cc.Vec2",
- "x": -5.2,
- "y": 43.7
+ "x": 1.2,
+ "y": 78.4
},
"_size": {
"__type__": "cc.Size",
- "width": 76.8,
- "height": 89.4
+ "width": 97.2,
+ "height": 135.5
},
"_id": ""
},
@@ -1517,7 +2189,7 @@
"fileId": "b2Dt9lJI9FyJCDezkDBPBl"
},
{
- "__type__": "b8b21s83WtGa4vfAQSBqcV2",
+ "__type__": "e5f01LImC5O74+V7cXUvO9S",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
@@ -1526,17 +2198,13 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 69
- },
- "hitFlashMaterial": {
- "__uuid__": "a8f34051-ccff-4050-b9d9-234f62977264",
- "__expectedType__": "cc.Material"
+ "__id__": 104
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
- "fileId": "73EvrIHtpHRLrosWOmbjqW"
+ "fileId": "d5P5g0yOVImL6XiAsrWiAQ"
},
{
"__type__": "de8f3gD7VlGbrk78ePlhxE9",
@@ -1548,16 +2216,38 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 71
+ "__id__": 106
},
"animator": {
- "__id__": 13
+ "__id__": 40
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
- "fileId": "f3ERL7EnxDDJJwl73G1hlJ"
+ "fileId": "7dxit2L7pHxrVVhovMUGP7"
+ },
+ {
+ "__type__": "b8b21s83WtGa4vfAQSBqcV2",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 1
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 108
+ },
+ "hitFlashMaterial": {
+ "__uuid__": "a8f34051-ccff-4050-b9d9-234f62977264",
+ "__expectedType__": "cc.Material"
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "1bzDmkyGlBW6ytP5yS5+Yd"
},
{
"__type__": "cc.PrefabInfo",
@@ -1569,6 +2259,11 @@
},
"fileId": "fdklpBwCBM/qJ4WFlQF3kT",
"instance": null,
- "targetOverrides": null
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": [
+ {
+ "__id__": 8
+ }
+ ]
}
]
\ No newline at end of file
diff --git a/assets/resources/game/heros/role.prefab.meta b/assets/resources/game/heros/role.prefab.meta
index 380620fc..3ff1afee 100644
--- a/assets/resources/game/heros/role.prefab.meta
+++ b/assets/resources/game/heros/role.prefab.meta
@@ -2,7 +2,7 @@
"ver": "1.1.50",
"importer": "prefab",
"imported": true,
- "uuid": "a9ece743-4b57-4605-b051-83ca9ed79bf7",
+ "uuid": "b03c09d2-f503-4ad8-a45e-3a4b26e8d560",
"files": [
".json"
],
diff --git a/assets/resources/game/heros/skill.plist b/assets/resources/game/heros/skill.plist
index 28522c13..0235e7eb 100644
--- a/assets/resources/game/heros/skill.plist
+++ b/assets/resources/game/heros/skill.plist
@@ -15,9 +15,9 @@
spriteSourceSize
{102,106}
textureRect
- {{1,247},{102,106}}
+ {{1,1},{102,106}}
textureRotated
-
+
1002.png
@@ -30,9 +30,9 @@
spriteSourceSize
{102,106}
textureRect
- {{109,248},{102,106}}
+ {{105,1},{102,106}}
textureRotated
-
+
1011.png
@@ -45,9 +45,9 @@
spriteSourceSize
{102,106}
textureRect
- {{217,255},{102,106}}
+ {{209,1},{102,106}}
textureRotated
-
+
1012.png
@@ -60,9 +60,9 @@
spriteSourceSize
{102,106}
textureRect
- {{325,268},{102,106}}
+ {{313,1},{102,106}}
textureRotated
-
+
6001.png
@@ -71,13 +71,13 @@
spriteOffset
{0,0}
spriteSize
- {61,63}
+ {64,64}
spriteSourceSize
- {61,63}
+ {64,64}
textureRect
- {{384,58},{61,63}}
+ {{547,1},{64,64}}
textureRotated
-
+
6002.png
@@ -86,11 +86,11 @@
spriteOffset
{0,0}
spriteSize
- {70,63}
+ {64,64}
spriteSourceSize
- {70,63}
+ {64,64}
textureRect
- {{232,119},{70,63}}
+ {{613,1},{64,64}}
textureRotated
@@ -101,13 +101,13 @@
spriteOffset
{0,0}
spriteSize
- {63,68}
+ {60,60}
spriteSourceSize
- {63,68}
+ {60,60}
textureRect
- {{304,119},{63,68}}
+ {{781,67},{60,60}}
textureRotated
-
+
6004.png
@@ -116,13 +116,28 @@
spriteOffset
{0,0}
spriteSize
- {62,66}
+ {64,64}
spriteSourceSize
- {62,66}
+ {64,64}
textureRect
- {{89,117},{62,66}}
+ {{679,1},{64,64}}
textureRotated
-
+
+
+ 6005.png
+
+ aliases
+
+ spriteOffset
+ {0,0}
+ spriteSize
+ {64,64}
+ spriteSourceSize
+ {64,64}
+ textureRect
+ {{745,1},{64,64}}
+ textureRotated
+
6006.png
@@ -131,28 +146,13 @@
spriteOffset
{0,0}
spriteSize
- {60,66}
+ {64,64}
spriteSourceSize
- {60,66}
+ {64,64}
textureRect
- {{185,56},{60,66}}
+ {{811,1},{64,64}}
textureRotated
-
-
- 6007.png
-
- aliases
-
- spriteOffset
- {0,0}
- spriteSize
- {62,73}
- spriteSourceSize
- {62,73}
- textureRect
- {{157,118},{62,73}}
- textureRotated
-
+
6101.png
@@ -161,13 +161,13 @@
spriteOffset
{0,0}
spriteSize
- {64,73}
+ {60,60}
spriteSourceSize
- {64,73}
+ {60,60}
textureRect
- {{1,177},{64,73}}
+ {{843,67},{60,60}}
textureRotated
-
+
6102.png
@@ -176,13 +176,13 @@
spriteOffset
{0,0}
spriteSize
- {64,73}
+ {60,60}
spriteSourceSize
- {64,73}
+ {60,60}
textureRect
- {{76,181},{64,73}}
+ {{905,67},{60,60}}
textureRotated
-
+
6103.png
@@ -191,148 +191,13 @@
spriteOffset
{0,0}
spriteSize
- {64,73}
+ {60,60}
spriteSourceSize
- {64,73}
+ {60,60}
textureRect
- {{151,182},{64,73}}
+ {{967,67},{60,60}}
textureRotated
-
-
- 6201 .png
-
- aliases
-
- spriteOffset
- {0,0}
- spriteSize
- {54,62}
- spriteSourceSize
- {54,62}
- textureRect
- {{253,1},{54,62}}
- textureRotated
-
-
- 6202 .png
-
- aliases
-
- spriteOffset
- {0,0}
- spriteSize
- {54,62}
- spriteSourceSize
- {54,62}
- textureRect
- {{317,1},{54,62}}
- textureRotated
-
-
- 6203 .png
-
- aliases
-
- spriteOffset
- {0,0}
- spriteSize
- {54,62}
- spriteSourceSize
- {54,62}
- textureRect
- {{381,1},{54,62}}
- textureRotated
-
-
- 6204.png
-
- aliases
-
- spriteOffset
- {0,0}
- spriteSize
- {53,61}
- spriteSourceSize
- {53,61}
- textureRect
- {{64,1},{53,61}}
- textureRotated
-
-
- 6205.png
-
- aliases
-
- spriteOffset
- {0,0}
- spriteSize
- {53,61}
- spriteSourceSize
- {53,61}
- textureRect
- {{127,1},{53,61}}
- textureRotated
-
-
- 6206.png
-
- aliases
-
- spriteOffset
- {0,0}
- spriteSize
- {53,61}
- spriteSourceSize
- {53,61}
- textureRect
- {{190,1},{53,61}}
- textureRotated
-
-
- 6207.png
-
- aliases
-
- spriteOffset
- {0,0}
- spriteSize
- {55,59}
- spriteSourceSize
- {55,59}
- textureRect
- {{445,1},{55,59}}
- textureRotated
-
-
- 6208.png
-
- aliases
-
- spriteOffset
- {0,0}
- spriteSize
- {55,59}
- spriteSourceSize
- {55,59}
- textureRect
- {{1,50},{55,59}}
- textureRotated
-
-
- 6209.png
-
- aliases
-
- spriteOffset
- {0,0}
- spriteSize
- {56,59}
- spriteSourceSize
- {56,59}
- textureRect
- {{62,56},{56,59}}
- textureRotated
-
+
6210.png
@@ -341,13 +206,13 @@
spriteOffset
{0,0}
spriteSize
- {61,86}
+ {64,60}
spriteSourceSize
- {61,86}
+ {64,60}
textureRect
- {{1,114},{61,86}}
+ {{585,67},{64,60}}
textureRotated
-
+
6211.png
@@ -356,71 +221,116 @@
spriteOffset
{0,0}
spriteSize
- {74,83}
+ {64,64}
spriteSourceSize
- {74,83}
+ {64,64}
textureRect
- {{380,192},{74,83}}
+ {{877,1},{64,64}}
textureRotated
-
+
- 6301.png
+ 6212.png
aliases
spriteOffset
{0,0}
spriteSize
- {66,68}
+ {64,64}
spriteSourceSize
- {66,68}
+ {64,64}
textureRect
- {{441,124},{66,68}}
+ {{943,1},{64,64}}
textureRotated
-
+
- 6302.png
+ 6213.png
aliases
spriteOffset
{0,0}
spriteSize
- {67,74}
+ {44,50}
spriteSourceSize
- {67,74}
+ {44,50}
textureRect
- {{304,186},{67,74}}
+ {{1029,67},{44,50}}
textureRotated
-
+
- 6303.png
+ 6214.png
aliases
spriteOffset
{0,0}
spriteSize
- {47,61}
+ {44,64}
spriteSourceSize
- {47,61}
+ {44,64}
textureRect
- {{1,1},{47,61}}
+ {{1075,67},{44,64}}
textureRotated
- 7001.png
+ 6215.png
aliases
spriteOffset
{0,0}
spriteSize
- {63,65}
+ {64,64}
spriteSourceSize
- {63,65}
+ {64,64}
textureRect
- {{374,121},{63,65}}
+ {{1009,1},{64,64}}
+ textureRotated
+
+
+ 6216.png
+
+ aliases
+
+ spriteOffset
+ {0,0}
+ spriteSize
+ {40,46}
+ spriteSourceSize
+ {40,46}
+ textureRect
+ {{481,79},{40,46}}
+ textureRotated
+
+
+ 6217.png
+
+ aliases
+
+ spriteOffset
+ {0,0}
+ spriteSize
+ {64,60}
+ spriteSourceSize
+ {64,60}
+ textureRect
+ {{651,67},{64,60}}
+ textureRotated
+
+
+ 6218.png
+
+ aliases
+
+ spriteOffset
+ {0,0}
+ spriteSize
+ {48,62}
+ spriteSourceSize
+ {48,62}
+ textureRect
+ {{417,79},{48,62}}
textureRotated
@@ -435,7 +345,7 @@
spriteSourceSize
{60,62}
textureRect
- {{253,57},{60,62}}
+ {{717,67},{60,62}}
textureRotated
@@ -450,9 +360,9 @@
spriteSourceSize
{65,60}
textureRect
- {{317,57},{65,60}}
+ {{485,1},{65,60}}
textureRotated
-
+
userinfo_icon_boss.png
@@ -465,9 +375,9 @@
spriteSourceSize
{66,76}
textureRect
- {{226,184},{66,76}}
+ {{417,1},{66,76}}
textureRotated
-
+
userinfo_icon_crown.png
@@ -480,7 +390,7 @@
spriteSourceSize
{59,60}
textureRect
- {{123,56},{59,60}}
+ {{523,68},{59,60}}
textureRotated
@@ -495,7 +405,7 @@
spriteSourceSize
{61,64}
textureRect
- {{449,58},{61,64}}
+ {{1075,1},{61,64}}
textureRotated
@@ -511,9 +421,9 @@
realTextureFileName
skill.png
size
- {511,371}
+ {1140,128}
smartupdate
- $TexturePacker:SmartUpdate:e626ca9551b109ee626696e4d575594e:841d246feaeb8c4a383dca05301779e9:de628d2eabb1e43115cf8c86336e45f6$
+ $TexturePacker:SmartUpdate:07d62d24f5c5e38e65f2eb6575a8a3cb:4d5175f9c40acf8942c69135c8202a86:de628d2eabb1e43115cf8c86336e45f6$
textureFileName
skill.png
diff --git a/assets/resources/game/heros/skill.plist.meta b/assets/resources/game/heros/skill.plist.meta
index b899055a..94e8e32d 100644
--- a/assets/resources/game/heros/skill.plist.meta
+++ b/assets/resources/game/heros/skill.plist.meta
@@ -19,8 +19,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 253,
- "trimY": 57,
+ "trimX": 717,
+ "trimY": 67,
"width": 60,
"height": 62,
"rawWidth": 60,
@@ -53,52 +53,6 @@
],
"subMetas": {}
},
- "25217": {
- "importer": "sprite-frame",
- "uuid": "56fae78e-4db4-4ef1-be24-d030fc909ed1@25217",
- "displayName": "",
- "id": "25217",
- "name": "6203 ",
- "userData": {
- "trimType": "auto",
- "trimThreshold": 1,
- "rotated": true,
- "offsetX": 0,
- "offsetY": 0,
- "trimX": 381,
- "trimY": 1,
- "width": 54,
- "height": 62,
- "rawWidth": 54,
- "rawHeight": 62,
- "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": "d359dffc-1087-4d3b-bce7-f80eaaeacb1a@6c48a",
- "atlasUuid": "56fae78e-4db4-4ef1-be24-d030fc909ed1"
- },
- "ver": "1.0.12",
- "imported": true,
- "files": [
- ".json"
- ],
- "subMetas": {}
- },
"97766": {
"importer": "sprite-frame",
"uuid": "56fae78e-4db4-4ef1-be24-d030fc909ed1@97766",
@@ -111,8 +65,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 449,
- "trimY": 58,
+ "trimX": 1075,
+ "trimY": 1,
"width": 61,
"height": 64,
"rawWidth": 61,
@@ -154,11 +108,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 1,
- "trimY": 247,
+ "trimY": 1,
"width": 102,
"height": 106,
"rawWidth": 102,
@@ -200,11 +154,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 109,
- "trimY": 248,
+ "trimX": 105,
+ "trimY": 1,
"width": 102,
"height": 106,
"rawWidth": 102,
@@ -246,11 +200,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 217,
- "trimY": 255,
+ "trimX": 209,
+ "trimY": 1,
"width": 102,
"height": 106,
"rawWidth": 102,
@@ -292,11 +246,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 325,
- "trimY": 268,
+ "trimX": 313,
+ "trimY": 1,
"width": 102,
"height": 106,
"rawWidth": 102,
@@ -338,15 +292,15 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 384,
- "trimY": 58,
- "width": 61,
- "height": 63,
- "rawWidth": 61,
- "rawHeight": 63,
+ "trimX": 547,
+ "trimY": 1,
+ "width": 64,
+ "height": 64,
+ "rawWidth": 64,
+ "rawHeight": 64,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
@@ -387,12 +341,12 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 232,
- "trimY": 119,
- "width": 70,
- "height": 63,
- "rawWidth": 70,
- "rawHeight": 63,
+ "trimX": 613,
+ "trimY": 1,
+ "width": 64,
+ "height": 64,
+ "rawWidth": 64,
+ "rawHeight": 64,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
@@ -430,15 +384,15 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 304,
- "trimY": 119,
- "width": 63,
- "height": 68,
- "rawWidth": 63,
- "rawHeight": 68,
+ "trimX": 781,
+ "trimY": 67,
+ "width": 60,
+ "height": 60,
+ "rawWidth": 60,
+ "rawHeight": 60,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
@@ -476,15 +430,61 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 89,
- "trimY": 117,
- "width": 62,
- "height": 66,
- "rawWidth": 62,
- "rawHeight": 66,
+ "trimX": 679,
+ "trimY": 1,
+ "width": 64,
+ "height": 64,
+ "rawWidth": 64,
+ "rawHeight": 64,
+ "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": "d359dffc-1087-4d3b-bce7-f80eaaeacb1a@6c48a",
+ "atlasUuid": "56fae78e-4db4-4ef1-be24-d030fc909ed1"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
+ "54f93": {
+ "importer": "sprite-frame",
+ "uuid": "56fae78e-4db4-4ef1-be24-d030fc909ed1@54f93",
+ "displayName": "",
+ "id": "54f93",
+ "name": "6005",
+ "userData": {
+ "trimType": "auto",
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 745,
+ "trimY": 1,
+ "width": 64,
+ "height": 64,
+ "rawWidth": 64,
+ "rawHeight": 64,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
@@ -522,61 +522,15 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 185,
- "trimY": 56,
- "width": 60,
- "height": 66,
- "rawWidth": 60,
- "rawHeight": 66,
- "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": "d359dffc-1087-4d3b-bce7-f80eaaeacb1a@6c48a",
- "atlasUuid": "56fae78e-4db4-4ef1-be24-d030fc909ed1"
- },
- "ver": "1.0.12",
- "imported": true,
- "files": [
- ".json"
- ],
- "subMetas": {}
- },
- "b69ac": {
- "importer": "sprite-frame",
- "uuid": "56fae78e-4db4-4ef1-be24-d030fc909ed1@b69ac",
- "displayName": "",
- "id": "b69ac",
- "name": "6007",
- "userData": {
- "trimType": "auto",
- "trimThreshold": 1,
- "rotated": true,
- "offsetX": 0,
- "offsetY": 0,
- "trimX": 157,
- "trimY": 118,
- "width": 62,
- "height": 73,
- "rawWidth": 62,
- "rawHeight": 73,
+ "trimX": 811,
+ "trimY": 1,
+ "width": 64,
+ "height": 64,
+ "rawWidth": 64,
+ "rawHeight": 64,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
@@ -614,15 +568,15 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1,
- "trimY": 177,
- "width": 64,
- "height": 73,
- "rawWidth": 64,
- "rawHeight": 73,
+ "trimX": 843,
+ "trimY": 67,
+ "width": 60,
+ "height": 60,
+ "rawWidth": 60,
+ "rawHeight": 60,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
@@ -660,15 +614,15 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 76,
- "trimY": 181,
- "width": 64,
- "height": 73,
- "rawWidth": 64,
- "rawHeight": 73,
+ "trimX": 905,
+ "trimY": 67,
+ "width": 60,
+ "height": 60,
+ "rawWidth": 60,
+ "rawHeight": 60,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
@@ -706,383 +660,15 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 151,
- "trimY": 182,
- "width": 64,
- "height": 73,
- "rawWidth": 64,
- "rawHeight": 73,
- "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": "d359dffc-1087-4d3b-bce7-f80eaaeacb1a@6c48a",
- "atlasUuid": "56fae78e-4db4-4ef1-be24-d030fc909ed1"
- },
- "ver": "1.0.12",
- "imported": true,
- "files": [
- ".json"
- ],
- "subMetas": {}
- },
- "0a326": {
- "importer": "sprite-frame",
- "uuid": "56fae78e-4db4-4ef1-be24-d030fc909ed1@0a326",
- "displayName": "",
- "id": "0a326",
- "name": "6201 ",
- "userData": {
- "trimType": "auto",
- "trimThreshold": 1,
- "rotated": true,
- "offsetX": 0,
- "offsetY": 0,
- "trimX": 253,
- "trimY": 1,
- "width": 54,
- "height": 62,
- "rawWidth": 54,
- "rawHeight": 62,
- "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": "d359dffc-1087-4d3b-bce7-f80eaaeacb1a@6c48a",
- "atlasUuid": "56fae78e-4db4-4ef1-be24-d030fc909ed1"
- },
- "ver": "1.0.12",
- "imported": true,
- "files": [
- ".json"
- ],
- "subMetas": {}
- },
- "a6afb": {
- "importer": "sprite-frame",
- "uuid": "56fae78e-4db4-4ef1-be24-d030fc909ed1@a6afb",
- "displayName": "",
- "id": "a6afb",
- "name": "6202 ",
- "userData": {
- "trimType": "auto",
- "trimThreshold": 1,
- "rotated": true,
- "offsetX": 0,
- "offsetY": 0,
- "trimX": 317,
- "trimY": 1,
- "width": 54,
- "height": 62,
- "rawWidth": 54,
- "rawHeight": 62,
- "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": "d359dffc-1087-4d3b-bce7-f80eaaeacb1a@6c48a",
- "atlasUuid": "56fae78e-4db4-4ef1-be24-d030fc909ed1"
- },
- "ver": "1.0.12",
- "imported": true,
- "files": [
- ".json"
- ],
- "subMetas": {}
- },
- "09842": {
- "importer": "sprite-frame",
- "uuid": "56fae78e-4db4-4ef1-be24-d030fc909ed1@09842",
- "displayName": "",
- "id": "09842",
- "name": "6204",
- "userData": {
- "trimType": "auto",
- "trimThreshold": 1,
- "rotated": true,
- "offsetX": 0,
- "offsetY": 0,
- "trimX": 64,
- "trimY": 1,
- "width": 53,
- "height": 61,
- "rawWidth": 53,
- "rawHeight": 61,
- "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": "d359dffc-1087-4d3b-bce7-f80eaaeacb1a@6c48a",
- "atlasUuid": "56fae78e-4db4-4ef1-be24-d030fc909ed1"
- },
- "ver": "1.0.12",
- "imported": true,
- "files": [
- ".json"
- ],
- "subMetas": {}
- },
- "0b019": {
- "importer": "sprite-frame",
- "uuid": "56fae78e-4db4-4ef1-be24-d030fc909ed1@0b019",
- "displayName": "",
- "id": "0b019",
- "name": "6205",
- "userData": {
- "trimType": "auto",
- "trimThreshold": 1,
- "rotated": true,
- "offsetX": 0,
- "offsetY": 0,
- "trimX": 127,
- "trimY": 1,
- "width": 53,
- "height": 61,
- "rawWidth": 53,
- "rawHeight": 61,
- "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": "d359dffc-1087-4d3b-bce7-f80eaaeacb1a@6c48a",
- "atlasUuid": "56fae78e-4db4-4ef1-be24-d030fc909ed1"
- },
- "ver": "1.0.12",
- "imported": true,
- "files": [
- ".json"
- ],
- "subMetas": {}
- },
- "1c208": {
- "importer": "sprite-frame",
- "uuid": "56fae78e-4db4-4ef1-be24-d030fc909ed1@1c208",
- "displayName": "",
- "id": "1c208",
- "name": "6206",
- "userData": {
- "trimType": "auto",
- "trimThreshold": 1,
- "rotated": true,
- "offsetX": 0,
- "offsetY": 0,
- "trimX": 190,
- "trimY": 1,
- "width": 53,
- "height": 61,
- "rawWidth": 53,
- "rawHeight": 61,
- "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": "d359dffc-1087-4d3b-bce7-f80eaaeacb1a@6c48a",
- "atlasUuid": "56fae78e-4db4-4ef1-be24-d030fc909ed1"
- },
- "ver": "1.0.12",
- "imported": true,
- "files": [
- ".json"
- ],
- "subMetas": {}
- },
- "63a07": {
- "importer": "sprite-frame",
- "uuid": "56fae78e-4db4-4ef1-be24-d030fc909ed1@63a07",
- "displayName": "",
- "id": "63a07",
- "name": "6207",
- "userData": {
- "trimType": "auto",
- "trimThreshold": 1,
- "rotated": true,
- "offsetX": 0,
- "offsetY": 0,
- "trimX": 445,
- "trimY": 1,
- "width": 55,
- "height": 59,
- "rawWidth": 55,
- "rawHeight": 59,
- "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": "d359dffc-1087-4d3b-bce7-f80eaaeacb1a@6c48a",
- "atlasUuid": "56fae78e-4db4-4ef1-be24-d030fc909ed1"
- },
- "ver": "1.0.12",
- "imported": true,
- "files": [
- ".json"
- ],
- "subMetas": {}
- },
- "6f533": {
- "importer": "sprite-frame",
- "uuid": "56fae78e-4db4-4ef1-be24-d030fc909ed1@6f533",
- "displayName": "",
- "id": "6f533",
- "name": "6208",
- "userData": {
- "trimType": "auto",
- "trimThreshold": 1,
- "rotated": true,
- "offsetX": 0,
- "offsetY": 0,
- "trimX": 1,
- "trimY": 50,
- "width": 55,
- "height": 59,
- "rawWidth": 55,
- "rawHeight": 59,
- "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": "d359dffc-1087-4d3b-bce7-f80eaaeacb1a@6c48a",
- "atlasUuid": "56fae78e-4db4-4ef1-be24-d030fc909ed1"
- },
- "ver": "1.0.12",
- "imported": true,
- "files": [
- ".json"
- ],
- "subMetas": {}
- },
- "519ea": {
- "importer": "sprite-frame",
- "uuid": "56fae78e-4db4-4ef1-be24-d030fc909ed1@519ea",
- "displayName": "",
- "id": "519ea",
- "name": "6209",
- "userData": {
- "trimType": "auto",
- "trimThreshold": 1,
- "rotated": true,
- "offsetX": 0,
- "offsetY": 0,
- "trimX": 62,
- "trimY": 56,
- "width": 56,
- "height": 59,
- "rawWidth": 56,
- "rawHeight": 59,
+ "trimX": 967,
+ "trimY": 67,
+ "width": 60,
+ "height": 60,
+ "rawWidth": 60,
+ "rawHeight": 60,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
@@ -1120,15 +706,15 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1,
- "trimY": 114,
- "width": 61,
- "height": 86,
- "rawWidth": 61,
- "rawHeight": 86,
+ "trimX": 585,
+ "trimY": 67,
+ "width": 64,
+ "height": 60,
+ "rawWidth": 64,
+ "rawHeight": 60,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
@@ -1166,153 +752,15 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 380,
- "trimY": 192,
- "width": 74,
- "height": 83,
- "rawWidth": 74,
- "rawHeight": 83,
- "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": "d359dffc-1087-4d3b-bce7-f80eaaeacb1a@6c48a",
- "atlasUuid": "56fae78e-4db4-4ef1-be24-d030fc909ed1"
- },
- "ver": "1.0.12",
- "imported": true,
- "files": [
- ".json"
- ],
- "subMetas": {}
- },
- "1a700": {
- "importer": "sprite-frame",
- "uuid": "56fae78e-4db4-4ef1-be24-d030fc909ed1@1a700",
- "displayName": "",
- "id": "1a700",
- "name": "6301",
- "userData": {
- "trimType": "auto",
- "trimThreshold": 1,
- "rotated": true,
- "offsetX": 0,
- "offsetY": 0,
- "trimX": 441,
- "trimY": 124,
- "width": 66,
- "height": 68,
- "rawWidth": 66,
- "rawHeight": 68,
- "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": "d359dffc-1087-4d3b-bce7-f80eaaeacb1a@6c48a",
- "atlasUuid": "56fae78e-4db4-4ef1-be24-d030fc909ed1"
- },
- "ver": "1.0.12",
- "imported": true,
- "files": [
- ".json"
- ],
- "subMetas": {}
- },
- "a4b15": {
- "importer": "sprite-frame",
- "uuid": "56fae78e-4db4-4ef1-be24-d030fc909ed1@a4b15",
- "displayName": "",
- "id": "a4b15",
- "name": "6302",
- "userData": {
- "trimType": "auto",
- "trimThreshold": 1,
- "rotated": true,
- "offsetX": 0,
- "offsetY": 0,
- "trimX": 304,
- "trimY": 186,
- "width": 67,
- "height": 74,
- "rawWidth": 67,
- "rawHeight": 74,
- "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": "d359dffc-1087-4d3b-bce7-f80eaaeacb1a@6c48a",
- "atlasUuid": "56fae78e-4db4-4ef1-be24-d030fc909ed1"
- },
- "ver": "1.0.12",
- "imported": true,
- "files": [
- ".json"
- ],
- "subMetas": {}
- },
- "1f754": {
- "importer": "sprite-frame",
- "uuid": "56fae78e-4db4-4ef1-be24-d030fc909ed1@1f754",
- "displayName": "",
- "id": "1f754",
- "name": "6303",
- "userData": {
- "trimType": "auto",
- "trimThreshold": 1,
- "rotated": true,
- "offsetX": 0,
- "offsetY": 0,
- "trimX": 1,
+ "trimX": 877,
"trimY": 1,
- "width": 47,
- "height": 61,
- "rawWidth": 47,
- "rawHeight": 61,
+ "width": 64,
+ "height": 64,
+ "rawWidth": 64,
+ "rawHeight": 64,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
@@ -1341,24 +789,300 @@
],
"subMetas": {}
},
- "5e616": {
+ "9b235": {
"importer": "sprite-frame",
- "uuid": "56fae78e-4db4-4ef1-be24-d030fc909ed1@5e616",
+ "uuid": "56fae78e-4db4-4ef1-be24-d030fc909ed1@9b235",
"displayName": "",
- "id": "5e616",
- "name": "7001",
+ "id": "9b235",
+ "name": "6212",
+ "userData": {
+ "trimType": "auto",
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 943,
+ "trimY": 1,
+ "width": 64,
+ "height": 64,
+ "rawWidth": 64,
+ "rawHeight": 64,
+ "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": "d359dffc-1087-4d3b-bce7-f80eaaeacb1a@6c48a",
+ "atlasUuid": "56fae78e-4db4-4ef1-be24-d030fc909ed1"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
+ "e3c46": {
+ "importer": "sprite-frame",
+ "uuid": "56fae78e-4db4-4ef1-be24-d030fc909ed1@e3c46",
+ "displayName": "",
+ "id": "e3c46",
+ "name": "6213",
+ "userData": {
+ "trimType": "auto",
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 1029,
+ "trimY": 67,
+ "width": 44,
+ "height": 50,
+ "rawWidth": 44,
+ "rawHeight": 50,
+ "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": "d359dffc-1087-4d3b-bce7-f80eaaeacb1a@6c48a",
+ "atlasUuid": "56fae78e-4db4-4ef1-be24-d030fc909ed1"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
+ "02e0b": {
+ "importer": "sprite-frame",
+ "uuid": "56fae78e-4db4-4ef1-be24-d030fc909ed1@02e0b",
+ "displayName": "",
+ "id": "02e0b",
+ "name": "6214",
"userData": {
"trimType": "auto",
"trimThreshold": 1,
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 374,
- "trimY": 121,
- "width": 63,
- "height": 65,
- "rawWidth": 63,
- "rawHeight": 65,
+ "trimX": 1075,
+ "trimY": 67,
+ "width": 44,
+ "height": 64,
+ "rawWidth": 44,
+ "rawHeight": 64,
+ "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": "d359dffc-1087-4d3b-bce7-f80eaaeacb1a@6c48a",
+ "atlasUuid": "56fae78e-4db4-4ef1-be24-d030fc909ed1"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
+ "9f34e": {
+ "importer": "sprite-frame",
+ "uuid": "56fae78e-4db4-4ef1-be24-d030fc909ed1@9f34e",
+ "displayName": "",
+ "id": "9f34e",
+ "name": "6215",
+ "userData": {
+ "trimType": "auto",
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 1009,
+ "trimY": 1,
+ "width": 64,
+ "height": 64,
+ "rawWidth": 64,
+ "rawHeight": 64,
+ "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": "d359dffc-1087-4d3b-bce7-f80eaaeacb1a@6c48a",
+ "atlasUuid": "56fae78e-4db4-4ef1-be24-d030fc909ed1"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
+ "6524c": {
+ "importer": "sprite-frame",
+ "uuid": "56fae78e-4db4-4ef1-be24-d030fc909ed1@6524c",
+ "displayName": "",
+ "id": "6524c",
+ "name": "6216",
+ "userData": {
+ "trimType": "auto",
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 481,
+ "trimY": 79,
+ "width": 40,
+ "height": 46,
+ "rawWidth": 40,
+ "rawHeight": 46,
+ "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": "d359dffc-1087-4d3b-bce7-f80eaaeacb1a@6c48a",
+ "atlasUuid": "56fae78e-4db4-4ef1-be24-d030fc909ed1"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
+ "9d586": {
+ "importer": "sprite-frame",
+ "uuid": "56fae78e-4db4-4ef1-be24-d030fc909ed1@9d586",
+ "displayName": "",
+ "id": "9d586",
+ "name": "6217",
+ "userData": {
+ "trimType": "auto",
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 651,
+ "trimY": 67,
+ "width": 64,
+ "height": 60,
+ "rawWidth": 64,
+ "rawHeight": 60,
+ "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": "d359dffc-1087-4d3b-bce7-f80eaaeacb1a@6c48a",
+ "atlasUuid": "56fae78e-4db4-4ef1-be24-d030fc909ed1"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
+ "0c67d": {
+ "importer": "sprite-frame",
+ "uuid": "56fae78e-4db4-4ef1-be24-d030fc909ed1@0c67d",
+ "displayName": "",
+ "id": "0c67d",
+ "name": "6218",
+ "userData": {
+ "trimType": "auto",
+ "trimThreshold": 1,
+ "rotated": true,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 417,
+ "trimY": 79,
+ "width": 48,
+ "height": 62,
+ "rawWidth": 48,
+ "rawHeight": 62,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
@@ -1396,11 +1120,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 317,
- "trimY": 57,
+ "trimX": 485,
+ "trimY": 1,
"width": 65,
"height": 60,
"rawWidth": 65,
@@ -1442,11 +1166,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 226,
- "trimY": 184,
+ "trimX": 417,
+ "trimY": 1,
"width": 66,
"height": 76,
"rawWidth": 66,
@@ -1491,8 +1215,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 123,
- "trimY": 56,
+ "trimX": 523,
+ "trimY": 68,
"width": 59,
"height": 60,
"rawWidth": 59,
diff --git a/assets/resources/game/heros/skill.png b/assets/resources/game/heros/skill.png
index 119f6a0d..d592bcbd 100644
Binary files a/assets/resources/game/heros/skill.png and b/assets/resources/game/heros/skill.png differ
diff --git a/assets/resources/game/heros/skill_card.prefab b/assets/resources/game/heros/skill_card.prefab
index f6cd81f7..1cfff2b3 100644
--- a/assets/resources/game/heros/skill_card.prefab
+++ b/assets/resources/game/heros/skill_card.prefab
@@ -80,7 +80,7 @@
},
{
"__type__": "cc.Node",
- "_name": "bg",
+ "_name": "card_green",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
@@ -114,8 +114,8 @@
},
"_lscale": {
"__type__": "cc.Vec3",
- "x": 1.0000000000000002,
- "y": 1.0000000000000002,
+ "x": 1,
+ "y": 1,
"z": 1
},
"_mobility": 0,
@@ -154,7 +154,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
- "fileId": "98iGc3EdxJG6wem+4QD0kL"
+ "fileId": "36rxb9+o9E5rB9ComMCAig"
},
{
"__type__": "cc.Sprite",
@@ -179,10 +179,10 @@
"a": 255
},
"_spriteFrame": {
- "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@7d8c1",
+ "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@eb602",
"__expectedType__": "cc.SpriteFrame"
},
- "_type": 1,
+ "_type": 0,
"_fillType": 0,
"_sizeMode": 0,
"_fillCenter": {
@@ -199,7 +199,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
- "fileId": "95KIf1WTFJUJBapgMClaii"
+ "fileId": "ffD+v5TzZH57R1R/EuEFaI"
},
{
"__type__": "cc.PrefabInfo",
@@ -209,7 +209,7 @@
"asset": {
"__id__": 0
},
- "fileId": "8at0kvKwNHvrpHcYsSWcp5",
+ "fileId": "0axXyrK4FK2p6WCE4+Rtmx",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
@@ -320,7 +320,7 @@
},
"_type": 0,
"_fillType": 0,
- "_sizeMode": 1,
+ "_sizeMode": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
@@ -764,8 +764,8 @@
},
"_lpos": {
"__type__": "cc.Vec3",
- "x": 10,
- "y": 130,
+ "x": 15,
+ "y": 120,
"z": 0
},
"_lrot": {
@@ -814,8 +814,8 @@
},
"_lpos": {
"__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
+ "x": -2,
+ "y": 2,
"z": 0
},
"_lrot": {
@@ -1001,7 +1001,7 @@
"a": 255
},
"_spriteFrame": {
- "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@a6b9d",
+ "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@64e6d",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 0,
diff --git a/assets/resources/gui/gui.plist b/assets/resources/gui/gui.plist
index a68c925a..f221c31c 100644
--- a/assets/resources/gui/gui.plist
+++ b/assets/resources/gui/gui.plist
@@ -15,9 +15,9 @@
spriteSourceSize
{94,118}
textureRect
- {{1843,49},{94,118}}
+ {{857,596},{94,118}}
textureRotated
-
+
02.png
@@ -30,7 +30,7 @@
spriteSourceSize
{64,63}
textureRect
- {{1652,185},{64,63}}
+ {{887,908},{64,63}}
textureRotated
@@ -45,7 +45,7 @@
spriteSourceSize
{64,62}
textureRect
- {{1652,250},{64,62}}
+ {{887,973},{64,62}}
textureRotated
@@ -60,9 +60,9 @@
spriteSourceSize
{122,98}
textureRect
- {{1719,49},{122,98}}
+ {{588,800},{122,98}}
textureRotated
-
+
43.png
@@ -75,7 +75,7 @@
spriteSourceSize
{100,100}
textureRect
- {{1718,235},{100,100}}
+ {{588,924},{100,100}}
textureRotated
@@ -90,9 +90,9 @@
spriteSourceSize
{82,94}
textureRect
- {{1826,361},{82,94}}
+ {{857,716},{82,94}}
textureRotated
-
+
58.png
@@ -105,7 +105,7 @@
spriteSourceSize
{100,96}
textureRect
- {{1728,337},{100,96}}
+ {{328,765},{100,96}}
textureRotated
@@ -120,9 +120,9 @@
spriteSourceSize
{84,106}
textureRect
- {{1719,149},{84,106}}
+ {{801,920},{84,106}}
textureRotated
-
+
Artboard 16.png
@@ -135,9 +135,9 @@
spriteSourceSize
{360,106}
textureRect
- {{149,368},{334,92}}
+ {{234,504},{334,92}}
textureRotated
-
+
Artboard 17.png
@@ -150,7 +150,7 @@
spriteSourceSize
{360,112}
textureRect
- {{611,1},{344,94}}
+ {{138,504},{344,94}}
textureRotated
@@ -165,9 +165,9 @@
spriteSourceSize
{389,124}
textureRect
- {{281,1},{365,100}}
+ {{544,148},{365,100}}
textureRotated
-
+
Artboard 28.png
@@ -180,10 +180,40 @@
spriteSourceSize
{386,109}
textureRect
- {{429,1},{352,87}}
+ {{49,504},{352,87}}
textureRotated
+ Cartoon RPG UI_Slot - Avatar.png
+
+ aliases
+
+ spriteOffset
+ {0,0}
+ spriteSize
+ {160,160}
+ spriteSourceSize
+ {160,160}
+ textureRect
+ {{695,596},{160,160}}
+ textureRotated
+
+
+ Cartoon RPG UI_Slot - Item.png
+
+ aliases
+
+ spriteOffset
+ {0,0}
+ spriteSize
+ {160,160}
+ spriteSourceSize
+ {160,160}
+ textureRect
+ {{695,758},{160,160}}
+ textureRotated
+
+
Heroes_icon.png
aliases
@@ -195,7 +225,7 @@
spriteSourceSize
{41,48}
textureRect
- {{1893,318},{41,48}}
+ {{818,1089},{41,48}}
textureRotated
@@ -210,9 +240,9 @@
spriteSourceSize
{35,32}
textureRect
- {{1379,231},{35,32}}
+ {{197,1154},{35,32}}
textureRotated
-
+
Option_icon.png
@@ -225,7 +255,7 @@
spriteSourceSize
{42,43}
textureRect
- {{713,347},{42,43}}
+ {{805,1132},{42,43}}
textureRotated
@@ -240,9 +270,9 @@
spriteSourceSize
{361,44}
textureRect
- {{383,1},{361,44}}
+ {{544,250},{361,44}}
textureRotated
-
+
Rounded Rectangle 1029 copy 11.png
@@ -255,9 +285,9 @@
spriteSourceSize
{72,40}
textureRect
- {{1339,189},{72,40}}
+ {{405,1108},{72,40}}
textureRotated
-
+
Rounded Rectangle 795.png
@@ -270,9 +300,9 @@
spriteSourceSize
{238,41}
textureRect
- {{1413,189},{238,41}}
+ {{427,394},{238,41}}
textureRotated
-
+
Shop_icon.png
@@ -285,9 +315,9 @@
spriteSourceSize
{49,42}
textureRect
- {{713,391},{49,42}}
+ {{883,1037},{49,42}}
textureRotated
-
+
UI-02.png
@@ -300,9 +330,9 @@
spriteSourceSize
{105,10}
textureRect
- {{485,355},{105,10}}
+ {{29,1176},{105,10}}
textureRotated
-
+
UI-03.png
@@ -315,9 +345,9 @@
spriteSourceSize
{111,16}
textureRect
- {{695,347},{111,16}}
+ {{427,278},{111,16}}
textureRotated
-
+
baoxiang.png
@@ -330,7 +360,7 @@
spriteSourceSize
{138,123}
textureRect
- {{1339,49},{138,123}}
+ {{570,660},{138,123}}
textureRotated
@@ -345,7 +375,7 @@
spriteSourceSize
{541,275}
textureRect
- {{707,1},{541,275}}
+ {{1,1},{541,275}}
textureRotated
@@ -360,7 +390,22 @@
spriteSourceSize
{694,46}
textureRect
- {{1269,1},{694,46}}
+ {{1,278},{694,46}}
+ textureRotated
+
+
+ black.png
+
+ aliases
+
+ spriteOffset
+ {0,0}
+ spriteSize
+ {111,109}
+ spriteSourceSize
+ {111,109}
+ textureRect
+ {{467,1074},{111,109}}
textureRotated
@@ -375,9 +420,9 @@
spriteSourceSize
{376,131}
textureRect
- {{1,1},{376,131}}
+ {{49,278},{376,131}}
textureRotated
-
+
btn blue.png
@@ -390,7 +435,7 @@
spriteSourceSize
{259,96}
textureRect
- {{1456,189},{259,96}}
+ {{328,504},{259,96}}
textureRotated
@@ -405,9 +450,9 @@
spriteSourceSize
{259,96}
textureRect
- {{1554,186},{259,96}}
+ {{427,296},{259,96}}
textureRotated
-
+
btn.png
@@ -420,7 +465,7 @@
spriteSourceSize
{221,87}
textureRect
- {{1250,49},{221,87}}
+ {{576,437},{221,87}}
textureRotated
@@ -435,7 +480,7 @@
spriteSourceSize
{117,135}
textureRect
- {{1464,49},{117,135}}
+ {{49,858},{117,135}}
textureRotated
@@ -450,7 +495,7 @@
spriteSourceSize
{71,71}
textureRect
- {{1820,255},{71,71}}
+ {{745,1030},{71,71}}
textureRotated
@@ -465,7 +510,97 @@
spriteSourceSize
{141,149}
textureRect
- {{983,278},{141,149}}
+ {{168,850},{141,149}}
+ textureRotated
+
+
+ card_blue.png
+
+ aliases
+
+ spriteOffset
+ {0,0}
+ spriteSize
+ {148,217}
+ spriteSourceSize
+ {148,217}
+ textureRect
+ {{688,296},{148,217}}
+ textureRotated
+
+
+ card_green.png
+
+ aliases
+
+ spriteOffset
+ {0,0}
+ spriteSize
+ {148,217}
+ spriteSourceSize
+ {148,217}
+ textureRect
+ {{426,437},{148,217}}
+ textureRotated
+
+
+ card_red.png
+
+ aliases
+
+ spriteOffset
+ {0,0}
+ spriteSize
+ {148,217}
+ spriteSourceSize
+ {148,217}
+ textureRect
+ {{665,446},{148,217}}
+ textureRotated
+
+
+ crystal_blue.png
+
+ aliases
+
+ spriteOffset
+ {0,0}
+ spriteSize
+ {72,71}
+ spriteSourceSize
+ {72,71}
+ textureRect
+ {{331,1108},{72,71}}
+ textureRotated
+
+
+ crystal_green.png
+
+ aliases
+
+ spriteOffset
+ {0,0}
+ spriteSize
+ {72,71}
+ spriteSourceSize
+ {72,71}
+ textureRect
+ {{658,1102},{72,71}}
+ textureRotated
+
+
+ crystal_red.png
+
+ aliases
+
+ spriteOffset
+ {0,0}
+ spriteSize
+ {72,71}
+ spriteSourceSize
+ {72,71}
+ textureRect
+ {{731,1103},{72,71}}
textureRotated
@@ -480,7 +615,7 @@
spriteSourceSize
{180,38}
textureRect
- {{762,278},{180,38}}
+ {{907,250},{180,38}}
textureRotated
@@ -495,7 +630,7 @@
spriteSourceSize
{38,38}
textureRect
- {{1339,231},{38,38}}
+ {{850,1132},{38,38}}
textureRotated
@@ -510,9 +645,9 @@
spriteSourceSize
{166,20}
textureRect
- {{802,278},{166,20}}
+ {{29,1154},{166,20}}
textureRotated
-
+
gbg.png
@@ -525,7 +660,22 @@
spriteSourceSize
{212,26}
textureRect
- {{1020,429},{212,26}}
+ {{1,974},{212,26}}
+ textureRotated
+
+
+ gh2.png
+
+ aliases
+
+ spriteOffset
+ {0,0}
+ spriteSize
+ {160,160}
+ spriteSourceSize
+ {160,160}
+ textureRect
+ {{426,800},{160,160}}
textureRotated
@@ -540,7 +690,7 @@
spriteSourceSize
{76,76}
textureRect
- {{1,379},{76,76}}
+ {{580,1102},{76,76}}
textureRotated
@@ -555,7 +705,22 @@
spriteSourceSize
{109,108}
textureRect
- {{1843,145},{109,108}}
+ {{690,920},{109,108}}
+ textureRotated
+
+
+ grep.png
+
+ aliases
+
+ spriteOffset
+ {0,0}
+ spriteSize
+ {112,110}
+ spriteSourceSize
+ {112,110}
+ textureRect
+ {{467,962},{112,110}}
textureRotated
@@ -570,7 +735,7 @@
spriteSourceSize
{134,134}
textureRect
- {{1583,49},{134,134}}
+ {{331,972},{134,134}}
textureRotated
@@ -585,9 +750,9 @@
spriteSourceSize
{85,74}
textureRect
- {{1652,375},{85,74}}
+ {{581,1026},{85,74}}
textureRotated
-
+
life2.png
@@ -600,9 +765,9 @@
spriteSourceSize
{77,72}
textureRect
- {{79,379},{75,68}}
+ {{668,1030},{75,68}}
textureRotated
-
+
line_bg.png
@@ -615,9 +780,9 @@
spriteSourceSize
{350,91}
textureRect
- {{518,1},{350,91}}
+ {{49,411},{350,91}}
textureRotated
-
+
line_left.png
@@ -630,7 +795,7 @@
spriteSourceSize
{106,91}
textureRect
- {{602,353},{106,91}}
+ {{857,800},{106,91}}
textureRotated
@@ -645,9 +810,9 @@
spriteSourceSize
{365,145}
textureRect
- {{134,1},{365,145}}
+ {{544,1},{365,145}}
textureRotated
-
+
magic.png
@@ -660,9 +825,9 @@
spriteSourceSize
{67,53}
textureRect
- {{707,278},{67,53}}
+ {{884,446},{67,53}}
textureRotated
-
+
menu_focus.png
@@ -675,7 +840,7 @@
spriteSourceSize
{157,157}
textureRect
- {{824,278},{157,157}}
+ {{29,995},{157,157}}
textureRotated
@@ -690,7 +855,7 @@
spriteSourceSize
{103,103}
textureRect
- {{497,355},{103,103}}
+ {{319,867},{103,103}}
textureRotated
@@ -705,7 +870,7 @@
spriteSourceSize
{129,8}
textureRect
- {{1269,416},{129,8}}
+ {{188,1144},{129,8}}
textureRotated
@@ -720,9 +885,9 @@
spriteSourceSize
{216,8}
textureRect
- {{1234,429},{216,8}}
+ {{927,1},{216,8}}
textureRotated
-
+
rund_bg.png
@@ -735,7 +900,7 @@
spriteSourceSize
{1024,1024}
textureRect
- {{1269,272},{142,142}}
+ {{426,656},{142,142}}
textureRotated
@@ -750,7 +915,7 @@
spriteSourceSize
{32,12}
textureRect
- {{983,429},{32,12}}
+ {{907,432},{32,12}}
textureRotated
@@ -765,9 +930,9 @@
spriteSourceSize
{61,69}
textureRect
- {{1893,255},{61,69}}
+ {{884,501},{61,69}}
textureRotated
-
+
skill.png
@@ -780,7 +945,7 @@
spriteSourceSize
{141,149}
textureRect
- {{1126,278},{141,149}}
+ {{188,993},{141,149}}
textureRotated
@@ -795,7 +960,7 @@
spriteSourceSize
{63,59}
textureRect
- {{1652,314},{63,59}}
+ {{818,1028},{63,59}}
textureRotated
@@ -810,9 +975,9 @@
spriteSourceSize
{35,14}
textureRect
- {{713,442},{35,14}}
+ {{937,1},{35,14}}
textureRotated
-
+
ybg.png
@@ -825,9 +990,9 @@
spriteSourceSize
{216,14}
textureRect
- {{802,446},{216,14}}
+ {{911,1},{216,14}}
textureRotated
-
+
metadata
@@ -841,9 +1006,9 @@
realTextureFileName
gui.png
size
- {1964,461}
+ {952,1187}
smartupdate
- $TexturePacker:SmartUpdate:a5b9acc5e822c2ed2aa01db35d3d9f40:c5075d5486d7e44865b7344dec5e7794:5f86533554b8a62fd9d2a17dd9533d7c$
+ $TexturePacker:SmartUpdate:85e4c7f13b98dbab5508a62c8cfc3b82:14094fc9ea76e45a583b61109889d303:5f86533554b8a62fd9d2a17dd9533d7c$
textureFileName
gui.png
diff --git a/assets/resources/gui/gui.plist.meta b/assets/resources/gui/gui.plist.meta
index fc47d3de..ab195c3e 100644
--- a/assets/resources/gui/gui.plist.meta
+++ b/assets/resources/gui/gui.plist.meta
@@ -19,8 +19,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 762,
- "trimY": 278,
+ "trimX": 907,
+ "trimY": 250,
"width": 180,
"height": 38,
"rawWidth": 180,
@@ -62,11 +62,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 713,
- "trimY": 391,
+ "trimX": 883,
+ "trimY": 1037,
"width": 49,
"height": 42,
"rawWidth": 49,
@@ -111,8 +111,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 611,
- "trimY": 1,
+ "trimX": 138,
+ "trimY": 504,
"width": 344,
"height": 94,
"rawWidth": 360,
@@ -154,11 +154,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1,
- "trimY": 1,
+ "trimX": 49,
+ "trimY": 278,
"width": 376,
"height": 131,
"rawWidth": 376,
@@ -191,6 +191,52 @@
],
"subMetas": {}
},
+ "48084": {
+ "importer": "sprite-frame",
+ "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@48084",
+ "displayName": "",
+ "id": "48084",
+ "name": "gh2",
+ "userData": {
+ "trimType": "auto",
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 426,
+ "trimY": 800,
+ "width": 160,
+ "height": 160,
+ "rawWidth": 160,
+ "rawHeight": 160,
+ "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": {}
+ },
"59775": {
"importer": "sprite-frame",
"uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@59775",
@@ -200,11 +246,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 983,
- "trimY": 278,
+ "trimX": 168,
+ "trimY": 850,
"width": 141,
"height": 149,
"rawWidth": 141,
@@ -249,8 +295,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1464,
- "trimY": 49,
+ "trimX": 49,
+ "trimY": 858,
"width": 117,
"height": 135,
"rawWidth": 117,
@@ -295,8 +341,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1843,
- "trimY": 145,
+ "trimX": 690,
+ "trimY": 920,
"width": 109,
"height": 108,
"rawWidth": 109,
@@ -338,11 +384,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1843,
- "trimY": 49,
+ "trimX": 857,
+ "trimY": 596,
"width": 94,
"height": 118,
"rawWidth": 94,
@@ -375,6 +421,52 @@
],
"subMetas": {}
},
+ "98971": {
+ "importer": "sprite-frame",
+ "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@98971",
+ "displayName": "",
+ "id": "98971",
+ "name": "card_red",
+ "userData": {
+ "trimType": "auto",
+ "trimThreshold": 1,
+ "rotated": true,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 665,
+ "trimY": 446,
+ "width": 148,
+ "height": 217,
+ "rawWidth": 148,
+ "rawHeight": 217,
+ "borderTop": 30,
+ "borderBottom": 25,
+ "borderLeft": 27,
+ "borderRight": 24,
+ "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": {}
+ },
"a6b9d": {
"importer": "sprite-frame",
"uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@a6b9d",
@@ -387,8 +479,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1652,
- "trimY": 185,
+ "trimX": 887,
+ "trimY": 908,
"width": 64,
"height": 63,
"rawWidth": 64,
@@ -433,8 +525,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1652,
- "trimY": 250,
+ "trimX": 887,
+ "trimY": 973,
"width": 64,
"height": 62,
"rawWidth": 64,
@@ -476,11 +568,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1719,
- "trimY": 49,
+ "trimX": 588,
+ "trimY": 800,
"width": 122,
"height": 98,
"rawWidth": 122,
@@ -525,8 +617,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1718,
- "trimY": 235,
+ "trimX": 588,
+ "trimY": 924,
"width": 100,
"height": 100,
"rawWidth": 100,
@@ -568,11 +660,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1826,
- "trimY": 361,
+ "trimX": 857,
+ "trimY": 716,
"width": 82,
"height": 94,
"rawWidth": 82,
@@ -617,8 +709,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1728,
- "trimY": 337,
+ "trimX": 328,
+ "trimY": 765,
"width": 100,
"height": 96,
"rawWidth": 100,
@@ -660,11 +752,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1719,
- "trimY": 149,
+ "trimX": 801,
+ "trimY": 920,
"width": 84,
"height": 106,
"rawWidth": 84,
@@ -706,11 +798,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 149,
- "trimY": 368,
+ "trimX": 234,
+ "trimY": 504,
"width": 334,
"height": 92,
"rawWidth": 360,
@@ -752,11 +844,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": -2,
"offsetY": 2,
- "trimX": 281,
- "trimY": 1,
+ "trimX": 544,
+ "trimY": 148,
"width": 365,
"height": 100,
"rawWidth": 389,
@@ -801,8 +893,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": -1,
- "trimX": 429,
- "trimY": 1,
+ "trimX": 49,
+ "trimY": 504,
"width": 352,
"height": 87,
"rawWidth": 386,
@@ -835,6 +927,98 @@
],
"subMetas": {}
},
+ "f60dc": {
+ "importer": "sprite-frame",
+ "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@f60dc",
+ "displayName": "",
+ "id": "f60dc",
+ "name": "Cartoon RPG UI_Slot - Avatar",
+ "userData": {
+ "trimType": "auto",
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 695,
+ "trimY": 596,
+ "width": 160,
+ "height": 160,
+ "rawWidth": 160,
+ "rawHeight": 160,
+ "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": {}
+ },
+ "227e6": {
+ "importer": "sprite-frame",
+ "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@227e6",
+ "displayName": "",
+ "id": "227e6",
+ "name": "Cartoon RPG UI_Slot - Item",
+ "userData": {
+ "trimType": "auto",
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 695,
+ "trimY": 758,
+ "width": 160,
+ "height": 160,
+ "rawWidth": 160,
+ "rawHeight": 160,
+ "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": {}
+ },
"d3524": {
"importer": "sprite-frame",
"uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@d3524",
@@ -847,8 +1031,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1893,
- "trimY": 318,
+ "trimX": 818,
+ "trimY": 1089,
"width": 41,
"height": 48,
"rawWidth": 41,
@@ -890,11 +1074,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1379,
- "trimY": 231,
+ "trimX": 197,
+ "trimY": 1154,
"width": 35,
"height": 32,
"rawWidth": 35,
@@ -939,8 +1123,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 713,
- "trimY": 347,
+ "trimX": 805,
+ "trimY": 1132,
"width": 42,
"height": 43,
"rawWidth": 42,
@@ -982,11 +1166,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 383,
- "trimY": 1,
+ "trimX": 544,
+ "trimY": 250,
"width": 361,
"height": 44,
"rawWidth": 361,
@@ -1028,11 +1212,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1339,
- "trimY": 189,
+ "trimX": 405,
+ "trimY": 1108,
"width": 72,
"height": 40,
"rawWidth": 72,
@@ -1074,11 +1258,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1413,
- "trimY": 189,
+ "trimX": 427,
+ "trimY": 394,
"width": 238,
"height": 41,
"rawWidth": 238,
@@ -1120,11 +1304,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 485,
- "trimY": 355,
+ "trimX": 29,
+ "trimY": 1176,
"width": 105,
"height": 10,
"rawWidth": 105,
@@ -1166,11 +1350,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 695,
- "trimY": 347,
+ "trimX": 427,
+ "trimY": 278,
"width": 111,
"height": 16,
"rawWidth": 111,
@@ -1215,8 +1399,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1339,
- "trimY": 49,
+ "trimX": 570,
+ "trimY": 660,
"width": 138,
"height": 123,
"rawWidth": 138,
@@ -1261,7 +1445,7 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 707,
+ "trimX": 1,
"trimY": 1,
"width": 541,
"height": 275,
@@ -1304,11 +1488,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1269,
- "trimY": 1,
+ "trimX": 1,
+ "trimY": 278,
"width": 694,
"height": 46,
"rawWidth": 694,
@@ -1341,6 +1525,52 @@
],
"subMetas": {}
},
+ "176a9": {
+ "importer": "sprite-frame",
+ "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@176a9",
+ "displayName": "",
+ "id": "176a9",
+ "name": "black",
+ "userData": {
+ "trimType": "auto",
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 467,
+ "trimY": 1074,
+ "width": 111,
+ "height": 109,
+ "rawWidth": 111,
+ "rawHeight": 109,
+ "borderTop": 33,
+ "borderBottom": 35,
+ "borderLeft": 34,
+ "borderRight": 37,
+ "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": {}
+ },
"1fc73": {
"importer": "sprite-frame",
"uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@1fc73",
@@ -1353,8 +1583,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1456,
- "trimY": 189,
+ "trimX": 328,
+ "trimY": 504,
"width": 259,
"height": 96,
"rawWidth": 259,
@@ -1396,11 +1626,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1554,
- "trimY": 186,
+ "trimX": 427,
+ "trimY": 296,
"width": 259,
"height": 96,
"rawWidth": 259,
@@ -1445,8 +1675,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1250,
- "trimY": 49,
+ "trimX": 576,
+ "trimY": 437,
"width": 221,
"height": 87,
"rawWidth": 221,
@@ -1491,8 +1721,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1820,
- "trimY": 255,
+ "trimX": 745,
+ "trimY": 1030,
"width": 71,
"height": 71,
"rawWidth": 71,
@@ -1525,6 +1755,236 @@
],
"subMetas": {}
},
+ "eb602": {
+ "importer": "sprite-frame",
+ "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@eb602",
+ "displayName": "",
+ "id": "eb602",
+ "name": "card_blue",
+ "userData": {
+ "trimType": "auto",
+ "trimThreshold": 1,
+ "rotated": true,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 688,
+ "trimY": 296,
+ "width": 148,
+ "height": 217,
+ "rawWidth": 148,
+ "rawHeight": 217,
+ "borderTop": 32,
+ "borderBottom": 29,
+ "borderLeft": 35,
+ "borderRight": 37,
+ "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": {}
+ },
+ "279e3": {
+ "importer": "sprite-frame",
+ "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@279e3",
+ "displayName": "",
+ "id": "279e3",
+ "name": "card_green",
+ "userData": {
+ "trimType": "auto",
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 426,
+ "trimY": 437,
+ "width": 148,
+ "height": 217,
+ "rawWidth": 148,
+ "rawHeight": 217,
+ "borderTop": 30,
+ "borderBottom": 29,
+ "borderLeft": 29,
+ "borderRight": 37,
+ "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": {}
+ },
+ "64e6d": {
+ "importer": "sprite-frame",
+ "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@64e6d",
+ "displayName": "",
+ "id": "64e6d",
+ "name": "crystal_blue",
+ "userData": {
+ "trimType": "auto",
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 331,
+ "trimY": 1108,
+ "width": 72,
+ "height": 71,
+ "rawWidth": 72,
+ "rawHeight": 71,
+ "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": {}
+ },
+ "1bbb6": {
+ "importer": "sprite-frame",
+ "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@1bbb6",
+ "displayName": "",
+ "id": "1bbb6",
+ "name": "crystal_green",
+ "userData": {
+ "trimType": "auto",
+ "trimThreshold": 1,
+ "rotated": true,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 658,
+ "trimY": 1102,
+ "width": 72,
+ "height": 71,
+ "rawWidth": 72,
+ "rawHeight": 71,
+ "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": {}
+ },
+ "86c70": {
+ "importer": "sprite-frame",
+ "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@86c70",
+ "displayName": "",
+ "id": "86c70",
+ "name": "crystal_red",
+ "userData": {
+ "trimType": "auto",
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 731,
+ "trimY": 1103,
+ "width": 72,
+ "height": 71,
+ "rawWidth": 72,
+ "rawHeight": 71,
+ "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": {}
+ },
"f572f": {
"importer": "sprite-frame",
"uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@f572f",
@@ -1537,8 +1997,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1339,
- "trimY": 231,
+ "trimX": 850,
+ "trimY": 1132,
"width": 38,
"height": 38,
"rawWidth": 38,
@@ -1580,11 +2040,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 802,
- "trimY": 278,
+ "trimX": 29,
+ "trimY": 1154,
"width": 166,
"height": 20,
"rawWidth": 166,
@@ -1626,11 +2086,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1020,
- "trimY": 429,
+ "trimX": 1,
+ "trimY": 974,
"width": 212,
"height": 26,
"rawWidth": 212,
@@ -1675,8 +2135,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1,
- "trimY": 379,
+ "trimX": 580,
+ "trimY": 1102,
"width": 76,
"height": 76,
"rawWidth": 76,
@@ -1709,6 +2169,52 @@
],
"subMetas": {}
},
+ "4b4e8": {
+ "importer": "sprite-frame",
+ "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@4b4e8",
+ "displayName": "",
+ "id": "4b4e8",
+ "name": "grep",
+ "userData": {
+ "trimType": "auto",
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 467,
+ "trimY": 962,
+ "width": 112,
+ "height": 110,
+ "rawWidth": 112,
+ "rawHeight": 110,
+ "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": {}
+ },
"4d393": {
"importer": "sprite-frame",
"uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@4d393",
@@ -1721,8 +2227,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1583,
- "trimY": 49,
+ "trimX": 331,
+ "trimY": 972,
"width": 134,
"height": 134,
"rawWidth": 134,
@@ -1764,11 +2270,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1652,
- "trimY": 375,
+ "trimX": 581,
+ "trimY": 1026,
"width": 85,
"height": 74,
"rawWidth": 85,
@@ -1810,11 +2316,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 79,
- "trimY": 379,
+ "trimX": 668,
+ "trimY": 1030,
"width": 75,
"height": 68,
"rawWidth": 77,
@@ -1856,11 +2362,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 518,
- "trimY": 1,
+ "trimX": 49,
+ "trimY": 411,
"width": 350,
"height": 91,
"rawWidth": 350,
@@ -1905,8 +2411,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 602,
- "trimY": 353,
+ "trimX": 857,
+ "trimY": 800,
"width": 106,
"height": 91,
"rawWidth": 106,
@@ -1948,10 +2454,10 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 134,
+ "trimX": 544,
"trimY": 1,
"width": 365,
"height": 145,
@@ -1994,11 +2500,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 707,
- "trimY": 278,
+ "trimX": 884,
+ "trimY": 446,
"width": 67,
"height": 53,
"rawWidth": 67,
@@ -2043,8 +2549,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 824,
- "trimY": 278,
+ "trimX": 29,
+ "trimY": 995,
"width": 157,
"height": 157,
"rawWidth": 157,
@@ -2089,8 +2595,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 497,
- "trimY": 355,
+ "trimX": 319,
+ "trimY": 867,
"width": 103,
"height": 103,
"rawWidth": 103,
@@ -2135,8 +2641,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1269,
- "trimY": 416,
+ "trimX": 188,
+ "trimY": 1144,
"width": 129,
"height": 8,
"rawWidth": 129,
@@ -2178,11 +2684,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1234,
- "trimY": 429,
+ "trimX": 927,
+ "trimY": 1,
"width": 216,
"height": 8,
"rawWidth": 216,
@@ -2227,8 +2733,8 @@
"rotated": false,
"offsetX": 369,
"offsetY": -236,
- "trimX": 1269,
- "trimY": 272,
+ "trimX": 426,
+ "trimY": 656,
"width": 142,
"height": 142,
"rawWidth": 1024,
@@ -2273,8 +2779,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 983,
- "trimY": 429,
+ "trimX": 907,
+ "trimY": 432,
"width": 32,
"height": 12,
"rawWidth": 32,
@@ -2316,11 +2822,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1893,
- "trimY": 255,
+ "trimX": 884,
+ "trimY": 501,
"width": 61,
"height": 69,
"rawWidth": 61,
@@ -2365,8 +2871,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1126,
- "trimY": 278,
+ "trimX": 188,
+ "trimY": 993,
"width": 141,
"height": 149,
"rawWidth": 141,
@@ -2411,8 +2917,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1652,
- "trimY": 314,
+ "trimX": 818,
+ "trimY": 1028,
"width": 63,
"height": 59,
"rawWidth": 63,
@@ -2454,11 +2960,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 713,
- "trimY": 442,
+ "trimX": 937,
+ "trimY": 1,
"width": 35,
"height": 14,
"rawWidth": 35,
@@ -2500,11 +3006,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 802,
- "trimY": 446,
+ "trimX": 911,
+ "trimY": 1,
"width": 216,
"height": 14,
"rawWidth": 216,
diff --git a/assets/resources/gui/gui.png b/assets/resources/gui/gui.png
index d11a336f..1032c08d 100644
Binary files a/assets/resources/gui/gui.png and b/assets/resources/gui/gui.png differ
diff --git a/assets/script/Main.ts b/assets/script/Main.ts
index 2f9f349a..482c9638 100644
--- a/assets/script/Main.ts
+++ b/assets/script/Main.ts
@@ -19,8 +19,8 @@ const { ccclass, property } = _decorator;
@ccclass('Main')
export class Main extends Root {
start() {
- if (DEBUG) profiler.showStats();
- PhysicsSystem2D.instance.debugDrawFlags = EPhysics2DDrawFlags.Aabb
+ // if (DEBUG) profiler.showStats();
+ // PhysicsSystem2D.instance.debugDrawFlags = EPhysics2DDrawFlags.Aabb
// | EPhysics2DDrawFlags.Pair
// |EPhysics2DDrawFlags.CenterOfMass
// |EPhysics2DDrawFlags.Joint
diff --git a/assets/script/game/Role/Role.ts b/assets/script/game/Role/Role.ts
index b587e02c..67ad8d69 100644
--- a/assets/script/game/Role/Role.ts
+++ b/assets/script/game/Role/Role.ts
@@ -37,7 +37,7 @@ export class Role extends ecs.Entity {
}
/** 加载角色 */
- load(pos: Vec3 = Vec3.ZERO,uuid:number=101,skin:string="Character01") {
+ load(pos: Vec3 = Vec3.ZERO,uuid:number=101) {
// var path = "game/monster/"+prefab_path;
var path = "game/heros/role";
var prefab: Prefab = oops.res.get(path, Prefab)!;
@@ -46,7 +46,7 @@ export class Role extends ecs.Entity {
node.parent = scene.entityLayer!.node!;
// var as = node.getComponent(MonsterSpine);
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/player';
// resources.load(url, SpriteAtlas, (err: any, atlas) => {
// const sprite = node.getChildByName("avatar").getChildByName("TNode").getChildByName("bb").getComponent(Sprite);
@@ -54,8 +54,6 @@ export class Role extends ecs.Entity {
// sprite.spriteFrame = atlas.getSpriteFrame(RoleSet[uuid].path);
// });
var rv = node.getComponent(RoleViewComp)!;
- rv.skin=skin
- rv.setSkin()
this.add(rv);
this.hero_init(uuid,node)
diff --git a/assets/script/game/Role/RoleSpine.ts b/assets/script/game/Role/RoleSpine.ts
index 9e3506bc..49f9addd 100644
--- a/assets/script/game/Role/RoleSpine.ts
+++ b/assets/script/game/Role/RoleSpine.ts
@@ -33,11 +33,11 @@ export class RoleSpine extends Component {
this.spine = this.animator.getComponent(sp.Skeleton)!;
}
atk() {
- this.spine.setAnimation(0, "Throwing", false);
+ this.spine.setAnimation(0, "atk2", false);
}
magic() {
- this.spine.setAnimation(0, "Hit", false);
+ this.spine.setAnimation(0, "max", false);
}
setSkin(value: string): void {
console.log("RoleSpine setSkin", value);
diff --git a/assets/script/game/Role/RoleSpineAnimator.ts b/assets/script/game/Role/RoleSpineAnimator.ts
index 07828486..5bd929a6 100644
--- a/assets/script/game/Role/RoleSpineAnimator.ts
+++ b/assets/script/game/Role/RoleSpineAnimator.ts
@@ -15,7 +15,7 @@ const { ccclass, property, requireComponent, disallowMultiple } = _decorator;
@disallowMultiple
@requireComponent(sp.Skeleton)
export default class RoleSpineAnimator extends Component {
- private animName: string = "Idle";
+ private animName: string = "move";
private loop: boolean = true;
private spine!: sp.Skeleton;
start() {
@@ -32,8 +32,8 @@ export default class RoleSpineAnimator extends Component {
this.spine.setEndListener(trackEntry => {
var animationName = trackEntry.animation ? trackEntry.animation.name : "";
// console.log("[track %s][animation %s] end.", trackEntry.trackIndex, animationName);
- if (animationName == "Throwing"||animationName == "Hit") {
- this.spine.setAnimation(0, "Idle", true);
+ if (animationName == "atk2" ||animationName == "magic"||animationName=="max") {
+ this.spine.setAnimation(0, "move", true);
}
});
diff --git a/assets/script/game/Role/RoleViewComp.ts b/assets/script/game/Role/RoleViewComp.ts
index d0e52fd2..844ec9ef 100644
--- a/assets/script/game/Role/RoleViewComp.ts
+++ b/assets/script/game/Role/RoleViewComp.ts
@@ -35,7 +35,7 @@ export class RoleViewComp extends CCComp {
hp_max:number = 1000;
power: number = 0;
stop_cd:number = 0;
- atk_cd:number = 10;
+ atk_cd:number = 3;
atk:number = 10;
skill_uuid:number = 9003;
max_skill_uuid:number = 1001;
@@ -51,8 +51,8 @@ export class RoleViewComp extends CCComp {
// let x = RandomManager.instance.getRandomInt(1,9,2)
// this.as.setSkin("Character0"+x);
this.atk_time = new Timer(this.atk_cd);
- // this.sprite = this.node.getChildByName("avatar").getChildByName("TNode").getChildByName("bb").getComponent(Sprite);
- // this.orginalFlashMaterial = this.sprite.getRenderMaterial(0);
+ this.sprite = this.node.getChildByName("avatar").getChildByName("TNode").getChildByName("bb").getComponent(Sprite);
+ this.orginalFlashMaterial = this.sprite.getRenderMaterial(0);
console.log("Role view start")
let collider = this.getComponent(Collider2D);
if (collider) {
@@ -113,16 +113,16 @@ export class RoleViewComp extends CCComp {
}
in_atked() {
- // this.sprite.setSharedMaterial(this.hitFlashMaterial, 0);
- // this.scheduleOnce(() => {
- // this.sprite.setSharedMaterial(this.orginalFlashMaterial, 0);
- // }, 0.1);
- var path = "game/skills/atked";
- var prefab: Prefab = oops.res.get(path, Prefab)!;
- var node = instantiate(prefab);
- let pos = v3(0,30)
- node.setPosition(pos)
- node.parent = this.node;
+ this.sprite.setSharedMaterial(this.hitFlashMaterial, 0);
+ this.scheduleOnce(() => {
+ this.sprite.setSharedMaterial(this.orginalFlashMaterial, 0);
+ }, 0.1);
+ // var path = "game/skills/atked";
+ // var prefab: Prefab = oops.res.get(path, Prefab)!;
+ // var node = instantiate(prefab);
+ // let pos = v3(0,30)
+ // node.setPosition(pos)
+ // node.parent = this.node;
}
hp_change(hp: number){
this.hp -= hp;
diff --git a/assets/script/game/common/config/CardSet.ts b/assets/script/game/common/config/CardSet.ts
index e4377de7..3f3306e8 100644
--- a/assets/script/game/common/config/CardSet.ts
+++ b/assets/script/game/common/config/CardSet.ts
@@ -12,18 +12,24 @@ 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},
{uuid:1001,type:2},{uuid:1002,type:2},
+ {uuid:6001,type:3},{uuid:6004,type:3},{uuid:6101,type:3},
],
2:[
{uuid:2101,type:1},{uuid:2102,type:1},{uuid:2201,type:1},{uuid:2202,type:1},{uuid:2301,type:1},{uuid:2302,type:1},
{uuid:1001,type:2},{uuid:1002,type:2},
+ {uuid:6001,type:3},{uuid:6004,type:3},{uuid:6101,type:3},
],
3:[
{uuid:3101,type:1},{uuid:3102,type:1},{uuid:3201,type:1},{uuid:3202,type:1},{uuid:3301,type:1},{uuid:3302,type:1},
- {uuid:1001,type:2},{uuid:1002,type:2},
+ {uuid:1001,type:2},{uuid:1002,type:2},{uuid:4011,type:2},{uuid:4012,type:2},
+ {uuid:6001,type:3},{uuid:6004,type:3},{uuid:6101,type:3},{uuid:6002,type:3},{uuid:6003,type:3},{uuid:6005,type:3},{uuid:6006,type:3},{uuid:6102,type:3},{uuid:6103,type:3},
+ {uuid:6210,type:3},{uuid:6213,type:3},{uuid:6216,type:3},
],
4:[
{uuid:4101,type:1},{uuid:4102,type:1},{uuid:4201,type:1},{uuid:4202,type:1},{uuid:4301,type:1},{uuid:4302,type:1},
- {uuid:1001,type:2},{uuid:1002,type:2},
+ {uuid:1001,type:2},{uuid:1002,type:2},{uuid:4011,type:2},{uuid:4012,type:2},
+ {uuid:6001,type:3},{uuid:6004,type:3},{uuid:6101,type:3},{uuid:6002,type:3},{uuid:6003,type:3},{uuid:6005,type:3},{uuid:6006,type:3},{uuid:6102,type:3},{uuid:6103,type:3},
+ {uuid:6210,type:3},{uuid:6213,type:3},{uuid:6216,type:3},{uuid:6211,type:3},{uuid:6212,type:3},{uuid:6214,type:3},{uuid:6215,type:3},{uuid:6217,type:3},{uuid:6218,type:3},
],
5:[{uuid:5001,type:1},{uuid:5002,type:1},{uuid:5003,type:1},{uuid:5004,type:1}],
// 1:[1101,1102,1103,1104,1105,1106,1201,1202,1203,1204,1205,1301,1302,1303,1304,],
diff --git a/assets/script/game/common/config/SkillSet.ts b/assets/script/game/common/config/SkillSet.ts
index 5154bc25..06df5ca7 100644
--- a/assets/script/game/common/config/SkillSet.ts
+++ b/assets/script/game/common/config/SkillSet.ts
@@ -8,14 +8,12 @@ type ：
9： buff物品，
91: 单体buff物品，加最少血，临时
92：单体buff物品，随机，临时
- 93: 单体buff物品，加最少血，永久
- 94：单体buff物品，随机，永久
- 95: 群体buff物品临时
- 96: 群体buff物品永久
+ 93: 群体buff物品
+ 94：role buff
sd： 卡片技能图标持续时间
cd： 卡片技能释放本技能cd
count：卡片1次释放本技能数
-bsd：buff技能作用持续时间
+bsd：buff技能作用持续时间 ，bsd=0 为永久
bcd：buff技能执行一次间隔
sk_uuid:子技能id
sk_count:子技能个数
@@ -31,13 +29,27 @@ export const SkillSet={
9001:{uuid: 9001,path: "1001",type: 1,level: 1,name: "基础攻击1",sp_name:"base",dis:70,count:1,atk:0,hp:0,shield:0,sd:10,cd:3,bsd:10,bcd:1,sk_uuid:1001,sk_count:0,speed:450,},
9002:{uuid: 9002,path: "1001",type: 1,level: 1,name: "基础攻击2",sp_name:"base2",dis:70,count:1,atk:0,hp:0,shield:0,sd:10,cd:3,bsd:10,bcd:1,sk_uuid:1001,sk_count:0,speed:450,},
9003:{uuid: 9003,path: "1001",type: 2,level: 1,name: "基础攻击3",sp_name:"base3",dis:720,count:1,atk:0,hp:0,shield:0,sd:10,cd:3,bsd:10,bcd:1,sk_uuid:1001,sk_count:0,speed:450,},
+
+ 6001:{uuid: 6001,path: "6001",type: 92,level: 1,name: "普通单手剑",sp_name:"",dis:720,count:1,atk:10,hp:0,shield:0,sd:30,cd:1,bsd:5,bcd:1,sk_uuid:1001,sk_count:0,speed:350,},
+ 6002:{uuid: 6002,path: "6002",type: 93,level: 3,name: "精致单手剑",sp_name:"",dis:720,count:1,atk:10,hp:0,shield:0,sd:30,cd:1,bsd:5,bcd:1,sk_uuid:1001,sk_count:0,speed:350,},
+ 6003:{uuid: 6003,path: "6003",type: 94,level: 3,name: "魔法单手剑",sp_name:"",dis:720,count:1,atk:10,hp:0,shield:0,sd:30,cd:1,bsd:5,bcd:1,sk_uuid:1001,sk_count:0,speed:350,},
+ 6004:{uuid: 6004,path: "6004",type: 92,level: 1,name: "普通木盾",sp_name:"",dis:720,count:1,atk:0,hp:0,shield:0,sd:30,cd:1,bsd:5,bcd:1,sk_uuid:1001,sk_count:0,speed:350,},
+ 6005:{uuid: 6005,path: "6005",type: 93,level: 3,name: "精致钢盾",sp_name:"",dis:720,count:1,atk:0,hp:0,shield:0,sd:30,cd:1,bsd:5,bcd:1,sk_uuid:1001,sk_count:0,speed:350,},
+ 6006:{uuid: 6006,path: "6006",type: 94,level: 3,name: "魔法盾",sp_name:"",dis:720,count:1,atk:0,hp:0,shield:0,sd:30,cd:1,bsd:5,bcd:1,sk_uuid:1001,sk_count:0,speed:350,},
+ 6101:{uuid: 6101,path: "6101",type: 91,level: 1,name: "初级药水",sp_name:"",dis:720,count:1,atk:0,hp:30,shield:0,sd:30,cd:1,bsd:5,bcd:1,sk_uuid:1001,sk_count:0,speed:350,},
+ 6102:{uuid: 6102,path: "6102",type: 93,level: 3,name: "高级药水",sp_name:"",dis:720,count:1,atk:0,hp:50,shield:0,sd:30,cd:1,bsd:5,bcd:1,sk_uuid:1001,sk_count:0,speed:350,},
+ 6103:{uuid: 6103,path: "6103",type: 94,level: 3,name: "活力药水",sp_name:"",dis:720,count:1,atk:0,hp:50,shield:0,sd:30,cd:1,bsd:5,bcd:1,sk_uuid:1001,sk_count:0,speed:350,},
+ 6210:{uuid: 6210,path: "6210",type: 92,level: 3,name: "普通攻击石",sp_name:"",dis:720,count:1,atk:0,hp:30,shield:0,sd:30,cd:1,bsd:0,bcd:1,sk_uuid:1001,sk_count:0,speed:350,},
+ 6211:{uuid: 6211,path: "6211",type: 93,level: 4,name: "特效攻击石",sp_name:"",dis:720,count:1,atk:0,hp:50,shield:0,sd:30,cd:1,bsd:0,bcd:1,sk_uuid:1001,sk_count:0,speed:350,},
+ 6212:{uuid: 6212,path: "6212",type: 94,level: 4,name: "精炼攻击石",sp_name:"",dis:720,count:1,atk:0,hp:50,shield:0,sd:30,cd:1,bsd:0,bcd:1,sk_uuid:1001,sk_count:0,speed:350,},
+ 6213:{uuid: 6213,path: "6213",type: 92,level: 3,name: "普通生命石",sp_name:"",dis:720,count:1,atk:0,hp:30,shield:0,sd:30,cd:1,bsd:0,bcd:1,sk_uuid:1001,sk_count:0,speed:350,},
+ 6214:{uuid: 6214,path: "6214",type: 93,level: 4,name: "特效生命石",sp_name:"",dis:720,count:1,atk:0,hp:50,shield:0,sd:30,cd:1,bsd:0,bcd:1,sk_uuid:1001,sk_count:0,speed:350,},
+ 6215:{uuid: 6215,path: "6215",type: 94,level: 4,name: "精炼生命石",sp_name:"",dis:720,count:1,atk:0,hp:50,shield:0,sd:30,cd:1,bsd:0,bcd:1,sk_uuid:1001,sk_count:0,speed:350,},
+ 6216:{uuid: 6216,path: "6216",type: 92,level: 3,name: "普通全能石",sp_name:"",dis:720,count:1,atk:0,hp:30,shield:0,sd:30,cd:1,bsd:0,bcd:1,sk_uuid:1001,sk_count:0,speed:350,},
+ 6217:{uuid: 6217,path: "6217",type: 93,level: 4,name: "特效全能石",sp_name:"",dis:720,count:1,atk:0,hp:50,shield:0,sd:30,cd:1,bsd:0,bcd:1,sk_uuid:1001,sk_count:0,speed:350,},
+ 6218:{uuid: 6218,path: "6218",type: 94,level: 4,name: "精炼全能石",sp_name:"",dis:720,count:1,atk:0,hp:50,shield:0,sd:30,cd:1,bsd:0,bcd:1,sk_uuid:1001,sk_count:0,speed:350,},
}
export const AllItems={
- 6001:{uuid: 6001,path: "6001",type: 92,level: 1,name: "单手剑",sp_name:"",dis:720,count:1,atk:10,hp:0,shield:0,sd:10,cd:1,bsd:5,bcd:1,sk_uuid:1001,sk_count:0,speed:350,},
- 6002:{uuid: 6002,path: "6002",type: 95,level: 3,name: "武器库",sp_name:"",dis:720,count:1,atk:10,hp:0,shield:0,sd:10,cd:1,bsd:5,bcd:1,sk_uuid:1001,sk_count:0,speed:350,},
- 6003:{uuid: 6003,path: "6003",type: 92,level: 1,name: "木盾",sp_name:"",dis:720,count:1,atk:0,hp:0,shield:0,sd:10,cd:1,bsd:5,bcd:1,sk_uuid:1001,sk_count:0,speed:350,},
- 6004:{uuid: 6004,path: "6004",type: 95,level: 3,name: "钢盾",sp_name:"",dis:720,count:1,atk:0,hp:0,shield:0,sd:10,cd:1,bsd:5,bcd:1,sk_uuid:1001,sk_count:0,speed:350,},
- 6101:{uuid: 6101,path: "6101",type: 92,level: 1,name: "初级治疗药水",sp_name:"",dis:720,count:1,atk:0,hp:30,shield:0,sd:10,cd:1,bsd:5,bcd:1,sk_uuid:1001,sk_count:0,speed:350,},
- 6102:{uuid: 6102,path: "6102",type: 95,level: 3,name: "高级治疗药水",sp_name:"",dis:720,count:1,atk:0,hp:50,shield:0,sd:10,cd:1,bsd:5,bcd:1,sk_uuid:1001,sk_count:0,speed:350,},
+
}
diff --git a/assets/script/game/map/view/MapViewComp.ts b/assets/script/game/map/view/MapViewComp.ts
index 2c9b6900..8d8e8b20 100644
--- a/assets/script/game/map/view/MapViewComp.ts
+++ b/assets/script/game/map/view/MapViewComp.ts
@@ -44,7 +44,7 @@ export class MapViewComp extends CCComp {
load_role(){
let role = ecs.getEntity(Role);
let pos = v3(BoxSet.HERO_START-50,BoxSet.GAME_LINE)
- role.load(pos,108,"Character07")
+ role.load(pos,108)
smc.Role=role
}
load_data(){
diff --git a/assets/script/game/monster/CSkillComp.ts b/assets/script/game/monster/CSkillComp.ts
index ac35cb94..29c0c562 100644
--- a/assets/script/game/monster/CSkillComp.ts
+++ b/assets/script/game/monster/CSkillComp.ts
@@ -11,6 +11,7 @@ import { BoxSet, GameSet } from "../common/config/BoxSet";
import { smc } from "../common/SingletonModuleComp";
import { oops } from "../../../../extensions/oops-plugin-framework/assets/core/Oops";
import { HeroModelComp } from "./HeroModelComp";
+import { RandomManager } from "../../../../extensions/oops-plugin-framework/assets/core/common/random/RandomManager";
const { ccclass, property } = _decorator;
/** 视图层对象 */
@@ -50,7 +51,7 @@ export class CSkillComp extends CCComp {
if(smc.skills[this.skill_uuid].type == 1){
this.shoot()
}
- if(smc.skills[this.skill_uuid].type == 9){
+ if(smc.skills[this.skill_uuid].type > 90){
this.add_buff()
}
@@ -86,6 +87,17 @@ export class CSkillComp extends CCComp {
skill.load(pos,speed,dis,scale,this.node,this.skill_uuid,atk,angle,t_pos);
}
add_buff(){
+ // 1： 远距离攻击，碰撞后 结束
+ // 2： 远距离攻击，碰撞后 持续，直到技能结束
+ // 3： 远距离攻击，碰撞后 持续，带击退功能
+ // 4： 双技能技能，1技能结束后，触发2技能
+ // 5: 特殊技能，触发特殊弹窗选项
+ // 9： buff物品，
+ // 91: 单体buff物品，加最少血，临时
+ // 92：单体buff物品，随机，临时
+ // 93: 群体buff物品
+ // 94：role 临时buff
+ // 95：role 永久buff
let uuid= this.skill_uuid;
let atk:number=smc.Role.RoleView.atk
let args:any = {
@@ -94,19 +106,32 @@ export class CSkillComp extends CCComp {
shield:atk*GameSet.ATK_TO_SHIELD_RATIO,
}
let heros:any = ecs.query(ecs.allOf(HeroModelComp));
- let heros_hp:any=[]
+ let least_hp:number=999999
+ let t_hero:any= null
if (heros.length > 0) {
- if(SkillSet[uuid].type==92){
- heros[0].MonsterBuff.add_buff(uuid,args);
-
+ if(SkillSet[uuid].type==92){ //随机添加buff
+ let i = RandomManager.instance.getRandomInt(0,heros.length-1,3)
+ console.log("i %%length:",i,heros.length)
+ heros[i].MonsterBuff.add_buff(uuid,args);
}else{
for (let i = 0; i < heros.length; i++) {
let hero = heros[i];
- if(SkillSet[uuid].type==99){
+ // console.log(" CSkillComp hero",hero);
+ if(SkillSet[uuid].type==91){ //血量最少单体
+ console.log(" CSkillComp hero 91",hero,least_hp,t_hero);
+ if(hero.MonsterView.hp < least_hp){
+ least_hp = hero.MonsterView.hp
+ t_hero = hero
+ }
+ }else{ //群体
hero.MonsterBuff.add_buff(uuid,args);
- }
+ }
}
+ if(t_hero){ //血量最少单体
+ t_hero.MonsterBuff.add_buff(uuid,args);
+ }
+
}
}
diff --git a/assets/script/game/monster/HeroCard.ts b/assets/script/game/monster/HeroCard.ts
index 1b5fa9ca..031adda5 100644
--- a/assets/script/game/monster/HeroCard.ts
+++ b/assets/script/game/monster/HeroCard.ts
@@ -52,9 +52,9 @@ export class HeroCard extends ecs.Entity {
break;
case 3:
default:
- path = "game/heros/hero_card";
- url = "game/heros/heros";
- ({ path: pathName, name, level } = smc.heros[uuid]);
+ path = "game/heros/item_card";
+ url = "game/heros/skill";
+ ({ path: pathName, name, level } = smc.skills[uuid]);
}
diff --git a/assets/script/game/monster/HeroCardViewComp.ts b/assets/script/game/monster/HeroCardViewComp.ts
index 5ddb275d..9f402505 100644
--- a/assets/script/game/monster/HeroCardViewComp.ts
+++ b/assets/script/game/monster/HeroCardViewComp.ts
@@ -23,6 +23,7 @@ export class HeroCardViewComp extends CCComp {
pos_y:number = 0;
card_type:number = 1;
card_level:number = 1;
+ alive:boolean = false;
protected onLoad(): void {
this.node.on(NodeEventType.TOUCH_START, this.onTouchMove, this);
@@ -73,18 +74,26 @@ export class HeroCardViewComp extends CCComp {
}
do_active(){
// console.log(this.node.getChildByName("active"),this.node.getChildByName("use"), this.node.getChildByName("bag"))
- let active = this.node.getChildByName("active")
+ // let active = this.node.getChildByName("active")
// let use = this.node.getChildByName("use")
// let bag = this.node.getChildByName("bag")
- active.active = !active.active
+ // active.active = !active.active
// use.active = !use.active
// bag.active = !bag.active
+ this.alive=!this.alive
+ if(this.alive){
+ this.node.setScale(1.5,1.5,1)
+ }else{
+ this.node.setScale(1,1,0)
+ }
+
}
no_active(){
let active = this.node.getChildByName("active")
// let use = this.node.getChildByName("use")
// let bag = this.node.getChildByName("bag")
active.active = false
+ this.node.setScale(1,1)
// use.active = false
// bag.active = false
}
@@ -122,12 +131,12 @@ export class HeroCardViewComp extends CCComp {
}
}
do_use_card(){
- switch (this.card_type) { // 添加括号并修正语法
+ switch (this.card_type) {
case 1:
- oops.message.dispatchEvent("do_add_hero", { uuid: this.card_uid }); // 添加分号
+ oops.message.dispatchEvent("do_add_hero", { uuid: this.card_uid });
break;
case 2:
- oops.message.dispatchEvent("do_use_skill", { uuid: this.card_uid }); // 添加分号
+ oops.message.dispatchEvent("do_use_skill", { uuid: this.card_uid });
// console.log("do_use_skill",this.card_uid)
break;
default:
diff --git a/assets/script/game/monster/MonsterSpineAnimator.ts b/assets/script/game/monster/MonsterSpineAnimator.ts
index f82671f0..6b6ceed9 100644
--- a/assets/script/game/monster/MonsterSpineAnimator.ts
+++ b/assets/script/game/monster/MonsterSpineAnimator.ts
@@ -32,7 +32,7 @@ export default class MonsterSpineAnimator extends Component {
this.spine.setEndListener(trackEntry => {
var animationName = trackEntry.animation ? trackEntry.animation.name : "";
// console.log("[track %s][animation %s] end.", trackEntry.trackIndex, animationName);
- if (animationName == "atk" ||animationName == "magic"||animationName=="max") {
+ if (animationName == "atk2" ||animationName == "magic"||animationName=="max") {
this.spine.setAnimation(0, "move", true);
}
});
diff --git a/assets/script/game/monster/MonsterViewComp.ts b/assets/script/game/monster/MonsterViewComp.ts
index 6a580727..e460e175 100644
--- a/assets/script/game/monster/MonsterViewComp.ts
+++ b/assets/script/game/monster/MonsterViewComp.ts
@@ -87,6 +87,7 @@ export class MonsterViewComp extends CCComp {
} /** 视图层逻辑代码分离演示 */
start () {
this.sprite = this.node.getChildByName("avatar").getChildByName("TNode").getChildByName("bb").getComponent(Sprite);
+ this.node.getChildByName("top").setScale(this.scale,1);
this.orginalFlashMaterial = this.sprite.getRenderMaterial(0);
this.BoxRang.getComponent(BoxRangComp).box_group = this.box_group;
@@ -180,7 +181,7 @@ export class MonsterViewComp extends CCComp {
this.power = 0
}
let power_progress= this.power/this.power_max;
- this.node.getChildByName("power").getComponent(ProgressBar)!.progress = power_progress;
+ this.node.getChildByName("top").getChildByName("power").getComponent(ProgressBar)!.progress = power_progress;
}
shoot(skill_uuid:number){
// console.log("monster shoot");
@@ -223,7 +224,7 @@ export class MonsterViewComp extends CCComp {
}
in_shield(){
let shield_progress= this.shield/this.shield_max;
- this.node.getChildByName("shield").getComponent(ProgressBar)!.progress = shield_progress;
+ this.node.getChildByName("top").getChildByName("shield").getComponent(ProgressBar)!.progress = shield_progress;
// if(this.shield <= 0){
// this.node.getChildByName("shield").active=false
// }else{
@@ -245,7 +246,7 @@ export class MonsterViewComp extends CCComp {
this.hp = this.hp_max;
}
let hp_progress= this.hp/this.hp_max;
- this.node.getChildByName("hp").getComponent(ProgressBar)!.progress = hp_progress;
+ this.node.getChildByName("top").getChildByName("hp").getComponent(ProgressBar)!.progress = hp_progress;
if(this.hp <= 0){
this.dead();
this.is_dead = true;
diff --git a/settings/v2/packages/engine.json b/settings/v2/packages/engine.json
index 60a5c650..4f30919c 100644
--- a/settings/v2/packages/engine.json
+++ b/settings/v2/packages/engine.json
@@ -17,7 +17,7 @@
"_value": true
},
"skeletal-animation": {
- "_value": false
+ "_value": true
},
"3d": {
"_value": false
@@ -136,6 +136,7 @@
"particle-2d",
"physics-2d-box2d",
"profiler",
+ "skeletal-animation",
"spine",
"tween",
"ui",