From 4058bad9dff178f9c2bd98b6229bb71912c27390 Mon Sep 17 00:00:00 2001 From: Vladislav Date: Fri, 16 Dec 2022 16:32:30 +0400 Subject: [PATCH] Different Art and Animation --- .../Media/Animation/Game/Drops/DropStart.anim | 189 ++++++++++++++++ .../Animation/Game/Drops/DropStart.anim.meta | 13 ++ assets/Media/Animation/Game/Drops/XP.anim | 58 ++++- assets/Media/Animation/Game/Player/Idle.anim | 68 ++++++ .../Animation/Game/Player/Idle.anim.meta | 13 ++ assets/Media/Animation/Game/Player/Move.anim | 88 ++++++++ .../Animation/Game/Player/Move.anim.meta | 13 ++ .../Animation/Game/Weapon/WeaponSwing.anim | 18 +- .../Game/Player/PlWarriorMove00.png.meta | 73 +++--- .../Game/Player/PlWarriorMove01.png.meta | 72 +++--- .../Game/Player/PlWarriorMove02.png.meta | 70 +++--- .../Game/Player/PlWarriorMove03.png.meta | 72 +++--- .../Media/Images/Game/UI/HealthBarBg.png.meta | 106 ++++++++- .../Images/Game/UI/HealthBarFill.png.meta | 106 ++++++++- assets/Media/Images/Game/Weapons/ShotDiag.png | Bin 262 -> 189 bytes .../Images/Game/Weapons/ShotDiag.png.meta | 40 ++-- assets/Media/Images/Game/Weapons/ShotHalo.png | Bin 111 -> 193 bytes .../Images/Game/Weapons/ShotHalo.png.meta | 30 +-- .../Media/Images/Game/Weapons/ShotHoriz.png | Bin 305 -> 278 bytes .../Game/Weapons/SwordTrace/RoundTrace.png | Bin 0 -> 6353 bytes .../Weapons/SwordTrace/RoundTrace.png.meta | 134 +++++++++++ .../Weapons/SwordTrace/WpnTrace01.png.meta | 2 +- assets/Media/Prefabs/Game/Drops/Chest.prefab | 210 +++++++++++++++-- assets/Media/Prefabs/Game/Drops/Gold.prefab | 206 +++++++++++++++-- assets/Media/Prefabs/Game/Drops/Health.prefab | 212 ++++++++++++++++-- assets/Media/Prefabs/Game/Drops/Magnet.prefab | 173 ++++++++++++-- assets/Media/Prefabs/Game/Drops/XP.prefab | 212 ++++++++++++++++-- assets/Media/Prefabs/Game/Player.prefab | 89 +++++--- .../Projectiles/DiagonalProjectile.prefab | 4 +- 29 files changed, 1923 insertions(+), 348 deletions(-) create mode 100644 assets/Media/Animation/Game/Drops/DropStart.anim create mode 100644 assets/Media/Animation/Game/Drops/DropStart.anim.meta create mode 100644 assets/Media/Animation/Game/Player/Idle.anim create mode 100644 assets/Media/Animation/Game/Player/Idle.anim.meta create mode 100644 assets/Media/Animation/Game/Player/Move.anim create mode 100644 assets/Media/Animation/Game/Player/Move.anim.meta create mode 100644 assets/Media/Images/Game/Weapons/SwordTrace/RoundTrace.png create mode 100644 assets/Media/Images/Game/Weapons/SwordTrace/RoundTrace.png.meta diff --git a/assets/Media/Animation/Game/Drops/DropStart.anim b/assets/Media/Animation/Game/Drops/DropStart.anim new file mode 100644 index 0000000..3419533 --- /dev/null +++ b/assets/Media/Animation/Game/Drops/DropStart.anim @@ -0,0 +1,189 @@ +[ + { + "__type__": "cc.AnimationClip", + "_name": "DropStart", + "_objFlags": 0, + "__editorExtras__": { + "embeddedPlayerGroups": [] + }, + "_native": "", + "sample": 60, + "speed": 1, + "wrapMode": 1, + "enableTrsBlending": false, + "_duration": 0.55, + "_hash": 500763545, + "_tracks": [ + { + "__id__": 1 + } + ], + "_exoticAnimation": null, + "_events": [], + "_embeddedPlayers": [] + }, + { + "__type__": "cc.animation.VectorTrack", + "_binding": { + "__type__": "cc.animation.TrackBinding", + "path": { + "__id__": 2 + } + }, + "_channels": [ + { + "__id__": 4 + }, + { + "__id__": 6 + }, + { + "__id__": 8 + }, + { + "__id__": 10 + } + ], + "_nComponents": 3 + }, + { + "__type__": "cc.animation.TrackPath", + "_paths": [ + { + "__id__": 3 + }, + "position" + ] + }, + { + "__type__": "cc.animation.HierarchyPath", + "path": "Sprite" + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 5 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [], + "_values": [], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 7 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [ + 0, + 0.1666666716337204, + 0.3333333432674408, + 0.44999998807907104, + 0.550000011920929 + ], + "_values": [ + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 2, + "tangentWeightMode": 2, + "value": 4, + "rightTangent": 24, + "rightTangentWeight": 0.240208238363266, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 2, + "tangentWeightMode": 3, + "value": 6, + "rightTangent": -5.236363410949707, + "rightTangentWeight": 0.488674521446228, + "leftTangent": 0, + "leftTangentWeight": 0.07000000029802322, + "easingMethod": 0, + "__editorExtras__": null + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 2, + "tangentWeightMode": 1, + "value": 0, + "rightTangent": 19.084871292114258, + "rightTangentWeight": 1, + "leftTangent": -137.69654846191406, + "leftTangentWeight": 3.1135990619659424, + "easingMethod": 0, + "__editorExtras__": { + "broken": true + } + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 2, + "tangentWeightMode": 2, + "value": 1, + "rightTangent": -0.561619758605957, + "rightTangentWeight": 0.06742104142904282, + "leftTangent": 0.1428571492433548, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "broken": true + } + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 2, + "tangentWeightMode": 1, + "value": 0, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": -24.661108016967773, + "leftTangentWeight": 0.6264635920524597, + "easingMethod": 0, + "__editorExtras__": { + "broken": true + } + } + ], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 9 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [], + "_values": [], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 11 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [], + "_values": [], + "preExtrapolation": 1, + "postExtrapolation": 1 + } +] \ No newline at end of file diff --git a/assets/Media/Animation/Game/Drops/DropStart.anim.meta b/assets/Media/Animation/Game/Drops/DropStart.anim.meta new file mode 100644 index 0000000..f25a1ce --- /dev/null +++ b/assets/Media/Animation/Game/Drops/DropStart.anim.meta @@ -0,0 +1,13 @@ +{ + "ver": "2.0.3", + "importer": "animation-clip", + "imported": true, + "uuid": "93ff1109-5561-4797-a02c-50baf13c7507", + "files": [ + ".cconb" + ], + "subMetas": {}, + "userData": { + "name": "DropStart" + } +} diff --git a/assets/Media/Animation/Game/Drops/XP.anim b/assets/Media/Animation/Game/Drops/XP.anim index 6ef4860..50d0fa8 100644 --- a/assets/Media/Animation/Game/Drops/XP.anim +++ b/assets/Media/Animation/Game/Drops/XP.anim @@ -11,7 +11,7 @@ "speed": 1, "wrapMode": 2, "enableTrsBlending": false, - "_duration": 0, + "_duration": 2.0166666666666666, "_hash": 500763545, "_tracks": [ { @@ -55,7 +55,59 @@ }, { "__type__": "cc.ObjectCurve", - "_times": [], - "_values": [] + "_times": [ + 0, + 0.16666666666666666, + 0.3333333333333333, + 0.5, + 0.6666666666666666, + 0.8333333333333334, + 1, + 1.1666666666666667, + 1.3333333333333333, + 2 + ], + "_values": [ + { + "__uuid__": "7c2d6332-ec79-4c3a-956b-c6813fc002b1@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "77e1fca8-5319-44a9-a85e-f11899bc8b14@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "51a381da-a298-4e98-8232-874dd6e3629b@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "053f91cb-ca9b-4ac7-99e8-d91c896988ed@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "66fa7cbf-8d87-478e-814b-2b0c3b581c8b@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "d9e6d9f0-2600-4f99-b621-4c4bec5161f6@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "d69d4a23-1b6d-4d14-aaa1-0e9c5bab1db6@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "46d39d9a-415f-43d3-b88b-aa148218d438@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "7c2d6332-ec79-4c3a-956b-c6813fc002b1@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "7c2d6332-ec79-4c3a-956b-c6813fc002b1@f9941", + "__expectedType__": "cc.SpriteFrame" + } + ] } ] \ No newline at end of file diff --git a/assets/Media/Animation/Game/Player/Idle.anim b/assets/Media/Animation/Game/Player/Idle.anim new file mode 100644 index 0000000..20efae4 --- /dev/null +++ b/assets/Media/Animation/Game/Player/Idle.anim @@ -0,0 +1,68 @@ +[ + { + "__type__": "cc.AnimationClip", + "_name": "Idle", + "_objFlags": 0, + "__editorExtras__": { + "embeddedPlayerGroups": [] + }, + "_native": "", + "sample": 60, + "speed": 1, + "wrapMode": 2, + "enableTrsBlending": false, + "_duration": 0.016666666666666666, + "_hash": 500763545, + "_tracks": [ + { + "__id__": 1 + } + ], + "_exoticAnimation": null, + "_events": [], + "_embeddedPlayers": [] + }, + { + "__type__": "cc.animation.ObjectTrack", + "_binding": { + "__type__": "cc.animation.TrackBinding", + "path": { + "__id__": 2 + } + }, + "_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 + ], + "_values": [ + { + "__uuid__": "3d470257-0eba-4a39-8504-5420e4e28ca8@f9941", + "__expectedType__": "cc.SpriteFrame" + } + ] + } +] \ No newline at end of file diff --git a/assets/Media/Animation/Game/Player/Idle.anim.meta b/assets/Media/Animation/Game/Player/Idle.anim.meta new file mode 100644 index 0000000..86e7ae5 --- /dev/null +++ b/assets/Media/Animation/Game/Player/Idle.anim.meta @@ -0,0 +1,13 @@ +{ + "ver": "2.0.3", + "importer": "animation-clip", + "imported": true, + "uuid": "4cc17fff-7876-4922-b371-2fe1cec77c14", + "files": [ + ".cconb" + ], + "subMetas": {}, + "userData": { + "name": "Idle" + } +} diff --git a/assets/Media/Animation/Game/Player/Move.anim b/assets/Media/Animation/Game/Player/Move.anim new file mode 100644 index 0000000..a0441b8 --- /dev/null +++ b/assets/Media/Animation/Game/Player/Move.anim @@ -0,0 +1,88 @@ +[ + { + "__type__": "cc.AnimationClip", + "_name": "Move", + "_objFlags": 0, + "__editorExtras__": { + "embeddedPlayerGroups": [] + }, + "_native": "", + "sample": 60, + "speed": 1, + "wrapMode": 2, + "enableTrsBlending": false, + "_duration": 1, + "_hash": 500763545, + "_tracks": [ + { + "__id__": 1 + } + ], + "_exoticAnimation": null, + "_events": [], + "_embeddedPlayers": [] + }, + { + "__type__": "cc.animation.ObjectTrack", + "_binding": { + "__type__": "cc.animation.TrackBinding", + "path": { + "__id__": 2 + } + }, + "_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.25, + 0.5, + 0.75, + 0.9833333333333333 + ], + "_values": [ + { + "__uuid__": "3d470257-0eba-4a39-8504-5420e4e28ca8@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "a90012ec-a814-40d9-b762-783f28a178f9@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "95e93202-1072-40a8-ae22-3e5ee3678956@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "b30d5701-543f-4f35-a6f8-bc94f6af437f@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "b30d5701-543f-4f35-a6f8-bc94f6af437f@f9941", + "__expectedType__": "cc.SpriteFrame" + } + ] + } +] \ No newline at end of file diff --git a/assets/Media/Animation/Game/Player/Move.anim.meta b/assets/Media/Animation/Game/Player/Move.anim.meta new file mode 100644 index 0000000..cbc81cf --- /dev/null +++ b/assets/Media/Animation/Game/Player/Move.anim.meta @@ -0,0 +1,13 @@ +{ + "ver": "2.0.3", + "importer": "animation-clip", + "imported": true, + "uuid": "5bf4b24f-2ebc-43ad-8f59-97e486d05c0c", + "files": [ + ".cconb" + ], + "subMetas": {}, + "userData": { + "name": "Move" + } +} diff --git a/assets/Media/Animation/Game/Weapon/WeaponSwing.anim b/assets/Media/Animation/Game/Weapon/WeaponSwing.anim index 2975402..3427965 100644 --- a/assets/Media/Animation/Game/Weapon/WeaponSwing.anim +++ b/assets/Media/Animation/Game/Weapon/WeaponSwing.anim @@ -62,9 +62,9 @@ "__type__": "cc.RealCurve", "_times": [ 0, - 0.4666666666666667, - 0.8666666666666667, - 1.3 + 0.46666666865348816, + 0.8666666746139526, + 1.2999999523162842 ], "_values": [ { @@ -125,9 +125,9 @@ "__type__": "cc.RealCurve", "_times": [ 0, - 0.4666666666666667, - 0.8666666666666667, - 1.3 + 0.46666666865348816, + 0.8666666746139526, + 1.2999999523162842 ], "_values": [ { @@ -188,9 +188,9 @@ "__type__": "cc.RealCurve", "_times": [ 0, - 0.4666666666666667, - 0.8666666666666667, - 1.3 + 0.46666666865348816, + 0.8666666746139526, + 1.2999999523162842 ], "_values": [ { diff --git a/assets/Media/Images/Game/Player/PlWarriorMove00.png.meta b/assets/Media/Images/Game/Player/PlWarriorMove00.png.meta index f143064..6bc8fc0 100644 --- a/assets/Media/Images/Game/Player/PlWarriorMove00.png.meta +++ b/assets/Media/Images/Game/Player/PlWarriorMove00.png.meta @@ -39,15 +39,15 @@ "id": "f9941", "name": "spriteFrame", "userData": { - "trimType": "auto", + "trimType": "none", "trimThreshold": 1, "rotated": false, - "offsetX": -1, - "offsetY": -0.5, - "trimX": 3, - "trimY": 5, - "width": 24, - "height": 31, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 32, + "height": 40, "rawWidth": 32, "rawHeight": 40, "borderTop": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -12, - -15.5, + -16, + -20, 0, - 12, - -15.5, + 16, + -20, 0, - -12, - 15.5, + -16, + 20, 0, - 12, - 15.5, + 16, + 20, 0 ], "indexes": [ @@ -83,33 +83,33 @@ 3 ], "uv": [ - 3, - 35, - 27, - 35, - 3, - 4, - 27, - 4 + 0, + 40, + 32, + 40, + 0, + 0, + 32, + 0 ], "nuv": [ - 0.09375, - 0.1, - 0.84375, - 0.1, - 0.09375, - 0.875, - 0.84375, - 0.875 + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 ], "minPos": [ - -12, - -15.5, + -16, + -20, 0 ], "maxPos": [ - 12, - 15.5, + 16, + 20, 0 ] }, @@ -129,6 +129,7 @@ "type": "sprite-frame", "fixAlphaTransparencyArtifacts": true, "hasAlpha": true, - "redirect": "3d470257-0eba-4a39-8504-5420e4e28ca8@f9941" + "redirect": "3d470257-0eba-4a39-8504-5420e4e28ca8@f9941", + "flipVertical": false } } diff --git a/assets/Media/Images/Game/Player/PlWarriorMove01.png.meta b/assets/Media/Images/Game/Player/PlWarriorMove01.png.meta index 89b497a..d9dcae6 100644 --- a/assets/Media/Images/Game/Player/PlWarriorMove01.png.meta +++ b/assets/Media/Images/Game/Player/PlWarriorMove01.png.meta @@ -39,15 +39,15 @@ "id": "f9941", "name": "spriteFrame", "userData": { - "trimType": "auto", + "trimType": "none", "trimThreshold": 1, "rotated": false, - "offsetX": -1.5, - "offsetY": -1, - "trimX": 3, - "trimY": 6, - "width": 23, - "height": 30, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 32, + "height": 40, "rawWidth": 32, "rawHeight": 40, "borderTop": 0, @@ -55,23 +55,23 @@ "borderLeft": 0, "borderRight": 0, "packable": true, - "pixelsToUnit": 100, + "pixelsToUnit": 50, "pivotX": 0.5, "pivotY": 0.5, "meshType": 0, "vertices": { "rawPosition": [ - -11.5, - -15, + -16, + -20, 0, - 11.5, - -15, + 16, + -20, 0, - -11.5, - 15, + -16, + 20, 0, - 11.5, - 15, + 16, + 20, 0 ], "indexes": [ @@ -83,33 +83,33 @@ 3 ], "uv": [ - 3, - 34, - 26, - 34, - 3, - 4, - 26, - 4 + 0, + 40, + 32, + 40, + 0, + 0, + 32, + 0 ], "nuv": [ - 0.09375, - 0.1, - 0.8125, - 0.1, - 0.09375, - 0.85, - 0.8125, - 0.85 + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 ], "minPos": [ - -11.5, - -15, + -16, + -20, 0 ], "maxPos": [ - 11.5, - 15, + 16, + 20, 0 ] }, diff --git a/assets/Media/Images/Game/Player/PlWarriorMove02.png.meta b/assets/Media/Images/Game/Player/PlWarriorMove02.png.meta index 413c116..fe8ec7a 100644 --- a/assets/Media/Images/Game/Player/PlWarriorMove02.png.meta +++ b/assets/Media/Images/Game/Player/PlWarriorMove02.png.meta @@ -39,15 +39,15 @@ "id": "f9941", "name": "spriteFrame", "userData": { - "trimType": "auto", + "trimType": "none", "trimThreshold": 1, "rotated": false, - "offsetX": -1.5, + "offsetX": 0, "offsetY": 0, - "trimX": 2, - "trimY": 5, - "width": 25, - "height": 30, + "trimX": 0, + "trimY": 0, + "width": 32, + "height": 40, "rawWidth": 32, "rawHeight": 40, "borderTop": 0, @@ -55,23 +55,23 @@ "borderLeft": 0, "borderRight": 0, "packable": true, - "pixelsToUnit": 100, + "pixelsToUnit": 50, "pivotX": 0.5, "pivotY": 0.5, "meshType": 0, "vertices": { "rawPosition": [ - -12.5, - -15, + -16, + -20, 0, - 12.5, - -15, + 16, + -20, 0, - -12.5, - 15, + -16, + 20, 0, - 12.5, - 15, + 16, + 20, 0 ], "indexes": [ @@ -83,33 +83,33 @@ 3 ], "uv": [ - 2, - 35, - 27, - 35, - 2, - 5, - 27, - 5 + 0, + 40, + 32, + 40, + 0, + 0, + 32, + 0 ], "nuv": [ - 0.0625, - 0.125, - 0.84375, - 0.125, - 0.0625, - 0.875, - 0.84375, - 0.875 + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 ], "minPos": [ - -12.5, - -15, + -16, + -20, 0 ], "maxPos": [ - 12.5, - 15, + 16, + 20, 0 ] }, diff --git a/assets/Media/Images/Game/Player/PlWarriorMove03.png.meta b/assets/Media/Images/Game/Player/PlWarriorMove03.png.meta index 7a95f0d..cd3b9b1 100644 --- a/assets/Media/Images/Game/Player/PlWarriorMove03.png.meta +++ b/assets/Media/Images/Game/Player/PlWarriorMove03.png.meta @@ -39,15 +39,15 @@ "id": "f9941", "name": "spriteFrame", "userData": { - "trimType": "auto", + "trimType": "none", "trimThreshold": 1, "rotated": false, - "offsetX": -0.5, - "offsetY": -1, - "trimX": 2, - "trimY": 6, - "width": 27, - "height": 30, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 32, + "height": 40, "rawWidth": 32, "rawHeight": 40, "borderTop": 0, @@ -55,23 +55,23 @@ "borderLeft": 0, "borderRight": 0, "packable": true, - "pixelsToUnit": 100, + "pixelsToUnit": 50, "pivotX": 0.5, "pivotY": 0.5, "meshType": 0, "vertices": { "rawPosition": [ - -13.5, - -15, + -16, + -20, 0, - 13.5, - -15, + 16, + -20, 0, - -13.5, - 15, + -16, + 20, 0, - 13.5, - 15, + 16, + 20, 0 ], "indexes": [ @@ -83,33 +83,33 @@ 3 ], "uv": [ - 2, - 34, - 29, - 34, - 2, - 4, - 29, - 4 + 0, + 40, + 32, + 40, + 0, + 0, + 32, + 0 ], "nuv": [ - 0.0625, - 0.1, - 0.90625, - 0.1, - 0.0625, - 0.85, - 0.90625, - 0.85 + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 ], "minPos": [ - -13.5, - -15, + -16, + -20, 0 ], "maxPos": [ - 13.5, - 15, + 16, + 20, 0 ] }, diff --git a/assets/Media/Images/Game/UI/HealthBarBg.png.meta b/assets/Media/Images/Game/UI/HealthBarBg.png.meta index 1d082b9..fa7e54a 100644 --- a/assets/Media/Images/Game/UI/HealthBarBg.png.meta +++ b/assets/Media/Images/Game/UI/HealthBarBg.png.meta @@ -15,15 +15,15 @@ "id": "6c48a", "name": "texture", "userData": { - "wrapModeS": "repeat", - "wrapModeT": "repeat", - "minfilter": "linear", - "magfilter": "linear", + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "minfilter": "nearest", + "magfilter": "nearest", "mipfilter": "none", "anisotropy": 0, "isUuid": true, "imageUuidOrDatabaseUri": "29bf4d7b-909b-472f-839a-bbb94136bab3", - "visible": true + "visible": false }, "ver": "1.0.22", "imported": true, @@ -31,12 +31,104 @@ ".json" ], "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "29bf4d7b-909b-472f-839a-bbb94136bab3@f9941", + "displayName": "HealthBarBg", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 5, + "height": 5, + "rawWidth": 5, + "rawHeight": 5, + "borderTop": 2, + "borderBottom": 2, + "borderLeft": 2, + "borderRight": 2, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -2.5, + -2.5, + 0, + 2.5, + -2.5, + 0, + -2.5, + 2.5, + 0, + 2.5, + 2.5, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 5, + 5, + 5, + 0, + 0, + 5, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -2.5, + -2.5, + 0 + ], + "maxPos": [ + 2.5, + 2.5, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "29bf4d7b-909b-472f-839a-bbb94136bab3@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.11", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} } }, "userData": { - "type": "texture", + "type": "sprite-frame", "fixAlphaTransparencyArtifacts": true, "hasAlpha": true, - "redirect": "29bf4d7b-909b-472f-839a-bbb94136bab3@6c48a" + "redirect": "29bf4d7b-909b-472f-839a-bbb94136bab3@f9941" } } diff --git a/assets/Media/Images/Game/UI/HealthBarFill.png.meta b/assets/Media/Images/Game/UI/HealthBarFill.png.meta index a86983e..36dbd16 100644 --- a/assets/Media/Images/Game/UI/HealthBarFill.png.meta +++ b/assets/Media/Images/Game/UI/HealthBarFill.png.meta @@ -15,15 +15,15 @@ "id": "6c48a", "name": "texture", "userData": { - "wrapModeS": "repeat", - "wrapModeT": "repeat", - "minfilter": "linear", - "magfilter": "linear", + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "minfilter": "nearest", + "magfilter": "nearest", "mipfilter": "none", "anisotropy": 0, "isUuid": true, "imageUuidOrDatabaseUri": "0ca53d61-de26-4d01-9770-eec0e3ac06ae", - "visible": true + "visible": false }, "ver": "1.0.22", "imported": true, @@ -31,12 +31,104 @@ ".json" ], "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "0ca53d61-de26-4d01-9770-eec0e3ac06ae@f9941", + "displayName": "HealthBarFill", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 3, + "height": 3, + "rawWidth": 3, + "rawHeight": 3, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -1.5, + -1.5, + 0, + 1.5, + -1.5, + 0, + -1.5, + 1.5, + 0, + 1.5, + 1.5, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 3, + 3, + 3, + 0, + 0, + 3, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -1.5, + -1.5, + 0 + ], + "maxPos": [ + 1.5, + 1.5, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "0ca53d61-de26-4d01-9770-eec0e3ac06ae@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.11", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} } }, "userData": { - "type": "texture", + "type": "sprite-frame", "fixAlphaTransparencyArtifacts": true, "hasAlpha": true, - "redirect": "0ca53d61-de26-4d01-9770-eec0e3ac06ae@6c48a" + "redirect": "0ca53d61-de26-4d01-9770-eec0e3ac06ae@f9941" } } diff --git a/assets/Media/Images/Game/Weapons/ShotDiag.png b/assets/Media/Images/Game/Weapons/ShotDiag.png index 7f3cc19db02a0bb4c825ff015a3e797730c58b37..5711cdf2fb6d9f45bcd7ec38daa2b291724682fe 100644 GIT binary patch literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^Qb5eX!3HFshrEviQZ1e?jv*QolT%*Q9AjYpFR8)m zmf zTW284|K~zC1>djy?ne_Af_RxTP;!VUyR!qssY*eGB?w0G7Z3p80}xMxa;HW^OaK4? M07*qoM6N<$f-5L$W&i*H diff --git a/assets/Media/Images/Game/Weapons/ShotDiag.png.meta b/assets/Media/Images/Game/Weapons/ShotDiag.png.meta index 9f0c63f..3c10507 100644 --- a/assets/Media/Images/Game/Weapons/ShotDiag.png.meta +++ b/assets/Media/Images/Game/Weapons/ShotDiag.png.meta @@ -46,10 +46,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 15, - "height": 15, - "rawWidth": 15, - "rawHeight": 15, + "width": 26, + "height": 8, + "rawWidth": 26, + "rawHeight": 8, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ - -7.5, - -7.5, + -13, + -4, 0, - 7.5, - -7.5, + 13, + -4, 0, - -7.5, - 7.5, + -13, + 4, 0, - 7.5, - 7.5, + 13, + 4, 0 ], "indexes": [ @@ -84,12 +84,12 @@ ], "uv": [ 0, - 15, - 15, - 15, + 8, + 26, + 8, 0, 0, - 15, + 26, 0 ], "nuv": [ @@ -103,13 +103,13 @@ 1 ], "minPos": [ - -7.5, - -7.5, + -13, + -4, 0 ], "maxPos": [ - 7.5, - 7.5, + 13, + 4, 0 ] }, diff --git a/assets/Media/Images/Game/Weapons/ShotHalo.png b/assets/Media/Images/Game/Weapons/ShotHalo.png index 4b0af47fa1d1e761334627e62941a90941bc5a4d..00d38784cca79d311664ae281326fb7e3a3ea8df 100644 GIT binary patch literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^JV4CB!3HGHK9Tzfq&hrZ9780gCja^W-<~-v;eDIV z!4m}q;w_AqHUuAKQTup5Hj3krR!vvHJ$>HmM|L>hlvpURFVdQ&MBb@0QxROf&c&j literal 111 zcmeAS@N?(olHy`uVBq!ia0vp^96-#%!3HEZpRM}e@1#5 zgNL>-iujJJZ(&ThBakfx`v|02R#OHn;CO8Usnlr%Efh+?7bPJI!o-uP4+(Jep zr}Y2c5k3r77G_{gXG&QZOl-9n&K$mmLAU&DMllR#88H^ZgLCfKiBk;6PB1VCpEqD& zV7S0=6dSFDY6wUVf{i^CE?vC9@c8-@M9{$`;{Kl`D(Lj|K@PzUU>1PDy{iWpNltYj zM}dMGo6A7}W;o0O7@Mr*jT{2#0NHRjU|?VX02&-(c)odaga7~l07*qoM6N<$f@bDt AZ~y=R delta 278 zcmV+x0qOph0_cMyW0hcFU^uvD2_r5!Tz~~x9NF-U z^fWN-p)HJ}b;s4W43Dor`G4=~0g^0ZLAC&7IJ&{e7J$HvnX?#VHDwqW7##k`{XdD* z;Qd;`VEXa(Ck!A*F}o)e{0CW36Ys{LBF2T)f;+Fj!!3aUet%Iuh8UUU3_)Q+3@pDc zW6(wYyBP%Jv=}%AxEbEO`qjV!vJqs!F?|D4LIMnqo(Jib^r$* zC`j}OSa|8;1$dC)3%W&&=5RJB=ulD}%tDx@Ab`!{tt+;GH527+WFKJz$d;l5QY~R% cU|;|MI!9*2HV+AK)&Kwi07*qoM6N<$f~U22^8f$< diff --git a/assets/Media/Images/Game/Weapons/SwordTrace/RoundTrace.png b/assets/Media/Images/Game/Weapons/SwordTrace/RoundTrace.png new file mode 100644 index 0000000000000000000000000000000000000000..30af2405844385d8de911f57fb94aa0c780db599 GIT binary patch literal 6353 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