From 68af10bc4d40b503167fe3140a0e6f1f4bd23711 Mon Sep 17 00:00:00 2001 From: reisenlol Date: Thu, 15 Jan 2026 23:55:42 -0800 Subject: [PATCH] they do not call me the ui designer --- Assets/Prefabs/PlayerEntity.prefab | 154 ++- Assets/Scenes/Prototype.unity | 1348 ++++++++++++++++++++++- Assets/Scripts/ActionUIHandler.cs | 63 +- Assets/Scripts/CameraController.cs | 17 + Assets/Scripts/CameraController.cs.meta | 2 + Assets/Scripts/Entity.cs | 16 +- Assets/Scripts/MeleeWeapon.cs | 4 +- Assets/Scripts/PlayerEntity.cs | 11 +- Assets/Scripts/PlayerEntityMovement.cs | 19 +- Assets/Scripts/RangedWeapon.cs | 2 +- Assets/Scripts/TurnHandler.cs | 8 +- Assets/Sprites/gunuuysprite.png | Bin 0 -> 5799 bytes Assets/Sprites/gunuuysprite.png.meta | 156 +++ ProjectSettings/TagManager.asset | 2 +- 14 files changed, 1677 insertions(+), 125 deletions(-) create mode 100644 Assets/Scripts/CameraController.cs create mode 100644 Assets/Scripts/CameraController.cs.meta create mode 100644 Assets/Sprites/gunuuysprite.png create mode 100644 Assets/Sprites/gunuuysprite.png.meta diff --git a/Assets/Prefabs/PlayerEntity.prefab b/Assets/Prefabs/PlayerEntity.prefab index 4426e11..8155986 100644 --- a/Assets/Prefabs/PlayerEntity.prefab +++ b/Assets/Prefabs/PlayerEntity.prefab @@ -28,7 +28,7 @@ RectTransform: m_GameObject: {fileID: 423052272253214442} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.25, y: 1.25, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3164856206414981243} @@ -212,7 +212,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -0.5} + m_AnchoredPosition: {x: 0, y: -0.6} m_SizeDelta: {x: 0.9, y: 0.15} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3388054835193516624 @@ -262,7 +262,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 576146896620919861} - - component: {fileID: 3017941309338641158} - component: {fileID: 6953866836340070426} - component: {fileID: 5017380791142386142} - component: {fileID: 7370141107480051474} @@ -283,67 +282,13 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 2.5, y: 3.5, z: 0} - m_LocalScale: {x: 0.8, y: 0.8, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 3735594418940052040} - {fileID: 6763493467664428652} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &3017941309338641158 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8094053231633710175} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} - m_Color: {r: 0.5424528, g: 0.9869612, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!61 &6953866836340070426 BoxCollider2D: m_ObjectHideFlags: 0 @@ -382,7 +327,7 @@ BoxCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1, y: 1} + oldSize: {x: 0.8125, y: 0.9625} newSize: {x: 1, y: 1} adaptiveTilingThreshold: 0.5 drawMode: 0 @@ -437,7 +382,7 @@ MonoBehaviour: canMove: 1 invincible: 0 spriteRenderers: - - {fileID: 3017941309338641158} + - {fileID: 400185309718877830} damageColorChangeSpeed: 4 hasMoved: 0 hasAttacked: 0 @@ -447,3 +392,90 @@ MonoBehaviour: weaponInstances: [] currentWeapon: {fileID: 0} hpBar: {fileID: 3104995061699689292} +--- !u!1 &9154813544046831137 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3735594418940052040} + - component: {fileID: 400185309718877830} + m_Layer: 0 + m_Name: Sprite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3735594418940052040 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9154813544046831137} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: -0.01745245, w: 0.99984777} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 576146896620919861} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -2} +--- !u!212 &400185309718877830 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9154813544046831137} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: -7425528324702340497, guid: 2e81e15c3990a443d883186c228cacb9, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/Assets/Scenes/Prototype.unity b/Assets/Scenes/Prototype.unity index fec350c..819de63 100644 --- a/Assets/Scenes/Prototype.unity +++ b/Assets/Scenes/Prototype.unity @@ -119,6 +119,142 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &6127959 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6127960} + - component: {fileID: 6127962} + - component: {fileID: 6127961} + m_Layer: 5 + m_Name: ActionText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &6127960 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6127959} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1741550582} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 25} + m_SizeDelta: {x: 300, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &6127961 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6127959} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'Remaining Actions: 2' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 30 + m_fontSizeBase: 30 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &6127962 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6127959} + m_CullTransparentMesh: 1 --- !u!1 &32287492 GameObject: m_ObjectHideFlags: 0 @@ -176,7 +312,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Skip + m_text: Wait m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -303,8 +439,163 @@ MonoBehaviour: selectedEntity: {fileID: 0} templateObject: {fileID: 214183925} isMoving: 0 + mouseWorldPos: {x: 0, y: 0, z: 0} debounceDuration: 0.2 pathRequested: [] +--- !u!1 &51053951 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 51053952} + - component: {fileID: 51053954} + - component: {fileID: 51053953} + m_Layer: 5 + m_Name: InfoPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &51053952 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 51053951} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1774370118} + - {fileID: 1744470853} + - {fileID: 1071017989} + - {fileID: 1269014763} + m_Father: {fileID: 580779879} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &51053953 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 51053951} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.0754717, g: 0.0754717, b: 0.0754717, a: 0.8352941} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &51053954 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 51053951} + m_CullTransparentMesh: 1 +--- !u!1 &117748788 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 117748789} + - component: {fileID: 117748791} + - component: {fileID: 117748790} + m_Layer: 5 + m_Name: HPBar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &117748789 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 117748788} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 309360849} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -10, y: -10} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &117748790 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 117748788} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.8867924, g: 0.2300641, b: 0.2300641, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &117748791 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 117748788} + m_CullTransparentMesh: 1 --- !u!1 &162815249 GameObject: m_ObjectHideFlags: 0 @@ -641,6 +932,83 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 87b2f3acfe362ceb498b8129365d99a9, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &309360848 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 309360849} + - component: {fileID: 309360851} + - component: {fileID: 309360850} + m_Layer: 5 + m_Name: HPBarBorder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &309360849 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 309360848} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 117748789} + - {fileID: 1579573209} + m_Father: {fileID: 1269014763} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: -200, y: 40} + m_SizeDelta: {x: 380, y: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &309360850 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 309360848} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.09433961, g: 0.09433961, b: 0.09433961, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &309360851 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 309360848} + m_CullTransparentMesh: 1 --- !u!1 &328994028 GameObject: m_ObjectHideFlags: 0 @@ -1019,7 +1387,7 @@ Camera: far clip plane: 1000 field of view: 34 orthographic: 1 - orthographic size: 7.701242 + orthographic size: 4.5 m_Depth: -1 m_CullingMask: serializedVersion: 2 @@ -1082,6 +1450,42 @@ MonoBehaviour: m_PostInfinity: 2 m_RotationOrder: 4 CustomBlends: {fileID: 0} +--- !u!1 &580779878 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 580779879} + m_Layer: 5 + m_Name: InfoUI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &580779879 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 580779878} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 51053952} + m_Father: {fileID: 1453849255} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -400, y: 150} + m_SizeDelta: {x: 800, y: 300} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &589901456 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3911937516835917761, guid: f8b988bc429cbeb5fbdd3d95c8ce553b, type: 3} @@ -1797,6 +2201,142 @@ Transform: m_Children: [] m_Father: {fileID: 1010455543} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1007984060 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1007984061} + - component: {fileID: 1007984063} + - component: {fileID: 1007984062} + m_Layer: 5 + m_Name: ATKLabel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1007984061 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1007984060} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1269014763} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 110, y: 0} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1007984062 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1007984060} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'ATTACK: ' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1007984063 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1007984060} + m_CullTransparentMesh: 1 --- !u!1 &1010455542 GameObject: m_ObjectHideFlags: 0 @@ -1886,6 +2426,81 @@ Transform: m_Children: [] m_Father: {fileID: 1010455543} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1071017988 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1071017989} + - component: {fileID: 1071017991} + - component: {fileID: 1071017990} + m_Layer: 5 + m_Name: Portrait + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1071017989 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1071017988} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 51053952} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -150, y: 0} + m_SizeDelta: {x: 250, y: 250} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1071017990 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1071017988} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -7425528324702340497, guid: 2e81e15c3990a443d883186c228cacb9, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1071017991 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1071017988} + m_CullTransparentMesh: 1 --- !u!1 &1206305438 GameObject: m_ObjectHideFlags: 0 @@ -2312,9 +2927,9 @@ RectTransform: - {fileID: 1952057948} m_Father: {fileID: 1453849255} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -90, y: 45} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -90, y: -30} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1250801359 @@ -2411,6 +3026,122 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1250801357} m_CullTransparentMesh: 1 +--- !u!1 &1269014762 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1269014763} + m_Layer: 5 + m_Name: Stats + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1269014763 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1269014762} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1007984061} + - {fileID: 2111145669} + - {fileID: 309360849} + m_Father: {fileID: 51053952} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1349034866 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1349034868} + - component: {fileID: 1349034867} + m_Layer: 10 + m_Name: CameraBorders + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!61 &1349034867 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1349034866} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 40, y: 40} + m_EdgeRadius: 0 +--- !u!4 &1349034868 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1349034866} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -15} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1389484817 GameObject: m_ObjectHideFlags: 0 @@ -2421,6 +3152,8 @@ GameObject: m_Component: - component: {fileID: 1389484819} - component: {fileID: 1389484818} + - component: {fileID: 1389484820} + - component: {fileID: 1389484821} m_Layer: 0 m_Name: CinemachineCamera m_TagString: Untagged @@ -2453,7 +3186,7 @@ MonoBehaviour: CustomLookAtTarget: 0 Lens: FieldOfView: 34 - OrthographicSize: 7.701242 + OrthographicSize: 4.5 NearClipPlane: 0.3 FarClipPlane: 1000 Dutch: 0 @@ -2486,6 +3219,40 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1389484820 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1389484817} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f453f694addf4275988fac205bc91968, type: 3} + m_Name: + m_EditorClassIdentifier: + BoundingShape2D: {fileID: 1349034867} + Damping: 0.5 + SlowingDistance: 5 + OversizeWindow: + Enabled: 0 + MaxWindowSize: 0 + Padding: 0 + m_LegacyMaxWindowSize: -2 +--- !u!114 &1389484821 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1389484817} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bc0f858f3c02d522db5e0934da8c5766, type: 3} + m_Name: + m_EditorClassIdentifier: + panSpeed: 16 + canMoveCamera: 1 --- !u!4 &1396110572 stripped Transform: m_CorrespondingSourceObject: {fileID: 576146896620919861, guid: 0890a915b9432db98b28379f0c26c064, type: 3} @@ -2504,7 +3271,7 @@ GameObject: - component: {fileID: 1453849253} - component: {fileID: 1453849252} m_Layer: 5 - m_Name: Canvas + m_Name: GameCanvas m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2586,6 +3353,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1741550582} + - {fileID: 580779879} - {fileID: 1250801358} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2732,6 +3500,142 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1516433669} m_CullTransparentMesh: 1 +--- !u!1 &1579573208 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1579573209} + - component: {fileID: 1579573211} + - component: {fileID: 1579573210} + m_Layer: 5 + m_Name: HealthText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1579573209 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1579573208} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 309360849} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 370, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1579573210 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1579573208} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 100/100 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 30 + m_fontSizeBase: 30 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1579573211 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1579573208} + m_CullTransparentMesh: 1 --- !u!1 &1741550581 GameObject: m_ObjectHideFlags: 0 @@ -2764,11 +3668,12 @@ RectTransform: - {fileID: 1226097032} - {fileID: 1862374685} - {fileID: 922303061} + - {fileID: 6127960} m_Father: {fileID: 1453849255} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 150, y: 200} m_SizeDelta: {x: 300, y: 400} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1741550583 @@ -2783,9 +3688,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0891f634b432ac024a82048b58adf276, type: 3} m_Name: m_EditorClassIdentifier: - opened: 0 - offset: {x: 180, y: -230, z: 0} actionUI: {fileID: 1862374684} + actionText: {fileID: 6127961} + opened: 0 + infoUI: {fileID: 51053951} + nameLabel: {fileID: 1774370119} + classLabel: {fileID: 1744470854} + unitPortrait: {fileID: 1071017990} + attackLabel: {fileID: 1007984062} + speedLabel: {fileID: 2111145670} + healthBar: {fileID: 117748789} + healthText: {fileID: 1579573210} moveButton: {fileID: 1991761901} attackButton: {fileID: 1904174745} reloadButton: {fileID: 1218150749} @@ -2793,6 +3706,142 @@ MonoBehaviour: weaponUIPanel: {fileID: 922303061} templateWeaponButton: {fileID: 1226097033} templateButtonHeight: 50 +--- !u!1 &1744470852 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1744470853} + - component: {fileID: 1744470855} + - component: {fileID: 1744470854} + m_Layer: 5 + m_Name: ClassLabel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1744470853 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1744470852} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 51053952} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 110, y: 60} + m_SizeDelta: {x: 200, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1744470854 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1744470852} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Ranker + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1744470855 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1744470852} + m_CullTransparentMesh: 1 --- !u!1 &1747903012 GameObject: m_ObjectHideFlags: 0 @@ -2806,7 +3855,7 @@ GameObject: - component: {fileID: 1747903015} - component: {fileID: 1747903014} m_Layer: 5 - m_Name: SkipButton + m_Name: WaitButton m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2975,6 +4024,142 @@ MonoBehaviour: tilePrefab: {fileID: -6983208405962868106, guid: da6a24e46891b2ed09fda1a256f63c62, type: 3} cam: {fileID: 519420031} grid: {fileID: 201300562} +--- !u!1 &1774370117 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1774370118} + - component: {fileID: 1774370120} + - component: {fileID: 1774370119} + m_Layer: 5 + m_Name: UnitNameLabel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1774370118 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1774370117} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 51053952} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 110, y: -40} + m_SizeDelta: {x: 200, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1774370119 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1774370117} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Rabbit Name Lol + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 50 + m_fontSizeBase: 50 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1774370120 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1774370117} + m_CullTransparentMesh: 1 --- !u!1 &1862374684 GameObject: m_ObjectHideFlags: 0 @@ -3702,6 +4887,142 @@ Transform: - {fileID: 2042240624} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2111145668 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2111145669} + - component: {fileID: 2111145671} + - component: {fileID: 2111145670} + m_Layer: 5 + m_Name: MoveLabel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2111145669 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2111145668} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1269014763} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 110, y: -50} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2111145670 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2111145668} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'SPEED:' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &2111145671 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2111145668} + m_CullTransparentMesh: 1 --- !u!114 &2111574831 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 7370141107480051474, guid: 0890a915b9432db98b28379f0c26c064, type: 3} @@ -3974,6 +5295,7 @@ PrefabInstance: SceneRoots: m_ObjectHideFlags: 0 m_Roots: + - {fileID: 1349034868} - {fileID: 1389484819} - {fileID: 519420032} - {fileID: 619394802} diff --git a/Assets/Scripts/ActionUIHandler.cs b/Assets/Scripts/ActionUIHandler.cs index ff5bcf3..7614c77 100644 --- a/Assets/Scripts/ActionUIHandler.cs +++ b/Assets/Scripts/ActionUIHandler.cs @@ -1,3 +1,4 @@ +using System; using TMPro; using UnityEngine; using UnityEngine.UI; @@ -21,10 +22,19 @@ public class ActionUIHandler : MonoBehaviour #endregion private PlayerEntity selectedEntity; private RangedWeapon possibleRanged; - public bool opened; [Header("Main UI")] - [SerializeField] private Vector3 offset; [SerializeField] private GameObject actionUI; + [SerializeField] private TextMeshProUGUI actionText; + public bool opened; + [Header("Info UI")] + [SerializeField] private GameObject infoUI; + [SerializeField] private TextMeshProUGUI nameLabel; + [SerializeField] private TextMeshProUGUI classLabel; + [SerializeField] private Image unitPortrait; + [SerializeField] private TextMeshProUGUI attackLabel; + [SerializeField] private TextMeshProUGUI speedLabel; + [SerializeField] private Transform healthBar; + [SerializeField] private TextMeshProUGUI healthText; [Header("Action Buttons")] [SerializeField] private Button moveButton; [SerializeField] private Button attackButton; @@ -37,13 +47,15 @@ public class ActionUIHandler : MonoBehaviour [SerializeField] private float templateButtonHeight; //500 if statements in this script lol + public void ShowUI(PlayerEntity target) { opened = true; possibleRanged = null; selectedEntity = target; - transform.position = Input.mousePosition + offset; actionUI.SetActive(true); + actionText.gameObject.SetActive(true); + infoUI.SetActive(true); UpdateUI(); } @@ -53,7 +65,7 @@ public class ActionUIHandler : MonoBehaviour { possibleRanged = isRanged; } - if ((!isRanged || !isRanged.fired) && !selectedEntity.hasAttacked) + if (!isRanged || !isRanged.fired) { attackButton.gameObject.SetActive(true); reloadButton.gameObject.SetActive(false); @@ -63,7 +75,7 @@ public class ActionUIHandler : MonoBehaviour attackButton.gameObject.SetActive(false); if (isRanged && isRanged.fired) { - if (selectedEntity.hasMoved || selectedEntity.hasAttacked) + if (selectedEntity.actions < 2) { reloadButton.gameObject.SetActive(false); } @@ -73,27 +85,37 @@ public class ActionUIHandler : MonoBehaviour } } } - if (!selectedEntity.hasMoved || !selectedEntity.hasAttacked) - { - moveButton.gameObject.SetActive(true); - switchButton.gameObject.SetActive(true); - } - if (selectedEntity.hasAttacked && selectedEntity.hasMoved) + moveButton.gameObject.SetActive(true); + switchButton.gameObject.SetActive(true); + actionText.text = $"Remaining Actions: {selectedEntity.actions}"; + UpdateInfo(); + if (selectedEntity.actions == 0) { HideUI(); } } + + public void UpdateInfo() + { + healthBar.localScale = new Vector3(selectedEntity.health / selectedEntity.maxHealth,1,1); + healthText.text = $"{selectedEntity.health}/{selectedEntity.maxHealth}"; + attackLabel.text = $"Attack: {selectedEntity.currentWeapon.damage}"; + speedLabel.text = $"Speed: {selectedEntity.maxMovement}"; + } public void HideUI() { opened = false; - actionUI.SetActive(false); - weaponUIPanel.gameObject.SetActive(false); + foreach (Transform uiObject in transform) + { + uiObject.gameObject.SetActive(false); + } + infoUI.SetActive(false); } public void ReloadGun() { possibleRanged.Reload(); - selectedEntity.hasAttacked = true; + selectedEntity.actions -= 2; HideUI(); } @@ -145,7 +167,7 @@ public class ActionUIHandler : MonoBehaviour public void SelectWeapon(Weapon weaponSelected) { - MoveAction(); + selectedEntity.actions--; selectedEntity.SwitchWeapon(weaponSelected); HideWeaponList(); UpdateUI(); @@ -155,15 +177,4 @@ public class ActionUIHandler : MonoBehaviour { weaponUIPanel.gameObject.SetActive(false); } - private void MoveAction() - { - if (!selectedEntity.hasMoved) - { - selectedEntity.hasMoved = true; - } - else if (!selectedEntity.hasAttacked) - { - selectedEntity.hasAttacked = true; - } - } } diff --git a/Assets/Scripts/CameraController.cs b/Assets/Scripts/CameraController.cs new file mode 100644 index 0000000..fee1834 --- /dev/null +++ b/Assets/Scripts/CameraController.cs @@ -0,0 +1,17 @@ +using System; +using UnityEngine; + +public class CameraController : MonoBehaviour +{ + public float panSpeed; + public bool canMoveCamera = true; + + private void Update() + { + if (canMoveCamera) + { + Vector2 moveDirection = new Vector3(Input.GetAxis("Horizontal"), Input.GetAxis("Vertical")); + transform.Translate(moveDirection * (panSpeed * Time.deltaTime)); + } + } +} diff --git a/Assets/Scripts/CameraController.cs.meta b/Assets/Scripts/CameraController.cs.meta new file mode 100644 index 0000000..7f89874 --- /dev/null +++ b/Assets/Scripts/CameraController.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: bc0f858f3c02d522db5e0934da8c5766 \ No newline at end of file diff --git a/Assets/Scripts/Entity.cs b/Assets/Scripts/Entity.cs index 469a150..4117a33 100644 --- a/Assets/Scripts/Entity.cs +++ b/Assets/Scripts/Entity.cs @@ -17,7 +17,8 @@ public class Entity : MonoBehaviour public bool canMove = true; public bool invincible; - [Header("Animation")] + [Header("Animation (assume sprites face right)")] + private bool isFacingRight; [SerializeField] private SpriteRenderer[] spriteRenderers; [SerializeField] private float damageColorChangeSpeed; @@ -61,6 +62,19 @@ public class Entity : MonoBehaviour currentTile = pathToMove[currentTileList]; currentState = 0; currentTileList++; + if (currentTileList < pathToMove.Length) + { + float dotProduct = Vector3.Dot((pathToMove[currentTileList].transform.position - currentTile.transform.position), Vector3.right); + if (dotProduct < 0 && !isFacingRight || dotProduct > 0 && isFacingRight) + { + isFacingRight = !isFacingRight; + foreach (SpriteRenderer spriteRenderer in spriteRenderers) + { + spriteRenderer.gameObject.transform.eulerAngles = new Vector3(0, 0, -spriteRenderer.gameObject.transform.eulerAngles.z); + spriteRenderer.flipX = !spriteRenderer.flipX; //quite the jank rotation code + } + } + } } yield return null; } diff --git a/Assets/Scripts/MeleeWeapon.cs b/Assets/Scripts/MeleeWeapon.cs index 03fc5d6..9bcf371 100644 --- a/Assets/Scripts/MeleeWeapon.cs +++ b/Assets/Scripts/MeleeWeapon.cs @@ -19,7 +19,7 @@ public class MeleeWeapon : Weapon if (Input.GetMouseButtonDown(0)) { RaycastHit2D[] enemyList = Physics2D.BoxCastAll(transform.position, colliderSize, Vector3.Angle(transform.position, mouseWorldPos), - PlayerEntityMovement.instance.mouseWorldPos, 100f, entityLayer); + PlayerEntityMovement.instance.mouseWorldPos, 2, entityLayer); foreach (RaycastHit2D enemy in enemyList) { if (!enemy.transform.CompareTag(tag) && enemy.transform.TryGetComponent(out Entity isEntity)) @@ -28,7 +28,7 @@ public class MeleeWeapon : Weapon } } isAiming = false; - thisEntity.hasAttacked = true; + thisEntity.actions--; TurnHandler.instance.UpdateTurns(); ActionUIHandler.instance.UpdateUI(); debugColliderHitbox.gameObject.SetActive(false); diff --git a/Assets/Scripts/PlayerEntity.cs b/Assets/Scripts/PlayerEntity.cs index d5cec19..43e3243 100644 --- a/Assets/Scripts/PlayerEntity.cs +++ b/Assets/Scripts/PlayerEntity.cs @@ -3,9 +3,9 @@ using UnityEngine; public class PlayerEntity : Entity { - [Header("Player Flags")] - public bool hasMoved = false; - public bool hasAttacked = false; + [Header("Player Flags")] + public int actions = 2; + public int maxActions = 2; [Header("Weaponry")] [SerializeField] private Weapon[] weapons; [HideInInspector] public List weaponInstances = new(); @@ -42,8 +42,7 @@ public class PlayerEntity : Entity public void SkipTurn() { - hasMoved = true; - hasAttacked = true; + actions = 0; TurnHandler.instance.UpdateTurns(); } public void Attack() @@ -68,7 +67,7 @@ public class PlayerEntity : Entity private void OnMouseDown() { - if ((!hasMoved || !hasAttacked) && !PlayerEntityMovement.instance.isMoving) + if (actions > 0 && !PlayerEntityMovement.instance.isMoving) { ActionUIHandler.instance.ShowUI(this); } diff --git a/Assets/Scripts/PlayerEntityMovement.cs b/Assets/Scripts/PlayerEntityMovement.cs index e62dc53..6a69dc8 100644 --- a/Assets/Scripts/PlayerEntityMovement.cs +++ b/Assets/Scripts/PlayerEntityMovement.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using UnityEngine; +using UnityEngine.InputSystem; public class PlayerEntityMovement : MonoBehaviour { @@ -66,7 +67,14 @@ public class PlayerEntityMovement : MonoBehaviour requestedTile = newTile; foreach (TileObject tile in pathRequested) { - tile.sprite.color = new Color(137, 137, 137, 255); + if (!currentMovableTiles.Contains(tile)) + { + tile.sprite.color = new Color32(137, 137, 137, 255); + } + else + { + tile.sprite.color = Color.green; + } } PathfindToTarget(); } @@ -159,14 +167,7 @@ public class PlayerEntityMovement : MonoBehaviour StartCoroutine(selectedEntity.MoveToLocation(pathRequested.ToArray())); templateObject.SetActive(false); UncolorGrid(); - if (!selectedEntity.hasMoved) - { - selectedEntity.hasMoved = true; - } - else - { - selectedEntity.hasAttacked = true; - } + selectedEntity.actions--; return true; } diff --git a/Assets/Scripts/RangedWeapon.cs b/Assets/Scripts/RangedWeapon.cs index 92e8241..6be00f8 100644 --- a/Assets/Scripts/RangedWeapon.cs +++ b/Assets/Scripts/RangedWeapon.cs @@ -40,7 +40,7 @@ public class RangedWeapon : Weapon CreateProjectile(mousePos); fired = true; isAiming = false; - thisEntity.hasAttacked = true; + thisEntity.actions--; } else if (Input.GetMouseButtonDown(1)) { diff --git a/Assets/Scripts/TurnHandler.cs b/Assets/Scripts/TurnHandler.cs index 9565790..6676562 100644 --- a/Assets/Scripts/TurnHandler.cs +++ b/Assets/Scripts/TurnHandler.cs @@ -48,7 +48,7 @@ public class TurnHandler : MonoBehaviour { foreach (PlayerEntity player in playerEntities) { - if (!player.hasMoved || !player.hasAttacked) + if (player.actions > 0) { return; } @@ -82,8 +82,7 @@ public class TurnHandler : MonoBehaviour currentGameState = GameState.PlayerTurn; foreach (PlayerEntity player in playerEntities) { - player.hasMoved = false; - player.hasAttacked = false; + player.actions = player.maxActions; } } @@ -96,8 +95,7 @@ public class TurnHandler : MonoBehaviour { foreach (PlayerEntity player in playerEntities) { - player.hasMoved = true; - player.hasAttacked = true; + player.actions = 0; } UpdateTurns(); } diff --git a/Assets/Sprites/gunuuysprite.png b/Assets/Sprites/gunuuysprite.png new file mode 100644 index 0000000000000000000000000000000000000000..fd999209a5afb38c3e7ae4198309b6f06ab4b7ab GIT binary patch literal 5799 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 R{NM8oXsa8jRj62F{s(31^OFDo literal 0 HcmV?d00001 diff --git a/Assets/Sprites/gunuuysprite.png.meta b/Assets/Sprites/gunuuysprite.png.meta new file mode 100644 index 0000000..8cb7f85 --- /dev/null +++ b/Assets/Sprites/gunuuysprite.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 2e81e15c3990a443d883186c228cacb9 +TextureImporter: + internalIDToNameTable: + - first: + 213: -7425528324702340497 + second: gunuuysprite_0 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 240 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: gunuuysprite_0 + rect: + serializedVersion: 2 + x: 15 + y: 4 + width: 195 + height: 231 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: f6af380b45933f890800000000000000 + internalID: -7425528324702340497 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + gunuuysprite_0: -7425528324702340497 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index f7902ca..d56ea82 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -16,7 +16,7 @@ TagManager: - Entity - Projectile - WeaponHitbox - - + - CamBorders - - -