diff --git a/battle_srv/models/room.go b/battle_srv/models/room.go index 878e695..6466f6b 100644 --- a/battle_srv/models/room.go +++ b/battle_srv/models/room.go @@ -747,7 +747,7 @@ func (pR *Room) OnDismissed() { pR.RollbackEstimatedDtNanos = 16666666 // A little smaller than the actual per frame time, just for logging FAST FRAME dilutedServerFps := float64(55.0) pR.dilutedRollbackEstimatedDtNanos = int64(float64(pR.RollbackEstimatedDtNanos) * float64(pR.ServerFps) / dilutedServerFps) - pR.BattleDurationFrames = 120 * pR.ServerFps + pR.BattleDurationFrames = 45 * pR.ServerFps pR.BattleDurationNanos = int64(pR.BattleDurationFrames) * (pR.RollbackEstimatedDtNanos + 1) pR.InputFrameUpsyncDelayTolerance = 2 pR.MaxChasingRenderFramesPerUpdate = 8 @@ -758,7 +758,7 @@ func (pR *Room) OnDismissed() { pR.MeleeSkillConfig[punchSkillId] = &MeleeBullet{ // for offender StartupFrames: int32(10), - ActiveFrames: int32(3), + ActiveFrames: int32(10), RecoveryFrames: int32(34), RecoveryFramesOnBlock: int32(34), RecoveryFramesOnHit: int32(34), @@ -1793,7 +1793,7 @@ func (pR *Room) downsyncToSinglePlayer(playerId int32, player *Player, refRender refRenderFrame.BackendUnconfirmedMask = unconfirmedMask pR.sendSafely(refRenderFrame, toSendInputFrameDownsyncsSnapshot, DOWNSYNC_MSG_ACT_FORCED_RESYNC, playerId, false) //Logger.Warn(fmt.Sprintf("Sent refRenderFrameId=%v & inputFrameIds [%d, %d), for roomId=%v, playerId=%d, playerJoinIndex=%d, renderFrameId=%d, curDynamicsRenderFrameId=%d, playerLastSentInputFrameId=%d: InputsBuffer=%v", refRenderFrameId, toSendInputFrameIdSt, toSendInputFrameIdEd, pR.Id, playerId, player.JoinIndex, pR.RenderFrameId, pR.CurDynamicsRenderFrameId, player.LastSentInputFrameId, pR.InputsBufferString(false))) - Logger.Warn(fmt.Sprintf("Sent refRenderFrameId=%v & inputFrameIds [%d, %d), for roomId=%v, playerId=%d, playerJoinIndex=%d, renderFrameId=%d, curDynamicsRenderFrameId=%d, playerLastSentInputFrameId=%d", refRenderFrameId, toSendInputFrameIdSt, toSendInputFrameIdEd, pR.Id, playerId, player.JoinIndex, pR.RenderFrameId, pR.CurDynamicsRenderFrameId, player.LastSentInputFrameId)) + //Logger.Warn(fmt.Sprintf("Sent refRenderFrameId=%v & inputFrameIds [%d, %d), for roomId=%v, playerId=%d, playerJoinIndex=%d, renderFrameId=%d, curDynamicsRenderFrameId=%d, playerLastSentInputFrameId=%d", refRenderFrameId, toSendInputFrameIdSt, toSendInputFrameIdEd, pR.Id, playerId, player.JoinIndex, pR.RenderFrameId, pR.CurDynamicsRenderFrameId, player.LastSentInputFrameId)) } else { pR.sendSafely(nil, toSendInputFrameDownsyncsSnapshot, DOWNSYNC_MSG_ACT_INPUT_BATCH, playerId, false) } diff --git a/charts/README.md b/charts/README.md index 4b222b9..cd6fc7d 100644 --- a/charts/README.md +++ b/charts/README.md @@ -7,3 +7,10 @@ ffmpeg -i input.mp4 -filter:v "setpts=0.5*PTS" output.mp4 ``` ffmpeg -ss 12 -t 13 -i input.mp4 -vf "fps=10,scale=480:-1" -loop 0 output.gif ``` + +# Extract GIF (with alpha channel, e.g. exported from Fighter Factory Studio) to PNG sequence +``` +ffmpeg -vsync vfr -i input.gif output%d.png +``` + +The `-vsync vfr` tells ffmpeg to disrespect the original delays set within the GIF file, otherwise many duplicate frame will be extracted by the default 60FPS. diff --git a/frontend/assets/resources/animation/SoldierFireGhost/frameAnim/Atk1.anim b/frontend/assets/resources/animation/SoldierFireGhost/frameAnim/Atk1.anim deleted file mode 100644 index f7dede7..0000000 --- a/frontend/assets/resources/animation/SoldierFireGhost/frameAnim/Atk1.anim +++ /dev/null @@ -1,229 +0,0 @@ -{ - "__type__": "cc.AnimationClip", - "_name": "Atk1", - "_objFlags": 0, - "_native": "", - "_duration": 0.5833333333333334, - "sample": 60, - "speed": 1, - "wrapMode": 1, - "curveData": { - "comps": { - "cc.Sprite": { - "spriteFrame": [ - { - "frame": 0, - "value": { - "__uuid__": "7fedc57f-6998-45fc-899d-ea5edd41ab13" - } - }, - { - "frame": 0.016666666666666666, - "value": { - "__uuid__": "d55c2f3c-9110-4627-b8b2-0f9395f0d145" - } - }, - { - "frame": 0.03333333333333333, - "value": { - "__uuid__": "1228879d-d28e-48e4-a3ce-5ceda0d1831f" - } - }, - { - "frame": 0.05, - "value": { - "__uuid__": "e88dd5c4-cc5d-46e0-88de-e382e2bcadd7" - } - }, - { - "frame": 0.06666666666666667, - "value": { - "__uuid__": "df069f5c-7fc0-4731-bb7f-9d2032498e4c" - } - }, - { - "frame": 0.08333333333333333, - "value": { - "__uuid__": "4815763d-64e1-4b15-b795-38900861c651" - } - }, - { - "frame": 0.1, - "value": { - "__uuid__": "0dca4f06-bf25-4e7f-ac3a-1687e284f5d6" - } - }, - { - "frame": 0.11666666666666667, - "value": { - "__uuid__": "de8db3c9-affd-45ef-a536-e2d28ebc8094" - } - }, - { - "frame": 0.13333333333333333, - "value": { - "__uuid__": "baaafb8b-9c1a-45ea-ba80-eb8048b61b57" - } - }, - { - "frame": 0.15, - "value": { - "__uuid__": "9ffa7db6-1aec-4a1e-a8a9-118f2a6e50dc" - } - }, - { - "frame": 0.16666666666666666, - "value": { - "__uuid__": "f2f296ad-0e19-4b00-b061-8c9edff98d0d" - } - }, - { - "frame": 0.18333333333333332, - "value": { - "__uuid__": "3e546607-d27f-40fa-9967-771c55a12590" - } - }, - { - "frame": 0.2, - "value": { - "__uuid__": "fece0129-e8ae-45be-b963-e2b821add0d3" - } - }, - { - "frame": 0.21666666666666667, - "value": { - "__uuid__": "f5f48bec-3d2a-49de-9416-26cc75d34e32" - } - }, - { - "frame": 0.23333333333333334, - "value": { - "__uuid__": "b083cfc9-a439-4600-b336-b50ca08b68c4" - } - }, - { - "frame": 0.25, - "value": { - "__uuid__": "d04003f5-16c1-4510-898b-9148b76eb958" - } - }, - { - "frame": 0.26666666666666666, - "value": { - "__uuid__": "2159f038-bffa-480c-a2bd-c305868f2fd9" - } - }, - { - "frame": 0.2833333333333333, - "value": { - "__uuid__": "1d3de292-7dd4-4e28-b1d2-23fc38318390" - } - }, - { - "frame": 0.3, - "value": { - "__uuid__": "3031ca7c-e1f7-4d14-b29e-5a7102cab245" - } - }, - { - "frame": 0.31666666666666665, - "value": { - "__uuid__": "987e9d14-b6fc-46c7-93ed-8914e42bfa8b" - } - }, - { - "frame": 0.3333333333333333, - "value": { - "__uuid__": "327db66e-2136-4d52-9727-399d60715a86" - } - }, - { - "frame": 0.35, - "value": { - "__uuid__": "82ab2dcd-22e9-490f-96c4-4786018c91d0" - } - }, - { - "frame": 0.36666666666666664, - "value": { - "__uuid__": "36812959-85a6-40fb-9a38-1b4d871eba92" - } - }, - { - "frame": 0.38333333333333336, - "value": { - "__uuid__": "2941d74c-7b9c-43dc-a5c4-45952220d9a2" - } - }, - { - "frame": 0.4, - "value": { - "__uuid__": "4aed2032-25d5-42fd-983a-4473e2985a99" - } - }, - { - "frame": 0.4166666666666667, - "value": { - "__uuid__": "3db216c1-3362-4404-8db6-11615bfa6e64" - } - }, - { - "frame": 0.43333333333333335, - "value": { - "__uuid__": "2cf0cb17-cbb0-4d64-9c91-83639a363158" - } - }, - { - "frame": 0.45, - "value": { - "__uuid__": "9c057e2c-1dc4-4c6c-adb7-85bf691cefb5" - } - }, - { - "frame": 0.4666666666666667, - "value": { - "__uuid__": "49c07a7f-2ace-4e2b-ba4c-724aad12ec5c" - } - }, - { - "frame": 0.48333333333333334, - "value": { - "__uuid__": "cec3c067-c958-4988-b113-2f10d7f4f5ea" - } - }, - { - "frame": 0.5, - "value": { - "__uuid__": "ad57f789-a25a-411c-b130-62a8ab16177f" - } - }, - { - "frame": 0.5166666666666667, - "value": { - "__uuid__": "3c2a21a5-7c85-48f3-95ff-0d7a32e5e852" - } - }, - { - "frame": 0.5333333333333333, - "value": { - "__uuid__": "fe15eece-07a5-4d15-927b-af980aea7693" - } - }, - { - "frame": 0.55, - "value": { - "__uuid__": "30ac103a-0f2b-45db-9442-461479beeb0d" - } - }, - { - "frame": 0.5666666666666667, - "value": { - "__uuid__": "76272ec6-0721-4496-941b-5cb6a52b2c35" - } - } - ] - } - } - }, - "events": [] -} \ No newline at end of file diff --git a/frontend/assets/resources/animation/SoldierFireGhost/frameAnim/Atked1.anim b/frontend/assets/resources/animation/SoldierFireGhost/frameAnim/Atked1.anim deleted file mode 100644 index 67fe0ad..0000000 --- a/frontend/assets/resources/animation/SoldierFireGhost/frameAnim/Atked1.anim +++ /dev/null @@ -1,133 +0,0 @@ -{ - "__type__": "cc.AnimationClip", - "_name": "Atked1", - "_objFlags": 0, - "_native": "", - "_duration": 0.31666666666666665, - "sample": 60, - "speed": 1, - "wrapMode": 1, - "curveData": { - "comps": { - "cc.Sprite": { - "spriteFrame": [ - { - "frame": 0, - "value": { - "__uuid__": "6fd7cfcb-95b2-4197-a065-6bc48365f855" - } - }, - { - "frame": 0.016666666666666666, - "value": { - "__uuid__": "39aaeff6-3116-4e12-8ec4-9362a8a2fea2" - } - }, - { - "frame": 0.03333333333333333, - "value": { - "__uuid__": "fb4e42e6-0fae-48d4-a600-217e01d43e57" - } - }, - { - "frame": 0.05, - "value": { - "__uuid__": "2af606d7-4b3d-4355-95d1-a3ab673d2a2e" - } - }, - { - "frame": 0.06666666666666667, - "value": { - "__uuid__": "be18e65b-346c-4efb-84cb-7f317fcaf8ac" - } - }, - { - "frame": 0.08333333333333333, - "value": { - "__uuid__": "d269af72-8b89-420c-ba9e-6892cda06e80" - } - }, - { - "frame": 0.1, - "value": { - "__uuid__": "30539c9d-6dbb-4409-8562-6c24b12010c2" - } - }, - { - "frame": 0.11666666666666667, - "value": { - "__uuid__": "96b655f9-9a90-4cb1-86ab-0be881ad8983" - } - }, - { - "frame": 0.13333333333333333, - "value": { - "__uuid__": "a86f8107-3d8d-426e-9a17-c856c1ab292a" - } - }, - { - "frame": 0.15, - "value": { - "__uuid__": "d7f99f14-9257-426a-9e90-a948e7ca8d23" - } - }, - { - "frame": 0.16666666666666666, - "value": { - "__uuid__": "809dcbcf-9edd-4b8b-8bc8-42394ce0a9c2" - } - }, - { - "frame": 0.18333333333333332, - "value": { - "__uuid__": "f3e74927-2eea-4306-ba0a-c89972ca88f1" - } - }, - { - "frame": 0.2, - "value": { - "__uuid__": "af7a23f6-9b5c-4fe8-aa74-741f18500866" - } - }, - { - "frame": 0.21666666666666667, - "value": { - "__uuid__": "4cc6ecdb-3741-4a2e-87a0-a93739a38d37" - } - }, - { - "frame": 0.23333333333333334, - "value": { - "__uuid__": "f809b6d3-6f5b-4cf4-b148-5cf7fdf407a5" - } - }, - { - "frame": 0.25, - "value": { - "__uuid__": "b1c9e526-fe26-42a8-9257-7e5549847273" - } - }, - { - "frame": 0.26666666666666666, - "value": { - "__uuid__": "db62c862-7553-4f99-b758-8c4a4aec438a" - } - }, - { - "frame": 0.2833333333333333, - "value": { - "__uuid__": "55f68905-bff7-48ea-b497-5077f49b2aca" - } - }, - { - "frame": 0.3, - "value": { - "__uuid__": "b01f45f9-c394-4706-aae1-d1d26a84f48a" - } - } - ] - } - } - }, - "events": [] -} \ No newline at end of file diff --git a/frontend/assets/resources/animation/SoldierFireGhost/frameAnim/Idle1.anim b/frontend/assets/resources/animation/SoldierFireGhost/frameAnim/Idle1.anim deleted file mode 100644 index 325072b..0000000 --- a/frontend/assets/resources/animation/SoldierFireGhost/frameAnim/Idle1.anim +++ /dev/null @@ -1,432 +0,0 @@ -{ - "__type__": "cc.AnimationClip", - "_name": "Idle1", - "_objFlags": 0, - "_native": "", - "_duration": 1.1166666666666667, - "sample": 60, - "speed": 1, - "wrapMode": 2, - "curveData": { - "comps": { - "cc.Sprite": { - "spriteFrame": [ - { - "frame": 0, - "value": { - "__uuid__": "91bba749-7338-4bdc-b9a2-0450a183378f" - } - }, - { - "frame": 0.016666666666666666, - "value": { - "__uuid__": "31b10e1f-7433-4c0d-b9a7-576adc0cdb51" - } - }, - { - "frame": 0.03333333333333333, - "value": { - "__uuid__": "80d4afc7-d21a-4eec-ab5e-ec833e1e905b" - } - }, - { - "frame": 0.05, - "value": { - "__uuid__": "d75070b5-3dbe-4d77-886e-8851f31e8ac8" - } - }, - { - "frame": 0.06666666666666667, - "value": { - "__uuid__": "a30e880e-1ff1-434d-bdbc-a3a2e0de671b" - } - }, - { - "frame": 0.08333333333333333, - "value": { - "__uuid__": "87cec524-adf7-48a6-af37-b1bae14b9317" - } - }, - { - "frame": 0.1, - "value": { - "__uuid__": "d415a590-b4bf-4590-834a-b075705e063a" - } - }, - { - "frame": 0.11666666666666667, - "value": { - "__uuid__": "e8b7eb99-0b52-4f01-8dd3-6c1ff23a8552" - } - }, - { - "frame": 0.13333333333333333, - "value": { - "__uuid__": "599c03fd-c5f1-45b1-9cd8-0164f8e82fe0" - } - }, - { - "frame": 0.15, - "value": { - "__uuid__": "0f71de95-9947-40da-929f-dd25bf43884e" - } - }, - { - "frame": 0.16666666666666666, - "value": { - "__uuid__": "99980a57-3af2-4c23-84b8-87759ee79e10" - } - }, - { - "frame": 0.18333333333333332, - "value": { - "__uuid__": "ab001dd3-587c-4a23-adbc-5f0d3eedccaf" - } - }, - { - "frame": 0.2, - "value": { - "__uuid__": "9869ec96-1c78-482e-bff8-95d0b064d0f6" - } - }, - { - "frame": 0.21666666666666667, - "value": { - "__uuid__": "0863d34e-0116-4134-b17e-32dae8f1589f" - } - }, - { - "frame": 0.23333333333333334, - "value": { - "__uuid__": "10454569-56bb-4721-9a94-49015f5e11cc" - } - }, - { - "frame": 0.25, - "value": { - "__uuid__": "b13c9ee9-a497-43b3-9b54-83250bc62cc6" - } - }, - { - "frame": 0.26666666666666666, - "value": { - "__uuid__": "80e898d9-10a9-4817-988c-7571744173e7" - } - }, - { - "frame": 0.2833333333333333, - "value": { - "__uuid__": "0e4e927d-0c67-43a1-aade-a6b5ea3fe498" - } - }, - { - "frame": 0.3, - "value": { - "__uuid__": "6c327da9-60a2-4b63-89ca-05e7bb9b8c5f" - } - }, - { - "frame": 0.31666666666666665, - "value": { - "__uuid__": "9e71217f-0580-481e-b2ea-8886eb7cf492" - } - }, - { - "frame": 0.3333333333333333, - "value": { - "__uuid__": "ed851c4e-6a42-4643-8d50-1bac3d55b1ac" - } - }, - { - "frame": 0.35, - "value": { - "__uuid__": "3a4738ba-bf3c-47cf-98f7-7e68aba0c96c" - } - }, - { - "frame": 0.36666666666666664, - "value": { - "__uuid__": "d035e717-c8ab-4cdc-b59f-c61c9e85990a" - } - }, - { - "frame": 0.38333333333333336, - "value": { - "__uuid__": "4bf6ea06-54bf-4c25-87f7-c7d9dca56fab" - } - }, - { - "frame": 0.4, - "value": { - "__uuid__": "a4b324b1-1191-43ee-ac76-a4536d1dbac7" - } - }, - { - "frame": 0.4166666666666667, - "value": { - "__uuid__": "4e2ac5fa-1c68-4cbd-80e6-a94af579796d" - } - }, - { - "frame": 0.43333333333333335, - "value": { - "__uuid__": "64cd0353-429a-4a47-a6fc-b0f12e565e94" - } - }, - { - "frame": 0.45, - "value": { - "__uuid__": "3fa0ae73-f8f8-455f-82c3-24a428379e95" - } - }, - { - "frame": 0.4666666666666667, - "value": { - "__uuid__": "a4679596-56d5-44f2-a349-7579ad7fbe33" - } - }, - { - "frame": 0.48333333333333334, - "value": { - "__uuid__": "3293d474-dfb3-412a-aca1-ce76f70a2181" - } - }, - { - "frame": 0.5, - "value": { - "__uuid__": "9794aec3-5e18-4df4-bae2-296f7c5ed935" - } - }, - { - "frame": 0.5166666666666667, - "value": { - "__uuid__": "4373d7b7-ea22-4ba2-a6df-c0672d4310a2" - } - }, - { - "frame": 0.5333333333333333, - "value": { - "__uuid__": "89b6617e-2131-4bc6-840a-048af7944bb8" - } - }, - { - "frame": 0.55, - "value": { - "__uuid__": "9c267a7b-ab24-49b4-a2f3-26d885799f23" - } - }, - { - "frame": 0.5666666666666667, - "value": { - "__uuid__": "df3255ea-00af-47c2-9deb-4ccd27a62706" - } - }, - { - "frame": 0.5833333333333334, - "value": { - "__uuid__": "e15242c9-29ba-411a-a93f-dddad5613956" - } - }, - { - "frame": 0.6, - "value": { - "__uuid__": "ef3f8029-d5cc-4024-95ca-1f2aa062a0d5" - } - }, - { - "frame": 0.6166666666666667, - "value": { - "__uuid__": "7b48f205-a1e8-4233-8c72-11ae9c0ccea7" - } - }, - { - "frame": 0.6333333333333333, - "value": { - "__uuid__": "ffc69bce-fd84-42d8-b8c9-fe05e6c7fa03" - } - }, - { - "frame": 0.65, - "value": { - "__uuid__": "81805795-ab34-47c1-ab45-57f54d28e72f" - } - }, - { - "frame": 0.6666666666666666, - "value": { - "__uuid__": "adae26a6-7991-4583-966c-4364ba35474d" - } - }, - { - "frame": 0.6833333333333333, - "value": { - "__uuid__": "ab51a779-10b7-4039-ac45-6ada002e702f" - } - }, - { - "frame": 0.7, - "value": { - "__uuid__": "173d4746-0af5-40ae-a472-ba6406c700dc" - } - }, - { - "frame": 0.7166666666666667, - "value": { - "__uuid__": "4054d644-4b5c-473d-ad2c-1c1eb06b01d7" - } - }, - { - "frame": 0.7333333333333333, - "value": { - "__uuid__": "0f55009f-71dc-4e70-8152-7dbc2a16a17c" - } - }, - { - "frame": 0.75, - "value": { - "__uuid__": "d273f52f-4ec1-4ccf-8820-92879682213e" - } - }, - { - "frame": 0.7666666666666667, - "value": { - "__uuid__": "37c2f336-a3c8-4b46-8031-d48c3f36c675" - } - }, - { - "frame": 0.7833333333333333, - "value": { - "__uuid__": "8cee57cb-5e79-4fe9-8368-745b38a37021" - } - }, - { - "frame": 0.8, - "value": { - "__uuid__": "4e67aa7d-d6a6-405b-99c4-ef5be609fdf4" - } - }, - { - "frame": 0.8166666666666667, - "value": { - "__uuid__": "b0b7fc1a-f42a-4977-bfef-93841bdfa2f8" - } - }, - { - "frame": 0.8333333333333334, - "value": { - "__uuid__": "352bbb78-d87c-425d-b39e-a401432f0070" - } - }, - { - "frame": 0.85, - "value": { - "__uuid__": "9aaadf6a-808f-44f4-b7a8-392138851168" - } - }, - { - "frame": 0.8666666666666667, - "value": { - "__uuid__": "a319abd0-a689-400c-8f2a-94ccc70e50f9" - } - }, - { - "frame": 0.8833333333333333, - "value": { - "__uuid__": "2efd4c0f-10c1-41be-81b5-40b3d10cb863" - } - }, - { - "frame": 0.9, - "value": { - "__uuid__": "8b94f28d-7da8-4e83-a9d6-46072b24a847" - } - }, - { - "frame": 0.9166666666666666, - "value": { - "__uuid__": "1f153a21-9a57-4bf7-a7bb-fa2a2e3b9484" - } - }, - { - "frame": 0.9333333333333333, - "value": { - "__uuid__": "2d3ad677-51b8-4d53-924c-dea3f66f0510" - } - }, - { - "frame": 0.95, - "value": { - "__uuid__": "68aabf9d-5b21-4405-b92d-18a837895c37" - } - }, - { - "frame": 0.9666666666666667, - "value": { - "__uuid__": "cb893520-96b5-4ce4-a9dd-90ca4eac1882" - } - }, - { - "frame": 0.9833333333333333, - "value": { - "__uuid__": "498ee98f-7211-4495-99fe-662aee098217" - } - }, - { - "frame": 1, - "value": { - "__uuid__": "da05be2e-e07f-4081-a99d-9c1b1459b862" - } - }, - { - "frame": 1.0166666666666666, - "value": { - "__uuid__": "46e64686-1071-4db2-8f3d-4a0a00dc8e10" - } - }, - { - "frame": 1.0333333333333334, - "value": { - "__uuid__": "5a082e4d-d615-411f-880e-b03bda363cea" - } - }, - { - "frame": 1.05, - "value": { - "__uuid__": "6d582b00-b973-4397-8866-32f531d4366e" - } - }, - { - "frame": 1.0666666666666667, - "value": { - "__uuid__": "1de67f2c-e9ea-438d-8f30-b7c40159bc92" - } - }, - { - "frame": 1.0833333333333333, - "value": { - "__uuid__": "6e98330a-9709-44e1-8704-aa6430bd8236" - } - }, - { - "frame": 1.1, - "value": { - "__uuid__": "b2557433-9168-4b78-a9ac-78b33633b1d8" - } - } - ] - } - } - }, - "events": [ - { - "frame": 0, - "func": "", - "params": [] - }, - { - "frame": 0, - "func": "", - "params": [] - } - ] -} \ No newline at end of file diff --git a/frontend/assets/resources/animation/SoldierFireGhost/frameAnim/InAirIdle1.anim b/frontend/assets/resources/animation/SoldierFireGhost/frameAnim/InAirIdle1.anim deleted file mode 100644 index c61643e..0000000 --- a/frontend/assets/resources/animation/SoldierFireGhost/frameAnim/InAirIdle1.anim +++ /dev/null @@ -1,205 +0,0 @@ -{ - "__type__": "cc.AnimationClip", - "_name": "InAirIdle1", - "_objFlags": 0, - "_native": "", - "_duration": 0.5166666666666667, - "sample": 60, - "speed": 1, - "wrapMode": 2, - "curveData": { - "comps": { - "cc.Sprite": { - "spriteFrame": [ - { - "frame": 0, - "value": { - "__uuid__": "dd02916e-9ac8-4fe7-a944-d6082eb9007a" - } - }, - { - "frame": 0.016666666666666666, - "value": { - "__uuid__": "1906b14b-f3a2-4dc9-9e0d-99e3b334e67b" - } - }, - { - "frame": 0.03333333333333333, - "value": { - "__uuid__": "1b4f284c-be67-403b-9f5d-59aa641d3c92" - } - }, - { - "frame": 0.05, - "value": { - "__uuid__": "6feb197e-2013-48fd-bbbb-3d2809cb1d63" - } - }, - { - "frame": 0.06666666666666667, - "value": { - "__uuid__": "2db4e807-a5d2-4c09-b033-a0ae97e5d0bf" - } - }, - { - "frame": 0.08333333333333333, - "value": { - "__uuid__": "73958a6b-31a7-4bb8-babd-1aefba55a793" - } - }, - { - "frame": 0.1, - "value": { - "__uuid__": "9545ca77-8002-4ad1-a91e-1e343cdf0e0b" - } - }, - { - "frame": 0.11666666666666667, - "value": { - "__uuid__": "581e4c15-9de3-4b72-a91a-2e82ac6b092c" - } - }, - { - "frame": 0.13333333333333333, - "value": { - "__uuid__": "4af94082-f36b-4b9e-9077-bd458fd0b188" - } - }, - { - "frame": 0.15, - "value": { - "__uuid__": "5463290d-7b25-4625-8be5-1a16dbe3bd83" - } - }, - { - "frame": 0.16666666666666666, - "value": { - "__uuid__": "e507775a-1009-47a8-b1a8-8ade0104e4c2" - } - }, - { - "frame": 0.18333333333333332, - "value": { - "__uuid__": "6583a9e1-92fb-4db2-9437-9d2b26bc5920" - } - }, - { - "frame": 0.2, - "value": { - "__uuid__": "b07e2da2-d1f2-4ec8-acdf-92706d0be9e0" - } - }, - { - "frame": 0.21666666666666667, - "value": { - "__uuid__": "dd60bf4f-6b5f-4385-9e46-1e49e6a7cfbe" - } - }, - { - "frame": 0.23333333333333334, - "value": { - "__uuid__": "46811e43-c874-41d5-8799-6fafc904cd5a" - } - }, - { - "frame": 0.25, - "value": { - "__uuid__": "0a370e7e-e25f-4faf-9a76-73b246338a4d" - } - }, - { - "frame": 0.26666666666666666, - "value": { - "__uuid__": "1f003135-e929-4a05-9029-76e7cb8c76ef" - } - }, - { - "frame": 0.2833333333333333, - "value": { - "__uuid__": "b78015ba-98e4-4ccd-9852-a7ec053a0ba4" - } - }, - { - "frame": 0.3, - "value": { - "__uuid__": "0589abef-dc0d-4d33-a084-25b273ca1368" - } - }, - { - "frame": 0.31666666666666665, - "value": { - "__uuid__": "20542755-bbfa-43cd-b593-e73d121b5ed6" - } - }, - { - "frame": 0.3333333333333333, - "value": { - "__uuid__": "5d5ac5af-3da7-4b22-9183-5885736e2ca7" - } - }, - { - "frame": 0.35, - "value": { - "__uuid__": "47bbe2a2-a983-4aca-8a3e-6cd6df5eee03" - } - }, - { - "frame": 0.36666666666666664, - "value": { - "__uuid__": "6d3fb572-d6af-4b7e-9350-9ff482569127" - } - }, - { - "frame": 0.38333333333333336, - "value": { - "__uuid__": "573cfba0-4534-4886-849a-61f4f2cbd349" - } - }, - { - "frame": 0.4, - "value": { - "__uuid__": "0b4ebd8a-6316-4802-aa24-49ab08e6a75b" - } - }, - { - "frame": 0.4166666666666667, - "value": { - "__uuid__": "5b7fff7b-5818-4be8-b65d-c212d15e6e71" - } - }, - { - "frame": 0.43333333333333335, - "value": { - "__uuid__": "f964ec77-c016-44fa-8f55-3e59ae30283d" - } - }, - { - "frame": 0.45, - "value": { - "__uuid__": "679a79eb-85c6-4445-8517-36465c57c6da" - } - }, - { - "frame": 0.4666666666666667, - "value": { - "__uuid__": "8764bb9b-4b08-4bc5-b9e5-93af39321c70" - } - }, - { - "frame": 0.48333333333333334, - "value": { - "__uuid__": "f291785e-2685-4ba0-b38b-9607972ce6f0" - } - }, - { - "frame": 0.5, - "value": { - "__uuid__": "a4e84eb9-b866-4cdc-8925-a5d29c65aea5" - } - } - ] - } - } - }, - "events": [] -} \ No newline at end of file diff --git a/frontend/assets/resources/animation/SoldierFireGhost/frameAnim/Walking.anim b/frontend/assets/resources/animation/SoldierFireGhost/frameAnim/Walking.anim deleted file mode 100644 index 2ccce91..0000000 --- a/frontend/assets/resources/animation/SoldierFireGhost/frameAnim/Walking.anim +++ /dev/null @@ -1,385 +0,0 @@ -{ - "__type__": "cc.AnimationClip", - "_name": "Walking", - "_objFlags": 0, - "_native": "", - "_duration": 1.0166666666666666, - "sample": 60, - "speed": 1, - "wrapMode": 2, - "curveData": { - "comps": { - "cc.Sprite": { - "spriteFrame": [ - { - "frame": 0, - "value": { - "__uuid__": "5a9af6ac-cccc-4964-90a1-7136468d64ae" - } - }, - { - "frame": 0.016666666666666666, - "value": { - "__uuid__": "e62f3718-263c-4a93-8405-55aca440180f" - } - }, - { - "frame": 0.03333333333333333, - "value": { - "__uuid__": "700a3fef-00d2-437a-a323-cc79802d76f5" - } - }, - { - "frame": 0.05, - "value": { - "__uuid__": "bf8ce5ef-5171-45ab-97dd-8c9da2dbcd5a" - } - }, - { - "frame": 0.06666666666666667, - "value": { - "__uuid__": "0894f61a-e4a0-458d-890e-aa3d60e4bf4f" - } - }, - { - "frame": 0.08333333333333333, - "value": { - "__uuid__": "1995a986-6421-427c-92fe-4e3bae551e67" - } - }, - { - "frame": 0.1, - "value": { - "__uuid__": "4ca1ce37-410d-4437-8b7a-498292e74bc6" - } - }, - { - "frame": 0.11666666666666667, - "value": { - "__uuid__": "1e23a398-6051-4a69-a71d-7ea4909da77e" - } - }, - { - "frame": 0.13333333333333333, - "value": { - "__uuid__": "ef18849a-0d4d-4bfe-a707-073958511ca6" - } - }, - { - "frame": 0.15, - "value": { - "__uuid__": "f217d368-9fc9-48cd-b635-059a7bc472a4" - } - }, - { - "frame": 0.16666666666666666, - "value": { - "__uuid__": "b312cebf-3945-40c7-a367-3bc1d6689109" - } - }, - { - "frame": 0.18333333333333332, - "value": { - "__uuid__": "476ddde6-8fd9-40cc-a789-0a08ebff5352" - } - }, - { - "frame": 0.2, - "value": { - "__uuid__": "b27f06dc-217d-4b68-a747-4c1d3c27151f" - } - }, - { - "frame": 0.21666666666666667, - "value": { - "__uuid__": "83d15d82-f23d-40c4-b4ef-da4ce6964fc9" - } - }, - { - "frame": 0.23333333333333334, - "value": { - "__uuid__": "7cc81715-c432-4ee2-bf67-a77a4dadcd89" - } - }, - { - "frame": 0.25, - "value": { - "__uuid__": "463ae409-a045-40d1-ac44-1f2aac439065" - } - }, - { - "frame": 0.26666666666666666, - "value": { - "__uuid__": "84e68a5e-f23b-4570-ac4f-d85f1eba292c" - } - }, - { - "frame": 0.2833333333333333, - "value": { - "__uuid__": "ce73c3ce-b543-4f9b-892c-27b76a9c84dc" - } - }, - { - "frame": 0.3, - "value": { - "__uuid__": "25280250-fab5-464c-b26e-1a5f1733aa09" - } - }, - { - "frame": 0.31666666666666665, - "value": { - "__uuid__": "abf595ad-a861-482c-8f5a-43f243516a5b" - } - }, - { - "frame": 0.3333333333333333, - "value": { - "__uuid__": "238ce540-4c4a-41c0-967c-32218e3dfd3c" - } - }, - { - "frame": 0.35, - "value": { - "__uuid__": "0a3f1bbf-788b-4d78-b737-2ec5364fe5a4" - } - }, - { - "frame": 0.36666666666666664, - "value": { - "__uuid__": "c6397500-a2d9-4d68-b874-299bbc4a2173" - } - }, - { - "frame": 0.38333333333333336, - "value": { - "__uuid__": "914aeb36-e7ab-4676-8016-8cf3a4fef6c6" - } - }, - { - "frame": 0.4, - "value": { - "__uuid__": "1c7a050e-c52b-4402-911d-bc2d9ffed627" - } - }, - { - "frame": 0.4166666666666667, - "value": { - "__uuid__": "74eaaf1d-5de5-411d-86d4-839022712426" - } - }, - { - "frame": 0.43333333333333335, - "value": { - "__uuid__": "b42fe407-2c81-4960-a697-0125815e1bc7" - } - }, - { - "frame": 0.45, - "value": { - "__uuid__": "9395f625-e627-4a0a-85cb-05f9b3a99d48" - } - }, - { - "frame": 0.4666666666666667, - "value": { - "__uuid__": "5805ad62-293f-4d81-ad59-ac290ba2e2d3" - } - }, - { - "frame": 0.48333333333333334, - "value": { - "__uuid__": "9c79bea6-dc45-4113-ace8-c7145cc889db" - } - }, - { - "frame": 0.5, - "value": { - "__uuid__": "cabc4d77-a49d-4c43-9144-01c5283fe206" - } - }, - { - "frame": 0.5166666666666667, - "value": { - "__uuid__": "0514d19b-a3ad-478d-99da-fa91190148b7" - } - }, - { - "frame": 0.5333333333333333, - "value": { - "__uuid__": "57646810-7598-4723-b12f-5e15e8299aaa" - } - }, - { - "frame": 0.55, - "value": { - "__uuid__": "65e5cbd3-15f3-4526-a347-db55ac24bf51" - } - }, - { - "frame": 0.5666666666666667, - "value": { - "__uuid__": "1555d6f4-1bdf-4b64-99b2-bb13195257f4" - } - }, - { - "frame": 0.5833333333333334, - "value": { - "__uuid__": "843e335d-fdb6-4a23-9949-3c81d977fb21" - } - }, - { - "frame": 0.6, - "value": { - "__uuid__": "781f66e7-dd7f-4ff5-a38e-9423762b4b52" - } - }, - { - "frame": 0.6166666666666667, - "value": { - "__uuid__": "ef990cae-899c-451f-91fd-7a42ac949534" - } - }, - { - "frame": 0.6333333333333333, - "value": { - "__uuid__": "a2df488a-e91b-46b0-8c25-2ba8551ab539" - } - }, - { - "frame": 0.65, - "value": { - "__uuid__": "6650a6e0-6ddd-42ec-af68-1a1a032e19b5" - } - }, - { - "frame": 0.6666666666666666, - "value": { - "__uuid__": "9a54c669-7f7d-41e4-8939-1853967d0dbf" - } - }, - { - "frame": 0.6833333333333333, - "value": { - "__uuid__": "da04432e-3845-465b-9ddf-ce2bd7c7174e" - } - }, - { - "frame": 0.7, - "value": { - "__uuid__": "aa7a792d-22dc-4d28-8d27-52ddfcd8d147" - } - }, - { - "frame": 0.7166666666666667, - "value": { - "__uuid__": "ceb00ecc-d391-4b19-b9d6-e53792590c46" - } - }, - { - "frame": 0.7333333333333333, - "value": { - "__uuid__": "33b3fa05-9894-4393-b9ce-f819c5818bf3" - } - }, - { - "frame": 0.75, - "value": { - "__uuid__": "972cc5ec-ca1c-4127-8e21-f339df92a4fd" - } - }, - { - "frame": 0.7666666666666667, - "value": { - "__uuid__": "3874c9de-2b47-4327-b4f8-c61d3896cefe" - } - }, - { - "frame": 0.7833333333333333, - "value": { - "__uuid__": "4a6f08e6-7f96-4451-8f71-7bee8cd63cf2" - } - }, - { - "frame": 0.8, - "value": { - "__uuid__": "256f3d2b-4cb9-4523-bf7a-c48380e249bb" - } - }, - { - "frame": 0.8166666666666667, - "value": { - "__uuid__": "4c40c070-9cba-44f9-acd6-2408f569f21c" - } - }, - { - "frame": 0.8333333333333334, - "value": { - "__uuid__": "454bfff4-b8a1-4f90-b708-bbf295b99498" - } - }, - { - "frame": 0.85, - "value": { - "__uuid__": "f0288374-f487-4870-b921-8baf851bb865" - } - }, - { - "frame": 0.8666666666666667, - "value": { - "__uuid__": "2fd06c6a-c3de-4b7f-bef7-1cba61c9909c" - } - }, - { - "frame": 0.8833333333333333, - "value": { - "__uuid__": "d4d08680-1b77-4b44-92bd-be27c03747fa" - } - }, - { - "frame": 0.9, - "value": { - "__uuid__": "5a85b0ce-7a4e-4d84-b4fb-089cdff45265" - } - }, - { - "frame": 0.9166666666666666, - "value": { - "__uuid__": "ac515982-6ac2-462c-b186-c4468b489e39" - } - }, - { - "frame": 0.9333333333333333, - "value": { - "__uuid__": "92571718-c75c-4c09-9aac-b1b043bb70a7" - } - }, - { - "frame": 0.95, - "value": { - "__uuid__": "a248383c-2cf6-487e-8941-a05f6c08bc60" - } - }, - { - "frame": 0.9666666666666667, - "value": { - "__uuid__": "c4f035dc-a01e-4b8e-a1b7-f4faf9515e99" - } - }, - { - "frame": 0.9833333333333333, - "value": { - "__uuid__": "a6f9c9b4-1129-4b6a-b4c3-2a3d425c746a" - } - }, - { - "frame": 1, - "value": { - "__uuid__": "d99d68fa-73c7-4057-98ec-9aa45864c050" - } - } - ] - } - } - }, - "events": [] -} \ No newline at end of file diff --git a/frontend/assets/resources/animation/UltramanTiga.meta b/frontend/assets/resources/animation/UltramanTiga.meta new file mode 100644 index 0000000..c22432b --- /dev/null +++ b/frontend/assets/resources/animation/UltramanTiga.meta @@ -0,0 +1,7 @@ +{ + "ver": "1.0.1", + "uuid": "d7459b4f-ba3f-4ead-9e0d-ec2387c9ee1f", + "isSubpackage": false, + "subpackageName": "", + "subMetas": {} +} \ No newline at end of file diff --git a/frontend/assets/resources/animation/UltramanTiga/Atk1.anim b/frontend/assets/resources/animation/UltramanTiga/Atk1.anim new file mode 100644 index 0000000..7562163 --- /dev/null +++ b/frontend/assets/resources/animation/UltramanTiga/Atk1.anim @@ -0,0 +1,43 @@ +{ + "__type__": "cc.AnimationClip", + "_name": "Atk1", + "_objFlags": 0, + "_native": "", + "_duration": 0.36666666666666664, + "sample": 60, + "speed": 1, + "wrapMode": 1, + "curveData": { + "comps": { + "cc.Sprite": { + "spriteFrame": [ + { + "frame": 0, + "value": { + "__uuid__": "a5607dff-7c39-47bc-8f27-86586f219387" + } + }, + { + "frame": 0.11666666666666667, + "value": { + "__uuid__": "bbcfe7c4-2341-4d58-b758-17920dbc4e0e" + } + }, + { + "frame": 0.2833333333333333, + "value": { + "__uuid__": "93e45cd6-652b-4732-8139-587170884ae4" + } + }, + { + "frame": 0.35, + "value": { + "__uuid__": "2c65c72d-34c0-424c-9a7e-2d961a68a1b6" + } + } + ] + } + } + }, + "events": [] +} \ No newline at end of file diff --git a/frontend/assets/resources/animation/SoldierFireGhost/frameAnim/Atk1.anim.meta b/frontend/assets/resources/animation/UltramanTiga/Atk1.anim.meta similarity index 100% rename from frontend/assets/resources/animation/SoldierFireGhost/frameAnim/Atk1.anim.meta rename to frontend/assets/resources/animation/UltramanTiga/Atk1.anim.meta diff --git a/frontend/assets/resources/animation/UltramanTiga/Atked1.anim b/frontend/assets/resources/animation/UltramanTiga/Atked1.anim new file mode 100644 index 0000000..9f67100 --- /dev/null +++ b/frontend/assets/resources/animation/UltramanTiga/Atked1.anim @@ -0,0 +1,25 @@ +{ + "__type__": "cc.AnimationClip", + "_name": "Atked1", + "_objFlags": 0, + "_native": "", + "_duration": 0.016666666666666666, + "sample": 60, + "speed": 1, + "wrapMode": 1, + "curveData": { + "comps": { + "cc.Sprite": { + "spriteFrame": [ + { + "frame": 0, + "value": { + "__uuid__": "26166514-7b99-4e18-a3ef-515718a7597f" + } + } + ] + } + } + }, + "events": [] +} \ No newline at end of file diff --git a/frontend/assets/resources/animation/SoldierFireGhost/frameAnim/Atked1.anim.meta b/frontend/assets/resources/animation/UltramanTiga/Atked1.anim.meta similarity index 100% rename from frontend/assets/resources/animation/SoldierFireGhost/frameAnim/Atked1.anim.meta rename to frontend/assets/resources/animation/UltramanTiga/Atked1.anim.meta diff --git a/frontend/assets/resources/animation/UltramanTiga/Idle1.anim b/frontend/assets/resources/animation/UltramanTiga/Idle1.anim new file mode 100644 index 0000000..fa8e269 --- /dev/null +++ b/frontend/assets/resources/animation/UltramanTiga/Idle1.anim @@ -0,0 +1,54 @@ +{ + "__type__": "cc.AnimationClip", + "_name": "Idle1", + "_objFlags": 0, + "_native": "", + "_duration": 0.11666666666666667, + "sample": 60, + "speed": 0.3, + "wrapMode": 2, + "curveData": { + "comps": { + "cc.Sprite": { + "spriteFrame": [ + { + "frame": 0, + "value": { + "__uuid__": "3437907b-f662-4805-9723-78839fd930f5" + } + }, + { + "frame": 0.03333333333333333, + "value": { + "__uuid__": "86de4c9c-202c-417b-abdb-7f5d4ae87045" + } + }, + { + "frame": 0.06666666666666667, + "value": { + "__uuid__": "2e8dd9ad-e227-405f-a22a-33079051e709" + } + }, + { + "frame": 0.1, + "value": { + "__uuid__": "03d976f3-4abb-40e9-85b9-ff532009b7ea" + } + } + ] + } + } + }, + "events": [ + { + "frame": 0, + "func": "", + "params": [] + }, + { + "frame": 0, + "func": "", + "params": [] + } + ] +} \ No newline at end of file diff --git a/frontend/assets/resources/animation/SoldierFireGhost/frameAnim/Idle1.anim.meta b/frontend/assets/resources/animation/UltramanTiga/Idle1.anim.meta similarity index 100% rename from frontend/assets/resources/animation/SoldierFireGhost/frameAnim/Idle1.anim.meta rename to frontend/assets/resources/animation/UltramanTiga/Idle1.anim.meta diff --git a/frontend/assets/resources/animation/UltramanTiga/InAirAtk1.anim b/frontend/assets/resources/animation/UltramanTiga/InAirAtk1.anim new file mode 100644 index 0000000..1b30099 --- /dev/null +++ b/frontend/assets/resources/animation/UltramanTiga/InAirAtk1.anim @@ -0,0 +1,37 @@ +{ + "__type__": "cc.AnimationClip", + "_name": "InAirAtk1", + "_objFlags": 0, + "_native": "", + "_duration": 0.35, + "sample": 60, + "speed": 1, + "wrapMode": 1, + "curveData": { + "comps": { + "cc.Sprite": { + "spriteFrame": [ + { + "frame": 0.016666666666666666, + "value": { + "__uuid__": "58e0a91a-e6ce-482d-8668-713867301837" + } + }, + { + "frame": 0.2, + "value": { + "__uuid__": "aca5205f-5749-42fa-be3b-4f4888faf766" + } + }, + { + "frame": 0.3333333333333333, + "value": { + "__uuid__": "d0f43a74-3f79-42b6-9d1e-a6c17c0cd07f" + } + } + ] + } + } + }, + "events": [] +} \ No newline at end of file diff --git a/frontend/assets/resources/animation/UltramanTiga/InAirAtk1.anim.meta b/frontend/assets/resources/animation/UltramanTiga/InAirAtk1.anim.meta new file mode 100644 index 0000000..dbaa0a4 --- /dev/null +++ b/frontend/assets/resources/animation/UltramanTiga/InAirAtk1.anim.meta @@ -0,0 +1,5 @@ +{ + "ver": "2.1.0", + "uuid": "8710591c-3f5e-4911-83e7-42cc18be6af9", + "subMetas": {} +} \ No newline at end of file diff --git a/frontend/assets/resources/animation/UltramanTiga/InAirIdle1.anim b/frontend/assets/resources/animation/UltramanTiga/InAirIdle1.anim new file mode 100644 index 0000000..3c7d530 --- /dev/null +++ b/frontend/assets/resources/animation/UltramanTiga/InAirIdle1.anim @@ -0,0 +1,25 @@ +{ + "__type__": "cc.AnimationClip", + "_name": "InAirIdle1", + "_objFlags": 0, + "_native": "", + "_duration": 0.016666666666666666, + "sample": 60, + "speed": 0.1, + "wrapMode": 2, + "curveData": { + "comps": { + "cc.Sprite": { + "spriteFrame": [ + { + "frame": 0, + "value": { + "__uuid__": "ca385337-356e-49eb-8081-36b1505411a2" + } + } + ] + } + } + }, + "events": [] +} \ No newline at end of file diff --git a/frontend/assets/resources/animation/SoldierFireGhost/frameAnim/InAirIdle1.anim.meta b/frontend/assets/resources/animation/UltramanTiga/InAirIdle1.anim.meta similarity index 100% rename from frontend/assets/resources/animation/SoldierFireGhost/frameAnim/InAirIdle1.anim.meta rename to frontend/assets/resources/animation/UltramanTiga/InAirIdle1.anim.meta diff --git a/frontend/assets/resources/animation/UltramanTiga/UltramanTiga.plist b/frontend/assets/resources/animation/UltramanTiga/UltramanTiga.plist new file mode 100644 index 0000000..5209d96 --- /dev/null +++ b/frontend/assets/resources/animation/UltramanTiga/UltramanTiga.plist @@ -0,0 +1,551 @@ + + + + + frames + + Atk1_1.png + + aliases + + spriteOffset + {0,0} + spriteSize + {74,85} + spriteSourceSize + {74,85} + textureRect + {{176,366},{74,85}} + textureRotated + + + Atk1_2.png + + aliases + + spriteOffset + {0,0} + spriteSize + {74,85} + spriteSourceSize + {74,85} + textureRect + {{0,375},{74,85}} + textureRotated + + + Atk1_3.png + + aliases + + spriteOffset + {0,0} + spriteSize + {74,85} + spriteSourceSize + {74,85} + textureRect + {{85,388},{74,85}} + textureRotated + + + Atk1_4.png + + aliases + + spriteOffset + {0,0} + spriteSize + {74,85} + spriteSourceSize + {74,85} + textureRect + {{0,449},{74,85}} + textureRotated + + + Atk1_5.png + + aliases + + spriteOffset + {0,0} + spriteSize + {74,85} + spriteSourceSize + {74,85} + textureRect + {{0,375},{74,85}} + textureRotated + + + Atk1_6.png + + aliases + + spriteOffset + {0,0} + spriteSize + {74,85} + spriteSourceSize + {74,85} + textureRect + {{85,462},{74,85}} + textureRotated + + + Atked1_1.png + + aliases + + spriteOffset + {0,0} + spriteSize + {47,82} + spriteSourceSize + {47,82} + textureRect + {{170,451},{47,82}} + textureRotated + + + Atked1_2.png + + aliases + + spriteOffset + {0,0} + spriteSize + {47,82} + spriteSourceSize + {47,82} + textureRect + {{170,498},{47,82}} + textureRotated + + + Idle1_1.png + + aliases + + spriteOffset + {0,0} + spriteSize + {56,86} + spriteSourceSize + {56,86} + textureRect + {{190,194},{56,86}} + textureRotated + + + Idle1_2.png + + aliases + + spriteOffset + {0,0} + spriteSize + {56,86} + spriteSourceSize + {56,86} + textureRect + {{185,280},{56,86}} + textureRotated + + + Idle1_3.png + + aliases + + spriteOffset + {0,0} + spriteSize + {56,86} + spriteSourceSize + {56,86} + textureRect + {{90,332},{56,86}} + textureRotated + + + Idle1_4.png + + aliases + + spriteOffset + {0,0} + spriteSize + {56,86} + spriteSourceSize + {56,86} + textureRect + {{185,280},{56,86}} + textureRotated + + + InAirAtk1_1.png + + aliases + + spriteOffset + {0,0} + spriteSize + {63,95} + spriteSourceSize + {63,95} + textureRect + {{104,43},{63,95}} + textureRotated + + + InAirAtk1_2.png + + aliases + + spriteOffset + {0,0} + spriteSize + {63,95} + spriteSourceSize + {63,95} + textureRect + {{0,86},{63,95}} + textureRotated + + + InAirAtk1_3.png + + aliases + + spriteOffset + {0,0} + spriteSize + {63,95} + spriteSourceSize + {63,95} + textureRect + {{95,106},{63,95}} + textureRotated + + + InAirAtk1_4.png + + aliases + + spriteOffset + {0,0} + spriteSize + {63,95} + spriteSourceSize + {63,95} + textureRect + {{0,149},{63,95}} + textureRotated + + + InAirAtk1_5.png + + aliases + + spriteOffset + {0,0} + spriteSize + {63,95} + spriteSourceSize + {63,95} + textureRect + {{104,43},{63,95}} + textureRotated + + + InAirAtk1_6.png + + aliases + + spriteOffset + {0,0} + spriteSize + {63,95} + spriteSourceSize + {63,95} + textureRect + {{95,169},{63,95}} + textureRotated + + + InAirAtk1_7.png + + aliases + + spriteOffset + {0,0} + spriteSize + {63,95} + spriteSourceSize + {63,95} + textureRect + {{0,212},{63,95}} + textureRotated + + + InAirAtked1_1.png + + aliases + + spriteOffset + {0,0} + spriteSize + {47,82} + spriteSourceSize + {47,82} + textureRect + {{170,451},{47,82}} + textureRotated + + + InAirAtked1_2.png + + aliases + + spriteOffset + {0,0} + spriteSize + {47,82} + spriteSourceSize + {47,82} + textureRect + {{170,498},{47,82}} + textureRotated + + + InAirIdle1_1.png + + aliases + + spriteOffset + {0,0} + spriteSize + {43,104} + spriteSourceSize + {43,104} + textureRect + {{0,0},{43,104}} + textureRotated + + + InAirIdle1_2.png + + aliases + + spriteOffset + {0,0} + spriteSize + {43,104} + spriteSourceSize + {43,104} + textureRect + {{104,0},{43,104}} + textureRotated + + + InAirIdle1_3.png + + aliases + + spriteOffset + {0,0} + spriteSize + {43,104} + spriteSourceSize + {43,104} + textureRect + {{208,0},{43,104}} + textureRotated + + + InAirIdle1_4.png + + aliases + + spriteOffset + {0,0} + spriteSize + {43,104} + spriteSourceSize + {43,104} + textureRect + {{104,0},{43,104}} + textureRotated + + + InAirIdle1_5.png + + aliases + + spriteOffset + {0,0} + spriteSize + {43,104} + spriteSourceSize + {43,104} + textureRect + {{0,0},{43,104}} + textureRotated + + + InAirIdle1_6.png + + aliases + + spriteOffset + {0,0} + spriteSize + {43,104} + spriteSourceSize + {43,104} + textureRect + {{0,43},{43,104}} + textureRotated + + + Walking_1.png + + aliases + + spriteOffset + {0,0} + spriteSize + {50,90} + spriteSourceSize + {50,90} + textureRect + {{199,104},{50,90}} + textureRotated + + + Walking_2.png + + aliases + + spriteOffset + {0,0} + spriteSize + {50,90} + spriteSourceSize + {50,90} + textureRect + {{95,232},{50,90}} + textureRotated + + + Walking_3.png + + aliases + + spriteOffset + {0,0} + spriteSize + {50,90} + spriteSourceSize + {50,90} + textureRect + {{0,275},{50,90}} + textureRotated + + + Walking_4.png + + aliases + + spriteOffset + {0,0} + spriteSize + {50,90} + spriteSourceSize + {50,90} + textureRect + {{90,282},{50,90}} + textureRotated + + + Walking_5.png + + aliases + + spriteOffset + {0,0} + spriteSize + {50,90} + spriteSourceSize + {50,90} + textureRect + {{0,325},{50,90}} + textureRotated + + + Walking_6.png + + aliases + + spriteOffset + {0,0} + spriteSize + {50,90} + spriteSourceSize + {50,90} + textureRect + {{90,282},{50,90}} + textureRotated + + + Walking_7.png + + aliases + + spriteOffset + {0,0} + spriteSize + {50,90} + spriteSourceSize + {50,90} + textureRect + {{0,275},{50,90}} + textureRotated + + + Walking_8.png + + aliases + + spriteOffset + {0,0} + spriteSize + {50,90} + spriteSourceSize + {50,90} + textureRect + {{95,232},{50,90}} + textureRotated + + + + metadata + + format + 3 + pixelFormat + RGBA8888 + premultiplyAlpha + + realTextureFileName + UltramanTiga.png + size + {252,545} + smartupdate + $TexturePacker:SmartUpdate:4a857ca23ea86a140850bef35b0258da:88d012415ccd7dd313108f39b071523a:1c886ab62fdbd8d1a0c538b1b57b3521$ + textureFileName + UltramanTiga.png + + + diff --git a/frontend/assets/resources/animation/UltramanTiga/UltramanTiga.plist.meta b/frontend/assets/resources/animation/UltramanTiga/UltramanTiga.plist.meta new file mode 100644 index 0000000..1817396 --- /dev/null +++ b/frontend/assets/resources/animation/UltramanTiga/UltramanTiga.plist.meta @@ -0,0 +1,782 @@ +{ + "ver": "1.2.4", + "uuid": "5d522f7b-359b-4f38-ac35-55fdbee56cae", + "rawTextureUuid": "b4ea3971-8f28-4cc7-96a4-83f10dce229f", + "size": { + "width": 252, + "height": 545 + }, + "type": "Texture Packer", + "subMetas": { + "Atk1_1.png": { + "ver": "1.0.4", + "uuid": "8e9ca384-97ec-4e75-a285-6d74d64a3c3c", + "rawTextureUuid": "b4ea3971-8f28-4cc7-96a4-83f10dce229f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 176, + "trimY": 366, + "width": 74, + "height": 85, + "rawWidth": 74, + "rawHeight": 85, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "Atk1_2.png": { + "ver": "1.0.4", + "uuid": "a5607dff-7c39-47bc-8f27-86586f219387", + "rawTextureUuid": "b4ea3971-8f28-4cc7-96a4-83f10dce229f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 375, + "width": 74, + "height": 85, + "rawWidth": 74, + "rawHeight": 85, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "Atk1_3.png": { + "ver": "1.0.4", + "uuid": "bbcfe7c4-2341-4d58-b758-17920dbc4e0e", + "rawTextureUuid": "b4ea3971-8f28-4cc7-96a4-83f10dce229f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 85, + "trimY": 388, + "width": 74, + "height": 85, + "rawWidth": 74, + "rawHeight": 85, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "Atk1_4.png": { + "ver": "1.0.4", + "uuid": "93e45cd6-652b-4732-8139-587170884ae4", + "rawTextureUuid": "b4ea3971-8f28-4cc7-96a4-83f10dce229f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 449, + "width": 74, + "height": 85, + "rawWidth": 74, + "rawHeight": 85, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "Atk1_5.png": { + "ver": "1.0.4", + "uuid": "2c65c72d-34c0-424c-9a7e-2d961a68a1b6", + "rawTextureUuid": "b4ea3971-8f28-4cc7-96a4-83f10dce229f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 375, + "width": 74, + "height": 85, + "rawWidth": 74, + "rawHeight": 85, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "Atk1_6.png": { + "ver": "1.0.4", + "uuid": "d977ee77-cde3-47be-b63d-82a5b116b69a", + "rawTextureUuid": "b4ea3971-8f28-4cc7-96a4-83f10dce229f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 85, + "trimY": 462, + "width": 74, + "height": 85, + "rawWidth": 74, + "rawHeight": 85, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "Atked1_1.png": { + "ver": "1.0.4", + "uuid": "26166514-7b99-4e18-a3ef-515718a7597f", + "rawTextureUuid": "b4ea3971-8f28-4cc7-96a4-83f10dce229f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 170, + "trimY": 451, + "width": 47, + "height": 82, + "rawWidth": 47, + "rawHeight": 82, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "Atked1_2.png": { + "ver": "1.0.4", + "uuid": "98d06843-f140-4d6a-9aa6-0949a1690dca", + "rawTextureUuid": "b4ea3971-8f28-4cc7-96a4-83f10dce229f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 170, + "trimY": 498, + "width": 47, + "height": 82, + "rawWidth": 47, + "rawHeight": 82, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "Idle1_1.png": { + "ver": "1.0.4", + "uuid": "3437907b-f662-4805-9723-78839fd930f5", + "rawTextureUuid": "b4ea3971-8f28-4cc7-96a4-83f10dce229f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 190, + "trimY": 194, + "width": 56, + "height": 86, + "rawWidth": 56, + "rawHeight": 86, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "Idle1_2.png": { + "ver": "1.0.4", + "uuid": "86de4c9c-202c-417b-abdb-7f5d4ae87045", + "rawTextureUuid": "b4ea3971-8f28-4cc7-96a4-83f10dce229f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 185, + "trimY": 280, + "width": 56, + "height": 86, + "rawWidth": 56, + "rawHeight": 86, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "Idle1_3.png": { + "ver": "1.0.4", + "uuid": "2e8dd9ad-e227-405f-a22a-33079051e709", + "rawTextureUuid": "b4ea3971-8f28-4cc7-96a4-83f10dce229f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 90, + "trimY": 332, + "width": 56, + "height": 86, + "rawWidth": 56, + "rawHeight": 86, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "Idle1_4.png": { + "ver": "1.0.4", + "uuid": "03d976f3-4abb-40e9-85b9-ff532009b7ea", + "rawTextureUuid": "b4ea3971-8f28-4cc7-96a4-83f10dce229f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 185, + "trimY": 280, + "width": 56, + "height": 86, + "rawWidth": 56, + "rawHeight": 86, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "InAirAtk1_1.png": { + "ver": "1.0.4", + "uuid": "d0f43a74-3f79-42b6-9d1e-a6c17c0cd07f", + "rawTextureUuid": "b4ea3971-8f28-4cc7-96a4-83f10dce229f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 104, + "trimY": 43, + "width": 63, + "height": 95, + "rawWidth": 63, + "rawHeight": 95, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "InAirAtk1_2.png": { + "ver": "1.0.4", + "uuid": "58e0a91a-e6ce-482d-8668-713867301837", + "rawTextureUuid": "b4ea3971-8f28-4cc7-96a4-83f10dce229f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 86, + "width": 63, + "height": 95, + "rawWidth": 63, + "rawHeight": 95, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "InAirAtk1_3.png": { + "ver": "1.0.4", + "uuid": "aca5205f-5749-42fa-be3b-4f4888faf766", + "rawTextureUuid": "b4ea3971-8f28-4cc7-96a4-83f10dce229f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 95, + "trimY": 106, + "width": 63, + "height": 95, + "rawWidth": 63, + "rawHeight": 95, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "InAirAtk1_4.png": { + "ver": "1.0.4", + "uuid": "4b08f81b-4412-4d98-aa39-11fc140b00a2", + "rawTextureUuid": "b4ea3971-8f28-4cc7-96a4-83f10dce229f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 149, + "width": 63, + "height": 95, + "rawWidth": 63, + "rawHeight": 95, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "InAirAtk1_5.png": { + "ver": "1.0.4", + "uuid": "618142b5-4eb9-4b06-948c-9346381af4b4", + "rawTextureUuid": "b4ea3971-8f28-4cc7-96a4-83f10dce229f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 104, + "trimY": 43, + "width": 63, + "height": 95, + "rawWidth": 63, + "rawHeight": 95, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "InAirAtk1_6.png": { + "ver": "1.0.4", + "uuid": "caf2aac4-bb75-41f2-8deb-334b20b36cc2", + "rawTextureUuid": "b4ea3971-8f28-4cc7-96a4-83f10dce229f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 95, + "trimY": 169, + "width": 63, + "height": 95, + "rawWidth": 63, + "rawHeight": 95, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "InAirAtk1_7.png": { + "ver": "1.0.4", + "uuid": "b5368d17-52da-4a4b-82e9-7808a973a16d", + "rawTextureUuid": "b4ea3971-8f28-4cc7-96a4-83f10dce229f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 212, + "width": 63, + "height": 95, + "rawWidth": 63, + "rawHeight": 95, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "InAirAtked1_1.png": { + "ver": "1.0.4", + "uuid": "e643e1e4-6a6a-4c73-995c-d49e3c4c750c", + "rawTextureUuid": "b4ea3971-8f28-4cc7-96a4-83f10dce229f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 170, + "trimY": 451, + "width": 47, + "height": 82, + "rawWidth": 47, + "rawHeight": 82, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "InAirAtked1_2.png": { + "ver": "1.0.4", + "uuid": "982e48da-cac3-4c1e-96f6-3c659c43ecdd", + "rawTextureUuid": "b4ea3971-8f28-4cc7-96a4-83f10dce229f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 170, + "trimY": 498, + "width": 47, + "height": 82, + "rawWidth": 47, + "rawHeight": 82, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "InAirIdle1_1.png": { + "ver": "1.0.4", + "uuid": "55dc7736-f0bc-46b8-9705-efcdb19ddb85", + "rawTextureUuid": "b4ea3971-8f28-4cc7-96a4-83f10dce229f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 43, + "height": 104, + "rawWidth": 43, + "rawHeight": 104, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "InAirIdle1_2.png": { + "ver": "1.0.4", + "uuid": "5a18d76d-6e98-43c9-8f0a-99111256e1d5", + "rawTextureUuid": "b4ea3971-8f28-4cc7-96a4-83f10dce229f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 104, + "trimY": 0, + "width": 43, + "height": 104, + "rawWidth": 43, + "rawHeight": 104, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "InAirIdle1_3.png": { + "ver": "1.0.4", + "uuid": "7c0bb61d-15f8-4d41-9225-2a1f339b80b1", + "rawTextureUuid": "b4ea3971-8f28-4cc7-96a4-83f10dce229f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 208, + "trimY": 0, + "width": 43, + "height": 104, + "rawWidth": 43, + "rawHeight": 104, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "InAirIdle1_4.png": { + "ver": "1.0.4", + "uuid": "7cb60116-3f96-44bb-9bf7-6fbfc2ca9772", + "rawTextureUuid": "b4ea3971-8f28-4cc7-96a4-83f10dce229f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 104, + "trimY": 0, + "width": 43, + "height": 104, + "rawWidth": 43, + "rawHeight": 104, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "InAirIdle1_5.png": { + "ver": "1.0.4", + "uuid": "e8d32f3e-0b66-4b35-b4ed-7823a047cc88", + "rawTextureUuid": "b4ea3971-8f28-4cc7-96a4-83f10dce229f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 43, + "height": 104, + "rawWidth": 43, + "rawHeight": 104, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "InAirIdle1_6.png": { + "ver": "1.0.4", + "uuid": "ca385337-356e-49eb-8081-36b1505411a2", + "rawTextureUuid": "b4ea3971-8f28-4cc7-96a4-83f10dce229f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 43, + "width": 43, + "height": 104, + "rawWidth": 43, + "rawHeight": 104, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "Walking_1.png": { + "ver": "1.0.4", + "uuid": "b706e9a2-827e-42bc-9920-c0e644eb8a75", + "rawTextureUuid": "b4ea3971-8f28-4cc7-96a4-83f10dce229f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 199, + "trimY": 104, + "width": 50, + "height": 90, + "rawWidth": 50, + "rawHeight": 90, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "Walking_2.png": { + "ver": "1.0.4", + "uuid": "f9141513-f9b3-4fc8-8900-b793294c82c6", + "rawTextureUuid": "b4ea3971-8f28-4cc7-96a4-83f10dce229f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 95, + "trimY": 232, + "width": 50, + "height": 90, + "rawWidth": 50, + "rawHeight": 90, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "Walking_3.png": { + "ver": "1.0.4", + "uuid": "6e12b8d0-488c-4885-9b4a-712af055be78", + "rawTextureUuid": "b4ea3971-8f28-4cc7-96a4-83f10dce229f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 275, + "width": 50, + "height": 90, + "rawWidth": 50, + "rawHeight": 90, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "Walking_4.png": { + "ver": "1.0.4", + "uuid": "a4be80d2-4593-4d92-994b-de7fc66642f0", + "rawTextureUuid": "b4ea3971-8f28-4cc7-96a4-83f10dce229f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 90, + "trimY": 282, + "width": 50, + "height": 90, + "rawWidth": 50, + "rawHeight": 90, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "Walking_5.png": { + "ver": "1.0.4", + "uuid": "bc355af2-caa1-4458-be7f-f84184d27c11", + "rawTextureUuid": "b4ea3971-8f28-4cc7-96a4-83f10dce229f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 325, + "width": 50, + "height": 90, + "rawWidth": 50, + "rawHeight": 90, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "Walking_6.png": { + "ver": "1.0.4", + "uuid": "4fa095aa-f08d-4baa-84c9-10e8eac6ea01", + "rawTextureUuid": "b4ea3971-8f28-4cc7-96a4-83f10dce229f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 90, + "trimY": 282, + "width": 50, + "height": 90, + "rawWidth": 50, + "rawHeight": 90, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "Walking_7.png": { + "ver": "1.0.4", + "uuid": "01424fa9-4b4b-472a-ae90-923d0877fb66", + "rawTextureUuid": "b4ea3971-8f28-4cc7-96a4-83f10dce229f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 275, + "width": 50, + "height": 90, + "rawWidth": 50, + "rawHeight": 90, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + }, + "Walking_8.png": { + "ver": "1.0.4", + "uuid": "5d8fe180-61eb-448d-bbcf-100d1763ebc8", + "rawTextureUuid": "b4ea3971-8f28-4cc7-96a4-83f10dce229f", + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 95, + "trimY": 232, + "width": 50, + "height": 90, + "rawWidth": 50, + "rawHeight": 90, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "spriteType": "normal", + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/frontend/assets/resources/animation/UltramanTiga/UltramanTiga.png b/frontend/assets/resources/animation/UltramanTiga/UltramanTiga.png new file mode 100644 index 0000000..a9a0e87 Binary files /dev/null and b/frontend/assets/resources/animation/UltramanTiga/UltramanTiga.png differ diff --git a/frontend/assets/resources/animation/UltramanTiga/UltramanTiga.png.meta b/frontend/assets/resources/animation/UltramanTiga/UltramanTiga.png.meta new file mode 100644 index 0000000..2381a93 --- /dev/null +++ b/frontend/assets/resources/animation/UltramanTiga/UltramanTiga.png.meta @@ -0,0 +1,12 @@ +{ + "ver": "2.3.3", + "uuid": "b4ea3971-8f28-4cc7-96a4-83f10dce229f", + "type": "raw", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "platformSettings": {}, + "subMetas": {} +} \ No newline at end of file diff --git a/frontend/assets/resources/animation/UltramanTiga/Walking.anim b/frontend/assets/resources/animation/UltramanTiga/Walking.anim new file mode 100644 index 0000000..69358cd --- /dev/null +++ b/frontend/assets/resources/animation/UltramanTiga/Walking.anim @@ -0,0 +1,67 @@ +{ + "__type__": "cc.AnimationClip", + "_name": "Walking", + "_objFlags": 0, + "_native": "", + "_duration": 0.36666666666666664, + "sample": 60, + "speed": 1, + "wrapMode": 2, + "curveData": { + "comps": { + "cc.Sprite": { + "spriteFrame": [ + { + "frame": 0, + "value": { + "__uuid__": "b706e9a2-827e-42bc-9920-c0e644eb8a75" + } + }, + { + "frame": 0.05, + "value": { + "__uuid__": "f9141513-f9b3-4fc8-8900-b793294c82c6" + } + }, + { + "frame": 0.1, + "value": { + "__uuid__": "6e12b8d0-488c-4885-9b4a-712af055be78" + } + }, + { + "frame": 0.16666666666666666, + "value": { + "__uuid__": "a4be80d2-4593-4d92-994b-de7fc66642f0" + } + }, + { + "frame": 0.21666666666666667, + "value": { + "__uuid__": "bc355af2-caa1-4458-be7f-f84184d27c11" + } + }, + { + "frame": 0.26666666666666666, + "value": { + "__uuid__": "4fa095aa-f08d-4baa-84c9-10e8eac6ea01" + } + }, + { + "frame": 0.31666666666666665, + "value": { + "__uuid__": "01424fa9-4b4b-472a-ae90-923d0877fb66" + } + }, + { + "frame": 0.35, + "value": { + "__uuid__": "5d8fe180-61eb-448d-bbcf-100d1763ebc8" + } + } + ] + } + } + }, + "events": [] +} \ No newline at end of file diff --git a/frontend/assets/resources/animation/SoldierFireGhost/frameAnim/Walking.anim.meta b/frontend/assets/resources/animation/UltramanTiga/Walking.anim.meta similarity index 100% rename from frontend/assets/resources/animation/SoldierFireGhost/frameAnim/Walking.anim.meta rename to frontend/assets/resources/animation/UltramanTiga/Walking.anim.meta diff --git a/frontend/assets/resources/map/dungeon/map.tmx b/frontend/assets/resources/map/dungeon/map.tmx index 8a35325..8257f31 100644 --- a/frontend/assets/resources/map/dungeon/map.tmx +++ b/frontend/assets/resources/map/dungeon/map.tmx @@ -9,10 +9,10 @@ - + - + diff --git a/frontend/assets/resources/prefabs/ControlledCharacter.prefab b/frontend/assets/resources/prefabs/ControlledCharacter.prefab index 78a69a8..8fdcd12 100644 --- a/frontend/assets/resources/prefabs/ControlledCharacter.prefab +++ b/frontend/assets/resources/prefabs/ControlledCharacter.prefab @@ -779,7 +779,7 @@ }, { "__type__": "cc.Node", - "_name": "SoldierFireGhostFrameAnim", + "_name": "UltramanTiga", "_objFlags": 0, "_parent": { "__id__": 11 @@ -826,8 +826,8 @@ 0, 0, 1, - 1, - 1, + 0.7, + 0.7, 1 ] }, @@ -870,7 +870,7 @@ "__uuid__": "43dbf141-be76-48c3-bdef-29233ccbe30d" }, { - "__uuid__": "c738236a-0702-45f8-aa38-99457b051997" + "__uuid__": "8710591c-3f5e-4911-83e7-42cc18be6af9" }, { "__uuid__": "c69bcceb-d7d1-4e33-9623-e2a374a0a6b6" @@ -907,7 +907,7 @@ "_fillRange": 0, "_isTrimmedMode": true, "_atlas": { - "__uuid__": "145769c8-a259-42bc-8cce-6e035f493c70" + "__uuid__": "5d522f7b-359b-4f38-ac35-55fdbee56cae" }, "_id": "" }, @@ -919,7 +919,7 @@ "asset": { "__uuid__": "59bff7a2-23e1-4d69-bce7-afb37eae196a" }, - "fileId": "4c+Ci1MGpP47N3wJ0ujhEm", + "fileId": "17JdhftghBYr81MfV9i6cy", "sync": false }, { diff --git a/frontend/assets/scenes/default_map.fire b/frontend/assets/scenes/default_map.fire index 413cc5b..a89dd91 100644 --- a/frontend/assets/scenes/default_map.fire +++ b/frontend/assets/scenes/default_map.fire @@ -78,19 +78,19 @@ "_active": true, "_components": [ { - "__id__": 29 + "__id__": 37 }, { - "__id__": 30 + "__id__": 38 }, { - "__id__": 31 + "__id__": 39 }, { - "__id__": 32 + "__id__": 40 }, { - "__id__": 33 + "__id__": 41 } ], "_prefab": null, @@ -158,7 +158,7 @@ "__id__": 5 }, { - "__id__": 28 + "__id__": 36 } ], "_prefab": null, @@ -279,13 +279,13 @@ }, "_children": [ { - "__id__": 22 + "__id__": 30 } ], "_active": true, "_components": [ { - "__id__": 27 + "__id__": 35 } ], "_prefab": null, @@ -352,6 +352,12 @@ }, { "__id__": 20 + }, + { + "__id__": 22 + }, + { + "__id__": 26 } ], "_active": true, @@ -447,7 +453,7 @@ "array": [ 0, 0, - 216.50635094610968, + 215.81269742929726, 0, 0, 0, @@ -1043,10 +1049,10 @@ }, { "__type__": "cc.Node", - "_name": "JoystickBG", + "_name": "BtnA", "_objFlags": 0, "_parent": { - "__id__": 6 + "__id__": 7 }, "_children": [ { @@ -1054,12 +1060,70 @@ } ], "_active": true, + "_components": [], + "_prefab": null, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 200, + "height": 200 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 143.689, + -584.849, + 0, + 0, + 0, + 0, + 1, + 0.66667, + 0.66667, + 0.66667 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "35ITFOFadFX5FVNVNUZbrn" + }, + { + "__type__": "cc.Node", + "_name": "Background", + "_objFlags": 0, + "_parent": { + "__id__": 22 + }, + "_children": [], + "_active": true, "_components": [ { - "__id__": 25 + "__id__": 24 }, { - "__id__": 26 + "__id__": 25 } ], "_prefab": null, @@ -1073,8 +1137,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 400, - "height": 400 + "width": 200, + "height": 200 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1108,6 +1172,324 @@ "_is3DNode": false, "_groupIndex": 0, "groupIndex": 0, + "_id": "8f/j+BH3VFzowR9kS36/D8" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 23 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "350fd890-3d28-4e53-9dfa-1bf00d857737" + }, + "_type": 1, + "_sizeMode": 0, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": { + "__uuid__": "030d9286-e8a2-40cf-98f8-baf713f0b8c4" + }, + "_id": "bdYe//0u9Dj79RLi8Rt6un" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 23 + }, + "_enabled": true, + "alignMode": 0, + "_target": null, + "_alignFlags": 45, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_verticalCenter": 0, + "_horizontalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 100, + "_originalHeight": 40, + "_id": "98p5OL5fdGep1z6jWXKTu9" + }, + { + "__type__": "cc.Node", + "_name": "BtnB", + "_objFlags": 0, + "_parent": { + "__id__": 7 + }, + "_children": [ + { + "__id__": 27 + } + ], + "_active": true, + "_components": [], + "_prefab": null, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 200, + "height": 200 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 370.368, + -424.647, + 0, + 0, + 0, + 0, + 1, + 0.66667, + 0.66667, + 0.66667 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "92c5tbNsZPG7f09UQLXv+j" + }, + { + "__type__": "cc.Node", + "_name": "Background", + "_objFlags": 0, + "_parent": { + "__id__": 26 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 28 + }, + { + "__id__": 29 + } + ], + "_prefab": null, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 200, + "height": 200 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + -1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "96xSPG8lxPZIsW+n65WcbU" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 27 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "a2170e4c-df31-41ef-be73-f4f605e75821" + }, + "_type": 1, + "_sizeMode": 0, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": { + "__uuid__": "030d9286-e8a2-40cf-98f8-baf713f0b8c4" + }, + "_id": "2euUQEzg9FdZu2ijWBxgrr" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 27 + }, + "_enabled": true, + "alignMode": 0, + "_target": null, + "_alignFlags": 45, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_verticalCenter": 0, + "_horizontalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 100, + "_originalHeight": 40, + "_id": "5bXB50moJH9aH7RcbRuSS5" + }, + { + "__type__": "cc.Node", + "_name": "JoystickBG", + "_objFlags": 0, + "_parent": { + "__id__": 6 + }, + "_children": [ + { + "__id__": 31 + } + ], + "_active": true, + "_components": [ + { + "__id__": 33 + }, + { + "__id__": 34 + } + ], + "_prefab": null, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 400, + "height": 400 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + -380, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, "_id": "88u3wQvvdO8pbrNWhs3ifP" }, { @@ -1115,13 +1497,13 @@ "_name": "Joystick", "_objFlags": 0, "_parent": { - "__id__": 22 + "__id__": 30 }, "_children": [], "_active": true, "_components": [ { - "__id__": 24 + "__id__": 32 } ], "_prefab": null, @@ -1177,7 +1559,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 23 + "__id__": 31 }, "_enabled": true, "_materials": [ @@ -1211,7 +1593,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 22 + "__id__": 30 }, "_enabled": true, "_materials": [ @@ -1245,7 +1627,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 22 + "__id__": 30 }, "_enabled": true, "alignMode": 0, @@ -1408,10 +1790,10 @@ "__id__": 3 }, "stickhead": { - "__id__": 23 + "__id__": 31 }, "base": { - "__id__": 22 + "__id__": 30 }, "joyStickEps": 0.1, "magicLeanLowerBound": 0.414, @@ -1431,6 +1813,12 @@ }, "linearMovingEps": 0.1, "scaleByEps": 0.0375, + "btnA": { + "__id__": 22 + }, + "btnB": { + "__id__": 26 + }, "_id": "e9oVYTr7ROlpp/IrNjBUmR" } ] \ No newline at end of file diff --git a/frontend/assets/scenes/login.fire b/frontend/assets/scenes/login.fire index 020e9a8..2434b03 100644 --- a/frontend/assets/scenes/login.fire +++ b/frontend/assets/scenes/login.fire @@ -440,7 +440,7 @@ "array": [ 0, 0, - 216.05530045313827, + 215.81269742929726, 0, 0, 0, diff --git a/frontend/assets/scenes/offline_map_1.fire b/frontend/assets/scenes/offline_map_1.fire index 9e6102e..856191e 100644 --- a/frontend/assets/scenes/offline_map_1.fire +++ b/frontend/assets/scenes/offline_map_1.fire @@ -78,19 +78,19 @@ "_active": true, "_components": [ { - "__id__": 19 + "__id__": 27 }, { - "__id__": 20 + "__id__": 28 }, { - "__id__": 21 + "__id__": 29 }, { - "__id__": 22 + "__id__": 30 }, { - "__id__": 23 + "__id__": 31 } ], "_prefab": null, @@ -289,13 +289,13 @@ }, "_children": [ { - "__id__": 13 + "__id__": 21 } ], "_active": true, "_components": [ { - "__id__": 18 + "__id__": 26 } ], "_prefab": null, @@ -359,6 +359,12 @@ }, { "__id__": 11 + }, + { + "__id__": 13 + }, + { + "__id__": 17 } ], "_active": true, @@ -454,7 +460,7 @@ "array": [ 0, 0, - 209.73151519075364, + 215.81269742929726, 0, 0, 0, @@ -607,10 +613,10 @@ }, { "__type__": "cc.Node", - "_name": "JoystickBG", + "_name": "BtnA", "_objFlags": 0, "_parent": { - "__id__": 7 + "__id__": 8 }, "_children": [ { @@ -618,12 +624,70 @@ } ], "_active": true, + "_components": [], + "_prefab": null, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 200, + "height": 200 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 143.689, + -584.849, + 0, + 0, + 0, + 0, + 1, + 0.66667, + 0.66667, + 0.66667 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "a5pbciqqBEiYlyy7SLwP4V" + }, + { + "__type__": "cc.Node", + "_name": "Background", + "_objFlags": 0, + "_parent": { + "__id__": 13 + }, + "_children": [], + "_active": true, "_components": [ { - "__id__": 16 + "__id__": 15 }, { - "__id__": 17 + "__id__": 16 } ], "_prefab": null, @@ -637,8 +701,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 400, - "height": 400 + "width": 200, + "height": 200 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -672,6 +736,324 @@ "_is3DNode": false, "_groupIndex": 0, "groupIndex": 0, + "_id": "ffojLoj41JCpizkLkManxw" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 14 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "350fd890-3d28-4e53-9dfa-1bf00d857737" + }, + "_type": 1, + "_sizeMode": 0, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": { + "__uuid__": "030d9286-e8a2-40cf-98f8-baf713f0b8c4" + }, + "_id": "21Oz9QwBZPALzRoJujKVPG" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 14 + }, + "_enabled": true, + "alignMode": 0, + "_target": null, + "_alignFlags": 45, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_verticalCenter": 0, + "_horizontalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 100, + "_originalHeight": 40, + "_id": "beUmgK1D1M07I7kTL4NFLK" + }, + { + "__type__": "cc.Node", + "_name": "BtnB", + "_objFlags": 0, + "_parent": { + "__id__": 8 + }, + "_children": [ + { + "__id__": 18 + } + ], + "_active": true, + "_components": [], + "_prefab": null, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 200, + "height": 200 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 370.368, + -424.647, + 0, + 0, + 0, + 0, + 1, + 0.66667, + 0.66667, + 0.66667 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "9eZHUAtItPMKp7OrItdaWA" + }, + { + "__type__": "cc.Node", + "_name": "Background", + "_objFlags": 0, + "_parent": { + "__id__": 17 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 19 + }, + { + "__id__": 20 + } + ], + "_prefab": null, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 200, + "height": 200 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + -1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "e2JXxje+hAC7LjZqzgq8RF" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 18 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "a2170e4c-df31-41ef-be73-f4f605e75821" + }, + "_type": 1, + "_sizeMode": 0, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": { + "__uuid__": "030d9286-e8a2-40cf-98f8-baf713f0b8c4" + }, + "_id": "54DvUzQvpKMrmsuRaQRSxf" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 18 + }, + "_enabled": true, + "alignMode": 0, + "_target": null, + "_alignFlags": 45, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_verticalCenter": 0, + "_horizontalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 100, + "_originalHeight": 40, + "_id": "5fVLGAIhROj6UDGotnneup" + }, + { + "__type__": "cc.Node", + "_name": "JoystickBG", + "_objFlags": 0, + "_parent": { + "__id__": 7 + }, + "_children": [ + { + "__id__": 22 + } + ], + "_active": true, + "_components": [ + { + "__id__": 24 + }, + { + "__id__": 25 + } + ], + "_prefab": null, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 400, + "height": 400 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + -380, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, "_id": "88u3wQvvdO8pbrNWhs3ifP" }, { @@ -679,13 +1061,13 @@ "_name": "Joystick", "_objFlags": 0, "_parent": { - "__id__": 13 + "__id__": 21 }, "_children": [], "_active": true, "_components": [ { - "__id__": 15 + "__id__": 23 } ], "_prefab": null, @@ -741,7 +1123,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 14 + "__id__": 22 }, "_enabled": true, "_materials": [ @@ -775,7 +1157,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 13 + "__id__": 21 }, "_enabled": true, "_materials": [ @@ -809,7 +1191,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 13 + "__id__": 21 }, "_enabled": true, "alignMode": 0, @@ -944,10 +1326,10 @@ "__id__": 3 }, "stickhead": { - "__id__": 14 + "__id__": 22 }, "base": { - "__id__": 13 + "__id__": 21 }, "joyStickEps": 0.1, "magicLeanLowerBound": 0.414, @@ -967,6 +1349,12 @@ }, "linearMovingEps": 0.1, "scaleByEps": 0.0375, + "btnA": { + "__id__": 13 + }, + "btnB": { + "__id__": 17 + }, "_id": "e9oVYTr7ROlpp/IrNjBUmR" } ] \ No newline at end of file diff --git a/frontend/assets/scripts/AttackingCharacter.js b/frontend/assets/scripts/AttackingCharacter.js index 0304d82..8fa622b 100644 --- a/frontend/assets/scripts/AttackingCharacter.js +++ b/frontend/assets/scripts/AttackingCharacter.js @@ -98,7 +98,7 @@ cc.Class({ } let newCharacterState = rdfPlayer.characterState; - const newAnimName = window.ATK_CHARACTER_STATE_ARR[newCharacterState][1]; + let newAnimName = window.ATK_CHARACTER_STATE_ARR[newCharacterState][1]; let playingAnimName = null; let underlyingAnimationCtrl = null; diff --git a/frontend/assets/scripts/Map.js b/frontend/assets/scripts/Map.js index 7ab6b4e..37c2bf3 100644 --- a/frontend/assets/scripts/Map.js +++ b/frontend/assets/scripts/Map.js @@ -779,7 +779,7 @@ cc.Class({ if (1 == joinIndex) { playerScriptIns.setSpecies("SoldierWaterGhost"); } else if (2 == joinIndex) { - playerScriptIns.setSpecies("SoldierFireGhostFrameAnim"); + playerScriptIns.setSpecies("UltramanTiga"); } const [wx, wy] = self.virtualGridToWorldPos(vx, vy); diff --git a/frontend/assets/scripts/OfflineMap.js b/frontend/assets/scripts/OfflineMap.js index 61faa59..a87760d 100644 --- a/frontend/assets/scripts/OfflineMap.js +++ b/frontend/assets/scripts/OfflineMap.js @@ -47,7 +47,7 @@ cc.Class({ 1: { // for offender startupFrames: 10, - activeFrames: 3, + activeFrames: 20, recoveryFrames: 34, // usually but not always "startupFrames+activeFrames", I hereby set it to be 1 frame more than the actual animation to avoid critical transition, i.e. when the animation is 1 frame from ending but "rdfPlayer.framesToRecover" is already counted 0 and the player triggers an other same attack, making an effective bullet trigger but no animation is played due to same animName is still playing recoveryFramesOnBlock: 34, recoveryFramesOnHit: 34, @@ -196,7 +196,7 @@ cc.Class({ } }); self.selfPlayerInfo = { - id: 10 + id: 11 }; self._initPlayerRichInfoDict(startRdf.players); self.onRoomDownsyncFrame(startRdf); diff --git a/frontend/assets/scripts/TouchEventsManager.js b/frontend/assets/scripts/TouchEventsManager.js index 29d7c6b..2d0f442 100644 --- a/frontend/assets/scripts/TouchEventsManager.js +++ b/frontend/assets/scripts/TouchEventsManager.js @@ -88,6 +88,14 @@ cc.Class({ default: 0.0375, type: cc.Float }, + btnA: { + default: null, + type: cc.Node + }, + btnB: { + default: null, + type: cc.Node + }, }, start() {}, @@ -137,6 +145,7 @@ cc.Class({ }); translationListenerNode.inTouchPoints = new Map(); + /* zoomingListenerNode.on(cc.Node.EventType.TOUCH_START, function(event) { self._touchStartEvent(event); }); @@ -150,6 +159,37 @@ cc.Class({ self._touchEndEvent(event); }); zoomingListenerNode.inTouchPoints = new Map(); + */ + + if (self.btnA) { + self.btnA.on(cc.Node.EventType.TOUCH_START, function(evt) { + self.cachedBtnALevel = 1; + evt.target.runAction(cc.scaleTo(0.1, 0.3)); + }); + self.btnA.on(cc.Node.EventType.TOUCH_END, function(evt) { + self.cachedBtnALevel = 0; + evt.target.runAction(cc.scaleTo(0.1, 1.0)); + }); + self.btnA.on(cc.Node.EventType.TOUCH_CANCEL, function(evt) { + self.cachedBtnALevel = 0; + evt.target.runAction(cc.scaleTo(0.1, 1.0)); + }); + } + + if (self.btnB) { + self.btnB.on(cc.Node.EventType.TOUCH_START, function(evt) { + self.cachedBtnBLevel = 1; + evt.target.runAction(cc.scaleTo(0.1, 0.3)); + }); + self.btnB.on(cc.Node.EventType.TOUCH_END, function(evt) { + self.cachedBtnBLevel = 0; + evt.target.runAction(cc.scaleTo(0.1, 1.0)); + }); + self.btnB.on(cc.Node.EventType.TOUCH_CANCEL, function(evt) { + self.cachedBtnBLevel = 0; + evt.target.runAction(cc.scaleTo(0.1, 1.0)); + }); + } // Setup keyboard controls for the ease of attach debugging cc.systemEvent.on(cc.SystemEvent.EventType.KEY_DOWN, function(evt) {