diff --git a/assets/resources/game/heros/a1.prefab b/assets/resources/game/heros/a1.prefab
index beea77ab..e5db1cf1 100644
--- a/assets/resources/game/heros/a1.prefab
+++ b/assets/resources/game/heros/a1.prefab
@@ -1003,7 +1003,7 @@
],
"value": {
"__type__": "cc.Vec3",
- "x": 1.2,
+ "x": 1,
"y": 1,
"z": 1
}
diff --git a/assets/resources/game/heros/a2.prefab b/assets/resources/game/heros/a2.prefab
index 89adc16a..cfa01506 100644
--- a/assets/resources/game/heros/a2.prefab
+++ b/assets/resources/game/heros/a2.prefab
@@ -1003,7 +1003,7 @@
],
"value": {
"__type__": "cc.Vec3",
- "x": 1.2,
+ "x": 1,
"y": 1,
"z": 1
}
diff --git a/assets/resources/game/heros/a3.prefab b/assets/resources/game/heros/a3.prefab
index a484f893..30f2965b 100644
--- a/assets/resources/game/heros/a3.prefab
+++ b/assets/resources/game/heros/a3.prefab
@@ -1003,7 +1003,7 @@
],
"value": {
"__type__": "cc.Vec3",
- "x": 1.2,
+ "x": 1,
"y": 1,
"z": 1
}
diff --git a/assets/resources/game/heros/k1.prefab b/assets/resources/game/heros/k1.prefab
index 3e5a0fb6..33b3c5b8 100644
--- a/assets/resources/game/heros/k1.prefab
+++ b/assets/resources/game/heros/k1.prefab
@@ -44,28 +44,31 @@
},
{
"__id__": 82
+ },
+ {
+ "__id__": 91
}
],
"_active": true,
"_components": [
- {
- "__id__": 91
- },
- {
- "__id__": 93
- },
- {
- "__id__": 95
- },
- {
- "__id__": 97
- },
{
"__id__": 99
+ },
+ {
+ "__id__": 101
+ },
+ {
+ "__id__": 103
+ },
+ {
+ "__id__": 105
+ },
+ {
+ "__id__": 107
}
],
"_prefab": {
- "__id__": 101
+ "__id__": 109
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -315,7 +318,7 @@
"value": {
"__type__": "cc.Vec3",
"x": 0,
- "y": -4.526,
+ "y": -0.07,
"z": 0
}
},
@@ -1003,7 +1006,7 @@
],
"value": {
"__type__": "cc.Vec3",
- "x": 1.2,
+ "x": 1,
"y": 1,
"z": 1
}
@@ -1401,6 +1404,174 @@
],
"value": false
},
+ {
+ "__type__": "cc.Node",
+ "_name": "buff_add",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 1
+ },
+ "_children": [],
+ "_active": false,
+ "_components": [
+ {
+ "__id__": 92
+ },
+ {
+ "__id__": 94
+ },
+ {
+ "__id__": 96
+ }
+ ],
+ "_prefab": {
+ "__id__": 98
+ },
+ "_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.7,
+ "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__": 91
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 93
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 106.70999908447266,
+ "height": 108
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5000468659746804,
+ "y": 0.11898148501360858
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "92iyOUSpROt5I/Qbr0n0VR"
+ },
+ {
+ "__type__": "sp.Skeleton",
+ "_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
+ },
+ "_skeletonData": {
+ "__uuid__": "af716091-7de8-4a09-9f4e-bb7c9c40d0db",
+ "__expectedType__": "sp.SkeletonData"
+ },
+ "defaultSkin": "default",
+ "defaultAnimation": "show",
+ "_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": "a32g1O2bxLI6D28EOYFjld"
+ },
+ {
+ "__type__": "cc.Animation",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 91
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 97
+ },
+ "playOnLoad": false,
+ "_clips": [
+ {
+ "__uuid__": "00cf1b0a-8952-433d-87a0-7f3dc167cbef",
+ "__expectedType__": "cc.AnimationClip"
+ }
+ ],
+ "_defaultClip": {
+ "__uuid__": "00cf1b0a-8952-433d-87a0-7f3dc167cbef",
+ "__expectedType__": "cc.AnimationClip"
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "20Q1ZTb3VN+IH3gAk13P9s"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "733PKzwANLyJWD2ume4u5f",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
{
"__type__": "cc.UITransform",
"_name": "",
@@ -1411,7 +1582,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 92
+ "__id__": 100
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1439,7 +1610,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 94
+ "__id__": 102
},
"enabledContactListener": true,
"bullet": true,
@@ -1473,7 +1644,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 96
+ "__id__": 104
},
"tag": 0,
"_group": 4,
@@ -1507,7 +1678,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 98
+ "__id__": 106
},
"anm": {
"__id__": 37
@@ -1528,7 +1699,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 100
+ "__id__": 108
},
"_id": ""
},
diff --git a/assets/resources/game/heros/k2.prefab b/assets/resources/game/heros/k2.prefab
index 78780a92..6d90a898 100644
--- a/assets/resources/game/heros/k2.prefab
+++ b/assets/resources/game/heros/k2.prefab
@@ -1003,7 +1003,7 @@
],
"value": {
"__type__": "cc.Vec3",
- "x": 1.2,
+ "x": 1,
"y": 1,
"z": 1
}
diff --git a/assets/resources/game/heros/k3.prefab b/assets/resources/game/heros/k3.prefab
index 8d6d95b9..acc8b9db 100644
--- a/assets/resources/game/heros/k3.prefab
+++ b/assets/resources/game/heros/k3.prefab
@@ -34,38 +34,38 @@
"__id__": 40
},
{
- "__id__": 52
+ "__id__": 55
},
{
- "__id__": 63
+ "__id__": 66
},
{
- "__id__": 72
+ "__id__": 75
},
{
- "__id__": 82
+ "__id__": 85
}
],
"_active": true,
"_components": [
{
- "__id__": 91
+ "__id__": 94
},
{
- "__id__": 93
+ "__id__": 96
},
{
- "__id__": 95
+ "__id__": 98
},
{
- "__id__": 97
+ "__id__": 100
},
{
- "__id__": 99
+ "__id__": 102
}
],
"_prefab": {
- "__id__": 101
+ "__id__": 104
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -743,6 +743,12 @@
},
{
"__id__": 51
+ },
+ {
+ "__id__": 52
+ },
+ {
+ "__id__": 53
}
],
"removedComponents": []
@@ -854,6 +860,32 @@
"z": 1
}
},
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 44
+ },
+ "propertyPath": [
+ "_layer"
+ ],
+ "value": 1
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 54
+ },
+ "propertyPath": [
+ "_layer"
+ ],
+ "value": 1
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "7a5LvbdlxEc6FKa7cun2oB"
+ ]
+ },
{
"__type__": "cc.Node",
"_objFlags": 0,
@@ -861,14 +893,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 53
+ "__id__": 56
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 52
+ "__id__": 55
},
"asset": {
"__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -876,7 +908,7 @@
},
"fileId": "5fqU0L3/FOhKaco5UkHuWT",
"instance": {
- "__id__": 54
+ "__id__": 57
},
"targetOverrides": null
},
@@ -889,23 +921,23 @@
"mountedChildren": [],
"mountedComponents": [],
"propertyOverrides": [
- {
- "__id__": 55
- },
- {
- "__id__": 57
- },
{
"__id__": 58
},
- {
- "__id__": 59
- },
{
"__id__": 60
},
+ {
+ "__id__": 61
+ },
{
"__id__": 62
+ },
+ {
+ "__id__": 63
+ },
+ {
+ "__id__": 65
}
],
"removedComponents": []
@@ -913,7 +945,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 59
},
"propertyPath": [
"_name"
@@ -929,7 +961,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 59
},
"propertyPath": [
"_lpos"
@@ -944,7 +976,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 59
},
"propertyPath": [
"_lrot"
@@ -960,7 +992,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 59
},
"propertyPath": [
"_euler"
@@ -975,7 +1007,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 61
+ "__id__": 64
},
"propertyPath": [
"_lpos"
@@ -996,14 +1028,14 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 59
},
"propertyPath": [
"_lscale"
],
"value": {
"__type__": "cc.Vec3",
- "x": 1.2,
+ "x": 1,
"y": 1,
"z": 1
}
@@ -1015,14 +1047,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 64
+ "__id__": 67
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 63
+ "__id__": 66
},
"asset": {
"__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
@@ -1030,7 +1062,7 @@
},
"fileId": "0d6ZXmA5dHkZxoGONDL2sE",
"instance": {
- "__id__": 65
+ "__id__": 68
},
"targetOverrides": null
},
@@ -1043,20 +1075,20 @@
"mountedChildren": [],
"mountedComponents": [],
"propertyOverrides": [
- {
- "__id__": 66
- },
- {
- "__id__": 68
- },
{
"__id__": 69
},
{
- "__id__": 70
+ "__id__": 71
},
{
- "__id__": 71
+ "__id__": 72
+ },
+ {
+ "__id__": 73
+ },
+ {
+ "__id__": 74
}
],
"removedComponents": []
@@ -1064,7 +1096,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 70
},
"propertyPath": [
"_name"
@@ -1080,7 +1112,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 70
},
"propertyPath": [
"_lpos"
@@ -1095,7 +1127,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 70
},
"propertyPath": [
"_lrot"
@@ -1111,7 +1143,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 70
},
"propertyPath": [
"_euler"
@@ -1126,7 +1158,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 70
},
"propertyPath": [
"_active"
@@ -1140,14 +1172,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 73
+ "__id__": 76
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 72
+ "__id__": 75
},
"asset": {
"__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a",
@@ -1155,7 +1187,7 @@
},
"fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": {
- "__id__": 74
+ "__id__": 77
},
"targetOverrides": null
},
@@ -1168,23 +1200,23 @@
"mountedChildren": [],
"mountedComponents": [],
"propertyOverrides": [
- {
- "__id__": 75
- },
- {
- "__id__": 77
- },
{
"__id__": 78
},
- {
- "__id__": 79
- },
{
"__id__": 80
},
{
"__id__": 81
+ },
+ {
+ "__id__": 82
+ },
+ {
+ "__id__": 83
+ },
+ {
+ "__id__": 84
}
],
"removedComponents": []
@@ -1192,7 +1224,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 79
},
"propertyPath": [
"_name"
@@ -1208,7 +1240,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 79
},
"propertyPath": [
"_lpos"
@@ -1223,7 +1255,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 79
},
"propertyPath": [
"_lrot"
@@ -1239,7 +1271,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 79
},
"propertyPath": [
"_euler"
@@ -1254,7 +1286,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 79
},
"propertyPath": [
"_lscale"
@@ -1269,7 +1301,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 79
},
"propertyPath": [
"_active"
@@ -1283,14 +1315,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 83
+ "__id__": 86
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 82
+ "__id__": 85
},
"asset": {
"__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338",
@@ -1298,7 +1330,7 @@
},
"fileId": "91yoyAQGNDm5ziI7NUChZ+",
"instance": {
- "__id__": 84
+ "__id__": 87
},
"targetOverrides": null
},
@@ -1311,20 +1343,20 @@
"mountedChildren": [],
"mountedComponents": [],
"propertyOverrides": [
- {
- "__id__": 85
- },
- {
- "__id__": 87
- },
{
"__id__": 88
},
{
- "__id__": 89
+ "__id__": 90
},
{
- "__id__": 90
+ "__id__": 91
+ },
+ {
+ "__id__": 92
+ },
+ {
+ "__id__": 93
}
],
"removedComponents": []
@@ -1332,7 +1364,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 86
+ "__id__": 89
},
"propertyPath": [
"_name"
@@ -1348,7 +1380,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 86
+ "__id__": 89
},
"propertyPath": [
"_lpos"
@@ -1363,7 +1395,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 86
+ "__id__": 89
},
"propertyPath": [
"_lrot"
@@ -1379,7 +1411,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 86
+ "__id__": 89
},
"propertyPath": [
"_euler"
@@ -1394,7 +1426,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 86
+ "__id__": 89
},
"propertyPath": [
"_active"
@@ -1411,7 +1443,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 92
+ "__id__": 95
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1439,7 +1471,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 94
+ "__id__": 97
},
"enabledContactListener": true,
"bullet": true,
@@ -1473,7 +1505,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 96
+ "__id__": 99
},
"tag": 0,
"_group": 4,
@@ -1507,7 +1539,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 98
+ "__id__": 101
},
"anm": {
"__id__": 37
@@ -1528,7 +1560,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 100
+ "__id__": 103
},
"_id": ""
},
@@ -1549,16 +1581,16 @@
"targetOverrides": null,
"nestedPrefabInstanceRoots": [
{
- "__id__": 82
+ "__id__": 85
},
{
- "__id__": 72
+ "__id__": 75
},
{
- "__id__": 63
+ "__id__": 66
},
{
- "__id__": 52
+ "__id__": 55
},
{
"__id__": 40
diff --git a/assets/resources/game/heros/mor1.prefab b/assets/resources/game/heros/mor1.prefab
index f1b15c53..fd117222 100644
--- a/assets/resources/game/heros/mor1.prefab
+++ b/assets/resources/game/heros/mor1.prefab
@@ -1003,7 +1003,7 @@
],
"value": {
"__type__": "cc.Vec3",
- "x": 1.2,
+ "x": 1,
"y": 1,
"z": 1
}
diff --git a/assets/resources/game/heros/mor2.prefab b/assets/resources/game/heros/mor2.prefab
index 98aefb07..3665a9a0 100644
--- a/assets/resources/game/heros/mor2.prefab
+++ b/assets/resources/game/heros/mor2.prefab
@@ -1003,7 +1003,7 @@
],
"value": {
"__type__": "cc.Vec3",
- "x": 1.2,
+ "x": 1,
"y": 1,
"z": 1
}
diff --git a/assets/resources/game/heros/mor3.prefab b/assets/resources/game/heros/mor3.prefab
index 2890bf0e..8e28636c 100644
--- a/assets/resources/game/heros/mor3.prefab
+++ b/assets/resources/game/heros/mor3.prefab
@@ -1003,7 +1003,7 @@
],
"value": {
"__type__": "cc.Vec3",
- "x": 1.2,
+ "x": 1,
"y": 1,
"z": 1
}
diff --git a/assets/resources/game/heros/pd1.prefab b/assets/resources/game/heros/pd1.prefab
index 6c52b8c6..35b52586 100644
--- a/assets/resources/game/heros/pd1.prefab
+++ b/assets/resources/game/heros/pd1.prefab
@@ -1003,7 +1003,7 @@
],
"value": {
"__type__": "cc.Vec3",
- "x": 1.2,
+ "x": 1,
"y": 1,
"z": 1
}
diff --git a/assets/resources/game/heros/top.prefab b/assets/resources/game/heros/top.prefab
index 563a2796..7bb26ee2 100644
--- a/assets/resources/game/heros/top.prefab
+++ b/assets/resources/game/heros/top.prefab
@@ -22,20 +22,20 @@
"__id__": 2
},
{
- "__id__": 16
+ "__id__": 22
},
{
- "__id__": 32
+ "__id__": 56
}
],
"_active": true,
"_components": [
{
- "__id__": 48
+ "__id__": 72
}
],
"_prefab": {
- "__id__": 50
+ "__id__": 74
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -77,22 +77,25 @@
"_children": [
{
"__id__": 3
+ },
+ {
+ "__id__": 9
}
],
"_active": true,
"_components": [
{
- "__id__": 9
+ "__id__": 15
},
{
- "__id__": 11
+ "__id__": 17
},
{
- "__id__": 13
+ "__id__": 19
}
],
"_prefab": {
- "__id__": 15
+ "__id__": 21
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -109,7 +112,7 @@
},
"_lscale": {
"__type__": "cc.Vec3",
- "x": 0.8,
+ "x": 1,
"y": 1,
"z": 1
},
@@ -164,7 +167,7 @@
"z": 1
},
"_mobility": 0,
- "_layer": 33554432,
+ "_layer": 1,
"_euler": {
"__type__": "cc.Vec3",
"x": 0,
@@ -224,10 +227,10 @@
"a": 255
},
"_spriteFrame": {
- "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@ff93c",
+ "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@fa049",
"__expectedType__": "cc.SpriteFrame"
},
- "_type": 1,
+ "_type": 3,
"_fillType": 0,
"_sizeMode": 0,
"_fillCenter": {
@@ -236,7 +239,7 @@
"y": 0
},
"_fillStart": 0,
- "_fillRange": 0,
+ "_fillRange": 1,
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": null,
@@ -259,6 +262,142 @@
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
+ {
+ "__type__": "cc.Node",
+ "_name": "bg2",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 2
+ },
+ "_children": [],
+ "_active": false,
+ "_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": 1,
+ "_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": 60,
+ "height": 15
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "321MMZ0WBBHIcdtYlOrhNM"
+ },
+ {
+ "__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": 0,
+ "g": 0,
+ "b": 0,
+ "a": 255
+ },
+ "_spriteFrame": {
+ "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@4c659",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ "_type": 0,
+ "_fillType": 0,
+ "_sizeMode": 0,
+ "_fillCenter": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_fillStart": 0,
+ "_fillRange": 0.51,
+ "_isTrimmedMode": true,
+ "_useGrayscale": true,
+ "_atlas": null,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "a5+uSV9MNFyantmp8WI+uN"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "3aD9/XAShOvbVk6WoGBLK+",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
{
"__type__": "cc.UITransform",
"_name": "",
@@ -269,7 +408,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 10
+ "__id__": 16
},
"_contentSize": {
"__type__": "cc.Size",
@@ -297,7 +436,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 12
+ "__id__": 18
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -310,7 +449,7 @@
"a": 255
},
"_spriteFrame": {
- "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@9c879",
+ "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@984ba",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 1,
@@ -342,13 +481,13 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 14
+ "__id__": 20
},
"_barSprite": {
"__id__": 6
},
- "_mode": 0,
- "_totalLength": 60,
+ "_mode": 2,
+ "_totalLength": 1,
"_progress": 1,
"_reverse": false,
"_id": ""
@@ -380,20 +519,29 @@
},
"_children": [
{
- "__id__": 17
+ "__id__": 23
},
{
- "__id__": 23
+ "__id__": 29
+ },
+ {
+ "__id__": 35
+ },
+ {
+ "__id__": 41
+ },
+ {
+ "__id__": 47
}
],
"_active": true,
"_components": [
{
- "__id__": 29
+ "__id__": 53
}
],
"_prefab": {
- "__id__": 31
+ "__id__": 55
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -426,148 +574,12 @@
},
{
"__type__": "cc.Node",
- "_name": "atk",
+ "_name": "ap",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 16
- },
- "_children": [],
- "_active": false,
- "_components": [
- {
- "__id__": 18
- },
- {
- "__id__": 20
- }
- ],
- "_prefab": {
"__id__": 22
},
- "_lpos": {
- "__type__": "cc.Vec3",
- "x": -8.725,
- "y": 12.79,
- "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__": 17
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 19
- },
- "_contentSize": {
- "__type__": "cc.Size",
- "width": 24,
- "height": 24
- },
- "_anchorPoint": {
- "__type__": "cc.Vec2",
- "x": 0.5,
- "y": 0.5
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "f57IxG6QxEx43OjgI//06I"
- },
- {
- "__type__": "cc.Sprite",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 17
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 21
- },
- "_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@e4b0d",
- "__expectedType__": "cc.SpriteFrame"
- },
- "_type": 0,
- "_fillType": 0,
- "_sizeMode": 0,
- "_fillCenter": {
- "__type__": "cc.Vec2",
- "x": 0,
- "y": 0
- },
- "_fillStart": 0,
- "_fillRange": 0,
- "_isTrimmedMode": true,
- "_useGrayscale": false,
- "_atlas": null,
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "8eU3aOh01K+pYTeVPsOWU4"
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 1
- },
- "asset": {
- "__id__": 0
- },
- "fileId": "dfDOq9MhxDoay0LMIRMSnQ",
- "instance": null,
- "targetOverrides": null,
- "nestedPrefabInstanceRoots": null
- },
- {
- "__type__": "cc.Node",
- "_name": "atk_s",
- "_objFlags": 0,
- "__editorExtras__": {},
- "_parent": {
- "__id__": 16
- },
"_children": [],
"_active": false,
"_components": [
@@ -583,8 +595,8 @@
},
"_lpos": {
"__type__": "cc.Vec3",
- "x": 16.109,
- "y": 12.449,
+ "x": 0.439,
+ "y": 18.517,
"z": 0
},
"_lrot": {
@@ -624,8 +636,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 24,
- "height": 24
+ "width": 65.5999984741211,
+ "height": 65.5999984741211
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -636,10 +648,10 @@
},
{
"__type__": "cc.CompPrefabInfo",
- "fileId": "2aq549V/lIJqSdzaP+GTbU"
+ "fileId": "f57IxG6QxEx43OjgI//06I"
},
{
- "__type__": "cc.Sprite",
+ "__type__": "sp.Skeleton",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
@@ -660,28 +672,28 @@
"b": 255,
"a": 255
},
- "_spriteFrame": {
- "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@57b31",
- "__expectedType__": "cc.SpriteFrame"
+ "_skeletonData": {
+ "__uuid__": "e53bbef1-7515-4aed-ab0b-4fb1bfb2c906",
+ "__expectedType__": "sp.SkeletonData"
},
- "_type": 0,
- "_fillType": 0,
- "_sizeMode": 0,
- "_fillCenter": {
- "__type__": "cc.Vec2",
- "x": 0,
- "y": 0
- },
- "_fillStart": 0,
- "_fillRange": 0,
- "_isTrimmedMode": true,
- "_useGrayscale": false,
- "_atlas": null,
+ "defaultSkin": "default",
+ "defaultAnimation": "loop",
+ "_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": "76xobP6NNJ07n2tQ0hPZ7a"
+ "fileId": "8dG9AYAnZFhrBk79tUxXE8"
},
{
"__type__": "cc.PrefabInfo",
@@ -691,7 +703,551 @@
"asset": {
"__id__": 0
},
- "fileId": "98WKvp4shKP6QSOhiLhHGZ",
+ "fileId": "dfDOq9MhxDoay0LMIRMSnQ",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "cd",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 22
+ },
+ "_children": [],
+ "_active": false,
+ "_components": [
+ {
+ "__id__": 30
+ },
+ {
+ "__id__": 32
+ }
+ ],
+ "_prefab": {
+ "__id__": 34
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0.439,
+ "y": 18.517,
+ "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__": 29
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 31
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 65.5999984741211,
+ "height": 65.5999984741211
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.49100609502573933
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "f5EjmqA0VK6bMg6KsbI7tH"
+ },
+ {
+ "__type__": "sp.Skeleton",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 29
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 33
+ },
+ "_customMaterial": null,
+ "_srcBlendFactor": 2,
+ "_dstBlendFactor": 4,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
+ },
+ "_skeletonData": {
+ "__uuid__": "3f3890f8-95ab-44e3-92b8-6b144223e1d0",
+ "__expectedType__": "sp.SkeletonData"
+ },
+ "defaultSkin": "default",
+ "defaultAnimation": "loop",
+ "_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": "6178tgQ2FHIp7KFoMfxQtG"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "afcIk0vOJMMZ5ST+5+2CBt",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "def",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 22
+ },
+ "_children": [],
+ "_active": false,
+ "_components": [
+ {
+ "__id__": 36
+ },
+ {
+ "__id__": 38
+ }
+ ],
+ "_prefab": {
+ "__id__": 40
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0.439,
+ "y": 18.517,
+ "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__": 35
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 37
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 65.5999984741211,
+ "height": 65.5999984741211
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "89aUatwzhM+JrOOnJeq/BU"
+ },
+ {
+ "__type__": "sp.Skeleton",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 35
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 39
+ },
+ "_customMaterial": null,
+ "_srcBlendFactor": 2,
+ "_dstBlendFactor": 4,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
+ },
+ "_skeletonData": {
+ "__uuid__": "4c5cb1cc-5985-4ebe-918c-61fd50774b2f",
+ "__expectedType__": "sp.SkeletonData"
+ },
+ "defaultSkin": "default",
+ "defaultAnimation": "loop",
+ "_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": "b9A0nR7BJBW7Vn0QLYcP06"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "92EC4fqQpCDakamuLNWU37",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "hp",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 22
+ },
+ "_children": [],
+ "_active": false,
+ "_components": [
+ {
+ "__id__": 42
+ },
+ {
+ "__id__": 44
+ }
+ ],
+ "_prefab": {
+ "__id__": 46
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0.439,
+ "y": 18.517,
+ "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__": 41
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 43
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 65.5999984741211,
+ "height": 65.5999984741211
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "17UpbZk4JA9JYnvJjbzRQk"
+ },
+ {
+ "__type__": "sp.Skeleton",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 41
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 45
+ },
+ "_customMaterial": null,
+ "_srcBlendFactor": 2,
+ "_dstBlendFactor": 4,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
+ },
+ "_skeletonData": {
+ "__uuid__": "e53bbef1-7515-4aed-ab0b-4fb1bfb2c906",
+ "__expectedType__": "sp.SkeletonData"
+ },
+ "defaultSkin": "default",
+ "defaultAnimation": "loop",
+ "_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": "0fZU0umZ9FjpWrYQm3aQR6"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "edRa9fWl1EzoNeYHT7zXGJ",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "crit",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 22
+ },
+ "_children": [],
+ "_active": false,
+ "_components": [
+ {
+ "__id__": 48
+ },
+ {
+ "__id__": 50
+ }
+ ],
+ "_prefab": {
+ "__id__": 52
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0.439,
+ "y": 18.517,
+ "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__": 47
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 49
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 65.5999984741211,
+ "height": 65.5999984741211
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "9dmeNWgA9NbadnTKNla99s"
+ },
+ {
+ "__type__": "sp.Skeleton",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 47
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 51
+ },
+ "_customMaterial": null,
+ "_srcBlendFactor": 2,
+ "_dstBlendFactor": 4,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
+ },
+ "_skeletonData": {
+ "__uuid__": "10f1c534-e608-4b93-b5ef-9167d6a511b2",
+ "__expectedType__": "sp.SkeletonData"
+ },
+ "defaultSkin": "default",
+ "defaultAnimation": "loop",
+ "_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": "7b2xg+JKBK0o76FO8fJKig"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "12u7ICth9BCL3li3sS1FUQ",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
@@ -702,11 +1258,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 16
+ "__id__": 22
},
"_enabled": true,
"__prefab": {
- "__id__": 30
+ "__id__": 54
},
"_contentSize": {
"__type__": "cc.Size",
@@ -747,20 +1303,20 @@
},
"_children": [
{
- "__id__": 33
+ "__id__": 57
},
{
- "__id__": 39
+ "__id__": 63
}
],
"_active": false,
"_components": [
{
- "__id__": 45
+ "__id__": 69
}
],
"_prefab": {
- "__id__": 47
+ "__id__": 71
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -797,20 +1353,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 32
+ "__id__": 56
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 34
+ "__id__": 58
},
{
- "__id__": 36
+ "__id__": 60
}
],
"_prefab": {
- "__id__": 38
+ "__id__": 62
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -847,11 +1403,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 33
+ "__id__": 57
},
"_enabled": true,
"__prefab": {
- "__id__": 35
+ "__id__": 59
},
"_contentSize": {
"__type__": "cc.Size",
@@ -875,11 +1431,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 33
+ "__id__": 57
},
"_enabled": true,
"__prefab": {
- "__id__": 37
+ "__id__": 61
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -933,20 +1489,20 @@
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
- "__id__": 32
+ "__id__": 56
},
"_children": [],
"_active": true,
"_components": [
{
- "__id__": 40
+ "__id__": 64
},
{
- "__id__": 42
+ "__id__": 66
}
],
"_prefab": {
- "__id__": 44
+ "__id__": 68
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -983,11 +1539,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 39
+ "__id__": 63
},
"_enabled": true,
"__prefab": {
- "__id__": 41
+ "__id__": 65
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1011,11 +1567,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 39
+ "__id__": 63
},
"_enabled": true,
"__prefab": {
- "__id__": 43
+ "__id__": 67
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -1092,11 +1648,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 32
+ "__id__": 56
},
"_enabled": true,
"__prefab": {
- "__id__": 46
+ "__id__": 70
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1137,7 +1693,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 49
+ "__id__": 73
},
"_contentSize": {
"__type__": "cc.Size",
diff --git a/assets/resources/game/skills/atked.prefab b/assets/resources/game/skills/atked.prefab
index 4388be0f..e5958b4a 100644
--- a/assets/resources/game/skills/atked.prefab
+++ b/assets/resources/game/skills/atked.prefab
@@ -102,8 +102,8 @@
},
"_lscale": {
"__type__": "cc.Vec3",
- "x": 1,
- "y": 1,
+ "x": 1.5,
+ "y": 1.5,
"z": 1
},
"_mobility": 0,
diff --git a/assets/resources/game/skills/atked/atked.anim b/assets/resources/game/skills/atked/atked.anim
index 54a674f8..8f125a2b 100644
--- a/assets/resources/game/skills/atked/atked.anim
+++ b/assets/resources/game/skills/atked/atked.anim
@@ -86,7 +86,7 @@
"__type__": "cc.RealKeyframeValue",
"interpolationMode": 0,
"tangentWeightMode": 0,
- "value": 0.30000001192092896,
+ "value": 0.3,
"rightTangent": 0,
"rightTangentWeight": 1,
"leftTangent": 0,
@@ -127,7 +127,7 @@
"__type__": "cc.RealKeyframeValue",
"interpolationMode": 0,
"tangentWeightMode": 0,
- "value": 0.30000001192092896,
+ "value": 0.4000000059604645,
"rightTangent": 0,
"rightTangentWeight": 1,
"leftTangent": 0,
diff --git a/assets/resources/game/skills/buff/ap_up.atlas b/assets/resources/game/skills/buff/ap_up.atlas
new file mode 100644
index 00000000..741e76f2
--- /dev/null
+++ b/assets/resources/game/skills/buff/ap_up.atlas
@@ -0,0 +1,34 @@
+
+ap_up.png
+size: 123,80
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+buff_0
+ rotate: false
+ xy: 2, 2
+ size: 76, 76
+ orig: 82, 82
+ offset: 3, 3
+ index: -1
+buff_1_1
+ rotate: false
+ xy: 80, 2
+ size: 29, 33
+ orig: 31, 36
+ offset: 1, 2
+ index: -1
+buff_1_3
+ rotate: false
+ xy: 80, 2
+ size: 29, 33
+ orig: 31, 36
+ offset: 1, 2
+ index: -1
+buff_1_2
+ rotate: false
+ xy: 80, 37
+ size: 41, 41
+ orig: 82, 81
+ offset: 21, 20
+ index: -1
diff --git a/assets/resources/game/skills/buff/ap_up.atlas.meta b/assets/resources/game/skills/buff/ap_up.atlas.meta
new file mode 100644
index 00000000..9f457b98
--- /dev/null
+++ b/assets/resources/game/skills/buff/ap_up.atlas.meta
@@ -0,0 +1,12 @@
+{
+ "ver": "1.0.1",
+ "importer": "*",
+ "imported": true,
+ "uuid": "0b8a49e6-8eeb-446f-bb1d-810553ff7cfe",
+ "files": [
+ ".atlas",
+ ".json"
+ ],
+ "subMetas": {},
+ "userData": {}
+}
diff --git a/assets/resources/game/skills/buff/ap_up.json b/assets/resources/game/skills/buff/ap_up.json
new file mode 100644
index 00000000..5adf5227
--- /dev/null
+++ b/assets/resources/game/skills/buff/ap_up.json
@@ -0,0 +1,90 @@
+{
+"skeleton": {
+ "hash": "FNNmwbijC7nZIvTsWlu3NlBldhM=",
+ "spine": "3.8.75",
+ "x": -32.8,
+ "y": -32.8,
+ "width": 65.6,
+ "height": 65.6,
+ "images": "./images/",
+ "audio": ""
+},
+"bones": [
+ { "name": "root", "scaleX": 0.8, "scaleY": 0.8 },
+ { "name": "main", "parent": "root", "rotation": 43.44 },
+ { "name": "bone2", "parent": "root", "x": 15.46, "y": -13.96 },
+ { "name": "bone3", "parent": "root", "x": -20.82, "y": 10.06 },
+ { "name": "bone", "parent": "root" }
+],
+"slots": [
+ { "name": "buff_0_1", "bone": "root" },
+ { "name": "buff_0", "bone": "bone", "attachment": "buff_0" },
+ { "name": "buff_1_3", "bone": "bone3", "attachment": "buff_1_3" },
+ { "name": "buff_1_6", "bone": "bone3", "attachment": "buff_1_3", "blend": "screen" },
+ { "name": "buff_1_2", "bone": "main", "attachment": "buff_1_2" },
+ { "name": "buff_1_4", "bone": "main", "attachment": "buff_1_2", "blend": "screen" },
+ { "name": "buff_1_1", "bone": "bone2", "attachment": "buff_1_1" },
+ { "name": "buff_1_5", "bone": "bone2", "attachment": "buff_1_1", "blend": "screen" }
+],
+"skins": [
+ {
+ "name": "default",
+ "attachments": {
+ "buff_0": {
+ "buff_0": { "width": 82, "height": 82 }
+ },
+ "buff_1_1": {
+ "buff_1_1": { "x": 0.5, "width": 31, "height": 36 }
+ },
+ "buff_1_2": {
+ "buff_1_2": { "x": 0.34, "y": 0.36, "rotation": -43.44, "width": 82, "height": 81 }
+ },
+ "buff_1_3": {
+ "buff_1_3": { "x": 0.5, "width": 31, "height": 36 }
+ },
+ "buff_1_4": {
+ "buff_1_2": { "x": 0.34, "y": 0.36, "rotation": -43.44, "width": 82, "height": 81 }
+ },
+ "buff_1_5": {
+ "buff_1_1": { "x": 0.5, "width": 31, "height": 36 }
+ },
+ "buff_1_6": {
+ "buff_1_3": { "x": 0.5, "width": 31, "height": 36 }
+ }
+ }
+ }
+],
+"animations": {
+ "loop": {
+ "bones": {
+ "bone2": {
+ "scale": [
+ { "x": 0.929, "y": 0.929, "curve": 0.25, "c3": 0.75 },
+ { "time": 0.2333, "x": 1.073, "y": 1.073, "curve": 0.25, "c3": 0.75 },
+ { "time": 0.4667, "x": 0.929, "y": 0.929, "curve": 0.25, "c3": 0.75 },
+ { "time": 0.7, "x": 1.073, "y": 1.073, "curve": 0.25, "c3": 0.75 },
+ { "time": 0.9333, "x": 0.929, "y": 0.929 }
+ ]
+ },
+ "bone3": {
+ "scale": [
+ { "x": 1.057, "y": 1.057, "curve": 0.38, "c2": 0.53, "c3": 0.745 },
+ { "time": 0.1, "curve": 0.25, "c3": 0.75 },
+ { "time": 0.3333, "x": 1.14, "y": 1.14, "curve": 0.246, "c3": 0.633, "c4": 0.54 },
+ { "time": 0.4667, "x": 1.057, "y": 1.057, "curve": 0.38, "c2": 0.53, "c3": 0.745 },
+ { "time": 0.5667, "curve": 0.25, "c3": 0.75 },
+ { "time": 0.8, "x": 1.14, "y": 1.14, "curve": 0.246, "c3": 0.633, "c4": 0.54 },
+ { "time": 0.9333, "x": 1.057, "y": 1.057 }
+ ]
+ },
+ "root": {
+ "translate": [
+ { "curve": 0.25, "c3": 0.75 },
+ { "time": 0.4667, "y": 4, "curve": 0.25, "c3": 0.75 },
+ { "time": 0.9333 }
+ ]
+ }
+ }
+ }
+}
+}
\ No newline at end of file
diff --git a/assets/resources/game/skills/buff/ap_up.json.meta b/assets/resources/game/skills/buff/ap_up.json.meta
new file mode 100644
index 00000000..1cc56711
--- /dev/null
+++ b/assets/resources/game/skills/buff/ap_up.json.meta
@@ -0,0 +1,11 @@
+{
+ "ver": "1.2.6",
+ "importer": "spine-data",
+ "imported": true,
+ "uuid": "e53bbef1-7515-4aed-ab0b-4fb1bfb2c906",
+ "files": [
+ ".json"
+ ],
+ "subMetas": {},
+ "userData": {}
+}
diff --git a/assets/resources/game/skills/buff/ap_up.png b/assets/resources/game/skills/buff/ap_up.png
new file mode 100644
index 00000000..168e463d
Binary files /dev/null and b/assets/resources/game/skills/buff/ap_up.png differ
diff --git a/assets/resources/game/skills/buff/ap_up.png.meta b/assets/resources/game/skills/buff/ap_up.png.meta
new file mode 100644
index 00000000..c8ad796d
--- /dev/null
+++ b/assets/resources/game/skills/buff/ap_up.png.meta
@@ -0,0 +1,42 @@
+{
+ "ver": "1.0.26",
+ "importer": "image",
+ "imported": true,
+ "uuid": "70a3d41b-f33f-4e61-8683-290204a2ea6d",
+ "files": [
+ ".json",
+ ".png"
+ ],
+ "subMetas": {
+ "6c48a": {
+ "importer": "texture",
+ "uuid": "70a3d41b-f33f-4e61-8683-290204a2ea6d@6c48a",
+ "displayName": "ap_up",
+ "id": "6c48a",
+ "name": "texture",
+ "userData": {
+ "wrapModeS": "repeat",
+ "wrapModeT": "repeat",
+ "minfilter": "linear",
+ "magfilter": "linear",
+ "mipfilter": "none",
+ "anisotropy": 0,
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "70a3d41b-f33f-4e61-8683-290204a2ea6d",
+ "visible": false
+ },
+ "ver": "1.0.22",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ }
+ },
+ "userData": {
+ "hasAlpha": true,
+ "type": "texture",
+ "fixAlphaTransparencyArtifacts": false,
+ "redirect": "70a3d41b-f33f-4e61-8683-290204a2ea6d@6c48a"
+ }
+}
diff --git a/assets/resources/game/skills/buff/baiqi.atlas b/assets/resources/game/skills/buff/baiqi.atlas
new file mode 100644
index 00000000..b2aa0794
--- /dev/null
+++ b/assets/resources/game/skills/buff/baiqi.atlas
@@ -0,0 +1,41 @@
+
+baiqi.png
+size: 169,217
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+图层 1
+ rotate: false
+ xy: 2, 48
+ size: 165, 42
+ orig: 195, 199
+ offset: 11, 77
+ index: -1
+图层 2
+ rotate: false
+ xy: 2, 2
+ size: 157, 44
+ orig: 195, 199
+ offset: 24, 77
+ index: -1
+图层 3
+ rotate: false
+ xy: 2, 176
+ size: 158, 39
+ orig: 195, 199
+ offset: 16, 77
+ index: -1
+图层 4
+ rotate: false
+ xy: 2, 134
+ size: 150, 40
+ orig: 195, 199
+ offset: 21, 77
+ index: -1
+图层 5
+ rotate: false
+ xy: 2, 92
+ size: 161, 40
+ orig: 195, 199
+ offset: 16, 77
+ index: -1
diff --git a/assets/resources/game/skills/buff/baiqi.atlas.meta b/assets/resources/game/skills/buff/baiqi.atlas.meta
new file mode 100644
index 00000000..e95378cf
--- /dev/null
+++ b/assets/resources/game/skills/buff/baiqi.atlas.meta
@@ -0,0 +1,12 @@
+{
+ "ver": "1.0.1",
+ "importer": "*",
+ "imported": true,
+ "uuid": "bf00ddf5-681f-454e-8b56-8f2fd5f49006",
+ "files": [
+ ".atlas",
+ ".json"
+ ],
+ "subMetas": {},
+ "userData": {}
+}
diff --git a/assets/resources/game/skills/buff/baiqi.json b/assets/resources/game/skills/buff/baiqi.json
new file mode 100644
index 00000000..f4b04550
--- /dev/null
+++ b/assets/resources/game/skills/buff/baiqi.json
@@ -0,0 +1,68 @@
+{
+"skeleton": { "hash": "aiACg+2Kezlndge7x6TK3wT4iYM=", "spine": "3.8.75", "images": "./images/", "audio": "C:\\Users\\25141\\Desktop\\buff\\buff_97" },
+"bones": [
+ { "name": "root", "scaleX": 0.4, "scaleY": 0.4 },
+ { "name": "bone2", "parent": "root", "y": -8.73, "scaleX": 1.4989, "scaleY": 1.4989 }
+],
+"slots": [
+ { "name": "图层 1", "bone": "bone2", "blend": "screen" },
+ { "name": "图层 2", "bone": "bone2", "color": "ffffff3c", "blend": "additive" }
+],
+"skins": [
+ {
+ "name": "default",
+ "attachments": {
+ "图层 1": {
+ "图层 1": { "x": 3.91, "y": 17.15, "width": 195, "height": 199 },
+ "图层 2": { "x": 3.91, "y": 17.15, "width": 195, "height": 199 },
+ "图层 3": { "x": 3.91, "y": 17.15, "width": 195, "height": 199 },
+ "图层 4": { "x": 3.91, "y": 17.15, "width": 195, "height": 199 },
+ "图层 5": { "x": 3.91, "y": 17.15, "width": 195, "height": 199 }
+ },
+ "图层 2": {
+ "图层 1": { "x": 3.91, "y": 17.15, "width": 195, "height": 199 },
+ "图层 2": { "x": 3.91, "y": 17.15, "width": 195, "height": 199 },
+ "图层 3": { "x": 3.91, "y": 17.15, "width": 195, "height": 199 },
+ "图层 4": { "x": 3.91, "y": 17.15, "width": 195, "height": 199 },
+ "图层 5": { "x": 3.91, "y": 17.15, "width": 195, "height": 199 }
+ }
+ }
+ }
+],
+"animations": {
+ "loop": {
+ "slots": {
+ "图层 2": {
+ "attachment": [
+ { "name": "图层 1" },
+ { "time": 0.0667, "name": "图层 2" },
+ { "time": 0.1333, "name": "图层 3" },
+ { "time": 0.2, "name": "图层 4" },
+ { "time": 0.2667, "name": "图层 5" },
+ { "time": 0.3333, "name": "图层 1" },
+ { "time": 0.4, "name": "图层 2" },
+ { "time": 0.4667, "name": "图层 3" },
+ { "time": 0.5333, "name": "图层 4" },
+ { "time": 0.6, "name": "图层 5" },
+ { "time": 0.6667, "name": "图层 1" }
+ ]
+ },
+ "图层 1": {
+ "attachment": [
+ { "name": "图层 1" },
+ { "time": 0.0667, "name": "图层 2" },
+ { "time": 0.1333, "name": "图层 3" },
+ { "time": 0.2, "name": "图层 4" },
+ { "time": 0.2667, "name": "图层 5" },
+ { "time": 0.3333, "name": "图层 1" },
+ { "time": 0.4, "name": "图层 2" },
+ { "time": 0.4667, "name": "图层 3" },
+ { "time": 0.5333, "name": "图层 4" },
+ { "time": 0.6, "name": "图层 5" },
+ { "time": 0.6667, "name": "图层 1" }
+ ]
+ }
+ }
+ }
+}
+}
\ No newline at end of file
diff --git a/assets/resources/game/skills/buff/baiqi.json.meta b/assets/resources/game/skills/buff/baiqi.json.meta
new file mode 100644
index 00000000..fc02a31f
--- /dev/null
+++ b/assets/resources/game/skills/buff/baiqi.json.meta
@@ -0,0 +1,11 @@
+{
+ "ver": "1.2.6",
+ "importer": "spine-data",
+ "imported": true,
+ "uuid": "3ad5c35e-0872-46d6-a974-561ada3589d8",
+ "files": [
+ ".json"
+ ],
+ "subMetas": {},
+ "userData": {}
+}
diff --git a/assets/resources/game/skills/buff/baiqi.png b/assets/resources/game/skills/buff/baiqi.png
new file mode 100644
index 00000000..0605348e
Binary files /dev/null and b/assets/resources/game/skills/buff/baiqi.png differ
diff --git a/assets/resources/game/skills/buff/baiqi.png.meta b/assets/resources/game/skills/buff/baiqi.png.meta
new file mode 100644
index 00000000..29188933
--- /dev/null
+++ b/assets/resources/game/skills/buff/baiqi.png.meta
@@ -0,0 +1,42 @@
+{
+ "ver": "1.0.26",
+ "importer": "image",
+ "imported": true,
+ "uuid": "c584cddd-5f6b-4fed-b081-d5347d11d2c5",
+ "files": [
+ ".json",
+ ".png"
+ ],
+ "subMetas": {
+ "6c48a": {
+ "importer": "texture",
+ "uuid": "c584cddd-5f6b-4fed-b081-d5347d11d2c5@6c48a",
+ "displayName": "baiqi",
+ "id": "6c48a",
+ "name": "texture",
+ "userData": {
+ "wrapModeS": "repeat",
+ "wrapModeT": "repeat",
+ "minfilter": "linear",
+ "magfilter": "linear",
+ "mipfilter": "none",
+ "anisotropy": 0,
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "c584cddd-5f6b-4fed-b081-d5347d11d2c5",
+ "visible": false
+ },
+ "ver": "1.0.22",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ }
+ },
+ "userData": {
+ "hasAlpha": true,
+ "type": "texture",
+ "fixAlphaTransparencyArtifacts": false,
+ "redirect": "c584cddd-5f6b-4fed-b081-d5347d11d2c5@6c48a"
+ }
+}
diff --git a/assets/resources/game/skills/buff/baoqi.meta b/assets/resources/game/skills/buff/baoqi.meta
new file mode 100644
index 00000000..78aff537
--- /dev/null
+++ b/assets/resources/game/skills/buff/baoqi.meta
@@ -0,0 +1,9 @@
+{
+ "ver": "1.2.0",
+ "importer": "directory",
+ "imported": true,
+ "uuid": "2ac31d0b-0c4f-43f9-b584-03a46484108a",
+ "files": [],
+ "subMetas": {},
+ "userData": {}
+}
diff --git a/assets/resources/game/skills/buff/buff_add.atlas b/assets/resources/game/skills/buff/buff_add.atlas
new file mode 100644
index 00000000..a7e7a3bd
--- /dev/null
+++ b/assets/resources/game/skills/buff/buff_add.atlas
@@ -0,0 +1,62 @@
+
+buff_add.png
+size: 291,185
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+tl0019
+ rotate: true
+ xy: 175, 8
+ size: 42, 47
+ orig: 150, 99
+ offset: 93, 42
+ index: -1
+tl0020
+ rotate: false
+ xy: 122, 112
+ size: 115, 71
+ orig: 150, 99
+ offset: 22, 17
+ index: -1
+tl0021
+ rotate: false
+ xy: 2, 110
+ size: 118, 73
+ orig: 150, 99
+ offset: 19, 15
+ index: -1
+tl0022
+ rotate: false
+ xy: 122, 52
+ size: 113, 58
+ orig: 150, 99
+ offset: 19, 13
+ index: -1
+tl0023
+ rotate: true
+ xy: 239, 94
+ size: 89, 50
+ orig: 150, 99
+ offset: 18, 13
+ index: -1
+tl0024
+ rotate: false
+ xy: 110, 3
+ size: 63, 47
+ orig: 150, 99
+ offset: 18, 13
+ index: -1
+tl0025
+ rotate: false
+ xy: 237, 43
+ size: 52, 49
+ orig: 150, 99
+ offset: 17, 14
+ index: -1
+光柱2
+ rotate: false
+ xy: 2, 2
+ size: 106, 106
+ orig: 108, 108
+ offset: 1, 1
+ index: -1
diff --git a/assets/resources/game/skills/buff/buff_add.atlas.meta b/assets/resources/game/skills/buff/buff_add.atlas.meta
new file mode 100644
index 00000000..8b102d5f
--- /dev/null
+++ b/assets/resources/game/skills/buff/buff_add.atlas.meta
@@ -0,0 +1,12 @@
+{
+ "ver": "1.0.1",
+ "importer": "*",
+ "imported": true,
+ "uuid": "247880a1-480a-496e-ad6e-f26d65403301",
+ "files": [
+ ".atlas",
+ ".json"
+ ],
+ "subMetas": {},
+ "userData": {}
+}
diff --git a/assets/resources/game/skills/buff/buff_add.json b/assets/resources/game/skills/buff/buff_add.json
new file mode 100644
index 00000000..9e3513a0
--- /dev/null
+++ b/assets/resources/game/skills/buff/buff_add.json
@@ -0,0 +1,124 @@
+{
+"skeleton": {
+ "hash": "ocvFvvgx79LvV8lxsuBjdnnkDN4=",
+ "spine": "3.8.75",
+ "x": -53.36,
+ "y": -12.85,
+ "width": 106.71,
+ "height": 108,
+ "images": "./images/",
+ "audio": "C:\\Users\\25141\\Desktop\\buff\\buff_93"
+},
+"bones": [
+ { "name": "root" },
+ { "name": "bone", "parent": "root", "rotation": 25.77, "x": 6.55, "y": 14.28, "scaleX": -1 },
+ { "name": "bone2", "parent": "root", "rotation": 25.77, "x": 6.55, "y": 44.28, "scaleX": -1 },
+ { "name": "bone3", "parent": "root", "rotation": 25.77, "x": 6.55, "y": 74.28, "scaleX": -1 },
+ { "name": "bone4", "parent": "root", "scaleX": 0.9881 }
+],
+"slots": [
+ { "name": "光柱2", "bone": "bone4", "color": "ffe80000", "attachment": "光柱2", "blend": "additive" },
+ { "name": "tl0019", "bone": "bone" },
+ { "name": "tl19", "bone": "bone2" },
+ { "name": "tl20", "bone": "bone3" }
+],
+"skins": [
+ {
+ "name": "default",
+ "attachments": {
+ "tl0019": {
+ "tl0019": { "y": 0.5, "width": 150, "height": 99 },
+ "tl0020": { "y": 0.5, "width": 150, "height": 99 },
+ "tl0021": { "y": 0.5, "width": 150, "height": 99 },
+ "tl0022": { "y": 0.5, "width": 150, "height": 99 },
+ "tl0023": { "y": 0.5, "width": 150, "height": 99 },
+ "tl0024": { "y": 0.5, "width": 150, "height": 99 },
+ "tl0025": { "y": 0.5, "width": 150, "height": 99 }
+ },
+ "tl19": {
+ "tl0019": { "y": 0.5, "width": 150, "height": 99 },
+ "tl0020": { "y": 0.5, "width": 150, "height": 99 },
+ "tl0021": { "y": 0.5, "width": 150, "height": 99 },
+ "tl0022": { "y": 0.5, "width": 150, "height": 99 },
+ "tl0023": { "y": 0.5, "width": 150, "height": 99 },
+ "tl0024": { "y": 0.5, "width": 150, "height": 99 },
+ "tl0025": { "y": 0.5, "width": 150, "height": 99 }
+ },
+ "光柱2": {
+ "光柱2": { "y": 41.15, "width": 108, "height": 108 }
+ },
+ "tl20": {
+ "tl0019": { "y": 0.5, "width": 150, "height": 99 },
+ "tl0020": { "y": 0.5, "width": 150, "height": 99 },
+ "tl0021": { "y": 0.5, "width": 150, "height": 99 },
+ "tl0022": { "y": 0.5, "width": 150, "height": 99 },
+ "tl0023": { "y": 0.5, "width": 150, "height": 99 },
+ "tl0024": { "y": 0.5, "width": 150, "height": 99 },
+ "tl0025": { "y": 0.5, "width": 150, "height": 99 }
+ }
+ }
+ }
+],
+"animations": {
+ "show": {
+ "slots": {
+ "tl0019": {
+ "attachment": [
+ { "name": "tl0019" },
+ { "time": 0.0667, "name": "tl0020" },
+ { "time": 0.1333, "name": "tl0021" },
+ { "time": 0.2, "name": "tl0022" },
+ { "time": 0.2667, "name": "tl0023" },
+ { "time": 0.3333, "name": "tl0024" },
+ { "time": 0.4, "name": "tl0025" },
+ { "time": 0.4667, "name": null }
+ ]
+ },
+ "tl19": {
+ "attachment": [
+ { "time": 0.2667, "name": "tl0019" },
+ { "time": 0.3333, "name": "tl0020" },
+ { "time": 0.4, "name": "tl0021" },
+ { "time": 0.4667, "name": "tl0022" },
+ { "time": 0.5333, "name": "tl0023" },
+ { "time": 0.6, "name": "tl0024" },
+ { "time": 0.6667, "name": "tl0025" },
+ { "time": 0.7333, "name": null }
+ ]
+ },
+ "光柱2": {
+ "color": [
+ { "color": "ffffff00" },
+ { "time": 0.2667, "color": "ffdd4981", "curve": "stepped" },
+ { "time": 0.3333, "color": "ffdd4981" },
+ { "time": 0.6667, "color": "ffdd4900" }
+ ]
+ },
+ "tl20": {
+ "attachment": [
+ { "time": 0.4667, "name": "tl0019" },
+ { "time": 0.5333, "name": "tl0020" },
+ { "time": 0.6, "name": "tl0021" },
+ { "time": 0.6667, "name": "tl0022" },
+ { "time": 0.7333, "name": "tl0023" },
+ { "time": 0.8, "name": "tl0024" },
+ { "time": 0.8667, "name": "tl0025" },
+ { "time": 0.9333, "name": null }
+ ]
+ }
+ },
+ "bones": {
+ "bone4": {
+ "translate": [
+ { "curve": 0.146, "c2": 0.51, "c3": 0.75 },
+ { "time": 0.2667, "y": 2.83 }
+ ],
+ "scale": [
+ { "x": 0.478, "y": 0.478, "curve": 0.16, "c2": 0.5, "c3": 0.75 },
+ { "time": 0.2667, "x": 0.949, "y": 1.2 }
+ ]
+ }
+ }
+ }
+}
+}
\ No newline at end of file
diff --git a/assets/resources/game/skills/buff/buff_add.json.meta b/assets/resources/game/skills/buff/buff_add.json.meta
new file mode 100644
index 00000000..59ae43b7
--- /dev/null
+++ b/assets/resources/game/skills/buff/buff_add.json.meta
@@ -0,0 +1,11 @@
+{
+ "ver": "1.2.6",
+ "importer": "spine-data",
+ "imported": true,
+ "uuid": "af716091-7de8-4a09-9f4e-bb7c9c40d0db",
+ "files": [
+ ".json"
+ ],
+ "subMetas": {},
+ "userData": {}
+}
diff --git a/assets/resources/game/skills/buff/buff_add.png b/assets/resources/game/skills/buff/buff_add.png
new file mode 100644
index 00000000..7dc0b0fc
Binary files /dev/null and b/assets/resources/game/skills/buff/buff_add.png differ
diff --git a/assets/resources/game/skills/buff/buff_add.png.meta b/assets/resources/game/skills/buff/buff_add.png.meta
new file mode 100644
index 00000000..9709ce1c
--- /dev/null
+++ b/assets/resources/game/skills/buff/buff_add.png.meta
@@ -0,0 +1,42 @@
+{
+ "ver": "1.0.26",
+ "importer": "image",
+ "imported": true,
+ "uuid": "a21ec5a7-5e4f-4f85-98b6-7f15b1bc26b8",
+ "files": [
+ ".json",
+ ".png"
+ ],
+ "subMetas": {
+ "6c48a": {
+ "importer": "texture",
+ "uuid": "a21ec5a7-5e4f-4f85-98b6-7f15b1bc26b8@6c48a",
+ "displayName": "buff_add",
+ "id": "6c48a",
+ "name": "texture",
+ "userData": {
+ "wrapModeS": "repeat",
+ "wrapModeT": "repeat",
+ "minfilter": "linear",
+ "magfilter": "linear",
+ "mipfilter": "none",
+ "anisotropy": 0,
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "a21ec5a7-5e4f-4f85-98b6-7f15b1bc26b8",
+ "visible": false
+ },
+ "ver": "1.0.22",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ }
+ },
+ "userData": {
+ "hasAlpha": true,
+ "type": "texture",
+ "fixAlphaTransparencyArtifacts": false,
+ "redirect": "a21ec5a7-5e4f-4f85-98b6-7f15b1bc26b8@6c48a"
+ }
+}
diff --git a/assets/resources/game/skills/buff/cd_up.atlas b/assets/resources/game/skills/buff/cd_up.atlas
new file mode 100644
index 00000000..4619f055
--- /dev/null
+++ b/assets/resources/game/skills/buff/cd_up.atlas
@@ -0,0 +1,34 @@
+
+cd_up.png
+size: 121,80
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+Icon_Sword02
+ rotate: false
+ xy: 80, 39
+ size: 39, 39
+ orig: 39, 39
+ offset: 0, 0
+ index: -1
+buff_0
+ rotate: false
+ xy: 2, 2
+ size: 76, 76
+ orig: 82, 82
+ offset: 3, 3
+ index: -1
+buff_1_1
+ rotate: false
+ xy: 80, 4
+ size: 29, 33
+ orig: 31, 36
+ offset: 1, 2
+ index: -1
+buff_1_3
+ rotate: false
+ xy: 80, 4
+ size: 29, 33
+ orig: 31, 36
+ offset: 1, 2
+ index: -1
diff --git a/assets/resources/game/skills/buff/cd_up.atlas.meta b/assets/resources/game/skills/buff/cd_up.atlas.meta
new file mode 100644
index 00000000..65aa97a5
--- /dev/null
+++ b/assets/resources/game/skills/buff/cd_up.atlas.meta
@@ -0,0 +1,12 @@
+{
+ "ver": "1.0.1",
+ "importer": "*",
+ "imported": true,
+ "uuid": "60562de8-1fdc-4b61-a8ae-2726aba94a19",
+ "files": [
+ ".atlas",
+ ".json"
+ ],
+ "subMetas": {},
+ "userData": {}
+}
diff --git a/assets/resources/game/skills/buff/cd_up.json b/assets/resources/game/skills/buff/cd_up.json
new file mode 100644
index 00000000..83be2ea3
--- /dev/null
+++ b/assets/resources/game/skills/buff/cd_up.json
@@ -0,0 +1,90 @@
+{
+"skeleton": {
+ "hash": "u1Kcf+EHdtiLrMlOhOSZHtC8gLI=",
+ "spine": "3.8.75",
+ "x": -32.8,
+ "y": -32.21,
+ "width": 65.6,
+ "height": 65.6,
+ "images": "./images/",
+ "audio": ""
+},
+"bones": [
+ { "name": "root", "y": 0.59, "scaleX": 0.8, "scaleY": 0.8 },
+ { "name": "main", "parent": "root", "rotation": 43.44 },
+ { "name": "bone2", "parent": "root", "x": 15.46, "y": -13.96 },
+ { "name": "bone3", "parent": "root", "x": -20.82, "y": 10.06 },
+ { "name": "bone", "parent": "root" }
+],
+"slots": [
+ { "name": "buff_0_1", "bone": "root" },
+ { "name": "buff_0", "bone": "bone", "attachment": "buff_0" },
+ { "name": "buff_1_3", "bone": "bone3", "attachment": "buff_1_3" },
+ { "name": "buff_1_6", "bone": "bone3", "attachment": "buff_1_3", "blend": "screen" },
+ { "name": "buff_1_2", "bone": "main", "attachment": "Icon_Sword02" },
+ { "name": "buff_1_4", "bone": "main", "attachment": "Icon_Sword02", "blend": "screen" },
+ { "name": "buff_1_1", "bone": "bone2", "attachment": "buff_1_1" },
+ { "name": "buff_1_5", "bone": "bone2", "attachment": "buff_1_1", "blend": "screen" }
+],
+"skins": [
+ {
+ "name": "default",
+ "attachments": {
+ "buff_0": {
+ "buff_0": { "width": 82, "height": 82 }
+ },
+ "buff_1_1": {
+ "buff_1_1": { "x": 0.5, "width": 31, "height": 36 }
+ },
+ "buff_1_2": {
+ "Icon_Sword02": { "x": 0.34, "y": 0.36, "rotation": -43.44, "width": 39, "height": 39 }
+ },
+ "buff_1_3": {
+ "buff_1_3": { "x": 0.5, "width": 31, "height": 36 }
+ },
+ "buff_1_4": {
+ "Icon_Sword02": { "x": 0.34, "y": 0.36, "rotation": -43.44, "width": 39, "height": 39 }
+ },
+ "buff_1_5": {
+ "buff_1_1": { "x": 0.5, "width": 31, "height": 36 }
+ },
+ "buff_1_6": {
+ "buff_1_3": { "x": 0.5, "width": 31, "height": 36 }
+ }
+ }
+ }
+],
+"animations": {
+ "loop": {
+ "bones": {
+ "bone2": {
+ "scale": [
+ { "x": 0.929, "y": 0.929, "curve": 0.25, "c3": 0.75 },
+ { "time": 0.2333, "x": 1.073, "y": 1.073, "curve": 0.25, "c3": 0.75 },
+ { "time": 0.4667, "x": 0.929, "y": 0.929, "curve": 0.25, "c3": 0.75 },
+ { "time": 0.7, "x": 1.073, "y": 1.073, "curve": 0.25, "c3": 0.75 },
+ { "time": 0.9333, "x": 0.929, "y": 0.929 }
+ ]
+ },
+ "bone3": {
+ "scale": [
+ { "x": 1.057, "y": 1.057, "curve": 0.38, "c2": 0.53, "c3": 0.745 },
+ { "time": 0.1, "curve": 0.25, "c3": 0.75 },
+ { "time": 0.3333, "x": 1.14, "y": 1.14, "curve": 0.246, "c3": 0.633, "c4": 0.54 },
+ { "time": 0.4667, "x": 1.057, "y": 1.057, "curve": 0.38, "c2": 0.53, "c3": 0.745 },
+ { "time": 0.5667, "curve": 0.25, "c3": 0.75 },
+ { "time": 0.8, "x": 1.14, "y": 1.14, "curve": 0.246, "c3": 0.633, "c4": 0.54 },
+ { "time": 0.9333, "x": 1.057, "y": 1.057 }
+ ]
+ },
+ "root": {
+ "translate": [
+ { "curve": 0.25, "c3": 0.75 },
+ { "time": 0.4667, "y": 4, "curve": 0.25, "c3": 0.75 },
+ { "time": 0.9333 }
+ ]
+ }
+ }
+ }
+}
+}
\ No newline at end of file
diff --git a/assets/resources/game/skills/buff/cd_up.json.meta b/assets/resources/game/skills/buff/cd_up.json.meta
new file mode 100644
index 00000000..488e7379
--- /dev/null
+++ b/assets/resources/game/skills/buff/cd_up.json.meta
@@ -0,0 +1,11 @@
+{
+ "ver": "1.2.6",
+ "importer": "spine-data",
+ "imported": true,
+ "uuid": "3f3890f8-95ab-44e3-92b8-6b144223e1d0",
+ "files": [
+ ".json"
+ ],
+ "subMetas": {},
+ "userData": {}
+}
diff --git a/assets/resources/game/skills/buff/cd_up.png b/assets/resources/game/skills/buff/cd_up.png
new file mode 100644
index 00000000..60db8637
Binary files /dev/null and b/assets/resources/game/skills/buff/cd_up.png differ
diff --git a/assets/resources/game/skills/buff/cd_up.png.meta b/assets/resources/game/skills/buff/cd_up.png.meta
new file mode 100644
index 00000000..be5020ba
--- /dev/null
+++ b/assets/resources/game/skills/buff/cd_up.png.meta
@@ -0,0 +1,42 @@
+{
+ "ver": "1.0.26",
+ "importer": "image",
+ "imported": true,
+ "uuid": "4ca8a5ce-8f45-4560-8a62-9870732e4e23",
+ "files": [
+ ".json",
+ ".png"
+ ],
+ "subMetas": {
+ "6c48a": {
+ "importer": "texture",
+ "uuid": "4ca8a5ce-8f45-4560-8a62-9870732e4e23@6c48a",
+ "displayName": "cd_up",
+ "id": "6c48a",
+ "name": "texture",
+ "userData": {
+ "wrapModeS": "repeat",
+ "wrapModeT": "repeat",
+ "minfilter": "linear",
+ "magfilter": "linear",
+ "mipfilter": "none",
+ "anisotropy": 0,
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "4ca8a5ce-8f45-4560-8a62-9870732e4e23",
+ "visible": false
+ },
+ "ver": "1.0.22",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ }
+ },
+ "userData": {
+ "hasAlpha": true,
+ "type": "texture",
+ "fixAlphaTransparencyArtifacts": false,
+ "redirect": "4ca8a5ce-8f45-4560-8a62-9870732e4e23@6c48a"
+ }
+}
diff --git a/assets/resources/game/skills/buff/crit_up.atlas b/assets/resources/game/skills/buff/crit_up.atlas
new file mode 100644
index 00000000..3ae719be
--- /dev/null
+++ b/assets/resources/game/skills/buff/crit_up.atlas
@@ -0,0 +1,34 @@
+
+crit_up.png
+size: 141,81
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+Icon_Fire02
+ rotate: false
+ xy: 80, 33
+ size: 59, 46
+ orig: 59, 46
+ offset: 0, 0
+ index: -1
+buff_0
+ rotate: false
+ xy: 2, 3
+ size: 76, 76
+ orig: 82, 82
+ offset: 3, 3
+ index: -1
+buff_1_1
+ rotate: true
+ xy: 80, 2
+ size: 29, 33
+ orig: 31, 36
+ offset: 1, 2
+ index: -1
+buff_1_3
+ rotate: true
+ xy: 80, 2
+ size: 29, 33
+ orig: 31, 36
+ offset: 1, 2
+ index: -1
diff --git a/assets/resources/game/skills/buff/crit_up.atlas.meta b/assets/resources/game/skills/buff/crit_up.atlas.meta
new file mode 100644
index 00000000..8e56b0b9
--- /dev/null
+++ b/assets/resources/game/skills/buff/crit_up.atlas.meta
@@ -0,0 +1,12 @@
+{
+ "ver": "1.0.1",
+ "importer": "*",
+ "imported": true,
+ "uuid": "deccfb06-bf4a-4b9e-8e73-031a1f66686f",
+ "files": [
+ ".atlas",
+ ".json"
+ ],
+ "subMetas": {},
+ "userData": {}
+}
diff --git a/assets/resources/game/skills/buff/crit_up.json b/assets/resources/game/skills/buff/crit_up.json
new file mode 100644
index 00000000..fd64e09e
--- /dev/null
+++ b/assets/resources/game/skills/buff/crit_up.json
@@ -0,0 +1,90 @@
+{
+"skeleton": {
+ "hash": "lvs4ZvyHfANnPU4Kp+6e51YupD4=",
+ "spine": "3.8.75",
+ "x": -32.8,
+ "y": -32.8,
+ "width": 65.6,
+ "height": 65.6,
+ "images": "./images/",
+ "audio": ""
+},
+"bones": [
+ { "name": "root", "scaleX": 0.8, "scaleY": 0.8 },
+ { "name": "main", "parent": "root", "rotation": 43.44 },
+ { "name": "bone2", "parent": "root", "x": 15.46, "y": -13.96 },
+ { "name": "bone3", "parent": "root", "x": -20.82, "y": 10.06 },
+ { "name": "bone", "parent": "root" }
+],
+"slots": [
+ { "name": "buff_0_1", "bone": "root" },
+ { "name": "buff_0", "bone": "bone", "attachment": "buff_0" },
+ { "name": "buff_1_3", "bone": "bone3", "attachment": "buff_1_3" },
+ { "name": "buff_1_6", "bone": "bone3", "attachment": "buff_1_3", "blend": "screen" },
+ { "name": "buff_1_2", "bone": "main", "attachment": "Icon_Fire02" },
+ { "name": "buff_1_4", "bone": "main", "attachment": "Icon_Fire02", "blend": "screen" },
+ { "name": "buff_1_1", "bone": "bone2", "attachment": "buff_1_1" },
+ { "name": "buff_1_5", "bone": "bone2", "attachment": "buff_1_1", "blend": "screen" }
+],
+"skins": [
+ {
+ "name": "default",
+ "attachments": {
+ "buff_0": {
+ "buff_0": { "width": 82, "height": 82 }
+ },
+ "buff_1_1": {
+ "buff_1_1": { "x": 0.5, "width": 31, "height": 36 }
+ },
+ "buff_1_2": {
+ "Icon_Fire02": { "x": 0.34, "y": 0.36, "rotation": -43.44, "width": 59, "height": 46 }
+ },
+ "buff_1_3": {
+ "buff_1_3": { "x": 0.5, "width": 31, "height": 36 }
+ },
+ "buff_1_4": {
+ "Icon_Fire02": { "x": 0.34, "y": 0.36, "rotation": -43.44, "width": 59, "height": 46 }
+ },
+ "buff_1_5": {
+ "buff_1_1": { "x": 0.5, "width": 31, "height": 36 }
+ },
+ "buff_1_6": {
+ "buff_1_3": { "x": 0.5, "width": 31, "height": 36 }
+ }
+ }
+ }
+],
+"animations": {
+ "loop": {
+ "bones": {
+ "bone2": {
+ "scale": [
+ { "x": 0.929, "y": 0.929, "curve": 0.25, "c3": 0.75 },
+ { "time": 0.2333, "x": 1.073, "y": 1.073, "curve": 0.25, "c3": 0.75 },
+ { "time": 0.4667, "x": 0.929, "y": 0.929, "curve": 0.25, "c3": 0.75 },
+ { "time": 0.7, "x": 1.073, "y": 1.073, "curve": 0.25, "c3": 0.75 },
+ { "time": 0.9333, "x": 0.929, "y": 0.929 }
+ ]
+ },
+ "bone3": {
+ "scale": [
+ { "x": 1.057, "y": 1.057, "curve": 0.38, "c2": 0.53, "c3": 0.745 },
+ { "time": 0.1, "curve": 0.25, "c3": 0.75 },
+ { "time": 0.3333, "x": 1.14, "y": 1.14, "curve": 0.246, "c3": 0.633, "c4": 0.54 },
+ { "time": 0.4667, "x": 1.057, "y": 1.057, "curve": 0.38, "c2": 0.53, "c3": 0.745 },
+ { "time": 0.5667, "curve": 0.25, "c3": 0.75 },
+ { "time": 0.8, "x": 1.14, "y": 1.14, "curve": 0.246, "c3": 0.633, "c4": 0.54 },
+ { "time": 0.9333, "x": 1.057, "y": 1.057 }
+ ]
+ },
+ "root": {
+ "translate": [
+ { "curve": 0.25, "c3": 0.75 },
+ { "time": 0.4667, "y": 4, "curve": 0.25, "c3": 0.75 },
+ { "time": 0.9333 }
+ ]
+ }
+ }
+ }
+}
+}
\ No newline at end of file
diff --git a/assets/resources/game/skills/buff/crit_up.json.meta b/assets/resources/game/skills/buff/crit_up.json.meta
new file mode 100644
index 00000000..ec249f38
--- /dev/null
+++ b/assets/resources/game/skills/buff/crit_up.json.meta
@@ -0,0 +1,11 @@
+{
+ "ver": "1.2.6",
+ "importer": "spine-data",
+ "imported": true,
+ "uuid": "10f1c534-e608-4b93-b5ef-9167d6a511b2",
+ "files": [
+ ".json"
+ ],
+ "subMetas": {},
+ "userData": {}
+}
diff --git a/assets/resources/game/skills/buff/crit_up.png b/assets/resources/game/skills/buff/crit_up.png
new file mode 100644
index 00000000..31266dbc
Binary files /dev/null and b/assets/resources/game/skills/buff/crit_up.png differ
diff --git a/assets/resources/game/skills/buff/crit_up.png.meta b/assets/resources/game/skills/buff/crit_up.png.meta
new file mode 100644
index 00000000..d73f08bd
--- /dev/null
+++ b/assets/resources/game/skills/buff/crit_up.png.meta
@@ -0,0 +1,42 @@
+{
+ "ver": "1.0.26",
+ "importer": "image",
+ "imported": true,
+ "uuid": "430eda2a-27f2-41ff-a2c7-bd67d699ea0f",
+ "files": [
+ ".json",
+ ".png"
+ ],
+ "subMetas": {
+ "6c48a": {
+ "importer": "texture",
+ "uuid": "430eda2a-27f2-41ff-a2c7-bd67d699ea0f@6c48a",
+ "displayName": "crit_up",
+ "id": "6c48a",
+ "name": "texture",
+ "userData": {
+ "wrapModeS": "repeat",
+ "wrapModeT": "repeat",
+ "minfilter": "linear",
+ "magfilter": "linear",
+ "mipfilter": "none",
+ "anisotropy": 0,
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "430eda2a-27f2-41ff-a2c7-bd67d699ea0f",
+ "visible": false
+ },
+ "ver": "1.0.22",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ }
+ },
+ "userData": {
+ "hasAlpha": true,
+ "type": "texture",
+ "fixAlphaTransparencyArtifacts": false,
+ "redirect": "430eda2a-27f2-41ff-a2c7-bd67d699ea0f@6c48a"
+ }
+}
diff --git a/assets/resources/game/skills/buff/def_up.atlas b/assets/resources/game/skills/buff/def_up.atlas
new file mode 100644
index 00000000..509aca63
--- /dev/null
+++ b/assets/resources/game/skills/buff/def_up.atlas
@@ -0,0 +1,34 @@
+
+def_up.png
+size: 135,88
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+Icon_Shield
+ rotate: false
+ xy: 80, 33
+ size: 53, 53
+ orig: 53, 53
+ offset: 0, 0
+ index: -1
+buff_0
+ rotate: false
+ xy: 2, 10
+ size: 76, 76
+ orig: 82, 82
+ offset: 3, 3
+ index: -1
+buff_1_1
+ rotate: true
+ xy: 80, 2
+ size: 29, 33
+ orig: 31, 36
+ offset: 1, 2
+ index: -1
+buff_1_3
+ rotate: true
+ xy: 80, 2
+ size: 29, 33
+ orig: 31, 36
+ offset: 1, 2
+ index: -1
diff --git a/assets/resources/game/skills/buff/def_up.atlas.meta b/assets/resources/game/skills/buff/def_up.atlas.meta
new file mode 100644
index 00000000..a9e0f387
--- /dev/null
+++ b/assets/resources/game/skills/buff/def_up.atlas.meta
@@ -0,0 +1,12 @@
+{
+ "ver": "1.0.1",
+ "importer": "*",
+ "imported": true,
+ "uuid": "5522dff4-e8bb-4a1c-bbee-42499400066a",
+ "files": [
+ ".atlas",
+ ".json"
+ ],
+ "subMetas": {},
+ "userData": {}
+}
diff --git a/assets/resources/game/skills/buff/def_up.json b/assets/resources/game/skills/buff/def_up.json
new file mode 100644
index 00000000..3c2f9a4a
--- /dev/null
+++ b/assets/resources/game/skills/buff/def_up.json
@@ -0,0 +1,90 @@
+{
+"skeleton": {
+ "hash": "dH6pKhTB/o05k6Za95T509y6ka4=",
+ "spine": "3.8.75",
+ "x": -32.8,
+ "y": -32.8,
+ "width": 65.6,
+ "height": 65.6,
+ "images": "./images/",
+ "audio": ""
+},
+"bones": [
+ { "name": "root", "scaleX": 0.8, "scaleY": 0.8 },
+ { "name": "main", "parent": "root", "rotation": 43.44 },
+ { "name": "bone2", "parent": "root", "x": 15.46, "y": -13.96 },
+ { "name": "bone3", "parent": "root", "x": -20.82, "y": 10.06 },
+ { "name": "bone", "parent": "root" }
+],
+"slots": [
+ { "name": "buff_0_1", "bone": "root" },
+ { "name": "buff_0", "bone": "bone", "attachment": "buff_0" },
+ { "name": "buff_1_3", "bone": "bone3", "attachment": "buff_1_3" },
+ { "name": "buff_1_6", "bone": "bone3", "attachment": "buff_1_3", "blend": "screen" },
+ { "name": "buff_1_2", "bone": "main", "attachment": "Icon_Shield" },
+ { "name": "buff_1_4", "bone": "main", "attachment": "Icon_Shield", "blend": "screen" },
+ { "name": "buff_1_1", "bone": "bone2", "attachment": "buff_1_1" },
+ { "name": "buff_1_5", "bone": "bone2", "attachment": "buff_1_1", "blend": "screen" }
+],
+"skins": [
+ {
+ "name": "default",
+ "attachments": {
+ "buff_0": {
+ "buff_0": { "width": 82, "height": 82 }
+ },
+ "buff_1_1": {
+ "buff_1_1": { "x": 0.5, "width": 31, "height": 36 }
+ },
+ "buff_1_2": {
+ "Icon_Shield": { "x": 0.34, "y": 0.36, "rotation": -43.44, "width": 53, "height": 53 }
+ },
+ "buff_1_3": {
+ "buff_1_3": { "x": 0.5, "width": 31, "height": 36 }
+ },
+ "buff_1_4": {
+ "Icon_Shield": { "x": 0.34, "y": 0.36, "rotation": -43.44, "width": 53, "height": 53 }
+ },
+ "buff_1_5": {
+ "buff_1_1": { "x": 0.5, "width": 31, "height": 36 }
+ },
+ "buff_1_6": {
+ "buff_1_3": { "x": 0.5, "width": 31, "height": 36 }
+ }
+ }
+ }
+],
+"animations": {
+ "loop": {
+ "bones": {
+ "bone2": {
+ "scale": [
+ { "x": 0.929, "y": 0.929, "curve": 0.25, "c3": 0.75 },
+ { "time": 0.2333, "x": 1.073, "y": 1.073, "curve": 0.25, "c3": 0.75 },
+ { "time": 0.4667, "x": 0.929, "y": 0.929, "curve": 0.25, "c3": 0.75 },
+ { "time": 0.7, "x": 1.073, "y": 1.073, "curve": 0.25, "c3": 0.75 },
+ { "time": 0.9333, "x": 0.929, "y": 0.929 }
+ ]
+ },
+ "bone3": {
+ "scale": [
+ { "x": 1.057, "y": 1.057, "curve": 0.38, "c2": 0.53, "c3": 0.745 },
+ { "time": 0.1, "curve": 0.25, "c3": 0.75 },
+ { "time": 0.3333, "x": 1.14, "y": 1.14, "curve": 0.246, "c3": 0.633, "c4": 0.54 },
+ { "time": 0.4667, "x": 1.057, "y": 1.057, "curve": 0.38, "c2": 0.53, "c3": 0.745 },
+ { "time": 0.5667, "curve": 0.25, "c3": 0.75 },
+ { "time": 0.8, "x": 1.14, "y": 1.14, "curve": 0.246, "c3": 0.633, "c4": 0.54 },
+ { "time": 0.9333, "x": 1.057, "y": 1.057 }
+ ]
+ },
+ "root": {
+ "translate": [
+ { "curve": 0.25, "c3": 0.75 },
+ { "time": 0.4667, "y": 4, "curve": 0.25, "c3": 0.75 },
+ { "time": 0.9333 }
+ ]
+ }
+ }
+ }
+}
+}
\ No newline at end of file
diff --git a/assets/resources/game/skills/buff/def_up.json.meta b/assets/resources/game/skills/buff/def_up.json.meta
new file mode 100644
index 00000000..4ff11f54
--- /dev/null
+++ b/assets/resources/game/skills/buff/def_up.json.meta
@@ -0,0 +1,11 @@
+{
+ "ver": "1.2.6",
+ "importer": "spine-data",
+ "imported": true,
+ "uuid": "4c5cb1cc-5985-4ebe-918c-61fd50774b2f",
+ "files": [
+ ".json"
+ ],
+ "subMetas": {},
+ "userData": {}
+}
diff --git a/assets/resources/game/skills/buff/def_up.png b/assets/resources/game/skills/buff/def_up.png
new file mode 100644
index 00000000..ef6db68e
Binary files /dev/null and b/assets/resources/game/skills/buff/def_up.png differ
diff --git a/assets/resources/game/skills/buff/def_up.png.meta b/assets/resources/game/skills/buff/def_up.png.meta
new file mode 100644
index 00000000..72a69290
--- /dev/null
+++ b/assets/resources/game/skills/buff/def_up.png.meta
@@ -0,0 +1,42 @@
+{
+ "ver": "1.0.26",
+ "importer": "image",
+ "imported": true,
+ "uuid": "a15784ea-b7aa-4a7f-a3c5-6214416b0c07",
+ "files": [
+ ".json",
+ ".png"
+ ],
+ "subMetas": {
+ "6c48a": {
+ "importer": "texture",
+ "uuid": "a15784ea-b7aa-4a7f-a3c5-6214416b0c07@6c48a",
+ "displayName": "def_up",
+ "id": "6c48a",
+ "name": "texture",
+ "userData": {
+ "wrapModeS": "repeat",
+ "wrapModeT": "repeat",
+ "minfilter": "linear",
+ "magfilter": "linear",
+ "mipfilter": "none",
+ "anisotropy": 0,
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "a15784ea-b7aa-4a7f-a3c5-6214416b0c07",
+ "visible": false
+ },
+ "ver": "1.0.22",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ }
+ },
+ "userData": {
+ "hasAlpha": true,
+ "type": "texture",
+ "fixAlphaTransparencyArtifacts": false,
+ "redirect": "a15784ea-b7aa-4a7f-a3c5-6214416b0c07@6c48a"
+ }
+}
diff --git a/assets/resources/game/skills/dead.prefab b/assets/resources/game/skills/dead.prefab
index 80295298..5d4e5ca1 100644
--- a/assets/resources/game/skills/dead.prefab
+++ b/assets/resources/game/skills/dead.prefab
@@ -52,8 +52,8 @@
},
"_lscale": {
"__type__": "cc.Vec3",
- "x": 0.5,
- "y": 0.5,
+ "x": 1,
+ "y": 1,
"z": 1
},
"_mobility": 0,
diff --git a/assets/resources/game/skills/heath/buff_3.atlas b/assets/resources/game/skills/heath/buff_3.atlas
new file mode 100644
index 00000000..05e27b08
--- /dev/null
+++ b/assets/resources/game/skills/heath/buff_3.atlas
@@ -0,0 +1,48 @@
+
+buff_3.png
+size: 300,275
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+BUFF/buff/1/baodian3
+ rotate: false
+ xy: 2, 86
+ size: 187, 187
+ orig: 205, 205
+ offset: 9, 9
+ index: -1
+BUFF/buff/1/hfgq_0
+ rotate: false
+ xy: 2, 18
+ size: 243, 66
+ orig: 400, 400
+ offset: 79, 152
+ index: -1
+BUFF/buff/1/hfgt_0
+ rotate: true
+ xy: 2, 2
+ size: 14, 133
+ orig: 400, 400
+ offset: 193, 134
+ index: -1
+BUFF/buff/1/jiahao
+ rotate: false
+ xy: 191, 226
+ size: 45, 47
+ orig: 45, 47
+ offset: 0, 0
+ index: -1
+BUFF/buff/1/lt_0
+ rotate: false
+ xy: 247, 11
+ size: 51, 262
+ orig: 400, 400
+ offset: 189, 69
+ index: -1
+BUFF/buff/1/star2
+ rotate: false
+ xy: 191, 182
+ size: 39, 42
+ orig: 39, 42
+ offset: 0, 0
+ index: -1
diff --git a/assets/resources/game/skills/heath/buff_3.atlas.meta b/assets/resources/game/skills/heath/buff_3.atlas.meta
new file mode 100644
index 00000000..10ec81a6
--- /dev/null
+++ b/assets/resources/game/skills/heath/buff_3.atlas.meta
@@ -0,0 +1,12 @@
+{
+ "ver": "1.0.1",
+ "importer": "*",
+ "imported": true,
+ "uuid": "9b5b6140-ba94-4204-9b20-d71a91abb287",
+ "files": [
+ ".atlas",
+ ".json"
+ ],
+ "subMetas": {},
+ "userData": {}
+}
diff --git a/assets/resources/game/skills/heath/buff_3.json b/assets/resources/game/skills/heath/buff_3.json
new file mode 100644
index 00000000..78c5d3f0
--- /dev/null
+++ b/assets/resources/game/skills/heath/buff_3.json
@@ -0,0 +1,380 @@
+{
+"skeleton": {
+ "hash": "EbXEScNLje0TiSOzlAPeSiBc2pQ=",
+ "spine": "3.8.75",
+ "x": -85.26,
+ "y": -78.87,
+ "width": 187.07,
+ "height": 208.83,
+ "images": "./images/",
+ "audio": ""
+},
+"bones": [
+ { "name": "root", "rotation": -0.03 },
+ { "name": "all", "parent": "root", "y": -62.2, "scaleX": 0.4, "scaleY": 0.4 },
+ { "name": "bone2", "parent": "all", "y": 158.43, "color": "24ff00ff" },
+ { "name": "bd", "parent": "root", "y": 55.48, "scaleX": 0.7263, "scaleY": 0.7263 },
+ { "name": "all2", "parent": "all", "x": 101.57, "y": 216.94, "scaleX": 0.7643, "scaleY": 0.7643 },
+ { "name": "all3", "parent": "all", "x": -88.03, "y": 215.31, "scaleX": 0.6106, "scaleY": 0.6106 },
+ { "name": "lt1", "parent": "all", "x": -60.93, "y": 176.71, "scaleX": 0.7001, "scaleY": 0.7001 },
+ { "name": "lt2", "parent": "all", "x": -4.31, "y": 146.54, "scaleX": 0.7001, "scaleY": 0.9049 },
+ { "name": "lt3", "parent": "all", "x": 52.98, "y": 172, "scaleX": 0.7001, "scaleY": 0.7593 },
+ { "name": "all4", "parent": "all", "x": -103.68, "y": 216.41, "color": "39ff00ff" },
+ {
+ "name": "all5",
+ "parent": "all",
+ "x": 88.68,
+ "y": 190.01,
+ "scaleX": 0.809,
+ "scaleY": 0.809,
+ "color": "39ff00ff"
+ },
+ {
+ "name": "all6",
+ "parent": "all",
+ "x": 120.02,
+ "y": 235.09,
+ "scaleX": 0.5614,
+ "scaleY": 0.5614,
+ "color": "39ff00ff"
+ },
+ {
+ "name": "all7",
+ "parent": "all",
+ "x": 20.32,
+ "y": 325.43,
+ "scaleX": 0.6012,
+ "scaleY": 0.6012,
+ "color": "39ff00ff"
+ },
+ { "name": "all8", "parent": "all", "x": 349.65, "y": 257.04, "scaleX": 0.4, "scaleY": 0.4 },
+ { "name": "all9", "parent": "all", "x": 389.75, "y": 257.04, "scaleX": 0.3, "scaleY": 0.3 },
+ { "name": "all10", "parent": "all", "x": 68.38, "y": 154.57, "scaleX": 0.5, "scaleY": 0.5 },
+ { "name": "all11", "parent": "all", "x": -44.31, "y": 154.09, "scaleX": 0.5, "scaleY": 0.5 }
+],
+"slots": [
+ { "name": "BUFF/buff/1/baodian3", "bone": "bd", "color": "ffffff00", "attachment": "BUFF/buff/1/baodian3", "blend": "additive" },
+ { "name": "BUFF/buff/1/hfgt_0", "bone": "all2", "color": "000000ff", "attachment": "BUFF/buff/1/hfgt_0", "blend": "additive" },
+ { "name": "BUFF/buff/1/hfgt_1", "bone": "all3", "color": "ffffff00", "attachment": "BUFF/buff/1/hfgt_0", "blend": "additive" },
+ { "name": "BUFF/buff/1/hfgq_0", "bone": "bone2", "color": "ffffff00", "attachment": "BUFF/buff/1/hfgq_0", "blend": "additive" },
+ { "name": "BUFF/buff/1/lt_0", "bone": "lt1", "color": "fffc0000", "attachment": "BUFF/buff/1/lt_0", "blend": "additive" },
+ { "name": "BUFF/buff/1/lt_1", "bone": "lt2", "color": "fffc0000", "attachment": "BUFF/buff/1/lt_0", "blend": "additive" },
+ { "name": "BUFF/buff/1/lt_2", "bone": "lt3", "color": "fffc0000", "attachment": "BUFF/buff/1/lt_0", "blend": "additive" },
+ { "name": "BUFF/buff/1/jiahao", "bone": "all4", "color": "ffffff00", "attachment": "BUFF/buff/1/jiahao" },
+ { "name": "BUFF/buff/1/jiahao2", "bone": "all5", "color": "ffffff00", "attachment": "BUFF/buff/1/jiahao" },
+ { "name": "BUFF/buff/1/jiahao3", "bone": "all6", "color": "ffffff00", "attachment": "BUFF/buff/1/jiahao" },
+ { "name": "BUFF/buff/1/jiahao4", "bone": "all7", "color": "ffffff00", "attachment": "BUFF/buff/1/jiahao" },
+ { "name": "BUFF/buff/1/star2", "bone": "all8", "color": "ffffff00", "attachment": "BUFF/buff/1/star2", "blend": "additive" },
+ { "name": "BUFF/buff/1/star3", "bone": "all9", "color": "ffffff00", "attachment": "BUFF/buff/1/star2", "blend": "additive" },
+ { "name": "BUFF/buff/1/star4", "bone": "all10", "color": "ffffff00", "attachment": "BUFF/buff/1/star2", "blend": "additive" },
+ { "name": "BUFF/buff/1/star5", "bone": "all11", "color": "ffffff00", "attachment": "BUFF/buff/1/star2", "blend": "additive" },
+ { "name": "1", "bone": "root" },
+ { "name": "2", "bone": "root" }
+],
+"path": [
+ {
+ "name": "1",
+ "bones": [ "all8" ],
+ "target": "1"
+ },
+ {
+ "name": "2",
+ "order": 1,
+ "bones": [ "all9" ],
+ "target": "2"
+ }
+],
+"skins": [
+ {
+ "name": "default",
+ "attachments": {
+ "BUFF/buff/1/jiahao2": {
+ "BUFF/buff/1/jiahao": { "y": 0.5, "width": 45, "height": 47 }
+ },
+ "BUFF/buff/1/jiahao3": {
+ "BUFF/buff/1/jiahao": { "y": 0.5, "width": 45, "height": 47 }
+ },
+ "BUFF/buff/1/jiahao4": {
+ "BUFF/buff/1/jiahao": { "y": 0.5, "width": 45, "height": 47 }
+ },
+ "BUFF/buff/1/star3": {
+ "BUFF/buff/1/star2": { "x": 0.5, "width": 39, "height": 42 }
+ },
+ "BUFF/buff/1/star4": {
+ "BUFF/buff/1/star2": { "x": 0.5, "width": 39, "height": 42 }
+ },
+ "BUFF/buff/1/star5": {
+ "BUFF/buff/1/star2": { "x": 0.5, "width": 39, "height": 42 }
+ },
+ "BUFF/buff/1/baodian3": {
+ "BUFF/buff/1/baodian3": { "width": 205, "height": 205 }
+ },
+ "BUFF/buff/1/lt_0": {
+ "BUFF/buff/1/lt_0": { "x": -17.39, "y": 131.99, "width": 400, "height": 400 }
+ },
+ "BUFF/buff/1/lt_1": {
+ "BUFF/buff/1/lt_0": { "x": -17.39, "y": 145.29, "width": 400, "height": 400 }
+ },
+ "BUFF/buff/1/lt_2": {
+ "BUFF/buff/1/lt_0": { "x": -17.39, "y": 131.99, "width": 400, "height": 400 }
+ },
+ "BUFF/buff/1/jiahao": {
+ "BUFF/buff/1/jiahao": { "y": 0.5, "width": 45, "height": 47 }
+ },
+ "BUFF/buff/1/hfgq_0": {
+ "BUFF/buff/1/hfgq_0": { "width": 400, "height": 400 }
+ },
+ "BUFF/buff/1/star2": {
+ "BUFF/buff/1/star2": { "x": 0.5, "width": 39, "height": 42 }
+ },
+ "BUFF/buff/1/hfgt_0": {
+ "BUFF/buff/1/hfgt_0": { "width": 400, "height": 400 }
+ },
+ "BUFF/buff/1/hfgt_1": {
+ "BUFF/buff/1/hfgt_0": { "width": 400, "height": 400 }
+ }
+ }
+ }
+],
+"animations": {
+ "show": {
+ "slots": {
+ "BUFF/buff/1/hfgt_1": {
+ "color": [
+ { "color": "ffffff65", "curve": "stepped" },
+ { "time": 0.3333, "color": "ffffff65" },
+ { "time": 0.6, "color": "ffffff00" }
+ ]
+ },
+ "BUFF/buff/1/jiahao2": {
+ "color": [
+ { "time": 0.3333, "color": "ffffff00" },
+ { "time": 0.5, "color": "ffffffff", "curve": "stepped" },
+ { "time": 0.6667, "color": "ffffffff" },
+ { "time": 1, "color": "ffffff00" }
+ ]
+ },
+ "BUFF/buff/1/hfgq_0": {
+ "color": [
+ { "color": "ffffff00", "curve": 0.25, "c4": 0.88 },
+ { "time": 0.3333, "color": "ffffffff", "curve": 0.25, "c3": 0.75 },
+ { "time": 0.8333, "color": "ffffff00" }
+ ]
+ },
+ "BUFF/buff/1/star4": {
+ "color": [
+ { "color": "ffffffff" }
+ ]
+ },
+ "BUFF/buff/1/star5": {
+ "color": [
+ { "color": "ffffffff" }
+ ]
+ },
+ "BUFF/buff/1/jiahao3": {
+ "color": [
+ { "color": "ffffff00" },
+ { "time": 0.1667, "color": "ffffffff", "curve": "stepped" },
+ { "time": 0.3333, "color": "ffffffff" },
+ { "time": 0.6667, "color": "ffffff00" }
+ ]
+ },
+ "BUFF/buff/1/lt_1": {
+ "color": [
+ { "time": 0.1667, "color": "fffc0095", "curve": "stepped" },
+ { "time": 0.5, "color": "fffc0095" },
+ { "time": 0.8333, "color": "fffc0000" }
+ ]
+ },
+ "BUFF/buff/1/lt_0": {
+ "color": [
+ { "color": "fffc0095", "curve": "stepped" },
+ { "time": 0.3333, "color": "fffc0095" },
+ { "time": 0.6667, "color": "fffc0000" }
+ ]
+ },
+ "BUFF/buff/1/hfgt_0": {
+ "color": [
+ { "time": 0.4333, "color": "ffffff00" },
+ { "time": 0.6, "color": "ffffff79", "curve": "stepped" },
+ { "time": 0.8667, "color": "ffffff79" },
+ { "time": 1.1, "color": "ffffff00" }
+ ]
+ },
+ "BUFF/buff/1/baodian3": {
+ "color": [
+ { "color": "ffffff00", "curve": 0.25, "c3": 0.75 },
+ { "time": 0.2333, "color": "ffffff5f", "curve": 0.25, "c3": 0.75 },
+ { "time": 0.6, "color": "ffffff4f", "curve": 0.25, "c3": 0.75 },
+ { "time": 0.9333, "color": "ffffff00" }
+ ]
+ },
+ "BUFF/buff/1/star2": {
+ "color": [
+ { "color": "ffffffff", "curve": "stepped" },
+ { "time": 0.6667, "color": "ffffffff" },
+ { "time": 1, "color": "ffffff00" }
+ ]
+ },
+ "BUFF/buff/1/star3": {
+ "color": [
+ { "color": "ffffffff" }
+ ]
+ },
+ "BUFF/buff/1/jiahao": {
+ "color": [
+ { "time": 0.1, "color": "ffffff00" },
+ { "time": 0.2667, "color": "ffffffff", "curve": "stepped" },
+ { "time": 0.4333, "color": "ffffffff" },
+ { "time": 0.7667, "color": "ffffff00" }
+ ]
+ },
+ "BUFF/buff/1/lt_2": {
+ "color": [
+ { "time": 0.3333, "color": "fffc0095", "curve": "stepped" },
+ { "time": 0.6667, "color": "fffc0095" },
+ { "time": 1, "color": "fffc0000" }
+ ]
+ },
+ "BUFF/buff/1/jiahao4": {
+ "color": [
+ { "time": 0.1667, "color": "ffffff00" },
+ { "time": 0.3333, "color": "ffffffff", "curve": "stepped" },
+ { "time": 0.5, "color": "ffffffff" },
+ { "time": 0.8333, "color": "ffffff00" }
+ ]
+ }
+ },
+ "bones": {
+ "bone2": {
+ "translate": [
+ { "y": 1.94 }
+ ],
+ "scale": [
+ { "x": 0.3, "y": 0.3, "curve": 0, "c2": 0.8, "c3": 0.75 },
+ { "time": 0.8333 }
+ ]
+ },
+ "all2": {
+ "translate": [
+ { "time": 0.4333, "curve": 0.126, "c2": 0.16, "c3": 0.75 },
+ { "time": 1.1, "y": 45.87 }
+ ]
+ },
+ "all3": {
+ "translate": [
+ { "y": 13.54 },
+ { "time": 0.6, "y": 55.27 }
+ ]
+ },
+ "all4": {
+ "translate": [
+ { "time": 0.1, "curve": 0.104, "c2": 0.15, "c3": 0 },
+ { "time": 0.7667, "y": 109.04 }
+ ],
+ "scale": [
+ { "time": 0.1, "x": 0.8, "y": 0.8 },
+ { "time": 0.2667 }
+ ]
+ },
+ "all5": {
+ "translate": [
+ { "time": 0.3333, "curve": 0.104, "c2": 0.15, "c3": 0.363 },
+ { "time": 1, "y": 109.04 }
+ ],
+ "scale": [
+ { "time": 0.3333, "x": 0.8, "y": 0.8 },
+ { "time": 0.5 }
+ ]
+ },
+ "all6": {
+ "translate": [
+ { "curve": 0.104, "c2": 0.15, "c3": 0.385 },
+ { "time": 0.6667, "y": 109.04 }
+ ],
+ "scale": [
+ { "x": 0.8, "y": 0.8 },
+ { "time": 0.1667 }
+ ]
+ },
+ "all7": {
+ "translate": [
+ { "time": 0.1667, "curve": 0.104, "c2": 0.15, "c3": 0.314 },
+ { "time": 0.8333, "y": 109.04 }
+ ],
+ "scale": [
+ { "time": 0.1667, "x": 0.8, "y": 0.8 },
+ { "time": 0.3333 }
+ ]
+ },
+ "lt1": {
+ "scale": [
+ { "x": 1.086, "y": 0.343, "curve": 0.111, "c2": 0.14, "c3": 0.75 },
+ { "time": 0.3333, "x": 0.337, "y": 1.034 },
+ { "time": 0.6667, "x": 0, "y": 1.034 }
+ ]
+ },
+ "lt2": {
+ "scale": [
+ { "time": 0.1667, "x": 1.055, "y": 0.316, "curve": 0.111, "c2": 0.14, "c3": 0.75 },
+ { "time": 0.5, "x": 0.337, "y": 1.034 },
+ { "time": 0.8333, "x": 0, "y": 1.034 }
+ ]
+ },
+ "lt3": {
+ "scale": [
+ { "time": 0.3333, "x": 0.984, "y": 0.493, "curve": 0.111, "c2": 0.14, "c3": 0.75 },
+ { "time": 0.6667, "x": 0.233, "y": 1.237 },
+ { "time": 1, "x": 0, "y": 1.034 }
+ ]
+ },
+ "all8": {
+ "scale": [
+ { "time": 0.3333 },
+ { "time": 1, "x": 0, "y": 0 }
+ ]
+ },
+ "all9": {
+ "scale": [
+ { "time": 0.5 },
+ { "time": 1, "x": 0, "y": 0 }
+ ]
+ },
+ "all10": {
+ "translate": [
+ { "time": 0.1, "curve": 0.111, "c2": 0.16, "c3": 0.75 },
+ { "time": 0.7667, "x": 54.69, "y": 52.01 }
+ ],
+ "scale": [
+ { "time": 0.2667 },
+ { "time": 0.7667, "x": 0, "y": 0 }
+ ]
+ },
+ "all11": {
+ "translate": [
+ { "time": 0.1, "curve": 0.111, "c2": 0.16, "c3": 0.75 },
+ { "time": 0.7667, "x": -31.26, "y": 41.99 }
+ ],
+ "scale": [
+ { "time": 0.2667, "x": 0.565, "y": 0.565 },
+ { "time": 0.7667, "x": 0, "y": 0 }
+ ]
+ }
+ },
+ "path": {
+ "1": {
+ "position": [
+ {},
+ { "time": 1, "position": 1 }
+ ]
+ },
+ "2": {
+ "position": [
+ { "time": 0.1667 },
+ { "time": 1.1667, "position": 1 }
+ ]
+ }
+ }
+ }
+}
+}
\ No newline at end of file
diff --git a/assets/resources/game/skills/heath/buff_3.json.meta b/assets/resources/game/skills/heath/buff_3.json.meta
new file mode 100644
index 00000000..5db91294
--- /dev/null
+++ b/assets/resources/game/skills/heath/buff_3.json.meta
@@ -0,0 +1,11 @@
+{
+ "ver": "1.2.6",
+ "importer": "spine-data",
+ "imported": true,
+ "uuid": "767d0128-62fa-4398-882a-1f79f30ac5f7",
+ "files": [
+ ".json"
+ ],
+ "subMetas": {},
+ "userData": {}
+}
diff --git a/assets/resources/game/skills/heath/buff_3.png b/assets/resources/game/skills/heath/buff_3.png
new file mode 100644
index 00000000..53ad9987
Binary files /dev/null and b/assets/resources/game/skills/heath/buff_3.png differ
diff --git a/assets/resources/game/skills/heath/buff_3.png.meta b/assets/resources/game/skills/heath/buff_3.png.meta
new file mode 100644
index 00000000..508463e5
--- /dev/null
+++ b/assets/resources/game/skills/heath/buff_3.png.meta
@@ -0,0 +1,42 @@
+{
+ "ver": "1.0.26",
+ "importer": "image",
+ "imported": true,
+ "uuid": "edb6b86d-9b49-4f9b-95fd-66310ca59f4e",
+ "files": [
+ ".json",
+ ".png"
+ ],
+ "subMetas": {
+ "6c48a": {
+ "importer": "texture",
+ "uuid": "edb6b86d-9b49-4f9b-95fd-66310ca59f4e@6c48a",
+ "displayName": "buff_3",
+ "id": "6c48a",
+ "name": "texture",
+ "userData": {
+ "wrapModeS": "repeat",
+ "wrapModeT": "repeat",
+ "minfilter": "linear",
+ "magfilter": "linear",
+ "mipfilter": "none",
+ "anisotropy": 0,
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "edb6b86d-9b49-4f9b-95fd-66310ca59f4e",
+ "visible": false
+ },
+ "ver": "1.0.22",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ }
+ },
+ "userData": {
+ "hasAlpha": true,
+ "type": "texture",
+ "fixAlphaTransparencyArtifacts": false,
+ "redirect": "edb6b86d-9b49-4f9b-95fd-66310ca59f4e@6c48a"
+ }
+}
diff --git a/assets/resources/game/skills/heathed.prefab b/assets/resources/game/skills/heathed.prefab
index 59093114..c29a43fc 100644
--- a/assets/resources/game/skills/heathed.prefab
+++ b/assets/resources/game/skills/heathed.prefab
@@ -20,16 +20,19 @@
"_children": [
{
"__id__": 2
+ },
+ {
+ "__id__": 10
}
],
"_active": true,
"_components": [
{
- "__id__": 10
+ "__id__": 16
}
],
"_prefab": {
- "__id__": 12
+ "__id__": 18
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -51,7 +54,7 @@
"z": 1
},
"_mobility": 0,
- "_layer": 1073741824,
+ "_layer": 1,
"_euler": {
"__type__": "cc.Vec3",
"x": 0,
@@ -69,7 +72,7 @@
"__id__": 1
},
"_children": [],
- "_active": true,
+ "_active": false,
"_components": [
{
"__id__": 3
@@ -104,7 +107,7 @@
"z": 1
},
"_mobility": 0,
- "_layer": 1073741824,
+ "_layer": 1,
"_euler": {
"__type__": "cc.Vec3",
"x": 0,
@@ -228,6 +231,142 @@
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
+ {
+ "__type__": "cc.Node",
+ "_name": "anm",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 1
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 11
+ },
+ {
+ "__id__": 13
+ }
+ ],
+ "_prefab": {
+ "__id__": 15
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": -6.767,
+ "y": -40.599,
+ "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__": 10
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 12
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 187.07000732421875,
+ "height": 208.8300018310547
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.45576521514997775,
+ "y": 0.37767563115949476
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "a5/hl0+N9OUb944a49zzKF"
+ },
+ {
+ "__type__": "sp.Skeleton",
+ "_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
+ },
+ "_skeletonData": {
+ "__uuid__": "767d0128-62fa-4398-882a-1f79f30ac5f7",
+ "__expectedType__": "sp.SkeletonData"
+ },
+ "defaultSkin": "default",
+ "defaultAnimation": "show",
+ "_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": "8fL0GfHp5NgI1lAzpAcih3"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "87+cbUTwZOXIIFCkVHG/aJ",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
{
"__type__": "cc.UITransform",
"_name": "",
@@ -238,7 +377,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 11
+ "__id__": 17
},
"_contentSize": {
"__type__": "cc.Size",
diff --git a/assets/resources/game/skills/max.prefab b/assets/resources/game/skills/max.prefab
index 0443b955..d13ff5ba 100644
--- a/assets/resources/game/skills/max.prefab
+++ b/assets/resources/game/skills/max.prefab
@@ -20,19 +20,22 @@
"_children": [
{
"__id__": 2
+ },
+ {
+ "__id__": 8
}
],
"_active": true,
"_components": [
{
- "__id__": 8
+ "__id__": 14
},
{
- "__id__": 10
+ "__id__": 16
}
],
"_prefab": {
- "__id__": 12
+ "__id__": 18
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -72,7 +75,7 @@
"__id__": 1
},
"_children": [],
- "_active": true,
+ "_active": false,
"_components": [
{
"__id__": 3
@@ -127,8 +130,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 64,
- "height": 48
+ "width": 84,
+ "height": 50
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -199,6 +202,142 @@
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
+ {
+ "__type__": "cc.Node",
+ "_name": "anm",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 1
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 9
+ },
+ {
+ "__id__": 11
+ }
+ ],
+ "_prefab": {
+ "__id__": 13
+ },
+ "_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__": 8
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 10
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 100,
+ "height": 100
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "3c/cqhm69LxrUeWFQsrPv+"
+ },
+ {
+ "__type__": "sp.Skeleton",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 8
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 12
+ },
+ "_customMaterial": null,
+ "_srcBlendFactor": 2,
+ "_dstBlendFactor": 4,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
+ },
+ "_skeletonData": {
+ "__uuid__": "3ad5c35e-0872-46d6-a974-561ada3589d8",
+ "__expectedType__": "sp.SkeletonData"
+ },
+ "defaultSkin": "default",
+ "defaultAnimation": "loop",
+ "_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": "93Y91kgfdDlLRx8EM4EtbQ"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "bcO0Hg1dJN6ZtgtSNpygqs",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
{
"__type__": "cc.UITransform",
"_name": "",
@@ -209,7 +348,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 9
+ "__id__": 15
},
"_contentSize": {
"__type__": "cc.Size",
@@ -237,7 +376,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 11
+ "__id__": 17
},
"playOnLoad": true,
"_clips": [
diff --git a/assets/resources/game/skills/shield.prefab b/assets/resources/game/skills/shield.prefab
index c997f2bf..b3987f40 100644
--- a/assets/resources/game/skills/shield.prefab
+++ b/assets/resources/game/skills/shield.prefab
@@ -24,6 +24,9 @@
],
"_active": true,
"_components": [
+ {
+ "__id__": 6
+ },
{
"__id__": 8
},
@@ -35,13 +38,10 @@
},
{
"__id__": 14
- },
- {
- "__id__": 16
}
],
"_prefab": {
- "__id__": 18
+ "__id__": 16
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -85,13 +85,10 @@
"_components": [
{
"__id__": 3
- },
- {
- "__id__": 5
}
],
"_prefab": {
- "__id__": 7
+ "__id__": 5
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -150,51 +147,6 @@
"__type__": "cc.CompPrefabInfo",
"fileId": "b4sNQPJWFKha7x75SWXmRj"
},
- {
- "__type__": "cc.Sprite",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 2
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 6
- },
- "_customMaterial": null,
- "_srcBlendFactor": 2,
- "_dstBlendFactor": 4,
- "_color": {
- "__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
- "a": 255
- },
- "_spriteFrame": {
- "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@103fd",
- "__expectedType__": "cc.SpriteFrame"
- },
- "_type": 0,
- "_fillType": 0,
- "_sizeMode": 0,
- "_fillCenter": {
- "__type__": "cc.Vec2",
- "x": 0,
- "y": 0
- },
- "_fillStart": 0,
- "_fillRange": 0,
- "_isTrimmedMode": true,
- "_useGrayscale": false,
- "_atlas": null,
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "9a+65VIghBm4HQxuHPQ/mg"
- },
{
"__type__": "cc.PrefabInfo",
"root": {
@@ -218,7 +170,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 9
+ "__id__": 7
},
"_contentSize": {
"__type__": "cc.Size",
@@ -246,7 +198,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 11
+ "__id__": 9
},
"enabledContactListener": true,
"bullet": true,
@@ -280,7 +232,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 13
+ "__id__": 11
},
"tag": 8,
"_group": 4,
@@ -314,7 +266,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 15
+ "__id__": 13
},
"_id": ""
},
@@ -332,7 +284,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 17
+ "__id__": 15
},
"playOnLoad": false,
"_clips": [
diff --git a/assets/resources/game/skills/shielded.prefab b/assets/resources/game/skills/shielded.prefab
index c889d3ca..e771023b 100644
--- a/assets/resources/game/skills/shielded.prefab
+++ b/assets/resources/game/skills/shielded.prefab
@@ -54,7 +54,7 @@
"z": 1
},
"_mobility": 0,
- "_layer": 1073741824,
+ "_layer": 1,
"_euler": {
"__type__": "cc.Vec3",
"x": 0,
@@ -107,7 +107,7 @@
"z": 1
},
"_mobility": 0,
- "_layer": 1073741824,
+ "_layer": 1,
"_euler": {
"__type__": "cc.Vec3",
"x": 0,
diff --git a/assets/resources/gui/gui.plist b/assets/resources/gui/gui.plist
index 5f9383e9..d41c1f7d 100644
--- a/assets/resources/gui/gui.plist
+++ b/assets/resources/gui/gui.plist
@@ -17,7 +17,7 @@
spriteSourceSize
{30,30}
textureRect
- {{1701,1564},{30,30}}
+ {{1681,811},{30,30}}
textureRotated
@@ -34,7 +34,7 @@
spriteSourceSize
{389,124}
textureRect
- {{1,1107},{365,100}}
+ {{248,1},{365,100}}
textureRotated
@@ -51,9 +51,9 @@
spriteSourceSize
{32,34}
textureRect
- {{1665,1571},{32,34}}
+ {{1035,269},{32,34}}
textureRotated
-
+
BorderFrame_Squrare_Inner.png
@@ -68,7 +68,7 @@
spriteSourceSize
{27,27}
textureRect
- {{428,832},{27,27}}
+ {{568,640},{27,27}}
textureRotated
@@ -85,7 +85,7 @@
spriteSourceSize
{125,122}
textureRect
- {{844,445},{125,122}}
+ {{985,629},{125,122}}
textureRotated
@@ -102,9 +102,9 @@
spriteSourceSize
{125,122}
textureRect
- {{346,1108},{125,122}}
+ {{1491,1},{125,122}}
textureRotated
-
+
BubbleFrame01_Hexagon_Bg_Yellow.png
@@ -119,9 +119,9 @@
spriteSourceSize
{125,122}
textureRect
- {{327,1232},{125,122}}
+ {{1413,357},{125,122}}
textureRotated
-
+
Button01_l_Blue.png
@@ -136,9 +136,9 @@
spriteSourceSize
{80,142}
textureRect
- {{603,1062},{80,142}}
+ {{489,271},{80,142}}
textureRotated
-
+
Button01_l_Gray.png
@@ -153,9 +153,9 @@
spriteSourceSize
{80,142}
textureRect
- {{685,1053},{80,142}}
+ {{633,271},{80,142}}
textureRotated
-
+
Button01_l_Green.png
@@ -170,7 +170,7 @@
spriteSourceSize
{80,142}
textureRect
- {{1329,165},{80,142}}
+ {{777,271},{80,142}}
textureRotated
@@ -187,7 +187,7 @@
spriteSourceSize
{80,142}
textureRect
- {{1102,428},{80,142}}
+ {{671,970},{80,142}}
textureRotated
@@ -204,7 +204,7 @@
spriteSourceSize
{80,142}
textureRect
- {{603,1206},{80,142}}
+ {{753,950},{80,142}}
textureRotated
@@ -221,9 +221,9 @@
spriteSourceSize
{70,114}
textureRect
- {{962,784},{70,114}}
+ {{1857,495},{70,114}}
textureRotated
-
+
Button01_s_Green.png
@@ -238,9 +238,9 @@
spriteSourceSize
{70,114}
textureRect
- {{1626,616},{70,114}}
+ {{1929,533},{70,114}}
textureRotated
-
+
Button01_s_Mint.png
@@ -255,7 +255,7 @@
spriteSourceSize
{70,114}
textureRect
- {{1202,806},{70,114}}
+ {{1929,605},{70,114}}
textureRotated
@@ -272,7 +272,7 @@
spriteSourceSize
{70,114}
textureRect
- {{1626,732},{70,114}}
+ {{1856,611},{70,114}}
textureRotated
@@ -289,7 +289,7 @@
spriteSourceSize
{70,114}
textureRect
- {{994,986},{70,114}}
+ {{1928,677},{70,114}}
textureRotated
@@ -306,9 +306,9 @@
spriteSourceSize
{70,114}
textureRect
- {{1200,1091},{70,114}}
+ {{1856,727},{70,114}}
textureRotated
-
+
Button_Circle122.png
@@ -323,9 +323,9 @@
spriteSourceSize
{120,122}
textureRect
- {{1589,47},{120,122}}
+ {{1316,1292},{120,122}}
textureRotated
-
+
Button_Circle82.png
@@ -340,9 +340,9 @@
spriteSourceSize
{80,82}
textureRect
- {{1698,796},{80,82}}
+ {{1274,1080},{80,82}}
textureRotated
-
+
Button_Round01_Yellow.png
@@ -357,7 +357,7 @@
spriteSourceSize
{94,197}
textureRect
- {{1211,49},{94,197}}
+ {{643,755},{94,197}}
textureRotated
@@ -374,9 +374,9 @@
spriteSourceSize
{94,96}
textureRect
- {{1110,984},{94,96}}
+ {{1946,107},{94,96}}
textureRotated
-
+
Button_SkillBtn_White_Bg.png
@@ -391,9 +391,9 @@
spriteSourceSize
{128,106}
textureRect
- {{473,1194},{128,106}}
+ {{1015,1163},{128,106}}
textureRotated
-
+
Button_Tapered_Yellow.png
@@ -408,7 +408,7 @@
spriteSourceSize
{185,194}
textureRect
- {{617,555},{185,194}}
+ {{739,754},{185,194}}
textureRotated
@@ -425,7 +425,7 @@
spriteSourceSize
{84,84}
textureRect
- {{862,1530},{84,84}}
+ {{646,668},{84,84}}
textureRotated
@@ -442,7 +442,7 @@
spriteSourceSize
{226,226}
textureRect
- {{200,832},{226,226}}
+ {{1059,1},{226,226}}
textureRotated
@@ -459,7 +459,7 @@
spriteSourceSize
{68,7}
textureRect
- {{1316,1290},{68,7}}
+ {{680,954},{68,7}}
textureRotated
@@ -476,9 +476,9 @@
spriteSourceSize
{29,38}
textureRect
- {{1749,1219},{29,38}}
+ {{1755,811},{29,38}}
textureRotated
-
+
GradeIcon_Gem_On.png
@@ -493,9 +493,9 @@
spriteSourceSize
{29,38}
textureRect
- {{1749,1259},{29,38}}
+ {{1795,811},{29,38}}
textureRotated
-
+
Icon_Badge01.png
@@ -510,7 +510,7 @@
spriteSourceSize
{83,88}
textureRect
- {{710,1327},{83,88}}
+ {{468,670},{83,88}}
textureRotated
@@ -527,7 +527,7 @@
spriteSourceSize
{55,59}
textureRect
- {{1680,1400},{55,59}}
+ {{761,1356},{55,59}}
textureRotated
@@ -544,9 +544,9 @@
spriteSourceSize
{74,79}
textureRect
- {{616,1412},{74,79}}
+ {{392,674},{74,79}}
textureRotated
-
+
Icon_Badge03_Yellow.png
@@ -561,9 +561,9 @@
spriteSourceSize
{74,79}
textureRect
- {{697,1412},{74,79}}
+ {{969,1082},{74,79}}
textureRotated
-
+
Icon_Castle.png
@@ -578,9 +578,9 @@
spriteSourceSize
{123,101}
textureRect
- {{1589,171},{123,101}}
+ {{882,629},{123,101}}
textureRotated
-
+
Icon_Check03_s.png
@@ -595,7 +595,7 @@
spriteSourceSize
{55,51}
textureRect
- {{1608,1550},{55,51}}
+ {{1802,228},{55,51}}
textureRotated
@@ -612,9 +612,9 @@
spriteSourceSize
{84,66}
textureRect
- {{458,1420},{84,66}}
+ {{732,668},{84,66}}
textureRotated
-
+
Icon_GradeBadge_Beginner.Png
@@ -629,7 +629,7 @@
spriteSourceSize
{128,128}
textureRect
- {{800,1313},{104,102}}
+ {{1637,707},{104,102}}
textureRotated
@@ -646,7 +646,7 @@
spriteSourceSize
{128,128}
textureRect
- {{1006,1424},{96,104}}
+ {{1946,1},{96,104}}
textureRotated
@@ -663,9 +663,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1329,47},{128,116}}
+ {{1200,495},{128,116}}
textureRotated
-
+
Icon_GradeBadge_Diamond.Png
@@ -680,7 +680,7 @@
spriteSourceSize
{128,128}
textureRect
- {{685,1197},{128,102}}
+ {{1123,1163},{128,102}}
textureRotated
@@ -697,9 +697,9 @@
spriteSourceSize
{128,128}
textureRect
- {{832,770},{128,100}}
+ {{1331,1162},{128,100}}
textureRotated
-
+
Icon_GradeBadge_Grandmaster.Png
@@ -714,9 +714,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1459,47},{128,116}}
+ {{1123,753},{128,116}}
textureRotated
-
+
Icon_GradeBadge_Iron.Png
@@ -731,7 +731,7 @@
spriteSourceSize
{128,128}
textureRect
- {{767,1053},{128,102}}
+ {{1208,950},{128,102}}
textureRotated
@@ -748,7 +748,7 @@
spriteSourceSize
{128,128}
textureRect
- {{789,1183},{128,106}}
+ {{1100,950},{128,106}}
textureRotated
@@ -765,9 +765,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1078,698},{124,100}}
+ {{1416,484},{124,100}}
textureRotated
-
+
Icon_GradeBadge_Silver.Png
@@ -782,7 +782,7 @@
spriteSourceSize
{128,128}
textureRect
- {{1079,572},{124,104}}
+ {{1615,1},{124,104}}
textureRotated
@@ -799,9 +799,9 @@
spriteSourceSize
{105,93}
textureRect
- {{1299,558},{105,93}}
+ {{1794,1131},{105,93}}
textureRotated
-
+
Icon_Helmet.png
@@ -816,9 +816,9 @@
spriteSourceSize
{117,109}
textureRect
- {{1206,980},{117,109}}
+ {{1721,1},{117,109}}
textureRotated
-
+
Icon_Leaf_Left.png
@@ -833,9 +833,9 @@
spriteSourceSize
{50,67}
textureRect
- {{1325,1048},{50,67}}
+ {{1694,467},{50,67}}
textureRotated
-
+
Icon_Leaf_Right.png
@@ -850,9 +850,9 @@
spriteSourceSize
{50,65}
textureRect
- {{1626,1220},{50,65}}
+ {{1273,883},{50,65}}
textureRotated
-
+
Icon_Lock02.png
@@ -867,7 +867,7 @@
spriteSourceSize
{83,86}
textureRect
- {{1306,665},{83,86}}
+ {{558,670},{83,86}}
textureRotated
@@ -884,7 +884,7 @@
spriteSourceSize
{71,93}
textureRect
- {{948,1530},{71,93}}
+ {{1400,877},{71,93}}
textureRotated
@@ -901,9 +901,9 @@
spriteSourceSize
{75,76}
textureRect
- {{1325,970},{75,76}}
+ {{1859,119},{75,76}}
textureRotated
-
+
Icon_Sword01.png
@@ -918,7 +918,7 @@
spriteSourceSize
{108,110}
textureRect
- {{1524,867},{108,110}}
+ {{1746,699},{108,110}}
textureRotated
@@ -935,7 +935,7 @@
spriteSourceSize
{78,77}
textureRect
- {{1269,1533},{78,77}}
+ {{889,1084},{78,77}}
textureRotated
@@ -952,9 +952,9 @@
spriteSourceSize
{64,73}
textureRect
- {{1714,143},{64,73}}
+ {{1325,883},{64,73}}
textureRotated
-
+
Image_Bagde_Wing1.png
@@ -969,9 +969,9 @@
spriteSourceSize
{268,225}
textureRect
- {{941,49},{268,225}}
+ {{489,1},{268,225}}
textureRotated
-
+
Image_Bagde_Wing2.png
@@ -986,9 +986,9 @@
spriteSourceSize
{148,114}
textureRect
- {{196,1108},{148,114}}
+ {{555,978},{148,114}}
textureRotated
-
+
Image_Chest01.png
@@ -1003,9 +1003,9 @@
spriteSourceSize
{619,350}
textureRect
- {{1,1},{619,350}}
+ {{1,755},{619,350}}
textureRotated
-
+
Image_Chest05.png
@@ -1020,7 +1020,7 @@
spriteSourceSize
{752,197}
textureRect
- {{1,353},{752,197}}
+ {{1,1},{752,197}}
textureRotated
@@ -1037,7 +1037,7 @@
spriteSourceSize
{270,275}
textureRect
- {{200,555},{270,275}}
+ {{538,363},{270,275}}
textureRotated
@@ -1054,9 +1054,9 @@
spriteSourceSize
{60,122}
textureRect
- {{870,986},{60,122}}
+ {{1442,610},{60,122}}
textureRotated
-
+
ItemFrame01_Single_Green.png
@@ -1071,7 +1071,7 @@
spriteSourceSize
{60,122}
textureRect
- {{1524,375},{60,122}}
+ {{1451,734},{60,122}}
textureRotated
@@ -1088,7 +1088,7 @@
spriteSourceSize
{60,122}
textureRect
- {{1524,499},{60,122}}
+ {{1504,610},{60,122}}
textureRotated
@@ -1105,7 +1105,7 @@
spriteSourceSize
{60,122}
textureRect
- {{1712,502},{60,122}}
+ {{1513,734},{60,122}}
textureRotated
@@ -1122,9 +1122,9 @@
spriteSourceSize
{60,122}
textureRect
- {{1078,800},{60,122}}
+ {{1518,484},{60,122}}
textureRotated
-
+
ItemFrame01_Single_Red.png
@@ -1139,9 +1139,9 @@
spriteSourceSize
{60,122}
textureRect
- {{586,1350},{60,122}}
+ {{1566,608},{60,122}}
textureRotated
-
+
ItemFrame01_Single_Yellow.png
@@ -1156,7 +1156,7 @@
spriteSourceSize
{60,122}
textureRect
- {{1006,1300},{60,122}}
+ {{1575,732},{60,122}}
textureRotated
@@ -1173,9 +1173,9 @@
spriteSourceSize
{60,62}
textureRect
- {{1316,1100},{60,62}}
+ {{995,886},{60,62}}
textureRotated
-
+
ItemFrame02_Single_Gray.png
@@ -1190,9 +1190,9 @@
spriteSourceSize
{60,62}
textureRect
- {{1317,1162},{60,62}}
+ {{1728,1190},{60,62}}
textureRotated
-
+
ItemFrame02_Single_Green.png
@@ -1207,9 +1207,9 @@
spriteSourceSize
{60,62}
textureRect
- {{1317,1226},{60,62}}
+ {{1901,1169},{60,62}}
textureRotated
-
+
ItemFrame02_Single_Navy.png
@@ -1224,9 +1224,9 @@
spriteSourceSize
{60,62}
textureRect
- {{1484,1475},{60,62}}
+ {{1965,1169},{60,62}}
textureRotated
-
+
ItemFrame02_Single_OffWhite.png
@@ -1241,9 +1241,9 @@
spriteSourceSize
{60,62}
textureRect
- {{1484,1539},{60,62}}
+ {{1792,1226},{60,62}}
textureRotated
-
+
ItemFrame02_Single_Red.png
@@ -1258,7 +1258,7 @@
spriteSourceSize
{60,62}
textureRect
- {{1631,1272},{60,62}}
+ {{1760,1288},{60,62}}
textureRotated
@@ -1275,9 +1275,9 @@
spriteSourceSize
{60,62}
textureRect
- {{1616,1336},{60,62}}
+ {{1760,1352},{60,62}}
textureRotated
-
+
ItemFrame03_Single_Blue.png
@@ -1292,9 +1292,9 @@
spriteSourceSize
{128,130}
textureRect
- {{196,1358},{128,130}}
+ {{810,497},{128,130}}
textureRotated
-
+
ItemFrame03_Single_Gray.png
@@ -1309,7 +1309,7 @@
spriteSourceSize
{128,130}
textureRect
- {{132,1488},{128,130}}
+ {{940,497},{128,130}}
textureRotated
@@ -1326,7 +1326,7 @@
spriteSourceSize
{128,130}
textureRect
- {{262,1488},{128,130}}
+ {{941,363},{128,130}}
textureRotated
@@ -1343,7 +1343,7 @@
spriteSourceSize
{128,130}
textureRect
- {{328,1356},{128,130}}
+ {{926,754},{128,130}}
textureRotated
@@ -1360,7 +1360,7 @@
spriteSourceSize
{128,130}
textureRect
- {{392,1488},{128,130}}
+ {{1070,495},{128,130}}
textureRotated
@@ -1377,7 +1377,7 @@
spriteSourceSize
{128,130}
textureRect
- {{473,1062},{128,130}}
+ {{1071,363},{128,130}}
textureRotated
@@ -1394,7 +1394,7 @@
spriteSourceSize
{128,128}
textureRect
- {{1524,979},{108,108}}
+ {{1802,1021},{108,108}}
textureRotated
@@ -1411,9 +1411,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1586,390},{124,112}}
+ {{1112,627},{124,112}}
textureRotated
-
+
ItemIcon_Bag_Brown.Png
@@ -1428,7 +1428,7 @@
spriteSourceSize
{128,128}
textureRect
- {{1402,1011},{110,104}}
+ {{1694,843},{110,104}}
textureRotated
@@ -1445,7 +1445,7 @@
spriteSourceSize
{128,128}
textureRect
- {{1514,1089},{110,104}}
+ {{1928,749},{110,104}}
textureRotated
@@ -1462,7 +1462,7 @@
spriteSourceSize
{128,128}
textureRect
- {{897,1172},{128,100}}
+ {{1312,950},{128,100}}
textureRotated
@@ -1479,7 +1479,7 @@
spriteSourceSize
{128,128}
textureRect
- {{1473,165},{100,114}}
+ {{1625,127},{100,114}}
textureRotated
@@ -1496,9 +1496,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1524,751},{100,114}}
+ {{1930,431},{100,114}}
textureRotated
-
+
ItemIcon_Calendar.Png
@@ -1513,9 +1513,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1422,787},{100,110}}
+ {{1806,919},{100,110}}
textureRotated
-
+
ItemIcon_Calendar_Check.Png
@@ -1530,9 +1530,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1422,899},{100,110}}
+ {{1918,961},{100,110}}
textureRotated
-
+
ItemIcon_Chat.Png
@@ -1547,9 +1547,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1473,267},{114,106}}
+ {{1937,203},{114,106}}
textureRotated
-
+
ItemIcon_Dungeon.Png
@@ -1564,7 +1564,7 @@
spriteSourceSize
{128,128}
textureRect
- {{1151,308},{118,100}}
+ {{1537,355},{118,100}}
textureRotated
@@ -1581,7 +1581,7 @@
spriteSourceSize
{128,128}
textureRect
- {{617,751},{120,108}}
+ {{1069,253},{120,108}}
textureRotated
@@ -1598,7 +1598,7 @@
spriteSourceSize
{128,128}
textureRect
- {{1184,428},{128,102}}
+ {{1227,1162},{128,102}}
textureRotated
@@ -1615,9 +1615,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1586,504},{110,124}}
+ {{1474,229},{110,124}}
textureRotated
-
+
ItemIcon_Gear_Armor_Bottom.Png
@@ -1632,9 +1632,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1253,308},{118,114}}
+ {{958,1297},{118,114}}
textureRotated
-
+
ItemIcon_Gear_Boots.Png
@@ -1649,7 +1649,7 @@
spriteSourceSize
{128,128}
textureRect
- {{1589,274},{122,114}}
+ {{834,1297},{122,114}}
textureRotated
@@ -1666,9 +1666,9 @@
spriteSourceSize
{128,128}
textureRect
- {{738,872},{128,112}}
+ {{1201,361},{128,112}}
textureRotated
-
+
ItemIcon_Gear_Ring.Png
@@ -1683,7 +1683,7 @@
spriteSourceSize
{128,128}
textureRect
- {{898,1420},{108,106}}
+ {{1652,1284},{108,106}}
textureRotated
@@ -1700,7 +1700,7 @@
spriteSourceSize
{128,128}
textureRect
- {{1626,1108},{110,110}}
+ {{1934,319},{110,110}}
textureRotated
@@ -1717,9 +1717,9 @@
spriteSourceSize
{128,128}
textureRect
- {{906,1302},{116,98}}
+ {{1287,129},{116,98}}
textureRotated
-
+
ItemIcon_Gem_Ellipse_Red.Png
@@ -1734,7 +1734,7 @@
spriteSourceSize
{128,128}
textureRect
- {{964,690},{92,112}}
+ {{921,269},{92,112}}
textureRotated
@@ -1751,9 +1751,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1104,1415},{114,98}}
+ {{1405,129},{114,98}}
textureRotated
-
+
ItemIcon_Key_Gold.png
@@ -1768,7 +1768,7 @@
spriteSourceSize
{128,128}
textureRect
- {{963,572},{114,116}}
+ {{1516,949},{114,116}}
textureRotated
@@ -1785,9 +1785,9 @@
spriteSourceSize
{128,128}
textureRect
- {{778,1417},{118,100}}
+ {{1586,229},{118,100}}
textureRotated
-
+
ItemIcon_Map.Png
@@ -1802,7 +1802,7 @@
spriteSourceSize
{128,128}
textureRect
- {{1204,1415},{116,108}}
+ {{1746,581},{116,108}}
textureRotated
@@ -1819,9 +1819,9 @@
spriteSourceSize
{128,128}
textureRect
- {{871,1048},{122,118}}
+ {{1078,1293},{122,118}}
textureRotated
-
+
ItemIcon_Medal_Bronze_1.png
@@ -1836,7 +1836,7 @@
spriteSourceSize
{128,128}
textureRect
- {{1204,678},{100,126}}
+ {{1414,950},{100,126}}
textureRotated
@@ -1853,7 +1853,7 @@
spriteSourceSize
{128,128}
textureRect
- {{1524,623},{100,126}}
+ {{1535,1157},{100,126}}
textureRotated
@@ -1870,9 +1870,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1187,878},{100,126}}
+ {{1550,1285},{100,126}}
textureRotated
-
+
ItemIcon_Medal_Gold_2.png
@@ -1887,7 +1887,7 @@
spriteSourceSize
{128,128}
textureRect
- {{999,1172},{100,126}}
+ {{1287,1},{100,126}}
textureRotated
@@ -1904,7 +1904,7 @@
spriteSourceSize
{128,128}
textureRect
- {{1101,1173},{100,126}}
+ {{1389,1},{100,126}}
textureRotated
@@ -1921,7 +1921,7 @@
spriteSourceSize
{128,128}
textureRect
- {{656,1488},{100,126}}
+ {{1372,229},{100,126}}
textureRotated
@@ -1938,7 +1938,7 @@
spriteSourceSize
{128,128}
textureRect
- {{1288,428},{128,104}}
+ {{1241,753},{128,104}}
textureRotated
@@ -1955,7 +1955,7 @@
spriteSourceSize
{128,128}
textureRect
- {{1304,1299},{102,114}}
+ {{1753,347},{102,114}}
textureRotated
@@ -1972,7 +1972,7 @@
spriteSourceSize
{128,128}
textureRect
- {{1077,862},{108,120}}
+ {{1440,1292},{108,120}}
textureRotated
@@ -1989,9 +1989,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1394,375},{128,112}}
+ {{1258,229},{128,112}}
textureRotated
-
+
ItemIcon_Shop.Png
@@ -2006,9 +2006,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1314,1415},{116,106}}
+ {{1741,120},{116,106}}
textureRotated
-
+
ItemIcon_Skull.png
@@ -2023,7 +2023,7 @@
spriteSourceSize
{128,128}
textureRect
- {{1369,247},{126,102}}
+ {{1347,749},{126,102}}
textureRotated
@@ -2040,9 +2040,9 @@
spriteSourceSize
{128,128}
textureRect
- {{991,1058},{116,112}}
+ {{1632,949},{116,112}}
textureRotated
-
+
ItemIcon_Star_Bronze.Png
@@ -2057,7 +2057,7 @@
spriteSourceSize
{128,128}
textureRect
- {{1203,1163},{116,112}}
+ {{1580,475},{116,112}}
textureRotated
@@ -2074,9 +2074,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1068,1301},{116,112}}
+ {{1639,349},{116,112}}
textureRotated
-
+
ItemIcon_Star_Purple.Png
@@ -2091,9 +2091,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1186,1301},{116,112}}
+ {{1688,229},{116,112}}
textureRotated
-
+
ItemIcon_Star_Red.Png
@@ -2108,9 +2108,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1634,880},{116,112}}
+ {{1832,1},{116,112}}
textureRotated
-
+
ItemIcon_Star_Silver.Png
@@ -2125,7 +2125,7 @@
spriteSourceSize
{128,128}
textureRect
- {{1634,994},{116,112}}
+ {{1628,593},{116,112}}
textureRotated
@@ -2142,7 +2142,7 @@
spriteSourceSize
{128,128}
textureRect
- {{1185,558},{112,118}}
+ {{1202,1293},{112,118}}
textureRotated
@@ -2159,9 +2159,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1394,489},{128,100}}
+ {{1433,1162},{128,100}}
textureRotated
-
+
ItemIcon_Ticket_Red.Png
@@ -2176,9 +2176,9 @@
spriteSourceSize
{128,128}
textureRect
- {{458,1302},{126,116}}
+ {{1226,625},{126,116}}
textureRotated
-
+
ItemIcon_Trophy_Bronze.Png
@@ -2193,9 +2193,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1394,591},{128,96}}
+ {{1315,359},{128,96}}
textureRotated
-
+
ItemIcon_Trophy_Gold.Png
@@ -2210,7 +2210,7 @@
spriteSourceSize
{128,128}
textureRect
- {{979,856},{128,96}}
+ {{1318,489},{128,96}}
textureRotated
@@ -2227,9 +2227,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1394,689},{128,96}}
+ {{1344,619},{128,96}}
textureRotated
-
+
ItemIcon_Video.Png
@@ -2244,9 +2244,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1408,1117},{104,110}}
+ {{1920,855},{104,110}}
textureRotated
-
+
Label_Badge01_Green.png
@@ -2261,7 +2261,7 @@
spriteSourceSize
{129,132}
textureRect
- {{1,1474},{129,132}}
+ {{753,1163},{129,132}}
textureRotated
@@ -2278,7 +2278,7 @@
spriteSourceSize
{129,132}
textureRect
- {{196,1224},{129,132}}
+ {{884,1163},{129,132}}
textureRotated
@@ -2295,7 +2295,7 @@
spriteSourceSize
{129,132}
textureRect
- {{832,569},{129,132}}
+ {{835,950},{129,132}}
textureRotated
@@ -2312,7 +2312,7 @@
spriteSourceSize
{129,132}
textureRect
- {{971,428},{129,132}}
+ {{810,363},{129,132}}
textureRotated
@@ -2329,7 +2329,7 @@
spriteSourceSize
{99,102}
textureRect
- {{758,1519},{99,102}}
+ {{1521,128},{99,102}}
textureRotated
@@ -2346,7 +2346,7 @@
spriteSourceSize
{80,80}
textureRect
- {{1187,1533},{80,80}}
+ {{1358,1080},{80,80}}
textureRotated
@@ -2363,7 +2363,7 @@
spriteSourceSize
{80,83}
textureRect
- {{1698,626},{80,83}}
+ {{800,668},{80,83}}
textureRotated
@@ -2380,9 +2380,9 @@
spriteSourceSize
{80,83}
textureRect
- {{1698,711},{80,83}}
+ {{1189,1080},{80,83}}
textureRotated
-
+
MenuIcon_Armor.png
@@ -2397,7 +2397,7 @@
spriteSourceSize
{71,70}
textureRect
- {{1487,1339},{71,70}}
+ {{1857,423},{71,70}}
textureRotated
@@ -2414,7 +2414,7 @@
spriteSourceSize
{63,67}
textureRect
- {{1711,78},{63,67}}
+ {{1659,1067},{63,67}}
textureRotated
@@ -2431,9 +2431,9 @@
spriteSourceSize
{73,58}
textureRect
- {{1043,1530},{73,58}}
+ {{1859,264},{73,58}}
textureRotated
-
+
MenuIcon_Ring.png
@@ -2448,7 +2448,7 @@
spriteSourceSize
{66,70}
textureRect
- {{544,1420},{66,70}}
+ {{1848,843},{66,70}}
textureRotated
@@ -2465,9 +2465,9 @@
spriteSourceSize
{65,70}
textureRect
- {{1713,281},{65,70}}
+ {{1130,883},{65,70}}
textureRotated
-
+
MenuIcon_Sword.png
@@ -2482,9 +2482,9 @@
spriteSourceSize
{65,69}
textureRect
- {{1713,353},{65,69}}
+ {{1202,883},{65,69}}
textureRotated
-
+
Option_icon.png
@@ -2499,7 +2499,7 @@
spriteSourceSize
{42,43}
textureRect
- {{1587,1288},{42,43}}
+ {{1637,811},{42,43}}
textureRotated
@@ -2516,7 +2516,7 @@
spriteSourceSize
{60,62}
textureRect
- {{1678,1336},{60,62}}
+ {{1822,1288},{60,62}}
textureRotated
@@ -2533,9 +2533,9 @@
spriteSourceSize
{33,34}
textureRect
- {{1665,1535},{33,34}}
+ {{598,1128},{33,34}}
textureRotated
-
+
ResourceBar_Single_Btn_Purple1.png
@@ -2550,9 +2550,9 @@
spriteSourceSize
{60,62}
textureRect
- {{1550,1411},{60,62}}
+ {{1824,1352},{60,62}}
textureRotated
-
+
ResourceBar_Single_Btn_Purple2.png
@@ -2567,7 +2567,7 @@
spriteSourceSize
{33,34}
textureRect
- {{1742,1518},{33,34}}
+ {{634,1128},{33,34}}
textureRotated
@@ -2584,7 +2584,7 @@
spriteSourceSize
{60,62}
textureRect
- {{1546,1475},{60,62}}
+ {{1884,1288},{60,62}}
textureRotated
@@ -2601,7 +2601,7 @@
spriteSourceSize
{33,34}
textureRect
- {{1701,1529},{33,34}}
+ {{670,1128},{33,34}}
textureRotated
@@ -2618,9 +2618,9 @@
spriteSourceSize
{67,75}
textureRect
- {{1711,1},{67,75}}
+ {{812,1094},{67,75}}
textureRotated
-
+
ResourceBar_Single_Icon_Energy.png
@@ -2635,9 +2635,9 @@
spriteSourceSize
{57,79}
textureRect
- {{1422,1410},{57,79}}
+ {{753,1297},{57,79}}
textureRotated
-
+
ResourceBar_Single_Icon_Gem.png
@@ -2652,9 +2652,9 @@
spriteSourceSize
{77,69}
textureRect
- {{1408,1339},{77,69}}
+ {{1588,1067},{77,69}}
textureRotated
-
+
ResourceBar_White_Btn1.png
@@ -2669,9 +2669,9 @@
spriteSourceSize
{60,62}
textureRect
- {{1546,1539},{60,62}}
+ {{1888,1352},{60,62}}
textureRotated
-
+
ResourceBar_White_Icon1.png
@@ -2686,7 +2686,7 @@
spriteSourceSize
{28,28}
textureRect
- {{1749,1299},{28,28}}
+ {{538,640},{28,28}}
textureRotated
@@ -2703,7 +2703,7 @@
spriteSourceSize
{39,40}
textureRect
- {{1738,1108},{39,40}}
+ {{1806,842},{39,40}}
textureRotated
@@ -2720,9 +2720,9 @@
spriteSourceSize
{35,39}
textureRect
- {{1664,1494},{35,39}}
+ {{706,1126},{35,39}}
textureRotated
-
+
RoleIcon_Bow.png
@@ -2737,9 +2737,9 @@
spriteSourceSize
{33,36}
textureRect
- {{1588,1253},{33,36}}
+ {{313,1376},{33,36}}
textureRotated
-
+
RoleIcon_Hat.png
@@ -2754,7 +2754,7 @@
spriteSourceSize
{39,34}
textureRect
- {{1701,1493},{39,34}}
+ {{1806,883},{39,34}}
textureRotated
@@ -2771,7 +2771,7 @@
spriteSourceSize
{37,35}
textureRect
- {{1741,1398},{37,35}}
+ {{747,1126},{37,35}}
textureRotated
@@ -2788,9 +2788,9 @@
spriteSourceSize
{30,39}
textureRect
- {{1634,848},{30,39}}
+ {{1035,305},{30,39}}
textureRotated
-
+
RoleIcon_Lightning.png
@@ -2805,7 +2805,7 @@
spriteSourceSize
{29,40}
textureRect
- {{1738,1188},{29,40}}
+ {{1713,811},{29,40}}
textureRotated
@@ -2822,7 +2822,7 @@
spriteSourceSize
{33,41}
textureRect
- {{422,1062},{33,41}}
+ {{555,1128},{33,41}}
textureRotated
@@ -2839,7 +2839,7 @@
spriteSourceSize
{37,40}
textureRect
- {{1738,1149},{37,40}}
+ {{811,629},{37,40}}
textureRotated
@@ -2856,9 +2856,9 @@
spriteSourceSize
{36,40}
textureRect
- {{1742,1435},{36,40}}
+ {{230,1376},{36,40}}
textureRotated
-
+
RoleIcon_Sword.png
@@ -2873,9 +2873,9 @@
spriteSourceSize
{36,39}
textureRect
- {{1742,1477},{36,39}}
+ {{272,1376},{36,39}}
textureRotated
-
+
Rounded Rectangle 1029 copy 10.png
@@ -2890,9 +2890,9 @@
spriteSourceSize
{361,44}
textureRect
- {{1318,1},{361,44}}
+ {{350,1},{361,44}}
textureRotated
-
+
Screen Dimmed.png
@@ -2907,9 +2907,9 @@
spriteSourceSize
{108,234}
textureRect
- {{608,445},{108,234}}
+ {{949,1},{108,234}}
textureRotated
-
+
SkillFrame_s_Empty.png
@@ -2924,9 +2924,9 @@
spriteSourceSize
{36,56}
textureRect
- {{1588,1195},{36,56}}
+ {{172,1376},{36,56}}
textureRotated
-
+
SkillIcon02_3.png
@@ -2941,7 +2941,7 @@
spriteSourceSize
{82,81}
textureRect
- {{1103,1531},{82,81}}
+ {{1105,1080},{82,81}}
textureRotated
@@ -2958,9 +2958,9 @@
spriteSourceSize
{54,64}
textureRect
- {{1306,750},{54,64}}
+ {{1802,281},{54,64}}
textureRotated
-
+
Slider_Level02_Icon_Up_White.png
@@ -2975,7 +2975,7 @@
spriteSourceSize
{54,64}
textureRect
- {{1560,1339},{54,64}}
+ {{1746,1005},{54,64}}
textureRotated
@@ -2992,7 +2992,7 @@
spriteSourceSize
{89,89}
textureRect
- {{1109,1082},{89,89}}
+ {{1495,858},{89,89}}
textureRotated
@@ -3009,7 +3009,7 @@
spriteSourceSize
{89,89}
textureRect
- {{1315,879},{89,89}}
+ {{1637,1193},{89,89}}
textureRotated
@@ -3026,7 +3026,7 @@
spriteSourceSize
{54,54}
textureRect
- {{1693,1280},{54,54}}
+ {{1724,1134},{54,54}}
textureRotated
@@ -3043,7 +3043,7 @@
spriteSourceSize
{54,54}
textureRect
- {{1608,1494},{54,54}}
+ {{1892,1231},{54,54}}
textureRotated
@@ -3060,7 +3060,7 @@
spriteSourceSize
{304,143}
textureRect
- {{472,555},{304,143}}
+ {{248,368},{304,143}}
textureRotated
@@ -3077,9 +3077,9 @@
spriteSourceSize
{304,143}
textureRect
- {{622,300},{304,143}}
+ {{393,364},{304,143}}
textureRotated
-
+
Title_Ribbon05.png
@@ -3094,9 +3094,9 @@
spriteSourceSize
{58,78}
textureRect
- {{1211,248},{58,78}}
+ {{1045,1082},{58,78}}
textureRotated
-
+
ToastMessage_Bg_Gray.png
@@ -3111,9 +3111,9 @@
spriteSourceSize
{4,32}
textureRect
- {{1774,502},{4,32}}
+ {{748,253},{4,32}}
textureRotated
-
+
UI-02.png
@@ -3128,7 +3128,7 @@
spriteSourceSize
{105,10}
textureRect
- {{1,1608},{105,10}}
+ {{705,1114},{105,10}}
textureRotated
@@ -3145,10 +3145,44 @@
spriteSourceSize
{111,16}
textureRect
- {{1203,1281},{111,16}}
+ {{263,674},{111,16}}
textureRotated
+ back1.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {258,30}
+ spriteSourceSize
+ {258,30}
+ textureRect
+ {{716,1},{258,30}}
+ textureRotated
+
+
+ bar1.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {191,26}
+ spriteSourceSize
+ {191,26}
+ textureRect
+ {{697,1163},{191,26}}
+ textureRotated
+
+
bg.png
aliases
@@ -3162,9 +3196,9 @@
spriteSourceSize
{190,56}
textureRect
- {{680,861},{190,56}}
+ {{200,697},{190,56}}
textureRotated
-
+
bg1.png
@@ -3179,7 +3213,24 @@
spriteSourceSize
{694,46}
textureRect
- {{622,1},{694,46}}
+ {{200,1},{694,46}}
+ textureRotated
+
+
+ bg2.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {169,36}
+ spriteSourceSize
+ {169,36}
+ textureRect
+ {{1,1376},{169,36}}
textureRotated
@@ -3196,9 +3247,9 @@
spriteSourceSize
{406,200}
textureRect
- {{200,353},{406,200}}
+ {{353,755},{406,200}}
textureRotated
-
+
btn_add.png
@@ -3213,7 +3264,7 @@
spriteSourceSize
{71,71}
textureRect
- {{1318,806},{71,71}}
+ {{1857,350},{71,71}}
textureRotated
@@ -3230,9 +3281,9 @@
spriteSourceSize
{34,60}
textureRect
- {{1422,1491},{34,60}}
+ {{1856,1226},{34,60}}
textureRotated
-
+
character_grade_label_green.png
@@ -3247,7 +3298,7 @@
spriteSourceSize
{34,60}
textureRect
- {{1740,1336},{34,60}}
+ {{1952,1349},{34,60}}
textureRotated
@@ -3264,9 +3315,9 @@
spriteSourceSize
{34,60}
textureRect
- {{1612,1458},{34,60}}
+ {{1988,1349},{34,60}}
textureRotated
-
+
character_grade_label_purple.png
@@ -3281,9 +3332,9 @@
spriteSourceSize
{34,60}
textureRect
- {{1680,1457},{34,60}}
+ {{2007,1231},{34,60}}
textureRotated
-
+
character_list_frame_blue.png
@@ -3298,7 +3349,7 @@
spriteSourceSize
{65,130}
textureRect
- {{522,1488},{65,130}}
+ {{1191,229},{65,130}}
textureRotated
@@ -3315,9 +3366,9 @@
spriteSourceSize
{65,130}
textureRect
- {{832,703},{65,130}}
+ {{966,950},{65,130}}
textureRotated
-
+
character_list_frame_green.png
@@ -3332,7 +3383,7 @@
spriteSourceSize
{65,130}
textureRect
- {{589,1488},{65,130}}
+ {{1033,950},{65,130}}
textureRotated
@@ -3349,9 +3400,9 @@
spriteSourceSize
{65,130}
textureRect
- {{738,986},{65,130}}
+ {{1056,753},{65,130}}
textureRotated
-
+
character_lv_bar_bg.png
@@ -3366,9 +3417,9 @@
spriteSourceSize
{24,72}
textureRect
- {{1752,880},{24,72}}
+ {{1858,324},{24,72}}
textureRotated
-
+
character_select_frame.png
@@ -3383,9 +3434,9 @@
spriteSourceSize
{64,221}
textureRect
- {{928,308},{64,221}}
+ {{555,755},{64,221}}
textureRotated
-
+
common_tab_bg.png
@@ -3400,7 +3451,7 @@
spriteSourceSize
{28,36}
textureRect
- {{1681,1},{28,36}}
+ {{348,1376},{28,36}}
textureRotated
@@ -3417,9 +3468,9 @@
spriteSourceSize
{21,14}
textureRect
- {{1291,285},{21,14}}
+ {{353,1163},{21,14}}
textureRotated
-
+
dun2.png
@@ -3434,7 +3485,7 @@
spriteSourceSize
{112,109}
textureRect
- {{868,872},{112,109}}
+ {{1746,467},{112,109}}
textureRotated
@@ -3451,9 +3502,9 @@
spriteSourceSize
{54,58}
textureRect
- {{1693,1220},{54,58}}
+ {{1746,949},{54,58}}
textureRotated
-
+
equipment_detail_icon_defense.png
@@ -3468,7 +3519,7 @@
spriteSourceSize
{63,71}
textureRect
- {{1514,1274},{63,71}}
+ {{1057,885},{63,71}}
textureRotated
@@ -3485,7 +3536,7 @@
spriteSourceSize
{67,62}
textureRect
- {{1481,1411},{67,62}}
+ {{926,886},{67,62}}
textureRotated
@@ -3502,7 +3553,7 @@
spriteSourceSize
{166,20}
textureRect
- {{1307,49},{166,20}}
+ {{353,1179},{166,20}}
textureRotated
@@ -3519,7 +3570,7 @@
spriteSourceSize
{212,26}
textureRect
- {{928,374},{212,26}}
+ {{597,640},{212,26}}
textureRotated
@@ -3536,9 +3587,9 @@
spriteSourceSize
{250,199}
textureRect
- {{428,861},{250,199}}
+ {{748,1},{250,199}}
textureRotated
-
+
line_bg.png
@@ -3553,7 +3604,7 @@
spriteSourceSize
{350,91}
textureRect
- {{103,1107},{350,91}}
+ {{396,1},{350,91}}
textureRotated
@@ -3570,9 +3621,9 @@
spriteSourceSize
{106,91}
textureRect
- {{739,751},{106,91}}
+ {{1586,856},{106,91}}
textureRotated
-
+
pause_btn_icon_exit.png
@@ -3587,7 +3638,7 @@
spriteSourceSize
{80,72}
textureRect
- {{1349,1533},{80,72}}
+ {{1440,1078},{80,72}}
textureRotated
@@ -3604,7 +3655,7 @@
spriteSourceSize
{20,26}
textureRect
- {{1307,217},{20,26}}
+ {{353,1347},{20,26}}
textureRotated
@@ -3621,9 +3672,9 @@
spriteSourceSize
{13,20}
textureRect
- {{103,1459},{13,20}}
+ {{248,674},{13,20}}
textureRotated
-
+
redbar.png
@@ -3638,7 +3689,7 @@
spriteSourceSize
{129,8}
textureRect
- {{971,562},{129,8}}
+ {{716,261},{129,8}}
textureRotated
@@ -3655,7 +3706,7 @@
spriteSourceSize
{191,26}
textureRect
- {{804,555},{191,26}}
+ {{725,1163},{191,26}}
textureRotated
@@ -3672,7 +3723,7 @@
spriteSourceSize
{216,8}
textureRect
- {{928,418},{216,8}}
+ {{617,353},{216,8}}
textureRotated
@@ -3689,9 +3740,9 @@
spriteSourceSize
{258,30}
textureRect
- {{941,276},{258,30}}
+ {{716,1},{258,30}}
textureRotated
-
+
shadow.png
@@ -3706,9 +3757,9 @@
spriteSourceSize
{32,12}
textureRect
- {{608,353},{32,12}}
+ {{671,1114},{32,12}}
textureRotated
-
+
shop_roof_bg.png
@@ -3723,7 +3774,7 @@
spriteSourceSize
{317,249}
textureRect
- {{622,49},{317,249}}
+ {{378,1163},{317,249}}
textureRotated
@@ -3740,9 +3791,9 @@
spriteSourceSize
{128,128}
textureRect
- {{1408,1229},{104,108}}
+ {{1912,1063},{104,108}}
textureRotated
-
+
slider_fill_blue.png
@@ -3757,9 +3808,9 @@
spriteSourceSize
{220,20}
textureRect
- {{200,1060},{220,20}}
+ {{621,755},{220,20}}
textureRotated
-
+
slider_fill_red.png
@@ -3774,7 +3825,7 @@
spriteSourceSize
{219,8}
textureRect
- {{200,1098},{219,8}}
+ {{396,353},{219,8}}
textureRotated
@@ -3791,7 +3842,7 @@
spriteSourceSize
{220,14}
textureRect
- {{200,1082},{220,14}}
+ {{847,253},{220,14}}
textureRotated
@@ -3808,7 +3859,7 @@
spriteSourceSize
{4,12}
textureRect
- {{1587,1333},{4,12}}
+ {{376,674},{4,12}}
textureRotated
@@ -3825,7 +3876,7 @@
spriteSourceSize
{56,62}
textureRect
- {{1616,1400},{56,62}}
+ {{697,1356},{56,62}}
textureRotated
@@ -3842,9 +3893,9 @@
spriteSourceSize
{63,59}
textureRect
- {{1423,1527},{63,59}}
+ {{1659,1132},{63,59}}
textureRotated
-
+
userinfo_icon_boss.png
@@ -3859,9 +3910,9 @@
spriteSourceSize
{66,76}
textureRect
- {{1712,424},{66,76}}
+ {{1859,196},{66,76}}
textureRotated
-
+
userinfo_icon_crown.png
@@ -3876,9 +3927,9 @@
spriteSourceSize
{59,60}
textureRect
- {{1307,247},{59,60}}
+ {{1946,1287},{59,60}}
textureRotated
-
+
userinfo_icon_skull.png
@@ -3893,7 +3944,7 @@
spriteSourceSize
{61,64}
textureRect
- {{1714,218},{61,64}}
+ {{1728,1071},{61,64}}
textureRotated
@@ -3910,7 +3961,7 @@
spriteSourceSize
{72,77}
textureRect
- {{1514,1195},{72,77}}
+ {{1514,1078},{72,77}}
textureRotated
@@ -3927,9 +3978,9 @@
spriteSourceSize
{35,14}
textureRect
- {{1291,248},{35,14}}
+ {{643,954},{35,14}}
textureRotated
-
+
ybg.png
@@ -3944,7 +3995,7 @@
spriteSourceSize
{216,14}
textureRect
- {{928,402},{216,14}}
+ {{949,237},{216,14}}
textureRotated
@@ -3960,9 +4011,9 @@
realTextureFileName
gui.png
size
- {1779,1619}
+ {2045,1413}
smartupdate
- $TexturePacker:SmartUpdate:91eee471e3bead71792c6456c272bd7b:d6663fce2765081fed1aa15fd28bb15a:5f86533554b8a62fd9d2a17dd9533d7c$
+ $TexturePacker:SmartUpdate:92d15ab0f5dbe4d5708a1fb177882d41:818ef996ee17c71b7e3fa45b62a08176:5f86533554b8a62fd9d2a17dd9533d7c$
textureFileName
gui.png
diff --git a/assets/resources/gui/gui.plist.meta b/assets/resources/gui/gui.plist.meta
index 43cd9282..123c27d7 100644
--- a/assets/resources/gui/gui.plist.meta
+++ b/assets/resources/gui/gui.plist.meta
@@ -19,8 +19,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1185,
- "trimY": 558,
+ "trimX": 1202,
+ "trimY": 1293,
"width": 112,
"height": 118,
"rawWidth": 128,
@@ -62,11 +62,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1698,
- "trimY": 796,
+ "trimX": 1274,
+ "trimY": 1080,
"width": 80,
"height": 82,
"rawWidth": 80,
@@ -111,8 +111,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1524,
- "trimY": 623,
+ "trimX": 1535,
+ "trimY": 1157,
"width": 100,
"height": 126,
"rawWidth": 128,
@@ -154,11 +154,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 697,
- "trimY": 1412,
+ "trimX": 969,
+ "trimY": 1082,
"width": 74,
"height": 79,
"rawWidth": 74,
@@ -203,8 +203,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1524,
- "trimY": 375,
+ "trimX": 1451,
+ "trimY": 734,
"width": 60,
"height": 122,
"rawWidth": 60,
@@ -249,8 +249,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 1,
- "trimX": 999,
- "trimY": 1172,
+ "trimX": 1287,
+ "trimY": 1,
"width": 100,
"height": 126,
"rawWidth": 128,
@@ -292,11 +292,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1612,
- "trimY": 1458,
+ "trimX": 1988,
+ "trimY": 1349,
"width": 34,
"height": 60,
"rawWidth": 34,
@@ -338,11 +338,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 1,
- "trimX": 991,
- "trimY": 1058,
+ "trimX": 1632,
+ "trimY": 949,
"width": 116,
"height": 112,
"rawWidth": 128,
@@ -384,11 +384,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1325,
- "trimY": 1048,
+ "trimX": 1694,
+ "trimY": 467,
"width": 50,
"height": 67,
"rawWidth": 50,
@@ -430,11 +430,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1408,
- "trimY": 1117,
+ "trimX": 1920,
+ "trimY": 855,
"width": 104,
"height": 110,
"rawWidth": 128,
@@ -476,11 +476,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 832,
- "trimY": 703,
+ "trimX": 966,
+ "trimY": 950,
"width": 65,
"height": 130,
"rawWidth": 65,
@@ -525,8 +525,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 685,
- "trimY": 1197,
+ "trimX": 1123,
+ "trimY": 1163,
"width": 128,
"height": 102,
"rawWidth": 128,
@@ -568,11 +568,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1616,
- "trimY": 1336,
+ "trimX": 1760,
+ "trimY": 1352,
"width": 60,
"height": 62,
"rawWidth": 60,
@@ -614,11 +614,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1742,
- "trimY": 1477,
+ "trimX": 272,
+ "trimY": 1376,
"width": 36,
"height": 39,
"rawWidth": 36,
@@ -660,11 +660,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 941,
- "trimY": 276,
+ "trimX": 716,
+ "trimY": 1,
"width": 258,
"height": 30,
"rawWidth": 258,
@@ -709,8 +709,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1680,
- "trimY": 1400,
+ "trimX": 761,
+ "trimY": 1356,
"width": 55,
"height": 59,
"rawWidth": 55,
@@ -755,8 +755,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1109,
- "trimY": 1082,
+ "trimX": 1495,
+ "trimY": 858,
"width": 89,
"height": 89,
"rawWidth": 89,
@@ -801,8 +801,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1714,
- "trimY": 218,
+ "trimX": 1728,
+ "trimY": 1071,
"width": 61,
"height": 64,
"rawWidth": 61,
@@ -847,8 +847,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1204,
- "trimY": 678,
+ "trimX": 1414,
+ "trimY": 950,
"width": 100,
"height": 126,
"rawWidth": 128,
@@ -893,8 +893,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1701,
- "trimY": 1564,
+ "trimX": 1681,
+ "trimY": 811,
"width": 30,
"height": 30,
"rawWidth": 30,
@@ -939,8 +939,8 @@
"rotated": true,
"offsetX": -2,
"offsetY": 2,
- "trimX": 1,
- "trimY": 1107,
+ "trimX": 248,
+ "trimY": 1,
"width": 365,
"height": 100,
"rawWidth": 389,
@@ -982,11 +982,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1665,
- "trimY": 1571,
+ "trimX": 1035,
+ "trimY": 269,
"width": 32,
"height": 34,
"rawWidth": 32,
@@ -1031,8 +1031,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 428,
- "trimY": 832,
+ "trimX": 568,
+ "trimY": 640,
"width": 27,
"height": 27,
"rawWidth": 27,
@@ -1077,8 +1077,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 844,
- "trimY": 445,
+ "trimX": 985,
+ "trimY": 629,
"width": 125,
"height": 122,
"rawWidth": 125,
@@ -1120,11 +1120,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 346,
- "trimY": 1108,
+ "trimX": 1491,
+ "trimY": 1,
"width": 125,
"height": 122,
"rawWidth": 125,
@@ -1166,11 +1166,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 327,
- "trimY": 1232,
+ "trimX": 1413,
+ "trimY": 357,
"width": 125,
"height": 122,
"rawWidth": 125,
@@ -1212,11 +1212,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 603,
- "trimY": 1062,
+ "trimX": 489,
+ "trimY": 271,
"width": 80,
"height": 142,
"rawWidth": 80,
@@ -1258,11 +1258,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 685,
- "trimY": 1053,
+ "trimX": 633,
+ "trimY": 271,
"width": 80,
"height": 142,
"rawWidth": 80,
@@ -1307,8 +1307,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1329,
- "trimY": 165,
+ "trimX": 777,
+ "trimY": 271,
"width": 80,
"height": 142,
"rawWidth": 80,
@@ -1353,8 +1353,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1102,
- "trimY": 428,
+ "trimX": 671,
+ "trimY": 970,
"width": 80,
"height": 142,
"rawWidth": 80,
@@ -1399,8 +1399,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 603,
- "trimY": 1206,
+ "trimX": 753,
+ "trimY": 950,
"width": 80,
"height": 142,
"rawWidth": 80,
@@ -1442,11 +1442,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 962,
- "trimY": 784,
+ "trimX": 1857,
+ "trimY": 495,
"width": 70,
"height": 114,
"rawWidth": 70,
@@ -1488,11 +1488,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1626,
- "trimY": 616,
+ "trimX": 1929,
+ "trimY": 533,
"width": 70,
"height": 114,
"rawWidth": 70,
@@ -1537,8 +1537,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1202,
- "trimY": 806,
+ "trimX": 1929,
+ "trimY": 605,
"width": 70,
"height": 114,
"rawWidth": 70,
@@ -1583,8 +1583,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1626,
- "trimY": 732,
+ "trimX": 1856,
+ "trimY": 611,
"width": 70,
"height": 114,
"rawWidth": 70,
@@ -1629,8 +1629,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 994,
- "trimY": 986,
+ "trimX": 1928,
+ "trimY": 677,
"width": 70,
"height": 114,
"rawWidth": 70,
@@ -1672,11 +1672,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1200,
- "trimY": 1091,
+ "trimX": 1856,
+ "trimY": 727,
"width": 70,
"height": 114,
"rawWidth": 70,
@@ -1718,11 +1718,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1589,
- "trimY": 47,
+ "trimX": 1316,
+ "trimY": 1292,
"width": 120,
"height": 122,
"rawWidth": 120,
@@ -1767,8 +1767,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1211,
- "trimY": 49,
+ "trimX": 643,
+ "trimY": 755,
"width": 94,
"height": 197,
"rawWidth": 94,
@@ -1810,11 +1810,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1110,
- "trimY": 984,
+ "trimX": 1946,
+ "trimY": 107,
"width": 94,
"height": 96,
"rawWidth": 94,
@@ -1856,11 +1856,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 473,
- "trimY": 1194,
+ "trimX": 1015,
+ "trimY": 1163,
"width": 128,
"height": 106,
"rawWidth": 128,
@@ -1905,8 +1905,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 617,
- "trimY": 555,
+ "trimX": 739,
+ "trimY": 754,
"width": 185,
"height": 194,
"rawWidth": 185,
@@ -1951,8 +1951,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 862,
- "trimY": 1530,
+ "trimX": 646,
+ "trimY": 668,
"width": 84,
"height": 84,
"rawWidth": 84,
@@ -1997,8 +1997,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 200,
- "trimY": 832,
+ "trimX": 1059,
+ "trimY": 1,
"width": 226,
"height": 226,
"rawWidth": 226,
@@ -2043,8 +2043,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1316,
- "trimY": 1290,
+ "trimX": 680,
+ "trimY": 954,
"width": 68,
"height": 7,
"rawWidth": 68,
@@ -2086,11 +2086,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1749,
- "trimY": 1219,
+ "trimX": 1755,
+ "trimY": 811,
"width": 29,
"height": 38,
"rawWidth": 29,
@@ -2132,11 +2132,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1749,
- "trimY": 1259,
+ "trimX": 1795,
+ "trimY": 811,
"width": 29,
"height": 38,
"rawWidth": 29,
@@ -2181,8 +2181,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 710,
- "trimY": 1327,
+ "trimX": 468,
+ "trimY": 670,
"width": 83,
"height": 88,
"rawWidth": 83,
@@ -2224,11 +2224,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 616,
- "trimY": 1412,
+ "trimX": 392,
+ "trimY": 674,
"width": 74,
"height": 79,
"rawWidth": 74,
@@ -2270,11 +2270,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1589,
- "trimY": 171,
+ "trimX": 882,
+ "trimY": 629,
"width": 123,
"height": 101,
"rawWidth": 123,
@@ -2319,8 +2319,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1608,
- "trimY": 1550,
+ "trimX": 1802,
+ "trimY": 228,
"width": 55,
"height": 51,
"rawWidth": 55,
@@ -2362,11 +2362,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 458,
- "trimY": 1420,
+ "trimX": 732,
+ "trimY": 668,
"width": 84,
"height": 66,
"rawWidth": 84,
@@ -2411,8 +2411,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 800,
- "trimY": 1313,
+ "trimX": 1637,
+ "trimY": 707,
"width": 104,
"height": 102,
"rawWidth": 128,
@@ -2457,8 +2457,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1006,
- "trimY": 1424,
+ "trimX": 1946,
+ "trimY": 1,
"width": 96,
"height": 104,
"rawWidth": 128,
@@ -2500,11 +2500,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1329,
- "trimY": 47,
+ "trimX": 1200,
+ "trimY": 495,
"width": 128,
"height": 116,
"rawWidth": 128,
@@ -2546,11 +2546,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 832,
- "trimY": 770,
+ "trimX": 1331,
+ "trimY": 1162,
"width": 128,
"height": 100,
"rawWidth": 128,
@@ -2592,11 +2592,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1459,
- "trimY": 47,
+ "trimX": 1123,
+ "trimY": 753,
"width": 128,
"height": 116,
"rawWidth": 128,
@@ -2641,8 +2641,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 767,
- "trimY": 1053,
+ "trimX": 1208,
+ "trimY": 950,
"width": 128,
"height": 102,
"rawWidth": 128,
@@ -2687,8 +2687,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 789,
- "trimY": 1183,
+ "trimX": 1100,
+ "trimY": 950,
"width": 128,
"height": 106,
"rawWidth": 128,
@@ -2730,11 +2730,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1078,
- "trimY": 698,
+ "trimX": 1416,
+ "trimY": 484,
"width": 124,
"height": 100,
"rawWidth": 128,
@@ -2779,8 +2779,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1079,
- "trimY": 572,
+ "trimX": 1615,
+ "trimY": 1,
"width": 124,
"height": 104,
"rawWidth": 128,
@@ -2822,11 +2822,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1299,
- "trimY": 558,
+ "trimX": 1794,
+ "trimY": 1131,
"width": 105,
"height": 93,
"rawWidth": 105,
@@ -2868,11 +2868,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1206,
- "trimY": 980,
+ "trimX": 1721,
+ "trimY": 1,
"width": 117,
"height": 109,
"rawWidth": 117,
@@ -2914,11 +2914,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1626,
- "trimY": 1220,
+ "trimX": 1273,
+ "trimY": 883,
"width": 50,
"height": 65,
"rawWidth": 50,
@@ -2963,8 +2963,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1306,
- "trimY": 665,
+ "trimX": 558,
+ "trimY": 670,
"width": 83,
"height": 86,
"rawWidth": 83,
@@ -3009,8 +3009,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 948,
- "trimY": 1530,
+ "trimX": 1400,
+ "trimY": 877,
"width": 71,
"height": 93,
"rawWidth": 71,
@@ -3052,11 +3052,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1325,
- "trimY": 970,
+ "trimX": 1859,
+ "trimY": 119,
"width": 75,
"height": 76,
"rawWidth": 75,
@@ -3101,8 +3101,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1524,
- "trimY": 867,
+ "trimX": 1746,
+ "trimY": 699,
"width": 108,
"height": 110,
"rawWidth": 108,
@@ -3147,8 +3147,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1269,
- "trimY": 1533,
+ "trimX": 889,
+ "trimY": 1084,
"width": 78,
"height": 77,
"rawWidth": 78,
@@ -3190,11 +3190,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1714,
- "trimY": 143,
+ "trimX": 1325,
+ "trimY": 883,
"width": 64,
"height": 73,
"rawWidth": 64,
@@ -3236,11 +3236,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 941,
- "trimY": 49,
+ "trimX": 489,
+ "trimY": 1,
"width": 268,
"height": 225,
"rawWidth": 268,
@@ -3282,11 +3282,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 196,
- "trimY": 1108,
+ "trimX": 555,
+ "trimY": 978,
"width": 148,
"height": 114,
"rawWidth": 148,
@@ -3328,11 +3328,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
"trimX": 1,
- "trimY": 1,
+ "trimY": 755,
"width": 619,
"height": 350,
"rawWidth": 619,
@@ -3378,7 +3378,7 @@
"offsetX": 0,
"offsetY": 0,
"trimX": 1,
- "trimY": 353,
+ "trimY": 1,
"width": 752,
"height": 197,
"rawWidth": 752,
@@ -3423,8 +3423,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 200,
- "trimY": 555,
+ "trimX": 538,
+ "trimY": 363,
"width": 270,
"height": 275,
"rawWidth": 270,
@@ -3466,11 +3466,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 870,
- "trimY": 986,
+ "trimX": 1442,
+ "trimY": 610,
"width": 60,
"height": 122,
"rawWidth": 60,
@@ -3515,8 +3515,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1524,
- "trimY": 499,
+ "trimX": 1504,
+ "trimY": 610,
"width": 60,
"height": 122,
"rawWidth": 60,
@@ -3561,8 +3561,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1712,
- "trimY": 502,
+ "trimX": 1513,
+ "trimY": 734,
"width": 60,
"height": 122,
"rawWidth": 60,
@@ -3604,11 +3604,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1078,
- "trimY": 800,
+ "trimX": 1518,
+ "trimY": 484,
"width": 60,
"height": 122,
"rawWidth": 60,
@@ -3650,11 +3650,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 586,
- "trimY": 1350,
+ "trimX": 1566,
+ "trimY": 608,
"width": 60,
"height": 122,
"rawWidth": 60,
@@ -3699,8 +3699,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1006,
- "trimY": 1300,
+ "trimX": 1575,
+ "trimY": 732,
"width": 60,
"height": 122,
"rawWidth": 60,
@@ -3742,11 +3742,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1316,
- "trimY": 1100,
+ "trimX": 995,
+ "trimY": 886,
"width": 60,
"height": 62,
"rawWidth": 60,
@@ -3788,11 +3788,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1317,
- "trimY": 1162,
+ "trimX": 1728,
+ "trimY": 1190,
"width": 60,
"height": 62,
"rawWidth": 60,
@@ -3834,11 +3834,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1317,
- "trimY": 1226,
+ "trimX": 1901,
+ "trimY": 1169,
"width": 60,
"height": 62,
"rawWidth": 60,
@@ -3880,11 +3880,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1484,
- "trimY": 1475,
+ "trimX": 1965,
+ "trimY": 1169,
"width": 60,
"height": 62,
"rawWidth": 60,
@@ -3926,11 +3926,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1484,
- "trimY": 1539,
+ "trimX": 1792,
+ "trimY": 1226,
"width": 60,
"height": 62,
"rawWidth": 60,
@@ -3975,8 +3975,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1631,
- "trimY": 1272,
+ "trimX": 1760,
+ "trimY": 1288,
"width": 60,
"height": 62,
"rawWidth": 60,
@@ -4018,11 +4018,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 196,
- "trimY": 1358,
+ "trimX": 810,
+ "trimY": 497,
"width": 128,
"height": 130,
"rawWidth": 128,
@@ -4067,8 +4067,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 132,
- "trimY": 1488,
+ "trimX": 940,
+ "trimY": 497,
"width": 128,
"height": 130,
"rawWidth": 128,
@@ -4113,8 +4113,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 262,
- "trimY": 1488,
+ "trimX": 941,
+ "trimY": 363,
"width": 128,
"height": 130,
"rawWidth": 128,
@@ -4159,8 +4159,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 328,
- "trimY": 1356,
+ "trimX": 926,
+ "trimY": 754,
"width": 128,
"height": 130,
"rawWidth": 128,
@@ -4205,8 +4205,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 392,
- "trimY": 1488,
+ "trimX": 1070,
+ "trimY": 495,
"width": 128,
"height": 130,
"rawWidth": 128,
@@ -4251,8 +4251,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 473,
- "trimY": 1062,
+ "trimX": 1071,
+ "trimY": 363,
"width": 128,
"height": 130,
"rawWidth": 128,
@@ -4297,8 +4297,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1524,
- "trimY": 979,
+ "trimX": 1802,
+ "trimY": 1021,
"width": 108,
"height": 108,
"rawWidth": 128,
@@ -4340,11 +4340,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1586,
- "trimY": 390,
+ "trimX": 1112,
+ "trimY": 627,
"width": 124,
"height": 112,
"rawWidth": 128,
@@ -4389,8 +4389,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1402,
- "trimY": 1011,
+ "trimX": 1694,
+ "trimY": 843,
"width": 110,
"height": 104,
"rawWidth": 128,
@@ -4435,8 +4435,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1514,
- "trimY": 1089,
+ "trimX": 1928,
+ "trimY": 749,
"width": 110,
"height": 104,
"rawWidth": 128,
@@ -4481,8 +4481,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 897,
- "trimY": 1172,
+ "trimX": 1312,
+ "trimY": 950,
"width": 128,
"height": 100,
"rawWidth": 128,
@@ -4527,8 +4527,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1473,
- "trimY": 165,
+ "trimX": 1625,
+ "trimY": 127,
"width": 100,
"height": 114,
"rawWidth": 128,
@@ -4570,11 +4570,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1524,
- "trimY": 751,
+ "trimX": 1930,
+ "trimY": 431,
"width": 100,
"height": 114,
"rawWidth": 128,
@@ -4616,11 +4616,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": -1,
"offsetY": 1,
- "trimX": 1422,
- "trimY": 787,
+ "trimX": 1806,
+ "trimY": 919,
"width": 100,
"height": 110,
"rawWidth": 128,
@@ -4662,11 +4662,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1422,
- "trimY": 899,
+ "trimX": 1918,
+ "trimY": 961,
"width": 100,
"height": 110,
"rawWidth": 128,
@@ -4708,11 +4708,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1473,
- "trimY": 267,
+ "trimX": 1937,
+ "trimY": 203,
"width": 114,
"height": 106,
"rawWidth": 128,
@@ -4757,8 +4757,8 @@
"rotated": true,
"offsetX": -1,
"offsetY": 1,
- "trimX": 1151,
- "trimY": 308,
+ "trimX": 1537,
+ "trimY": 355,
"width": 118,
"height": 100,
"rawWidth": 128,
@@ -4803,8 +4803,8 @@
"rotated": false,
"offsetX": -1,
"offsetY": 0,
- "trimX": 617,
- "trimY": 751,
+ "trimX": 1069,
+ "trimY": 253,
"width": 120,
"height": 108,
"rawWidth": 128,
@@ -4849,8 +4849,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1184,
- "trimY": 428,
+ "trimX": 1227,
+ "trimY": 1162,
"width": 128,
"height": 102,
"rawWidth": 128,
@@ -4892,11 +4892,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1586,
- "trimY": 504,
+ "trimX": 1474,
+ "trimY": 229,
"width": 110,
"height": 124,
"rawWidth": 128,
@@ -4938,11 +4938,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1253,
- "trimY": 308,
+ "trimX": 958,
+ "trimY": 1297,
"width": 118,
"height": 114,
"rawWidth": 128,
@@ -4987,8 +4987,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1589,
- "trimY": 274,
+ "trimX": 834,
+ "trimY": 1297,
"width": 122,
"height": 114,
"rawWidth": 128,
@@ -5030,11 +5030,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 738,
- "trimY": 872,
+ "trimX": 1201,
+ "trimY": 361,
"width": 128,
"height": 112,
"rawWidth": 128,
@@ -5079,8 +5079,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 1,
- "trimX": 898,
- "trimY": 1420,
+ "trimX": 1652,
+ "trimY": 1284,
"width": 108,
"height": 106,
"rawWidth": 128,
@@ -5125,8 +5125,8 @@
"rotated": false,
"offsetX": -1,
"offsetY": 1,
- "trimX": 1626,
- "trimY": 1108,
+ "trimX": 1934,
+ "trimY": 319,
"width": 110,
"height": 110,
"rawWidth": 128,
@@ -5168,11 +5168,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": -1,
"offsetY": 0,
- "trimX": 906,
- "trimY": 1302,
+ "trimX": 1287,
+ "trimY": 129,
"width": 116,
"height": 98,
"rawWidth": 128,
@@ -5217,8 +5217,8 @@
"rotated": true,
"offsetX": -1,
"offsetY": 0,
- "trimX": 964,
- "trimY": 690,
+ "trimX": 921,
+ "trimY": 269,
"width": 92,
"height": 112,
"rawWidth": 128,
@@ -5260,11 +5260,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1104,
- "trimY": 1415,
+ "trimX": 1405,
+ "trimY": 129,
"width": 114,
"height": 98,
"rawWidth": 128,
@@ -5309,8 +5309,8 @@
"rotated": false,
"offsetX": -1,
"offsetY": 1,
- "trimX": 963,
- "trimY": 572,
+ "trimX": 1516,
+ "trimY": 949,
"width": 114,
"height": 116,
"rawWidth": 128,
@@ -5352,11 +5352,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": -1,
"offsetY": 1,
- "trimX": 778,
- "trimY": 1417,
+ "trimX": 1586,
+ "trimY": 229,
"width": 118,
"height": 100,
"rawWidth": 128,
@@ -5401,8 +5401,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1204,
- "trimY": 1415,
+ "trimX": 1746,
+ "trimY": 581,
"width": 116,
"height": 108,
"rawWidth": 128,
@@ -5444,11 +5444,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": -1,
"offsetY": 1,
- "trimX": 871,
- "trimY": 1048,
+ "trimX": 1078,
+ "trimY": 1293,
"width": 122,
"height": 118,
"rawWidth": 128,
@@ -5490,11 +5490,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1187,
- "trimY": 878,
+ "trimX": 1550,
+ "trimY": 1285,
"width": 100,
"height": 126,
"rawWidth": 128,
@@ -5539,8 +5539,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1101,
- "trimY": 1173,
+ "trimX": 1389,
+ "trimY": 1,
"width": 100,
"height": 126,
"rawWidth": 128,
@@ -5585,8 +5585,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 1,
- "trimX": 656,
- "trimY": 1488,
+ "trimX": 1372,
+ "trimY": 229,
"width": 100,
"height": 126,
"rawWidth": 128,
@@ -5631,8 +5631,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1288,
- "trimY": 428,
+ "trimX": 1241,
+ "trimY": 753,
"width": 128,
"height": 104,
"rawWidth": 128,
@@ -5677,8 +5677,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1304,
- "trimY": 1299,
+ "trimX": 1753,
+ "trimY": 347,
"width": 102,
"height": 114,
"rawWidth": 128,
@@ -5723,8 +5723,8 @@
"rotated": false,
"offsetX": -1,
"offsetY": 0,
- "trimX": 1077,
- "trimY": 862,
+ "trimX": 1440,
+ "trimY": 1292,
"width": 108,
"height": 120,
"rawWidth": 128,
@@ -5766,11 +5766,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": -3,
- "trimX": 1394,
- "trimY": 375,
+ "trimX": 1258,
+ "trimY": 229,
"width": 128,
"height": 112,
"rawWidth": 128,
@@ -5812,11 +5812,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": -1,
"offsetY": 1,
- "trimX": 1314,
- "trimY": 1415,
+ "trimX": 1741,
+ "trimY": 120,
"width": 116,
"height": 106,
"rawWidth": 128,
@@ -5861,8 +5861,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1369,
- "trimY": 247,
+ "trimX": 1347,
+ "trimY": 749,
"width": 126,
"height": 102,
"rawWidth": 128,
@@ -5907,8 +5907,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1203,
- "trimY": 1163,
+ "trimX": 1580,
+ "trimY": 475,
"width": 116,
"height": 112,
"rawWidth": 128,
@@ -5950,11 +5950,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1068,
- "trimY": 1301,
+ "trimX": 1639,
+ "trimY": 349,
"width": 116,
"height": 112,
"rawWidth": 128,
@@ -5996,11 +5996,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1186,
- "trimY": 1301,
+ "trimX": 1688,
+ "trimY": 229,
"width": 116,
"height": 112,
"rawWidth": 128,
@@ -6042,11 +6042,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1634,
- "trimY": 880,
+ "trimX": 1832,
+ "trimY": 1,
"width": 116,
"height": 112,
"rawWidth": 128,
@@ -6091,8 +6091,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1634,
- "trimY": 994,
+ "trimX": 1628,
+ "trimY": 593,
"width": 116,
"height": 112,
"rawWidth": 128,
@@ -6134,11 +6134,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1394,
- "trimY": 489,
+ "trimX": 1433,
+ "trimY": 1162,
"width": 128,
"height": 100,
"rawWidth": 128,
@@ -6180,11 +6180,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 458,
- "trimY": 1302,
+ "trimX": 1226,
+ "trimY": 625,
"width": 126,
"height": 116,
"rawWidth": 128,
@@ -6226,11 +6226,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1394,
- "trimY": 591,
+ "trimX": 1315,
+ "trimY": 359,
"width": 128,
"height": 96,
"rawWidth": 128,
@@ -6275,8 +6275,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 1,
- "trimX": 979,
- "trimY": 856,
+ "trimX": 1318,
+ "trimY": 489,
"width": 128,
"height": 96,
"rawWidth": 128,
@@ -6318,11 +6318,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1394,
- "trimY": 689,
+ "trimX": 1344,
+ "trimY": 619,
"width": 128,
"height": 96,
"rawWidth": 128,
@@ -6367,8 +6367,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1,
- "trimY": 1474,
+ "trimX": 753,
+ "trimY": 1163,
"width": 129,
"height": 132,
"rawWidth": 129,
@@ -6413,8 +6413,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 196,
- "trimY": 1224,
+ "trimX": 884,
+ "trimY": 1163,
"width": 129,
"height": 132,
"rawWidth": 129,
@@ -6459,8 +6459,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 832,
- "trimY": 569,
+ "trimX": 835,
+ "trimY": 950,
"width": 129,
"height": 132,
"rawWidth": 129,
@@ -6505,8 +6505,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 971,
- "trimY": 428,
+ "trimX": 810,
+ "trimY": 363,
"width": 129,
"height": 132,
"rawWidth": 129,
@@ -6551,8 +6551,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 758,
- "trimY": 1519,
+ "trimX": 1521,
+ "trimY": 128,
"width": 99,
"height": 102,
"rawWidth": 99,
@@ -6597,8 +6597,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1187,
- "trimY": 1533,
+ "trimX": 1358,
+ "trimY": 1080,
"width": 80,
"height": 80,
"rawWidth": 80,
@@ -6643,8 +6643,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1698,
- "trimY": 626,
+ "trimX": 800,
+ "trimY": 668,
"width": 80,
"height": 83,
"rawWidth": 80,
@@ -6686,11 +6686,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1698,
- "trimY": 711,
+ "trimX": 1189,
+ "trimY": 1080,
"width": 80,
"height": 83,
"rawWidth": 80,
@@ -6735,8 +6735,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1487,
- "trimY": 1339,
+ "trimX": 1857,
+ "trimY": 423,
"width": 71,
"height": 70,
"rawWidth": 71,
@@ -6781,8 +6781,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1711,
- "trimY": 78,
+ "trimX": 1659,
+ "trimY": 1067,
"width": 63,
"height": 67,
"rawWidth": 63,
@@ -6824,11 +6824,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1043,
- "trimY": 1530,
+ "trimX": 1859,
+ "trimY": 264,
"width": 73,
"height": 58,
"rawWidth": 73,
@@ -6873,8 +6873,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 544,
- "trimY": 1420,
+ "trimX": 1848,
+ "trimY": 843,
"width": 66,
"height": 70,
"rawWidth": 66,
@@ -6916,11 +6916,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1713,
- "trimY": 281,
+ "trimX": 1130,
+ "trimY": 883,
"width": 65,
"height": 70,
"rawWidth": 65,
@@ -6962,11 +6962,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1713,
- "trimY": 353,
+ "trimX": 1202,
+ "trimY": 883,
"width": 65,
"height": 69,
"rawWidth": 65,
@@ -7011,8 +7011,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1587,
- "trimY": 1288,
+ "trimX": 1637,
+ "trimY": 811,
"width": 42,
"height": 43,
"rawWidth": 42,
@@ -7057,8 +7057,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1678,
- "trimY": 1336,
+ "trimX": 1822,
+ "trimY": 1288,
"width": 60,
"height": 62,
"rawWidth": 60,
@@ -7100,11 +7100,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1665,
- "trimY": 1535,
+ "trimX": 598,
+ "trimY": 1128,
"width": 33,
"height": 34,
"rawWidth": 33,
@@ -7146,11 +7146,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1550,
- "trimY": 1411,
+ "trimX": 1824,
+ "trimY": 1352,
"width": 60,
"height": 62,
"rawWidth": 60,
@@ -7195,8 +7195,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1742,
- "trimY": 1518,
+ "trimX": 634,
+ "trimY": 1128,
"width": 33,
"height": 34,
"rawWidth": 33,
@@ -7241,8 +7241,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1546,
- "trimY": 1475,
+ "trimX": 1884,
+ "trimY": 1288,
"width": 60,
"height": 62,
"rawWidth": 60,
@@ -7287,8 +7287,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1701,
- "trimY": 1529,
+ "trimX": 670,
+ "trimY": 1128,
"width": 33,
"height": 34,
"rawWidth": 33,
@@ -7330,11 +7330,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1711,
- "trimY": 1,
+ "trimX": 812,
+ "trimY": 1094,
"width": 67,
"height": 75,
"rawWidth": 67,
@@ -7376,11 +7376,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1422,
- "trimY": 1410,
+ "trimX": 753,
+ "trimY": 1297,
"width": 57,
"height": 79,
"rawWidth": 57,
@@ -7422,11 +7422,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1408,
- "trimY": 1339,
+ "trimX": 1588,
+ "trimY": 1067,
"width": 77,
"height": 69,
"rawWidth": 77,
@@ -7468,11 +7468,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1546,
- "trimY": 1539,
+ "trimX": 1888,
+ "trimY": 1352,
"width": 60,
"height": 62,
"rawWidth": 60,
@@ -7517,8 +7517,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1749,
- "trimY": 1299,
+ "trimX": 538,
+ "trimY": 640,
"width": 28,
"height": 28,
"rawWidth": 28,
@@ -7563,8 +7563,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1738,
- "trimY": 1108,
+ "trimX": 1806,
+ "trimY": 842,
"width": 39,
"height": 40,
"rawWidth": 39,
@@ -7606,11 +7606,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1664,
- "trimY": 1494,
+ "trimX": 706,
+ "trimY": 1126,
"width": 35,
"height": 39,
"rawWidth": 35,
@@ -7652,11 +7652,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1588,
- "trimY": 1253,
+ "trimX": 313,
+ "trimY": 1376,
"width": 33,
"height": 36,
"rawWidth": 33,
@@ -7701,8 +7701,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1701,
- "trimY": 1493,
+ "trimX": 1806,
+ "trimY": 883,
"width": 39,
"height": 34,
"rawWidth": 39,
@@ -7747,8 +7747,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1741,
- "trimY": 1398,
+ "trimX": 747,
+ "trimY": 1126,
"width": 37,
"height": 35,
"rawWidth": 37,
@@ -7790,11 +7790,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1634,
- "trimY": 848,
+ "trimX": 1035,
+ "trimY": 305,
"width": 30,
"height": 39,
"rawWidth": 30,
@@ -7839,8 +7839,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1738,
- "trimY": 1188,
+ "trimX": 1713,
+ "trimY": 811,
"width": 29,
"height": 40,
"rawWidth": 29,
@@ -7885,8 +7885,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 422,
- "trimY": 1062,
+ "trimX": 555,
+ "trimY": 1128,
"width": 33,
"height": 41,
"rawWidth": 33,
@@ -7931,8 +7931,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1738,
- "trimY": 1149,
+ "trimX": 811,
+ "trimY": 629,
"width": 37,
"height": 40,
"rawWidth": 37,
@@ -7974,11 +7974,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1742,
- "trimY": 1435,
+ "trimX": 230,
+ "trimY": 1376,
"width": 36,
"height": 40,
"rawWidth": 36,
@@ -8020,10 +8020,10 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1318,
+ "trimX": 350,
"trimY": 1,
"width": 361,
"height": 44,
@@ -8066,11 +8066,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 608,
- "trimY": 445,
+ "trimX": 949,
+ "trimY": 1,
"width": 108,
"height": 234,
"rawWidth": 108,
@@ -8112,11 +8112,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1588,
- "trimY": 1195,
+ "trimX": 172,
+ "trimY": 1376,
"width": 36,
"height": 56,
"rawWidth": 36,
@@ -8161,8 +8161,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1103,
- "trimY": 1531,
+ "trimX": 1105,
+ "trimY": 1080,
"width": 82,
"height": 81,
"rawWidth": 82,
@@ -8204,11 +8204,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1306,
- "trimY": 750,
+ "trimX": 1802,
+ "trimY": 281,
"width": 54,
"height": 64,
"rawWidth": 54,
@@ -8253,8 +8253,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1560,
- "trimY": 1339,
+ "trimX": 1746,
+ "trimY": 1005,
"width": 54,
"height": 64,
"rawWidth": 54,
@@ -8299,8 +8299,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1315,
- "trimY": 879,
+ "trimX": 1637,
+ "trimY": 1193,
"width": 89,
"height": 89,
"rawWidth": 89,
@@ -8345,8 +8345,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1693,
- "trimY": 1280,
+ "trimX": 1724,
+ "trimY": 1134,
"width": 54,
"height": 54,
"rawWidth": 54,
@@ -8391,8 +8391,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1608,
- "trimY": 1494,
+ "trimX": 1892,
+ "trimY": 1231,
"width": 54,
"height": 54,
"rawWidth": 54,
@@ -8437,8 +8437,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 472,
- "trimY": 555,
+ "trimX": 248,
+ "trimY": 368,
"width": 304,
"height": 143,
"rawWidth": 304,
@@ -8480,11 +8480,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 622,
- "trimY": 300,
+ "trimX": 393,
+ "trimY": 364,
"width": 304,
"height": 143,
"rawWidth": 304,
@@ -8526,11 +8526,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1211,
- "trimY": 248,
+ "trimX": 1045,
+ "trimY": 1082,
"width": 58,
"height": 78,
"rawWidth": 58,
@@ -8572,11 +8572,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1774,
- "trimY": 502,
+ "trimX": 748,
+ "trimY": 253,
"width": 4,
"height": 32,
"rawWidth": 4,
@@ -8621,8 +8621,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1,
- "trimY": 1608,
+ "trimX": 705,
+ "trimY": 1114,
"width": 105,
"height": 10,
"rawWidth": 105,
@@ -8667,8 +8667,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1203,
- "trimY": 1281,
+ "trimX": 263,
+ "trimY": 674,
"width": 111,
"height": 16,
"rawWidth": 111,
@@ -8701,6 +8701,98 @@
],
"subMetas": {}
},
+ "984ba": {
+ "importer": "sprite-frame",
+ "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@984ba",
+ "displayName": "",
+ "id": "984ba",
+ "name": "back1",
+ "userData": {
+ "trimType": "auto",
+ "trimThreshold": 1,
+ "rotated": true,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 716,
+ "trimY": 1,
+ "width": 258,
+ "height": 30,
+ "rawWidth": 258,
+ "rawHeight": 30,
+ "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": {}
+ },
+ "fa049": {
+ "importer": "sprite-frame",
+ "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@fa049",
+ "displayName": "",
+ "id": "fa049",
+ "name": "bar1",
+ "userData": {
+ "trimType": "auto",
+ "trimThreshold": 1,
+ "rotated": true,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 697,
+ "trimY": 1163,
+ "width": 191,
+ "height": 26,
+ "rawWidth": 191,
+ "rawHeight": 26,
+ "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": {}
+ },
"58cb7": {
"importer": "sprite-frame",
"uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@58cb7",
@@ -8710,11 +8802,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 680,
- "trimY": 861,
+ "trimX": 200,
+ "trimY": 697,
"width": 190,
"height": 56,
"rawWidth": 190,
@@ -8756,10 +8848,10 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 622,
+ "trimX": 200,
"trimY": 1,
"width": 694,
"height": 46,
@@ -8793,6 +8885,52 @@
],
"subMetas": {}
},
+ "4c659": {
+ "importer": "sprite-frame",
+ "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@4c659",
+ "displayName": "",
+ "id": "4c659",
+ "name": "bg2",
+ "userData": {
+ "trimType": "auto",
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 1,
+ "trimY": 1376,
+ "width": 169,
+ "height": 36,
+ "rawWidth": 169,
+ "rawHeight": 36,
+ "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": {}
+ },
"098d7": {
"importer": "sprite-frame",
"uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@098d7",
@@ -8802,11 +8940,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 200,
- "trimY": 353,
+ "trimX": 353,
+ "trimY": 755,
"width": 406,
"height": 200,
"rawWidth": 406,
@@ -8851,8 +8989,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1318,
- "trimY": 806,
+ "trimX": 1857,
+ "trimY": 350,
"width": 71,
"height": 71,
"rawWidth": 71,
@@ -8894,11 +9032,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1422,
- "trimY": 1491,
+ "trimX": 1856,
+ "trimY": 1226,
"width": 34,
"height": 60,
"rawWidth": 34,
@@ -8943,8 +9081,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1740,
- "trimY": 1336,
+ "trimX": 1952,
+ "trimY": 1349,
"width": 34,
"height": 60,
"rawWidth": 34,
@@ -8986,11 +9124,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1680,
- "trimY": 1457,
+ "trimX": 2007,
+ "trimY": 1231,
"width": 34,
"height": 60,
"rawWidth": 34,
@@ -9035,8 +9173,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 522,
- "trimY": 1488,
+ "trimX": 1191,
+ "trimY": 229,
"width": 65,
"height": 130,
"rawWidth": 65,
@@ -9081,8 +9219,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 589,
- "trimY": 1488,
+ "trimX": 1033,
+ "trimY": 950,
"width": 65,
"height": 130,
"rawWidth": 65,
@@ -9124,11 +9262,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 738,
- "trimY": 986,
+ "trimX": 1056,
+ "trimY": 753,
"width": 65,
"height": 130,
"rawWidth": 65,
@@ -9170,11 +9308,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1752,
- "trimY": 880,
+ "trimX": 1858,
+ "trimY": 324,
"width": 24,
"height": 72,
"rawWidth": 24,
@@ -9216,11 +9354,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 928,
- "trimY": 308,
+ "trimX": 555,
+ "trimY": 755,
"width": 64,
"height": 221,
"rawWidth": 64,
@@ -9265,8 +9403,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1681,
- "trimY": 1,
+ "trimX": 348,
+ "trimY": 1376,
"width": 28,
"height": 36,
"rawWidth": 28,
@@ -9308,11 +9446,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1291,
- "trimY": 285,
+ "trimX": 353,
+ "trimY": 1163,
"width": 21,
"height": 14,
"rawWidth": 21,
@@ -9357,8 +9495,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 868,
- "trimY": 872,
+ "trimX": 1746,
+ "trimY": 467,
"width": 112,
"height": 109,
"rawWidth": 112,
@@ -9400,11 +9538,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1693,
- "trimY": 1220,
+ "trimX": 1746,
+ "trimY": 949,
"width": 54,
"height": 58,
"rawWidth": 54,
@@ -9449,8 +9587,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1514,
- "trimY": 1274,
+ "trimX": 1057,
+ "trimY": 885,
"width": 63,
"height": 71,
"rawWidth": 63,
@@ -9495,8 +9633,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1481,
- "trimY": 1411,
+ "trimX": 926,
+ "trimY": 886,
"width": 67,
"height": 62,
"rawWidth": 67,
@@ -9541,8 +9679,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1307,
- "trimY": 49,
+ "trimX": 353,
+ "trimY": 1179,
"width": 166,
"height": 20,
"rawWidth": 166,
@@ -9587,8 +9725,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 928,
- "trimY": 374,
+ "trimX": 597,
+ "trimY": 640,
"width": 212,
"height": 26,
"rawWidth": 212,
@@ -9630,11 +9768,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 428,
- "trimY": 861,
+ "trimX": 748,
+ "trimY": 1,
"width": 250,
"height": 199,
"rawWidth": 250,
@@ -9679,8 +9817,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 103,
- "trimY": 1107,
+ "trimX": 396,
+ "trimY": 1,
"width": 350,
"height": 91,
"rawWidth": 350,
@@ -9722,11 +9860,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 739,
- "trimY": 751,
+ "trimX": 1586,
+ "trimY": 856,
"width": 106,
"height": 91,
"rawWidth": 106,
@@ -9771,8 +9909,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1349,
- "trimY": 1533,
+ "trimX": 1440,
+ "trimY": 1078,
"width": 80,
"height": 72,
"rawWidth": 80,
@@ -9817,8 +9955,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1307,
- "trimY": 217,
+ "trimX": 353,
+ "trimY": 1347,
"width": 20,
"height": 26,
"rawWidth": 20,
@@ -9860,11 +9998,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 103,
- "trimY": 1459,
+ "trimX": 248,
+ "trimY": 674,
"width": 13,
"height": 20,
"rawWidth": 13,
@@ -9909,8 +10047,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 971,
- "trimY": 562,
+ "trimX": 716,
+ "trimY": 261,
"width": 129,
"height": 8,
"rawWidth": 129,
@@ -9955,8 +10093,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 804,
- "trimY": 555,
+ "trimX": 725,
+ "trimY": 1163,
"width": 191,
"height": 26,
"rawWidth": 191,
@@ -10001,8 +10139,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 928,
- "trimY": 418,
+ "trimX": 617,
+ "trimY": 353,
"width": 216,
"height": 8,
"rawWidth": 216,
@@ -10044,11 +10182,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 608,
- "trimY": 353,
+ "trimX": 671,
+ "trimY": 1114,
"width": 32,
"height": 12,
"rawWidth": 32,
@@ -10093,8 +10231,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 622,
- "trimY": 49,
+ "trimX": 378,
+ "trimY": 1163,
"width": 317,
"height": 249,
"rawWidth": 317,
@@ -10136,11 +10274,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 1,
- "trimX": 1408,
- "trimY": 1229,
+ "trimX": 1912,
+ "trimY": 1063,
"width": 104,
"height": 108,
"rawWidth": 128,
@@ -10182,11 +10320,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 200,
- "trimY": 1060,
+ "trimX": 621,
+ "trimY": 755,
"width": 220,
"height": 20,
"rawWidth": 220,
@@ -10231,8 +10369,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 200,
- "trimY": 1098,
+ "trimX": 396,
+ "trimY": 353,
"width": 219,
"height": 8,
"rawWidth": 219,
@@ -10277,8 +10415,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 200,
- "trimY": 1082,
+ "trimX": 847,
+ "trimY": 253,
"width": 220,
"height": 14,
"rawWidth": 220,
@@ -10323,8 +10461,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1587,
- "trimY": 1333,
+ "trimX": 376,
+ "trimY": 674,
"width": 4,
"height": 12,
"rawWidth": 4,
@@ -10369,8 +10507,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1616,
- "trimY": 1400,
+ "trimX": 697,
+ "trimY": 1356,
"width": 56,
"height": 62,
"rawWidth": 56,
@@ -10412,11 +10550,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1423,
- "trimY": 1527,
+ "trimX": 1659,
+ "trimY": 1132,
"width": 63,
"height": 59,
"rawWidth": 63,
@@ -10458,11 +10596,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1712,
- "trimY": 424,
+ "trimX": 1859,
+ "trimY": 196,
"width": 66,
"height": 76,
"rawWidth": 66,
@@ -10504,11 +10642,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1307,
- "trimY": 247,
+ "trimX": 1946,
+ "trimY": 1287,
"width": 59,
"height": 60,
"rawWidth": 59,
@@ -10554,7 +10692,7 @@
"offsetX": 0,
"offsetY": 0,
"trimX": 1514,
- "trimY": 1195,
+ "trimY": 1078,
"width": 72,
"height": 77,
"rawWidth": 72,
@@ -10596,11 +10734,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1291,
- "trimY": 248,
+ "trimX": 643,
+ "trimY": 954,
"width": 35,
"height": 14,
"rawWidth": 35,
@@ -10645,8 +10783,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 928,
- "trimY": 402,
+ "trimX": 949,
+ "trimY": 237,
"width": 216,
"height": 14,
"rawWidth": 216,
diff --git a/assets/resources/gui/gui.png b/assets/resources/gui/gui.png
index f9e84749..29737603 100644
Binary files a/assets/resources/gui/gui.png and b/assets/resources/gui/gui.png differ
diff --git a/assets/resources/gui/items.plist b/assets/resources/gui/items.plist
index 6dde8614..54755c85 100644
--- a/assets/resources/gui/items.plist
+++ b/assets/resources/gui/items.plist
@@ -17,9 +17,9 @@
spriteSourceSize
{77,77}
textureRect
- {{439,1},{71,65}}
+ {{153,144},{71,65}}
textureRotated
-
+
1002.png
@@ -34,7 +34,7 @@
spriteSourceSize
{77,77}
textureRect
- {{80,137},{73,61}}
+ {{202,81},{73,61}}
textureRotated
@@ -51,7 +51,7 @@
spriteSourceSize
{77,77}
textureRect
- {{123,74},{77,61}}
+ {{123,81},{77,61}}
textureRotated
@@ -68,7 +68,7 @@
spriteSourceSize
{77,77}
textureRect
- {{202,1},{77,65}}
+ {{1,206},{77,65}}
textureRotated
@@ -85,9 +85,9 @@
spriteSourceSize
{77,77}
textureRect
- {{281,68},{77,61}}
+ {{289,218},{77,61}}
textureRotated
-
+
1006.png
@@ -102,7 +102,7 @@
spriteSourceSize
{77,77}
textureRect
- {{360,1},{77,63}}
+ {{277,74},{77,63}}
textureRotated
@@ -119,7 +119,7 @@
spriteSourceSize
{77,77}
textureRect
- {{123,1},{77,71}}
+ {{1,133},{77,71}}
textureRotated
@@ -136,7 +136,7 @@
spriteSourceSize
{77,77}
textureRect
- {{1,206},{71,71}}
+ {{286,1},{71,71}}
textureRotated
@@ -153,9 +153,9 @@
spriteSourceSize
{70,70}
textureRect
- {{264,202},{54,60}}
+ {{208,217},{54,60}}
textureRotated
-
+
1010.png
@@ -170,7 +170,7 @@
spriteSourceSize
{70,70}
textureRect
- {{155,137},{62,54}}
+ {{438,1},{62,54}}
textureRotated
@@ -187,7 +187,7 @@
spriteSourceSize
{70,70}
textureRect
- {{320,202},{54,60}}
+ {{233,273},{54,60}}
textureRotated
@@ -204,7 +204,7 @@
spriteSourceSize
{70,70}
textureRect
- {{206,202},{56,60}}
+ {{1,273},{56,60}}
textureRotated
@@ -221,7 +221,7 @@
spriteSourceSize
{70,70}
textureRect
- {{376,195},{54,60}}
+ {{438,65},{54,60}}
textureRotated
@@ -238,7 +238,7 @@
spriteSourceSize
{70,70}
textureRect
- {{143,268},{62,54}}
+ {{80,217},{62,54}}
textureRotated
@@ -255,7 +255,7 @@
spriteSourceSize
{70,70}
textureRect
- {{391,257},{54,60}}
+ {{425,131},{54,60}}
textureRotated
@@ -272,9 +272,9 @@
spriteSourceSize
{70,70}
textureRect
- {{267,264},{56,60}}
+ {{59,273},{56,60}}
textureRotated
-
+
1018.png
@@ -289,9 +289,9 @@
spriteSourceSize
{70,70}
textureRect
- {{329,264},{56,60}}
+ {{117,273},{56,60}}
textureRotated
-
+
1019.png
@@ -306,9 +306,9 @@
spriteSourceSize
{70,70}
textureRect
- {{447,141},{56,60}}
+ {{175,273},{56,60}}
textureRotated
-
+
1020.png
@@ -323,9 +323,9 @@
spriteSourceSize
{70,70}
textureRect
- {{432,199},{54,60}}
+ {{419,269},{54,60}}
textureRotated
-
+
1021.png
@@ -340,9 +340,9 @@
spriteSourceSize
{70,70}
textureRect
- {{349,131},{62,54}}
+ {{144,217},{62,54}}
textureRotated
-
+
1022.png
@@ -357,7 +357,7 @@
spriteSourceSize
{70,70}
textureRect
- {{447,255},{54,60}}
+ {{423,200},{54,60}}
textureRotated
@@ -408,7 +408,7 @@
spriteSourceSize
{77,77}
textureRect
- {{1,133},{77,71}}
+ {{207,1},{77,71}}
textureRotated
@@ -425,9 +425,9 @@
spriteSourceSize
{77,77}
textureRect
- {{202,68},{77,63}}
+ {{289,139},{77,63}}
textureRotated
-
+
3004.Png
@@ -442,7 +442,7 @@
spriteSourceSize
{77,77}
textureRect
- {{281,1},{77,65}}
+ {{359,1},{77,65}}
textureRotated
@@ -459,7 +459,7 @@
spriteSourceSize
{77,77}
textureRect
- {{360,66},{77,61}}
+ {{359,68},{77,61}}
textureRotated
@@ -476,9 +476,9 @@
spriteSourceSize
{77,77}
textureRect
- {{143,201},{61,65}}
+ {{352,269},{61,65}}
textureRotated
-
+
9002.Png
@@ -493,7 +493,7 @@
spriteSourceSize
{77,77}
textureRect
- {{439,68},{71,71}}
+ {{80,144},{71,71}}
textureRotated
@@ -506,11 +506,11 @@
spriteOffset
{0,0}
spriteSize
- {58,58}
+ {82,78}
spriteSourceSize
- {58,58}
+ {90,90}
textureRect
- {{207,264},{58,58}}
+ {{123,1},{82,78}}
textureRotated
@@ -527,7 +527,7 @@
spriteSourceSize
{77,77}
textureRect
- {{211,133},{67,67}}
+ {{220,144},{67,67}}
textureRotated
@@ -544,7 +544,7 @@
spriteSourceSize
{77,77}
textureRect
- {{74,206},{67,67}}
+ {{356,131},{67,67}}
textureRotated
@@ -561,7 +561,7 @@
spriteSourceSize
{77,77}
textureRect
- {{280,133},{67,67}}
+ {{354,200},{67,67}}
textureRotated
@@ -577,9 +577,9 @@
realTextureFileName
items.png
size
- {511,323}
+ {493,334}
smartupdate
- $TexturePacker:SmartUpdate:04bbd6cd0407699a1595d0e401af7d1e:24aad079ba91bf6aa5e1937f9fc6b373:9b2c40378ce3448cae3ca053079d3001$
+ $TexturePacker:SmartUpdate:1bc512f8dc1baac0d03997c773bef4ca:0631a07c70b9bd4ccdd225f169eb27c3:9b2c40378ce3448cae3ca053079d3001$
textureFileName
items.png
diff --git a/assets/resources/gui/items.plist.meta b/assets/resources/gui/items.plist.meta
index adb323c9..b0c0d0da 100644
--- a/assets/resources/gui/items.plist.meta
+++ b/assets/resources/gui/items.plist.meta
@@ -16,11 +16,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 281,
- "trimY": 68,
+ "trimX": 289,
+ "trimY": 218,
"width": 77,
"height": 61,
"rawWidth": 77,
@@ -62,11 +62,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 432,
- "trimY": 199,
+ "trimX": 419,
+ "trimY": 269,
"width": 54,
"height": 60,
"rawWidth": 70,
@@ -111,8 +111,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 1,
- "trimX": 74,
- "trimY": 206,
+ "trimX": 356,
+ "trimY": 131,
"width": 67,
"height": 67,
"rawWidth": 77,
@@ -157,8 +157,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 360,
- "trimY": 1,
+ "trimX": 277,
+ "trimY": 74,
"width": 77,
"height": 63,
"rawWidth": 77,
@@ -200,11 +200,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 439,
- "trimY": 1,
+ "trimX": 153,
+ "trimY": 144,
"width": 71,
"height": 65,
"rawWidth": 77,
@@ -249,8 +249,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 1,
- "trimX": 80,
- "trimY": 137,
+ "trimX": 202,
+ "trimY": 81,
"width": 73,
"height": 61,
"rawWidth": 77,
@@ -296,7 +296,7 @@
"offsetX": 0,
"offsetY": 0,
"trimX": 123,
- "trimY": 74,
+ "trimY": 81,
"width": 77,
"height": 61,
"rawWidth": 77,
@@ -341,8 +341,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 202,
- "trimY": 1,
+ "trimX": 1,
+ "trimY": 206,
"width": 77,
"height": 65,
"rawWidth": 77,
@@ -387,8 +387,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 123,
- "trimY": 1,
+ "trimX": 1,
+ "trimY": 133,
"width": 77,
"height": 71,
"rawWidth": 77,
@@ -433,8 +433,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1,
- "trimY": 206,
+ "trimX": 286,
+ "trimY": 1,
"width": 71,
"height": 71,
"rawWidth": 77,
@@ -476,11 +476,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 264,
- "trimY": 202,
+ "trimX": 208,
+ "trimY": 217,
"width": 54,
"height": 60,
"rawWidth": 70,
@@ -525,8 +525,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": -2,
- "trimX": 155,
- "trimY": 137,
+ "trimX": 438,
+ "trimY": 1,
"width": 62,
"height": 54,
"rawWidth": 70,
@@ -571,8 +571,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": -1,
- "trimX": 320,
- "trimY": 202,
+ "trimX": 233,
+ "trimY": 273,
"width": 54,
"height": 60,
"rawWidth": 70,
@@ -617,8 +617,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 1,
- "trimX": 206,
- "trimY": 202,
+ "trimX": 1,
+ "trimY": 273,
"width": 56,
"height": 60,
"rawWidth": 70,
@@ -663,8 +663,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 376,
- "trimY": 195,
+ "trimX": 438,
+ "trimY": 65,
"width": 54,
"height": 60,
"rawWidth": 70,
@@ -709,8 +709,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": -2,
- "trimX": 143,
- "trimY": 268,
+ "trimX": 80,
+ "trimY": 217,
"width": 62,
"height": 54,
"rawWidth": 70,
@@ -755,8 +755,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": -1,
- "trimX": 391,
- "trimY": 257,
+ "trimX": 425,
+ "trimY": 131,
"width": 54,
"height": 60,
"rawWidth": 70,
@@ -798,11 +798,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 1,
- "trimX": 267,
- "trimY": 264,
+ "trimX": 59,
+ "trimY": 273,
"width": 56,
"height": 60,
"rawWidth": 70,
@@ -844,11 +844,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 1,
- "trimX": 329,
- "trimY": 264,
+ "trimX": 117,
+ "trimY": 273,
"width": 56,
"height": 60,
"rawWidth": 70,
@@ -890,11 +890,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 1,
- "trimX": 447,
- "trimY": 141,
+ "trimX": 175,
+ "trimY": 273,
"width": 56,
"height": 60,
"rawWidth": 70,
@@ -936,11 +936,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": -2,
- "trimX": 349,
- "trimY": 131,
+ "trimX": 144,
+ "trimY": 217,
"width": 62,
"height": 54,
"rawWidth": 70,
@@ -985,8 +985,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": -1,
- "trimX": 447,
- "trimY": 255,
+ "trimX": 423,
+ "trimY": 200,
"width": 54,
"height": 60,
"rawWidth": 70,
@@ -1123,8 +1123,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1,
- "trimY": 133,
+ "trimX": 207,
+ "trimY": 1,
"width": 77,
"height": 71,
"rawWidth": 77,
@@ -1166,11 +1166,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 202,
- "trimY": 68,
+ "trimX": 289,
+ "trimY": 139,
"width": 77,
"height": 63,
"rawWidth": 77,
@@ -1215,7 +1215,7 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 281,
+ "trimX": 359,
"trimY": 1,
"width": 77,
"height": 65,
@@ -1261,8 +1261,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 360,
- "trimY": 66,
+ "trimX": 359,
+ "trimY": 68,
"width": 77,
"height": 61,
"rawWidth": 77,
@@ -1304,11 +1304,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 143,
- "trimY": 201,
+ "trimX": 352,
+ "trimY": 269,
"width": 61,
"height": 65,
"rawWidth": 77,
@@ -1353,8 +1353,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 439,
- "trimY": 68,
+ "trimX": 80,
+ "trimY": 144,
"width": 71,
"height": 71,
"rawWidth": 77,
@@ -1399,12 +1399,12 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 207,
- "trimY": 264,
- "width": 58,
- "height": 58,
- "rawWidth": 58,
- "rawHeight": 58,
+ "trimX": 123,
+ "trimY": 1,
+ "width": 82,
+ "height": 78,
+ "rawWidth": 90,
+ "rawHeight": 90,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
@@ -1445,8 +1445,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 1,
- "trimX": 211,
- "trimY": 133,
+ "trimX": 220,
+ "trimY": 144,
"width": 67,
"height": 67,
"rawWidth": 77,
@@ -1491,8 +1491,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 1,
- "trimX": 280,
- "trimY": 133,
+ "trimX": 354,
+ "trimY": 200,
"width": 67,
"height": 67,
"rawWidth": 77,
diff --git a/assets/resources/gui/items.png b/assets/resources/gui/items.png
index 8b2a2617..c0a75e05 100644
Binary files a/assets/resources/gui/items.png and b/assets/resources/gui/items.png differ
diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab
index 2479e166..97b9b775 100644
--- a/assets/resources/gui/role_controller.prefab
+++ b/assets/resources/gui/role_controller.prefab
@@ -357,6 +357,8 @@
"__id__": 0
},
"fileId": "dbtEsaAyZBrq4EVQEtirXK",
+ "instance": null,
+ "targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
@@ -10513,7 +10515,7 @@
"__id__": 901
}
],
- "_active": false,
+ "_active": true,
"_components": [
{
"__id__": 1440
@@ -11418,8 +11420,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 108,
- "height": 108
+ "width": 128,
+ "height": 102
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -11455,7 +11457,7 @@
"a": 255
},
"_spriteFrame": {
- "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@780b2",
+ "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@0b270",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 0,
diff --git a/assets/script/game/common/config/Items.ts b/assets/script/game/common/config/Items.ts
index d9740ff2..b138ba77 100644
--- a/assets/script/game/common/config/Items.ts
+++ b/assets/script/game/common/config/Items.ts
@@ -7,9 +7,9 @@ type:
export const Items={
- 1001:{uuid: 1001,path: "1001",type:1,lv:2,name: "宝箱",info:"打开宝箱获得随机奖励", },
- 1002:{uuid: 1002,path: "1002",type:1,lv:3,name: "稀有宝箱",info:"打开宝箱获得随机奖励", },
- 1003:{uuid: 1003,path: "1003",type:1,lv:4,name: "传说宝箱",info:"打开宝箱获得随机奖励", },
+ 1001:{uuid: 1001,path: "1001",type:1,lv:2,name: "宝箱",info:"随机获取物品", },
+ 1002:{uuid: 1002,path: "1002",type:1,lv:3,name: "稀有宝箱",info:"随机获取少量英雄碎片", },
+ 1003:{uuid: 1003,path: "1003",type:1,lv:4,name: "传说宝箱",info:"随机获取大量英雄碎片", },
1004:{uuid: 1004,path: "1004",type:1,lv:3,name: "xxx",info:"英雄升级三星需要的凭证", },
1005:{uuid: 1005,path: "1005",type:1,lv:3,name: "xxx",info:"英雄升级四星需要的凭证", },
1006:{uuid: 1006,path: "1006",type:1,lv:4,name: "xxx",info:"英雄升级五星需要的凭证", },
@@ -25,6 +25,6 @@ export const Items={
1016:{uuid: 1016,path: "1016",type:1,lv:4,name: "传说生命石",info:"增加装备生命值50,成功几率50%", },
9001:{uuid: 9001,path: "9001",type:1,lv:0,name: "金币",info:"金币不是万能的,但是没有金币是万万不能的", },
9002:{uuid: 9002,path: "9002",type:1,lv:1,name: "叶子",info:"提升英雄等级的神奇叶子", },
- 9003:{uuid: 9003,path: "9003",type:1,lv:1,name: "经验",info:"提升英雄等级", },
+ 9003:{uuid: 9003,path: "9003",type:1,lv:1,name: "英雄经验",info:"提升英雄等级", },
}
diff --git a/assets/script/game/common/config/heroSet.ts b/assets/script/game/common/config/heroSet.ts
index 9346bbd7..21ca8b2f 100644
--- a/assets/script/game/common/config/heroSet.ts
+++ b/assets/script/game/common/config/heroSet.ts
@@ -46,7 +46,7 @@ import { Talents } from "./TalentSet"
export const HeroInfo = {
//坦克， 高防 ，圣盾
5001: {
- uuid:5001,name: "圣盾骑士",path:"k1",type:0,hp: 2000, hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:100,a_cd:1.5,
+ uuid:5001,name: "圣盾骑士",path:"k1",type:0,hp: 2000, hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:150,a_cd:1.5,
lvexp:0,slvexp:0,slv:0, speed: 100,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6005,6005,6005,6005,6005,6005],sk2:[6102,6102,6102,6102,6102,6102],sk3:[6102,6102,6102,6102,6102,6102],pw:0,pwm:150,pws:10,apw:10,uapw:10,cpw:10,dpw:10,dopw:10,
akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1],
abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
@@ -54,7 +54,7 @@ export const HeroInfo = {
},
//坦克，高血量 ，回血
5002: {
- uuid:5002,name: "狂暴骑士",path:"k2",type:0,hp: 2000, hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:100,a_cd:1.5,
+ uuid:5002,name: "狂暴骑士",path:"k2",type:0,hp: 2000, hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:150,a_cd:1.5,
lvexp:0,slvexp:0,slv:0, speed: 100,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6005,6005,6005,6005,6005,6005],sk2:[6102,6102,6102,6102,6102,6102],sk3:[6102,6102,6102,6102,6102,6102],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0,
akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1],
abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
@@ -62,7 +62,7 @@ export const HeroInfo = {
},
//坦克，高闪避 ，加闪避
5003: {
- uuid:5003,name: "防御骑士",path:"k3",type:0,hp: 2000, hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:100,a_cd:1.5,
+ uuid:5003,name: "防御骑士",path:"k3",type:0,hp: 2000, hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:150,a_cd:1.5,
lvexp:0,slvexp:0,slv:0, speed: 100,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6005,6005,6005,6005,6005,6005],sk2:[6102,6102,6102,6102,6102,6102],sk3:[6102,6102,6102,6102,6102,6102],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0,
akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1],
abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
@@ -112,21 +112,21 @@ export const HeroInfo = {
5201: {
- uuid: 5201,name: "兽人战士", path: "mor1", type:0,hp: 2000, hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:100,a_cd:1.5,
+ uuid: 5201,name: "兽人战士", path: "mor1", type:0,hp: 2000, hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:150,a_cd:1.5,
lvexp:0,slvexp:0,slv:0, speed: 100,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6005,6005,6005,6005,6005,6005],sk2:[6102,6102,6102,6102,6102,6102],sk3:[6102,6102,6102,6102,6102,6102],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0,
akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1],
abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"]
},
5202: {
- uuid: 5202,name: "兽人刺客", path: "mor2", type:0,hp: 2000, hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:100,a_cd:1.5,
+ uuid: 5202,name: "兽人刺客", path: "mor2", type:0,hp: 2000, hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:150,a_cd:1.5,
lvexp:0,slvexp:0,slv:0, speed: 100,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6005,6005,6005,6005,6005,6005],sk2:[6102,6102,6102,6102,6102,6102],sk3:[6102,6102,6102,6102,6102,6102],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0,
akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1],
abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"]
},
5203: {
- uuid: 5203,name: "兽人护卫", path: "mor3", type:0,hp: 2000, hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:100,a_cd:1.5,
+ uuid: 5203,name: "兽人护卫", path: "mor3", type:0,hp: 2000, hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:150,a_cd:1.5,
lvexp:0,slvexp:0,slv:0, speed: 100,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6005,6005,6005,6005,6005,6005],sk2:[6102,6102,6102,6102,6102,6102],sk3:[6102,6102,6102,6102,6102,6102],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0,
akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1],
abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001,
diff --git a/assets/script/game/hero/HeroViewComp.ts b/assets/script/game/hero/HeroViewComp.ts
index e137252b..c9e6e35c 100644
--- a/assets/script/game/hero/HeroViewComp.ts
+++ b/assets/script/game/hero/HeroViewComp.ts
@@ -256,6 +256,8 @@ export class HeroViewComp extends CCComp {
if(dir < this.dis){
this.is_atking=true
if(this.dis-dir > 80 &&this.type > 0 ) this.stop_cd = 0.1
+ if(dir < 65 &&this.type == 0 ) this.stop_cd = 0.1
+
}else{
this.is_atking=false
}
@@ -717,7 +719,7 @@ export class HeroViewComp extends CCComp {
var path = "game/skills/atked";
var prefab: Prefab = oops.res.get(path, Prefab)!;
var node = instantiate(prefab);
- let pos =v3(0,30);
+ let pos =v3(15,30);
node.setPosition(pos)
node.parent = this.node;
// this.as.atked();
@@ -730,7 +732,7 @@ export class HeroViewComp extends CCComp {
var prefab: Prefab = oops.res.get(path, Prefab)!;
var node = instantiate(prefab);
let pos = v3(this.node.position.x,this.node.position.y+30,this.node.position.z);
- node.parent = this.node.parent;
+ node.parent = this.node;
node.setPosition(pos);
this.exp_add(this.dexp)
this.power_add(this.dpw)