diff --git a/.DS_Store b/.DS_Store index da03c59..e23d626 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/assets/.DS_Store b/assets/.DS_Store index b693bfc..8a41efd 100644 Binary files a/assets/.DS_Store and b/assets/.DS_Store differ diff --git a/assets/bundle1/.DS_Store b/assets/bundle1/.DS_Store index 4acf187..5c9788e 100644 Binary files a/assets/bundle1/.DS_Store and b/assets/bundle1/.DS_Store differ diff --git a/assets/bundle1/anim/.DS_Store b/assets/bundle1/anim/.DS_Store index 120ea75..20fe0ea 100644 Binary files a/assets/bundle1/anim/.DS_Store and b/assets/bundle1/anim/.DS_Store differ diff --git a/assets/bundle1/anim/player/.DS_Store b/assets/bundle1/anim/player/.DS_Store index 432cef2..9c18255 100644 Binary files a/assets/bundle1/anim/player/.DS_Store and b/assets/bundle1/anim/player/.DS_Store differ diff --git a/assets/bundle1/anim/player/1/.DS_Store b/assets/bundle1/anim/player/1/.DS_Store index 980e426..d41eb83 100644 Binary files a/assets/bundle1/anim/player/1/.DS_Store and b/assets/bundle1/anim/player/1/.DS_Store differ diff --git a/assets/bundle1/anim/player/1/attack/attack.anim b/assets/bundle1/anim/player/1/attack/attack.anim index b641363..1f61640 100644 --- a/assets/bundle1/anim/player/1/attack/attack.anim +++ b/assets/bundle1/anim/player/1/attack/attack.anim @@ -11,7 +11,7 @@ "speed": 1, "wrapMode": 1, "enableTrsBlending": false, - "_duration": 1.2222222222222223, + "_duration": 1.1111111111111112, "_hash": 500763545, "_tracks": [ { @@ -80,9 +80,7 @@ 0.8888888888888888, 0.9444444444444444, 1, - 1.0555555555555556, - 1.1111111111111112, - 1.1666666666666667 + 1.0555555555555556 ], "_values": [ { @@ -121,10 +119,6 @@ "__uuid__": "d0ba04e4-8bf3-44ed-8648-bff1be2dd774@f9941", "__expectedType__": "cc.SpriteFrame" }, - { - "__uuid__": "78608711-b183-4313-b86d-a713a2fc7786@f9941", - "__expectedType__": "cc.SpriteFrame" - }, { "__uuid__": "181784f9-9564-4723-b58d-019e0bb09ccf@f9941", "__expectedType__": "cc.SpriteFrame" @@ -141,10 +135,6 @@ "__uuid__": "4efa8493-0cde-4a3d-b438-f210d24814e9@f9941", "__expectedType__": "cc.SpriteFrame" }, - { - "__uuid__": "16169e22-a791-4826-87c2-72e8ac9cd6b4@f9941", - "__expectedType__": "cc.SpriteFrame" - }, { "__uuid__": "22493ad2-6ffc-4ce2-be20-61d35436040d@f9941", "__expectedType__": "cc.SpriteFrame" diff --git a/assets/bundle1/anim/player/1/attack/金男初始套atk5_10015.png b/assets/bundle1/anim/player/1/attack/金男初始套atk5_10015.png deleted file mode 100644 index 106d236..0000000 Binary files a/assets/bundle1/anim/player/1/attack/金男初始套atk5_10015.png and /dev/null differ diff --git a/assets/bundle1/anim/player/1/attack/金男初始套atk5_10015.png.meta b/assets/bundle1/anim/player/1/attack/金男初始套atk5_10015.png.meta deleted file mode 100644 index cf75717..0000000 --- a/assets/bundle1/anim/player/1/attack/金男初始套atk5_10015.png.meta +++ /dev/null @@ -1,134 +0,0 @@ -{ - "ver": "1.0.27", - "importer": "image", - "imported": true, - "uuid": "78608711-b183-4313-b86d-a713a2fc7786", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "78608711-b183-4313-b86d-a713a2fc7786@6c48a", - "displayName": "金男初始套atk5_10015", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "clamp-to-edge", - "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "78608711-b183-4313-b86d-a713a2fc7786", - "isUuid": true, - "visible": false, - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0 - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "f9941": { - "importer": "sprite-frame", - "uuid": "78608711-b183-4313-b86d-a713a2fc7786@f9941", - "displayName": "金男初始套atk5_10015", - "id": "f9941", - "name": "spriteFrame", - "userData": { - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 1280, - "height": 960, - "rawWidth": 1280, - "rawHeight": 960, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "packable": true, - "pixelsToUnit": 100, - "pivotX": 0.5, - "pivotY": 0.5, - "meshType": 0, - "vertices": { - "rawPosition": [ - -640, - -480, - 0, - 640, - -480, - 0, - -640, - 480, - 0, - 640, - 480, - 0 - ], - "indexes": [ - 0, - 1, - 2, - 2, - 1, - 3 - ], - "uv": [ - 0, - 960, - 1280, - 960, - 0, - 0, - 1280, - 0 - ], - "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 - ], - "minPos": [ - -640, - -480, - 0 - ], - "maxPos": [ - 640, - 480, - 0 - ] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "78608711-b183-4313-b86d-a713a2fc7786@6c48a", - "atlasUuid": "", - "trimType": "none" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "type": "sprite-frame", - "hasAlpha": true, - "fixAlphaTransparencyArtifacts": false, - "redirect": "78608711-b183-4313-b86d-a713a2fc7786@6c48a" - } -} diff --git a/assets/bundle1/anim/player/1/attack/金男初始套atk5_10022.png b/assets/bundle1/anim/player/1/attack/金男初始套atk5_10022.png deleted file mode 100644 index ebc1706..0000000 Binary files a/assets/bundle1/anim/player/1/attack/金男初始套atk5_10022.png and /dev/null differ diff --git a/assets/bundle1/anim/player/1/attack/金男初始套atk5_10022.png.meta b/assets/bundle1/anim/player/1/attack/金男初始套atk5_10022.png.meta deleted file mode 100644 index fb2f406..0000000 --- a/assets/bundle1/anim/player/1/attack/金男初始套atk5_10022.png.meta +++ /dev/null @@ -1,134 +0,0 @@ -{ - "ver": "1.0.27", - "importer": "image", - "imported": true, - "uuid": "16169e22-a791-4826-87c2-72e8ac9cd6b4", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "16169e22-a791-4826-87c2-72e8ac9cd6b4@6c48a", - "displayName": "金男初始套atk5_10022", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "clamp-to-edge", - "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "16169e22-a791-4826-87c2-72e8ac9cd6b4", - "isUuid": true, - "visible": false, - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0 - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "f9941": { - "importer": "sprite-frame", - "uuid": "16169e22-a791-4826-87c2-72e8ac9cd6b4@f9941", - "displayName": "金男初始套atk5_10022", - "id": "f9941", - "name": "spriteFrame", - "userData": { - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 1280, - "height": 960, - "rawWidth": 1280, - "rawHeight": 960, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "packable": true, - "pixelsToUnit": 100, - "pivotX": 0.5, - "pivotY": 0.5, - "meshType": 0, - "vertices": { - "rawPosition": [ - -640, - -480, - 0, - 640, - -480, - 0, - -640, - 480, - 0, - 640, - 480, - 0 - ], - "indexes": [ - 0, - 1, - 2, - 2, - 1, - 3 - ], - "uv": [ - 0, - 960, - 1280, - 960, - 0, - 0, - 1280, - 0 - ], - "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 - ], - "minPos": [ - -640, - -480, - 0 - ], - "maxPos": [ - 640, - 480, - 0 - ] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "16169e22-a791-4826-87c2-72e8ac9cd6b4@6c48a", - "atlasUuid": "", - "trimType": "none" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "type": "sprite-frame", - "hasAlpha": true, - "fixAlphaTransparencyArtifacts": false, - "redirect": "16169e22-a791-4826-87c2-72e8ac9cd6b4@6c48a" - } -} diff --git a/assets/bundle1/anim/player/1/die/die.anim b/assets/bundle1/anim/player/1/die/die.anim index 58542e2..ce579d2 100644 --- a/assets/bundle1/anim/player/1/die/die.anim +++ b/assets/bundle1/anim/player/1/die/die.anim @@ -11,7 +11,7 @@ "speed": 1, "wrapMode": 1, "enableTrsBlending": false, - "_duration": 1, + "_duration": 0.9333333333333333, "_hash": 500763545, "_tracks": [ { @@ -74,8 +74,7 @@ 0.6666666666666666, 0.7333333333333333, 0.8, - 0.8666666666666667, - 0.9333333333333333 + 0.8666666666666667 ], "_values": [ { @@ -102,10 +101,6 @@ "__uuid__": "42e090c7-d6a9-4993-a5c9-d3830e1871a1@f9941", "__expectedType__": "cc.SpriteFrame" }, - { - "__uuid__": "57f9e375-8bee-49a3-ba2d-e67e24be7bbd@f9941", - "__expectedType__": "cc.SpriteFrame" - }, { "__uuid__": "597d0f97-00d5-49ba-b761-c4766d22ae26@f9941", "__expectedType__": "cc.SpriteFrame" diff --git a/assets/bundle1/anim/player/1/die/金男初始套die5_10011.png b/assets/bundle1/anim/player/1/die/金男初始套die5_10011.png deleted file mode 100644 index 3810d93..0000000 Binary files a/assets/bundle1/anim/player/1/die/金男初始套die5_10011.png and /dev/null differ diff --git a/assets/bundle1/anim/player/1/die/金男初始套die5_10011.png.meta b/assets/bundle1/anim/player/1/die/金男初始套die5_10011.png.meta deleted file mode 100644 index 6e45c9f..0000000 --- a/assets/bundle1/anim/player/1/die/金男初始套die5_10011.png.meta +++ /dev/null @@ -1,134 +0,0 @@ -{ - "ver": "1.0.27", - "importer": "image", - "imported": true, - "uuid": "57f9e375-8bee-49a3-ba2d-e67e24be7bbd", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "57f9e375-8bee-49a3-ba2d-e67e24be7bbd@6c48a", - "displayName": "金男初始套die5_10011", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "clamp-to-edge", - "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "57f9e375-8bee-49a3-ba2d-e67e24be7bbd", - "isUuid": true, - "visible": false, - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0 - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "f9941": { - "importer": "sprite-frame", - "uuid": "57f9e375-8bee-49a3-ba2d-e67e24be7bbd@f9941", - "displayName": "金男初始套die5_10011", - "id": "f9941", - "name": "spriteFrame", - "userData": { - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 1280, - "height": 960, - "rawWidth": 1280, - "rawHeight": 960, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "packable": true, - "pixelsToUnit": 100, - "pivotX": 0.5, - "pivotY": 0.5, - "meshType": 0, - "vertices": { - "rawPosition": [ - -640, - -480, - 0, - 640, - -480, - 0, - -640, - 480, - 0, - 640, - 480, - 0 - ], - "indexes": [ - 0, - 1, - 2, - 2, - 1, - 3 - ], - "uv": [ - 0, - 960, - 1280, - 960, - 0, - 0, - 1280, - 0 - ], - "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 - ], - "minPos": [ - -640, - -480, - 0 - ], - "maxPos": [ - 640, - 480, - 0 - ] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "57f9e375-8bee-49a3-ba2d-e67e24be7bbd@6c48a", - "atlasUuid": "", - "trimType": "none" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "type": "sprite-frame", - "hasAlpha": true, - "fixAlphaTransparencyArtifacts": false, - "redirect": "57f9e375-8bee-49a3-ba2d-e67e24be7bbd@6c48a" - } -} diff --git a/assets/bundle1/anim/player/2/.DS_Store b/assets/bundle1/anim/player/2/.DS_Store index bdc144c..03c33b2 100644 Binary files a/assets/bundle1/anim/player/2/.DS_Store and b/assets/bundle1/anim/player/2/.DS_Store differ diff --git a/assets/bundle1/anim/player/2/walk/21001千秋梦walk5_0009.png b/assets/bundle1/anim/player/2/walk/21001千秋梦walk5_0009.png deleted file mode 100644 index bbba541..0000000 Binary files a/assets/bundle1/anim/player/2/walk/21001千秋梦walk5_0009.png and /dev/null differ diff --git a/assets/bundle1/anim/player/2/walk/21001千秋梦walk5_0009.png.meta b/assets/bundle1/anim/player/2/walk/21001千秋梦walk5_0009.png.meta deleted file mode 100644 index d04e538..0000000 --- a/assets/bundle1/anim/player/2/walk/21001千秋梦walk5_0009.png.meta +++ /dev/null @@ -1,134 +0,0 @@ -{ - "ver": "1.0.27", - "importer": "image", - "imported": true, - "uuid": "0ba8f13e-9e14-44d7-ad5f-d0b95d4e1463", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "0ba8f13e-9e14-44d7-ad5f-d0b95d4e1463@6c48a", - "displayName": "21001千秋梦walk5_0009", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "clamp-to-edge", - "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "0ba8f13e-9e14-44d7-ad5f-d0b95d4e1463", - "isUuid": true, - "visible": false, - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0 - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "f9941": { - "importer": "sprite-frame", - "uuid": "0ba8f13e-9e14-44d7-ad5f-d0b95d4e1463@f9941", - "displayName": "21001千秋梦walk5_0009", - "id": "f9941", - "name": "spriteFrame", - "userData": { - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 1280, - "height": 960, - "rawWidth": 1280, - "rawHeight": 960, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "packable": true, - "pixelsToUnit": 100, - "pivotX": 0.5, - "pivotY": 0.5, - "meshType": 0, - "vertices": { - "rawPosition": [ - -640, - -480, - 0, - 640, - -480, - 0, - -640, - 480, - 0, - 640, - 480, - 0 - ], - "indexes": [ - 0, - 1, - 2, - 2, - 1, - 3 - ], - "uv": [ - 0, - 960, - 1280, - 960, - 0, - 0, - 1280, - 0 - ], - "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 - ], - "minPos": [ - -640, - -480, - 0 - ], - "maxPos": [ - 640, - 480, - 0 - ] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "0ba8f13e-9e14-44d7-ad5f-d0b95d4e1463@6c48a", - "atlasUuid": "", - "trimType": "none" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "type": "sprite-frame", - "hasAlpha": true, - "fixAlphaTransparencyArtifacts": false, - "redirect": "0ba8f13e-9e14-44d7-ad5f-d0b95d4e1463@6c48a" - } -} diff --git a/assets/bundle1/anim/player/2/walk/21001千秋梦walk5_0013.png b/assets/bundle1/anim/player/2/walk/21001千秋梦walk5_0013.png deleted file mode 100644 index 0f4c6df..0000000 Binary files a/assets/bundle1/anim/player/2/walk/21001千秋梦walk5_0013.png and /dev/null differ diff --git a/assets/bundle1/anim/player/2/walk/21001千秋梦walk5_0013.png.meta b/assets/bundle1/anim/player/2/walk/21001千秋梦walk5_0013.png.meta deleted file mode 100644 index 2ff32a6..0000000 --- a/assets/bundle1/anim/player/2/walk/21001千秋梦walk5_0013.png.meta +++ /dev/null @@ -1,134 +0,0 @@ -{ - "ver": "1.0.27", - "importer": "image", - "imported": true, - "uuid": "c9556507-c237-407c-88dd-cf6ed345e64b", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "c9556507-c237-407c-88dd-cf6ed345e64b@6c48a", - "displayName": "21001千秋梦walk5_0013", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "clamp-to-edge", - "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "c9556507-c237-407c-88dd-cf6ed345e64b", - "isUuid": true, - "visible": false, - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0 - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "f9941": { - "importer": "sprite-frame", - "uuid": "c9556507-c237-407c-88dd-cf6ed345e64b@f9941", - "displayName": "21001千秋梦walk5_0013", - "id": "f9941", - "name": "spriteFrame", - "userData": { - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 1280, - "height": 960, - "rawWidth": 1280, - "rawHeight": 960, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "packable": true, - "pixelsToUnit": 100, - "pivotX": 0.5, - "pivotY": 0.5, - "meshType": 0, - "vertices": { - "rawPosition": [ - -640, - -480, - 0, - 640, - -480, - 0, - -640, - 480, - 0, - 640, - 480, - 0 - ], - "indexes": [ - 0, - 1, - 2, - 2, - 1, - 3 - ], - "uv": [ - 0, - 960, - 1280, - 960, - 0, - 0, - 1280, - 0 - ], - "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 - ], - "minPos": [ - -640, - -480, - 0 - ], - "maxPos": [ - 640, - 480, - 0 - ] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "c9556507-c237-407c-88dd-cf6ed345e64b@6c48a", - "atlasUuid": "", - "trimType": "none" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "type": "sprite-frame", - "hasAlpha": true, - "fixAlphaTransparencyArtifacts": false, - "redirect": "c9556507-c237-407c-88dd-cf6ed345e64b@6c48a" - } -} diff --git a/assets/bundle1/anim/player/2/walk/21001千秋梦walk5_0019.png b/assets/bundle1/anim/player/2/walk/21001千秋梦walk5_0019.png deleted file mode 100644 index 232cfcc..0000000 Binary files a/assets/bundle1/anim/player/2/walk/21001千秋梦walk5_0019.png and /dev/null differ diff --git a/assets/bundle1/anim/player/2/walk/21001千秋梦walk5_0019.png.meta b/assets/bundle1/anim/player/2/walk/21001千秋梦walk5_0019.png.meta deleted file mode 100644 index ed2587d..0000000 --- a/assets/bundle1/anim/player/2/walk/21001千秋梦walk5_0019.png.meta +++ /dev/null @@ -1,134 +0,0 @@ -{ - "ver": "1.0.27", - "importer": "image", - "imported": true, - "uuid": "a9e59e6f-028b-4941-94d8-45deea27c565", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "a9e59e6f-028b-4941-94d8-45deea27c565@6c48a", - "displayName": "21001千秋梦walk5_0019", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "clamp-to-edge", - "wrapModeT": "clamp-to-edge", - "imageUuidOrDatabaseUri": "a9e59e6f-028b-4941-94d8-45deea27c565", - "isUuid": true, - "visible": false, - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0 - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "f9941": { - "importer": "sprite-frame", - "uuid": "a9e59e6f-028b-4941-94d8-45deea27c565@f9941", - "displayName": "21001千秋梦walk5_0019", - "id": "f9941", - "name": "spriteFrame", - "userData": { - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 1280, - "height": 960, - "rawWidth": 1280, - "rawHeight": 960, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "packable": true, - "pixelsToUnit": 100, - "pivotX": 0.5, - "pivotY": 0.5, - "meshType": 0, - "vertices": { - "rawPosition": [ - -640, - -480, - 0, - 640, - -480, - 0, - -640, - 480, - 0, - 640, - 480, - 0 - ], - "indexes": [ - 0, - 1, - 2, - 2, - 1, - 3 - ], - "uv": [ - 0, - 960, - 1280, - 960, - 0, - 0, - 1280, - 0 - ], - "nuv": [ - 0, - 0, - 1, - 0, - 0, - 1, - 1, - 1 - ], - "minPos": [ - -640, - -480, - 0 - ], - "maxPos": [ - 640, - 480, - 0 - ] - }, - "isUuid": true, - "imageUuidOrDatabaseUri": "a9e59e6f-028b-4941-94d8-45deea27c565@6c48a", - "atlasUuid": "", - "trimType": "none" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "type": "sprite-frame", - "hasAlpha": true, - "fixAlphaTransparencyArtifacts": false, - "redirect": "a9e59e6f-028b-4941-94d8-45deea27c565@6c48a" - } -} diff --git a/assets/bundle1/anim/player/2/walk/walk5_2.anim b/assets/bundle1/anim/player/2/walk/walk5_2.anim index a98c322..3e93056 100644 --- a/assets/bundle1/anim/player/2/walk/walk5_2.anim +++ b/assets/bundle1/anim/player/2/walk/walk5_2.anim @@ -11,7 +11,7 @@ "speed": 1, "wrapMode": 2, "enableTrsBlending": false, - "_duration": 0.8, + "_duration": 0.6, "_hash": 500763545, "_tracks": [ { @@ -69,10 +69,7 @@ 0.3333333333333333, 0.4, 0.4666666666666667, - 0.5333333333333333, - 0.6, - 0.6666666666666666, - 0.7333333333333333 + 0.5333333333333333 ], "_values": [ { @@ -91,24 +88,16 @@ "__uuid__": "cbeeced0-2f0f-41d9-939e-87e3932325d0@f9941", "__expectedType__": "cc.SpriteFrame" }, - { - "__uuid__": "0ba8f13e-9e14-44d7-ad5f-d0b95d4e1463@f9941", - "__expectedType__": "cc.SpriteFrame" - }, { "__uuid__": "b9ff776f-f06a-4de6-a1ea-ab4548c69c7d@f9941", "__expectedType__": "cc.SpriteFrame" }, - { - "__uuid__": "c9556507-c237-407c-88dd-cf6ed345e64b@f9941", - "__expectedType__": "cc.SpriteFrame" - }, { "__uuid__": "da677ad4-5c50-4f54-8230-fe2eb7580b29@f9941", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "a9e59e6f-028b-4941-94d8-45deea27c565@f9941", + "__uuid__": "88c4ae72-6eae-4950-8a3a-6d4eb91663bd@f9941", "__expectedType__": "cc.SpriteFrame" }, { @@ -118,10 +107,6 @@ { "__uuid__": "b9598373-cdcc-40a3-8baf-17e90306db4b@f9941", "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "88c4ae72-6eae-4950-8a3a-6d4eb91663bd@f9941", - "__expectedType__": "cc.SpriteFrame" } ] }, diff --git a/assets/resources/.DS_Store b/assets/resources/.DS_Store index 809a050..610c51a 100644 Binary files a/assets/resources/.DS_Store and b/assets/resources/.DS_Store differ diff --git a/assets/resources/anim/.DS_Store b/assets/resources/anim/.DS_Store index 99f56cf..d61d688 100644 Binary files a/assets/resources/anim/.DS_Store and b/assets/resources/anim/.DS_Store differ diff --git a/assets/resources/anim/xiaoguai/.DS_Store b/assets/resources/anim/xiaoguai/.DS_Store index f30523f..0579a5d 100644 Binary files a/assets/resources/anim/xiaoguai/.DS_Store and b/assets/resources/anim/xiaoguai/.DS_Store differ diff --git a/assets/resources/anim/xiaoguai/1/.DS_Store b/assets/resources/anim/xiaoguai/1/.DS_Store index 446854a..c03511c 100644 Binary files a/assets/resources/anim/xiaoguai/1/.DS_Store and b/assets/resources/anim/xiaoguai/1/.DS_Store differ diff --git a/assets/resources/images/.DS_Store b/assets/resources/images/.DS_Store index 30dedbd..f0b3d2c 100644 Binary files a/assets/resources/images/.DS_Store and b/assets/resources/images/.DS_Store differ