diff --git a/Assets/Scripts/Game/UserManualPopup.cs b/Assets/Scripts/Game/UserManualPopup.cs index c629f0f..fa4485b 100644 --- a/Assets/Scripts/Game/UserManualPopup.cs +++ b/Assets/Scripts/Game/UserManualPopup.cs @@ -45,15 +45,16 @@ public class UserManualPopup : MonoBehaviour userManualText.text += "The player who wears the hat the longest wins.\n\n"; // Add the "Controls" section - userManualText.text += "Controls\n\n"; - userManualText.text += "Move: / \n"; - userManualText.text += "Jump: / / / \n"; - userManualText.text += "Punch: / / / \n"; - userManualText.text += "Block: \n"; - userManualText.text += "Parry: Let go of at the right time\n\n"; - userManualText.text += "Tips\n\n"; + userManualText.text += "Controls\n\n"; + userManualText.text += "Naviagation: Use Left-Click to select and press to exit\n"; + userManualText.text += "Move: / \n"; + userManualText.text += "Jump: / / / \n"; + userManualText.text += "Punch: / / / \n"; + userManualText.text += "Block: \n"; + userManualText.text += "Parry: Let go of at the right time\n\n"; // Add the "Tips" section + userManualText.text += "Tips\n\n"; userManualText.text += "Punches seem to hit you harder when you lose health.\n\n"; userManualText.text += "Walk into your opponent to turn them around and push them.\n\n"; userManualText.text += "Time your jumps to avoid falling (or hitting your head).\n\n"; diff --git a/Assets/Sprites/buttons.asset b/Assets/Sprites/buttons.asset index 9c2fb18..0cc4841 100644 --- a/Assets/Sprites/buttons.asset +++ b/Assets/Sprites/buttons.asset @@ -35,7 +35,7 @@ MonoBehaviour: m_StrikethroughOffset: 0 m_StrikethroughThickness: 0 m_TabWidth: 0 - m_Material: {fileID: 3343706753789391403} + m_Material: {fileID: 1824638092261728032} spriteSheet: {fileID: 2800000, guid: ad5282cba86a56c44be50a3cd60a9608, type: 3} m_SpriteCharacterTable: - m_ElementType: 2 @@ -112,24 +112,29 @@ MonoBehaviour: m_Unicode: 65534 m_GlyphIndex: 14 m_Scale: 1 - m_Name: nin_b + m_Name: nin_y - m_ElementType: 2 m_Unicode: 65534 m_GlyphIndex: 15 m_Scale: 1 - m_Name: nin_y + m_Name: nin_b - m_ElementType: 2 m_Unicode: 65534 m_GlyphIndex: 16 m_Scale: 1 m_Name: Lstick + - m_ElementType: 2 + m_Unicode: 65534 + m_GlyphIndex: 17 + m_Scale: 1 + m_Name: key_esc m_GlyphTable: - m_Index: 0 m_Metrics: m_Width: 80 m_Height: 74 - m_HorizontalBearingX: -40 - m_HorizontalBearingY: 37 + m_HorizontalBearingX: 0 + m_HorizontalBearingY: 55 m_HorizontalAdvance: 80 m_GlyphRect: m_X: 31 @@ -144,8 +149,8 @@ MonoBehaviour: m_Metrics: m_Width: 226 m_Height: 98 - m_HorizontalBearingX: -113 - m_HorizontalBearingY: 49 + m_HorizontalBearingX: 0 + m_HorizontalBearingY: 75 m_HorizontalAdvance: 226 m_GlyphRect: m_X: 119 @@ -160,12 +165,12 @@ MonoBehaviour: m_Metrics: m_Width: 80 m_Height: 74 - m_HorizontalBearingX: -40 - m_HorizontalBearingY: 37 + m_HorizontalBearingX: 0 + m_HorizontalBearingY: 55 m_HorizontalAdvance: 80 m_GlyphRect: m_X: 32 - m_Y: 415 + m_Y: 416 m_Width: 80 m_Height: 74 m_Scale: 1 @@ -176,8 +181,8 @@ MonoBehaviour: m_Metrics: m_Width: 226 m_Height: 98 - m_HorizontalBearingX: -113 - m_HorizontalBearingY: 49 + m_HorizontalBearingX: 0 + m_HorizontalBearingY: 75 m_HorizontalAdvance: 226 m_GlyphRect: m_X: 118 @@ -192,8 +197,8 @@ MonoBehaviour: m_Metrics: m_Width: 80 m_Height: 74 - m_HorizontalBearingX: -40 - m_HorizontalBearingY: 37 + m_HorizontalBearingX: 0 + m_HorizontalBearingY: 55 m_HorizontalAdvance: 80 m_GlyphRect: m_X: 24 @@ -208,12 +213,12 @@ MonoBehaviour: m_Metrics: m_Width: 240 m_Height: 98 - m_HorizontalBearingX: -120 - m_HorizontalBearingY: 49 + m_HorizontalBearingX: 0 + m_HorizontalBearingY: 75 m_HorizontalAdvance: 240 m_GlyphRect: m_X: 106 - m_Y: 267 + m_Y: 266 m_Width: 240 m_Height: 98 m_Scale: 1 @@ -224,8 +229,8 @@ MonoBehaviour: m_Metrics: m_Width: 80 m_Height: 74 - m_HorizontalBearingX: -40 - m_HorizontalBearingY: 37 + m_HorizontalBearingX: 0 + m_HorizontalBearingY: 55 m_HorizontalAdvance: 80 m_GlyphRect: m_X: 20 @@ -240,8 +245,8 @@ MonoBehaviour: m_Metrics: m_Width: 80 m_Height: 74 - m_HorizontalBearingX: -40 - m_HorizontalBearingY: 37 + m_HorizontalBearingX: 0 + m_HorizontalBearingY: 55 m_HorizontalAdvance: 80 m_GlyphRect: m_X: 21 @@ -256,8 +261,8 @@ MonoBehaviour: m_Metrics: m_Width: 54 m_Height: 58 - m_HorizontalBearingX: -27 - m_HorizontalBearingY: 29 + m_HorizontalBearingX: 0 + m_HorizontalBearingY: 45 m_HorizontalAdvance: 54 m_GlyphRect: m_X: 145 @@ -272,12 +277,12 @@ MonoBehaviour: m_Metrics: m_Width: 54 m_Height: 58 - m_HorizontalBearingX: -27 - m_HorizontalBearingY: 29 + m_HorizontalBearingX: 0 + m_HorizontalBearingY: 45 m_HorizontalAdvance: 54 m_GlyphRect: m_X: 269 - m_Y: 180 + m_Y: 181 m_Width: 54 m_Height: 58 m_Scale: 1 @@ -288,11 +293,11 @@ MonoBehaviour: m_Metrics: m_Width: 54 m_Height: 58 - m_HorizontalBearingX: -27 - m_HorizontalBearingY: 29 + m_HorizontalBearingX: 0 + m_HorizontalBearingY: 45 m_HorizontalAdvance: 54 m_GlyphRect: - m_X: 203 + m_X: 204 m_Y: 179 m_Width: 54 m_Height: 58 @@ -304,12 +309,12 @@ MonoBehaviour: m_Metrics: m_Width: 54 m_Height: 58 - m_HorizontalBearingX: -27 - m_HorizontalBearingY: 29 + m_HorizontalBearingX: 0 + m_HorizontalBearingY: 45 m_HorizontalAdvance: 54 m_GlyphRect: - m_X: 126 - m_Y: 117 + m_X: 124 + m_Y: 118 m_Width: 54 m_Height: 58 m_Scale: 1 @@ -320,8 +325,8 @@ MonoBehaviour: m_Metrics: m_Width: 66 m_Height: 54 - m_HorizontalBearingX: -33 - m_HorizontalBearingY: 27 + m_HorizontalBearingX: 0 + m_HorizontalBearingY: 45 m_HorizontalAdvance: 66 m_GlyphRect: m_X: 278 @@ -331,13 +336,13 @@ MonoBehaviour: m_Scale: 1 m_AtlasIndex: 0 m_ClassDefinitionType: 0 - sprite: {fileID: -2986871994705294210, guid: ad5282cba86a56c44be50a3cd60a9608, type: 3} + sprite: {fileID: -7237472072382729174, guid: ad5282cba86a56c44be50a3cd60a9608, type: 3} - m_Index: 13 m_Metrics: m_Width: 28 m_Height: 18 - m_HorizontalBearingX: -14 - m_HorizontalBearingY: 9 + m_HorizontalBearingX: 0 + m_HorizontalBearingY: 14 m_HorizontalAdvance: 28 m_GlyphRect: m_X: 182 @@ -352,40 +357,40 @@ MonoBehaviour: m_Metrics: m_Width: 54 m_Height: 58 - m_HorizontalBearingX: -27 - m_HorizontalBearingY: 29 + m_HorizontalBearingX: 0 + m_HorizontalBearingY: 45 m_HorizontalAdvance: 54 m_GlyphRect: - m_X: 277 + m_X: 222 + m_Y: 95 + m_Width: 54 + m_Height: 58 + m_Scale: 1 + m_AtlasIndex: 0 + m_ClassDefinitionType: 0 + sprite: {fileID: -2986871994705294210, guid: ad5282cba86a56c44be50a3cd60a9608, type: 3} + - m_Index: 15 + m_Metrics: + m_Width: 54 + m_Height: 58 + m_HorizontalBearingX: 0 + m_HorizontalBearingY: 45 + m_HorizontalAdvance: 54 + m_GlyphRect: + m_X: 276 m_Y: 37 m_Width: 54 m_Height: 58 m_Scale: 1 m_AtlasIndex: 0 m_ClassDefinitionType: 0 - sprite: {fileID: -77006150763170147, guid: ad5282cba86a56c44be50a3cd60a9608, type: 3} - - m_Index: 15 - m_Metrics: - m_Width: 54 - m_Height: 58 - m_HorizontalBearingX: -27 - m_HorizontalBearingY: 29 - m_HorizontalAdvance: 54 - m_GlyphRect: - m_X: 121 - m_Y: 35 - m_Width: 54 - m_Height: 58 - m_Scale: 1 - m_AtlasIndex: 0 - m_ClassDefinitionType: 0 - sprite: {fileID: -7237472072382729174, guid: ad5282cba86a56c44be50a3cd60a9608, type: 3} + sprite: {fileID: 7174167584646727459, guid: ad5282cba86a56c44be50a3cd60a9608, type: 3} - m_Index: 16 m_Metrics: m_Width: 54 m_Height: 46 - m_HorizontalBearingX: -27 - m_HorizontalBearingY: 23 + m_HorizontalBearingX: 0 + m_HorizontalBearingY: 35 m_HorizontalAdvance: 54 m_GlyphRect: m_X: 214 @@ -395,17 +400,33 @@ MonoBehaviour: m_Scale: 1 m_AtlasIndex: 0 m_ClassDefinitionType: 0 + sprite: {fileID: -77006150763170147, guid: ad5282cba86a56c44be50a3cd60a9608, type: 3} + - m_Index: 17 + m_Metrics: + m_Width: 146 + m_Height: 98 + m_HorizontalBearingX: 0 + m_HorizontalBearingY: 75 + m_HorizontalAdvance: 146 + m_GlyphRect: + m_X: 13 + m_Y: 11 + m_Width: 146 + m_Height: 98 + m_Scale: 1 + m_AtlasIndex: 0 + m_ClassDefinitionType: 0 sprite: {fileID: -8315295956674182197, guid: ad5282cba86a56c44be50a3cd60a9608, type: 3} spriteInfoList: [] fallbackSpriteAssets: [] ---- !u!21 &3343706753789391403 +--- !u!21 &1824638092261728032 Material: serializedVersion: 8 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: buttons Material + m_Name: buttons 1 Material m_Shader: {fileID: 4800000, guid: cf81c85f95fe47e1a27f6ae460cf182c, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 diff --git a/Assets/Sprites/buttons.asset.meta b/Assets/Sprites/buttons.asset.meta index ffc440e..76d3f0c 100644 --- a/Assets/Sprites/buttons.asset.meta +++ b/Assets/Sprites/buttons.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1745d3ed4248aca41a37865dd6f9c4c3 +guid: 89fcf5d9e9495d342b3793a48498f3cd NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Sprites/buttons.png b/Assets/Sprites/buttons.png index 07d1a52..c32d841 100644 Binary files a/Assets/Sprites/buttons.png and b/Assets/Sprites/buttons.png differ diff --git a/Assets/Sprites/buttons.png.meta b/Assets/Sprites/buttons.png.meta index 95b1a6a..51f1d5a 100644 --- a/Assets/Sprites/buttons.png.meta +++ b/Assets/Sprites/buttons.png.meta @@ -53,6 +53,9 @@ TextureImporter: - first: 213: -77006150763170147 second: buttons_16 + - first: + 213: 7174167584646727459 + second: buttons_17 externalObjects: {} serializedVersion: 13 mipmaps: @@ -196,7 +199,7 @@ TextureImporter: rect: serializedVersion: 2 x: 32 - y: 415 + y: 416 width: 80 height: 74 alignment: 0 @@ -262,7 +265,7 @@ TextureImporter: rect: serializedVersion: 2 x: 106 - y: 267 + y: 266 width: 240 height: 98 alignment: 0 @@ -349,7 +352,7 @@ TextureImporter: name: ps_cross rect: serializedVersion: 2 - x: 203 + x: 204 y: 179 width: 54 height: 58 @@ -372,7 +375,7 @@ TextureImporter: rect: serializedVersion: 2 x: 269 - y: 180 + y: 181 width: 54 height: 58 alignment: 0 @@ -393,8 +396,8 @@ TextureImporter: name: xb_x rect: serializedVersion: 2 - x: 126 - y: 117 + x: 124 + y: 118 width: 54 height: 58 alignment: 0 @@ -434,13 +437,13 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: rb + name: nin_y rect: serializedVersion: 2 - x: 278 - y: 111 - width: 66 - height: 54 + x: 222 + y: 95 + width: 54 + height: 58 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -456,13 +459,13 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: nin_y + name: rb rect: serializedVersion: 2 - x: 121 - y: 35 - width: 54 - height: 58 + x: 278 + y: 111 + width: 66 + height: 54 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} @@ -477,6 +480,28 @@ TextureImporter: indices: edges: [] weights: [] + - serializedVersion: 2 + name: key_esc + rect: + serializedVersion: 2 + x: 13 + y: 11 + width: 146 + height: 98 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: bc3813c32622a9c80800000000000000 + internalID: -8315295956674182197 + vertices: [] + indices: + edges: [] + weights: [] - serializedVersion: 2 name: Lstick rect: @@ -493,8 +518,8 @@ TextureImporter: physicsShape: [] tessellationDetail: -1 bones: [] - spriteID: bc3813c32622a9c80800000000000000 - internalID: -8315295956674182197 + spriteID: d96bd3a505b6eeef0800000000000000 + internalID: -77006150763170147 vertices: [] indices: edges: [] @@ -503,7 +528,7 @@ TextureImporter: name: nin_b rect: serializedVersion: 2 - x: 277 + x: 276 y: 37 width: 54 height: 58 @@ -515,8 +540,8 @@ TextureImporter: physicsShape: [] tessellationDetail: -1 bones: [] - spriteID: d96bd3a505b6eeef0800000000000000 - internalID: -77006150763170147 + spriteID: 3278df96863cf8360800000000000000 + internalID: 7174167584646727459 vertices: [] indices: edges: [] @@ -525,7 +550,7 @@ TextureImporter: customData: physicsShape: [] bones: [] - spriteID: 03c62d185f152ed45aafb1fcec16d223 + spriteID: 96fd9859680f5e14abcb7b6bc0452e6b internalID: 0 vertices: [] indices: @@ -535,20 +560,21 @@ TextureImporter: spriteCustomMetadata: entries: [] nameFileIdTable: - Lstick: -8315295956674182197 + Lstick: -77006150763170147 key_a: 2958514102543403041 key_d: -8191739510646017925 key_e: -480254276019886394 key_enter: 3713549098536957005 + key_esc: -8315295956674182197 key_s: -3219683103784253410 key_shift: -6460607209241108654 key_space: 1008705478319212569 key_w: 5830344958925785552 - nin_b: -77006150763170147 - nin_y: -7237472072382729174 + nin_b: 7174167584646727459 + nin_y: -2986871994705294210 ps_cross: 4009284081192125275 ps_square: 8359661988393023892 - rb: -2986871994705294210 + rb: -7237472072382729174 start: -9124727645642988533 xb_a: 650656284835190746 xb_x: -7138311499508957143