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 7f3cc19..5711cdf 100644 Binary files a/assets/Media/Images/Game/Weapons/ShotDiag.png and b/assets/Media/Images/Game/Weapons/ShotDiag.png differ 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 4b0af47..00d3878 100644 Binary files a/assets/Media/Images/Game/Weapons/ShotHalo.png and b/assets/Media/Images/Game/Weapons/ShotHalo.png differ diff --git a/assets/Media/Images/Game/Weapons/ShotHalo.png.meta b/assets/Media/Images/Game/Weapons/ShotHalo.png.meta index d17f564..d606500 100644 --- a/assets/Media/Images/Game/Weapons/ShotHalo.png.meta +++ b/assets/Media/Images/Game/Weapons/ShotHalo.png.meta @@ -46,10 +46,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 8, - "height": 4, - "rawWidth": 8, - "rawHeight": 4, + "width": 12, + "height": 8, + "rawWidth": 12, + "rawHeight": 8, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, @@ -61,17 +61,17 @@ "meshType": 0, "vertices": { "rawPosition": [ + -6, -4, - -2, - 0, - 4, - -2, 0, + 6, -4, - 2, 0, + -6, + 4, + 0, + 6, 4, - 2, 0 ], "indexes": [ @@ -84,12 +84,12 @@ ], "uv": [ 0, - 4, 8, - 4, + 12, + 8, 0, 0, - 8, + 12, 0 ], "nuv": [ @@ -103,13 +103,13 @@ 1 ], "minPos": [ + -6, -4, - -2, 0 ], "maxPos": [ + 6, 4, - 2, 0 ] }, diff --git a/assets/Media/Images/Game/Weapons/ShotHoriz.png b/assets/Media/Images/Game/Weapons/ShotHoriz.png index da2dcf2..86a1e4f 100644 Binary files a/assets/Media/Images/Game/Weapons/ShotHoriz.png and b/assets/Media/Images/Game/Weapons/ShotHoriz.png differ 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 0000000..30af240 Binary files /dev/null and b/assets/Media/Images/Game/Weapons/SwordTrace/RoundTrace.png differ diff --git a/assets/Media/Images/Game/Weapons/SwordTrace/RoundTrace.png.meta b/assets/Media/Images/Game/Weapons/SwordTrace/RoundTrace.png.meta new file mode 100644 index 0000000..c0a8c0d --- /dev/null +++ b/assets/Media/Images/Game/Weapons/SwordTrace/RoundTrace.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.25", + "importer": "image", + "imported": true, + "uuid": "793f3737-55e5-4ce7-a1db-048ab33aa0a5", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "793f3737-55e5-4ce7-a1db-048ab33aa0a5@6c48a", + "displayName": "RoundTrace", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "clamp-to-edge", + "wrapModeT": "clamp-to-edge", + "minfilter": "nearest", + "magfilter": "nearest", + "mipfilter": "none", + "anisotropy": 0, + "isUuid": true, + "imageUuidOrDatabaseUri": "793f3737-55e5-4ce7-a1db-048ab33aa0a5", + "visible": false + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "793f3737-55e5-4ce7-a1db-048ab33aa0a5@f9941", + "displayName": "RoundTrace", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 160, + "height": 160, + "rawWidth": 160, + "rawHeight": 160, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -80, + -80, + 0, + 80, + -80, + 0, + -80, + 80, + 0, + 80, + 80, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 160, + 160, + 160, + 0, + 0, + 160, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -80, + -80, + 0 + ], + "maxPos": [ + 80, + 80, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "793f3737-55e5-4ce7-a1db-048ab33aa0a5@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.11", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "type": "sprite-frame", + "fixAlphaTransparencyArtifacts": true, + "hasAlpha": true, + "redirect": "793f3737-55e5-4ce7-a1db-048ab33aa0a5@f9941" + } +} diff --git a/assets/Media/Images/Game/Weapons/SwordTrace/WpnTrace01.png.meta b/assets/Media/Images/Game/Weapons/SwordTrace/WpnTrace01.png.meta index 93ec514..33929ac 100644 --- a/assets/Media/Images/Game/Weapons/SwordTrace/WpnTrace01.png.meta +++ b/assets/Media/Images/Game/Weapons/SwordTrace/WpnTrace01.png.meta @@ -39,7 +39,7 @@ "id": "f9941", "name": "spriteFrame", "userData": { - "trimType": "auto", + "trimType": "none", "trimThreshold": 1, "rotated": false, "offsetX": 0, diff --git a/assets/Media/Prefabs/Game/Drops/Chest.prefab b/assets/Media/Prefabs/Game/Drops/Chest.prefab index faab3e7..bfb1837 100644 --- a/assets/Media/Prefabs/Game/Drops/Chest.prefab +++ b/assets/Media/Prefabs/Game/Drops/Chest.prefab @@ -17,27 +17,31 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": null, - "_children": [], + "_children": [ + { + "__id__": 2 + } + ], "_active": true, "_components": [ - { - "__id__": 2 - }, - { - "__id__": 4 - }, - { - "__id__": 6 - }, - { - "__id__": 8 - }, { "__id__": 10 + }, + { + "__id__": 12 + }, + { + "__id__": 14 + }, + { + "__id__": 16 + }, + { + "__id__": 18 } ], "_prefab": { - "__id__": 12 + "__id__": 20 }, "_lpos": { "__type__": "cc.Vec3", @@ -67,6 +71,166 @@ }, "_id": "" }, + { + "__type__": "cc.Node", + "_name": "Sprite", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 3 + }, + { + "__id__": 5 + }, + { + "__id__": 7 + } + ], + "_prefab": { + "__id__": 9 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 4.5, + "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 + }, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 2 + }, + "_enabled": false, + "__prefab": { + "__id__": 4 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 25, + "height": 18 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "5exi3tZ2dE/prpBX5ouV3T" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "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__": "b287ba6b-8e3d-40db-9f96-f33dbd0c9884@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": "59E1dV9VVGgoLlBgtICQas" + }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 2 + }, + "_enabled": false, + "__prefab": { + "__id__": 8 + }, + "playOnLoad": false, + "_clips": [ + { + "__uuid__": "1c6f0a61-3b1e-41ad-ae72-cda59ee99ac4", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": { + "__uuid__": "1c6f0a61-3b1e-41ad-ae72-cda59ee99ac4", + "__expectedType__": "cc.AnimationClip" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "acTeuH0F5J4pBpz9g91X39" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "cbCjaTTjpLeZtTw/7Znq7Y" + }, { "__type__": "cc.UITransform", "_name": "", @@ -76,7 +240,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 3 + "__id__": 11 }, "_contentSize": { "__type__": "cc.Size", @@ -101,9 +265,9 @@ "node": { "__id__": 1 }, - "_enabled": true, + "_enabled": false, "__prefab": { - "__id__": 5 + "__id__": 13 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -147,7 +311,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 7 + "__id__": 15 }, "_id": "" }, @@ -162,19 +326,19 @@ "node": { "__id__": 1 }, - "_enabled": false, + "_enabled": true, "__prefab": { - "__id__": 9 + "__id__": 17 }, "playOnLoad": true, "_clips": [ { - "__uuid__": "1c6f0a61-3b1e-41ad-ae72-cda59ee99ac4", + "__uuid__": "93ff1109-5561-4797-a02c-50baf13c7507", "__expectedType__": "cc.AnimationClip" } ], "_defaultClip": { - "__uuid__": "1c6f0a61-3b1e-41ad-ae72-cda59ee99ac4", + "__uuid__": "93ff1109-5561-4797-a02c-50baf13c7507", "__expectedType__": "cc.AnimationClip" }, "_id": "" @@ -192,7 +356,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 11 + "__id__": 19 }, "tag": 0, "_group": 1, diff --git a/assets/Media/Prefabs/Game/Drops/Gold.prefab b/assets/Media/Prefabs/Game/Drops/Gold.prefab index 3981174..193d8e7 100644 --- a/assets/Media/Prefabs/Game/Drops/Gold.prefab +++ b/assets/Media/Prefabs/Game/Drops/Gold.prefab @@ -17,27 +17,82 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": null, + "_children": [ + { + "__id__": 2 + } + ], + "_active": true, + "_components": [ + { + "__id__": 10 + }, + { + "__id__": 12 + }, + { + "__id__": 14 + }, + { + "__id__": 16 + }, + { + "__id__": 18 + } + ], + "_prefab": { + "__id__": 20 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "Sprite", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, "_children": [], "_active": true, "_components": [ { - "__id__": 2 + "__id__": 3 }, { - "__id__": 4 + "__id__": 5 }, { - "__id__": 6 - }, - { - "__id__": 8 - }, - { - "__id__": 10 + "__id__": 7 } ], "_prefab": { - "__id__": 12 + "__id__": 9 }, "_lpos": { "__type__": "cc.Vec3", @@ -67,6 +122,115 @@ }, "_id": "" }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 4 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 9, + "height": 14 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "53nGERPRhPy6FM/FhqJb8c" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "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__": "3f1a9ccc-d48b-439e-abf8-453e8c364683@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": "85nyFNiUtAmYY28dprkCt6" + }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 8 + }, + "playOnLoad": true, + "_clips": [ + { + "__uuid__": "121c56f7-cf42-42e0-85b9-f861f021eddb", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": { + "__uuid__": "121c56f7-cf42-42e0-85b9-f861f021eddb", + "__expectedType__": "cc.AnimationClip" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "0cMoCv26VGp6YAV6MjqYHs" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "cfAFmtn5VBMJdPULHd2vC7" + }, { "__type__": "cc.UITransform", "_name": "", @@ -76,7 +240,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 3 + "__id__": 11 }, "_contentSize": { "__type__": "cc.Size", @@ -101,9 +265,9 @@ "node": { "__id__": 1 }, - "_enabled": true, + "_enabled": false, "__prefab": { - "__id__": 5 + "__id__": 13 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -147,7 +311,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 7 + "__id__": 15 }, "_id": "" }, @@ -164,17 +328,17 @@ }, "_enabled": true, "__prefab": { - "__id__": 9 + "__id__": 17 }, "playOnLoad": true, "_clips": [ { - "__uuid__": "121c56f7-cf42-42e0-85b9-f861f021eddb", + "__uuid__": "93ff1109-5561-4797-a02c-50baf13c7507", "__expectedType__": "cc.AnimationClip" } ], "_defaultClip": { - "__uuid__": "121c56f7-cf42-42e0-85b9-f861f021eddb", + "__uuid__": "93ff1109-5561-4797-a02c-50baf13c7507", "__expectedType__": "cc.AnimationClip" }, "_id": "" @@ -192,7 +356,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 11 + "__id__": 19 }, "tag": 0, "_group": 1, @@ -203,12 +367,12 @@ "_offset": { "__type__": "cc.Vec2", "x": 0, - "y": 0 + "y": 2.3 }, "_size": { "__type__": "cc.Size", - "width": 9, - "height": 14 + "width": 12, + "height": 12 }, "_id": "" }, diff --git a/assets/Media/Prefabs/Game/Drops/Health.prefab b/assets/Media/Prefabs/Game/Drops/Health.prefab index e18415c..46c54c0 100644 --- a/assets/Media/Prefabs/Game/Drops/Health.prefab +++ b/assets/Media/Prefabs/Game/Drops/Health.prefab @@ -17,27 +17,31 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": null, - "_children": [], + "_children": [ + { + "__id__": 2 + } + ], "_active": true, "_components": [ - { - "__id__": 2 - }, - { - "__id__": 4 - }, - { - "__id__": 6 - }, - { - "__id__": 8 - }, { "__id__": 10 + }, + { + "__id__": 12 + }, + { + "__id__": 14 + }, + { + "__id__": 16 + }, + { + "__id__": 18 } ], "_prefab": { - "__id__": 12 + "__id__": 20 }, "_lpos": { "__type__": "cc.Vec3", @@ -67,6 +71,166 @@ }, "_id": "" }, + { + "__type__": "cc.Node", + "_name": "Sprite", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 3 + }, + { + "__id__": 5 + }, + { + "__id__": 7 + } + ], + "_prefab": { + "__id__": 9 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 3.02, + "y": 4, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 2 + }, + "_enabled": false, + "__prefab": { + "__id__": 4 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 16, + "height": 32 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "8cPxHudgBM3bWXzmhUPlYx" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "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__": "b21a2890-2ba0-40a6-8abf-6012d59728ac@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": "08Jz5UtyxNyqonYXSmVL5i" + }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 8 + }, + "playOnLoad": true, + "_clips": [ + { + "__uuid__": "52aecc39-cde3-44e1-b8c8-58ed02809adb", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": { + "__uuid__": "52aecc39-cde3-44e1-b8c8-58ed02809adb", + "__expectedType__": "cc.AnimationClip" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "17Q1ZDcv5Oa6t4r9Qbm4Fh" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "b6QygGy6RPHaCKPdgv0cXF" + }, { "__type__": "cc.UITransform", "_name": "", @@ -76,7 +240,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 3 + "__id__": 11 }, "_contentSize": { "__type__": "cc.Size", @@ -101,9 +265,9 @@ "node": { "__id__": 1 }, - "_enabled": true, + "_enabled": false, "__prefab": { - "__id__": 5 + "__id__": 13 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -147,7 +311,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 7 + "__id__": 15 }, "tag": 0, "_group": 16, @@ -158,9 +322,9 @@ "_offset": { "__type__": "cc.Vec2", "x": 0, - "y": 0 + "y": -7.5 }, - "_radius": 6, + "_radius": 8, "_id": "" }, { @@ -176,7 +340,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 9 + "__id__": 17 }, "_id": "" }, @@ -193,17 +357,17 @@ }, "_enabled": true, "__prefab": { - "__id__": 11 + "__id__": 19 }, "playOnLoad": true, "_clips": [ { - "__uuid__": "52aecc39-cde3-44e1-b8c8-58ed02809adb", + "__uuid__": "93ff1109-5561-4797-a02c-50baf13c7507", "__expectedType__": "cc.AnimationClip" } ], "_defaultClip": { - "__uuid__": "52aecc39-cde3-44e1-b8c8-58ed02809adb", + "__uuid__": "93ff1109-5561-4797-a02c-50baf13c7507", "__expectedType__": "cc.AnimationClip" }, "_id": "" diff --git a/assets/Media/Prefabs/Game/Drops/Magnet.prefab b/assets/Media/Prefabs/Game/Drops/Magnet.prefab index 7259c49..d6a879f 100644 --- a/assets/Media/Prefabs/Game/Drops/Magnet.prefab +++ b/assets/Media/Prefabs/Game/Drops/Magnet.prefab @@ -17,27 +17,31 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": null, - "_children": [], - "_active": true, - "_components": [ + "_children": [ { "__id__": 2 - }, - { - "__id__": 4 - }, - { - "__id__": 6 - }, + } + ], + "_active": true, + "_components": [ { "__id__": 8 }, { "__id__": 10 + }, + { + "__id__": 12 + }, + { + "__id__": 14 + }, + { + "__id__": 16 } ], "_prefab": { - "__id__": 12 + "__id__": 18 }, "_lpos": { "__type__": "cc.Vec3", @@ -67,6 +71,135 @@ }, "_id": "" }, + { + "__type__": "cc.Node", + "_name": "Sprite", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 3 + }, + { + "__id__": 5 + } + ], + "_prefab": { + "__id__": 7 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 1.5, + "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 + }, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 4 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 15, + "height": 13 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "91CXDWVWFNqYfYmbLU5YrG" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "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__": "fa51c7dc-61c3-434c-bfa3-5ffc65ef9763@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": "5e8aB46yVGLKzMuV4vvx0N" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c8praR1PRJJ7chm9q1z+ta" + }, { "__type__": "cc.UITransform", "_name": "", @@ -76,7 +209,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 3 + "__id__": 9 }, "_contentSize": { "__type__": "cc.Size", @@ -101,9 +234,9 @@ "node": { "__id__": 1 }, - "_enabled": true, + "_enabled": false, "__prefab": { - "__id__": 5 + "__id__": 11 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -147,7 +280,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 7 + "__id__": 13 }, "tag": 0, "_group": 16, @@ -160,7 +293,7 @@ "x": 0, "y": 0 }, - "_radius": 6, + "_radius": 8, "_id": "" }, { @@ -176,7 +309,7 @@ }, "_enabled": false, "__prefab": { - "__id__": 9 + "__id__": 15 }, "_id": "" }, @@ -193,17 +326,17 @@ }, "_enabled": false, "__prefab": { - "__id__": 11 + "__id__": 17 }, "playOnLoad": true, "_clips": [ { - "__uuid__": "ec89d739-3120-45fc-842c-e1ddcb0c88be", + "__uuid__": "93ff1109-5561-4797-a02c-50baf13c7507", "__expectedType__": "cc.AnimationClip" } ], "_defaultClip": { - "__uuid__": "ec89d739-3120-45fc-842c-e1ddcb0c88be", + "__uuid__": "93ff1109-5561-4797-a02c-50baf13c7507", "__expectedType__": "cc.AnimationClip" }, "_id": "" diff --git a/assets/Media/Prefabs/Game/Drops/XP.prefab b/assets/Media/Prefabs/Game/Drops/XP.prefab index 5d04152..a7ad47f 100644 --- a/assets/Media/Prefabs/Game/Drops/XP.prefab +++ b/assets/Media/Prefabs/Game/Drops/XP.prefab @@ -17,27 +17,31 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": null, - "_children": [], + "_children": [ + { + "__id__": 2 + } + ], "_active": true, "_components": [ - { - "__id__": 2 - }, - { - "__id__": 4 - }, - { - "__id__": 6 - }, - { - "__id__": 8 - }, { "__id__": 10 + }, + { + "__id__": 12 + }, + { + "__id__": 14 + }, + { + "__id__": 16 + }, + { + "__id__": 18 } ], "_prefab": { - "__id__": 12 + "__id__": 20 }, "_lpos": { "__type__": "cc.Vec3", @@ -67,6 +71,166 @@ }, "_id": "" }, + { + "__type__": "cc.Node", + "_name": "Sprite", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 3 + }, + { + "__id__": 5 + }, + { + "__id__": 7 + } + ], + "_prefab": { + "__id__": 9 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 1.5, + "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 + }, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 4 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 15, + "height": 14 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a2WkR6mz1PC6auZhAyHlvH" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "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__": "77e1fca8-5319-44a9-a85e-f11899bc8b14@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": "43L7Gy8sxI36nLWnemQscM" + }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 8 + }, + "playOnLoad": true, + "_clips": [ + { + "__uuid__": "1bedbf28-a262-46be-85bb-33c2c169808d", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": { + "__uuid__": "1bedbf28-a262-46be-85bb-33c2c169808d", + "__expectedType__": "cc.AnimationClip" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "b2UEmJbZBJFL0K+kEm/VAI" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "f2CTDs6w1DILanW4527DPc" + }, { "__type__": "cc.UITransform", "_name": "", @@ -74,9 +238,9 @@ "node": { "__id__": 1 }, - "_enabled": true, + "_enabled": false, "__prefab": { - "__id__": 3 + "__id__": 11 }, "_contentSize": { "__type__": "cc.Size", @@ -101,9 +265,9 @@ "node": { "__id__": 1 }, - "_enabled": true, + "_enabled": false, "__prefab": { - "__id__": 5 + "__id__": 13 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -147,7 +311,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 7 + "__id__": 15 }, "tag": 0, "_group": 16, @@ -160,7 +324,7 @@ "x": 0, "y": 0 }, - "_radius": 6, + "_radius": 8, "_id": "" }, { @@ -176,7 +340,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 9 + "__id__": 17 }, "_id": "" }, @@ -193,17 +357,17 @@ }, "_enabled": true, "__prefab": { - "__id__": 11 + "__id__": 19 }, "playOnLoad": true, "_clips": [ { - "__uuid__": "1bedbf28-a262-46be-85bb-33c2c169808d", + "__uuid__": "93ff1109-5561-4797-a02c-50baf13c7507", "__expectedType__": "cc.AnimationClip" } ], "_defaultClip": { - "__uuid__": "1bedbf28-a262-46be-85bb-33c2c169808d", + "__uuid__": "93ff1109-5561-4797-a02c-50baf13c7507", "__expectedType__": "cc.AnimationClip" }, "_id": "" diff --git a/assets/Media/Prefabs/Game/Player.prefab b/assets/Media/Prefabs/Game/Player.prefab index f0b891f..7d7bc70 100644 --- a/assets/Media/Prefabs/Game/Player.prefab +++ b/assets/Media/Prefabs/Game/Player.prefab @@ -38,10 +38,13 @@ }, { "__id__": 98 + }, + { + "__id__": 100 } ], "_prefab": { - "__id__": 100 + "__id__": 102 }, "_lpos": { "__type__": "cc.Vec3", @@ -165,8 +168,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1, - "y": 1, + "x": 2, + "y": 2, "z": 1 }, "_layer": 33554432, @@ -239,8 +242,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 80, - "height": 16 + "width": 22, + "height": 5 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -269,16 +272,16 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 36, - "g": 36, - "b": 247, + "r": 255, + "g": 255, + "b": 255, "a": 255 }, "_spriteFrame": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__uuid__": "29bf4d7b-909b-472f-839a-bbb94136bab3@f9941", "__expectedType__": "cc.SpriteFrame" }, - "_type": 0, + "_type": 1, "_fillType": 0, "_sizeMode": 0, "_fillCenter": { @@ -381,7 +384,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": -40, + "x": -10, "y": 0, "z": 0 }, @@ -420,8 +423,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 80, - "height": 16 + "width": 20, + "height": 3 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -451,12 +454,12 @@ "_color": { "__type__": "cc.Color", "r": 255, - "g": 0, - "b": 0, + "g": 255, + "b": 255, "a": 255 }, "_spriteFrame": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__uuid__": "0ca53d61-de26-4d01-9770-eec0e3ac06ae@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -501,8 +504,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 80, - "height": 16 + "width": 20, + "height": 3 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -530,7 +533,7 @@ "__id__": 14 }, "_mode": 0, - "_totalLength": 80, + "_totalLength": 20, "_progress": 1, "_reverse": false, "_id": "" @@ -562,8 +565,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 80, - "height": 16 + "width": 22, + "height": 5 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -807,7 +810,7 @@ }, "_lpos": { "__type__": "cc.Vec3", - "x": 72, + "x": 70.758, "y": 0, "z": 0 }, @@ -1779,7 +1782,7 @@ "node": { "__id__": 33 }, - "_enabled": true, + "_enabled": false, "__prefab": { "__id__": 83 }, @@ -1920,8 +1923,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 40, - "height": 40 + "width": 64, + "height": 80 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1956,12 +1959,12 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__uuid__": "3d470257-0eba-4a39-8504-5420e4e28ca8@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -2028,8 +2031,8 @@ }, "_size": { "__type__": "cc.Size", - "width": 40, - "height": 40 + "width": 48.4, + "height": 61.2 }, "_id": "" }, @@ -2037,6 +2040,34 @@ "__type__": "cc.CompPrefabInfo", "fileId": "18oFw6jPBL34mmf4jgmCVT" }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 101 + }, + "playOnLoad": true, + "_clips": [ + { + "__uuid__": "5bf4b24f-2ebc-43ad-8f59-97e486d05c0c", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": { + "__uuid__": "5bf4b24f-2ebc-43ad-8f59-97e486d05c0c", + "__expectedType__": "cc.AnimationClip" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "af5Lk5McBBlYevBMB11or5" + }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/Media/Prefabs/Game/Projectiles/DiagonalProjectile.prefab b/assets/Media/Prefabs/Game/Projectiles/DiagonalProjectile.prefab index 66e11ed..183e4d5 100644 --- a/assets/Media/Prefabs/Game/Projectiles/DiagonalProjectile.prefab +++ b/assets/Media/Prefabs/Game/Projectiles/DiagonalProjectile.prefab @@ -77,8 +77,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 15, - "height": 15 + "width": 26, + "height": 8 }, "_anchorPoint": { "__type__": "cc.Vec2",