diff --git a/assets/resources/game/hero/arc1.prefab b/assets/resources/game/hero/arc1.prefab
index 0a8f28f4..2178d3b7 100644
--- a/assets/resources/game/hero/arc1.prefab
+++ b/assets/resources/game/hero/arc1.prefab
@@ -34,29 +34,32 @@
"__id__": 34
},
{
- "__id__": 44
+ "__id__": 48
+ },
+ {
+ "__id__": 58
}
],
"_active": true,
"_components": [
{
- "__id__": 52
+ "__id__": 66
},
{
- "__id__": 54
+ "__id__": 68
},
{
- "__id__": 56
+ "__id__": 70
},
{
- "__id__": 58
+ "__id__": 72
},
{
- "__id__": 60
+ "__id__": 74
}
],
"_prefab": {
- "__id__": 62
+ "__id__": 76
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -582,6 +585,8 @@
"__id__": 0
},
"fileId": "4aKyovCOhDJpr23Of35+5a",
+ "instance": null,
+ "targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
@@ -601,10 +606,10 @@
"__id__": 26
},
"asset": {
- "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
+ "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
"__expectedType__": "cc.Prefab"
},
- "fileId": "5fqU0L3/FOhKaco5UkHuWT",
+ "fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": {
"__id__": 28
},
@@ -612,7 +617,7 @@
},
{
"__type__": "cc.PrefabInstance",
- "fileId": "d89zY+mVZFTJ2X0QMBQzh+",
+ "fileId": "derX3lupVAn4ZazpDCpI2+",
"prefabRootNode": {
"__id__": 1
},
@@ -642,12 +647,12 @@
"propertyPath": [
"_name"
],
- "value": "top"
+ "value": "shielded"
},
{
"__type__": "cc.TargetInfo",
"localID": [
- "5fqU0L3/FOhKaco5UkHuWT"
+ "c46/YsCPVOJYA4mWEpNYRx"
]
},
{
@@ -661,7 +666,7 @@
"value": {
"__type__": "cc.Vec3",
"x": 0,
- "y": 66.342,
+ "y": 22.431,
"z": 0
}
},
@@ -713,10 +718,10 @@
"__id__": 34
},
"asset": {
- "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
+ "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
"__expectedType__": "cc.Prefab"
},
- "fileId": "0d6ZXmA5dHkZxoGONDL2sE",
+ "fileId": "5fqU0L3/FOhKaco5UkHuWT",
"instance": {
"__id__": 36
},
@@ -724,7 +729,7 @@
},
{
"__type__": "cc.PrefabInstance",
- "fileId": "fbO4DPhChG7JjH3LSDwBoV",
+ "fileId": "d89zY+mVZFTJ2X0QMBQzh+",
"prefabRootNode": {
"__id__": 1
},
@@ -745,6 +750,12 @@
},
{
"__id__": 42
+ },
+ {
+ "__id__": 44
+ },
+ {
+ "__id__": 46
}
],
"removedComponents": []
@@ -757,12 +768,12 @@
"propertyPath": [
"_name"
],
- "value": "tooltip"
+ "value": "top"
},
{
"__type__": "cc.TargetInfo",
"localID": [
- "0d6ZXmA5dHkZxoGONDL2sE"
+ "5fqU0L3/FOhKaco5UkHuWT"
]
},
{
@@ -775,8 +786,8 @@
],
"value": {
"__type__": "cc.Vec3",
- "x": -8.972,
- "y": 80.491,
+ "x": 0,
+ "y": 66.342,
"z": 0
}
},
@@ -819,12 +830,44 @@
"propertyPath": [
"_active"
],
- "value": true
+ "value": false
},
{
"__type__": "cc.TargetInfo",
"localID": [
- "fadwGZO+5HPqK+IqWjAe1I"
+ "a0XbEkK/5Hz5NHSlvc4s5C"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 45
+ },
+ "propertyPath": [
+ "_active"
+ ],
+ "value": false
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "dfDOq9MhxDoay0LMIRMSnQ"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 47
+ },
+ "propertyPath": [
+ "_active"
+ ],
+ "value": false
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "98WKvp4shKP6QSOhiLhHGZ"
]
},
{
@@ -834,45 +877,48 @@
"__id__": 1
},
"_prefab": {
- "__id__": 45
+ "__id__": 49
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 44
+ "__id__": 48
},
"asset": {
- "__uuid__": "3e8ca50b-1db9-4996-affc-9d57af3a12d7",
+ "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
"__expectedType__": "cc.Prefab"
},
- "fileId": "c46/YsCPVOJYA4mWEpNYRx",
+ "fileId": "0d6ZXmA5dHkZxoGONDL2sE",
"instance": {
- "__id__": 46
+ "__id__": 50
},
"targetOverrides": null
},
{
"__type__": "cc.PrefabInstance",
- "fileId": "2b8H+BQatD/rCv7V/hkb2L",
+ "fileId": "fbO4DPhChG7JjH3LSDwBoV",
"prefabRootNode": {
"__id__": 1
},
"mountedChildren": [],
"mountedComponents": [],
"propertyOverrides": [
- {
- "__id__": 47
- },
- {
- "__id__": 49
- },
- {
- "__id__": 50
- },
{
"__id__": 51
+ },
+ {
+ "__id__": 53
+ },
+ {
+ "__id__": 54
+ },
+ {
+ "__id__": 55
+ },
+ {
+ "__id__": 56
}
],
"removedComponents": []
@@ -880,38 +926,38 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 48
+ "__id__": 52
},
"propertyPath": [
"_name"
],
- "value": "heathed"
+ "value": "tooltip"
},
{
"__type__": "cc.TargetInfo",
"localID": [
- "c46/YsCPVOJYA4mWEpNYRx"
+ "0d6ZXmA5dHkZxoGONDL2sE"
]
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 48
+ "__id__": 52
},
"propertyPath": [
"_lpos"
],
"value": {
"__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
+ "x": -8.972,
+ "y": 80.491,
"z": 0
}
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 48
+ "__id__": 52
},
"propertyPath": [
"_lrot"
@@ -927,7 +973,135 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 48
+ "__id__": 52
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 57
+ },
+ "propertyPath": [
+ "_active"
+ ],
+ "value": true
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "fadwGZO+5HPqK+IqWjAe1I"
+ ]
+ },
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 59
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 58
+ },
+ "asset": {
+ "__uuid__": "3e8ca50b-1db9-4996-affc-9d57af3a12d7",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "c46/YsCPVOJYA4mWEpNYRx",
+ "instance": {
+ "__id__": 60
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "2b8H+BQatD/rCv7V/hkb2L",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 61
+ },
+ {
+ "__id__": 63
+ },
+ {
+ "__id__": 64
+ },
+ {
+ "__id__": 65
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 62
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "heathed"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "c46/YsCPVOJYA4mWEpNYRx"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 62
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 62
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 62
},
"propertyPath": [
"_euler"
@@ -949,7 +1123,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 53
+ "__id__": 67
},
"_contentSize": {
"__type__": "cc.Size",
@@ -977,7 +1151,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 55
+ "__id__": 69
},
"enabledContactListener": true,
"bullet": true,
@@ -1011,7 +1185,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 57
+ "__id__": 71
},
"tag": 0,
"_group": 4,
@@ -1045,12 +1219,16 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 59
+ "__id__": 73
},
"hitFlashMaterial": {
"__uuid__": "a8f34051-ccff-4050-b9d9-234f62977264",
"__expectedType__": "cc.Material"
},
+ "atkMaterial": {
+ "__uuid__": "adc4e674-6203-42dd-8224-dffb471648a2",
+ "__expectedType__": "cc.Material"
+ },
"BoxRang": {
"__id__": 8
},
@@ -1070,7 +1248,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 61
+ "__id__": 75
},
"animator": {
"__id__": 23
@@ -1094,7 +1272,10 @@
"targetOverrides": null,
"nestedPrefabInstanceRoots": [
{
- "__id__": 44
+ "__id__": 58
+ },
+ {
+ "__id__": 48
},
{
"__id__": 34
diff --git a/assets/resources/game/hero/k1.prefab b/assets/resources/game/hero/k1.prefab
new file mode 100644
index 00000000..8f0cf061
--- /dev/null
+++ b/assets/resources/game/hero/k1.prefab
@@ -0,0 +1,1212 @@
+[
+ {
+ "__type__": "cc.Prefab",
+ "_name": "k1",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_native": "",
+ "data": {
+ "__id__": 1
+ },
+ "optimizationPolicy": 0,
+ "persistent": false
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "k1",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": null,
+ "_children": [
+ {
+ "__id__": 2
+ },
+ {
+ "__id__": 8
+ },
+ {
+ "__id__": 18
+ },
+ {
+ "__id__": 26
+ },
+ {
+ "__id__": 34
+ },
+ {
+ "__id__": 42
+ },
+ {
+ "__id__": 50
+ }
+ ],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 58
+ },
+ {
+ "__id__": 60
+ },
+ {
+ "__id__": 62
+ },
+ {
+ "__id__": 64
+ },
+ {
+ "__id__": 66
+ }
+ ],
+ "_prefab": {
+ "__id__": 68
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": -0.041,
+ "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.Node",
+ "_name": "shadow",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 1
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 3
+ },
+ {
+ "__id__": 5
+ }
+ ],
+ "_prefab": {
+ "__id__": 7
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 2.157,
+ "y": 14.216,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 1,
+ "y": 1,
+ "z": 1
+ },
+ "_mobility": 0,
+ "_layer": 1,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 2
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 4
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 24,
+ "height": 10
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "a62pNH7WJL7Y2J76xlh6E5"
+ },
+ {
+ "__type__": "cc.Sprite",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 2
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 6
+ },
+ "_customMaterial": null,
+ "_srcBlendFactor": 2,
+ "_dstBlendFactor": 4,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
+ },
+ "_spriteFrame": {
+ "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@34d88",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ "_type": 0,
+ "_fillType": 0,
+ "_sizeMode": 0,
+ "_fillCenter": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_fillStart": 0,
+ "_fillRange": 0,
+ "_isTrimmedMode": true,
+ "_useGrayscale": false,
+ "_atlas": null,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "c7Ljbr2uBPrIAr55WaWcYz"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "51ZjCtSAdKQ7Bnocj2kgu0",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "range_box",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 1
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 9
+ },
+ {
+ "__id__": 11
+ },
+ {
+ "__id__": 13
+ },
+ {
+ "__id__": 15
+ }
+ ],
+ "_prefab": {
+ "__id__": 17
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 50,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 1,
+ "y": 1,
+ "z": 1
+ },
+ "_mobility": 0,
+ "_layer": 1,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 8
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 10
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 20,
+ "height": 100
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "a7v65R9FlK35rDSodMKBaf"
+ },
+ {
+ "__type__": "cc.RigidBody2D",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 8
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 12
+ },
+ "enabledContactListener": true,
+ "bullet": true,
+ "awakeOnLoad": true,
+ "_group": 4,
+ "_type": 1,
+ "_allowSleep": false,
+ "_gravityScale": 0,
+ "_linearDamping": 0,
+ "_angularDamping": 0,
+ "_linearVelocity": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_angularVelocity": 0,
+ "_fixedRotation": false,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "1dGvLlJTxIyqWs7tv5eOjk"
+ },
+ {
+ "__type__": "cc.BoxCollider2D",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 8
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 14
+ },
+ "tag": 4,
+ "_group": 4,
+ "_density": 0,
+ "_sensor": false,
+ "_friction": 0.2,
+ "_restitution": 0,
+ "_offset": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_size": {
+ "__type__": "cc.Size",
+ "width": 200,
+ "height": 150
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "c1dqgNlJdOJJzLITAnZIRf"
+ },
+ {
+ "__type__": "4d46f6aanNOIZlLrgDp9iTQ",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 8
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 16
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "e3pHt1VSRBAY+Za/OOtKNW"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "efBGnhxpVAs6aCGcg6inWm",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "anm",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 1
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 19
+ },
+ {
+ "__id__": 21
+ },
+ {
+ "__id__": 23
+ }
+ ],
+ "_prefab": {
+ "__id__": 25
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 5.725,
+ "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__": 18
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 20
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 96,
+ "height": 68
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "9eaEPPEkdKYYfWIxgJ1KbU"
+ },
+ {
+ "__type__": "cc.Sprite",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 18
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 22
+ },
+ "_customMaterial": null,
+ "_srcBlendFactor": 2,
+ "_dstBlendFactor": 4,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
+ },
+ "_spriteFrame": {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@9a470",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ "_type": 0,
+ "_fillType": 0,
+ "_sizeMode": 1,
+ "_fillCenter": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_fillStart": 0,
+ "_fillRange": 0,
+ "_isTrimmedMode": true,
+ "_useGrayscale": false,
+ "_atlas": null,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "b8HXPqPhZMN71qxUdeHMKv"
+ },
+ {
+ "__type__": "cc.Animation",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 18
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 24
+ },
+ "playOnLoad": true,
+ "_clips": [
+ {
+ "__uuid__": "d15edf7e-7a4f-45cc-a4f2-5b8566c6ac7b",
+ "__expectedType__": "cc.AnimationClip"
+ },
+ {
+ "__uuid__": "816f2261-4cea-4040-9c37-e050185991c3",
+ "__expectedType__": "cc.AnimationClip"
+ },
+ {
+ "__uuid__": "fa58b1a2-2606-4fc4-89a2-e625be93ff3b",
+ "__expectedType__": "cc.AnimationClip"
+ },
+ {
+ "__uuid__": "d15edf7e-7a4f-45cc-a4f2-5b8566c6ac7b",
+ "__expectedType__": "cc.AnimationClip"
+ }
+ ],
+ "_defaultClip": {
+ "__uuid__": "d15edf7e-7a4f-45cc-a4f2-5b8566c6ac7b",
+ "__expectedType__": "cc.AnimationClip"
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "cc+VbiPudF9b+0zbBwUuPW"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "4aKyovCOhDJpr23Of35+5a",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 27
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 26
+ },
+ "asset": {
+ "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "c46/YsCPVOJYA4mWEpNYRx",
+ "instance": {
+ "__id__": 28
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "3a1pwLAh1NkYnlDVrAFcnS",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 29
+ },
+ {
+ "__id__": 31
+ },
+ {
+ "__id__": 32
+ },
+ {
+ "__id__": 33
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 30
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "shielded"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "c46/YsCPVOJYA4mWEpNYRx"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 30
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 2.363,
+ "y": 23.482,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 30
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 30
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 35
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 34
+ },
+ "asset": {
+ "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "5fqU0L3/FOhKaco5UkHuWT",
+ "instance": {
+ "__id__": 36
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "69IAw7dThHvIlVtTfXOVMZ",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 37
+ },
+ {
+ "__id__": 39
+ },
+ {
+ "__id__": 40
+ },
+ {
+ "__id__": 41
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 38
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "top"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "5fqU0L3/FOhKaco5UkHuWT"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 38
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 66.342,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 38
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 38
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 43
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 42
+ },
+ "asset": {
+ "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "0d6ZXmA5dHkZxoGONDL2sE",
+ "instance": {
+ "__id__": 44
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "fe79INE+JI1Jy2Hu0iKLMn",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 45
+ },
+ {
+ "__id__": 47
+ },
+ {
+ "__id__": 48
+ },
+ {
+ "__id__": 49
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 46
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "tooltip"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "0d6ZXmA5dHkZxoGONDL2sE"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 46
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": -8.972,
+ "y": 80.491,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 46
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 46
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 51
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 50
+ },
+ "asset": {
+ "__uuid__": "3e8ca50b-1db9-4996-affc-9d57af3a12d7",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "c46/YsCPVOJYA4mWEpNYRx",
+ "instance": {
+ "__id__": 52
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "517cDJQp1A5rj5+wfW2Uag",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 53
+ },
+ {
+ "__id__": 55
+ },
+ {
+ "__id__": 56
+ },
+ {
+ "__id__": 57
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 54
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "heathed"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "c46/YsCPVOJYA4mWEpNYRx"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 54
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 54
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 54
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 1
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 59
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 80,
+ "height": 80
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "14OhXRCixNOaApgow/hFbp"
+ },
+ {
+ "__type__": "cc.RigidBody2D",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 1
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 61
+ },
+ "enabledContactListener": true,
+ "bullet": true,
+ "awakeOnLoad": true,
+ "_group": 4,
+ "_type": 1,
+ "_allowSleep": false,
+ "_gravityScale": 1,
+ "_linearDamping": 0,
+ "_angularDamping": 0,
+ "_linearVelocity": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_angularVelocity": 0,
+ "_fixedRotation": true,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "d8rVs6intBQ7lRU8Dw4zXV"
+ },
+ {
+ "__type__": "cc.BoxCollider2D",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 1
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 63
+ },
+ "tag": 0,
+ "_group": 4,
+ "_density": 1,
+ "_sensor": false,
+ "_friction": 1,
+ "_restitution": 0,
+ "_offset": {
+ "__type__": "cc.Vec2",
+ "x": 1.5,
+ "y": 40.7
+ },
+ "_size": {
+ "__type__": "cc.Size",
+ "width": 37.5,
+ "height": 57.8
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "b2Dt9lJI9FyJCDezkDBPBl"
+ },
+ {
+ "__type__": "a0379fmhvBHcbNcBF/l43O8",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 1
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 65
+ },
+ "animator": {
+ "__id__": 23
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "73PcRpG0xKxJpIRC2zbI/o"
+ },
+ {
+ "__type__": "873f8d+SolMEo8DiTTxZRh4",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 1
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 67
+ },
+ "hitFlashMaterial": {
+ "__uuid__": "a8f34051-ccff-4050-b9d9-234f62977264",
+ "__expectedType__": "cc.Material"
+ },
+ "atkMaterial": {
+ "__uuid__": "adc4e674-6203-42dd-8224-dffb471648a2",
+ "__expectedType__": "cc.Material"
+ },
+ "BoxRang": {
+ "__id__": 8
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "ae2ywFEqlJ26Sq7z7AtGgk"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "fdklpBwCBM/qJ4WFlQF3kT",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": [
+ {
+ "__id__": 50
+ },
+ {
+ "__id__": 42
+ },
+ {
+ "__id__": 34
+ },
+ {
+ "__id__": 26
+ }
+ ]
+ }
+]
\ No newline at end of file
diff --git a/assets/resources/game/skills/buff/atk.prefab.meta b/assets/resources/game/hero/k1.prefab.meta
similarity index 63%
rename from assets/resources/game/skills/buff/atk.prefab.meta
rename to assets/resources/game/hero/k1.prefab.meta
index 263bf810..c8c395cf 100644
--- a/assets/resources/game/skills/buff/atk.prefab.meta
+++ b/assets/resources/game/hero/k1.prefab.meta
@@ -2,12 +2,12 @@
"ver": "1.1.50",
"importer": "prefab",
"imported": true,
- "uuid": "dc3b1216-071a-4cbb-8506-009a2d884f3a",
+ "uuid": "dec33491-1682-466b-93dc-1a8315b7933e",
"files": [
".json"
],
"subMetas": {},
"userData": {
- "syncNodeName": "atk"
+ "syncNodeName": "k1"
}
}
diff --git a/assets/resources/game/hero/k3.prefab b/assets/resources/game/hero/k3.prefab
index 2b5c5974..07c8d2fc 100644
--- a/assets/resources/game/hero/k3.prefab
+++ b/assets/resources/game/hero/k3.prefab
@@ -35,28 +35,31 @@
},
{
"__id__": 42
+ },
+ {
+ "__id__": 50
}
],
"_active": true,
"_components": [
- {
- "__id__": 50
- },
- {
- "__id__": 52
- },
- {
- "__id__": 54
- },
- {
- "__id__": 56
- },
{
"__id__": 58
+ },
+ {
+ "__id__": 60
+ },
+ {
+ "__id__": 62
+ },
+ {
+ "__id__": 64
+ },
+ {
+ "__id__": 66
}
],
"_prefab": {
- "__id__": 60
+ "__id__": 68
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -603,10 +606,10 @@
"__id__": 26
},
"asset": {
- "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
+ "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
"__expectedType__": "cc.Prefab"
},
- "fileId": "5fqU0L3/FOhKaco5UkHuWT",
+ "fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": {
"__id__": 28
},
@@ -614,7 +617,7 @@
},
{
"__type__": "cc.PrefabInstance",
- "fileId": "69IAw7dThHvIlVtTfXOVMZ",
+ "fileId": "3a1pwLAh1NkYnlDVrAFcnS",
"prefabRootNode": {
"__id__": 1
},
@@ -644,12 +647,12 @@
"propertyPath": [
"_name"
],
- "value": "top"
+ "value": "shielded"
},
{
"__type__": "cc.TargetInfo",
"localID": [
- "5fqU0L3/FOhKaco5UkHuWT"
+ "c46/YsCPVOJYA4mWEpNYRx"
]
},
{
@@ -662,8 +665,8 @@
],
"value": {
"__type__": "cc.Vec3",
- "x": 0,
- "y": 66.342,
+ "x": 2.363,
+ "y": 23.482,
"z": 0
}
},
@@ -715,10 +718,10 @@
"__id__": 34
},
"asset": {
- "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
+ "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
"__expectedType__": "cc.Prefab"
},
- "fileId": "0d6ZXmA5dHkZxoGONDL2sE",
+ "fileId": "5fqU0L3/FOhKaco5UkHuWT",
"instance": {
"__id__": 36
},
@@ -726,7 +729,7 @@
},
{
"__type__": "cc.PrefabInstance",
- "fileId": "fe79INE+JI1Jy2Hu0iKLMn",
+ "fileId": "69IAw7dThHvIlVtTfXOVMZ",
"prefabRootNode": {
"__id__": 1
},
@@ -756,12 +759,12 @@
"propertyPath": [
"_name"
],
- "value": "tooltip"
+ "value": "top"
},
{
"__type__": "cc.TargetInfo",
"localID": [
- "0d6ZXmA5dHkZxoGONDL2sE"
+ "5fqU0L3/FOhKaco5UkHuWT"
]
},
{
@@ -774,8 +777,8 @@
],
"value": {
"__type__": "cc.Vec3",
- "x": -8.972,
- "y": 80.491,
+ "x": 0,
+ "y": 66.342,
"z": 0
}
},
@@ -827,10 +830,10 @@
"__id__": 42
},
"asset": {
- "__uuid__": "3e8ca50b-1db9-4996-affc-9d57af3a12d7",
+ "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
"__expectedType__": "cc.Prefab"
},
- "fileId": "c46/YsCPVOJYA4mWEpNYRx",
+ "fileId": "0d6ZXmA5dHkZxoGONDL2sE",
"instance": {
"__id__": 44
},
@@ -838,7 +841,7 @@
},
{
"__type__": "cc.PrefabInstance",
- "fileId": "517cDJQp1A5rj5+wfW2Uag",
+ "fileId": "fe79INE+JI1Jy2Hu0iKLMn",
"prefabRootNode": {
"__id__": 1
},
@@ -868,12 +871,12 @@
"propertyPath": [
"_name"
],
- "value": "heathed"
+ "value": "tooltip"
},
{
"__type__": "cc.TargetInfo",
"localID": [
- "c46/YsCPVOJYA4mWEpNYRx"
+ "0d6ZXmA5dHkZxoGONDL2sE"
]
},
{
@@ -886,8 +889,8 @@
],
"value": {
"__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
+ "x": -8.972,
+ "y": 80.491,
"z": 0
}
},
@@ -922,6 +925,118 @@
"z": 0
}
},
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 51
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 50
+ },
+ "asset": {
+ "__uuid__": "3e8ca50b-1db9-4996-affc-9d57af3a12d7",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "c46/YsCPVOJYA4mWEpNYRx",
+ "instance": {
+ "__id__": 52
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "517cDJQp1A5rj5+wfW2Uag",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 53
+ },
+ {
+ "__id__": 55
+ },
+ {
+ "__id__": 56
+ },
+ {
+ "__id__": 57
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 54
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "heathed"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "c46/YsCPVOJYA4mWEpNYRx"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 54
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 54
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 54
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
{
"__type__": "cc.UITransform",
"_name": "",
@@ -932,7 +1047,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 51
+ "__id__": 59
},
"_contentSize": {
"__type__": "cc.Size",
@@ -960,7 +1075,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 53
+ "__id__": 61
},
"enabledContactListener": true,
"bullet": true,
@@ -994,7 +1109,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 55
+ "__id__": 63
},
"tag": 0,
"_group": 4,
@@ -1028,7 +1143,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 57
+ "__id__": 65
},
"animator": {
"__id__": 23
@@ -1049,12 +1164,16 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 59
+ "__id__": 67
},
"hitFlashMaterial": {
"__uuid__": "a8f34051-ccff-4050-b9d9-234f62977264",
"__expectedType__": "cc.Material"
},
+ "atkMaterial": {
+ "__uuid__": "adc4e674-6203-42dd-8224-dffb471648a2",
+ "__expectedType__": "cc.Material"
+ },
"BoxRang": {
"__id__": 8
},
@@ -1076,6 +1195,9 @@
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": [
+ {
+ "__id__": 50
+ },
{
"__id__": 42
},
diff --git a/assets/resources/game/hero/knight/k1/animtor.meta b/assets/resources/game/hero/knight/k1/animtor.meta
new file mode 100644
index 00000000..649d8ad5
--- /dev/null
+++ b/assets/resources/game/hero/knight/k1/animtor.meta
@@ -0,0 +1 @@
+{"ver":"1.2.0","importer":"directory","imported":true,"uuid":"75d4d16e-d04c-4e1d-9ca7-d9879405fd59","files":[],"subMetas":{},"userData":{}}
diff --git a/assets/resources/game/hero/knight/k1/animtor/atk.anim b/assets/resources/game/hero/knight/k1/animtor/atk.anim
new file mode 100644
index 00000000..ac0e5466
--- /dev/null
+++ b/assets/resources/game/hero/knight/k1/animtor/atk.anim
@@ -0,0 +1,133 @@
+[
+ {
+ "__type__": "cc.AnimationClip",
+ "_name": "atk",
+ "_objFlags": 0,
+ "__editorExtras__": {
+ "embeddedPlayerGroups": []
+ },
+ "_native": "",
+ "sample": 24,
+ "speed": 1,
+ "wrapMode": 1,
+ "enableTrsBlending": false,
+ "_duration": 0.5,
+ "_hash": 500763545,
+ "_tracks": [
+ {
+ "__id__": 1
+ }
+ ],
+ "_exoticAnimation": null,
+ "_events": [],
+ "_embeddedPlayers": [],
+ "_additiveSettings": {
+ "__id__": 6
+ },
+ "_auxiliaryCurveEntries": []
+ },
+ {
+ "__type__": "cc.animation.ObjectTrack",
+ "_binding": {
+ "__type__": "cc.animation.TrackBinding",
+ "path": {
+ "__id__": 2
+ },
+ "proxy": null
+ },
+ "_channel": {
+ "__id__": 4
+ }
+ },
+ {
+ "__type__": "cc.animation.TrackPath",
+ "_paths": [
+ {
+ "__id__": 3
+ },
+ "spriteFrame"
+ ]
+ },
+ {
+ "__type__": "cc.animation.ComponentPath",
+ "component": "cc.Sprite"
+ },
+ {
+ "__type__": "cc.animation.Channel",
+ "_curve": {
+ "__id__": 5
+ }
+ },
+ {
+ "__type__": "cc.ObjectCurve",
+ "_times": [
+ 0,
+ 0.041666666666666664,
+ 0.08333333333333333,
+ 0.125,
+ 0.16666666666666666,
+ 0.20833333333333334,
+ 0.25,
+ 0.2916666666666667,
+ 0.3333333333333333,
+ 0.375,
+ 0.4166666666666667,
+ 0.4583333333333333
+ ],
+ "_values": [
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@9a470",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@c4ce3",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@eb99c",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@548da",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@8401f",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@cc0e6",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@d3762",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@ebb52",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@78440",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@c8b49",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@d4d3e",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@310ee",
+ "__expectedType__": "cc.SpriteFrame"
+ }
+ ]
+ },
+ {
+ "__type__": "cc.AnimationClipAdditiveSettings",
+ "enabled": false,
+ "refClip": null
+ }
+]
\ No newline at end of file
diff --git a/assets/resources/game/hero/knight/k1/animtor/atk.anim.meta b/assets/resources/game/hero/knight/k1/animtor/atk.anim.meta
new file mode 100644
index 00000000..eb1c7468
--- /dev/null
+++ b/assets/resources/game/hero/knight/k1/animtor/atk.anim.meta
@@ -0,0 +1 @@
+{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"816f2261-4cea-4040-9c37-e050185991c3","files":[".cconb"],"subMetas":{},"userData":{"name":"atk"}}
diff --git a/assets/resources/game/hero/knight/k1/animtor/idle.anim b/assets/resources/game/hero/knight/k1/animtor/idle.anim
new file mode 100644
index 00000000..8def3cab
--- /dev/null
+++ b/assets/resources/game/hero/knight/k1/animtor/idle.anim
@@ -0,0 +1,71 @@
+[
+ {
+ "__type__": "cc.AnimationClip",
+ "_name": "idle",
+ "_objFlags": 0,
+ "__editorExtras__": {
+ "embeddedPlayerGroups": []
+ },
+ "_native": "",
+ "sample": 24,
+ "speed": 1,
+ "wrapMode": 2,
+ "enableTrsBlending": false,
+ "_duration": 0,
+ "_hash": 500763545,
+ "_tracks": [
+ {
+ "__id__": 1
+ }
+ ],
+ "_exoticAnimation": null,
+ "_events": [],
+ "_embeddedPlayers": [],
+ "_additiveSettings": {
+ "__id__": 6
+ },
+ "_auxiliaryCurveEntries": []
+ },
+ {
+ "__type__": "cc.animation.ObjectTrack",
+ "_binding": {
+ "__type__": "cc.animation.TrackBinding",
+ "path": {
+ "__id__": 2
+ },
+ "proxy": null
+ },
+ "_channel": {
+ "__id__": 4
+ }
+ },
+ {
+ "__type__": "cc.animation.TrackPath",
+ "_paths": [
+ {
+ "__id__": 3
+ },
+ "spriteFrame"
+ ]
+ },
+ {
+ "__type__": "cc.animation.ComponentPath",
+ "component": "cc.Sprite"
+ },
+ {
+ "__type__": "cc.animation.Channel",
+ "_curve": {
+ "__id__": 5
+ }
+ },
+ {
+ "__type__": "cc.ObjectCurve",
+ "_times": [],
+ "_values": []
+ },
+ {
+ "__type__": "cc.AnimationClipAdditiveSettings",
+ "enabled": false,
+ "refClip": null
+ }
+]
\ No newline at end of file
diff --git a/assets/resources/game/hero/knight/k1/animtor/idle.anim.meta b/assets/resources/game/hero/knight/k1/animtor/idle.anim.meta
new file mode 100644
index 00000000..ae38080e
--- /dev/null
+++ b/assets/resources/game/hero/knight/k1/animtor/idle.anim.meta
@@ -0,0 +1 @@
+{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"b5ab4c86-dfdb-421f-a795-a0373212f73e","files":[".cconb"],"subMetas":{},"userData":{"name":"idle"}}
diff --git a/assets/resources/game/hero/knight/k1/animtor/max.anim b/assets/resources/game/hero/knight/k1/animtor/max.anim
new file mode 100644
index 00000000..b54baf1c
--- /dev/null
+++ b/assets/resources/game/hero/knight/k1/animtor/max.anim
@@ -0,0 +1,163 @@
+[
+ {
+ "__type__": "cc.AnimationClip",
+ "_name": "max",
+ "_objFlags": 0,
+ "__editorExtras__": {
+ "embeddedPlayerGroups": []
+ },
+ "_native": "",
+ "sample": 24,
+ "speed": 1,
+ "wrapMode": 1,
+ "enableTrsBlending": false,
+ "_duration": 0.75,
+ "_hash": 500763545,
+ "_tracks": [
+ {
+ "__id__": 1
+ }
+ ],
+ "_exoticAnimation": null,
+ "_events": [],
+ "_embeddedPlayers": [],
+ "_additiveSettings": {
+ "__id__": 6
+ },
+ "_auxiliaryCurveEntries": []
+ },
+ {
+ "__type__": "cc.animation.ObjectTrack",
+ "_binding": {
+ "__type__": "cc.animation.TrackBinding",
+ "path": {
+ "__id__": 2
+ },
+ "proxy": null
+ },
+ "_channel": {
+ "__id__": 4
+ }
+ },
+ {
+ "__type__": "cc.animation.TrackPath",
+ "_paths": [
+ {
+ "__id__": 3
+ },
+ "spriteFrame"
+ ]
+ },
+ {
+ "__type__": "cc.animation.ComponentPath",
+ "component": "cc.Sprite"
+ },
+ {
+ "__type__": "cc.animation.Channel",
+ "_curve": {
+ "__id__": 5
+ }
+ },
+ {
+ "__type__": "cc.ObjectCurve",
+ "_times": [
+ 0,
+ 0.041666666666666664,
+ 0.08333333333333333,
+ 0.125,
+ 0.16666666666666666,
+ 0.20833333333333334,
+ 0.25,
+ 0.2916666666666667,
+ 0.3333333333333333,
+ 0.375,
+ 0.4166666666666667,
+ 0.4583333333333333,
+ 0.5,
+ 0.5416666666666666,
+ 0.5833333333333334,
+ 0.625,
+ 0.6666666666666666,
+ 0.7083333333333334
+ ],
+ "_values": [
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@60799",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@26428",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@daa98",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@0779a",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@5eb28",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@1a538",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@fe61e",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@d1415",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@6823d",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@50949",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@e496c",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@648f3",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@9e4e1",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@f27c8",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@fce75",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@a12c4",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@956e1",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@d0912",
+ "__expectedType__": "cc.SpriteFrame"
+ }
+ ]
+ },
+ {
+ "__type__": "cc.AnimationClipAdditiveSettings",
+ "enabled": false,
+ "refClip": null
+ }
+]
\ No newline at end of file
diff --git a/assets/resources/game/hero/knight/k1/animtor/max.anim.meta b/assets/resources/game/hero/knight/k1/animtor/max.anim.meta
new file mode 100644
index 00000000..6378c0d9
--- /dev/null
+++ b/assets/resources/game/hero/knight/k1/animtor/max.anim.meta
@@ -0,0 +1 @@
+{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"fa58b1a2-2606-4fc4-89a2-e625be93ff3b","files":[".cconb"],"subMetas":{},"userData":{"name":"max"}}
diff --git a/assets/resources/game/hero/knight/k1/animtor/move.anim b/assets/resources/game/hero/knight/k1/animtor/move.anim
new file mode 100644
index 00000000..f71ffebe
--- /dev/null
+++ b/assets/resources/game/hero/knight/k1/animtor/move.anim
@@ -0,0 +1,163 @@
+[
+ {
+ "__type__": "cc.AnimationClip",
+ "_name": "move",
+ "_objFlags": 0,
+ "__editorExtras__": {
+ "embeddedPlayerGroups": []
+ },
+ "_native": "",
+ "sample": 24,
+ "speed": 1,
+ "wrapMode": 2,
+ "enableTrsBlending": false,
+ "_duration": 0.75,
+ "_hash": 500763545,
+ "_tracks": [
+ {
+ "__id__": 1
+ }
+ ],
+ "_exoticAnimation": null,
+ "_events": [],
+ "_embeddedPlayers": [],
+ "_additiveSettings": {
+ "__id__": 6
+ },
+ "_auxiliaryCurveEntries": []
+ },
+ {
+ "__type__": "cc.animation.ObjectTrack",
+ "_binding": {
+ "__type__": "cc.animation.TrackBinding",
+ "path": {
+ "__id__": 2
+ },
+ "proxy": null
+ },
+ "_channel": {
+ "__id__": 4
+ }
+ },
+ {
+ "__type__": "cc.animation.TrackPath",
+ "_paths": [
+ {
+ "__id__": 3
+ },
+ "spriteFrame"
+ ]
+ },
+ {
+ "__type__": "cc.animation.ComponentPath",
+ "component": "cc.Sprite"
+ },
+ {
+ "__type__": "cc.animation.Channel",
+ "_curve": {
+ "__id__": 5
+ }
+ },
+ {
+ "__type__": "cc.ObjectCurve",
+ "_times": [
+ 0,
+ 0.041666666666666664,
+ 0.08333333333333333,
+ 0.125,
+ 0.16666666666666666,
+ 0.20833333333333334,
+ 0.25,
+ 0.2916666666666667,
+ 0.3333333333333333,
+ 0.375,
+ 0.4166666666666667,
+ 0.4583333333333333,
+ 0.5,
+ 0.5416666666666666,
+ 0.5833333333333334,
+ 0.625,
+ 0.6666666666666666,
+ 0.7083333333333334
+ ],
+ "_values": [
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@02dd6",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@6d9c8",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@418cb",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@4f6da",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@dabad",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@69e31",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@b7990",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@f6bf0",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@6698a",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@60134",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@8564d",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@272a0",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@ba3ee",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@ff098",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@07703",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@14ae6",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@79ab7",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ {
+ "__uuid__": "c1bad438-a1a2-4e3a-b81e-6cac1f875a7a@5d708",
+ "__expectedType__": "cc.SpriteFrame"
+ }
+ ]
+ },
+ {
+ "__type__": "cc.AnimationClipAdditiveSettings",
+ "enabled": false,
+ "refClip": null
+ }
+]
\ No newline at end of file
diff --git a/assets/resources/game/hero/knight/k1/animtor/move.anim.meta b/assets/resources/game/hero/knight/k1/animtor/move.anim.meta
new file mode 100644
index 00000000..e063b21e
--- /dev/null
+++ b/assets/resources/game/hero/knight/k1/animtor/move.anim.meta
@@ -0,0 +1 @@
+{"ver":"2.0.3","importer":"animation-clip","imported":true,"uuid":"d15edf7e-7a4f-45cc-a4f2-5b8566c6ac7b","files":[".cconb"],"subMetas":{},"userData":{"name":"move"}}
diff --git a/assets/resources/game/hero/m1.prefab b/assets/resources/game/hero/m1.prefab
index 43419b5d..6473eb1a 100644
--- a/assets/resources/game/hero/m1.prefab
+++ b/assets/resources/game/hero/m1.prefab
@@ -34,29 +34,32 @@
"__id__": 34
},
{
- "__id__": 47
+ "__id__": 42
+ },
+ {
+ "__id__": 55
}
],
"_active": true,
"_components": [
- {
- "__id__": 55
- },
- {
- "__id__": 57
- },
- {
- "__id__": 59
- },
- {
- "__id__": 61
- },
{
"__id__": 63
+ },
+ {
+ "__id__": 65
+ },
+ {
+ "__id__": 67
+ },
+ {
+ "__id__": 69
+ },
+ {
+ "__id__": 71
}
],
"_prefab": {
- "__id__": 65
+ "__id__": 73
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -603,10 +606,10 @@
"__id__": 26
},
"asset": {
- "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
+ "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
"__expectedType__": "cc.Prefab"
},
- "fileId": "5fqU0L3/FOhKaco5UkHuWT",
+ "fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": {
"__id__": 28
},
@@ -614,7 +617,7 @@
},
{
"__type__": "cc.PrefabInstance",
- "fileId": "61G2LMRq5OJIcY4fQXU7TH",
+ "fileId": "f4l5/ZIjNLN4/iGzKsjvx8",
"prefabRootNode": {
"__id__": 1
},
@@ -644,12 +647,12 @@
"propertyPath": [
"_name"
],
- "value": "top"
+ "value": "shielded"
},
{
"__type__": "cc.TargetInfo",
"localID": [
- "5fqU0L3/FOhKaco5UkHuWT"
+ "c46/YsCPVOJYA4mWEpNYRx"
]
},
{
@@ -663,7 +666,7 @@
"value": {
"__type__": "cc.Vec3",
"x": 0,
- "y": 66.342,
+ "y": 22.431,
"z": 0
}
},
@@ -715,10 +718,10 @@
"__id__": 34
},
"asset": {
- "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
+ "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
"__expectedType__": "cc.Prefab"
},
- "fileId": "0d6ZXmA5dHkZxoGONDL2sE",
+ "fileId": "5fqU0L3/FOhKaco5UkHuWT",
"instance": {
"__id__": 36
},
@@ -726,7 +729,7 @@
},
{
"__type__": "cc.PrefabInstance",
- "fileId": "7dMMJSmBZEebgadN+QwPZl",
+ "fileId": "61G2LMRq5OJIcY4fQXU7TH",
"prefabRootNode": {
"__id__": 1
},
@@ -744,15 +747,6 @@
},
{
"__id__": 41
- },
- {
- "__id__": 42
- },
- {
- "__id__": 43
- },
- {
- "__id__": 45
}
],
"removedComponents": []
@@ -765,12 +759,12 @@
"propertyPath": [
"_name"
],
- "value": "tooltip"
+ "value": "top"
},
{
"__type__": "cc.TargetInfo",
"localID": [
- "0d6ZXmA5dHkZxoGONDL2sE"
+ "5fqU0L3/FOhKaco5UkHuWT"
]
},
{
@@ -783,8 +777,8 @@
],
"value": {
"__type__": "cc.Vec3",
- "x": -8.972,
- "y": 80.491,
+ "x": 0,
+ "y": 66.342,
"z": 0
}
},
@@ -819,10 +813,131 @@
"z": 0
}
},
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 43
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 42
+ },
+ "asset": {
+ "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "0d6ZXmA5dHkZxoGONDL2sE",
+ "instance": {
+ "__id__": 44
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "7dMMJSmBZEebgadN+QwPZl",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 45
+ },
+ {
+ "__id__": 47
+ },
+ {
+ "__id__": 48
+ },
+ {
+ "__id__": 49
+ },
+ {
+ "__id__": 50
+ },
+ {
+ "__id__": 51
+ },
+ {
+ "__id__": 53
+ }
+ ],
+ "removedComponents": []
+ },
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 38
+ "__id__": 46
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "tooltip"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "0d6ZXmA5dHkZxoGONDL2sE"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 46
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": -8.972,
+ "y": 80.491,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 46
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 46
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 46
},
"propertyPath": [
"_active"
@@ -832,7 +947,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 52
},
"propertyPath": [
"_active"
@@ -848,7 +963,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 46
+ "__id__": 54
},
"propertyPath": [
"_active"
@@ -868,14 +983,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 48
+ "__id__": 56
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 47
+ "__id__": 55
},
"asset": {
"__uuid__": "3e8ca50b-1db9-4996-affc-9d57af3a12d7",
@@ -883,7 +998,7 @@
},
"fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": {
- "__id__": 49
+ "__id__": 57
},
"targetOverrides": null
},
@@ -897,16 +1012,16 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 50
+ "__id__": 58
},
{
- "__id__": 52
+ "__id__": 60
},
{
- "__id__": 53
+ "__id__": 61
},
{
- "__id__": 54
+ "__id__": 62
}
],
"removedComponents": []
@@ -914,7 +1029,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 51
+ "__id__": 59
},
"propertyPath": [
"_name"
@@ -930,7 +1045,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 51
+ "__id__": 59
},
"propertyPath": [
"_lpos"
@@ -945,7 +1060,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 51
+ "__id__": 59
},
"propertyPath": [
"_lrot"
@@ -961,7 +1076,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 51
+ "__id__": 59
},
"propertyPath": [
"_euler"
@@ -983,7 +1098,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 56
+ "__id__": 64
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1011,7 +1126,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 58
+ "__id__": 66
},
"enabledContactListener": true,
"bullet": true,
@@ -1045,7 +1160,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 60
+ "__id__": 68
},
"tag": 0,
"_group": 4,
@@ -1079,7 +1194,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 62
+ "__id__": 70
},
"animator": {
"__id__": 23
@@ -1100,12 +1215,16 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 64
+ "__id__": 72
},
"hitFlashMaterial": {
"__uuid__": "a8f34051-ccff-4050-b9d9-234f62977264",
"__expectedType__": "cc.Material"
},
+ "atkMaterial": {
+ "__uuid__": "adc4e674-6203-42dd-8224-dffb471648a2",
+ "__expectedType__": "cc.Material"
+ },
"BoxRang": {
"__id__": 8
},
@@ -1128,7 +1247,10 @@
"targetOverrides": null,
"nestedPrefabInstanceRoots": [
{
- "__id__": 47
+ "__id__": 55
+ },
+ {
+ "__id__": 42
},
{
"__id__": 34
diff --git a/assets/resources/game/hero/m2.prefab b/assets/resources/game/hero/m2.prefab
index bd7d30fb..9f0cfefd 100644
--- a/assets/resources/game/hero/m2.prefab
+++ b/assets/resources/game/hero/m2.prefab
@@ -35,28 +35,31 @@
},
{
"__id__": 42
+ },
+ {
+ "__id__": 50
}
],
"_active": true,
"_components": [
- {
- "__id__": 50
- },
- {
- "__id__": 52
- },
- {
- "__id__": 54
- },
- {
- "__id__": 56
- },
{
"__id__": 58
+ },
+ {
+ "__id__": 60
+ },
+ {
+ "__id__": 62
+ },
+ {
+ "__id__": 64
+ },
+ {
+ "__id__": 66
}
],
"_prefab": {
- "__id__": 60
+ "__id__": 68
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -603,10 +606,10 @@
"__id__": 26
},
"asset": {
- "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
+ "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
"__expectedType__": "cc.Prefab"
},
- "fileId": "5fqU0L3/FOhKaco5UkHuWT",
+ "fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": {
"__id__": 28
},
@@ -614,7 +617,7 @@
},
{
"__type__": "cc.PrefabInstance",
- "fileId": "fbnlH+a31Je7BCHxS4wyJI",
+ "fileId": "07YwtBL8pHJbIRyVp1/c5y",
"prefabRootNode": {
"__id__": 1
},
@@ -644,12 +647,12 @@
"propertyPath": [
"_name"
],
- "value": "top"
+ "value": "shielded"
},
{
"__type__": "cc.TargetInfo",
"localID": [
- "5fqU0L3/FOhKaco5UkHuWT"
+ "c46/YsCPVOJYA4mWEpNYRx"
]
},
{
@@ -663,7 +666,7 @@
"value": {
"__type__": "cc.Vec3",
"x": 0,
- "y": 66.342,
+ "y": 22.431,
"z": 0
}
},
@@ -715,10 +718,10 @@
"__id__": 34
},
"asset": {
- "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
+ "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
"__expectedType__": "cc.Prefab"
},
- "fileId": "0d6ZXmA5dHkZxoGONDL2sE",
+ "fileId": "5fqU0L3/FOhKaco5UkHuWT",
"instance": {
"__id__": 36
},
@@ -726,7 +729,7 @@
},
{
"__type__": "cc.PrefabInstance",
- "fileId": "a4dhdtn4xOyYE8gwiRC1Lz",
+ "fileId": "fbnlH+a31Je7BCHxS4wyJI",
"prefabRootNode": {
"__id__": 1
},
@@ -756,12 +759,12 @@
"propertyPath": [
"_name"
],
- "value": "tooltip"
+ "value": "top"
},
{
"__type__": "cc.TargetInfo",
"localID": [
- "0d6ZXmA5dHkZxoGONDL2sE"
+ "5fqU0L3/FOhKaco5UkHuWT"
]
},
{
@@ -774,8 +777,8 @@
],
"value": {
"__type__": "cc.Vec3",
- "x": -8.972,
- "y": 80.491,
+ "x": 0,
+ "y": 66.342,
"z": 0
}
},
@@ -827,10 +830,10 @@
"__id__": 42
},
"asset": {
- "__uuid__": "3e8ca50b-1db9-4996-affc-9d57af3a12d7",
+ "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
"__expectedType__": "cc.Prefab"
},
- "fileId": "c46/YsCPVOJYA4mWEpNYRx",
+ "fileId": "0d6ZXmA5dHkZxoGONDL2sE",
"instance": {
"__id__": 44
},
@@ -838,7 +841,7 @@
},
{
"__type__": "cc.PrefabInstance",
- "fileId": "d7hed2I+tMqI6SzzKHKZkY",
+ "fileId": "a4dhdtn4xOyYE8gwiRC1Lz",
"prefabRootNode": {
"__id__": 1
},
@@ -868,12 +871,12 @@
"propertyPath": [
"_name"
],
- "value": "heathed"
+ "value": "tooltip"
},
{
"__type__": "cc.TargetInfo",
"localID": [
- "c46/YsCPVOJYA4mWEpNYRx"
+ "0d6ZXmA5dHkZxoGONDL2sE"
]
},
{
@@ -886,8 +889,8 @@
],
"value": {
"__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
+ "x": -8.972,
+ "y": 80.491,
"z": 0
}
},
@@ -922,6 +925,118 @@
"z": 0
}
},
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 51
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 50
+ },
+ "asset": {
+ "__uuid__": "3e8ca50b-1db9-4996-affc-9d57af3a12d7",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "c46/YsCPVOJYA4mWEpNYRx",
+ "instance": {
+ "__id__": 52
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "d7hed2I+tMqI6SzzKHKZkY",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 53
+ },
+ {
+ "__id__": 55
+ },
+ {
+ "__id__": 56
+ },
+ {
+ "__id__": 57
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 54
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "heathed"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "c46/YsCPVOJYA4mWEpNYRx"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 54
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 54
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 54
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
{
"__type__": "cc.UITransform",
"_name": "",
@@ -932,7 +1047,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 51
+ "__id__": 59
},
"_contentSize": {
"__type__": "cc.Size",
@@ -960,7 +1075,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 53
+ "__id__": 61
},
"enabledContactListener": true,
"bullet": true,
@@ -994,7 +1109,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 55
+ "__id__": 63
},
"tag": 0,
"_group": 4,
@@ -1028,7 +1143,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 57
+ "__id__": 65
},
"animator": {
"__id__": 23
@@ -1049,12 +1164,16 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 59
+ "__id__": 67
},
"hitFlashMaterial": {
"__uuid__": "a8f34051-ccff-4050-b9d9-234f62977264",
"__expectedType__": "cc.Material"
},
+ "atkMaterial": {
+ "__uuid__": "adc4e674-6203-42dd-8224-dffb471648a2",
+ "__expectedType__": "cc.Material"
+ },
"BoxRang": {
"__id__": 8
},
@@ -1076,6 +1195,9 @@
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": [
+ {
+ "__id__": 50
+ },
{
"__id__": 42
},
diff --git a/assets/resources/game/hero/m3.prefab b/assets/resources/game/hero/m3.prefab
index 56aa5989..64882654 100644
--- a/assets/resources/game/hero/m3.prefab
+++ b/assets/resources/game/hero/m3.prefab
@@ -35,28 +35,31 @@
},
{
"__id__": 42
+ },
+ {
+ "__id__": 50
}
],
"_active": true,
"_components": [
- {
- "__id__": 50
- },
- {
- "__id__": 52
- },
- {
- "__id__": 54
- },
- {
- "__id__": 56
- },
{
"__id__": 58
+ },
+ {
+ "__id__": 60
+ },
+ {
+ "__id__": 62
+ },
+ {
+ "__id__": 64
+ },
+ {
+ "__id__": 66
}
],
"_prefab": {
- "__id__": 60
+ "__id__": 68
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -603,10 +606,10 @@
"__id__": 26
},
"asset": {
- "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
+ "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
"__expectedType__": "cc.Prefab"
},
- "fileId": "5fqU0L3/FOhKaco5UkHuWT",
+ "fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": {
"__id__": 28
},
@@ -614,7 +617,7 @@
},
{
"__type__": "cc.PrefabInstance",
- "fileId": "87wHDvsz1I06TFBYYgAj1l",
+ "fileId": "56vS0iIehGw7+cX9I0Z2SW",
"prefabRootNode": {
"__id__": 1
},
@@ -644,12 +647,12 @@
"propertyPath": [
"_name"
],
- "value": "top"
+ "value": "shielded"
},
{
"__type__": "cc.TargetInfo",
"localID": [
- "5fqU0L3/FOhKaco5UkHuWT"
+ "c46/YsCPVOJYA4mWEpNYRx"
]
},
{
@@ -663,7 +666,7 @@
"value": {
"__type__": "cc.Vec3",
"x": 0,
- "y": 66.342,
+ "y": 22.431,
"z": 0
}
},
@@ -715,10 +718,10 @@
"__id__": 34
},
"asset": {
- "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
+ "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
"__expectedType__": "cc.Prefab"
},
- "fileId": "0d6ZXmA5dHkZxoGONDL2sE",
+ "fileId": "5fqU0L3/FOhKaco5UkHuWT",
"instance": {
"__id__": 36
},
@@ -726,7 +729,7 @@
},
{
"__type__": "cc.PrefabInstance",
- "fileId": "abSCtwZP9GwLDBkWbpyZBu",
+ "fileId": "87wHDvsz1I06TFBYYgAj1l",
"prefabRootNode": {
"__id__": 1
},
@@ -756,12 +759,12 @@
"propertyPath": [
"_name"
],
- "value": "tooltip"
+ "value": "top"
},
{
"__type__": "cc.TargetInfo",
"localID": [
- "0d6ZXmA5dHkZxoGONDL2sE"
+ "5fqU0L3/FOhKaco5UkHuWT"
]
},
{
@@ -774,8 +777,8 @@
],
"value": {
"__type__": "cc.Vec3",
- "x": -8.972,
- "y": 80.491,
+ "x": 0,
+ "y": 66.342,
"z": 0
}
},
@@ -827,10 +830,10 @@
"__id__": 42
},
"asset": {
- "__uuid__": "3e8ca50b-1db9-4996-affc-9d57af3a12d7",
+ "__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
"__expectedType__": "cc.Prefab"
},
- "fileId": "c46/YsCPVOJYA4mWEpNYRx",
+ "fileId": "0d6ZXmA5dHkZxoGONDL2sE",
"instance": {
"__id__": 44
},
@@ -838,7 +841,7 @@
},
{
"__type__": "cc.PrefabInstance",
- "fileId": "bflYRbc+JA35Hl2RLKmLqb",
+ "fileId": "abSCtwZP9GwLDBkWbpyZBu",
"prefabRootNode": {
"__id__": 1
},
@@ -868,12 +871,12 @@
"propertyPath": [
"_name"
],
- "value": "heathed"
+ "value": "tooltip"
},
{
"__type__": "cc.TargetInfo",
"localID": [
- "c46/YsCPVOJYA4mWEpNYRx"
+ "0d6ZXmA5dHkZxoGONDL2sE"
]
},
{
@@ -886,8 +889,8 @@
],
"value": {
"__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
+ "x": -8.972,
+ "y": 80.491,
"z": 0
}
},
@@ -922,6 +925,118 @@
"z": 0
}
},
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 51
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 50
+ },
+ "asset": {
+ "__uuid__": "3e8ca50b-1db9-4996-affc-9d57af3a12d7",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "c46/YsCPVOJYA4mWEpNYRx",
+ "instance": {
+ "__id__": 52
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "bflYRbc+JA35Hl2RLKmLqb",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 53
+ },
+ {
+ "__id__": 55
+ },
+ {
+ "__id__": 56
+ },
+ {
+ "__id__": 57
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 54
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "heathed"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "c46/YsCPVOJYA4mWEpNYRx"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 54
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 54
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 54
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
{
"__type__": "cc.UITransform",
"_name": "",
@@ -932,7 +1047,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 51
+ "__id__": 59
},
"_contentSize": {
"__type__": "cc.Size",
@@ -960,7 +1075,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 53
+ "__id__": 61
},
"enabledContactListener": true,
"bullet": true,
@@ -994,7 +1109,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 55
+ "__id__": 63
},
"tag": 0,
"_group": 4,
@@ -1028,7 +1143,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 57
+ "__id__": 65
},
"animator": {
"__id__": 23
@@ -1049,12 +1164,16 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 59
+ "__id__": 67
},
"hitFlashMaterial": {
"__uuid__": "a8f34051-ccff-4050-b9d9-234f62977264",
"__expectedType__": "cc.Material"
},
+ "atkMaterial": {
+ "__uuid__": "adc4e674-6203-42dd-8224-dffb471648a2",
+ "__expectedType__": "cc.Material"
+ },
"BoxRang": {
"__id__": 8
},
@@ -1076,6 +1195,9 @@
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": [
+ {
+ "__id__": 50
+ },
{
"__id__": 42
},
diff --git a/assets/resources/game/hero/top.prefab b/assets/resources/game/hero/top.prefab
index a4cea905..1700517d 100644
--- a/assets/resources/game/hero/top.prefab
+++ b/assets/resources/game/hero/top.prefab
@@ -28,11 +28,11 @@
"_active": true,
"_components": [
{
- "__id__": 38
+ "__id__": 32
}
],
"_prefab": {
- "__id__": 40
+ "__id__": 34
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -381,19 +381,16 @@
},
{
"__id__": 23
- },
- {
- "__id__": 29
}
],
"_active": true,
"_components": [
{
- "__id__": 35
+ "__id__": 29
}
],
"_prefab": {
- "__id__": 37
+ "__id__": 31
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -426,7 +423,7 @@
},
{
"__type__": "cc.Node",
- "_name": "def",
+ "_name": "atk",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
@@ -447,8 +444,8 @@
},
"_lpos": {
"__type__": "cc.Vec3",
- "x": -14,
- "y": 7,
+ "x": -8.725,
+ "y": 12.79,
"z": 0
},
"_lrot": {
@@ -488,144 +485,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 16,
- "height": 16
- },
- "_anchorPoint": {
- "__type__": "cc.Vec2",
- "x": 0.5,
- "y": 0.5
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "3eR6gIKgpAPLopyt1MiwR8"
- },
- {
- "__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@779a3",
- "__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": "23/l3UOB1MFr9THGv3i8Ru"
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 1
- },
- "asset": {
- "__id__": 0
- },
- "fileId": "a0XbEkK/5Hz5NHSlvc4s5C",
- "instance": null,
- "targetOverrides": null,
- "nestedPrefabInstanceRoots": null
- },
- {
- "__type__": "cc.Node",
- "_name": "atk",
- "_objFlags": 0,
- "__editorExtras__": {},
- "_parent": {
- "__id__": 16
- },
- "_children": [],
- "_active": false,
- "_components": [
- {
- "__id__": 24
- },
- {
- "__id__": 26
- }
- ],
- "_prefab": {
- "__id__": 28
- },
- "_lpos": {
- "__type__": "cc.Vec3",
- "x": 1,
- "y": 7,
- "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__": 23
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 25
- },
- "_contentSize": {
- "__type__": "cc.Size",
- "width": 16,
- "height": 16
+ "width": 24,
+ "height": 24
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -644,11 +505,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 23
+ "__id__": 17
},
"_enabled": true,
"__prefab": {
- "__id__": 27
+ "__id__": 21
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -708,19 +569,19 @@
"_active": false,
"_components": [
{
- "__id__": 30
+ "__id__": 24
},
{
- "__id__": 32
+ "__id__": 26
}
],
"_prefab": {
- "__id__": 34
+ "__id__": 28
},
"_lpos": {
"__type__": "cc.Vec3",
- "x": 15,
- "y": 7,
+ "x": 16.109,
+ "y": 12.449,
"z": 0
},
"_lrot": {
@@ -752,16 +613,16 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 29
+ "__id__": 23
},
"_enabled": true,
"__prefab": {
- "__id__": 31
+ "__id__": 25
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 16,
- "height": 16
+ "width": 24,
+ "height": 24
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -780,11 +641,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 29
+ "__id__": 23
},
"_enabled": true,
"__prefab": {
- "__id__": 33
+ "__id__": 27
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -842,7 +703,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 36
+ "__id__": 30
},
"_contentSize": {
"__type__": "cc.Size",
@@ -883,7 +744,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 39
+ "__id__": 33
},
"_contentSize": {
"__type__": "cc.Size",
diff --git a/assets/resources/game/hero/wall.prefab b/assets/resources/game/hero/wall.prefab
new file mode 100644
index 00000000..f9b82779
--- /dev/null
+++ b/assets/resources/game/hero/wall.prefab
@@ -0,0 +1,225 @@
+[
+ {
+ "__type__": "cc.Prefab",
+ "_name": "wall",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_native": "",
+ "data": {
+ "__id__": 1
+ },
+ "optimizationPolicy": 0,
+ "persistent": false
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "wall",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": null,
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 2
+ },
+ {
+ "__id__": 4
+ },
+ {
+ "__id__": 6
+ },
+ {
+ "__id__": 8
+ },
+ {
+ "__id__": 10
+ }
+ ],
+ "_prefab": {
+ "__id__": 12
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": -0.041,
+ "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__": 1
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 3
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 80,
+ "height": 80
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "14OhXRCixNOaApgow/hFbp"
+ },
+ {
+ "__type__": "cc.RigidBody2D",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 1
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 5
+ },
+ "enabledContactListener": true,
+ "bullet": true,
+ "awakeOnLoad": true,
+ "_group": 4,
+ "_type": 1,
+ "_allowSleep": false,
+ "_gravityScale": 1,
+ "_linearDamping": 0,
+ "_angularDamping": 0,
+ "_linearVelocity": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_angularVelocity": 0,
+ "_fixedRotation": true,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "d8rVs6intBQ7lRU8Dw4zXV"
+ },
+ {
+ "__type__": "cc.BoxCollider2D",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 1
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 7
+ },
+ "tag": 0,
+ "_group": 4,
+ "_density": 1,
+ "_sensor": false,
+ "_friction": 1,
+ "_restitution": 0,
+ "_offset": {
+ "__type__": "cc.Vec2",
+ "x": 3.8,
+ "y": 38.9
+ },
+ "_size": {
+ "__type__": "cc.Size",
+ "width": 38.7,
+ "height": 52.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "b2Dt9lJI9FyJCDezkDBPBl"
+ },
+ {
+ "__type__": "873f8d+SolMEo8DiTTxZRh4",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 1
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 9
+ },
+ "hitFlashMaterial": {
+ "__uuid__": "a8f34051-ccff-4050-b9d9-234f62977264",
+ "__expectedType__": "cc.Material"
+ },
+ "atkMaterial": {
+ "__uuid__": "adc4e674-6203-42dd-8224-dffb471648a2",
+ "__expectedType__": "cc.Material"
+ },
+ "BoxRang": null,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "e8D7SIXqhMy70eo38v4RXC"
+ },
+ {
+ "__type__": "a0379fmhvBHcbNcBF/l43O8",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 1
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 11
+ },
+ "animator": null,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "6c9bpIQcBJzaUECAD6NGcW"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "fdklpBwCBM/qJ4WFlQF3kT",
+ "instance": null,
+ "targetOverrides": null
+ }
+]
\ No newline at end of file
diff --git a/assets/resources/game/hero/wall.prefab.meta b/assets/resources/game/hero/wall.prefab.meta
new file mode 100644
index 00000000..6c3ce9c6
--- /dev/null
+++ b/assets/resources/game/hero/wall.prefab.meta
@@ -0,0 +1,13 @@
+{
+ "ver": "1.1.50",
+ "importer": "prefab",
+ "imported": true,
+ "uuid": "7c43d987-608a-45c7-83a2-ed563d4cbc72",
+ "files": [
+ ".json"
+ ],
+ "subMetas": {},
+ "userData": {
+ "syncNodeName": "wall"
+ }
+}
diff --git a/assets/resources/game/heros/cskill.prefab b/assets/resources/game/heros/cskill.prefab
index b4240f70..e6398862 100644
--- a/assets/resources/game/heros/cskill.prefab
+++ b/assets/resources/game/heros/cskill.prefab
@@ -29,13 +29,10 @@
"_components": [
{
"__id__": 16
- },
- {
- "__id__": 18
}
],
"_prefab": {
- "__id__": 20
+ "__id__": 18
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -175,7 +172,7 @@
},
"_type": 0,
"_fillType": 0,
- "_sizeMode": 1,
+ "_sizeMode": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
@@ -421,24 +418,6 @@
"__type__": "cc.CompPrefabInfo",
"fileId": "14OhXRCixNOaApgow/hFbp"
},
- {
- "__type__": "31174UD2TRL1L1oAaqlU06B",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 1
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 19
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "b4nIIcjGpGm7x6Bn3w4OXb"
- },
{
"__type__": "cc.PrefabInfo",
"root": {
diff --git a/assets/resources/game/heros/cskill.prefab.meta b/assets/resources/game/heros/cskill.prefab.meta
index 163cd77d..38790ccf 100644
--- a/assets/resources/game/heros/cskill.prefab.meta
+++ b/assets/resources/game/heros/cskill.prefab.meta
@@ -2,7 +2,7 @@
"ver": "1.1.50",
"importer": "prefab",
"imported": true,
- "uuid": "cece794f-d3f6-4ff3-8515-76a169e58f70",
+ "uuid": "78c5dfd6-2154-4fe3-b7ff-506decefde37",
"files": [
".json"
],
diff --git a/assets/resources/game/heros/knight/skeleton.atlas b/assets/resources/game/heros/knight/skeleton.atlas
new file mode 100644
index 00000000..9b544b13
--- /dev/null
+++ b/assets/resources/game/heros/knight/skeleton.atlas
@@ -0,0 +1,209 @@
+
+skeleton.png
+size: 567, 142
+format: RGBA8888
+filter: Linear, Linear
+repeat: none
+Angry
+ rotate: true
+ xy: 522, 70
+ size: 28, 15
+ orig: 128, 128
+ offset: 59, 59
+ index: -1
+EmberHarbinger
+ rotate: false
+ xy: 2, 14
+ size: 41, 126
+ orig: 128, 256
+ offset: 43, 38
+ index: -1
+Eyes1
+ rotate: false
+ xy: 457, 2
+ size: 43, 16
+ orig: 128, 128
+ offset: 52, 74
+ index: -1
+Eyes10
+ rotate: true
+ xy: 97, 2
+ size: 42, 14
+ orig: 128, 128
+ offset: 53, 75
+ index: -1
+Fluffy
+ rotate: true
+ xy: 45, 46
+ size: 94, 78
+ orig: 256, 256
+ offset: 83, 132
+ index: -1
+ShieldOfRagingCrux
+ rotate: true
+ xy: 222, 2
+ size: 54, 58
+ orig: 128, 128
+ offset: 38, 36
+ index: -1
+body
+ rotate: true
+ xy: 113, 4
+ size: 40, 49
+ orig: 40, 49
+ offset: 0, 0
+ index: -1
+body2
+ rotate: true
+ xy: 164, 5
+ size: 47, 56
+ orig: 47, 56
+ offset: 0, 0
+ index: -1
+er
+ rotate: false
+ xy: 539, 81
+ size: 15, 20
+ orig: 21, 20
+ offset: 0, 0
+ index: -1
+eye
+ rotate: true
+ xy: 457, 20
+ size: 45, 16
+ orig: 46, 16
+ offset: 1, 0
+ index: -1
+eye2
+ rotate: false
+ xy: 2, 2
+ size: 29, 4
+ orig: 128, 128
+ offset: 61, 81
+ index: -1
+fa
+ rotate: true
+ xy: 125, 54
+ size: 86, 75
+ orig: 86, 75
+ offset: 0, 0
+ index: -1
+hand3
+ rotate: true
+ xy: 502, 2
+ size: 21, 24
+ orig: 21, 24
+ offset: 0, 0
+ index: -1
+head
+ rotate: false
+ xy: 435, 67
+ size: 69, 73
+ orig: 69, 73
+ offset: 0, 0
+ index: -1
+hl
+ rotate: false
+ xy: 475, 25
+ size: 32, 40
+ orig: 32, 40
+ offset: 0, 0
+ index: -1
+hl2
+ rotate: false
+ xy: 405, 10
+ size: 33, 46
+ orig: 33, 46
+ offset: 0, 0
+ index: -1
+hr
+ rotate: true
+ xy: 530, 103
+ size: 37, 35
+ orig: 37, 35
+ offset: 0, 0
+ index: -1
+hr2
+ rotate: false
+ xy: 365, 10
+ size: 38, 46
+ orig: 38, 46
+ offset: 0, 0
+ index: -1
+ll
+ rotate: false
+ xy: 533, 35
+ size: 19, 33
+ orig: 20, 33
+ offset: 0, 0
+ index: -1
+ll2
+ rotate: false
+ xy: 506, 100
+ size: 22, 40
+ orig: 22, 40
+ offset: 0, 0
+ index: -1
+ll3
+ rotate: false
+ xy: 51, 2
+ size: 21, 42
+ orig: 21, 42
+ offset: 0, 0
+ index: -1
+lr
+ rotate: true
+ xy: 528, 5
+ size: 20, 33
+ orig: 20, 33
+ offset: 0, 0
+ index: -1
+lr2
+ rotate: false
+ xy: 509, 27
+ size: 22, 40
+ orig: 22, 40
+ offset: 0, 0
+ index: -1
+lr3
+ rotate: false
+ xy: 74, 2
+ size: 21, 42
+ orig: 21, 42
+ offset: 0, 0
+ index: -1
+mei
+ rotate: false
+ xy: 2, 8
+ size: 47, 4
+ orig: 47, 6
+ offset: 0, 1
+ index: -1
+tx
+ rotate: false
+ xy: 202, 58
+ size: 231, 82
+ orig: 235, 86
+ offset: 2, 2
+ index: -1
+tx_huo
+ rotate: true
+ xy: 282, 4
+ size: 52, 81
+ orig: 59, 85
+ offset: 4, 2
+ index: -1
+ying_zi
+ rotate: true
+ xy: 440, 4
+ size: 61, 15
+ orig: 63, 17
+ offset: 1, 1
+ index: -1
+zui
+ rotate: true
+ xy: 506, 69
+ size: 29, 14
+ orig: 29, 15
+ offset: 0, 0
+ index: -1
diff --git a/assets/resources/game/heros/knight/skeleton.atlas.meta b/assets/resources/game/heros/knight/skeleton.atlas.meta
new file mode 100644
index 00000000..2b2136de
--- /dev/null
+++ b/assets/resources/game/heros/knight/skeleton.atlas.meta
@@ -0,0 +1,12 @@
+{
+ "ver": "1.0.1",
+ "importer": "*",
+ "imported": true,
+ "uuid": "46a425a1-e454-4a2a-893b-91f34a79525f",
+ "files": [
+ ".atlas",
+ ".json"
+ ],
+ "subMetas": {},
+ "userData": {}
+}
diff --git a/assets/resources/game/heros/knight/skeleton.json b/assets/resources/game/heros/knight/skeleton.json
new file mode 100644
index 00000000..d94cb73e
--- /dev/null
+++ b/assets/resources/game/heros/knight/skeleton.json
@@ -0,0 +1,469 @@
+{
+"skeleton": {
+ "hash": "dy6XnZ8XLvE",
+ "spine": "3.8-from-4.0-from-4.1-from-4.2.35",
+ "x": -251.3,
+ "y": -119.77,
+ "width": 512,
+ "height": 512,
+ "images": "./images/",
+ "audio": "./audio"
+},
+"bones": [
+ { "name": "root" },
+ { "name": "bone2", "parent": "root", "length": 202.4, "rotation": 88.88, "x": 11.22, "y": 6.2 },
+ { "name": "bone", "parent": "bone2", "length": 66.85, "rotation": -0.08, "x": 58.47, "y": 2.88 },
+ { "name": "ll", "parent": "bone2", "length": 26.12, "rotation": 173.67, "x": 68.31, "y": 14.85 },
+ { "name": "bone3", "parent": "ll", "length": 22.56, "rotation": 1.56, "x": 34.35, "y": -0.59 },
+ { "name": "lr", "parent": "bone2", "length": 26.03, "rotation": -174.88, "x": 68.13, "y": -12.42 },
+ { "name": "bone5", "parent": "lr", "length": 18.29, "x": 35.28 },
+ { "name": "sl", "parent": "bone", "length": 14.78, "rotation": 91.21, "x": 61.11, "y": 5.51 },
+ { "name": "sr", "parent": "bone", "length": 11.26, "rotation": -88.79, "x": 60.67, "y": -7.17 },
+ { "name": "hl", "parent": "sl", "length": 20.69, "rotation": 34.7, "x": 33.63 },
+ { "name": "bone9", "parent": "hl", "length": 22.97, "rotation": 44.83, "x": 24.23, "y": 1.82 },
+ { "name": "hand", "parent": "bone9", "length": 11.45, "rotation": 68.95, "x": 30.49, "y": 2.31 },
+ { "name": "hr", "parent": "sr", "length": 20.6, "rotation": -76.07, "x": 10.89, "y": -3.74 },
+ { "name": "bone12", "parent": "hr", "length": 14.79, "rotation": 17.49, "x": 21.99, "y": -0.19 },
+ { "name": "bone13", "parent": "bone12", "length": 10.74, "rotation": 33.05, "x": 20.11, "y": 1.37 },
+ { "name": "head", "parent": "bone", "length": 67.99, "rotation": -5.33, "x": 73.16, "y": -0.27 },
+ { "name": "weapon", "parent": "hand", "length": 145.2, "rotation": 11.89, "x": -33.82, "y": -15.3 },
+ { "name": "weapon2", "parent": "bone13", "length": 178.63, "rotation": 66.88, "x": 0.14, "y": -14.27 },
+ { "name": "showder", "parent": "root", "length": 68.57, "rotation": -1.67, "x": -19.7, "y": 12.33 },
+ {
+ "name": "tx",
+ "parent": "root",
+ "length": 51.11,
+ "rotation": -0.4,
+ "x": 10.56,
+ "y": 7.68,
+ "scaleX": 1.1582
+ }
+],
+"slots": [
+ { "name": "ying_zi", "bone": "showder", "attachment": "ying_zi" },
+ { "name": "hr", "bone": "hr", "attachment": "hr2" },
+ { "name": "lr", "bone": "lr", "attachment": "lr3" },
+ { "name": "ll", "bone": "ll", "attachment": "ll3" },
+ { "name": "body", "bone": "bone", "attachment": "body2" },
+ { "name": "ShieldOfRagingCrux", "bone": "weapon2", "attachment": "ShieldOfRagingCrux" },
+ { "name": "hl", "bone": "hl", "attachment": "hl2" },
+ { "name": "head", "bone": "head", "attachment": "head" },
+ { "name": "mei", "bone": "head", "attachment": "mei" },
+ { "name": "zui", "bone": "head" },
+ { "name": "eye", "bone": "head", "attachment": "Eyes10" },
+ { "name": "fa", "bone": "head", "attachment": "Fluffy" },
+ { "name": "er", "bone": "head", "attachment": "er" },
+ { "name": "EmberHarbinger", "bone": "weapon", "attachment": "EmberHarbinger" },
+ { "name": "tx", "bone": "hand", "color": "ffffff5b", "attachment": "tx_huo" },
+ { "name": "hand3", "bone": "hand", "attachment": "hand3" },
+ { "name": "tx2", "bone": "tx", "color": "ffffff00", "attachment": "tx" }
+],
+"skins": [
+ {
+ "name": "default",
+ "attachments": {
+ "body": {
+ "body": { "x": 34.27, "y": 4.7, "rotation": -88.79, "width": 80, "height": 98 },
+ "body2": { "x": 23.39, "rotation": -88.79, "width": 94, "height": 112 }
+ },
+ "EmberHarbinger": {
+ "EmberHarbinger": {
+ "x": 131.06,
+ "y": -4.35,
+ "scaleX": 0.7,
+ "scaleY": 0.7,
+ "rotation": -91.25,
+ "width": 256,
+ "height": 512
+ }
+ },
+ "er": {
+ "er": { "x": 23.57, "y": 55.92, "rotation": -83.46, "width": 41, "height": 40 }
+ },
+ "eye": {
+ "eye": { "x": 41.2, "y": -7.57, "rotation": -83.46, "width": 91, "height": 32 },
+ "eye2": { "x": -3.46, "y": 10.76, "rotation": -83.46, "width": 256, "height": 256 },
+ "Eyes1": { "x": -3.13, "y": 8.02, "rotation": -83.46, "width": 256, "height": 256 },
+ "Eyes10": { "x": -0.59, "y": 5.72, "rotation": -83.46, "width": 256, "height": 256 }
+ },
+ "fa": {
+ "fa": { "x": 65.45, "y": 11.31, "rotation": -83.46, "width": 172, "height": 149 },
+ "Fluffy": { "x": -2.36, "y": 6.36, "rotation": -83.46, "width": 512, "height": 512 }
+ },
+ "hand3": {
+ "hand3": { "x": -1.14, "y": -2.38, "rotation": 28.52, "width": 42, "height": 48 }
+ },
+ "head": {
+ "head": { "x": 60.57, "y": 8.93, "rotation": -83.46, "width": 137, "height": 146 }
+ },
+ "hl": {
+ "hl": {
+ "type": "mesh",
+ "uvs": [ 0.91973, 0.06315, 0.98465, 0.15844, 0.9846, 0.27665, 0.96356, 0.34274, 0.85574, 0.42815, 0.71839, 0.47587, 0.69667, 0.51068, 0.67495, 0.5455, 0.64284, 0.59697, 0.63151, 0.61513, 0.6763, 0.76711, 0.52215, 0.82896, 0.50016, 0.86057, 0.50037, 0.93852, 0.45433, 0.97386, 0.24461, 0.99064, 0.12069, 0.9571, 0.05673, 0.88237, 0.01541, 0.75116, 0.01539, 0.67585, 0.01538, 0.60054, 0.04973, 0.51725, 0.08408, 0.43396, 0.17274, 0.30513, 0.19684, 0.27011, 0.22037, 0.23593, 0.42194, 0.07475, 0.60216, 0.01218, 0.80094, 0.01237 ],
+ "triangles": [ 14, 15, 12, 13, 14, 12, 15, 17, 12, 15, 16, 17, 17, 18, 12, 12, 18, 11, 10, 11, 9, 9, 11, 19, 11, 18, 19, 9, 19, 20, 9, 20, 21, 8, 9, 22, 9, 21, 22, 7, 8, 23, 8, 22, 23, 7, 23, 6, 23, 24, 6, 6, 24, 5, 24, 25, 5, 25, 26, 5, 26, 27, 5, 2, 4, 27, 4, 5, 27, 3, 4, 2, 28, 2, 27, 28, 1, 2, 1, 28, 0 ],
+ "vertices": [ 1, 9, -10.11, -8.72, 1, 1, 9, -11.73, -0.19, 1, 2, 9, -8.83, 8.81, 0.99545, 10, -18.52, 28.27, 0.00455, 2, 9, -5.93, 13.43, 0.97923, 10, -13.21, 29.5, 0.02077, 3, 9, 2.73, 17.82, 0.87911, 10, -3.97, 26.51, 0.11659, 11, 10.86, 40.69, 0.00431, 3, 9, 12.26, 18.77, 0.53864, 10, 3.46, 20.46, 0.4079, 11, 7.74, 31.63, 0.05346, 3, 9, 14.44, 21, 0.36489, 10, 6.57, 20.51, 0.5275, 11, 8.85, 28.72, 0.10761, 3, 9, 16.61, 23.22, 0.24291, 10, 9.69, 20.55, 0.57934, 11, 9.97, 25.82, 0.17775, 3, 9, 19.83, 26.51, 0.11404, 10, 14.29, 20.62, 0.54984, 11, 11.61, 21.52, 0.33612, 3, 9, 20.97, 27.67, 0.07641, 10, 15.91, 20.64, 0.49897, 11, 12.19, 20, 0.42462, 3, 9, 21.96, 40.13, 0.00233, 10, 25.39, 28.77, 0.1952, 11, 23.09, 13.9, 0.80247, 2, 10, 34.32, 22.28, 0.04849, 11, 20.07, 3.28, 0.95151, 2, 10, 37.21, 22.19, 0.01266, 11, 20.99, 0.54, 0.98734, 1, 11, 25.59, -3.67, 1, 1, 11, 25.69, -7.75, 1, 1, 11, 17.61, -18.55, 1, 1, 11, 10.27, -22.58, 1, 2, 10, 51.8, -2.21, 1.1E-4, 11, 3.1, -21.56, 0.99989, 2, 10, 43.69, -9.38, 0.06775, 11, -6.43, -16.42, 0.93225, 2, 10, 38.34, -12.15, 0.22918, 11, -10.87, -12.35, 0.77082, 2, 10, 32.99, -14.92, 0.47615, 11, -15.31, -8.28, 0.52385, 2, 10, 26.06, -16.03, 0.77621, 11, -18.74, -2.15, 0.22379, 2, 10, 19.13, -17.14, 0.95497, 11, -22.17, 3.97, 0.04503, 2, 9, 41.33, -4.92, 0.02333, 10, 7.37, -16.83, 0.97667, 2, 9, 39, -7.12, 0.06727, 10, 4.18, -16.75, 0.93273, 2, 9, 36.73, -9.26, 0.13707, 10, 1.06, -16.67, 0.86293, 2, 9, 20.51, -17.59, 0.92021, 10, -16.32, -11.13, 0.07979, 1, 9, 7.99, -18.82, 1, 1, 9, -4.11, -14.92, 1 ],
+ "hull": 29,
+ "edges": [ 0, 56, 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 18, 20, 20, 22, 22, 24, 24, 26, 26, 28, 28, 30, 30, 32, 32, 34, 34, 36, 50, 52, 52, 54, 54, 56, 48, 50, 44, 46, 46, 48, 10, 12, 12, 14, 14, 16, 16, 18, 40, 42, 42, 44, 36, 38, 38, 40 ],
+ "width": 64,
+ "height": 80
+ },
+ "hl2": {
+ "type": "mesh",
+ "uvs": [ 0.43356, 0, 0.448, 0.00703, 0.44796, 0.07424, 0.58752, 0.13758, 0.70046, 0.08571, 0.86806, 0.13508, 1, 0.21657, 1, 0.58626, 0.95821, 0.58569, 0.76604, 0.59801, 0.67117, 0.65417, 0.61235, 0.84739, 0.44331, 1, 0.1924, 1, 0.06552, 0.96102, 0, 0.77566, 0, 0.65616, 0.03533, 0.55193, 0.16624, 0.5376, 0.16295, 0.44937, 0.34806, 0.25096, 0.32817, 0.22122, 0.3282, 0.07683, 0.37273, 0.00823, 0.40264, 0 ],
+ "triangles": [ 19, 10, 18, 9, 10, 19, 18, 15, 16, 11, 18, 10, 17, 18, 16, 11, 15, 18, 15, 13, 14, 11, 13, 15, 12, 13, 11, 1, 24, 0, 1, 23, 24, 2, 23, 1, 22, 23, 2, 2, 21, 22, 3, 21, 2, 3, 20, 21, 5, 6, 3, 7, 8, 6, 5, 3, 4, 8, 9, 6, 6, 9, 3, 20, 3, 9, 9, 19, 20 ],
+ "vertices": [ 1, 9, -8.77, -43.39, 1, 1, 9, -9.16, -42.21, 1, 1, 9, -5.14, -35.92, 1, 1, 9, -9.22, -24.96, 1, 1, 9, -18.7, -25.73, 1, 1, 9, -25.2, -15.06, 1, 1, 9, -27.77, -2.68, 1, 2, 9, -5.65, 31.88, 0.92124, 10, 0, 42.39, 0.07876, 2, 9, -3.33, 30.32, 0.91617, 10, 0.55, 39.65, 0.08383, 2, 9, 8.25, 24.53, 0.72892, 10, 4.68, 27.38, 0.27108, 2, 9, 16.97, 26.36, 0.39701, 10, 12.15, 22.53, 0.60299, 2, 9, 31.85, 42.3, 0.0884, 10, 33.94, 23.34, 0.9116, 1, 10, 52.93, 15.97, 1, 1, 10, 56.59, -0.44, 1, 1, 10, 54.21, -9.68, 1, 1, 10, 35.08, -18.44, 1, 1, 10, 22.13, -21.32, 1, 1, 10, 10.33, -21.52, 1, 2, 9, 38.49, -2.78, 0.02866, 10, 6.87, -13.31, 0.97134, 2, 9, 33.39, -11.14, 0.33903, 10, -2.64, -15.65, 0.66097, 2, 9, 11.08, -23.01, 0.9994, 10, -26.84, -8.33, 6.0E-4, 1, 9, 10.42, -26.51, 1, 1, 9, 1.78, -40.01, 1, 1, 9, -4.84, -44.81, 1, 1, 9, -7.02, -44.5, 1 ],
+ "hull": 25,
+ "edges": [ 0, 48, 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 20, 22, 22, 24, 24, 26, 26, 28, 28, 30, 30, 32, 32, 34, 34, 36, 36, 38, 38, 40, 40, 42, 42, 44, 44, 46, 46, 48 ],
+ "width": 65,
+ "height": 91
+ }
+ },
+ "hr": {
+ "hr": {
+ "type": "mesh",
+ "uvs": [ 0.16779, 0.01397, 0.39036, 0.01377, 0.59249, 0.29488, 0.61648, 0.32825, 0.65629, 0.35914, 0.82642, 0.40534, 0.94441, 0.52546, 0.98745, 0.62924, 0.98617, 0.82993, 0.87437, 0.94552, 0.78879, 0.98586, 0.58309, 0.98636, 0.43548, 0.86961, 0.28788, 0.75286, 0.25707, 0.71004, 0.22626, 0.66722, 0.01264, 0.37032, 0.01361, 0.16985, 0.07729, 0.07176 ],
+ "triangles": [ 10, 11, 6, 12, 6, 11, 7, 9, 10, 5, 12, 4, 8, 9, 7, 5, 6, 12, 6, 7, 10, 3, 4, 14, 4, 12, 13, 4, 13, 14, 14, 15, 3, 15, 16, 2, 18, 2, 16, 18, 16, 17, 15, 2, 3, 1, 18, 0, 18, 1, 2 ],
+ "vertices": [ 1, 12, -14.32, 3.32, 1, 1, 12, -7.02, 17.84, 1, 3, 12, 17.19, 22.17, 0.72929, 13, 2.14, 22.77, 0.12727, 14, -3.4, 27.74, 0.14344, 3, 12, 20.06, 22.68, 0.57746, 13, 5.03, 22.39, 0.18206, 14, -1.18, 25.84, 0.24048, 3, 12, 23.3, 24.3, 0.38097, 13, 8.61, 22.97, 0.2, 14, 2.14, 24.38, 0.41902, 3, 12, 31.77, 33.94, 0.08666, 13, 19.59, 29.61, 0.05793, 14, 14.96, 23.96, 0.8554, 3, 12, 43.16, 37.85, 0.01486, 13, 31.62, 29.92, 0.00403, 14, 25.22, 17.65, 0.98111, 2, 12, 51.06, 37.39, 0.00183, 14, 29.88, 11.26, 0.99817, 1, 14, 32.89, -2.46, 1, 1, 14, 26.71, -12.15, 1, 1, 14, 21.24, -16.28, 1, 2, 13, 36.35, -11.48, 0.0398, 14, 6.6, -19.63, 0.9602, 2, 13, 22.98, -13.5, 0.35617, 14, -5.71, -14.03, 0.64383, 2, 13, 9.6, -15.53, 0.85917, 14, -18.02, -8.43, 0.14083, 3, 12, 32.13, -12.77, 2.5E-4, 13, 5.89, -15.05, 0.92787, 14, -20.88, -6.01, 0.07188, 3, 12, 28.44, -13.43, 0.0095, 13, 2.17, -14.57, 0.96254, 14, -23.73, -3.58, 0.02796, 2, 12, 2.86, -18.01, 0.77851, 13, -23.6, -11.25, 0.22149, 2, 12, -9.64, -11.64, 0.96313, 13, -33.61, -1.41, 0.03687, 2, 12, -13.68, -4.4, 0.99521, 13, -35.28, 6.71, 0.00479 ],
+ "hull": 19,
+ "edges": [ 0, 36, 0, 2, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 20, 22, 32, 34, 34, 36, 30, 32, 26, 28, 28, 30, 2, 4, 4, 6, 22, 24, 24, 26 ],
+ "width": 73,
+ "height": 70
+ },
+ "hr2": {
+ "type": "mesh",
+ "uvs": [ 0.53415, 0, 0.55929, 0.00891, 0.60016, 0.09338, 0.60035, 0.2734, 0.58297, 0.30476, 0.72005, 0.51455, 0.81514, 0.5171, 0.96339, 0.63959, 1, 0.70458, 1, 0.87931, 0.85389, 0.99986, 0.81981, 1, 0.63325, 1, 0.51734, 0.96306, 0.26878, 0.77311, 0.1954, 0.68164, 0.01979, 0.72274, 0, 0.66707, 0, 0.26412, 0.11948, 0.16384, 0.27465, 0.10155, 0.347, 0.17488, 0.46666, 0.12057, 0.49515, 0.00278, 0.50634, 0 ],
+ "triangles": [ 10, 11, 8, 8, 11, 12, 9, 10, 8, 12, 7, 8, 7, 5, 6, 5, 12, 13, 13, 14, 5, 5, 7, 12, 14, 15, 5, 16, 17, 15, 21, 15, 18, 15, 4, 5, 15, 21, 4, 21, 19, 20, 19, 21, 18, 15, 17, 18, 4, 21, 3, 3, 21, 22, 22, 2, 3, 22, 1, 2, 22, 23, 1, 1, 23, 0, 23, 24, 0 ],
+ "vertices": [ 1, 12, -27.91, 22.97, 1, 1, 12, -26.66, 24.61, 1, 1, 12, -18.47, 25.73, 1, 3, 12, -2.56, 21.8, 0.99375, 13, -16.81, 28.35, 0.00284, 14, -16.23, 42.75, 0.0034, 3, 12, -0.11, 19.85, 0.98016, 13, -15.05, 25.75, 0.0102, 14, -16.18, 39.61, 0.00965, 3, 12, 20.9, 25.23, 0.3745, 13, 6.6, 24.57, 0.23267, 14, 1.32, 26.82, 0.39282, 3, 12, 22.84, 32.09, 0.20072, 13, 10.52, 30.54, 0.18662, 14, 7.86, 29.68, 0.61266, 3, 12, 36.34, 40.2, 0.05125, 13, 25.82, 34.21, 0.06435, 14, 22.7, 24.41, 0.8844, 3, 12, 42.74, 41.44, 0.02606, 13, 32.3, 33.47, 0.03392, 14, 27.72, 20.26, 0.94002, 3, 12, 58.17, 37.61, 4.6E-4, 13, 45.87, 25.18, 3.6E-4, 14, 34.57, 5.91, 0.99918, 1, 14, 29.41, -8.71, 1, 1, 14, 27.11, -9.82, 1, 1, 14, 14.49, -15.85, 1, 2, 13, 33.5, -9.68, 0.01801, 14, 5.19, -16.57, 0.98199, 3, 12, 35.58, -13.29, 0.01541, 13, 9.03, -16.58, 0.94678, 14, -19.08, -9, 0.03781, 2, 12, 26.18, -16.63, 0.30616, 13, -0.94, -16.93, 0.69384, 2, 12, 26.64, -30.31, 0.51276, 13, -4.62, -30.12, 0.48724, 2, 12, 21.36, -30.53, 0.53635, 13, -9.72, -28.75, 0.46365, 2, 12, -14.22, -21.7, 0.99134, 13, -41.01, -9.63, 0.00866, 1, 12, -20.92, -10.8, 1, 1, 12, -23.62, 1.85, 1, 1, 12, -15.84, 5.52, 1, 1, 12, -18.48, 15.42, 1, 1, 12, -28.36, 20.07, 1, 1, 12, -28.41, 20.95, 1 ],
+ "hull": 25,
+ "edges": [ 0, 48, 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 20, 22, 22, 24, 24, 26, 26, 28, 28, 30, 30, 32, 32, 34, 34, 36, 36, 38, 38, 40, 40, 42, 42, 44, 44, 46, 46, 48 ],
+ "width": 75,
+ "height": 91
+ }
+ },
+ "ll": {
+ "ll": {
+ "type": "mesh",
+ "uvs": [ 0.33036, 0.1054, 0.53928, 0.10528, 0.73978, 0.02332, 0.85032, 0.09084, 0.85036, 0.33055, 0.85037, 0.39725, 0.85038, 0.4639, 0.85039, 0.50183, 0.85042, 0.70114, 0.85796, 0.73921, 0.93456, 0.77969, 0.94739, 0.94169, 0.8812, 0.96468, 0.61731, 0.97843, 0.26359, 0.97985, 0.11495, 0.93131, 0.07279, 0.90923, 0.06122, 0.83089, 0.04436, 0.52157, 0.04282, 0.48174, 0.03996, 0.40778, 0.03783, 0.35274, 0.02463, 0.01162, 0.14602, 0.01605 ],
+ "triangles": [ 4, 19, 20, 4, 18, 19, 18, 5, 17, 16, 17, 15, 6, 17, 5, 7, 17, 6, 8, 17, 7, 9, 17, 8, 15, 17, 14, 12, 9, 10, 12, 10, 11, 9, 13, 17, 12, 13, 9, 13, 14, 17, 21, 22, 23, 21, 23, 0, 1, 20, 21, 1, 2, 3, 1, 3, 4, 1, 21, 0, 4, 20, 1, 4, 5, 18 ],
+ "vertices": [ 2, 3, 6.05, -7.01, 0.9897, 4, -21.64, -6.02, 0.0103, 2, 3, 5.94, 1.35, 1, 4, -21.6, 2.34, 0, 2, 3, 0.43, 9.3, 0.99999, 4, -26.96, 10.39, 1.0E-5, 2, 3, 4.83, 13.78, 1, 4, -22.48, 14.78, 0, 2, 3, 20.65, 13.97, 0.9615, 4, -6.66, 14.69, 0.0385, 2, 3, 25.05, 14.03, 0.8365, 4, -2.26, 14.66, 0.1635, 2, 3, 29.45, 14.08, 0.61075, 4, 2.14, 14.64, 0.38925, 2, 3, 31.95, 14.12, 0.46747, 4, 4.65, 14.62, 0.53253, 2, 3, 45.11, 14.28, 0.03959, 4, 17.8, 14.54, 0.96041, 2, 3, 47.61, 14.61, 0.01512, 4, 20.31, 14.83, 0.98488, 2, 3, 50.25, 17.71, 0.00284, 4, 23.01, 17.88, 0.99716, 1, 4, 33.7, 18.32, 1, 1, 4, 35.2, 15.67, 1, 1, 4, 36.04, 5.11, 1, 1, 4, 36.05, -9.04, 1, 1, 4, 32.81, -14.97, 1, 1, 4, 31.34, -16.65, 1, 1, 4, 26.17, -17.08, 1, 2, 3, 33.65, -18.11, 0.07546, 4, 5.75, -17.63, 0.92454, 2, 3, 31.03, -18.2, 0.1427, 4, 3.12, -17.67, 0.8573, 2, 3, 26.15, -18.38, 0.33356, 4, -1.76, -17.76, 0.66644, 2, 3, 22.52, -18.51, 0.50546, 4, -5.39, -17.82, 0.49454, 1, 3, 0.01, -19.31, 1, 2, 3, 0.24, -14.45, 0.99947, 4, -27.59, -13.36, 5.3E-4 ],
+ "hull": 24,
+ "edges": [ 0, 46, 0, 2, 2, 4, 4, 6, 20, 22, 22, 24, 24, 26, 26, 28, 44, 46, 16, 18, 18, 20, 42, 44, 40, 42, 38, 40, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 36, 38, 32, 34, 34, 36, 28, 30, 30, 32 ],
+ "width": 40,
+ "height": 66
+ },
+ "ll2": {
+ "type": "mesh",
+ "uvs": [ 0.49765, 0, 0.64414, 0.03787, 0.81971, 0.17781, 0.89789, 0.50109, 0.84132, 0.66035, 0.89746, 0.73365, 1, 0.88485, 1, 0.97103, 0.82624, 1, 0.77067, 1, 0.39064, 0.97371, 0.12292, 0.93156, 0.07008, 0.89954, 0, 0.52102, 0, 0.44871, 0.00936, 0.40117, 0.06795, 0.44191, 0.06788, 0.05044, 0.39933, 0 ],
+ "triangles": [ 14, 15, 16, 13, 14, 16, 13, 16, 3, 4, 12, 3, 10, 11, 12, 12, 13, 3, 12, 4, 10, 5, 10, 4, 6, 10, 5, 6, 9, 10, 6, 8, 9, 7, 8, 6, 18, 16, 17, 18, 0, 1, 2, 16, 18, 2, 3, 16, 1, 2, 18 ],
+ "vertices": [ 1, 3, -8.65, 0.43, 1, 1, 3, -5.95, 7, 1, 1, 3, 4.74, 15.22, 1, 2, 3, 30.09, 19.82, 0.84477, 4, 2.89, 20.35, 0.15523, 2, 3, 42.78, 17.9, 0.43619, 4, 15.54, 18.2, 0.56381, 2, 3, 48.45, 20.63, 0.37146, 4, 21.26, 20.83, 0.62854, 1, 3, 60.18, 25.68, 1, 1, 4, 39.89, 25.85, 1, 1, 4, 42.38, 18.26, 1, 1, 4, 42.44, 15.82, 1, 1, 4, 40.82, -0.95, 1, 1, 4, 37.81, -12.82, 1, 1, 4, 35.34, -15.21, 1, 2, 3, 33.46, -19.58, 0.01958, 4, 5.53, -19.1, 0.98042, 2, 3, 27.76, -19.84, 0.07545, 4, -0.18, -19.25, 0.92455, 2, 3, 23.99, -19.6, 0.07915, 4, -3.94, -18.94, 0.92085, 2, 3, 27.08, -16.88, 0.12842, 4, -0.8, -16.28, 0.87158, 2, 3, -3.81, -18.28, 0.99377, 4, -31.71, -17.11, 0.00623, 1, 3, -8.45, -3.9, 1 ],
+ "hull": 19,
+ "edges": [ 0, 36, 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 20, 22, 22, 24, 24, 26, 26, 28, 28, 30, 30, 32, 32, 34, 34, 36 ],
+ "width": 44,
+ "height": 79
+ },
+ "ll3": {
+ "type": "mesh",
+ "uvs": [ 0.65671, 0.01118, 0.83538, 0.09692, 0.90026, 0.25593, 0.95354, 0.22283, 0.97588, 0.24867, 0.97613, 0.34347, 0.90851, 0.54418, 0.87469, 0.64453, 0.84088, 0.74489, 0.68999, 0.91769, 0.57792, 1, 0.40949, 1, 0.31441, 0.9746, 0.16499, 0.8279, 0.17197, 0.85909, 0.12898, 0.6981, 0.08598, 0.53712, 0, 0.21514, 0, 0.04809, 0.06857, 0.04624, 0.18689, 0.07518, 0.31601, 0.01172 ],
+ "triangles": [ 17, 18, 19, 17, 19, 20, 2, 3, 4, 2, 4, 5, 1, 16, 17, 6, 2, 5, 1, 2, 16, 6, 15, 2, 16, 2, 15, 20, 21, 0, 1, 20, 0, 20, 1, 17, 6, 7, 15, 8, 15, 7, 13, 15, 8, 15, 13, 14, 8, 9, 13, 9, 12, 13, 11, 12, 9, 10, 11, 9 ],
+ "vertices": [ 1, 3, -16.56, 2.72, 1, 1, 3, -9.7, 10.37, 1, 1, 3, 3.52, 13.63, 1, 1, 3, 0.65, 15.69, 1, 1, 3, 2.77, 16.7, 1, 2, 4, -23.13, 18.3, 1.3E-4, 3, 10.73, 17.07, 0.99987, 2, 4, -6.22, 15.83, 0.27902, 3, 27.7, 15.07, 0.72098, 2, 4, 2.23, 14.6, 0.7246, 3, 36.18, 14.06, 0.2754, 2, 4, 10.68, 13.36, 0.96422, 3, 44.66, 13.06, 0.03578, 1, 4, 25.31, 7.44, 1, 1, 4, 32.31, 2.97, 1, 1, 4, 32.43, -3.93, 1, 1, 4, 30.37, -7.87, 1, 2, 4, 18.16, -14.22, 1, 3, 52.89, -14.3, 0, 2, 4, 20.77, -13.88, 0.99995, 3, 55.49, -13.9, 5.0E-5, 2, 4, 7.28, -15.89, 0.93188, 3, 42.06, -16.27, 0.06812, 2, 4, -6.2, -17.9, 0.42208, 3, 28.63, -18.65, 0.57792, 2, 4, -33.18, -21.91, 3.0E-5, 3, 1.78, -23.4, 0.99997, 1, 3, -12.24, -24.04, 1, 1, 3, -12.52, -21.23, 1, 1, 3, -10.32, -16.28, 1, 1, 3, -15.88, -11.23, 1 ],
+ "hull": 22,
+ "edges": [ 0, 42, 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 16, 18, 18, 20, 20, 22, 22, 24, 24, 26, 26, 28, 34, 36, 36, 38, 38, 40, 40, 42, 32, 34, 28, 30, 30, 32, 10, 12, 12, 14, 14, 16 ],
+ "width": 41,
+ "height": 84
+ }
+ },
+ "lr": {
+ "lr": {
+ "type": "mesh",
+ "uvs": [ 0.87584, 0.01432, 0.87542, 0.35928, 0.87537, 0.39869, 0.87532, 0.43809, 0.87523, 0.51689, 0.85061, 0.68145, 0.88915, 0.73827, 0.96559, 0.78197, 0.93326, 0.9626, 0.55701, 0.97428, 0.16165, 0.96528, 0.03141, 0.8939, 0.04071, 0.76331, 0.03301, 0.49062, 0.03517, 0.43795, 0.03639, 0.40819, 0.0386, 0.35437, 0.04951, 0.08817, 0.16053, 0.02377, 0.3614, 0.10551, 0.56779, 0.10579, 0.75764, 0.01362 ],
+ "triangles": [ 1, 2, 13, 2, 3, 13, 13, 3, 4, 14, 20, 13, 13, 4, 12, 5, 12, 4, 8, 6, 7, 9, 10, 12, 5, 9, 12, 6, 9, 5, 11, 12, 10, 8, 9, 6, 17, 18, 19, 0, 20, 21, 1, 20, 0, 1, 13, 20, 15, 16, 20, 19, 16, 17, 15, 20, 14, 20, 16, 19 ],
+ "vertices": [ 1, 5, 0.19, 17.4, 1, 2, 5, 22.96, 17.38, 0.70387, 6, -4.51, 17.38, 0.29613, 2, 5, 25.56, 17.38, 0.57823, 6, -1.91, 17.38, 0.42177, 2, 5, 28.16, 17.37, 0.44556, 6, 0.7, 17.37, 0.55444, 2, 5, 33.36, 17.37, 0.21638, 6, 5.9, 17.37, 0.78362, 2, 5, 44.22, 16.39, 0.01203, 6, 16.76, 16.39, 0.98797, 2, 5, 47.97, 17.93, 0.00102, 6, 20.51, 17.93, 0.99898, 1, 6, 23.39, 20.98, 1, 1, 6, 35.31, 19.69, 1, 1, 6, 36.08, 4.64, 1, 1, 6, 35.49, -11.17, 1, 1, 6, 30.78, -16.38, 1, 1, 6, 22.16, -16.01, 1, 2, 5, 31.63, -16.32, 0.10839, 6, 4.16, -16.32, 0.89161, 2, 5, 28.15, -16.23, 0.23312, 6, 0.69, -16.23, 0.76688, 2, 5, 26.19, -16.18, 0.32544, 6, -1.28, -16.18, 0.67456, 2, 5, 22.63, -16.09, 0.51093, 6, -4.83, -16.09, 0.48907, 2, 5, 5.06, -15.66, 0.98692, 6, -22.4, -15.66, 0.01308, 2, 5, 0.81, -11.22, 0.99997, 6, -26.65, -11.22, 3.0E-5, 2, 5, 6.21, -3.18, 0.99976, 6, -21.25, -3.18, 2.4E-4, 1, 5, 6.23, 5.07, 1, 1, 5, 0.14, 12.67, 1 ],
+ "hull": 22,
+ "edges": [ 0, 42, 8, 10, 14, 16, 16, 18, 18, 20, 20, 22, 22, 24, 34, 36, 36, 38, 38, 40, 40, 42, 0, 2, 6, 8, 2, 4, 4, 6, 32, 34, 30, 32, 28, 30, 24, 26, 26, 28, 10, 12, 12, 14 ],
+ "width": 40,
+ "height": 66
+ },
+ "lr2": {
+ "type": "mesh",
+ "uvs": [ 0.45712, 0, 0.79654, 0.04812, 0.79584, 0.41324, 0.8876, 0.43069, 0.88674, 0.53231, 0.84137, 0.68164, 0.89277, 0.72676, 1, 0.88504, 1, 0.97138, 0.82464, 1, 0.76876, 1, 0.38615, 0.97338, 0.06657, 0.92204, 0.06755, 0.75988, 0, 0.52076, 0, 0.45059, 0.0446, 0.17691, 0.12888, 0.12854, 0.25269, 0 ],
+ "triangles": [ 4, 2, 3, 5, 2, 4, 14, 5, 13, 10, 11, 6, 5, 11, 13, 2, 5, 14, 11, 5, 6, 6, 7, 10, 12, 13, 11, 7, 9, 10, 8, 9, 7, 2, 0, 1, 17, 14, 15, 16, 17, 15, 17, 18, 0, 2, 17, 0, 2, 14, 17 ],
+ "vertices": [ 1, 5, -9.37, 1.62, 1, 1, 5, -5.56, 16.55, 1, 2, 5, 23.28, 16.52, 0.55641, 6, -4.18, 16.52, 0.44359, 2, 5, 24.66, 20.56, 0.40786, 6, -2.8, 20.56, 0.59214, 2, 5, 32.69, 20.52, 0.22247, 6, 5.22, 20.52, 0.77753, 2, 5, 44.48, 18.52, 0.02715, 6, 17.02, 18.52, 0.97285, 2, 5, 48.05, 20.79, 0.00478, 6, 20.58, 20.79, 0.99522, 1, 6, 33.09, 25.5, 1, 1, 6, 39.91, 25.5, 1, 1, 6, 42.17, 17.79, 1, 1, 6, 42.17, 15.33, 1, 1, 6, 40.07, -1.51, 1, 1, 6, 36.01, -15.57, 1, 2, 5, 50.67, -15.52, 0.00563, 6, 23.2, -15.52, 0.99437, 2, 5, 31.78, -18.5, 0.32995, 6, 4.31, -18.5, 0.67005, 2, 5, 26.23, -18.5, 0.55087, 6, -1.23, -18.5, 0.44913, 2, 5, 4.61, -16.53, 0.99908, 6, -22.85, -16.53, 9.2E-4, 1, 5, 0.79, -12.83, 1, 1, 5, -9.37, -7.38, 1 ],
+ "hull": 19,
+ "edges": [ 0, 36, 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 10, 12, 12, 14, 14, 16, 16, 18, 18, 20, 20, 22, 22, 24, 24, 26, 26, 28, 28, 30, 30, 32, 32, 34, 34, 36 ],
+ "width": 44,
+ "height": 79
+ },
+ "lr3": {
+ "type": "mesh",
+ "uvs": [ 0.76254, 0.04595, 0.82897, 0.08226, 0.90868, 0.04494, 1, 0.04843, 1, 0.166, 0.99964, 0.21185, 0.9038, 0.57721, 0.89172, 0.62326, 0.87884, 0.67235, 0.85129, 0.77737, 0.78185, 0.88002, 0.70274, 0.95714, 0.60892, 1, 0.42299, 1, 0.31483, 0.92217, 0.16019, 0.74685, 0.1268, 0.6481, 0.11362, 0.60913, 0.10352, 0.57927, 0.02341, 0.34237, 0.02411, 0.24863, 0.12113, 0.25097, 0.12097, 0.19929, 0.16632, 0.09714, 0.34104, 0.01179, 0.66106, 0.01173 ],
+ "triangles": [ 1, 2, 3, 4, 1, 3, 5, 1, 4, 5, 21, 22, 19, 20, 21, 0, 1, 22, 6, 18, 19, 23, 24, 25, 0, 23, 25, 22, 23, 0, 22, 1, 5, 6, 21, 5, 21, 6, 19, 6, 17, 18, 7, 17, 6, 16, 17, 7, 8, 16, 7, 15, 16, 8, 9, 15, 8, 10, 15, 9, 14, 15, 10, 11, 14, 10, 12, 13, 14, 11, 12, 14 ],
+ "vertices": [ 1, 5, -13.4, 10.76, 1, 1, 5, -10.35, 13.49, 1, 1, 5, -13.48, 16.76, 1, 1, 5, -13.19, 20.5, 1, 1, 5, -3.31, 20.5, 1, 1, 5, 0.54, 20.49, 1, 2, 6, -4.05, 16.56, 0.48414, 5, 31.23, 16.56, 0.51586, 2, 6, -0.18, 16.06, 0.67889, 5, 35.1, 16.06, 0.32111, 2, 6, 3.94, 15.53, 0.84576, 5, 39.22, 15.53, 0.15424, 2, 6, 12.77, 14.4, 0.99087, 5, 48.04, 14.4, 0.00913, 1, 6, 21.39, 11.56, 1, 1, 6, 27.87, 8.31, 1, 1, 6, 31.47, 4.47, 1, 1, 6, 31.47, -3.16, 1, 1, 6, 24.93, -7.59, 1, 2, 6, 10.2, -13.93, 0.9734, 5, 45.48, -13.93, 0.0266, 2, 6, 1.91, -15.3, 0.77326, 5, 37.19, -15.3, 0.22674, 2, 6, -1.37, -15.84, 0.62176, 5, 33.91, -15.84, 0.37824, 2, 6, -3.87, -16.26, 0.4926, 5, 31.4, -16.26, 0.5074, 2, 6, -23.77, -19.54, 0.00424, 5, 11.5, -19.54, 0.99576, 1, 5, 3.63, -19.51, 1, 1, 5, 3.83, -15.53, 1, 1, 5, -0.51, -15.54, 1, 1, 5, -9.1, -13.68, 1, 1, 5, -16.26, -6.52, 1, 1, 5, -16.27, 6.6, 1 ],
+ "hull": 26,
+ "edges": [ 0, 50, 0, 2, 2, 4, 4, 6, 6, 8, 8, 10, 18, 20, 20, 22, 22, 24, 24, 26, 26, 28, 28, 30, 38, 40, 40, 42, 42, 44, 44, 46, 46, 48, 48, 50, 10, 12, 12, 14, 14, 16, 16, 18, 36, 38, 34, 36, 30, 32, 32, 34 ],
+ "width": 41,
+ "height": 84
+ }
+ },
+ "mei": {
+ "mei": { "x": 55.25, "y": -7.64, "rotation": -83.46, "width": 93, "height": 11 }
+ },
+ "ShieldOfRagingCrux": {
+ "ShieldOfRagingCrux": { "x": 49.38, "y": -16.89, "rotation": -41.35, "width": 256, "height": 256 }
+ },
+ "tx": {
+ "tx_huo": {
+ "x": 101.43,
+ "y": 8.31,
+ "scaleX": 0.614,
+ "scaleY": 1.342,
+ "rotation": -77.44,
+ "width": 118,
+ "height": 169
+ }
+ },
+ "tx2": {
+ "tx": {
+ "x": -0.31,
+ "y": 0.09,
+ "scaleX": 0.1,
+ "scaleY": 0.1,
+ "rotation": 0.4,
+ "width": 470,
+ "height": 172
+ }
+ },
+ "ying_zi": {
+ "ying_zi": { "x": 34.6, "y": -1.16, "rotation": 1.67, "width": 125, "height": 33 }
+ },
+ "zui": {
+ "Angry": { "x": 1.67, "y": 7.31, "rotation": -83.46, "width": 256, "height": 256 },
+ "zui": { "x": 9.14, "y": -9.1, "rotation": -83.46, "width": 58, "height": 30 }
+ }
+ }
+ }
+],
+"animations": {
+ "atk": {
+ "slots": {
+ "tx": {
+ "color": [
+ { "color": "ffffff5b", "curve": "stepped" },
+ { "time": 0.6333, "color": "ffffff5b" }
+ ]
+ }
+ },
+ "bones": {
+ "hl": {
+ "rotate": [
+ {},
+ { "time": 0.4333, "angle": 128.13 },
+ { "time": 0.5333, "angle": 135.83 },
+ { "time": 0.6667 }
+ ]
+ },
+ "bone9": {
+ "rotate": [
+ {},
+ { "time": 0.4333, "angle": 37.61, "curve": "stepped" },
+ { "time": 0.5333, "angle": 37.61 },
+ { "time": 0.6667 }
+ ]
+ },
+ "hand": {
+ "rotate": [
+ { "curve": "stepped" },
+ { "time": 0.6667 }
+ ]
+ },
+ "bone": {
+ "rotate": [
+ {},
+ { "time": 0.4333, "angle": 7.67 },
+ { "time": 0.5333, "angle": 8.57 },
+ { "time": 0.6667 }
+ ]
+ },
+ "lr": {
+ "rotate": [
+ {},
+ { "time": 0.4333, "angle": 10.01, "curve": "stepped" },
+ { "time": 0.5333, "angle": 10.01 },
+ { "time": 0.6667 }
+ ]
+ },
+ "bone5": {
+ "rotate": [
+ {},
+ { "time": 0.4333, "angle": -10.95 }
+ ]
+ },
+ "bone2": {
+ "rotate": [
+ {},
+ { "time": 0.4333, "angle": 5.7 },
+ { "time": 0.5333, "angle": 7.8 },
+ { "time": 0.6667 }
+ ]
+ },
+ "head": {
+ "rotate": [
+ {},
+ { "time": 0.4333, "angle": 19.5, "curve": "stepped" },
+ { "time": 0.5333, "angle": 19.5 },
+ { "time": 0.6667 }
+ ]
+ },
+ "hr": {
+ "rotate": [
+ {},
+ { "time": 0.4333, "angle": -10.2, "curve": "stepped" },
+ { "time": 0.5333, "angle": -10.2 },
+ { "time": 0.6667 }
+ ]
+ }
+ }
+ },
+ "idle": {
+ "bones": {
+ "bone": {
+ "rotate": [
+ {},
+ { "time": 0.3333, "angle": 1.12 },
+ { "time": 0.6667 }
+ ]
+ },
+ "bone9": {
+ "rotate": [
+ {},
+ { "time": 0.3333, "angle": 9.36 },
+ { "time": 0.6667 }
+ ]
+ },
+ "bone12": {
+ "rotate": [
+ {},
+ { "time": 0.3333, "angle": -4.13 },
+ { "time": 0.6667 }
+ ]
+ }
+ }
+ },
+ "max": {
+ "slots": {
+ "tx2": {
+ "color": [
+ { "time": 0.1, "color": "ffffffff", "curve": "stepped" },
+ { "time": 0.3667, "color": "ffffffff" },
+ { "time": 0.4667, "color": "ffffff00" }
+ ]
+ },
+ "zui": {
+ "attachment": [
+ { "name": "Angry" },
+ { "time": 0.8, "name": null }
+ ]
+ }
+ },
+ "bones": {
+ "hr": {
+ "rotate": [
+ {},
+ { "time": 0.3333, "angle": 86.59, "curve": "stepped" },
+ { "time": 0.6, "angle": 86.59 },
+ { "time": 0.8 }
+ ]
+ },
+ "hl": {
+ "rotate": [
+ {},
+ { "time": 0.3333, "angle": -10.43, "curve": "stepped" },
+ { "time": 0.6, "angle": -10.43 },
+ { "time": 0.8 }
+ ]
+ },
+ "tx": {
+ "scale": [
+ { "time": 0.1 },
+ { "time": 0.4667, "x": 10.361, "y": 12 }
+ ]
+ },
+ "head": {
+ "rotate": [
+ {},
+ { "time": 0.3333, "angle": 15.6, "curve": "stepped" },
+ { "time": 0.6, "angle": 15.6 },
+ { "time": 0.8 }
+ ]
+ },
+ "bone": {
+ "rotate": [
+ {},
+ { "time": 0.3333, "angle": 5.1, "curve": "stepped" },
+ { "time": 0.6, "angle": 5.1 },
+ { "time": 0.8 }
+ ]
+ }
+ }
+ },
+ "move": {
+ "bones": {
+ "bone": {
+ "rotate": [
+ {},
+ { "time": 0.3333, "angle": 1.12 },
+ { "time": 0.6667 }
+ ]
+ },
+ "bone9": {
+ "rotate": [
+ {},
+ { "time": 0.3333, "angle": 9.36 },
+ { "time": 0.6667 }
+ ]
+ },
+ "bone12": {
+ "rotate": [
+ {},
+ { "time": 0.3333, "angle": -4.13 },
+ { "time": 0.6667 }
+ ]
+ },
+ "lr": {
+ "rotate": [
+ {},
+ { "time": 0.3333, "angle": 12.89 },
+ { "time": 0.6667 }
+ ]
+ },
+ "ll": {
+ "rotate": [
+ {},
+ { "time": 0.3333, "angle": -12.65 },
+ { "time": 0.6667 }
+ ]
+ },
+ "bone5": {
+ "rotate": [
+ {},
+ { "time": 0.3333, "angle": -13.38 },
+ { "time": 0.6667 }
+ ],
+ "scale": [
+ {}
+ ]
+ },
+ "bone3": {
+ "rotate": [
+ {},
+ { "time": 0.3333, "angle": 2 },
+ { "time": 0.5, "angle": 5.15 },
+ { "time": 0.6667 }
+ ],
+ "scale": [
+ {}
+ ]
+ }
+ }
+ }
+}
+}
\ No newline at end of file
diff --git a/assets/resources/game/heros/knight/skeleton.json.meta b/assets/resources/game/heros/knight/skeleton.json.meta
new file mode 100644
index 00000000..e0b83c1b
--- /dev/null
+++ b/assets/resources/game/heros/knight/skeleton.json.meta
@@ -0,0 +1,11 @@
+{
+ "ver": "1.2.6",
+ "importer": "spine-data",
+ "imported": true,
+ "uuid": "fae8d00e-408c-4239-8005-d2c2ccac984a",
+ "files": [
+ ".json"
+ ],
+ "subMetas": {},
+ "userData": {}
+}
diff --git a/assets/resources/game/heros/knight/skeleton.png b/assets/resources/game/heros/knight/skeleton.png
new file mode 100644
index 00000000..3846228b
Binary files /dev/null and b/assets/resources/game/heros/knight/skeleton.png differ
diff --git a/assets/resources/game/heros/knight/skeleton.png.meta b/assets/resources/game/heros/knight/skeleton.png.meta
new file mode 100644
index 00000000..2e947d6e
--- /dev/null
+++ b/assets/resources/game/heros/knight/skeleton.png.meta
@@ -0,0 +1,42 @@
+{
+ "ver": "1.0.26",
+ "importer": "image",
+ "imported": true,
+ "uuid": "daaadecc-a42c-49bb-9ec8-655ec00b2921",
+ "files": [
+ ".json",
+ ".png"
+ ],
+ "subMetas": {
+ "6c48a": {
+ "importer": "texture",
+ "uuid": "daaadecc-a42c-49bb-9ec8-655ec00b2921@6c48a",
+ "displayName": "skeleton",
+ "id": "6c48a",
+ "name": "texture",
+ "userData": {
+ "wrapModeS": "repeat",
+ "wrapModeT": "repeat",
+ "minfilter": "linear",
+ "magfilter": "linear",
+ "mipfilter": "none",
+ "anisotropy": 0,
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "daaadecc-a42c-49bb-9ec8-655ec00b2921",
+ "visible": false
+ },
+ "ver": "1.0.22",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ }
+ },
+ "userData": {
+ "hasAlpha": true,
+ "type": "texture",
+ "fixAlphaTransparencyArtifacts": false,
+ "redirect": "daaadecc-a42c-49bb-9ec8-655ec00b2921@6c48a"
+ }
+}
diff --git a/assets/resources/game/heros/role.prefab b/assets/resources/game/heros/role.prefab
index 3c1520ac..e683b50e 100644
--- a/assets/resources/game/heros/role.prefab
+++ b/assets/resources/game/heros/role.prefab
@@ -25,35 +25,44 @@
"__id__": 10
},
{
- "__id__": 20
+ "__id__": 16
},
{
- "__id__": 29
- }
- ],
- "_active": true,
- "_components": [
- {
- "__id__": 40
+ "__id__": 32
},
{
"__id__": 42
},
{
- "__id__": 44
+ "__id__": 53
},
{
- "__id__": 46
+ "__id__": 64
+ }
+ ],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 72
},
{
- "__id__": 48
+ "__id__": 74
},
{
- "__id__": 50
+ "__id__": 76
+ },
+ {
+ "__id__": 78
+ },
+ {
+ "__id__": 80
+ },
+ {
+ "__id__": 82
}
],
"_prefab": {
- "__id__": 52
+ "__id__": 84
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -93,7 +102,7 @@
"__id__": 1
},
"_children": [],
- "_active": true,
+ "_active": false,
"_components": [
{
"__id__": 3
@@ -266,7 +275,7 @@
},
{
"__type__": "cc.Node",
- "_name": "range_box",
+ "_name": "anm",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
@@ -280,16 +289,367 @@
},
{
"__id__": 13
- },
- {
- "__id__": 15
- },
- {
- "__id__": 17
}
],
"_prefab": {
- "__id__": 19
+ "__id__": 15
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": -2.715,
+ "y": -7.757,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 0.3,
+ "y": 0.3,
+ "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": 398.7300109863281,
+ "height": 389.4800109863281
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.4131617910717354,
+ "y": 0.25777960022036467
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "93GfKd9OBHa5H/OqPn6Eof"
+ },
+ {
+ "__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__": "fae8d00e-408c-4239-8005-d2c2ccac984a",
+ "__expectedType__": "sp.SkeletonData"
+ },
+ "defaultSkin": "default",
+ "defaultAnimation": "move",
+ "_premultipliedAlpha": true,
+ "_timeScale": 1.5,
+ "_preCacheMode": 0,
+ "_cacheMode": 0,
+ "_sockets": [],
+ "_useTint": false,
+ "_debugMesh": false,
+ "_debugBones": false,
+ "_debugSlots": false,
+ "_enableBatch": false,
+ "loop": true,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "77d/MslrBBG5Q34PEOfEmx"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "f93bA0SpRLSYr+8awRhPHd",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 17
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 16
+ },
+ "asset": {
+ "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "c46/YsCPVOJYA4mWEpNYRx",
+ "instance": {
+ "__id__": 18
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "c6m8ZwGT9NHK/b2+RoT8a7",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 19
+ },
+ {
+ "__id__": 21
+ },
+ {
+ "__id__": 22
+ },
+ {
+ "__id__": 23
+ },
+ {
+ "__id__": 24
+ },
+ {
+ "__id__": 25
+ },
+ {
+ "__id__": 26
+ },
+ {
+ "__id__": 28
+ },
+ {
+ "__id__": 30
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 20
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "shielded"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "c46/YsCPVOJYA4mWEpNYRx"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 20
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 16.461,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 20
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 20
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 20
+ },
+ "propertyPath": [
+ "_active"
+ ],
+ "value": true
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 20
+ },
+ "propertyPath": [
+ "_lscale"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 1,
+ "y": 1,
+ "z": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 27
+ },
+ "propertyPath": [
+ "_color"
+ ],
+ "value": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 192
+ }
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "9a+65VIghBm4HQxuHPQ/mg"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 29
+ },
+ "propertyPath": [
+ "_lscale"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 1,
+ "y": 1,
+ "z": 1
+ }
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "7a5LvbdlxEc6FKa7cun2oB"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 31
+ },
+ "propertyPath": [
+ "_contentSize"
+ ],
+ "value": {
+ "__type__": "cc.Size",
+ "width": 100,
+ "height": 110
+ }
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "b4sNQPJWFKha7x75SWXmRj"
+ ]
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "range_box",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 1
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 33
+ },
+ {
+ "__id__": 35
+ },
+ {
+ "__id__": 37
+ },
+ {
+ "__id__": 39
+ }
+ ],
+ "_prefab": {
+ "__id__": 41
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -326,11 +686,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 10
+ "__id__": 32
},
"_enabled": true,
"__prefab": {
- "__id__": 12
+ "__id__": 34
},
"_contentSize": {
"__type__": "cc.Size",
@@ -354,11 +714,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 10
+ "__id__": 32
},
"_enabled": true,
"__prefab": {
- "__id__": 14
+ "__id__": 36
},
"enabledContactListener": true,
"bullet": true,
@@ -388,11 +748,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 10
+ "__id__": 32
},
"_enabled": true,
"__prefab": {
- "__id__": 16
+ "__id__": 38
},
"tag": 4,
"_group": 4,
@@ -422,11 +782,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 10
+ "__id__": 32
},
"_enabled": true,
"__prefab": {
- "__id__": 18
+ "__id__": 40
},
"_id": ""
},
@@ -454,14 +814,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 21
+ "__id__": 43
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 20
+ "__id__": 42
},
"asset": {
"__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -469,7 +829,7 @@
},
"fileId": "5fqU0L3/FOhKaco5UkHuWT",
"instance": {
- "__id__": 22
+ "__id__": 44
},
"targetOverrides": null
},
@@ -483,19 +843,22 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 23
+ "__id__": 45
},
{
- "__id__": 25
+ "__id__": 47
},
{
- "__id__": 26
+ "__id__": 48
},
{
- "__id__": 27
+ "__id__": 49
},
{
- "__id__": 28
+ "__id__": 50
+ },
+ {
+ "__id__": 51
}
],
"removedComponents": []
@@ -503,7 +866,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 24
+ "__id__": 46
},
"propertyPath": [
"_name"
@@ -519,7 +882,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 24
+ "__id__": 46
},
"propertyPath": [
"_lpos"
@@ -534,7 +897,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 24
+ "__id__": 46
},
"propertyPath": [
"_lrot"
@@ -550,7 +913,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 24
+ "__id__": 46
},
"propertyPath": [
"_euler"
@@ -565,7 +928,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 24
+ "__id__": 46
},
"propertyPath": [
"_lscale"
@@ -577,6 +940,22 @@
"z": 1
}
},
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 52
+ },
+ "propertyPath": [
+ "_active"
+ ],
+ "value": false
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "4bGUhFXlZF/Jdkcq0HY9ai"
+ ]
+ },
{
"__type__": "cc.Node",
"_objFlags": 0,
@@ -584,14 +963,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 30
+ "__id__": 54
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 29
+ "__id__": 53
},
"asset": {
"__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
@@ -599,7 +978,7 @@
},
"fileId": "0d6ZXmA5dHkZxoGONDL2sE",
"instance": {
- "__id__": 31
+ "__id__": 55
},
"targetOverrides": null
},
@@ -613,22 +992,22 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 32
+ "__id__": 56
},
{
- "__id__": 34
+ "__id__": 58
},
{
- "__id__": 35
+ "__id__": 59
},
{
- "__id__": 36
+ "__id__": 60
},
{
- "__id__": 37
+ "__id__": 61
},
{
- "__id__": 39
+ "__id__": 63
}
],
"removedComponents": []
@@ -636,7 +1015,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 33
+ "__id__": 57
},
"propertyPath": [
"_name"
@@ -652,7 +1031,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 33
+ "__id__": 57
},
"propertyPath": [
"_lpos"
@@ -667,7 +1046,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 33
+ "__id__": 57
},
"propertyPath": [
"_lrot"
@@ -683,7 +1062,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 33
+ "__id__": 57
},
"propertyPath": [
"_euler"
@@ -698,7 +1077,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 38
+ "__id__": 62
},
"propertyPath": [
"_active"
@@ -714,13 +1093,125 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 33
+ "__id__": 57
},
"propertyPath": [
"_active"
],
"value": false
},
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 65
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 64
+ },
+ "asset": {
+ "__uuid__": "3e8ca50b-1db9-4996-affc-9d57af3a12d7",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "c46/YsCPVOJYA4mWEpNYRx",
+ "instance": {
+ "__id__": 66
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "d2UN4QO+BNroH7L+nRaD81",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 67
+ },
+ {
+ "__id__": 69
+ },
+ {
+ "__id__": 70
+ },
+ {
+ "__id__": 71
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 68
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "heathed"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "c46/YsCPVOJYA4mWEpNYRx"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 68
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 68
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 68
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
{
"__type__": "cc.UITransform",
"_name": "",
@@ -731,7 +1222,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 41
+ "__id__": 73
},
"_contentSize": {
"__type__": "cc.Size",
@@ -759,7 +1250,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 43
+ "__id__": 75
},
"enabledContactListener": true,
"bullet": true,
@@ -793,7 +1284,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 45
+ "__id__": 77
},
"tag": 0,
"_group": 4,
@@ -827,14 +1318,18 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 47
+ "__id__": 79
},
"hitFlashMaterial": {
"__uuid__": "a8f34051-ccff-4050-b9d9-234f62977264",
"__expectedType__": "cc.Material"
},
+ "atkMaterial": {
+ "__uuid__": "adc4e674-6203-42dd-8224-dffb471648a2",
+ "__expectedType__": "cc.Material"
+ },
"BoxRang": {
- "__id__": 10
+ "__id__": 32
},
"_id": ""
},
@@ -852,7 +1347,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 49
+ "__id__": 81
},
"_id": ""
},
@@ -870,10 +1365,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 51
- },
- "animator": {
- "__id__": 7
+ "__id__": 83
},
"_id": ""
},
@@ -894,10 +1386,16 @@
"targetOverrides": null,
"nestedPrefabInstanceRoots": [
{
- "__id__": 29
+ "__id__": 64
},
{
- "__id__": 20
+ "__id__": 53
+ },
+ {
+ "__id__": 42
+ },
+ {
+ "__id__": 16
}
]
}
diff --git a/assets/resources/game/map/Top-Down Forest Tileset_Environment - Fence 01.png b/assets/resources/game/map/Top-Down Forest Tileset_Environment - Fence 01.png
new file mode 100644
index 00000000..73856602
Binary files /dev/null and b/assets/resources/game/map/Top-Down Forest Tileset_Environment - Fence 01.png differ
diff --git a/assets/resources/game/map/Top-Down Forest Tileset_Environment - Fence 01.png.meta b/assets/resources/game/map/Top-Down Forest Tileset_Environment - Fence 01.png.meta
new file mode 100644
index 00000000..fcb598bc
--- /dev/null
+++ b/assets/resources/game/map/Top-Down Forest Tileset_Environment - Fence 01.png.meta
@@ -0,0 +1,134 @@
+{
+ "ver": "1.0.26",
+ "importer": "image",
+ "imported": true,
+ "uuid": "a533ed76-4c52-4062-8557-19b818fe4b27",
+ "files": [
+ ".json",
+ ".png"
+ ],
+ "subMetas": {
+ "6c48a": {
+ "importer": "texture",
+ "uuid": "a533ed76-4c52-4062-8557-19b818fe4b27@6c48a",
+ "displayName": "Top-Down Forest Tileset_Environment - Fence 01",
+ "id": "6c48a",
+ "name": "texture",
+ "userData": {
+ "wrapModeS": "clamp-to-edge",
+ "wrapModeT": "clamp-to-edge",
+ "minfilter": "linear",
+ "magfilter": "linear",
+ "mipfilter": "none",
+ "anisotropy": 0,
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "a533ed76-4c52-4062-8557-19b818fe4b27",
+ "visible": false
+ },
+ "ver": "1.0.22",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
+ "f9941": {
+ "importer": "sprite-frame",
+ "uuid": "a533ed76-4c52-4062-8557-19b818fe4b27@f9941",
+ "displayName": "Top-Down Forest Tileset_Environment - Fence 01",
+ "id": "f9941",
+ "name": "spriteFrame",
+ "userData": {
+ "trimType": "auto",
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0.5,
+ "offsetY": 2.5,
+ "trimX": 5,
+ "trimY": 6,
+ "width": 119,
+ "height": 47,
+ "rawWidth": 128,
+ "rawHeight": 64,
+ "borderTop": 0,
+ "borderBottom": 0,
+ "borderLeft": 0,
+ "borderRight": 0,
+ "packable": true,
+ "pixelsToUnit": 100,
+ "pivotX": 0.5,
+ "pivotY": 0.5,
+ "meshType": 0,
+ "vertices": {
+ "rawPosition": [
+ -59.5,
+ -23.5,
+ 0,
+ 59.5,
+ -23.5,
+ 0,
+ -59.5,
+ 23.5,
+ 0,
+ 59.5,
+ 23.5,
+ 0
+ ],
+ "indexes": [
+ 0,
+ 1,
+ 2,
+ 2,
+ 1,
+ 3
+ ],
+ "uv": [
+ 5,
+ 58,
+ 124,
+ 58,
+ 5,
+ 11,
+ 124,
+ 11
+ ],
+ "nuv": [
+ 0.0390625,
+ 0.171875,
+ 0.96875,
+ 0.171875,
+ 0.0390625,
+ 0.90625,
+ 0.96875,
+ 0.90625
+ ],
+ "minPos": [
+ -59.5,
+ -23.5,
+ 0
+ ],
+ "maxPos": [
+ 59.5,
+ 23.5,
+ 0
+ ]
+ },
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "a533ed76-4c52-4062-8557-19b818fe4b27@6c48a",
+ "atlasUuid": ""
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ }
+ },
+ "userData": {
+ "hasAlpha": true,
+ "type": "sprite-frame",
+ "fixAlphaTransparencyArtifacts": false,
+ "redirect": "a533ed76-4c52-4062-8557-19b818fe4b27@f9941"
+ }
+}
diff --git a/assets/resources/game/map/Top-Down Forest Tileset_Environment - Fence 03.png b/assets/resources/game/map/Top-Down Forest Tileset_Environment - Fence 03.png
new file mode 100644
index 00000000..390b62d0
Binary files /dev/null and b/assets/resources/game/map/Top-Down Forest Tileset_Environment - Fence 03.png differ
diff --git a/assets/resources/game/map/Top-Down Forest Tileset_Environment - Fence 03.png.meta b/assets/resources/game/map/Top-Down Forest Tileset_Environment - Fence 03.png.meta
new file mode 100644
index 00000000..70d612e6
--- /dev/null
+++ b/assets/resources/game/map/Top-Down Forest Tileset_Environment - Fence 03.png.meta
@@ -0,0 +1,134 @@
+{
+ "ver": "1.0.26",
+ "importer": "image",
+ "imported": true,
+ "uuid": "f02cc280-abae-42ee-af83-38f4bbf498ac",
+ "files": [
+ ".json",
+ ".png"
+ ],
+ "subMetas": {
+ "6c48a": {
+ "importer": "texture",
+ "uuid": "f02cc280-abae-42ee-af83-38f4bbf498ac@6c48a",
+ "displayName": "Top-Down Forest Tileset_Environment - Fence 03",
+ "id": "6c48a",
+ "name": "texture",
+ "userData": {
+ "wrapModeS": "clamp-to-edge",
+ "wrapModeT": "clamp-to-edge",
+ "minfilter": "linear",
+ "magfilter": "linear",
+ "mipfilter": "none",
+ "anisotropy": 0,
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "f02cc280-abae-42ee-af83-38f4bbf498ac",
+ "visible": false
+ },
+ "ver": "1.0.22",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
+ "f9941": {
+ "importer": "sprite-frame",
+ "uuid": "f02cc280-abae-42ee-af83-38f4bbf498ac@f9941",
+ "displayName": "Top-Down Forest Tileset_Environment - Fence 03",
+ "id": "f9941",
+ "name": "spriteFrame",
+ "userData": {
+ "trimType": "auto",
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": -1.5,
+ "offsetY": -2,
+ "trimX": 3,
+ "trimY": 13,
+ "width": 55,
+ "height": 42,
+ "rawWidth": 64,
+ "rawHeight": 64,
+ "borderTop": 0,
+ "borderBottom": 0,
+ "borderLeft": 0,
+ "borderRight": 0,
+ "packable": true,
+ "pixelsToUnit": 100,
+ "pivotX": 0.5,
+ "pivotY": 0.5,
+ "meshType": 0,
+ "vertices": {
+ "rawPosition": [
+ -27.5,
+ -21,
+ 0,
+ 27.5,
+ -21,
+ 0,
+ -27.5,
+ 21,
+ 0,
+ 27.5,
+ 21,
+ 0
+ ],
+ "indexes": [
+ 0,
+ 1,
+ 2,
+ 2,
+ 1,
+ 3
+ ],
+ "uv": [
+ 3,
+ 51,
+ 58,
+ 51,
+ 3,
+ 9,
+ 58,
+ 9
+ ],
+ "nuv": [
+ 0.046875,
+ 0.140625,
+ 0.90625,
+ 0.140625,
+ 0.046875,
+ 0.796875,
+ 0.90625,
+ 0.796875
+ ],
+ "minPos": [
+ -27.5,
+ -21,
+ 0
+ ],
+ "maxPos": [
+ 27.5,
+ 21,
+ 0
+ ]
+ },
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "f02cc280-abae-42ee-af83-38f4bbf498ac@6c48a",
+ "atlasUuid": ""
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ }
+ },
+ "userData": {
+ "hasAlpha": true,
+ "type": "sprite-frame",
+ "fixAlphaTransparencyArtifacts": false,
+ "redirect": "f02cc280-abae-42ee-af83-38f4bbf498ac@f9941"
+ }
+}
diff --git a/assets/resources/game/map/map_rpg.prefab b/assets/resources/game/map/map_rpg.prefab
index aa60e250..2f1e3271 100644
--- a/assets/resources/game/map/map_rpg.prefab
+++ b/assets/resources/game/map/map_rpg.prefab
@@ -28,17 +28,17 @@
"_active": true,
"_components": [
{
- "__id__": 68
+ "__id__": 92
},
{
- "__id__": 70
+ "__id__": 94
},
{
- "__id__": 72
+ "__id__": 96
}
],
"_prefab": {
- "__id__": 74
+ "__id__": 98
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -197,17 +197,17 @@
"_active": true,
"_components": [
{
- "__id__": 61
+ "__id__": 85
},
{
- "__id__": 63
+ "__id__": 87
},
{
- "__id__": 65
+ "__id__": 89
}
],
"_prefab": {
- "__id__": 67
+ "__id__": 91
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -251,29 +251,29 @@
"__id__": 8
},
{
- "__id__": 30
+ "__id__": 48
},
{
- "__id__": 34
+ "__id__": 58
},
{
- "__id__": 40
+ "__id__": 64
},
{
- "__id__": 46
+ "__id__": 70
},
{
- "__id__": 52
+ "__id__": 76
}
],
"_active": true,
"_components": [
{
- "__id__": 58
+ "__id__": 82
}
],
"_prefab": {
- "__id__": 60
+ "__id__": 84
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -320,20 +320,20 @@
"_active": true,
"_components": [
{
- "__id__": 21
+ "__id__": 39
},
{
- "__id__": 23
+ "__id__": 41
},
{
- "__id__": 25
+ "__id__": 43
},
{
- "__id__": 27
+ "__id__": 45
}
],
"_prefab": {
- "__id__": 29
+ "__id__": 47
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -380,14 +380,14 @@
"_active": true,
"_components": [
{
- "__id__": 16
+ "__id__": 34
},
{
- "__id__": 18
+ "__id__": 36
}
],
"_prefab": {
- "__id__": 20
+ "__id__": 38
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -426,18 +426,28 @@
"_parent": {
"__id__": 9
},
- "_children": [],
- "_active": true,
- "_components": [
+ "_children": [
{
"__id__": 11
},
{
- "__id__": 13
+ "__id__": 17
+ },
+ {
+ "__id__": 23
+ }
+ ],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 29
+ },
+ {
+ "__id__": 31
}
],
"_prefab": {
- "__id__": 15
+ "__id__": 33
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -468,6 +478,414 @@
},
"_id": ""
},
+ {
+ "__type__": "cc.Node",
+ "_name": "Top-Down Forest Tileset_Environment - Fence 01",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 10
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 12
+ },
+ {
+ "__id__": 14
+ }
+ ],
+ "_prefab": {
+ "__id__": 16
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": -323.357,
+ "y": 89.888,
+ "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__": 11
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 13
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 119,
+ "height": 47
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "e8SyTcUsNPlJzY+75/y2yc"
+ },
+ {
+ "__type__": "cc.Sprite",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 11
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 15
+ },
+ "_customMaterial": null,
+ "_srcBlendFactor": 2,
+ "_dstBlendFactor": 4,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
+ },
+ "_spriteFrame": {
+ "__uuid__": "a533ed76-4c52-4062-8557-19b818fe4b27@f9941",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ "_type": 0,
+ "_fillType": 0,
+ "_sizeMode": 1,
+ "_fillCenter": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_fillStart": 0,
+ "_fillRange": 0,
+ "_isTrimmedMode": true,
+ "_useGrayscale": false,
+ "_atlas": null,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "bbAq5ZMExC0LQhmrUvCYev"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "41vhc08jdE9Z5PJt9T6i44",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "Top-Down Forest Tileset_Environment - Fence 03",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 10
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 18
+ },
+ {
+ "__id__": 20
+ }
+ ],
+ "_prefab": {
+ "__id__": 22
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": -291.399,
+ "y": 61.542,
+ "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": 55,
+ "height": 42
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "24WfHTNkRB4Isfkb3uC/g2"
+ },
+ {
+ "__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__": "f02cc280-abae-42ee-af83-38f4bbf498ac@f9941",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ "_type": 0,
+ "_fillType": 0,
+ "_sizeMode": 1,
+ "_fillCenter": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_fillStart": 0,
+ "_fillRange": 0,
+ "_isTrimmedMode": true,
+ "_useGrayscale": false,
+ "_atlas": null,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "43MXQxd/NB/7iKIgc9WW6p"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "8cZe8MNNxBg5Po+EQL0wkf",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "Top-Down Forest Tileset_Environment - Fence 04",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 10
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 24
+ },
+ {
+ "__id__": 26
+ }
+ ],
+ "_prefab": {
+ "__id__": 28
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": -281.148,
+ "y": -204.978,
+ "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__": 23
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 25
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 55,
+ "height": 42
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "039c6vbPNAYYptxosOHpUN"
+ },
+ {
+ "__type__": "cc.Sprite",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 23
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 27
+ },
+ "_customMaterial": null,
+ "_srcBlendFactor": 2,
+ "_dstBlendFactor": 4,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
+ },
+ "_spriteFrame": {
+ "__uuid__": "f02cc280-abae-42ee-af83-38f4bbf498ac@f9941",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ "_type": 0,
+ "_fillType": 0,
+ "_sizeMode": 1,
+ "_fillCenter": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_fillStart": 0,
+ "_fillRange": 0,
+ "_isTrimmedMode": true,
+ "_useGrayscale": false,
+ "_atlas": null,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "d3blTYDqFMBbUQEC56gfY1"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "00/N1AZDxIAJfABGnNo9m4",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
{
"__type__": "cc.UITransform",
"_name": "",
@@ -478,7 +896,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 12
+ "__id__": 30
},
"_contentSize": {
"__type__": "cc.Size",
@@ -506,7 +924,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 14
+ "__id__": 32
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -564,7 +982,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 17
+ "__id__": 35
},
"_contentSize": {
"__type__": "cc.Size",
@@ -592,7 +1010,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 19
+ "__id__": 37
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -650,7 +1068,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 22
+ "__id__": 40
},
"_contentSize": {
"__type__": "cc.Size",
@@ -678,10 +1096,10 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 24
+ "__id__": 42
},
"bgImg": {
- "__id__": 18
+ "__id__": 36
},
"_id": ""
},
@@ -699,7 +1117,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 26
+ "__id__": 44
},
"light": {
"__uuid__": "319c7eb8-9826-48b6-81e4-82559dbf82a8",
@@ -721,7 +1139,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 28
+ "__id__": 46
},
"_id": ""
},
@@ -750,15 +1168,19 @@
"_parent": {
"__id__": 7
},
- "_children": [],
+ "_children": [
+ {
+ "__id__": 49
+ }
+ ],
"_active": true,
"_components": [
{
- "__id__": 31
+ "__id__": 55
}
],
"_prefab": {
- "__id__": 33
+ "__id__": 57
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -789,17 +1211,153 @@
},
"_id": ""
},
+ {
+ "__type__": "cc.Node",
+ "_name": "Top-Down Forest Tileset_Environment - Fence 01",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 48
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 50
+ },
+ {
+ "__id__": 52
+ }
+ ],
+ "_prefab": {
+ "__id__": 54
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": -322.602,
+ "y": 37.549,
+ "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__": 30
+ "__id__": 49
},
"_enabled": true,
"__prefab": {
- "__id__": 32
+ "__id__": 51
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 119,
+ "height": 47
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "5aqi8AcXxDv4yC8jq7O6/i"
+ },
+ {
+ "__type__": "cc.Sprite",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 49
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 53
+ },
+ "_customMaterial": null,
+ "_srcBlendFactor": 2,
+ "_dstBlendFactor": 4,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
+ },
+ "_spriteFrame": {
+ "__uuid__": "a533ed76-4c52-4062-8557-19b818fe4b27@f9941",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ "_type": 0,
+ "_fillType": 0,
+ "_sizeMode": 1,
+ "_fillCenter": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_fillStart": 0,
+ "_fillRange": 0,
+ "_isTrimmedMode": true,
+ "_useGrayscale": false,
+ "_atlas": null,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "56/qqtpeBGfIIW8I2Zd5PK"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "aab/FwSjVE3KfOtqnWNr8o",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 48
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 56
},
"_contentSize": {
"__type__": "cc.Size",
@@ -842,14 +1400,14 @@
"_active": true,
"_components": [
{
- "__id__": 35
+ "__id__": 59
},
{
- "__id__": 37
+ "__id__": 61
}
],
"_prefab": {
- "__id__": 39
+ "__id__": 63
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -886,11 +1444,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 34
+ "__id__": 58
},
"_enabled": true,
"__prefab": {
- "__id__": 36
+ "__id__": 60
},
"_contentSize": {
"__type__": "cc.Size",
@@ -914,11 +1472,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 34
+ "__id__": 58
},
"_enabled": true,
"__prefab": {
- "__id__": 38
+ "__id__": 62
},
"_id": ""
},
@@ -951,14 +1509,14 @@
"_active": true,
"_components": [
{
- "__id__": 41
+ "__id__": 65
},
{
- "__id__": 43
+ "__id__": 67
}
],
"_prefab": {
- "__id__": 45
+ "__id__": 69
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -995,11 +1553,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 40
+ "__id__": 64
},
"_enabled": true,
"__prefab": {
- "__id__": 42
+ "__id__": 66
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1023,11 +1581,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 40
+ "__id__": 64
},
"_enabled": true,
"__prefab": {
- "__id__": 44
+ "__id__": 68
},
"_id": ""
},
@@ -1060,14 +1618,14 @@
"_active": true,
"_components": [
{
- "__id__": 47
+ "__id__": 71
},
{
- "__id__": 49
+ "__id__": 73
}
],
"_prefab": {
- "__id__": 51
+ "__id__": 75
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -1104,11 +1662,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 46
+ "__id__": 70
},
"_enabled": true,
"__prefab": {
- "__id__": 48
+ "__id__": 72
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1132,11 +1690,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 46
+ "__id__": 70
},
"_enabled": true,
"__prefab": {
- "__id__": 50
+ "__id__": 74
},
"_id": ""
},
@@ -1169,14 +1727,14 @@
"_active": true,
"_components": [
{
- "__id__": 53
+ "__id__": 77
},
{
- "__id__": 55
+ "__id__": 79
}
],
"_prefab": {
- "__id__": 57
+ "__id__": 81
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -1213,11 +1771,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 52
+ "__id__": 76
},
"_enabled": true,
"__prefab": {
- "__id__": 54
+ "__id__": 78
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1241,11 +1799,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 52
+ "__id__": 76
},
"_enabled": true,
"__prefab": {
- "__id__": 56
+ "__id__": 80
},
"light": {
"__uuid__": "319c7eb8-9826-48b6-81e4-82559dbf82a8",
@@ -1280,7 +1838,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 59
+ "__id__": 83
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1321,7 +1879,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 62
+ "__id__": 86
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1349,7 +1907,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 64
+ "__id__": 88
},
"camera": {
"__id__": 3
@@ -1358,22 +1916,22 @@
"__id__": 7
},
"mapLayer": {
- "__id__": 23
+ "__id__": 41
},
"floorLayer": {
- "__id__": 30
+ "__id__": 48
},
"entityLayer": {
- "__id__": 43
+ "__id__": 67
},
"entityLayer1": {
- "__id__": 37
+ "__id__": 61
},
"entityLayer2": {
- "__id__": 49
+ "__id__": 73
},
"SkillLayer": {
- "__id__": 55
+ "__id__": 79
},
"isFollowPlayer": true,
"_id": ""
@@ -1392,7 +1950,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 66
+ "__id__": 90
},
"_id": ""
},
@@ -1423,7 +1981,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 69
+ "__id__": 93
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1451,7 +2009,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 71
+ "__id__": 95
},
"_cameraComponent": {
"__id__": 3
@@ -1473,7 +2031,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 73
+ "__id__": 97
},
"_alignFlags": 45,
"_target": null,
diff --git a/assets/resources/game/skills/atkup.prefab b/assets/resources/game/skills/atkup.prefab
new file mode 100644
index 00000000..ec7aa056
--- /dev/null
+++ b/assets/resources/game/skills/atkup.prefab
@@ -0,0 +1,334 @@
+[
+ {
+ "__type__": "cc.Prefab",
+ "_name": "atkup",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_native": "",
+ "data": {
+ "__id__": 1
+ },
+ "optimizationPolicy": 0,
+ "persistent": false
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "atkup",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": null,
+ "_children": [
+ {
+ "__id__": 2
+ }
+ ],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 8
+ },
+ {
+ "__id__": 10
+ },
+ {
+ "__id__": 12
+ },
+ {
+ "__id__": 14
+ }
+ ],
+ "_prefab": {
+ "__id__": 16
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 1,
+ "y": 1,
+ "z": 1
+ },
+ "_mobility": 0,
+ "_layer": 1073741824,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "skill",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 1
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 3
+ },
+ {
+ "__id__": 5
+ }
+ ],
+ "_prefab": {
+ "__id__": 7
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 1,
+ "y": 1,
+ "z": 1
+ },
+ "_mobility": 0,
+ "_layer": 1073741824,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 2
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 4
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 48,
+ "height": 48
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__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@fe42e",
+ "__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": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "7a5LvbdlxEc6FKa7cun2oB",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 1
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 9
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 120,
+ "height": 80
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.49664333316829656,
+ "y": 0.5156666649712457
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "63NP9yq3hEUKD/OZZZ5t7x"
+ },
+ {
+ "__type__": "cc.RigidBody2D",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 1
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 11
+ },
+ "enabledContactListener": true,
+ "bullet": true,
+ "awakeOnLoad": true,
+ "_group": 4,
+ "_type": 2,
+ "_allowSleep": false,
+ "_gravityScale": 0,
+ "_linearDamping": 0,
+ "_angularDamping": 0,
+ "_linearVelocity": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_angularVelocity": 0,
+ "_fixedRotation": false,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "f1VxV09PdOkofzgGv1tsZE"
+ },
+ {
+ "__type__": "cc.BoxCollider2D",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 1
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 13
+ },
+ "tag": 8,
+ "_group": 4,
+ "_density": 1,
+ "_sensor": true,
+ "_friction": 0.2,
+ "_restitution": 0,
+ "_offset": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_size": {
+ "__type__": "cc.Size",
+ "width": 30,
+ "height": 30
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "23eik112JPZYGiI8mJalTK"
+ },
+ {
+ "__type__": "45646oIyIdA24W+0c5rdELD",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 1
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 15
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "8ahZv91itPcYJm8S0veHYl"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "c46/YsCPVOJYA4mWEpNYRx",
+ "instance": null,
+ "targetOverrides": null
+ }
+]
\ No newline at end of file
diff --git a/assets/resources/game/skills/atkup.prefab.meta b/assets/resources/game/skills/atkup.prefab.meta
new file mode 100644
index 00000000..7bffbe4c
--- /dev/null
+++ b/assets/resources/game/skills/atkup.prefab.meta
@@ -0,0 +1,13 @@
+{
+ "ver": "1.1.50",
+ "importer": "prefab",
+ "imported": true,
+ "uuid": "5e5dbfee-998d-4243-a9a8-c186fe3e3bd4",
+ "files": [
+ ".json"
+ ],
+ "subMetas": {},
+ "userData": {
+ "syncNodeName": "atkup"
+ }
+}
diff --git a/assets/resources/game/skills/buff/shielded.anim b/assets/resources/game/skills/buff/shielded.anim
new file mode 100644
index 00000000..62cb100a
--- /dev/null
+++ b/assets/resources/game/skills/buff/shielded.anim
@@ -0,0 +1,240 @@
+[
+ {
+ "__type__": "cc.AnimationClip",
+ "_name": "shielded",
+ "_objFlags": 0,
+ "__editorExtras__": {
+ "embeddedPlayerGroups": []
+ },
+ "_native": "",
+ "sample": 24,
+ "speed": 1,
+ "wrapMode": 2,
+ "enableTrsBlending": false,
+ "_duration": 0.8333333333333334,
+ "_hash": 500763545,
+ "_tracks": [
+ {
+ "__id__": 1
+ }
+ ],
+ "_exoticAnimation": null,
+ "_events": [],
+ "_embeddedPlayers": [],
+ "_additiveSettings": {
+ "__id__": 11
+ },
+ "_auxiliaryCurveEntries": []
+ },
+ {
+ "__type__": "cc.animation.VectorTrack",
+ "_binding": {
+ "__type__": "cc.animation.TrackBinding",
+ "path": {
+ "__id__": 2
+ },
+ "proxy": null
+ },
+ "_channels": [
+ {
+ "__id__": 3
+ },
+ {
+ "__id__": 5
+ },
+ {
+ "__id__": 7
+ },
+ {
+ "__id__": 9
+ }
+ ],
+ "_nComponents": 3
+ },
+ {
+ "__type__": "cc.animation.TrackPath",
+ "_paths": [
+ "scale"
+ ]
+ },
+ {
+ "__type__": "cc.animation.Channel",
+ "_curve": {
+ "__id__": 4
+ }
+ },
+ {
+ "__type__": "cc.RealCurve",
+ "_times": [
+ 0,
+ 0.4166666567325592,
+ 0.8333333134651184
+ ],
+ "_values": [
+ {
+ "__type__": "cc.RealKeyframeValue",
+ "interpolationMode": 0,
+ "tangentWeightMode": 0,
+ "value": 1,
+ "rightTangent": 0,
+ "rightTangentWeight": 1,
+ "leftTangent": 0,
+ "leftTangentWeight": 1,
+ "easingMethod": 0,
+ "__editorExtras__": null
+ },
+ {
+ "__type__": "cc.RealKeyframeValue",
+ "interpolationMode": 0,
+ "tangentWeightMode": 0,
+ "value": 1.100000023841858,
+ "rightTangent": 0,
+ "rightTangentWeight": 1,
+ "leftTangent": 0,
+ "leftTangentWeight": 1,
+ "easingMethod": 0,
+ "__editorExtras__": null
+ },
+ {
+ "__type__": "cc.RealKeyframeValue",
+ "interpolationMode": 0,
+ "tangentWeightMode": 0,
+ "value": 1,
+ "rightTangent": 0,
+ "rightTangentWeight": 1,
+ "leftTangent": 0,
+ "leftTangentWeight": 1,
+ "easingMethod": 0,
+ "__editorExtras__": null
+ }
+ ],
+ "preExtrapolation": 1,
+ "postExtrapolation": 1
+ },
+ {
+ "__type__": "cc.animation.Channel",
+ "_curve": {
+ "__id__": 6
+ }
+ },
+ {
+ "__type__": "cc.RealCurve",
+ "_times": [
+ 0,
+ 0.4166666567325592,
+ 0.8333333134651184
+ ],
+ "_values": [
+ {
+ "__type__": "cc.RealKeyframeValue",
+ "interpolationMode": 0,
+ "tangentWeightMode": 0,
+ "value": 1,
+ "rightTangent": 0,
+ "rightTangentWeight": 1,
+ "leftTangent": 0,
+ "leftTangentWeight": 1,
+ "easingMethod": 0,
+ "__editorExtras__": null
+ },
+ {
+ "__type__": "cc.RealKeyframeValue",
+ "interpolationMode": 0,
+ "tangentWeightMode": 0,
+ "value": 1,
+ "rightTangent": 0,
+ "rightTangentWeight": 1,
+ "leftTangent": 0,
+ "leftTangentWeight": 1,
+ "easingMethod": 0,
+ "__editorExtras__": null
+ },
+ {
+ "__type__": "cc.RealKeyframeValue",
+ "interpolationMode": 0,
+ "tangentWeightMode": 0,
+ "value": 1,
+ "rightTangent": 0,
+ "rightTangentWeight": 1,
+ "leftTangent": 0,
+ "leftTangentWeight": 1,
+ "easingMethod": 0,
+ "__editorExtras__": null
+ }
+ ],
+ "preExtrapolation": 1,
+ "postExtrapolation": 1
+ },
+ {
+ "__type__": "cc.animation.Channel",
+ "_curve": {
+ "__id__": 8
+ }
+ },
+ {
+ "__type__": "cc.RealCurve",
+ "_times": [
+ 0,
+ 0.4166666567325592,
+ 0.8333333134651184
+ ],
+ "_values": [
+ {
+ "__type__": "cc.RealKeyframeValue",
+ "interpolationMode": 0,
+ "tangentWeightMode": 0,
+ "value": 1,
+ "rightTangent": 0,
+ "rightTangentWeight": 1,
+ "leftTangent": 0,
+ "leftTangentWeight": 1,
+ "easingMethod": 0,
+ "__editorExtras__": null
+ },
+ {
+ "__type__": "cc.RealKeyframeValue",
+ "interpolationMode": 0,
+ "tangentWeightMode": 0,
+ "value": 1,
+ "rightTangent": 0,
+ "rightTangentWeight": 1,
+ "leftTangent": 0,
+ "leftTangentWeight": 1,
+ "easingMethod": 0,
+ "__editorExtras__": null
+ },
+ {
+ "__type__": "cc.RealKeyframeValue",
+ "interpolationMode": 0,
+ "tangentWeightMode": 0,
+ "value": 1,
+ "rightTangent": 0,
+ "rightTangentWeight": 1,
+ "leftTangent": 0,
+ "leftTangentWeight": 1,
+ "easingMethod": 0,
+ "__editorExtras__": null
+ }
+ ],
+ "preExtrapolation": 1,
+ "postExtrapolation": 1
+ },
+ {
+ "__type__": "cc.animation.Channel",
+ "_curve": {
+ "__id__": 10
+ }
+ },
+ {
+ "__type__": "cc.RealCurve",
+ "_times": [],
+ "_values": [],
+ "preExtrapolation": 1,
+ "postExtrapolation": 1
+ },
+ {
+ "__type__": "cc.AnimationClipAdditiveSettings",
+ "enabled": false,
+ "refClip": null
+ }
+]
\ No newline at end of file
diff --git a/assets/resources/game/skills/buff/shielded.anim.meta b/assets/resources/game/skills/buff/shielded.anim.meta
new file mode 100644
index 00000000..1401144d
--- /dev/null
+++ b/assets/resources/game/skills/buff/shielded.anim.meta
@@ -0,0 +1,13 @@
+{
+ "ver": "2.0.3",
+ "importer": "animation-clip",
+ "imported": true,
+ "uuid": "6200a523-2e29-480c-a2bb-2189a23daf16",
+ "files": [
+ ".cconb"
+ ],
+ "subMetas": {},
+ "userData": {
+ "name": "shielded"
+ }
+}
diff --git a/assets/resources/game/skills/buff/shield.prefab b/assets/resources/game/skills/shield.prefab
similarity index 64%
rename from assets/resources/game/skills/buff/shield.prefab
rename to assets/resources/game/skills/shield.prefab
index 8830b66c..a6d0a345 100644
--- a/assets/resources/game/skills/buff/shield.prefab
+++ b/assets/resources/game/skills/shield.prefab
@@ -26,10 +26,19 @@
"_components": [
{
"__id__": 8
+ },
+ {
+ "__id__": 10
+ },
+ {
+ "__id__": 12
+ },
+ {
+ "__id__": 14
}
],
"_prefab": {
- "__id__": 10
+ "__id__": 16
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -62,7 +71,7 @@
},
{
"__type__": "cc.Node",
- "_name": "Cartoon RPG UI_Game Icon - Defense",
+ "_name": "skill",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
@@ -124,8 +133,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 14,
- "height": 14
+ "width": 48,
+ "height": 48
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -136,7 +145,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
- "fileId": "92y5A9GmdC3YqWXakOk+Dt"
+ "fileId": "b4sNQPJWFKha7x75SWXmRj"
},
{
"__type__": "cc.Sprite",
@@ -161,7 +170,7 @@
"a": 255
},
"_spriteFrame": {
- "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@a018f",
+ "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@f599c",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 0,
@@ -181,7 +190,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
- "fileId": "71N2ScG5NGYZ7cctMzdCwo"
+ "fileId": "9a+65VIghBm4HQxuHPQ/mg"
},
{
"__type__": "cc.PrefabInfo",
@@ -191,7 +200,7 @@
"asset": {
"__id__": 0
},
- "fileId": "8bAUZ3X4dEoY+FJWosklUw",
+ "fileId": "7a5LvbdlxEc6FKa7cun2oB",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
@@ -210,19 +219,105 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 100,
- "height": 100
+ "width": 120,
+ "height": 80
},
"_anchorPoint": {
"__type__": "cc.Vec2",
- "x": 0.5,
- "y": 0.5
+ "x": 0.49664333316829656,
+ "y": 0.5156666649712457
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
- "fileId": "81ULXUpuxIvZ3yj/tj37CQ"
+ "fileId": "63NP9yq3hEUKD/OZZZ5t7x"
+ },
+ {
+ "__type__": "cc.RigidBody2D",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 1
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 11
+ },
+ "enabledContactListener": true,
+ "bullet": true,
+ "awakeOnLoad": true,
+ "_group": 4,
+ "_type": 2,
+ "_allowSleep": false,
+ "_gravityScale": 0,
+ "_linearDamping": 0,
+ "_angularDamping": 0,
+ "_linearVelocity": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_angularVelocity": 0,
+ "_fixedRotation": false,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "f1VxV09PdOkofzgGv1tsZE"
+ },
+ {
+ "__type__": "cc.BoxCollider2D",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 1
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 13
+ },
+ "tag": 8,
+ "_group": 4,
+ "_density": 1,
+ "_sensor": true,
+ "_friction": 0.2,
+ "_restitution": 0,
+ "_offset": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_size": {
+ "__type__": "cc.Size",
+ "width": 30,
+ "height": 30
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "23eik112JPZYGiI8mJalTK"
+ },
+ {
+ "__type__": "45646oIyIdA24W+0c5rdELD",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 1
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 15
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "8ahZv91itPcYJm8S0veHYl"
},
{
"__type__": "cc.PrefabInfo",
diff --git a/assets/resources/game/skills/buff/shield.prefab.meta b/assets/resources/game/skills/shield.prefab.meta
similarity index 76%
rename from assets/resources/game/skills/buff/shield.prefab.meta
rename to assets/resources/game/skills/shield.prefab.meta
index cc7407f6..cd4c5166 100644
--- a/assets/resources/game/skills/buff/shield.prefab.meta
+++ b/assets/resources/game/skills/shield.prefab.meta
@@ -2,7 +2,7 @@
"ver": "1.1.50",
"importer": "prefab",
"imported": true,
- "uuid": "f228c341-e9c0-483c-96e8-377c9e89234b",
+ "uuid": "0a37d2a6-5f33-4565-8992-d6460a3cbea2",
"files": [
".json"
],
diff --git a/assets/resources/game/skills/buff/atk.prefab b/assets/resources/game/skills/shielded.prefab
similarity index 66%
rename from assets/resources/game/skills/buff/atk.prefab
rename to assets/resources/game/skills/shielded.prefab
index 6e7a2d63..3231d411 100644
--- a/assets/resources/game/skills/buff/atk.prefab
+++ b/assets/resources/game/skills/shielded.prefab
@@ -1,7 +1,7 @@
[
{
"__type__": "cc.Prefab",
- "_name": "atk",
+ "_name": "shielded",
"_objFlags": 0,
"__editorExtras__": {},
"_native": "",
@@ -13,7 +13,7 @@
},
{
"__type__": "cc.Node",
- "_name": "atk",
+ "_name": "shielded",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": null,
@@ -22,14 +22,17 @@
"__id__": 2
}
],
- "_active": true,
+ "_active": false,
"_components": [
{
- "__id__": 8
+ "__id__": 10
+ },
+ {
+ "__id__": 12
}
],
"_prefab": {
- "__id__": 10
+ "__id__": 14
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -62,7 +65,7 @@
},
{
"__type__": "cc.Node",
- "_name": "Cartoon RPG UI_Game Icon - Attack",
+ "_name": "skill",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
@@ -76,15 +79,18 @@
},
{
"__id__": 5
+ },
+ {
+ "__id__": 7
}
],
"_prefab": {
- "__id__": 7
+ "__id__": 9
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
- "y": 0,
+ "y": 15,
"z": 0
},
"_lrot": {
@@ -124,8 +130,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 14,
- "height": 14
+ "width": 55,
+ "height": 65
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -136,7 +142,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
- "fileId": "e65xj3nrRILqRAqturKhHp"
+ "fileId": "b4sNQPJWFKha7x75SWXmRj"
},
{
"__type__": "cc.Sprite",
@@ -161,7 +167,7 @@
"a": 255
},
"_spriteFrame": {
- "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@360cc",
+ "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@91c2a",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 0,
@@ -181,7 +187,36 @@
},
{
"__type__": "cc.CompPrefabInfo",
- "fileId": "bajfk57dZBYqejL8q2V5+3"
+ "fileId": "9a+65VIghBm4HQxuHPQ/mg"
+ },
+ {
+ "__type__": "cc.Animation",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 2
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 8
+ },
+ "playOnLoad": true,
+ "_clips": [
+ {
+ "__uuid__": "6200a523-2e29-480c-a2bb-2189a23daf16",
+ "__expectedType__": "cc.AnimationClip"
+ }
+ ],
+ "_defaultClip": {
+ "__uuid__": "6200a523-2e29-480c-a2bb-2189a23daf16",
+ "__expectedType__": "cc.AnimationClip"
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "cc1FBbHhlBirJkBcBIHROd"
},
{
"__type__": "cc.PrefabInfo",
@@ -191,7 +226,7 @@
"asset": {
"__id__": 0
},
- "fileId": "06h8KSrMJG9bW3+9zl/nWR",
+ "fileId": "7a5LvbdlxEc6FKa7cun2oB",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
@@ -206,23 +241,52 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 9
+ "__id__": 11
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 100,
- "height": 100
+ "width": 120,
+ "height": 80
},
"_anchorPoint": {
"__type__": "cc.Vec2",
- "x": 0.5,
- "y": 0.5
+ "x": 0.49664333316829656,
+ "y": 0
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
- "fileId": "81ULXUpuxIvZ3yj/tj37CQ"
+ "fileId": "63NP9yq3hEUKD/OZZZ5t7x"
+ },
+ {
+ "__type__": "cc.Animation",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 1
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 13
+ },
+ "playOnLoad": true,
+ "_clips": [
+ {
+ "__uuid__": "6200a523-2e29-480c-a2bb-2189a23daf16",
+ "__expectedType__": "cc.AnimationClip"
+ }
+ ],
+ "_defaultClip": {
+ "__uuid__": "6200a523-2e29-480c-a2bb-2189a23daf16",
+ "__expectedType__": "cc.AnimationClip"
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "c6LOemuvJKyYCqlF/yUJcr"
},
{
"__type__": "cc.PrefabInfo",
diff --git a/assets/resources/game/skills/shielded.prefab.meta b/assets/resources/game/skills/shielded.prefab.meta
new file mode 100644
index 00000000..d0a05f12
--- /dev/null
+++ b/assets/resources/game/skills/shielded.prefab.meta
@@ -0,0 +1,13 @@
+{
+ "ver": "1.1.50",
+ "importer": "prefab",
+ "imported": true,
+ "uuid": "e1b8a315-ece3-41a2-941e-a66861753f1b",
+ "files": [
+ ".json"
+ ],
+ "subMetas": {},
+ "userData": {
+ "syncNodeName": "shielded"
+ }
+}
diff --git a/assets/resources/game/skills/sword1.prefab b/assets/resources/game/skills/sword1.prefab
index c6adaa2e..cb3fbabf 100644
--- a/assets/resources/game/skills/sword1.prefab
+++ b/assets/resources/game/skills/sword1.prefab
@@ -133,8 +133,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 24,
- "height": 76
+ "width": 32,
+ "height": 64
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@@ -170,12 +170,12 @@
"a": 255
},
"_spriteFrame": {
- "__uuid__": "5768242f-b913-4e53-aa0e-b276de0f77f4@568ac",
+ "__uuid__": "5768242f-b913-4e53-aa0e-b276de0f77f4@b091f",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 0,
"_fillType": 0,
- "_sizeMode": 1,
+ "_sizeMode": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
diff --git a/assets/resources/gui/gui.plist b/assets/resources/gui/gui.plist
index 2a9654db..0f333c95 100644
--- a/assets/resources/gui/gui.plist
+++ b/assets/resources/gui/gui.plist
@@ -15,7 +15,7 @@
spriteSourceSize
{94,118}
textureRect
- {{283,1068},{94,118}}
+ {{689,645},{94,118}}
textureRotated
@@ -30,9 +30,9 @@
spriteSourceSize
{64,63}
textureRect
- {{257,1164},{64,63}}
+ {{569,524},{64,63}}
textureRotated
-
+
03.png
@@ -45,9 +45,9 @@
spriteSourceSize
{64,62}
textureRect
- {{236,1416},{64,62}}
+ {{1426,807},{64,62}}
textureRotated
-
+
100.png
@@ -60,9 +60,9 @@
spriteSourceSize
{103,117}
textureRect
- {{785,1193},{103,117}}
+ {{689,526},{103,117}}
textureRotated
-
+
118.png
@@ -75,7 +75,7 @@
spriteSourceSize
{144,179}
textureRect
- {{351,424},{144,179}}
+ {{351,378},{144,179}}
textureRotated
@@ -90,9 +90,9 @@
spriteSourceSize
{44,42}
textureRect
- {{961,332},{44,42}}
+ {{1315,531},{44,42}}
textureRotated
-
+
128.png
@@ -105,9 +105,9 @@
spriteSourceSize
{97,96}
textureRect
- {{564,1270},{97,96}}
+ {{1166,792},{97,96}}
textureRotated
-
+
129.png
@@ -120,7 +120,7 @@
spriteSourceSize
{20,20}
textureRect
- {{993,1306},{20,20}}
+ {{331,806},{20,20}}
textureRotated
@@ -135,9 +135,9 @@
spriteSourceSize
{122,98}
textureRect
- {{714,326},{122,98}}
+ {{673,156},{122,98}}
textureRotated
-
+
43.png
@@ -150,7 +150,7 @@
spriteSourceSize
{100,100}
textureRect
- {{562,1368},{100,100}}
+ {{660,881},{100,100}}
textureRotated
@@ -165,9 +165,9 @@
spriteSourceSize
{82,94}
textureRect
- {{763,1384},{82,94}}
+ {{924,887},{82,94}}
textureRotated
-
+
58.png
@@ -180,7 +180,7 @@
spriteSourceSize
{100,96}
textureRect
- {{612,326},{100,96}}
+ {{612,280},{100,96}}
textureRotated
@@ -195,9 +195,9 @@
spriteSourceSize
{84,106}
textureRect
- {{777,1298},{84,106}}
+ {{1456,577},{84,106}}
textureRotated
-
+
87.png
@@ -210,7 +210,7 @@
spriteSourceSize
{100,121}
textureRect
- {{838,326},{100,121}}
+ {{924,785},{100,121}}
textureRotated
@@ -225,9 +225,9 @@
spriteSourceSize
{119,113}
textureRect
- {{325,1308},{119,113}}
+ {{809,767},{119,113}}
textureRotated
-
+
91.png
@@ -240,7 +240,7 @@
spriteSourceSize
{124,114}
textureRect
- {{446,1295},{124,114}}
+ {{809,641},{124,114}}
textureRotated
@@ -255,7 +255,7 @@
spriteSourceSize
{101,117}
textureRect
- {{790,1090},{101,117}}
+ {{1047,792},{101,117}}
textureRotated
@@ -270,7 +270,7 @@
spriteSourceSize
{97,125}
textureRect
- {{564,1143},{97,125}}
+ {{288,832},{97,125}}
textureRotated
@@ -285,7 +285,7 @@
spriteSourceSize
{98,125}
textureRect
- {{399,794},{98,125}}
+ {{932,456},{98,125}}
textureRotated
@@ -300,7 +300,7 @@
spriteSourceSize
{97,125}
textureRect
- {{798,991},{97,125}}
+ {{932,556},{97,125}}
textureRotated
@@ -315,9 +315,9 @@
spriteSourceSize
{139,117}
textureRect
- {{541,1002},{139,117}}
+ {{1315,577},{139,117}}
textureRotated
-
+
99.png
@@ -330,7 +330,7 @@
spriteSourceSize
{129,123}
textureRect
- {{439,1164},{129,123}}
+ {{935,187},{129,123}}
textureRotated
@@ -345,9 +345,9 @@
spriteSourceSize
{160,48}
textureRect
- {{975,190},{140,38}}
+ {{387,914},{140,38}}
textureRotated
-
+
Artboard 16.png
@@ -360,9 +360,9 @@
spriteSourceSize
{360,106}
textureRect
- {{1,950},{334,92}}
+ {{1060,1},{334,92}}
textureRotated
-
+
Artboard 27.png
@@ -405,9 +405,9 @@
spriteSourceSize
{95,61}
textureRect
- {{946,633},{95,61}}
+ {{1264,906},{95,61}}
textureRotated
-
+
Buttons_Button Normal - Number.png
@@ -420,7 +420,7 @@
spriteSourceSize
{160,160}
textureRect
- {{126,596},{160,160}}
+ {{126,592},{160,160}}
textureRotated
@@ -435,7 +435,7 @@
spriteSourceSize
{160,160}
textureRect
- {{126,758},{160,160}}
+ {{126,754},{160,160}}
textureRotated
@@ -480,7 +480,7 @@
spriteSourceSize
{320,160}
textureRect
- {{351,202},{320,122}}
+ {{351,156},{320,122}}
textureRotated
@@ -495,7 +495,7 @@
spriteSourceSize
{160,160}
textureRect
- {{532,424},{144,144}}
+ {{532,378},{144,144}}
textureRotated
@@ -510,7 +510,7 @@
spriteSourceSize
{160,160}
textureRect
- {{812,735},{138,138}}
+ {{549,590},{138,138}}
textureRotated
@@ -525,7 +525,7 @@
spriteSourceSize
{160,160}
textureRect
- {{526,732},{128,142}}
+ {{1219,401},{128,142}}
textureRotated
@@ -540,7 +540,7 @@
spriteSourceSize
{160,160}
textureRect
- {{663,1137},{120,116}}
+ {{1055,674},{120,116}}
textureRotated
@@ -555,9 +555,9 @@
spriteSourceSize
{160,160}
textureRect
- {{868,40},{142,148}}
+ {{1396,1},{142,148}}
textureRotated
-
+
Cartoon RPG UI_Game Icon - Diamond.png
@@ -570,9 +570,9 @@
spriteSourceSize
{160,160}
textureRect
- {{837,428},{148,134}}
+ {{1363,307},{148,134}}
textureRotated
-
+
Cartoon RPG UI_Game Icon - Fire Resistant Gem.png
@@ -585,7 +585,7 @@
spriteSourceSize
{160,160}
textureRect
- {{670,729},{140,140}}
+ {{1059,532},{140,140}}
textureRotated
@@ -600,7 +600,7 @@
spriteSourceSize
{160,160}
textureRect
- {{283,920},{114,146}}
+ {{678,378},{114,146}}
textureRotated
@@ -615,9 +615,9 @@
spriteSourceSize
{160,160}
textureRect
- {{812,585},{132,148}}
+ {{1363,443},{132,148}}
textureRotated
-
+
Cartoon RPG UI_Game Icon - Life.png
@@ -630,7 +630,7 @@
spriteSourceSize
{160,160}
textureRect
- {{399,894},{144,136}}
+ {{794,371},{144,136}}
textureRotated
@@ -645,7 +645,7 @@
spriteSourceSize
{160,160}
textureRect
- {{813,202},{136,122}}
+ {{794,517},{136,122}}
textureRotated
@@ -660,7 +660,7 @@
spriteSourceSize
{160,160}
textureRect
- {{325,1164},{112,142}}
+ {{1201,532},{112,142}}
textureRotated
@@ -675,7 +675,7 @@
spriteSourceSize
{160,160}
textureRect
- {{798,875},{114,146}}
+ {{1059,416},{114,146}}
textureRotated
@@ -690,9 +690,9 @@
spriteSourceSize
{160,160}
textureRect
- {{673,202},{138,122}}
+ {{685,741},{138,122}}
textureRotated
-
+
Cartoon RPG UI_Game Icon - Water Gem.png
@@ -705,9 +705,9 @@
spriteSourceSize
{160,160}
textureRect
- {{403,1040},{122,136}}
+ {{935,318},{122,136}}
textureRotated
-
+
Cartoon RPG UI_Game Icon - Water Resistant Gem.png
@@ -720,7 +720,7 @@
spriteSourceSize
{160,160}
textureRect
- {{660,1007},{128,128}}
+ {{925,655},{128,128}}
textureRotated
@@ -735,7 +735,7 @@
spriteSourceSize
{160,160}
textureRect
- {{95,920},{160,160}}
+ {{387,590},{160,160}}
textureRotated
@@ -750,7 +750,7 @@
spriteSourceSize
{160,160}
textureRect
- {{95,1082},{160,160}}
+ {{387,752},{160,160}}
textureRotated
@@ -765,7 +765,7 @@
spriteSourceSize
{160,160}
textureRect
- {{1,1286},{160,160}}
+ {{773,47},{160,160}}
textureRotated
@@ -780,7 +780,7 @@
spriteSourceSize
{160,160}
textureRect
- {{344,570},{160,160}}
+ {{1060,95},{160,160}}
textureRotated
@@ -795,7 +795,7 @@
spriteSourceSize
{160,160}
textureRect
- {{506,570},{160,160}}
+ {{1222,95},{160,160}}
textureRotated
@@ -810,7 +810,7 @@
spriteSourceSize
{160,160}
textureRect
- {{163,1244},{160,160}}
+ {{1384,145},{160,160}}
textureRotated
@@ -840,7 +840,7 @@
spriteSourceSize
{82,91}
textureRect
- {{859,1399},{82,91}}
+ {{1008,895},{82,91}}
textureRotated
@@ -855,9 +855,9 @@
spriteSourceSize
{41,48}
textureRect
- {{1,1448},{41,48}}
+ {{1428,871},{41,48}}
textureRotated
-
+
LvlMapAvailable.png
@@ -870,9 +870,9 @@
spriteSourceSize
{35,32}
textureRect
- {{964,1},{35,32}}
+ {{1513,475},{35,32}}
textureRotated
-
+
Option_icon.png
@@ -885,9 +885,9 @@
spriteSourceSize
{42,43}
textureRect
- {{961,376},{42,43}}
+ {{1361,939},{42,43}}
textureRotated
-
+
Rounded Rectangle 1029 copy 10.png
@@ -900,7 +900,7 @@
spriteSourceSize
{361,44}
textureRect
- {{343,156},{361,44}}
+ {{697,1},{361,44}}
textureRotated
@@ -915,9 +915,9 @@
spriteSourceSize
{72,40}
textureRect
- {{51,1448},{72,40}}
+ {{870,888},{72,40}}
textureRotated
-
+
Rounded Rectangle 795.png
@@ -930,9 +930,9 @@
spriteSourceSize
{238,41}
textureRect
- {{103,553},{238,41}}
+ {{288,592},{238,41}}
textureRotated
-
+
Shop_icon.png
@@ -945,7 +945,7 @@
spriteSourceSize
{49,42}
textureRect
- {{952,1399},{49,42}}
+ {{634,524},{49,42}}
textureRotated
@@ -960,9 +960,9 @@
spriteSourceSize
{105,10}
textureRect
- {{868,190},{105,10}}
+ {{1535,307},{105,10}}
textureRotated
-
+
UI-03.png
@@ -975,7 +975,7 @@
spriteSourceSize
{111,16}
textureRect
- {{951,202},{111,16}}
+ {{1518,685},{111,16}}
textureRotated
@@ -990,7 +990,7 @@
spriteSourceSize
{138,123}
textureRect
- {{537,862},{138,123}}
+ {{935,47},{138,123}}
textureRotated
@@ -1020,9 +1020,9 @@
spriteSourceSize
{111,109}
textureRect
- {{904,1193},{111,109}}
+ {{1405,696},{111,109}}
textureRotated
-
+
btn green.png
@@ -1035,7 +1035,7 @@
spriteSourceSize
{259,96}
textureRect
- {{351,326},{259,96}}
+ {{351,280},{259,96}}
textureRotated
@@ -1050,7 +1050,7 @@
spriteSourceSize
{71,71}
textureRect
- {{163,1416},{71,71}}
+ {{1101,895},{71,71}}
textureRotated
@@ -1065,7 +1065,7 @@
spriteSourceSize
{97,97}
textureRect
- {{664,1367},{97,97}}
+ {{1264,807},{97,97}}
textureRotated
@@ -1080,7 +1080,7 @@
spriteSourceSize
{180,38}
textureRect
- {{344,732},{180,38}}
+ {{370,550},{180,38}}
textureRotated
@@ -1095,7 +1095,37 @@
spriteSourceSize
{38,38}
textureRect
- {{95,1244},{38,38}}
+ {{1492,807},{38,38}}
+ textureRotated
+
+
+ dun1.png
+
+ aliases
+
+ spriteOffset
+ {0,0}
+ spriteSize
+ {112,111}
+ spriteSourceSize
+ {112,111}
+ textureRect
+ {{1177,676},{112,111}}
+ textureRotated
+
+
+ dun2.png
+
+ aliases
+
+ spriteOffset
+ {0,0}
+ spriteSize
+ {112,109}
+ spriteSourceSize
+ {112,109}
+ textureRect
+ {{1291,696},{112,109}}
textureRotated
@@ -1110,9 +1140,9 @@
spriteSourceSize
{166,20}
textureRect
- {{344,772},{166,20}}
+ {{1513,307},{166,20}}
textureRotated
-
+
gbg.png
@@ -1125,7 +1155,7 @@
spriteSourceSize
{212,26}
textureRect
- {{288,596},{212,26}}
+ {{331,592},{212,26}}
textureRotated
@@ -1140,7 +1170,7 @@
spriteSourceSize
{160,160}
textureRect
- {{706,40},{160,160}}
+ {{773,209},{160,160}}
textureRotated
@@ -1155,22 +1185,7 @@
spriteSourceSize
{109,108}
textureRect
- {{288,810},{109,108}}
- textureRotated
-
-
- grep.png
-
- aliases
-
- spriteOffset
- {0,0}
- spriteSize
- {112,110}
- spriteSourceSize
- {112,110}
- textureRect
- {{663,1255},{112,110}}
+ {{549,866},{109,108}}
textureRotated
@@ -1185,7 +1200,7 @@
spriteSourceSize
{134,134}
textureRect
- {{662,871},{134,134}}
+ {{549,730},{134,134}}
textureRotated
@@ -1215,7 +1230,7 @@
spriteSourceSize
{106,91}
textureRect
- {{885,1306},{106,91}}
+ {{762,888},{106,91}}
textureRotated
@@ -1230,9 +1245,9 @@
spriteSourceSize
{67,53}
textureRect
- {{946,578},{67,53}}
+ {{714,280},{67,53}}
textureRotated
-
+
menu_focus.png
@@ -1245,7 +1260,7 @@
spriteSourceSize
{157,157}
textureRect
- {{678,426},{157,157}}
+ {{1060,257},{157,157}}
textureRotated
@@ -1260,7 +1275,7 @@
spriteSourceSize
{129,8}
textureRect
- {{163,1406},{129,8}}
+ {{387,954},{129,8}}
textureRotated
@@ -1275,7 +1290,7 @@
spriteSourceSize
{191,26}
textureRect
- {{316,596},{191,26}}
+ {{359,592},{191,26}}
textureRotated
@@ -1290,9 +1305,9 @@
spriteSourceSize
{216,8}
textureRect
- {{273,920},{216,8}}
+ {{351,540},{216,8}}
textureRotated
-
+
redbg1.png
@@ -1320,7 +1335,7 @@
spriteSourceSize
{265,37}
textureRect
- {{697,1},{265,37}}
+ {{103,553},{265,37}}
textureRotated
@@ -1335,7 +1350,7 @@
spriteSourceSize
{1024,1024}
textureRect
- {{668,585},{142,142}}
+ {{1219,257},{142,142}}
textureRotated
@@ -1350,9 +1365,9 @@
spriteSourceSize
{32,12}
textureRect
- {{1001,1},{32,12}}
+ {{1264,969},{32,12}}
textureRotated
-
+
shuaxin.png
@@ -1365,7 +1380,7 @@
spriteSourceSize
{61,69}
textureRect
- {{952,730},{61,69}}
+ {{1363,807},{61,69}}
textureRotated
@@ -1380,7 +1395,7 @@
spriteSourceSize
{32,32}
textureRect
- {{125,1448},{32,32}}
+ {{1513,512},{32,32}}
textureRotated
@@ -1410,7 +1425,7 @@
spriteSourceSize
{32,32}
textureRect
- {{973,421},{30,32}}
+ {{94,892},{30,32}}
textureRotated
@@ -1425,7 +1440,7 @@
spriteSourceSize
{32,32}
textureRect
- {{952,1450},{32,32}}
+ {{1492,847},{32,32}}
textureRotated
@@ -1440,7 +1455,7 @@
spriteSourceSize
{32,32}
textureRect
- {{973,455},{32,32}}
+ {{1406,939},{32,32}}
textureRotated
@@ -1455,7 +1470,7 @@
spriteSourceSize
{32,32}
textureRect
- {{973,489},{32,32}}
+ {{1471,881},{32,32}}
textureRotated
@@ -1470,7 +1485,7 @@
spriteSourceSize
{32,32}
textureRect
- {{973,523},{32,32}}
+ {{1505,881},{32,32}}
textureRotated
@@ -1485,7 +1500,7 @@
spriteSourceSize
{32,32}
textureRect
- {{909,1090},{32,32}}
+ {{1440,921},{32,32}}
textureRotated
@@ -1500,7 +1515,7 @@
spriteSourceSize
{32,32}
textureRect
- {{909,1124},{32,32}}
+ {{1474,915},{32,32}}
textureRotated
@@ -1515,7 +1530,7 @@
spriteSourceSize
{32,32}
textureRect
- {{909,1158},{32,32}}
+ {{1474,949},{32,32}}
textureRotated
@@ -1530,7 +1545,7 @@
spriteSourceSize
{32,32}
textureRect
- {{943,1083},{32,32}}
+ {{1508,915},{32,32}}
textureRotated
@@ -1545,7 +1560,7 @@
spriteSourceSize
{32,32}
textureRect
- {{952,866},{30,32}}
+ {{1,950},{30,32}}
textureRotated
@@ -1560,9 +1575,9 @@
spriteSourceSize
{32,32}
textureRect
- {{334,1457},{30,32}}
+ {{35,950},{30,32}}
textureRotated
-
+
status_icon_demon_133.png
@@ -1575,7 +1590,7 @@
spriteSourceSize
{96,96}
textureRect
- {{925,991},{90,88}}
+ {{1174,891},{90,88}}
textureRotated
@@ -1590,9 +1605,9 @@
spriteSourceSize
{32,32}
textureRect
- {{366,1457},{30,32}}
+ {{69,950},{30,32}}
textureRotated
-
+
status_icon_exhausted_50.png
@@ -1605,7 +1620,7 @@
spriteSourceSize
{32,32}
textureRect
- {{943,1117},{32,32}}
+ {{1508,949},{32,32}}
textureRotated
@@ -1620,7 +1635,7 @@
spriteSourceSize
{32,32}
textureRect
- {{977,1083},{32,32}}
+ {{126,916},{32,32}}
textureRotated
@@ -1631,11 +1646,11 @@
spriteOffset
{0,0}
spriteSize
- {30,32}
+ {32,32}
spriteSourceSize
{32,32}
textureRect
- {{368,1423},{30,32}}
+ {{160,916},{32,32}}
textureRotated
@@ -1650,9 +1665,9 @@
spriteSourceSize
{32,32}
textureRect
- {{398,1457},{30,32}}
+ {{103,950},{30,32}}
textureRotated
-
+
status_icon_freezing_106.png
@@ -1665,7 +1680,7 @@
spriteSourceSize
{32,32}
textureRect
- {{943,1151},{32,32}}
+ {{194,916},{32,32}}
textureRotated
@@ -1680,9 +1695,9 @@
spriteSourceSize
{32,32}
textureRect
- {{400,1423},{30,32}}
+ {{137,950},{30,32}}
textureRotated
-
+
status_icon_lucky_78.png
@@ -1695,7 +1710,7 @@
spriteSourceSize
{32,32}
textureRect
- {{977,1117},{32,32}}
+ {{228,916},{32,32}}
textureRotated
@@ -1710,7 +1725,7 @@
spriteSourceSize
{32,32}
textureRect
- {{977,1151},{32,32}}
+ {{695,49},{32,32}}
textureRotated
@@ -1725,7 +1740,7 @@
spriteSourceSize
{32,32}
textureRect
- {{946,898},{32,32}}
+ {{695,83},{32,32}}
textureRotated
@@ -1740,7 +1755,7 @@
spriteSourceSize
{32,32}
textureRect
- {{946,932},{32,32}}
+ {{695,117},{32,32}}
textureRotated
@@ -1755,7 +1770,7 @@
spriteSourceSize
{32,32}
textureRect
- {{300,1423},{32,32}}
+ {{729,47},{32,32}}
textureRotated
@@ -1770,9 +1785,9 @@
spriteSourceSize
{32,32}
textureRect
- {{430,1457},{30,32}}
+ {{171,950},{30,32}}
textureRotated
-
+
status_icon_strength_0.png
@@ -1785,7 +1800,7 @@
spriteSourceSize
{32,32}
textureRect
- {{300,1457},{32,32}}
+ {{729,81},{32,32}}
textureRotated
@@ -1800,7 +1815,7 @@
spriteSourceSize
{32,32}
textureRect
- {{334,1423},{32,32}}
+ {{729,115},{32,32}}
textureRotated
@@ -1815,9 +1830,9 @@
spriteSourceSize
{63,59}
textureRect
- {{952,801},{63,59}}
+ {{1363,878},{63,59}}
textureRotated
-
+
ybar.png
@@ -1830,9 +1845,9 @@
spriteSourceSize
{35,14}
textureRect
- {{316,794},{35,14}}
+ {{1363,257},{35,14}}
textureRotated
-
+
ybg.png
@@ -1845,9 +1860,9 @@
spriteSourceSize
{216,14}
textureRect
- {{257,920},{216,14}}
+ {{351,524},{216,14}}
textureRotated
-
+
metadata
@@ -1861,9 +1876,9 @@
realTextureFileName
gui.png
size
- {1014,1490}
+ {1546,982}
smartupdate
- $TexturePacker:SmartUpdate:11b2dc057723c1c6676f373a363c4f5c:029e8d9dedcaaa1894d9606dd1da762b:5f86533554b8a62fd9d2a17dd9533d7c$
+ $TexturePacker:SmartUpdate:78f6afe3d3703da4de84d82fe71684cf:ad194a0fee65d01752c98a7a01f1a98a:5f86533554b8a62fd9d2a17dd9533d7c$
textureFileName
gui.png
diff --git a/assets/resources/gui/gui.plist.meta b/assets/resources/gui/gui.plist.meta
index cc7781da..f7afd38c 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": 344,
- "trimY": 732,
+ "trimX": 370,
+ "trimY": 550,
"width": 180,
"height": 38,
"rawWidth": 180,
@@ -112,7 +112,7 @@
"offsetX": 0,
"offsetY": 0,
"trimX": 351,
- "trimY": 202,
+ "trimY": 156,
"width": 320,
"height": 122,
"rawWidth": 320,
@@ -157,8 +157,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 952,
- "trimY": 1399,
+ "trimX": 634,
+ "trimY": 524,
"width": 49,
"height": 42,
"rawWidth": 49,
@@ -203,8 +203,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 706,
- "trimY": 40,
+ "trimX": 773,
+ "trimY": 209,
"width": 160,
"height": 160,
"rawWidth": 160,
@@ -246,11 +246,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 812,
- "trimY": 585,
+ "trimX": 1363,
+ "trimY": 443,
"width": 132,
"height": 148,
"rawWidth": 160,
@@ -341,8 +341,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 288,
- "trimY": 810,
+ "trimX": 549,
+ "trimY": 866,
"width": 109,
"height": 108,
"rawWidth": 109,
@@ -387,8 +387,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 283,
- "trimY": 1068,
+ "trimX": 689,
+ "trimY": 645,
"width": 94,
"height": 118,
"rawWidth": 94,
@@ -430,11 +430,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 257,
- "trimY": 1164,
+ "trimX": 569,
+ "trimY": 524,
"width": 64,
"height": 63,
"rawWidth": 64,
@@ -476,11 +476,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 236,
- "trimY": 1416,
+ "trimX": 1426,
+ "trimY": 807,
"width": 64,
"height": 62,
"rawWidth": 64,
@@ -522,11 +522,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 785,
- "trimY": 1193,
+ "trimX": 689,
+ "trimY": 526,
"width": 103,
"height": 117,
"rawWidth": 103,
@@ -572,7 +572,7 @@
"offsetX": 0,
"offsetY": 0,
"trimX": 351,
- "trimY": 424,
+ "trimY": 378,
"width": 144,
"height": 179,
"rawWidth": 144,
@@ -614,11 +614,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 961,
- "trimY": 332,
+ "trimX": 1315,
+ "trimY": 531,
"width": 44,
"height": 42,
"rawWidth": 44,
@@ -660,11 +660,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 564,
- "trimY": 1270,
+ "trimX": 1166,
+ "trimY": 792,
"width": 97,
"height": 96,
"rawWidth": 97,
@@ -709,8 +709,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 993,
- "trimY": 1306,
+ "trimX": 331,
+ "trimY": 806,
"width": 20,
"height": 20,
"rawWidth": 20,
@@ -752,11 +752,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 714,
- "trimY": 326,
+ "trimX": 673,
+ "trimY": 156,
"width": 122,
"height": 98,
"rawWidth": 122,
@@ -801,8 +801,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 562,
- "trimY": 1368,
+ "trimX": 660,
+ "trimY": 881,
"width": 100,
"height": 100,
"rawWidth": 100,
@@ -844,11 +844,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 763,
- "trimY": 1384,
+ "trimX": 924,
+ "trimY": 887,
"width": 82,
"height": 94,
"rawWidth": 82,
@@ -894,7 +894,7 @@
"offsetX": 0,
"offsetY": 0,
"trimX": 612,
- "trimY": 326,
+ "trimY": 280,
"width": 100,
"height": 96,
"rawWidth": 100,
@@ -936,11 +936,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 777,
- "trimY": 1298,
+ "trimX": 1456,
+ "trimY": 577,
"width": 84,
"height": 106,
"rawWidth": 84,
@@ -985,8 +985,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 838,
- "trimY": 326,
+ "trimX": 924,
+ "trimY": 785,
"width": 100,
"height": 121,
"rawWidth": 100,
@@ -1028,11 +1028,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 325,
- "trimY": 1308,
+ "trimX": 809,
+ "trimY": 767,
"width": 119,
"height": 113,
"rawWidth": 119,
@@ -1077,8 +1077,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 446,
- "trimY": 1295,
+ "trimX": 809,
+ "trimY": 641,
"width": 124,
"height": 114,
"rawWidth": 124,
@@ -1123,8 +1123,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 790,
- "trimY": 1090,
+ "trimX": 1047,
+ "trimY": 792,
"width": 101,
"height": 117,
"rawWidth": 101,
@@ -1169,8 +1169,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 564,
- "trimY": 1143,
+ "trimX": 288,
+ "trimY": 832,
"width": 97,
"height": 125,
"rawWidth": 97,
@@ -1215,8 +1215,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 399,
- "trimY": 794,
+ "trimX": 932,
+ "trimY": 456,
"width": 98,
"height": 125,
"rawWidth": 98,
@@ -1261,8 +1261,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 798,
- "trimY": 991,
+ "trimX": 932,
+ "trimY": 556,
"width": 97,
"height": 125,
"rawWidth": 97,
@@ -1304,11 +1304,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 541,
- "trimY": 1002,
+ "trimX": 1315,
+ "trimY": 577,
"width": 139,
"height": 117,
"rawWidth": 139,
@@ -1353,8 +1353,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 439,
- "trimY": 1164,
+ "trimX": 935,
+ "trimY": 187,
"width": 129,
"height": 123,
"rawWidth": 129,
@@ -1396,11 +1396,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 975,
- "trimY": 190,
+ "trimX": 387,
+ "trimY": 914,
"width": 140,
"height": 38,
"rawWidth": 160,
@@ -1442,11 +1442,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1,
- "trimY": 950,
+ "trimX": 1060,
+ "trimY": 1,
"width": 334,
"height": 92,
"rawWidth": 360,
@@ -1580,11 +1580,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 946,
- "trimY": 633,
+ "trimX": 1264,
+ "trimY": 906,
"width": 95,
"height": 61,
"rawWidth": 95,
@@ -1630,7 +1630,7 @@
"offsetX": 0,
"offsetY": 0,
"trimX": 126,
- "trimY": 596,
+ "trimY": 592,
"width": 160,
"height": 160,
"rawWidth": 160,
@@ -1676,7 +1676,7 @@
"offsetX": 0,
"offsetY": 0,
"trimX": 126,
- "trimY": 758,
+ "trimY": 754,
"width": 160,
"height": 160,
"rawWidth": 160,
@@ -1814,7 +1814,7 @@
"offsetX": 0,
"offsetY": 0,
"trimX": 532,
- "trimY": 424,
+ "trimY": 378,
"width": 144,
"height": 144,
"rawWidth": 160,
@@ -1859,8 +1859,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 812,
- "trimY": 735,
+ "trimX": 549,
+ "trimY": 590,
"width": 138,
"height": 138,
"rawWidth": 160,
@@ -1905,8 +1905,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 526,
- "trimY": 732,
+ "trimX": 1219,
+ "trimY": 401,
"width": 128,
"height": 142,
"rawWidth": 160,
@@ -1951,8 +1951,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 663,
- "trimY": 1137,
+ "trimX": 1055,
+ "trimY": 674,
"width": 120,
"height": 116,
"rawWidth": 160,
@@ -1994,11 +1994,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 868,
- "trimY": 40,
+ "trimX": 1396,
+ "trimY": 1,
"width": 142,
"height": 148,
"rawWidth": 160,
@@ -2040,11 +2040,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 837,
- "trimY": 428,
+ "trimX": 1363,
+ "trimY": 307,
"width": 148,
"height": 134,
"rawWidth": 160,
@@ -2089,8 +2089,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 670,
- "trimY": 729,
+ "trimX": 1059,
+ "trimY": 532,
"width": 140,
"height": 140,
"rawWidth": 160,
@@ -2135,8 +2135,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 283,
- "trimY": 920,
+ "trimX": 678,
+ "trimY": 378,
"width": 114,
"height": 146,
"rawWidth": 160,
@@ -2181,8 +2181,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 399,
- "trimY": 894,
+ "trimX": 794,
+ "trimY": 371,
"width": 144,
"height": 136,
"rawWidth": 160,
@@ -2227,8 +2227,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 813,
- "trimY": 202,
+ "trimX": 794,
+ "trimY": 517,
"width": 136,
"height": 122,
"rawWidth": 160,
@@ -2273,8 +2273,8 @@
"rotated": false,
"offsetX": 1,
"offsetY": -3,
- "trimX": 325,
- "trimY": 1164,
+ "trimX": 1201,
+ "trimY": 532,
"width": 112,
"height": 142,
"rawWidth": 160,
@@ -2319,8 +2319,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 798,
- "trimY": 875,
+ "trimX": 1059,
+ "trimY": 416,
"width": 114,
"height": 146,
"rawWidth": 160,
@@ -2362,11 +2362,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 673,
- "trimY": 202,
+ "trimX": 685,
+ "trimY": 741,
"width": 138,
"height": 122,
"rawWidth": 160,
@@ -2408,11 +2408,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 403,
- "trimY": 1040,
+ "trimX": 935,
+ "trimY": 318,
"width": 122,
"height": 136,
"rawWidth": 160,
@@ -2457,8 +2457,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 660,
- "trimY": 1007,
+ "trimX": 925,
+ "trimY": 655,
"width": 128,
"height": 128,
"rawWidth": 160,
@@ -2503,8 +2503,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 95,
- "trimY": 920,
+ "trimX": 387,
+ "trimY": 590,
"width": 160,
"height": 160,
"rawWidth": 160,
@@ -2549,8 +2549,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 95,
- "trimY": 1082,
+ "trimX": 387,
+ "trimY": 752,
"width": 160,
"height": 160,
"rawWidth": 160,
@@ -2595,8 +2595,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1,
- "trimY": 1286,
+ "trimX": 773,
+ "trimY": 47,
"width": 160,
"height": 160,
"rawWidth": 160,
@@ -2641,8 +2641,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 344,
- "trimY": 570,
+ "trimX": 1060,
+ "trimY": 95,
"width": 160,
"height": 160,
"rawWidth": 160,
@@ -2687,8 +2687,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 506,
- "trimY": 570,
+ "trimX": 1222,
+ "trimY": 95,
"width": 160,
"height": 160,
"rawWidth": 160,
@@ -2733,8 +2733,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 163,
- "trimY": 1244,
+ "trimX": 1384,
+ "trimY": 145,
"width": 160,
"height": 160,
"rawWidth": 160,
@@ -2779,8 +2779,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 859,
- "trimY": 1399,
+ "trimX": 1008,
+ "trimY": 895,
"width": 82,
"height": 91,
"rawWidth": 82,
@@ -2822,11 +2822,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1,
- "trimY": 1448,
+ "trimX": 1428,
+ "trimY": 871,
"width": 41,
"height": 48,
"rawWidth": 41,
@@ -2868,11 +2868,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 964,
- "trimY": 1,
+ "trimX": 1513,
+ "trimY": 475,
"width": 35,
"height": 32,
"rawWidth": 35,
@@ -2914,11 +2914,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 961,
- "trimY": 376,
+ "trimX": 1361,
+ "trimY": 939,
"width": 42,
"height": 43,
"rawWidth": 42,
@@ -2963,8 +2963,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 343,
- "trimY": 156,
+ "trimX": 697,
+ "trimY": 1,
"width": 361,
"height": 44,
"rawWidth": 361,
@@ -3006,11 +3006,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 51,
- "trimY": 1448,
+ "trimX": 870,
+ "trimY": 888,
"width": 72,
"height": 40,
"rawWidth": 72,
@@ -3052,11 +3052,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 103,
- "trimY": 553,
+ "trimX": 288,
+ "trimY": 592,
"width": 238,
"height": 41,
"rawWidth": 238,
@@ -3098,11 +3098,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 868,
- "trimY": 190,
+ "trimX": 1535,
+ "trimY": 307,
"width": 105,
"height": 10,
"rawWidth": 105,
@@ -3147,8 +3147,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 951,
- "trimY": 202,
+ "trimX": 1518,
+ "trimY": 685,
"width": 111,
"height": 16,
"rawWidth": 111,
@@ -3193,8 +3193,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 537,
- "trimY": 862,
+ "trimX": 935,
+ "trimY": 47,
"width": 138,
"height": 123,
"rawWidth": 138,
@@ -3282,11 +3282,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 904,
- "trimY": 1193,
+ "trimX": 1405,
+ "trimY": 696,
"width": 111,
"height": 109,
"rawWidth": 111,
@@ -3332,7 +3332,7 @@
"offsetX": 0,
"offsetY": 0,
"trimX": 351,
- "trimY": 326,
+ "trimY": 280,
"width": 259,
"height": 96,
"rawWidth": 259,
@@ -3377,8 +3377,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 163,
- "trimY": 1416,
+ "trimX": 1101,
+ "trimY": 895,
"width": 71,
"height": 71,
"rawWidth": 71,
@@ -3423,8 +3423,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 664,
- "trimY": 1367,
+ "trimX": 1264,
+ "trimY": 807,
"width": 97,
"height": 97,
"rawWidth": 97,
@@ -3469,8 +3469,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 95,
- "trimY": 1244,
+ "trimX": 1492,
+ "trimY": 807,
"width": 38,
"height": 38,
"rawWidth": 38,
@@ -3503,6 +3503,98 @@
],
"subMetas": {}
},
+ "95e8c": {
+ "importer": "sprite-frame",
+ "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@95e8c",
+ "displayName": "",
+ "id": "95e8c",
+ "name": "dun1",
+ "userData": {
+ "trimType": "auto",
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 1177,
+ "trimY": 676,
+ "width": 112,
+ "height": 111,
+ "rawWidth": 112,
+ "rawHeight": 111,
+ "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": {}
+ },
+ "91c2a": {
+ "importer": "sprite-frame",
+ "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@91c2a",
+ "displayName": "",
+ "id": "91c2a",
+ "name": "dun2",
+ "userData": {
+ "trimType": "auto",
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 1291,
+ "trimY": 696,
+ "width": 112,
+ "height": 109,
+ "rawWidth": 112,
+ "rawHeight": 109,
+ "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": {}
+ },
"5c4a5": {
"importer": "sprite-frame",
"uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@5c4a5",
@@ -3512,11 +3604,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 344,
- "trimY": 772,
+ "trimX": 1513,
+ "trimY": 307,
"width": 166,
"height": 20,
"rawWidth": 166,
@@ -3561,8 +3653,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 288,
- "trimY": 596,
+ "trimX": 331,
+ "trimY": 592,
"width": 212,
"height": 26,
"rawWidth": 212,
@@ -3595,52 +3687,6 @@
],
"subMetas": {}
},
- "4b4e8": {
- "importer": "sprite-frame",
- "uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@4b4e8",
- "displayName": "",
- "id": "4b4e8",
- "name": "grep",
- "userData": {
- "trimType": "auto",
- "trimThreshold": 1,
- "rotated": false,
- "offsetX": 0,
- "offsetY": 0,
- "trimX": 663,
- "trimY": 1255,
- "width": 112,
- "height": 110,
- "rawWidth": 112,
- "rawHeight": 110,
- "borderTop": 26,
- "borderBottom": 24,
- "borderLeft": 19,
- "borderRight": 22,
- "packable": true,
- "pixelsToUnit": 100,
- "pivotX": 0.5,
- "pivotY": 0.5,
- "meshType": 0,
- "vertices": {
- "rawPosition": [],
- "indexes": [],
- "uv": [],
- "nuv": [],
- "minPos": [],
- "maxPos": []
- },
- "isUuid": true,
- "imageUuidOrDatabaseUri": "8b585538-1414-43ef-9d59-72de6a2c3741@6c48a",
- "atlasUuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2"
- },
- "ver": "1.0.12",
- "imported": true,
- "files": [
- ".json"
- ],
- "subMetas": {}
- },
"4d393": {
"importer": "sprite-frame",
"uuid": "f87f53f9-2fba-4a5b-968a-79a593311ab2@4d393",
@@ -3653,8 +3699,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 662,
- "trimY": 871,
+ "trimX": 549,
+ "trimY": 730,
"width": 134,
"height": 134,
"rawWidth": 134,
@@ -3745,8 +3791,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 885,
- "trimY": 1306,
+ "trimX": 762,
+ "trimY": 888,
"width": 106,
"height": 91,
"rawWidth": 106,
@@ -3788,11 +3834,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 946,
- "trimY": 578,
+ "trimX": 714,
+ "trimY": 280,
"width": 67,
"height": 53,
"rawWidth": 67,
@@ -3837,8 +3883,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 678,
- "trimY": 426,
+ "trimX": 1060,
+ "trimY": 257,
"width": 157,
"height": 157,
"rawWidth": 157,
@@ -3883,8 +3929,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 163,
- "trimY": 1406,
+ "trimX": 387,
+ "trimY": 954,
"width": 129,
"height": 8,
"rawWidth": 129,
@@ -3929,8 +3975,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 316,
- "trimY": 596,
+ "trimX": 359,
+ "trimY": 592,
"width": 191,
"height": 26,
"rawWidth": 191,
@@ -3972,11 +4018,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 273,
- "trimY": 920,
+ "trimX": 351,
+ "trimY": 540,
"width": 216,
"height": 8,
"rawWidth": 216,
@@ -4021,8 +4067,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 697,
- "trimY": 1,
+ "trimX": 103,
+ "trimY": 553,
"width": 265,
"height": 37,
"rawWidth": 265,
@@ -4067,8 +4113,8 @@
"rotated": false,
"offsetX": 369,
"offsetY": -236,
- "trimX": 668,
- "trimY": 585,
+ "trimX": 1219,
+ "trimY": 257,
"width": 142,
"height": 142,
"rawWidth": 1024,
@@ -4110,11 +4156,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1001,
- "trimY": 1,
+ "trimX": 1264,
+ "trimY": 969,
"width": 32,
"height": 12,
"rawWidth": 32,
@@ -4159,8 +4205,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 952,
- "trimY": 730,
+ "trimX": 1363,
+ "trimY": 807,
"width": 61,
"height": 69,
"rawWidth": 61,
@@ -4205,8 +4251,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 125,
- "trimY": 1448,
+ "trimX": 1513,
+ "trimY": 512,
"width": 32,
"height": 32,
"rawWidth": 32,
@@ -4297,8 +4343,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 973,
- "trimY": 421,
+ "trimX": 94,
+ "trimY": 892,
"width": 30,
"height": 32,
"rawWidth": 32,
@@ -4343,8 +4389,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 952,
- "trimY": 1450,
+ "trimX": 1492,
+ "trimY": 847,
"width": 32,
"height": 32,
"rawWidth": 32,
@@ -4389,8 +4435,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 973,
- "trimY": 455,
+ "trimX": 1406,
+ "trimY": 939,
"width": 32,
"height": 32,
"rawWidth": 32,
@@ -4435,8 +4481,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 973,
- "trimY": 489,
+ "trimX": 1471,
+ "trimY": 881,
"width": 32,
"height": 32,
"rawWidth": 32,
@@ -4481,8 +4527,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 973,
- "trimY": 523,
+ "trimX": 1505,
+ "trimY": 881,
"width": 32,
"height": 32,
"rawWidth": 32,
@@ -4527,8 +4573,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 909,
- "trimY": 1090,
+ "trimX": 1440,
+ "trimY": 921,
"width": 32,
"height": 32,
"rawWidth": 32,
@@ -4573,8 +4619,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 909,
- "trimY": 1124,
+ "trimX": 1474,
+ "trimY": 915,
"width": 32,
"height": 32,
"rawWidth": 32,
@@ -4619,8 +4665,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 909,
- "trimY": 1158,
+ "trimX": 1474,
+ "trimY": 949,
"width": 32,
"height": 32,
"rawWidth": 32,
@@ -4665,8 +4711,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 943,
- "trimY": 1083,
+ "trimX": 1508,
+ "trimY": 915,
"width": 32,
"height": 32,
"rawWidth": 32,
@@ -4711,8 +4757,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 952,
- "trimY": 866,
+ "trimX": 1,
+ "trimY": 950,
"width": 30,
"height": 32,
"rawWidth": 32,
@@ -4754,11 +4800,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 334,
- "trimY": 1457,
+ "trimX": 35,
+ "trimY": 950,
"width": 30,
"height": 32,
"rawWidth": 32,
@@ -4803,8 +4849,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 1,
- "trimX": 925,
- "trimY": 991,
+ "trimX": 1174,
+ "trimY": 891,
"width": 90,
"height": 88,
"rawWidth": 96,
@@ -4846,11 +4892,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 366,
- "trimY": 1457,
+ "trimX": 69,
+ "trimY": 950,
"width": 30,
"height": 32,
"rawWidth": 32,
@@ -4895,8 +4941,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 943,
- "trimY": 1117,
+ "trimX": 1508,
+ "trimY": 949,
"width": 32,
"height": 32,
"rawWidth": 32,
@@ -4941,8 +4987,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 977,
- "trimY": 1083,
+ "trimX": 126,
+ "trimY": 916,
"width": 32,
"height": 32,
"rawWidth": 32,
@@ -4987,9 +5033,9 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 368,
- "trimY": 1423,
- "width": 30,
+ "trimX": 160,
+ "trimY": 916,
+ "width": 32,
"height": 32,
"rawWidth": 32,
"rawHeight": 32,
@@ -5030,11 +5076,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 398,
- "trimY": 1457,
+ "trimX": 103,
+ "trimY": 950,
"width": 30,
"height": 32,
"rawWidth": 32,
@@ -5079,8 +5125,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 943,
- "trimY": 1151,
+ "trimX": 194,
+ "trimY": 916,
"width": 32,
"height": 32,
"rawWidth": 32,
@@ -5122,11 +5168,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 400,
- "trimY": 1423,
+ "trimX": 137,
+ "trimY": 950,
"width": 30,
"height": 32,
"rawWidth": 32,
@@ -5171,8 +5217,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 977,
- "trimY": 1117,
+ "trimX": 228,
+ "trimY": 916,
"width": 32,
"height": 32,
"rawWidth": 32,
@@ -5217,8 +5263,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 977,
- "trimY": 1151,
+ "trimX": 695,
+ "trimY": 49,
"width": 32,
"height": 32,
"rawWidth": 32,
@@ -5263,8 +5309,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 946,
- "trimY": 898,
+ "trimX": 695,
+ "trimY": 83,
"width": 32,
"height": 32,
"rawWidth": 32,
@@ -5309,8 +5355,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 946,
- "trimY": 932,
+ "trimX": 695,
+ "trimY": 117,
"width": 32,
"height": 32,
"rawWidth": 32,
@@ -5355,8 +5401,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 300,
- "trimY": 1423,
+ "trimX": 729,
+ "trimY": 47,
"width": 32,
"height": 32,
"rawWidth": 32,
@@ -5398,11 +5444,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 430,
- "trimY": 1457,
+ "trimX": 171,
+ "trimY": 950,
"width": 30,
"height": 32,
"rawWidth": 32,
@@ -5447,8 +5493,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 300,
- "trimY": 1457,
+ "trimX": 729,
+ "trimY": 81,
"width": 32,
"height": 32,
"rawWidth": 32,
@@ -5493,8 +5539,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 334,
- "trimY": 1423,
+ "trimX": 729,
+ "trimY": 115,
"width": 32,
"height": 32,
"rawWidth": 32,
@@ -5536,11 +5582,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 952,
- "trimY": 801,
+ "trimX": 1363,
+ "trimY": 878,
"width": 63,
"height": 59,
"rawWidth": 63,
@@ -5582,11 +5628,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 316,
- "trimY": 794,
+ "trimX": 1363,
+ "trimY": 257,
"width": 35,
"height": 14,
"rawWidth": 35,
@@ -5628,11 +5674,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 257,
- "trimY": 920,
+ "trimX": 351,
+ "trimY": 524,
"width": 216,
"height": 14,
"rawWidth": 216,
diff --git a/assets/resources/gui/gui.png b/assets/resources/gui/gui.png
index 3eaa1e56..ade724b2 100644
Binary files a/assets/resources/gui/gui.png and b/assets/resources/gui/gui.png differ
diff --git a/assets/resources/gui/role_controller.prefab b/assets/resources/gui/role_controller.prefab
index d2422a76..1c009f6e 100644
--- a/assets/resources/gui/role_controller.prefab
+++ b/assets/resources/gui/role_controller.prefab
@@ -8884,7 +8884,7 @@
"__id__": 386
}
],
- "_active": false,
+ "_active": true,
"_components": [
{
"__id__": 392
@@ -9981,7 +9981,7 @@
"__id__": 430
}
],
- "_active": false,
+ "_active": true,
"_components": [
{
"__id__": 436
@@ -11078,7 +11078,7 @@
"__id__": 474
}
],
- "_active": false,
+ "_active": true,
"_components": [
{
"__id__": 480
@@ -12175,7 +12175,7 @@
"__id__": 518
}
],
- "_active": false,
+ "_active": true,
"_components": [
{
"__id__": 524
diff --git a/assets/resources/materials/inline-glow.mtl b/assets/resources/materials/inline-glow.mtl
new file mode 100644
index 00000000..e5db0f24
--- /dev/null
+++ b/assets/resources/materials/inline-glow.mtl
@@ -0,0 +1,41 @@
+{
+ "__type__": "cc.Material",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_native": "",
+ "_effectAsset": {
+ "__uuid__": "9892a9d9-d322-490b-b95f-a54f39df8c47",
+ "__expectedType__": "cc.EffectAsset"
+ },
+ "_techIdx": 0,
+ "_defines": [
+ {
+ "USE_TEXTURE": true
+ }
+ ],
+ "_states": [
+ {
+ "rasterizerState": {},
+ "depthStencilState": {},
+ "blendState": {
+ "targets": [
+ {}
+ ]
+ }
+ }
+ ],
+ "_props": [
+ {
+ "glowColor": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 0,
+ "b": 0,
+ "a": 255
+ },
+ "glowWidth": 0.03,
+ "glowThreshold": 0.104
+ }
+ ]
+}
\ No newline at end of file
diff --git a/assets/resources/materials/inline-glow.mtl.meta b/assets/resources/materials/inline-glow.mtl.meta
new file mode 100644
index 00000000..d90e9611
--- /dev/null
+++ b/assets/resources/materials/inline-glow.mtl.meta
@@ -0,0 +1,11 @@
+{
+ "ver": "1.0.21",
+ "importer": "material",
+ "imported": true,
+ "uuid": "adc4e674-6203-42dd-8224-dffb471648a2",
+ "files": [
+ ".json"
+ ],
+ "subMetas": {},
+ "userData": {}
+}
diff --git a/assets/resources/shaders/builtin-sprite-inline-glow.effect b/assets/resources/shaders/builtin-sprite-inline-glow.effect
new file mode 100644
index 00000000..918b9ea3
--- /dev/null
+++ b/assets/resources/shaders/builtin-sprite-inline-glow.effect
@@ -0,0 +1,172 @@
+// Copyright (c) 2017-2020 Xiamen Yaji Software Co., Ltd.
+CCEffect %{
+ techniques:
+ - passes:
+ - vert: sprite-vs:vert
+ frag: sprite-fs:frag
+ depthStencilState:
+ depthTest: false
+ depthWrite: false
+ blendState:
+ targets:
+ - blend: true
+ blendSrc: src_alpha
+ blendDst: one_minus_src_alpha
+ blendDstAlpha: one_minus_src_alpha
+ rasterizerState:
+ cullMode: none
+ properties:
+ alphaThreshold: { value: 0.5 }
+
+ glowColor: { value: [1, 1, 1, 1], editor: { type: color } }
+ glowWidth: { value: 0.05, editor: { slide: true, range: [0, 0.3], step: 0.001 } }
+ glowThreshold: { value: 1, editor: { slide: true, range: [0, 0.99], step: 0.001 } }
+}%
+
+CCProgram sprite-vs %{
+ precision highp float;
+ #include
+ #if USE_LOCAL
+ #include
+ #endif
+ #if SAMPLE_FROM_RT
+ #include
+ #endif
+ in vec3 a_position;
+ in vec2 a_texCoord;
+ in vec4 a_color;
+
+ out vec4 color;
+ out vec2 uv0;
+
+ vec4 vert () {
+ vec4 pos = vec4(a_position, 1);
+
+ #if USE_LOCAL
+ pos = cc_matWorld * pos;
+ #endif
+
+ #if USE_PIXEL_ALIGNMENT
+ pos = cc_matView * pos;
+ pos.xyz = floor(pos.xyz);
+ pos = cc_matProj * pos;
+ #else
+ pos = cc_matViewProj * pos;
+ #endif
+
+ uv0 = a_texCoord;
+ #if SAMPLE_FROM_RT
+ CC_HANDLE_RT_SAMPLE_FLIP(uv0);
+ #endif
+ color = a_color;
+
+ return pos;
+ }
+}%
+
+CCProgram sprite-fs %{
+ precision highp float;
+ #include
+ #include
+
+ in vec4 color;
+
+ uniform FSConstants {
+ vec4 glowColor;
+ float glowWidth;
+ float glowThreshold;
+ };
+
+ #if USE_TEXTURE
+ in vec2 uv0;
+ #pragma builtin(local)
+ layout(set = 2, binding = 12) uniform sampler2D cc_spriteTexture;
+ #endif
+
+ vec4 getTextureColor (sampler2D mainTexture, vec2 uv) {
+ if (uv.x > 1.0 || uv.x < 0.0 || uv.y > 1.0 || uv.y < 0.0) {
+ return vec4(0.0, 0.0, 0.0, 0.0);
+ }
+ return texture(mainTexture, uv);
+ }
+
+ float getColorAlpha (float angle, float dist) {
+ // 角度转弧度，公式为：弧度 = 角度 * (pi / 180)
+ float radian = angle * 3.14 / 180.0;
+ vec2 newUV = uv0 + vec2(dist * cos(radian), dist * sin(radian));
+ vec4 color = getTextureColor(cc_spriteTexture, newUV);
+ return color.a;
+ }
+
+ float getAverageAlpha (float dist) {
+ float totalAlpha = 0.0;
+
+ totalAlpha += getColorAlpha(0.0, dist);
+ totalAlpha += getColorAlpha(30.0, dist);
+ totalAlpha += getColorAlpha(60.0, dist);
+ totalAlpha += getColorAlpha(90.0, dist);
+ totalAlpha += getColorAlpha(120.0, dist);
+ totalAlpha += getColorAlpha(150.0, dist);
+ totalAlpha += getColorAlpha(180.0, dist);
+ totalAlpha += getColorAlpha(210.0, dist);
+ totalAlpha += getColorAlpha(240.0, dist);
+ totalAlpha += getColorAlpha(270.0, dist);
+ totalAlpha += getColorAlpha(300.0, dist);
+ totalAlpha += getColorAlpha(330.0, dist);
+
+ return totalAlpha * 0.0833;
+ }
+
+ float getGlowAlpha () {
+ if (glowWidth == 0.0 ) {
+ return 0.0;
+ }
+
+ vec4 srcColor = getTextureColor(cc_spriteTexture, uv0);
+ if (srcColor.a <= glowThreshold) {
+ return srcColor.a;
+ }
+
+ float totalAlpha = 0.0;
+ totalAlpha += getAverageAlpha(glowWidth * 0.1);
+ totalAlpha += getAverageAlpha(glowWidth * 0.2);
+ totalAlpha += getAverageAlpha(glowWidth * 0.3);
+ totalAlpha += getAverageAlpha(glowWidth * 0.4);
+ totalAlpha += getAverageAlpha(glowWidth * 0.5);
+ totalAlpha += getAverageAlpha(glowWidth * 0.6);
+ totalAlpha += getAverageAlpha(glowWidth * 0.7);
+ totalAlpha += getAverageAlpha(glowWidth * 0.8);
+ totalAlpha += getAverageAlpha(glowWidth * 0.9);
+ totalAlpha += getAverageAlpha(glowWidth * 1.0);
+
+ return totalAlpha * 0.1;
+ }
+
+ vec4 frag () {
+ vec4 o = vec4(1, 1, 1, 1);
+
+ #if USE_TEXTURE
+ o *= CCSampleWithAlphaSeparated(cc_spriteTexture, uv0);
+ #if IS_GRAY
+ float gray = 0.2126 * o.r + 0.7152 * o.g + 0.0722 * o.b;
+ o.r = o.g = o.b = gray;
+ #endif
+ #endif
+
+ float alpha = getGlowAlpha();
+
+ if (alpha > glowThreshold) {
+ alpha = 1.0 - alpha;
+ alpha = -1.0 * (alpha - 1.0) * (alpha - 1.0) * (alpha - 1.0) * (alpha - 1.0) + 1.0;
+ }
+
+ vec4 dstColor = glowColor * alpha;
+ vec4 scrColor = o;
+
+ o = scrColor * scrColor.a + dstColor * 1.0;
+
+ o *= color;
+ ALPHA_TEST(o);
+ return o;
+ }
+}%
diff --git a/assets/resources/shaders/builtin-sprite-inline-glow.effect.meta b/assets/resources/shaders/builtin-sprite-inline-glow.effect.meta
new file mode 100644
index 00000000..55687929
--- /dev/null
+++ b/assets/resources/shaders/builtin-sprite-inline-glow.effect.meta
@@ -0,0 +1,11 @@
+{
+ "ver": "1.7.1",
+ "importer": "effect",
+ "imported": true,
+ "uuid": "9892a9d9-d322-490b-b95f-a54f39df8c47",
+ "files": [
+ ".json"
+ ],
+ "subMetas": {},
+ "userData": {}
+}
diff --git a/assets/script/game/Role/Role.ts b/assets/script/game/Role/Role.ts
index 27d4f866..a268cf34 100644
--- a/assets/script/game/Role/Role.ts
+++ b/assets/script/game/Role/Role.ts
@@ -55,7 +55,7 @@ export class Role extends ecs.Entity {
var rv = node.getComponent(RoleViewComp)!;
let role=smc.vm_data.role;
rv.hero_uuid=uuid;
- rv.speed =rv.ospeed = 0;
+ rv.speed =rv.ospeed = role.speed;
rv.hero_name= "role";
rv.hp= rv.hp_max = role.hp;
rv.level = role.lv;
diff --git a/assets/script/game/Role/RoleAnm.ts b/assets/script/game/Role/RoleAnm.ts
new file mode 100644
index 00000000..4db94315
--- /dev/null
+++ b/assets/script/game/Role/RoleAnm.ts
@@ -0,0 +1,83 @@
+/*
+ * @Author: dgflash
+ * @Date: 2022-08-04 15:08:35
+ * @LastEditors: dgflash
+ * @LastEditTime: 2022-08-04 15:26:26
+ */
+import { Color, Component, EventTouch, sp, Vec3, _decorator ,Animation, AnimationClip, AnimationState} from "cc";
+import { LayerUtil } from "../../../../extensions/oops-plugin-framework/assets/core/utils/LayerUtil";
+import { smc } from "../common/SingletonModuleComp";
+import RoleSpineAnimator from "./RoleSpineAnimator";
+
+const { ccclass, property } = _decorator;
+
+/**
+ * ＲＰＧ ＳＰＩＮＥ角色模型
+ */
+@ccclass('RoleSpine')
+export class RoleSpine extends Component {
+ @property({ type: Animation, tooltip: '动画控制器' })
+ animator: Animation = null!;
+ atk_clip: AnimationClip = null!;
+ idle_clip: AnimationClip = null!;
+ move_clip: AnimationClip = null!;
+ dead_clip: AnimationClip = null!;
+ private spine!: sp.Skeleton;
+
+ onLoad() {
+ // 角色控制组件
+
+ this.initAnimator();
+ LayerUtil.setNodeLayer(LayerUtil.MAP, this.node);
+ this.atk_clip = this.animator.clips[1];
+ this.idle_clip = this.animator.clips[0];
+ this.move_clip = this.animator.clips[2];
+ this.dead_clip = this.animator.clips[3];
+ let animation = this.animator.getComponent(Animation);
+ animation.on(Animation.EventType.FINISHED, this.onAnimationEvent, this)
+ }
+
+ /** 初始化动画 */
+ protected initAnimator() {
+ this.animator=this.node.getChildByName("hero").getComponent(Animation);
+ // console.log("role view comp init",this.animator);
+
+ }
+ onAnimationEvent(type: Animation.EventType, state: AnimationState){
+ // console.log("onAnimationEvent",type,state);
+ if(type==Animation.EventType.FINISHED){
+ if(state.name==this.atk_clip.name){
+ this.idle();
+ }
+ }
+ }
+ atk() {
+ if(!this.animator.getState(this.atk_clip.name).isPlaying){
+ this.animator.play(this.atk_clip.name);
+ }
+ }
+
+ magic() {
+
+ }
+
+
+
+ checkTouch(event: EventTouch): boolean {
+ return false;
+ }
+
+ onDestroy() {
+ this.node.destroy();
+ }
+
+ walk() {
+
+ }
+
+ idle() {
+ if(!this.animator.getState(this.idle_clip.name).isPlaying){
+ this.animator.play(this.idle_clip.name);
+ }
+ }
+}
diff --git a/assets/script/game/Role/RoleAnm.ts.meta b/assets/script/game/Role/RoleAnm.ts.meta
new file mode 100644
index 00000000..09bc7780
--- /dev/null
+++ b/assets/script/game/Role/RoleAnm.ts.meta
@@ -0,0 +1,9 @@
+{
+ "ver": "4.0.23",
+ "importer": "typescript",
+ "imported": true,
+ "uuid": "d1d8d0c9-9cff-4d85-a359-628a29fd5191",
+ "files": [],
+ "subMetas": {},
+ "userData": {}
+}
diff --git a/assets/script/game/Role/RoleSpine.ts b/assets/script/game/Role/RoleSpine.ts
index 4db94315..ddaa8c73 100644
--- a/assets/script/game/Role/RoleSpine.ts
+++ b/assets/script/game/Role/RoleSpine.ts
@@ -16,68 +16,43 @@ const { ccclass, property } = _decorator;
*/
@ccclass('RoleSpine')
export class RoleSpine extends Component {
- @property({ type: Animation, tooltip: '动画控制器' })
- animator: Animation = null!;
- atk_clip: AnimationClip = null!;
- idle_clip: AnimationClip = null!;
- move_clip: AnimationClip = null!;
- dead_clip: AnimationClip = null!;
+ private loop: boolean = true;
private spine!: sp.Skeleton;
+ private default:string = "move";
+ private atk_name: string = "atk";
+ private move_name: string = "move";
+ private max_name: string = "max";
+ private idel_name: string = "idle";
+ start() {
+ this.spine.setAnimation(0, this.default, true);
+ }
+ mixTime:number= 0.2;
onLoad() {
- // 角色控制组件
-
- this.initAnimator();
- LayerUtil.setNodeLayer(LayerUtil.MAP, this.node);
- this.atk_clip = this.animator.clips[1];
- this.idle_clip = this.animator.clips[0];
- this.move_clip = this.animator.clips[2];
- this.dead_clip = this.animator.clips[3];
- let animation = this.animator.getComponent(Animation);
- animation.on(Animation.EventType.FINISHED, this.onAnimationEvent, this)
+ this.spine = this.node.getChildByName("anm")!.getComponent(sp.Skeleton);
+ this.spine.setEndListener(trackEntry => {
+ var animationName = trackEntry.animation ? trackEntry.animation.name : "";
+ console.log("[track %s][animation %s] end.", trackEntry.trackIndex, animationName);
+ // if (animationName == "atk" || animationName== "max" ) {
+ // this.spine.setAnimation(0, this.default, true);
+ // }
+ });
}
-
- /** 初始化动画 */
- protected initAnimator() {
- this.animator=this.node.getChildByName("hero").getComponent(Animation);
- // console.log("role view comp init",this.animator);
-
- }
- onAnimationEvent(type: Animation.EventType, state: AnimationState){
- // console.log("onAnimationEvent",type,state);
- if(type==Animation.EventType.FINISHED){
- if(state.name==this.atk_clip.name){
- this.idle();
- }
- }
- }
- atk() {
- if(!this.animator.getState(this.atk_clip.name).isPlaying){
- this.animator.play(this.atk_clip.name);
- }
- }
-
- magic() {
+ protected play(animName: string, loop: boolean) {
}
-
-
-
- checkTouch(event: EventTouch): boolean {
- return false;
+ atk(){
+
+ this.spine.setAnimation(0, this.atk_name, false);
+ }
+ idle(){
+ this.spine.setAnimation(0, this.idel_name, true);
+ }
+ move(){
+ this.spine.setAnimation(0, this.move_name, true);
+ }
+ max(){
+ this.spine.setAnimation(0, this.max_name, false);
}
- onDestroy() {
- this.node.destroy();
- }
-
- walk() {
-
- }
-
- idle() {
- if(!this.animator.getState(this.idle_clip.name).isPlaying){
- this.animator.play(this.idle_clip.name);
- }
- }
}
diff --git a/assets/script/game/Role/RoleViewComp.ts b/assets/script/game/Role/RoleViewComp.ts
index 83517f65..3614da50 100644
--- a/assets/script/game/Role/RoleViewComp.ts
+++ b/assets/script/game/Role/RoleViewComp.ts
@@ -5,7 +5,7 @@
* @LastEditTime: 2022-08-17 12:36:18
*/
-import { Vec3, v3,_decorator ,Collider2D,Contact2DType,Label,Node,Prefab,instantiate,ProgressBar, Component, Material, Sprite,Animation, director} from "cc";
+import { Vec3, v3,_decorator ,Collider2D,Contact2DType,Label,Node,Prefab,instantiate,ProgressBar, Component, Material, Sprite,Animation, director, Vertex} from "cc";
import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS";
import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/module/common/CCComp";
import { RoleSpine } from "./RoleSpine";
@@ -30,6 +30,8 @@ export class RoleViewComp extends CCComp {
@property(Material)
hitFlashMaterial: Material;
orginalFlashMaterial: Material;
+ @property(Material)
+ atkMaterial: Material;
sprite: Sprite;
/** 角色动画 */
@property(Node)
@@ -61,7 +63,11 @@ export class RoleViewComp extends CCComp {
4:{uuid:8001,cd:2,alive:false},
5:{uuid:8001,cd:2,alive:false},
}
+ buff_atks:any = [];
+ buff_atk:number = 0;
+
atk: number = 10; /**攻击力 */
+ mission_atk:number = 0;//局内攻击
// atk_speed: number = 1;
atk_cd: number = 1.3; /**攻击速度 攻击间隔 */
atk_dis: number = 800;
@@ -89,7 +95,7 @@ export class RoleViewComp extends CCComp {
}
start () {
- this.sprite = this.node.getChildByName("hero").getComponent(Sprite);
+ // this.sprite = this.node.getChildByName("hero").getComponent(Sprite);
this.node.getChildByName("top").setScale(this.scale,1);
// this.node.getChildByName("atk").setScale(this.scale,1);
// this.node.getChildByName("atk").getComponent(Label).string = this.atk.toString();
@@ -97,7 +103,9 @@ export class RoleViewComp extends CCComp {
// this.node.getChildByName("hp_max").getComponent(Label).string=this.hp_max.toString();
- this.orginalFlashMaterial = this.sprite.getRenderMaterial(0);
+ // this.orginalFlashMaterial = this.sprite.getRenderMaterial(0);
+
+
this.BoxRang.getComponent(RoleRangComp).box_group = this.box_group;
this.BoxRang.getComponent(RoleRangComp).atk_range = this.atk_range
@@ -129,30 +137,37 @@ export class RoleViewComp extends CCComp {
}
onEndContact (selfCollider: Collider2D, otherCollider: Collider2D) { }
onPreSolve (selfCollider: Collider2D, otherCollider: Collider2D) {
- if(selfCollider.group != otherCollider.group&&otherCollider.tag == 0){
- this.is_atking = true;
- this.stop_cd = 0.1;
+ if(selfCollider.group == otherCollider.group&&selfCollider.tag==otherCollider.tag){
+
+ if(selfCollider.node.position.y < otherCollider.node.position.y){
+ if(selfCollider.node.getSiblingIndex() < otherCollider.node.getSiblingIndex()){
+
+ selfCollider.node.setSiblingIndex(otherCollider.node.getSiblingIndex()+1)
+ // console.log("onPreSolve b:"+selfCollider.node.uuid+":"+selfCollider.node.getSiblingIndex()+"/"+otherCollider.node.uuid+":"+otherCollider.node.getSiblingIndex());
+ }
+
+ }
}
}
onPostSolve (selfCollider: Collider2D, otherCollider: Collider2D) {
- if(selfCollider.group == otherCollider.group&&otherCollider.tag == 0&&selfCollider.tag == 0){
- let self_pos=selfCollider.node.getPosition();
- let other_pos=otherCollider.node.getPosition();
- // console.log('monster view group 相同');
- switch (selfCollider.group) {
- case BoxSet.HERO:
- if(self_pos.x < other_pos.x){
- this.stop_cd=0.1
- }
- break;
- case BoxSet.MONSTER:
- if(self_pos.x > other_pos.x){
- this.stop_cd=0.1
- }
- break
- }
- }
+ // if(selfCollider.group == otherCollider.group&&otherCollider.tag == 0&&selfCollider.tag == 0){
+ // let self_pos=selfCollider.node.getPosition();
+ // let other_pos=otherCollider.node.getPosition();
+ // // console.log('monster view group 相同');
+ // switch (selfCollider.group) {
+ // case BoxSet.HERO:
+ // if(self_pos.x < other_pos.x){
+ // this.stop_cd=0.1
+ // }
+ // break;
+ // case BoxSet.MONSTER:
+ // if(self_pos.x > other_pos.x){
+ // this.stop_cd=0.1
+ // }
+ // break
+ // }
+ // }
}
@@ -161,27 +176,40 @@ export class RoleViewComp extends CCComp {
}
this.in_destroy();
- this.in_shield();
+ this.check_buff_atks(dt)
+ this.in_shield(dt);
this.in_stop(dt);
this.in_atk(dt);
- this.move(dt);
+ this.move();
}
- move(dt: number){
+ move(){
if(this.stop_cd > 0){
return
}
- if (this.scale === 1 && this.node.position.x >= 120) {
- return;
+ if(this.enemy){
+ this.move_to(this.enemy.position)
+ }else{
+ this.move_to(v3(0,0));
+ }
+ }
+ move_to(enemy:Vec3){
+ // console.log("move to ",enemy);
+ var move = this.ent.get(MoveToComp) || this.ent.add(MoveToComp);
+ move.target = v3(enemy.x-100,enemy.y);
+ move.node = this.node;
+ move.speed = this.ospeed;
+ if(enemy.x < this.node.position.x){
+ this.node.setScale(-1,1);
+ }else{
+ this.node.setScale(1,1);
}
- this.node.setPosition(this.node.position.x+dt*this.speed*this.scale, this.node.position.y, this.node.position.z);
}
-
shoot(skill_uuid:number,y:number=0,x:number=0){
// console.log("mon shoot");
let skill = ecs.getEntity(Skill);
- let atk = smc.skills[skill_uuid].atk+this.atk;
+ let atk = smc.skills[skill_uuid].atk+this.atk+this.buff_atk+this.mission_atk;
let {pos,t_pos}=this.get_enemy_pos()
pos.y=pos.y + y
pos.x=pos.x + x
@@ -227,9 +255,6 @@ export class RoleViewComp extends CCComp {
}else{
this.atk_time += dt;
}
- }
- in_shield(){
-
}
hp_change(hp: number){
if(this.is_dead){
@@ -249,18 +274,67 @@ export class RoleViewComp extends CCComp {
if(this.hp <= 0){
this.dead();
this.is_dead = true;
+ this.ent.remove(MoveToComp)
smc.vm_data.game_over = true;
setTimeout(() => {
this.ent.destroy();
}, 15);
}
}
+ heathed(){
+ this.node.getChildByName("heathed").active=true
+ }
add_hp(hp: number=0){
- console.log("hero 加血动画");
+ this.heathed();
this.tooltip(2,hp.toString());
let hp_progress= this.hp/this.hp_max;
this.node.getChildByName("top").getChildByName("hp").getComponent(ProgressBar)!.progress = hp_progress;
}
+ add_atk(atk: number,time:number=0){
+ if(time > 0){
+ this.buff_atk=0
+ let buff={atk:atk,time:time}
+ this.buff_atks.push(buff);
+ this.buff_atks.forEach((element: { atk: number; }) => {
+ this.buff_atk += element.atk
+ });
+ }else{
+ this.mission_atk += atk;
+ }
+ // this.sprite.setSharedMaterial(this.atkMaterial, 0);
+ // this.scheduleOnce(() => {
+ // this.sprite.setSharedMaterial(this.orginalFlashMaterial, 0);
+ // }, 0.3);
+ }
+
+ check_buff_atks(dt: number){
+ for(let i=0;i 0){
+ this.shield_time -= dt;
+ if(this.shield_time <= 0){
+ this.shield_time = 0;
+ this.shield = this.shield_max=0;
+ // this.node.getChildByName("top").getChildByName("shield").active=false
+ }
+ // let shield_progress= this.shield/this.shield_max;
+ // this.node.getChildByName("top").getChildByName("shield").getComponent(ProgressBar)!.progress = shield_progress;
+ }
+ }
tooltip(type:number=1,value:string="",s_uuid:number=1001){
// console.log("tooltip",type);
let tip =ecs.getEntity(Tooltip);
@@ -309,18 +406,18 @@ export class RoleViewComp extends CCComp {
in_atked() {
- // var path = "game/skills/atked";
- // var prefab: Prefab = oops.res.get(path, Prefab)!;
- // var node = instantiate(prefab);
- // let pos = v3(0,60)
- // node.setPosition(pos)
- // node.parent = this.node;
+ var path = "game/skills/atked";
+ var prefab: Prefab = oops.res.get(path, Prefab)!;
+ var node = instantiate(prefab);
+ let pos = v3(0,60)
+ node.setPosition(pos)
+ node.parent = this.node;
- this.sprite.setSharedMaterial(this.hitFlashMaterial, 0);
- this.scheduleOnce(() => {
- this.sprite.setSharedMaterial(this.orginalFlashMaterial, 0);
- }, 0.1);
+ // this.sprite.setSharedMaterial(this.hitFlashMaterial, 0);
+ // this.scheduleOnce(() => {
+ // this.sprite.setSharedMaterial(this.orginalFlashMaterial, 0);
+ // }, 0.1);
@@ -331,9 +428,6 @@ export class RoleViewComp extends CCComp {
var node = instantiate(prefab);
node.setPosition(this.node.position.x,this.node.position.y+30,this.node.position.z);
node.parent = this.node.parent;
- }
- heathed(){
-
}
toDestroy(){
diff --git a/assets/script/game/common/SingletonModuleComp.ts b/assets/script/game/common/SingletonModuleComp.ts
index 126858b7..1b7b46a5 100644
--- a/assets/script/game/common/SingletonModuleComp.ts
+++ b/assets/script/game/common/SingletonModuleComp.ts
@@ -23,27 +23,45 @@ export class SingletonModuleComp extends ecs.Comp {
/** 游戏地图 */
map: GameMap = null!;
cards: any = [
- {uuid:9001,type:1},{uuid:9011,type:1},{uuid:9021,type:1},{uuid:9031,type:1},{uuid:9041,type:1}
+ {uuid:9001,type:1},{uuid:9002,type:1},{uuid:9011,type:1},{uuid:9021,type:1},{uuid:9031,type:1},{uuid:9041,type:1}
];
- items: any = [
- {uuid:1001,type:2},{uuid:1002,type:2},{uuid:4011,type:2},{uuid:4012,type:2},
-
- {uuid:6210,type:3},{uuid:6211,type:3},{uuid:6005,type:3},{uuid:6006,type:3},{uuid:6101,type:3},{uuid:6102,type:3},
+ item_list: any = [
+ {uuid:6005,type:2},{uuid:6006,type:2},{uuid:6101,type:2},{uuid:6102,type:2}, {uuid:6210,type:2},{uuid:6211,type:2},{uuid:6212,type:2},
+ // {uuid:6213,type:2},{uuid:6214,type:2},{uuid:6215,type:2},
+ // {uuid:6216,type:2},{uuid:6217,type:2},{uuid:6218,type:2}
];
+ items: any = []
player_skills: any = [
];
player_buffs: any = [
-
{x:-BoxSet.CSKILL_X,y:BoxSet.CSKILL_Y,eid:0},
{x:-BoxSet.CSKILL_X+55,y:BoxSet.CSKILL_Y,eid:0},
{x:-BoxSet.CSKILL_X+110,y:BoxSet.CSKILL_Y,eid:0},
- {x:-BoxSet.CSKILL_X+165,y:BoxSet.CSKILL_Y,eid:0},
+ {x:-BoxSet.CSKILL_X,y:BoxSet.CSKILL_Y,eid:0},
{x:-BoxSet.CSKILL_X,y:BoxSet.CSKILL_Y+55,eid:0},
{x:-BoxSet.CSKILL_X+55,y:BoxSet.CSKILL_Y+55,eid:0},
{x:-BoxSet.CSKILL_X+110,y:BoxSet.CSKILL_Y+55,eid:0},
{x:-BoxSet.CSKILL_X+165,y:BoxSet.CSKILL_Y+55,eid:0},
];
+ role_heros: any = [
+ {x:BoxSet.ROLE_FUX,y:50,eid:0},
+ {x:BoxSet.ROLE_FUX,y:0,eid:0},
+ {x:BoxSet.ROLE_FUX,y:-50,eid:0},
+
+ {x:BoxSet.ROLE_FUX+40,y:50,eid:0},
+ {x:BoxSet.ROLE_FUX+40,y:0,eid:0},
+ {x:BoxSet.ROLE_FUX+40,y:-50,eid:0},
+
+ {x:BoxSet.ROLE_BUX,y:50,eid:0},
+ {x:BoxSet.ROLE_BUX,y:0,eid:0},
+ {x:BoxSet.ROLE_BUX,y:-50,eid:0},
+
+ {x:BoxSet.ROLE_BUX-40,y:50,eid:0},
+ {x:BoxSet.ROLE_BUX-40,y:0,eid:0},
+ {x:BoxSet.ROLE_BUX-40,y:-50,eid:0},
+
+ ];
monster_buffs: any = [];
/** 游戏主角 */
Role: Role = null;
@@ -80,14 +98,19 @@ export class SingletonModuleComp extends ecs.Comp {
role:{
hp:3000,
hp_max:3000,
+ speed:30,
atk:10,
- atk_cd:2,
- atk_range:1000,
+ buff_atk:0,
+ mission_atk:0,
+ atk_cd:1,
+ atk_cd_up:0,
+ mission_atk_cd_up:0,
+ atk_range:400,
lv:1,
exp:0,
next_exp:100,
power:300,
- skill:1001,
+ skill:8001,
skills:{
1:{uuid:8001,cd:2,alive:true },
2:{uuid:9002,cd:2,alive:false},
@@ -105,9 +128,9 @@ export class SingletonModuleComp extends ecs.Comp {
up_cost:4,
},
gold: {
- min: 1,
+ min: 200,
max: 200,
- max_limit:10,
+ max_limit:200,
time:0,
cd:1,
},
diff --git a/assets/script/game/common/config/BoxSet.ts b/assets/script/game/common/config/BoxSet.ts
index 77f8f51b..5b2314b6 100644
--- a/assets/script/game/common/config/BoxSet.ts
+++ b/assets/script/game/common/config/BoxSet.ts
@@ -37,6 +37,18 @@ export enum BoxSet {
MAX_SKILL_SY = 50,
MAX_SKILL_BY = 80,
ATK_Y = 20,
+
+ ROLE_FUX=80,
+ ROLE_FUY=40,
+
+ ROLE_FDX=80,
+ ROLE_FDY=-40,
+
+ ROLE_BUX=-80,
+ ROLE_BUY=40,
+
+ ROLE_BDX=-80,
+ ROLE_BDY=-40,
}
export enum GameSet {
ATK_TO_ATK_RATIO=0.1,
diff --git a/assets/script/game/common/config/CardSet.ts b/assets/script/game/common/config/CardSet.ts
index 63afbd90..211b293d 100644
--- a/assets/script/game/common/config/CardSet.ts
+++ b/assets/script/game/common/config/CardSet.ts
@@ -4,17 +4,17 @@
export const CardList={
1:[
- {uuid:9001,type:1},{uuid:9011,type:1},{uuid:9021,type:1},{uuid:9031,type:1},{uuid:9041,type:1}
+ {uuid:9001,type:1},{uuid:9002,type:1},{uuid:9011,type:1},{uuid:9021,type:1},{uuid:9031,type:1},{uuid:9041,type:1}
// {uuid:9007,type:1},{uuid:9008,type:1},{uuid:9009,type:1},{uuid:9010,type:1},{uuid:9011,type:1},{uuid:9012,type:1},
],
2:[
- {uuid:9001,type:1},{uuid:9011,type:1},{uuid:9021,type:1},{uuid:9031,type:1},{uuid:9041,type:1}
+ {uuid:9001,type:1},{uuid:9002,type:1},{uuid:9011,type:1},{uuid:9021,type:1},{uuid:9031,type:1},{uuid:9041,type:1}
],
3:[
- {uuid:9001,type:1},{uuid:9011,type:1},{uuid:9021,type:1},{uuid:9031,type:1},{uuid:9041,type:1}
+ {uuid:9001,type:1},{uuid:9002,type:1},{uuid:9011,type:1},{uuid:9021,type:1},{uuid:9031,type:1},{uuid:9041,type:1}
],
4:[
- {uuid:9001,type:1},{uuid:9011,type:1},{uuid:9021,type:1},{uuid:9031,type:1},{uuid:9041,type:1}
+ {uuid:9001,type:1},{uuid:9002,type:1},{uuid:9011,type:1},{uuid:9021,type:1},{uuid:9031,type:1},{uuid:9041,type:1}
],
5:[
{uuid:1001,type:2},{uuid:1002,type:2},{uuid:4011,type:2},{uuid:4012,type:2},
diff --git a/assets/script/game/common/config/ItemSet.ts b/assets/script/game/common/config/ItemSet.ts
new file mode 100644
index 00000000..3863a472
--- /dev/null
+++ b/assets/script/game/common/config/ItemSet.ts
@@ -0,0 +1,70 @@
+/*
+type ：
+ 1： 远距离攻击，碰撞后 结束
+ 2： 远距离攻击，碰撞后 持续，直到技能结束
+ 3： 远距离攻击，碰撞后 持续，带击退功能
+ 4： 双技能技能，1技能结束后，触发2技能
+ 5: 特殊技能，触发特殊弹窗选项
+ 6: 近距离攻击，碰撞后
+ 9： buff物品，
+ 91: 单体buff，加最少血，临时
+ 92：单体buff，随机或自己，临时
+ 93: 群体buff物品
+ 94：role buff
+tg: 对象，0 自己，1：同伴 ，2 自己和同伴，3：敌人，4，自己和对人
+dis: 是否移动 1 移动 0 原地
+sd： 持续时间
+cd： 卡片技能释放本技能cd
+count：卡片1次释放本技能数
+bsd：buff技能作用持续时间 ，bsd=0 为永久
+bcd：buff技能执行一次间隔
+sk_uuid:子技能id
+sk_count:子技能个数
+sp_name : 预制体名称
+path: 图片地址
+
+*/
+
+export const Items={
+
+ 6005:{uuid: 6005,path: "6005",type: 93,level: 3,name: "钢盾",sp_name:"",info:"",
+ dis:1,count:1,in:0,run:0,atk:0,hp:0,shield:100,sd:30,cd:1,bsd:5,bcd:1,sk_uuid:1001,sk_count:0,speed:600, },
+
+ 6006:{uuid: 6006,path: "6006",type: 94,level: 3,name: "魔法盾",sp_name:"",info:"",
+ dis:1,count:1,in:0,run:0,atk:0,hp:0,shield:300,sd:30,cd:1,bsd:5,bcd:1,sk_uuid:1001,sk_count:0,speed:600, },
+
+ 6101:{uuid: 6101,path: "6101",type: 91,level: 1,name: "初级药水",sp_name:"",info:"",
+ dis:1,count:1,in:0,run:0,atk:0,hp:100,shield:0,sd:30,cd:5,bsd:5,bcd:1,sk_uuid:1001,sk_count:0,speed:600, },
+
+ 6102:{uuid: 6102,path: "6102",type: 93,level: 3,name: "高级药水",sp_name:"",info:"",
+ dis:1,count:1,in:0,run:0,atk:0,hp:300,shield:0,sd:30,cd:5,bsd:5,bcd:1,sk_uuid:1001,sk_count:0,speed:600, },
+
+ 6210:{uuid: 6210,path: "6210",type: 92,level: 3,name: "普通攻击石",sp_name:"",info:"",
+ dis:1,count:1,in:0,run:0,atk:20,hp:0,shield:0,sd:30,cd:1,bsd:0,bcd:1,sk_uuid:1001,sk_count:0,speed:600, },
+
+ 6211:{uuid: 6211,path: "6211",type: 93,level: 4,name: "特效攻击石",sp_name:"",info:"",
+ dis:1,count:1,in:0,run:0,atk:30,hp:0,shield:0,sd:30,cd:1,bsd:0,bcd:1,sk_uuid:1001,sk_count:0,speed:600, },
+
+ 6212:{uuid: 6212,path: "6212",type: 94,level: 4,name: "精炼攻击石",sp_name:"",info:"",
+ dis:1,count:1,in:0,run:0,atk:5,hp:0,shield:0,sd:0,cd:1,bsd:0,bcd:1,sk_uuid:1001,sk_count:0,speed:600, },
+
+ 6213:{uuid: 6213,path: "6213",type: 92,level: 3,name: "普通攻速石",sp_name:"",info:"",
+ dis:1,count:1,in:0,run:0,atk:0,hp:30,shield:0,sd:30,cd:1,bsd:0,bcd:1,sk_uuid:1001,sk_count:0,speed:600, },
+
+ 6214:{uuid: 6214,path: "6214",type: 93,level: 4,name: "特效攻速石",sp_name:"",info:"",
+ dis:1,count:1,in:0,run:0,atk:0,hp:30,shield:0,sd:30,cd:1,bsd:0,bcd:1,sk_uuid:1001,sk_count:0,speed:600, },
+
+ 6215:{uuid: 6215,path: "6215",type: 94,level: 4,name: "精炼攻速石",sp_name:"",info:"",
+ dis:1,count:1,in:0,run:0,atk:5,hp:30,shield:0,sd:30,cd:1,bsd:0,bcd:1,sk_uuid:1001,sk_count:0,speed:600, },
+
+ 6216:{uuid: 6216,path: "6216",type: 92,level: 3,name: "普通技能石",sp_name:"",info:"",
+ dis:1,count:1,in:0,run:0,atk:5,hp:30,shield:0,sd:30,cd:1,bsd:0,bcd:1,sk_uuid:1001,sk_count:0,speed:600, },
+
+ 6217:{uuid: 6217,path: "6217",type: 93,level: 4,name: "特效技能石",sp_name:"",info:"",
+ dis:1,count:1,in:0,run:0,atk:5,hp:30,shield:0,sd:30,cd:1,bsd:0,bcd:1,sk_uuid:1001,sk_count:0,speed:600, },
+
+ 6218:{uuid: 6218,path: "6218",type: 94,level: 4,name: "精炼技能石",sp_name:"",info:"",
+ dis:1,count:1,in:0,run:0,atk:5,hp:30,shield:0,sd:30,cd:1,bsd:0,bcd:1,sk_uuid:1001,sk_count:0,speed:600, },
+
+}
+
diff --git a/assets/script/game/common/config/ItemSet.ts.meta b/assets/script/game/common/config/ItemSet.ts.meta
new file mode 100644
index 00000000..f137e6a6
--- /dev/null
+++ b/assets/script/game/common/config/ItemSet.ts.meta
@@ -0,0 +1,9 @@
+{
+ "ver": "4.0.23",
+ "importer": "typescript",
+ "imported": true,
+ "uuid": "5207ea65-7d56-4895-974a-613fa815c084",
+ "files": [],
+ "subMetas": {},
+ "userData": {}
+}
diff --git a/assets/script/game/common/config/SkillSet.ts b/assets/script/game/common/config/SkillSet.ts
index 40154d5c..17771a5b 100644
--- a/assets/script/game/common/config/SkillSet.ts
+++ b/assets/script/game/common/config/SkillSet.ts
@@ -7,8 +7,8 @@ type ：
5: 特殊技能，触发特殊弹窗选项
6: 近距离攻击，碰撞后
9： buff物品，
- 91: 单体buff物品，加最少血，临时
- 92：单体buff物品，随机，临时
+ 91: 单体buff，加最少血，临时
+ 92：单体buff，随机或自己，临时
93: 群体buff物品
94：role buff
tg: 对象，0 自己，1：同伴 ，2 自己和同伴，3：敌人，4，自己和对人
@@ -22,9 +22,7 @@ sk_uuid:子技能id
sk_count:子技能个数
sp_name : 预制体名称
path: 图片地址
-
*/
-
export const SkillSet={
1001:{uuid: 1001,path: "1001",type: 1,tg:3,angle:true,level: 1,name: "火球术",sp_name:"fire",info:"释放一个火球术攻击敌人",
dis:1,count:1,in:0,run:0,atk:10,hp:0,shield:0,sd:10,cd:1,bsd:0,bcd:0,sk_uuid:1001,sk_count:0,speed:600, },
@@ -36,7 +34,12 @@ export const SkillSet={
dis:1,count:1,in:0,run:0,atk:10,hp:0,shield:0,sd:10,cd:1,bsd:0,bcd:0,sk_uuid:1001,sk_count:0,speed:600, },
2001:{uuid: 2001,path: "2001",type: 91,tg:1,angle:false,level: 1,name: "治愈术",sp_name:"heath",info:"释放一个寒冰箭攻击敌人",
- dis:1,count:1,in:0,run:1,atk:10,hp:0,shield:0,sd:10,cd:1,bsd:0,bcd:0,sk_uuid:1001,sk_count:0,speed:450, },
+ dis:1,count:1,in:0,run:1,atk:0,hp:30,shield:0,sd:10,cd:1,bsd:0,bcd:0,sk_uuid:1001,sk_count:0,speed:450, },
+ 2002:{uuid: 2002,path: "2002",type: 91,tg:0,angle:false,level: 1,name: "魔法盾",sp_name:"shield",info:"释放一个寒冰箭攻击敌人",
+ dis:1,count:1,in:0.2,run:2,atk:0,hp:0,shield:50,sd:0,cd:0,bsd:30,bcd:0,sk_uuid:1001,sk_count:0,speed:450, },
+ 2003:{uuid: 2003,path: "2003",type: 91,tg:0,angle:false,level: 1,name: "狂暴",sp_name:"atkup",info:"释放一个寒冰箭攻击敌人",
+ dis:1,count:1,in:0.2,run:2,atk:10,hp:0,shield:0,sd:0,cd:0,bsd:30,bcd:0,sk_uuid:1001,sk_count:0,speed:450, },
+
3001:{uuid: 3001,path: "3001",type: 1,tg:3,angle:true,level: 1,name: "三连击",sp_name:"patk",info:"释放一个魔法球攻击敌人",
dis:1,count:3,in:0.3,run:2,atk:0,hp:0,shield:0,sd:0,cd:0,bsd:0,bcd:0,sk_uuid:1001,sk_count:0,speed:600,},
@@ -57,53 +60,7 @@ export const SkillSet={
8001:{uuid: 8001,path: "8001",type: 1,tg:3,angle:true,level: 1,name: "飞刀",sp_name:"sword1",info:"释放一个魔法球攻击敌人",
dis:1,count:1,in:0,run:0,atk:0,hp:0,shield:0,sd:0,cd:0,bsd:0,bcd:0,sk_uuid:8001,sk_count:0,speed:600,},
-
- 6210:{uuid: 6210,path: "6210",type: 92,level: 1,name: "普通攻击石",sp_name:"",info:"",
- dis:1,count:1,in:0,run:0,atk:10,hp:0,shield:0,sd:30,cd:1,bsd:5,bcd:1,sk_uuid:1001,sk_count:0,speed:600, },
-
- 6211:{uuid: 6211,path: "6211",type: 93,level: 3,name: "精炼攻击石",sp_name:"",info:"",
- dis:1,count:1,in:0,run:0,atk:10,hp:0,shield:0,sd:30,cd:1,bsd:5,bcd:1,sk_uuid:1001,sk_count:0,speed:600, },
-
- 6005:{uuid: 6005,path: "6005",type: 93,level: 3,name: "钢盾",sp_name:"",info:"",
- dis:1,count:1,in:0,run:0,atk:0,hp:0,shield:30,sd:30,cd:1,bsd:5,bcd:1,sk_uuid:1001,sk_count:0,speed:600, },
-
- 6006:{uuid: 6006,path: "6006",type: 94,level: 3,name: "魔法盾",sp_name:"",info:"",
- dis:1,count:1,in:0,run:0,atk:0,hp:0,shield:30,sd:30,cd:1,bsd:5,bcd:1,sk_uuid:1001,sk_count:0,speed:600, },
-
- 6101:{uuid: 6101,path: "6101",type: 91,level: 1,name: "初级药水",sp_name:"",info:"",
- dis:1,count:1,in:0,run:0,atk:0,hp:30,shield:0,sd:30,cd:5,bsd:5,bcd:1,sk_uuid:1001,sk_count:0,speed:600, },
-
- 6102:{uuid: 6102,path: "6102",type: 93,level: 3,name: "高级药水",sp_name:"",info:"",
- dis:1,count:1,in:0,run:0,atk:0,hp:50,shield:0,sd:30,cd:5,bsd:5,bcd:1,sk_uuid:1001,sk_count:0,speed:600, },
}
-export const AllItems={
- 6210:{uuid: 6210,path: "6210",type: 92,level: 3,name: "普通攻击石",sp_name:"",info:"",
- dis:1,count:1,in:0,run:0,atk:0,hp:30,shield:0,sd:30,cd:1,bsd:0,bcd:1,sk_uuid:1001,sk_count:0,speed:600, },
-
- 6211:{uuid: 6211,path: "6211",type: 93,level: 4,name: "特效攻击石",sp_name:"",info:"",
- dis:1,count:1,in:0,run:0,atk:5,hp:0,shield:0,sd:30,cd:1,bsd:0,bcd:1,sk_uuid:1001,sk_count:0,speed:600, },
-
- 6212:{uuid: 6212,path: "6212",type: 94,level: 4,name: "精炼攻击石",sp_name:"",info:"",
- dis:1,count:1,in:0,run:0,atk:5,hp:0,shield:0,sd:30,cd:1,bsd:0,bcd:1,sk_uuid:1001,sk_count:0,speed:600, },
-
- 6213:{uuid: 6213,path: "6213",type: 92,level: 3,name: "普通生命石",sp_name:"",info:"",
- dis:1,count:1,in:0,run:0,atk:0,hp:30,shield:0,sd:30,cd:1,bsd:0,bcd:1,sk_uuid:1001,sk_count:0,speed:600, },
-
- 6214:{uuid: 6214,path: "6214",type: 93,level: 4,name: "特效生命石",sp_name:"",info:"",
- dis:1,count:1,in:0,run:0,atk:0,hp:30,shield:0,sd:30,cd:1,bsd:0,bcd:1,sk_uuid:1001,sk_count:0,speed:600, },
-
- 6215:{uuid: 6215,path: "6215",type: 94,level: 4,name: "精炼生命石",sp_name:"",info:"",
- dis:1,count:1,in:0,run:0,atk:5,hp:30,shield:0,sd:30,cd:1,bsd:0,bcd:1,sk_uuid:1001,sk_count:0,speed:600, },
-
- 6216:{uuid: 6216,path: "6216",type: 92,level: 3,name: "普通全能石",sp_name:"",info:"",
- dis:1,count:1,in:0,run:0,atk:5,hp:30,shield:0,sd:30,cd:1,bsd:0,bcd:1,sk_uuid:1001,sk_count:0,speed:600, },
-
- 6217:{uuid: 6217,path: "6217",type: 93,level: 4,name: "特效全能石",sp_name:"",info:"",
- dis:1,count:1,in:0,run:0,atk:5,hp:30,shield:0,sd:30,cd:1,bsd:0,bcd:1,sk_uuid:1001,sk_count:0,speed:600, },
-
- 6218:{uuid: 6218,path: "6218",type: 94,level: 4,name: "精炼全能石",sp_name:"",info:"",
- dis:1,count:1,in:0,run:0,atk:5,hp:30,shield:0,sd:30,cd:1,bsd:0,bcd:1,sk_uuid:1001,sk_count:0,speed:600, },
-}
diff --git a/assets/script/game/common/config/heroSet.ts b/assets/script/game/common/config/heroSet.ts
index 185e2c21..675805aa 100644
--- a/assets/script/game/common/config/heroSet.ts
+++ b/assets/script/game/common/config/heroSet.ts
@@ -1,28 +1,31 @@
export const HeroSet = {
9001: {
- uuid: 9001, path: "k3", type: 1, level: 1, name: "战士", atk: 4, hp: 35, atk_dis: 30, atk_cd: 2, power: 0, power_max: 10, speed: 30,
- max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 3001, word: "守护", info: "自身护盾", atktype: 1,
+ uuid: 9001, path: "k3", type: 1, level: 1,cost:2, name: "骑士", atk: 4, hp: 60, atk_dis: 40, atk_cd: 1, power: 0, power_max: 10, speed: 30,
+ max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 2002, word: "守护", info: "自身护盾", atktype: 1,
},
-
+ 9002: {
+ uuid: 9002, path: "k1", type: 1, level: 1,cost:2, name: "战士", atk: 8, hp: 30, atk_dis: 40, atk_cd: 1, power: 0, power_max: 10, speed: 30,
+ max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 2003, word: "守护", info: "自身护盾", atktype: 1,
+ },
9011: {
- uuid: 9004, path: "m1", type: 1, level: 1, name: "冰法", atk: 4, hp: 15, atk_dis: 200, atk_cd: 2, power: 0, power_max: 10, speed: 30,
+ uuid: 9004, path: "m1", type: 1, level: 1,cost:2, name: "冰法", atk: 15, hp: 20, atk_dis: 300, atk_cd: 2.5, power: 0, power_max: 10, speed: 30,
max_skill: "寒冰箭", skill_uuid: 9002, max_skill_uuid: 1002, word: "守护", info: "自身护盾", atktype: 1,
},
9021: {
- uuid: 9006, path: "m3", type: 3, level: 1, name: "火法", atk: 6, hp: 15, atk_dis: 200, atk_cd: 2, power: 0, power_max: 10, speed: 30,
+ uuid: 9006, path: "m3", type: 3, level: 1,cost:2, name: "火法", atk: 10, hp: 20, atk_dis: 300, atk_cd: 2, power: 0, power_max: 10, speed: 30,
max_skill: "火球术", skill_uuid: 9002, max_skill_uuid: 1001, word: "守护", info: "自身护盾", atktype: 2
},
9031: {
- uuid: 9005, path: "m2", type: 3, level: 1, name: "牧师", atk: 3, hp: 20, atk_dis: 200, atk_cd: 2, power: 0, power_max: 10, speed: 30,
+ uuid: 9005, path: "m2", type: 3, level: 1,cost:2, name: "牧师", atk: 3, hp: 20, atk_dis: 300, atk_cd: 2, power: 0, power_max: 10, speed: 30,
max_skill: "治愈术", skill_uuid: 9002, max_skill_uuid: 2001, word: "守护", info: "自身护盾", atktype: 2
},
9041: {
- uuid: 9009, path: "arc1", type: 3, level: 1, name: "弓箭手", atk: 3, hp: 15, atk_dis: 300, atk_cd: 1, power: 0, power_max: 10, speed: 30,
+ uuid: 9009, path: "arc1", type: 3, level: 1,cost:2, name: "弓箭手", atk: 5, hp: 30, atk_dis: 200, atk_cd: 1.5, power: 0, power_max: 10, speed: 30,
max_skill: "精准射击", skill_uuid: 9003, max_skill_uuid: 1003, word: "狂暴", info: "全体攻击", atktype: 2
},
@@ -31,40 +34,29 @@ export const HeroSet = {
export const MonSet = {
1011: {
- uuid: 1011, path: "orc1", type: 1, level: 1, name: "森林兽人", atk: 4, hp: 30, atk_dis: 30, atk_cd: 2, power: 0, power_max: 10, speed: 30,
- max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 1001, word: "守护", info: "自身护盾", atktype: 1
+ uuid: 1011, path: "orc1", type: 1, level: 1,cost:2, name: "森林兽人", atk: 8, hp: 30, atk_dis: 40, atk_cd: 2, power: 0, power_max: 10, speed: 30,
+ max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 0, word: "守护", info: "自身护盾", atktype: 1
},
1012: {
- uuid: 1012, path: "orc2", type: 1, level: 1, name: "荒野兽人", atk: 4, hp: 30, atk_dis: 30, atk_cd: 2, power: 0, power_max: 10, speed: 30,
- max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 1002, word: "守护", info: "自身护盾", atktype: 1
+ uuid: 1012, path: "orc2", type: 1, level: 1,cost:2, name: "荒野兽人", atk: 8, hp: 40, atk_dis: 40, atk_cd: 2, power: 0, power_max: 10, speed: 30,
+ max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 0, word: "守护", info: "自身护盾", atktype: 1
},
1013: {
- uuid: 1013, path: "orc3", type: 1, level: 1, name: "兽人战士", atk: 4, hp: 30, atk_dis: 30, atk_cd: 2, power: 0, power_max: 10, speed: 30,
- max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 1003, word: "守护", info: "自身护盾", atktype: 1
+ uuid: 1013, path: "orc3", type: 1, level: 1,cost:2, name: "兽人战士", atk: 8, hp: 60, atk_dis: 40, atk_cd: 2, power: 0, power_max: 10, speed: 30,
+ max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 0, word: "守护", info: "自身护盾", atktype: 1
},
1031: {
- uuid: 1031, path: "du1", type: 1, level: 1, name: "独眼巨人", atk: 4, hp: 30, atk_dis: 30, atk_cd: 2, power: 0, power_max: 10, speed: 30,
- max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 1004, word: "守护", info: "自身护盾", atktype: 1
+ uuid: 1031, path: "du1", type: 1, level: 1,cost:2, name: "独眼巨人", atk: 4, hp: 50, atk_dis: 40, atk_cd: 2, power: 0, power_max: 10, speed: 30,
+ max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 0, word: "守护", info: "自身护盾", atktype: 1
},
1032: {
- uuid: 1032, path: "du2", type: 1, level: 1, name: "狂暴独眼", atk: 4, hp: 30, atk_dis: 30, atk_cd: 2, power: 0, power_max: 10, speed: 30,
- max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 3001, word: "守护", info: "自身护盾", atktype: 1
+ uuid: 1032, path: "du2", type: 1, level: 1,cost:2, name: "狂暴独眼", atk: 5, hp: 60, atk_dis: 40, atk_cd: 2, power: 0, power_max: 10, speed: 30,
+ max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 0, word: "守护", info: "自身护盾", atktype: 1
},
1033: {
- uuid: 1033, path: "du3", type: 1, level: 1, name: "独眼首领", atk: 4, hp: 30, atk_dis: 30, atk_cd: 2, power: 0, power_max: 10, speed: 30,
- max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 3001, word: "守护", info: "自身护盾", atktype: 1
- },
- 1041: {
- uuid: 1041, path: "ys1", type: 1, level: 1, name: "火元素", atk: 4, hp: 30, atk_dis: 200, atk_cd: 2, power: 0, power_max: 10, speed: 30,
- max_skill: "火球术", skill_uuid: 9002, max_skill_uuid: 1001, word: "守护", info: "自身护盾", atktype: 2
- },
- 1042: {
- uuid: 1042, path: "ys2", type: 1, level: 1, name: "冰元素", atk: 4, hp: 30, atk_dis: 200, atk_cd: 2, power: 0, power_max: 10, speed: 30,
- max_skill: "寒冰箭", skill_uuid: 9002, max_skill_uuid: 1002, word: "守护", info: "自身护盾", atktype: 2
- },
- 1043: {
- uuid: 1043, path: "ys3", type: 1, level: 1, name: "气元素", atk: 4, hp: 30, atk_dis: 200, atk_cd: 2, power: 0, power_max: 10, speed: 30,
- max_skill: "魔法球", skill_uuid: 9002, max_skill_uuid: 1004, word: "守护", info: "自身护盾", atktype: 2
+ uuid: 1033, path: "du3", type: 1, level: 1,cost:2, name: "独眼首领", atk: 6, hp: 100, atk_dis: 40, atk_cd: 2, power: 0, power_max: 10, speed: 30,
+ max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 0, word: "守护", info: "自身护盾", atktype: 1
},
+
}
\ No newline at end of file
diff --git a/assets/script/game/hero/BoxRangComp.ts b/assets/script/game/hero/BoxRangComp.ts
index 986ba00c..ab58ec56 100644
--- a/assets/script/game/hero/BoxRangComp.ts
+++ b/assets/script/game/hero/BoxRangComp.ts
@@ -26,10 +26,10 @@ export class BoxRangComp extends CCComp {
this.HeroViewComp=this.Hero_node.getComponent(HeroViewComp);
// console.log("range box",this.HeroViewComp);
if (collider) {
- collider.on(Contact2DType.BEGIN_CONTACT, this.onBeginContact, this);
+ // collider.on(Contact2DType.BEGIN_CONTACT, this.onBeginContact, this);
collider.on(Contact2DType.END_CONTACT, this.onEndContact, this);
collider.on(Contact2DType.PRE_SOLVE, this.onPreSolve, this);
- collider.on(Contact2DType.POST_SOLVE, this.onPostSolve, this);
+ // collider.on(Contact2DType.POST_SOLVE, this.onPostSolve, this);
}
}
onBeginContact (selfCollider: Collider2D, otherCollider: Collider2D, contact: IPhysics2DContact | null) {
diff --git a/assets/script/game/hero/Hero.ts b/assets/script/game/hero/Hero.ts
index 1687fe36..ed87c9e9 100644
--- a/assets/script/game/hero/Hero.ts
+++ b/assets/script/game/hero/Hero.ts
@@ -17,6 +17,8 @@ import { HeroViewComp } from "./HeroViewComp";
import { BoxSet } from "../common/config/BoxSet";
import { RandomManager } from "../../../../extensions/oops-plugin-framework/assets/core/common/random/RandomManager";
import { HeroSet,MonSet } from "../common/config/heroSet";
+import { Role } from "../Role/Role";
+import { MoveToComp } from "../common/ecs/position/MoveTo";
/** 角色实体 */
@ecs.register(`Hero`)
export class Hero extends ecs.Entity {
@@ -24,6 +26,7 @@ export class Hero extends ecs.Entity {
HeroModel!: HeroModelComp;
// 视图层
HeroView!: HeroViewComp;
+
protected init() {
this.addComponents( HeroModelComp);
@@ -32,12 +35,12 @@ export class Hero extends ecs.Entity {
destroy(): void {
this.remove(HeroViewComp);
+ this.remove(MoveToComp);
super.destroy();
}
/** 加载角色 */
- load(pos: Vec3 = Vec3.ZERO,scale:number = -1,uuid:number=1001,layer:Node=smc.map.MapView.scene.entityLayer!.node!) {
-
+ load(pos: Vec3 = Vec3.ZERO,scale:number = -1,uuid:number=1001,layer:Node=smc.map.MapView.scene.entityLayer!.node!,index:number=-1) {
var path = "game/hero/"+smc.heros[uuid].path;
var prefab: Prefab = oops.res.get(path, Prefab)!;
var node = instantiate(prefab);
@@ -45,10 +48,33 @@ export class Hero extends ecs.Entity {
// var as = node.getComponent(HeroSpine);
// let ratio=this.set_ratio(uuid);
// node.setScale(node.scale.x*scale*ratio, node.scale.y*ratio, 0);
+ pos.x=smc.Role.RoleView.node.position.x+pos.x;
+ pos.y=smc.Role.RoleView.node.position.y+pos.y;
node.setPosition(pos)
- this.hero_init(uuid,node)
+ this.hero_init(uuid,node,index)
oops.message.dispatchEvent("hero_load",this)
}
+
+ hero_init(uuid:number=1001,node:Node,index:number=-1){
+ var hv = node.getComponent(HeroViewComp)!;
+ // console.log("hero_init",buff)
+ hv.speed =hv.ospeed = smc.heros[uuid].speed;
+ hv.hero_name= smc.heros[uuid].name;
+ hv.hp= hv.hp_max = smc.heros[uuid].hp;
+ hv.level = smc.heros[uuid].level;
+ hv.atk = smc.heros[uuid].atk;
+ hv.atk_cd = smc.heros[uuid].atk_cd;
+ hv.atk_dis = smc.heros[uuid].atk_dis;
+ hv.power = smc.heros[uuid].power;
+ hv.power_max= smc.heros[uuid].power_max;
+ hv.type = smc.heros[uuid].type;
+ hv.skill_uuid = smc.heros[uuid].skill_uuid;
+ hv.max_skill_uuid = smc.heros[uuid].max_skill_uuid;
+ hv.scale = 1;
+ hv.role_heros_index = index;
+ hv.Tpos = v3(0,0,0);
+ this.add(hv);
+ }
set_ratio(uuid:number){
let ratio=1;
switch (smc.heros[uuid].level) {
@@ -69,23 +95,4 @@ export class Hero extends ecs.Entity {
}
return ratio;
}
- hero_init(uuid:number=1001,node:Node,pos:Vec3=v3(0,0,0)){
- var mv = node.getComponent(HeroViewComp)!;
- // console.log("hero_init",buff)
- mv.speed =mv.ospeed = smc.heros[uuid].speed;
- mv.hero_name= smc.heros[uuid].name;
- mv.hp= mv.hp_max = smc.heros[uuid].hp;
- mv.level = smc.heros[uuid].level;
- mv.atk = smc.heros[uuid].atk;
- mv.atk_cd = smc.heros[uuid].atk_cd;
- mv.atk_dis = smc.heros[uuid].atk_dis;
- mv.power = smc.heros[uuid].power;
- mv.power_max= smc.heros[uuid].power_max;
- mv.type = smc.heros[uuid].type;
- mv.skill_uuid = smc.heros[uuid].skill_uuid;
- mv.max_skill_uuid = smc.heros[uuid].max_skill_uuid;
- mv.scale = 1;
- mv.Tpos = v3(0,0,0);
- this.add(mv);
- }
}
\ No newline at end of file
diff --git a/assets/script/game/hero/HeroSpine.ts b/assets/script/game/hero/HeroSpine.ts
index 652859c8..2ec7c0a3 100644
--- a/assets/script/game/hero/HeroSpine.ts
+++ b/assets/script/game/hero/HeroSpine.ts
@@ -21,7 +21,7 @@ export class HeroSpine extends Component {
atk_clip: AnimationClip = null!;
max_clip: AnimationClip = null!;
move_clip: AnimationClip = null!;
- default_clip:string = "move";
+ default_clip:string = "";
onLoad() {
// 角色控制组件
@@ -31,6 +31,7 @@ export class HeroSpine extends Component {
this.atk_clip = this.animator.clips[1];
this.max_clip = this.animator.clips[2];
this.move_clip = this.animator.clips[3];
+ this.default_clip=this.move_clip.name;
let animation = this.animator.getComponent(Animation);
animation.on(Animation.EventType.FINISHED, this.onAnimationEvent, this)
}
@@ -40,6 +41,7 @@ export class HeroSpine extends Component {
/** 初始化动画 */
protected initAnimator() {
this.animator=this.node.getChildByName("anm").getComponent(Animation);
+
// console.log("mon spine init",this.animator);
}
diff --git a/assets/script/game/hero/HeroViewComp.ts b/assets/script/game/hero/HeroViewComp.ts
index 9899d99a..3d6e747c 100644
--- a/assets/script/game/hero/HeroViewComp.ts
+++ b/assets/script/game/hero/HeroViewComp.ts
@@ -33,7 +33,9 @@ export class HeroViewComp extends CCComp {
hitFlashMaterial: Material;
orginalFlashMaterial: Material;
sprite: Sprite;
-
+ @property(Material)
+ atkMaterial: Material;
+
@property(Node)
BoxRang:Node =null!
@@ -57,8 +59,6 @@ export class HeroViewComp extends CCComp {
power_max: number = 1200; /** 能量最大值 */
power_speed: number = 1; //能量回复速度每0.1秒回复量
- skill_name: string = "base"; //技能名称
- max_skill_name: string = "base"; //大技能名称
skill_uuid:number = 9001;
max_skill_uuid:number = 1001;
atk: number = 10; /**攻击力 */
@@ -89,6 +89,7 @@ export class HeroViewComp extends CCComp {
buff_atks:any = [];
dir_y:number = 0;
speek_time:number = 0;
+ role_heros_index:number = -1;
onLoad() {
this.as = this.getComponent(HeroSpine);
// this.BoxRang = this.node.getChildByName("range_box");
@@ -96,6 +97,7 @@ export class HeroViewComp extends CCComp {
} /** 视图层逻辑代码分离演示 */
start () {
this.as.move()
+ this.node.getChildByName("top").getChildByName("hp").active = false;
this.sprite = this.node.getChildByName("anm").getComponent(Sprite);
// this.node.getChildByName("top").getChildByName("shield").active = false;
// this.node.getChildByName("top").setScale(this.scale,1);
@@ -118,9 +120,9 @@ export class HeroViewComp extends CCComp {
collider.group = this.box_group;
if (collider) {
collider.on(Contact2DType.BEGIN_CONTACT, this.onBeginContact, this);
- collider.on(Contact2DType.END_CONTACT, this.onEndContact, this);
+ // collider.on(Contact2DType.END_CONTACT, this.onEndContact, this);
collider.on(Contact2DType.PRE_SOLVE, this.onPreSolve, this);
- collider.on(Contact2DType.POST_SOLVE, this.onPostSolve, this);
+ // collider.on(Contact2DType.POST_SOLVE, this.onPostSolve, this);
}
// this.node.getChildByName("level").getChildByName("level").getComponent(Label).string = this.level.toString();
@@ -146,6 +148,7 @@ export class HeroViewComp extends CCComp {
}
onPreSolve (selfCollider: Collider2D, otherCollider: Collider2D) {
if(selfCollider.group == otherCollider.group&&selfCollider.tag==otherCollider.tag){
+
if(selfCollider.node.position.y < otherCollider.node.position.y){
if(selfCollider.node.getSiblingIndex() < otherCollider.node.getSiblingIndex()){
@@ -164,13 +167,15 @@ export class HeroViewComp extends CCComp {
if (this.timer.update(dt)) {
this.power_change(this.power_speed)
}
- this.check_buff_atks(dt)
this.in_destroy();
+ this.check_buff_atks(dt)
this.in_shield(dt);
this.in_stop(dt);
this.in_atk(dt);
- this.in_speek(dt);
- this.move(dt);
+ this.hp_show()
+ // this.in_speek(dt);
+ // this.move(dt);
+ this.move_to()
// if(this.m_timer.update(dt)){
// this.move_to()
// }
@@ -186,15 +191,24 @@ export class HeroViewComp extends CCComp {
if(this.enemy){
return
}
- // this.set_diry()
this.node.setPosition(this.node.position.x+dt*this.speed*this.scale, this.node.position.y+dt*this.dir_y, this.node.position.z);
}
- set_diry(){
- this.dir_y=-(this.node.position.y-BoxSet.GAME_LINE)/20
+ hp_show(){
+ if(this.hp == this.hp_max){
+ this.node.getChildByName("top").getChildByName("hp").active = false;
+ } else{
+ this.node.getChildByName("top").getChildByName("hp").active = true;
+ }
}
move_to(){
+ // if(this.stop_cd > 0){
+ // return
+ // }
+ // if(this.enemy){
+ // return
+ // }
var move = this.ent.get(MoveToComp) || this.ent.add(MoveToComp);
- move.target = v3(smc.Role.RoleView.node.position.x+10,smc.Role.RoleView.node.position.y);
+ move.target = v3(smc.Role.RoleView.node.position.x+smc.role_heros[this.role_heros_index].x,smc.Role.RoleView.node.position.y+smc.role_heros[this.role_heros_index].y);
move.node = this.node;
move.speed = this.ospeed;
}
@@ -202,7 +216,7 @@ export class HeroViewComp extends CCComp {
this.power += power;
if(this.power >= this.power_max&&this.check_enemy_alive()){
this.as.atk()
- this.to_speek(smc.skills[this.max_skill_uuid].name)
+ // this.to_speek(smc.skills[this.max_skill_uuid].name)
this.scheduleOnce(()=>{
this.handle_skill(this.max_skill_uuid);
},0.5)
@@ -237,10 +251,10 @@ export class HeroViewComp extends CCComp {
}
return {pos,t_pos}
}
- shoot(skill_uuid:number,y:number=0,x:number=0){
- // console.log("mon shoot");
+ shoot_enemy(skill_uuid:number,y:number=0,x:number=0){
+ // console.log("mon shoot_enemy");
let skill = ecs.getEntity(Skill);
- let atk = smc.skills[skill_uuid].atk+this.atk;
+ let atk = smc.skills[skill_uuid].atk+this.atk+this.buff_atk;
let {pos,t_pos}=this.get_enemy_pos()
pos.y=pos.y + y
pos.x=pos.x + x
@@ -252,21 +266,32 @@ export class HeroViewComp extends CCComp {
let atk = smc.skills[s_uuid].atk+this.atk;
let {pos,t_pos}=this.get_hero_pos(hero)
skill.load(pos,BoxSet.HERO,this.node,this.max_skill_uuid,atk,t_pos);
- hero.HeroView.add_hp(smc.skills[s_uuid].atk)
+ if(smc.skills[s_uuid].hp > 0){ //buff加血
+ hero.HeroView.add_hp(smc.skills[s_uuid].hp)
+ }
+ if(smc.skills[s_uuid].atk > 0){ //buff加攻击
+ hero.HeroView.add_atk(smc.skills[s_uuid].atk,smc.skills[s_uuid].bsd)
+ }
+ if(smc.skills[s_uuid].shield > 0){ //buff护盾
+ hero.HeroView.add_shield(smc.skills[s_uuid].shield,smc.skills[s_uuid].bsd)
+ }
+
}
push_least_buff(skill:number){
let heros:any = ecs.query(ecs.allOf(HeroModelComp));
- let least_hp:number=999999
+ let least_hp:number=0
let t_hero:any= null
if (heros.length > 0) {
if(smc.skills[skill].type==92){ //随机添加buff
let i = RandomManager.instance.getRandomInt(0,heros.length-1,3)
+ this.to_add_buff(heros[i],skill)
}else{
for (let i = 0; i < heros.length; i++) {
let hero = heros[i];
+ if(!hero.HeroView) continue
if(smc.skills[skill].type==91){ //血量最少单体
- if(hero.HeroView.hp < least_hp){
- least_hp = hero.HeroView.hp
+ if((hero.HeroView.hp_max-hero.HeroView.hp) > least_hp){
+ least_hp = (hero.HeroView.hp_max-hero.HeroView.hp)
t_hero = hero
}
}else{ //群体
@@ -287,19 +312,21 @@ export class HeroViewComp extends CCComp {
handle_skill(skill:number){
switch (smc.skills[skill].tg) {
case 0: //自己
-
+ this.to_add_buff(this.ent,skill)
break;
case 1: //伙伴
this.push_least_buff(skill)
break;
case 2: //自己和伙伴
-
+ this.to_add_buff(this.ent,skill)
+ this.push_least_buff(skill)
break;
case 3: //敌人
- this.shoot(skill)
+ this.shoot_enemy(skill)
break;
case 4: //敌人和自己
- this.shoot(skill)
+ this.to_add_buff(this.ent,skill)
+ this.shoot_enemy(skill)
break;
}
}
@@ -346,6 +373,22 @@ export class HeroViewComp extends CCComp {
}
}
+
+
+ heathed(){
+ this.node.getChildByName("heathed").active=true
+ }
+ add_hp(hp: number=0){
+ this.heathed();
+ this.hp+=hp;
+ if(this.hp > this.hp_max){
+ this.hp = this.hp_max;
+ }
+ this.tooltip(2,hp.toString());
+ let hp_progress= this.hp/this.hp_max;
+ this.node.getChildByName("top").getChildByName("hp").getComponent(ProgressBar)!.progress = hp_progress;
+ }
+
hp_change(hp: number){
if(this.is_dead){
return;
@@ -364,26 +407,15 @@ export class HeroViewComp extends CCComp {
if(this.hp <= 0){
this.dead();
this.is_dead = true;
+ smc.role_heros[this.role_heros_index].eid == 0
setTimeout(() => {
this.ent.destroy();
}, 15);
}
}
- heathed(){
- this.node.getChildByName("heathed").active=true
- }
- add_hp(hp: number=0){
- this.heathed();
- this.hp+=hp;
- if(this.hp > this.hp_max){
- this.hp = this.hp_max;
- }
- this.tooltip(2,hp.toString());
- let hp_progress= this.hp/this.hp_max;
- this.node.getChildByName("top").getChildByName("hp").getComponent(ProgressBar)!.progress = hp_progress;
- }
add_atk(atk: number,time:number=0){
if(time > 0){
+ this.buff_atk=0
let buff={atk:atk,time:time}
this.buff_atks.push(buff);
this.buff_atks.forEach((element: { atk: number; }) => {
@@ -392,15 +424,20 @@ export class HeroViewComp extends CCComp {
}else{
this.atk += atk;
}
+ this.sprite.setSharedMaterial(this.atkMaterial, 0);
+ this.scheduleOnce(() => {
+ this.sprite.setSharedMaterial(this.orginalFlashMaterial, 0);
+ }, 0.3);
+ console.log(this.buff_atks)
}
+
check_buff_atks(dt: number){
for(let i=0;i 0){
@@ -441,12 +491,6 @@ export class HeroViewComp extends CCComp {
// let shield_progress= this.shield/this.shield_max;
// this.node.getChildByName("top").getChildByName("shield").getComponent(ProgressBar)!.progress = shield_progress;
}
- if(this.shield <= 0){
- this.shield_time=0
- // this.node.getChildByName("top").getChildByName("shield").active=false
- }else{
- // this.node.getChildByName("top").getChildByName("shield").active=true
- }
}
tooltip(type:number=1,value:string="",s_uuid:number=1001,y:number=60){
// console.log("tooltip",type);
diff --git a/assets/script/game/initialize/Initialize.ts b/assets/script/game/initialize/Initialize.ts
index 36a24046..36b946ca 100644
--- a/assets/script/game/initialize/Initialize.ts
+++ b/assets/script/game/initialize/Initialize.ts
@@ -14,6 +14,7 @@ import { LoadingViewComp } from "./view/LoadingViewComp";
import { smc } from "../common/SingletonModuleComp";
import { MonSet, HeroSet } from "../common/config/heroSet";
import { SkillSet } from "../common/config/SkillSet";
+import { Items } from "../common/config/ItemSet";
// import {data} from "../data/data";
/**
@@ -89,7 +90,7 @@ export class Initialize extends ecs.Entity {
smc.monsters=MonSet;
// console.log("加载完成！",smc.heros);
smc.skills=SkillSet;
-
+ smc.items=Items;
var uic: UICallbacks = {
onAdded: (node: Node, params: any) => {
var comp = node.getComponent(LoadingViewComp) as ecs.Comp;
diff --git a/assets/script/game/map/CardController.ts b/assets/script/game/map/CardController.ts
index b875985a..7c5eb8b2 100644
--- a/assets/script/game/map/CardController.ts
+++ b/assets/script/game/map/CardController.ts
@@ -20,12 +20,12 @@ export class CardControllerComp extends CCComp {
touch_time:number = 0
in_touch:boolean = false
cards:any = {
- 1:{uuid:1101,type:1,lv:0,alive:false},
- 2:{uuid:1102,type:1,lv:0,alive:false},
- 3:{uuid:1103,type:1,lv:0,alive:false},
- 4:{uuid:1104,type:1,lv:0,alive:false},
- 5:{uuid:1105,type:1,lv:0,alive:false},
- 6:{uuid:1106,type:1,lv:0,alive:false},
+ 1:{uuid:1101,type:1,lv:0,cost:0,alive:false},
+ 2:{uuid:1102,type:1,lv:0,cost:0,alive:false},
+ 3:{uuid:1103,type:1,lv:0,cost:0,alive:false},
+ 4:{uuid:1104,type:1,lv:0,cost:0,alive:false},
+ 5:{uuid:1105,type:1,lv:0,cost:0,alive:false},
+ 6:{uuid:1106,type:1,lv:0,cost:0,alive:false},
}
protected onLoad(): void {
let card1 = this.node.getChildByName("cards").getChildByName("card1");
@@ -146,27 +146,18 @@ export class CardControllerComp extends CCComp {
// console.log("show_info",uuid)
let node =this.node.getChildByName("item_box")
if(type == 2){
- smc.vm_data.item_box.info = SkillSet[uuid].info
- smc.vm_data.item_box.name = SkillSet[uuid].name
- smc.vm_data.item_box.skillcd = SkillSet[uuid].cd
- smc.vm_data.item_box.skillsd = SkillSet[uuid].sd
- smc.vm_data.item_box.atk = SkillSet[uuid].atk
- smc.vm_data.item_box.hp = SkillSet[uuid].hp
+ smc.vm_data.item_box.info = smc.items[uuid].info
+ smc.vm_data.item_box.name = smc.items[uuid].name
+ smc.vm_data.item_box.skillcd = smc.items[uuid].cd
+ smc.vm_data.item_box.skillsd = smc.items[uuid].sd
+ smc.vm_data.item_box.atk = smc.items[uuid].atk
+ smc.vm_data.item_box.hp = smc.items[uuid].hp
+ smc.vm_data.item_box.shield = smc.items[uuid].shield
node.active=true
- }
- if(type == 3){
- smc.vm_data.item_box.info = SkillSet[uuid].info
- smc.vm_data.item_box.name = SkillSet[uuid].name
- smc.vm_data.item_box.skillcd = SkillSet[uuid].cd
- smc.vm_data.item_box.skillsd = SkillSet[uuid].sd
- smc.vm_data.item_box.atk = SkillSet[uuid].atk
- smc.vm_data.item_box.hp = SkillSet[uuid].hp
- smc.vm_data.item_box.shield = SkillSet[uuid].shield
- node.active=true
- if(SkillSet[uuid].shield > 0){
+ if(smc.items[uuid].shield > 0){
node.getChildByName("data").getChildByName("shield").active=true
}
- if(SkillSet[uuid].hp > 0){
+ if(smc.items[uuid].hp > 0){
node.getChildByName("data").getChildByName("hp").active=true
}
}
@@ -231,8 +222,9 @@ export class CardControllerComp extends CCComp {
load_cards() {
this.in_load = true
+
let card:any=null
- for (let index = 1; index <= 4; index++) {
+ for (let index = 1; index <= 6; index++) {
card=RandomManager.instance.getRandomByObjectList(smc.cards, 1);
this.cards[index].uuid=card[0].uuid
this.cards[index].type=card[0].type
@@ -241,35 +233,15 @@ export class CardControllerComp extends CCComp {
let pathName: string = "";
let name: string = "";
let level: number = 0;
+ let cost: number = 0;
let { uuid, type } = card[0];
url = "game/hero/hero_icon";
- ({ uuid: pathName, name, level } = smc.heros[uuid]);
+ ({ uuid: pathName, name, level ,cost} = smc.heros[uuid]);
this.cards[index].lv=level
+ this.cards[index].cost = cost
let node=this.node.getChildByName('cards').getChildByName('card'+index)
- node.getChildByName('cost').getComponent(Label).string=level.toString()
- node.getChildByName('name').getComponent(Label).string=name
- // const sprite = node.getChildByName("item").getComponent(Sprite);
- // console.log(this['card'+index],url,pathName,sprite)
- resources.load(url, SpriteAtlas, (err: any, atlas) => {
- const sprite = node.getChildByName("item").getComponent(Sprite);
- sprite.spriteFrame = atlas.getSpriteFrame(pathName);
- });
- this.cards[index].alive=true
- }
- for (let index = 5; index <= 6; index++) {
- card=RandomManager.instance.getRandomByObjectList(smc.items, 1);
- this.cards[index].uuid=card[0].uuid
- this.cards[index].type=card[0].type
- let url: string = "";
- let pathName: string = "";
- let name: string = "";
- let level: number = 0;
- let { uuid, type } = card[0];
- url = "game/heros/skill";
- ({ path: pathName, name, level } = smc.skills[uuid]);
- this.cards[index].lv=level
- let node=this.node.getChildByName('cards').getChildByName('card'+index)
- node.getChildByName('cost').getComponent(Label).string=level.toString()
+ node.getChildByName('cost').getComponent(Label).string=cost.toString()
+ node.getChildByName('lv').getChildByName('lv').getComponent(Label).string=level.toString()
node.getChildByName('name').getComponent(Label).string=name
// const sprite = node.getChildByName("item").getComponent(Sprite);
// console.log(this['card'+index],url,pathName,sprite)
@@ -279,6 +251,29 @@ export class CardControllerComp extends CCComp {
});
this.cards[index].alive=true
}
+ // for (let index = 5; index <= 6; index++) {
+ // card=RandomManager.instance.getRandomByObjectList(smc.item_list, 1);
+ // this.cards[index].uuid=card[0].uuid
+ // this.cards[index].type=card[0].type
+ // let url: string = "";
+ // let pathName: string = "";
+ // let name: string = "";
+ // let level: number = 0;
+ // let { uuid, type } = card[0];
+ // url = "game/heros/skill";
+ // ({ path: pathName, name, level } = smc.items[uuid]);
+ // this.cards[index].lv=level
+ // let node=this.node.getChildByName('cards').getChildByName('card'+index)
+ // node.getChildByName('cost').getComponent(Label).string=level.toString()
+ // node.getChildByName('name').getComponent(Label).string=name
+ // // const sprite = node.getChildByName("item").getComponent(Sprite);
+ // // console.log(this['card'+index],url,pathName,sprite)
+ // resources.load(url, SpriteAtlas, (err: any, atlas) => {
+ // const sprite = node.getChildByName("item").getComponent(Sprite);
+ // sprite.spriteFrame = atlas.getSpriteFrame(pathName);
+ // });
+ // this.cards[index].alive=true
+ // }
// console.log("cards:",this.cards)
this.in_load = false
}
@@ -317,7 +312,7 @@ export class CardControllerComp extends CCComp {
// console.log("card_index:",index,"card_alive:",this.cards[index].alive)
return;
};
- if(smc.vm_data.gold.min >= this.cards[index].lv){
+ if(smc.vm_data.gold.min >= this.cards[index].cost){
this.cards[index].alive=false
this.do_use_card(index)
}else{
@@ -327,18 +322,19 @@ export class CardControllerComp extends CCComp {
}
do_use_card(index:number){
this.cards[index].alive=false
- smc.vm_data.gold.min -= this.cards[index].lv;
- switch (this.cards[index].type) {
- case 1:
- oops.message.dispatchEvent("do_add_hero", { uuid: this.cards[index].uuid });
- break;
- case 2:
- oops.message.dispatchEvent("do_use_skill", { uuid: this.cards[index].uuid });
- break;
- case 3:
- oops.message.dispatchEvent("do_use_skill", { uuid: this.cards[index].uuid });
- break;
- }
+ smc.vm_data.gold.min -= this.cards[index].cost;
+ oops.message.dispatchEvent("do_add_hero", { uuid: this.cards[index].uuid });
+ // switch (this.cards[index].type) {
+ // case 1:
+ // oops.message.dispatchEvent("do_add_hero", { uuid: this.cards[index].uuid });
+ // break;
+ // case 2:
+ // oops.message.dispatchEvent("do_use_item", { uuid: this.cards[index].uuid });
+ // break;
+ // case 3:
+ // oops.message.dispatchEvent("do_use_item", { uuid: this.cards[index].uuid });
+ // break;
+ // }
this.remove_card(index)
}
protected update(dt: number): void {
diff --git a/assets/script/game/map/MapMonsterComp.ts b/assets/script/game/map/MapMonsterComp.ts
index f8cf13b9..96282483 100644
--- a/assets/script/game/map/MapMonsterComp.ts
+++ b/assets/script/game/map/MapMonsterComp.ts
@@ -36,7 +36,9 @@ export class MapMonsterComp extends CCComp {
target_timer: Timer = new Timer(0.1);
setp_num:number = 5;
game_over:boolean = false;
- start_ys:any[] = [100,50,0,-50,-100];
+ start_ys:any[] = [70,0,-70];
+ hero_start_ys:any[] = [35,-35];
+
onLoad(){
// 监听全局事件
oops.message.on("other_add_monster", this.on_other_add_monster, this);
@@ -95,11 +97,26 @@ export class MapMonsterComp extends CCComp {
private addHero(uuid:number=1001) {
let hero = ecs.getEntity(Hero);
var scene = smc.map.MapView.scene;
- let oy=RandomManager.instance.getRandomByObjectList(this.start_ys,1)
- let pos:Vec3 = v3(BoxSet.HERO_START,BoxSet.GAME_LINE+oy[0]);
+ let oy=RandomManager.instance.getRandomInt(-70,70,1)
+ let pos = v3(0,0);
+ let less=0
+ let index =0
+ for(let i=0; i <= 11;i++){
+ if(smc.role_heros[i].eid==0){
+ pos=v3(smc.role_heros[i].x,smc.role_heros[i].y)
+ less += 1
+ index = i
+ smc.role_heros[i].eid=hero.eid
+ break
+ }
+ }
+ if(less <= 0){
+ oops.gui.toast("人数已满");
+ return false
+ }
let monster_layer = scene.entityLayer!.node!
let scale = 1
- hero.load(pos,scale,uuid,monster_layer);
+ hero.load(pos,scale,uuid,monster_layer,index);
}
monster_refresh(){
if (this.setp_num <= 0){
@@ -107,8 +124,8 @@ export class MapMonsterComp extends CCComp {
}
let m:any = RandomManager.instance.getRandomByObjectList(this.mission_list[this.monster_level],1)
var scene = smc.map.MapView.scene;
- let oy=RandomManager.instance.getRandomByObjectList(this.start_ys,1)
- let pos:Vec3 = v3(BoxSet.MONSTER_START,BoxSet.GAME_LINE+oy[0])
+ let oy=RandomManager.instance.getRandomInt(-70,70,1)
+ let pos:Vec3 = v3(BoxSet.MONSTER_START,BoxSet.GAME_LINE+oy)
let monster_layer = scene.entityLayer!.node!
this.addMonster(m[0],monster_layer,pos)
this.setp_num -= 1
diff --git a/assets/script/game/map/MapSkillComp.ts b/assets/script/game/map/MapSkillComp.ts
index e80777b0..c3064068 100644
--- a/assets/script/game/map/MapSkillComp.ts
+++ b/assets/script/game/map/MapSkillComp.ts
@@ -4,7 +4,7 @@ import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/modu
import { oops } from "../../../../extensions/oops-plugin-framework/assets/core/Oops";
import { BoxSet } from "../common/config/BoxSet";
import { MapViewScene } from "./view/MapViewScene";
-import { CSkill } from "../skills/CSkill";
+import { smc } from "../common/SingletonModuleComp";
const { ccclass, property } = _decorator;
/** 视图层对象 */
@@ -18,6 +18,7 @@ export class MapSkillComp extends CCComp {
oops.message.on("monster_load", this.doMonsterLoad, this);
oops.message.on("hero_load", this.doHeroLoad, this);
oops.message.on("do_use_skill", this.doSkill, this);
+ oops.message.on("do_use_item", this.useItem, this);
}
doSkill(event: string, args: any){
this.addCSkill(args.uuid);
@@ -26,14 +27,7 @@ export class MapSkillComp extends CCComp {
}
addCSkill(uuid:number=1001,args:any=null){
- let csk =ecs.getEntity(CSkill);
- let scale = 1
- let pos = v3(BoxSet.CSKILL_X*-scale,BoxSet.CSKILL_Y)
- if(args){
- pos = v3(args.x,args.y)
- scale = args.scale
- }
- csk.load(pos,scale,uuid);
+
}
doMonsterLoad(){
const light = instantiate(this.light);
@@ -45,6 +39,18 @@ export class MapSkillComp extends CCComp {
light.setPosition(BoxSet.HERO_START,BoxSet.GAME_LINE,0);
this.node.addChild(light);
}
+ useItem(event: string, args: any){
+ console.log("useItem");
+ if(smc.items[args.uuid].hp > 0){ //buff加血
+ smc.Role.RoleView.add_hp(smc.items[args.uuid].hp)
+ }
+ if(smc.items[args.uuid].atk > 0){ //buff加攻击
+ smc.Role.RoleView.add_atk(smc.items[args.uuid].atk,smc.items[args.uuid].sd)
+ }
+ if(smc.items[args.uuid].shield > 0){ //buff护盾
+ smc.Role.RoleView.add_shield(smc.items[args.uuid].shield,smc.items[args.uuid].sd)
+ }
+ }
/** 视图层逻辑代码分离演示 */
start() {
// var entity = this.ent as ecs.Entity; // ecs.Entity 可转为当前模块的具体实体对象
diff --git a/assets/script/game/map/view/MapViewComp.ts b/assets/script/game/map/view/MapViewComp.ts
index 4d869836..33507d5c 100644
--- a/assets/script/game/map/view/MapViewComp.ts
+++ b/assets/script/game/map/view/MapViewComp.ts
@@ -42,7 +42,7 @@ export class MapViewComp extends CCComp {
// smc.vm_data.game.g_time += 1;
// }
// this.shuaxin(dt)
- this.gold_add(dt)
+ // this.gold_add(dt)
}
// 刷新怪物
diff --git a/assets/script/game/mon/BoxRangComp.ts b/assets/script/game/mon/BoxRangComp.ts
index 218e38d2..55116525 100644
--- a/assets/script/game/mon/BoxRangComp.ts
+++ b/assets/script/game/mon/BoxRangComp.ts
@@ -26,10 +26,10 @@ export class BoxRangComp extends CCComp {
this.MonViewComp=this.Hero_node.getComponent(MonViewComp);
// console.log("range box",this.MonViewComp);
if (collider) {
- collider.on(Contact2DType.BEGIN_CONTACT, this.onBeginContact, this);
+ // collider.on(Contact2DType.BEGIN_CONTACT, this.onBeginContact, this);
collider.on(Contact2DType.END_CONTACT, this.onEndContact, this);
collider.on(Contact2DType.PRE_SOLVE, this.onPreSolve, this);
- collider.on(Contact2DType.POST_SOLVE, this.onPostSolve, this);
+ // collider.on(Contact2DType.POST_SOLVE, this.onPostSolve, this);
}
}
onBeginContact (selfCollider: Collider2D, otherCollider: Collider2D, contact: IPhysics2DContact | null) {
@@ -59,7 +59,6 @@ export class BoxRangComp extends CCComp {
// console.log("onPreSolve b:"+selfCollider.node.parent.getSiblingIndex()+"/"+otherCollider.node.parent.getSiblingIndex());
// }
if(selfCollider.group != otherCollider.group&&otherCollider.tag == 0){
- let scene =smc.map.MapView.scene.mapLayer!.node!
let other_pos = otherCollider.node.getWorldPosition() ;
let self_pos = this.node.getWorldPosition();
// console.log("onPreSolve:",self_pos,other_pos);
diff --git a/assets/script/game/mon/MonViewComp.ts b/assets/script/game/mon/MonViewComp.ts
index 3ebb79ab..d1d5ff63 100644
--- a/assets/script/game/mon/MonViewComp.ts
+++ b/assets/script/game/mon/MonViewComp.ts
@@ -58,7 +58,7 @@ export class MonViewComp extends CCComp {
skill_name: string = "base"; //技能名称
max_skill_name: string = "base"; //大技能名称
skill_uuid:number = 9001;
- max_skill_uuid:number = 1001;
+ max_skill_uuid:number = 0;
atk: number = 10; /**攻击力 */
// atk_speed: number = 1;
atk_cd: number = 1.3; /**攻击速度 攻击间隔 */
@@ -114,9 +114,9 @@ export class MonViewComp extends CCComp {
collider.group = this.box_group;
if (collider) {
collider.on(Contact2DType.BEGIN_CONTACT, this.onBeginContact, this);
- collider.on(Contact2DType.END_CONTACT, this.onEndContact, this);
+ // collider.on(Contact2DType.END_CONTACT, this.onEndContact, this);
collider.on(Contact2DType.PRE_SOLVE, this.onPreSolve, this);
- collider.on(Contact2DType.POST_SOLVE, this.onPostSolve, this);
+ // collider.on(Contact2DType.POST_SOLVE, this.onPostSolve, this);
}
// this.node.getChildByName("level").getChildByName("level").getComponent(Label).string = this.level.toString();
@@ -149,7 +149,7 @@ export class MonViewComp extends CCComp {
}
}
onPostSolve (selfCollider: Collider2D, otherCollider: Collider2D) {
-
+
}
@@ -162,12 +162,19 @@ export class MonViewComp extends CCComp {
this.in_shield(dt);
this.in_stop(dt);
this.in_atk(dt);
+ this.hp_show()
this.move(dt);
// if(this.m_timer.update(dt)){
// this.move_to()
// }
}
-
+ hp_show(){
+ if(this.hp == this.hp_max){
+ this.node.getChildByName("top").getChildByName("hp").active = false;
+ } else{
+ this.node.getChildByName("top").getChildByName("hp").active = true;
+ }
+ }
move(dt: number){
if(this.stop_cd > 0){
return
@@ -188,6 +195,9 @@ export class MonViewComp extends CCComp {
move.speed = this.ospeed;
}
power_change(power: number){
+ if(this.max_skill_uuid == 0){
+ return
+ }
this.power += power;
if(this.power >= this.power_max&&this.check_enemy_alive()){
this.as.atk()
@@ -212,9 +222,7 @@ export class MonViewComp extends CCComp {
}
//使用max_skill
do_max_skill(){
- for(let i=0;i