diff --git a/Assets/CheatMenu.cs b/Assets/CheatMenu.cs index 806be9d3..150453ea 100644 --- a/Assets/CheatMenu.cs +++ b/Assets/CheatMenu.cs @@ -1,22 +1,69 @@ -using System.Collections; -using System.Collections.Generic; -using Data; +using System; +using System.Linq; using HexFiled; +using Items; +using TMPro; using Units; using UnityEngine; +using UnityEngine.UI; public class CheatMenu : MonoBehaviour { - [SerializeField] private UnitData _data; + [SerializeField] private Button showButton; + [SerializeField] private GameObject scrollRect; + [SerializeField] private GameObject grid; + [SerializeField] private Button buttonPrefab; + [SerializeField] private GameObject gridPrefab; private Unit _player; - void Start() - { - _player = HexManager.UnitCurrentCell[_data.Units.Find(x => x.isPlayer).color].unit; - } + private Data.Data _data; + private GameObject ItemsPrefab; - // Update is called once per frame - void Update() + public void SetPlayerNData(Unit player, Data.Data data) { + _player = player; + ItemsPrefab = new GameObject("CheatedItems"); + + showButton.onClick.AddListener(() => scrollRect.SetActive(!scrollRect.activeSelf)); + _data = data; + AddAllButtons(); + scrollRect.SetActive(false); } -} + + private void AddAllButtons() + { + + var itemGridGo = Instantiate(gridPrefab, grid.transform); + var itemGrid = itemGridGo.GetComponentInChildren(); + itemGridGo.GetComponentInChildren().text = "Items"; + _data.ItemsData.ItemInfos.ForEach(x => + { + AddButton(() => + { + var cell = HexManager.UnitCurrentCell[_player.Color].cell.GetListNeighbours() + .First(hexCell => hexCell != null); + + x.Item.Spawn(cell, ItemsPrefab, ItemFabric.itemIcon[x.Item.Type]); + scrollRect.SetActive(false); + }, "Spawn " + x.Item.name, itemGrid.gameObject); + }); + + var playerGridGO = Instantiate(gridPrefab, grid.transform); + var playerGrid = playerGridGO.GetComponentInChildren(); + playerGridGO.GetComponentInChildren().text = "Player"; + AddButton(() => + { + _player.UnitView.OnHit.Invoke(_player.Data.maxHP); + scrollRect.SetActive(false); + }, "Kill Player", playerGrid.gameObject); + AddButton(() => scrollRect.SetActive(false), "CLOSE", grid); + } + + private Button AddButton(Action onClickAction, string buttonText, GameObject parent) + { + var button = Instantiate(buttonPrefab, parent.transform); + button.onClick.AddListener(onClickAction.Invoke); + button.GetComponentInChildren().text = buttonText; + return button; + } +} \ No newline at end of file diff --git a/Assets/Joystick Pack/Scripts/Base/Joystick.cs b/Assets/Joystick Pack/Scripts/Base/Joystick.cs index 3cc9eee4..be72249e 100644 --- a/Assets/Joystick Pack/Scripts/Base/Joystick.cs +++ b/Assets/Joystick Pack/Scripts/Base/Joystick.cs @@ -1,6 +1,8 @@ using System; +using DG.Tweening; using UnityEngine; using UnityEngine.EventSystems; +using UnityEngine.UI; public class Joystick : MonoBehaviour, IPointerDownHandler, IDragHandler, IPointerUpHandler { @@ -33,6 +35,11 @@ public class Joystick : MonoBehaviour, IPointerDownHandler, IDragHandler, IPoint [SerializeField] protected RectTransform background = null; [SerializeField] private RectTransform handle = null; private RectTransform baseRect = null; + [SerializeField] private bool isToTranparency = false; + + [SerializeField] private float timeToFade; + [SerializeField] private float transparency; + public event Action OnTouchUp; public event Action OnTouchDown; @@ -157,6 +164,20 @@ public class Joystick : MonoBehaviour, IPointerDownHandler, IDragHandler, IPoint } return Vector2.zero; } + + protected void FadeJoystick(bool isToTransparant) + { + if (!isToTransparant) + { + background.gameObject.GetComponent().DOFade(transparency, timeToFade); + handle.gameObject.GetComponent().DOFade(transparency, timeToFade); + } + else + { + background.gameObject.GetComponent().DOFade(1f, timeToFade); + handle.gameObject.GetComponent().DOFade(1f, timeToFade); + } + } } public enum AxisOptions { Both, Horizontal, Vertical } \ No newline at end of file diff --git a/Assets/Joystick Pack/Scripts/Editor/JoystickEditor.cs b/Assets/Joystick Pack/Scripts/Editor/JoystickEditor.cs index de94efde..1a09434d 100644 --- a/Assets/Joystick Pack/Scripts/Editor/JoystickEditor.cs +++ b/Assets/Joystick Pack/Scripts/Editor/JoystickEditor.cs @@ -13,6 +13,9 @@ public class JoystickEditor : Editor private SerializedProperty snapY; protected SerializedProperty background; private SerializedProperty handle; + private SerializedProperty timeToFade; + private SerializedProperty transparency; + private SerializedProperty isToTranparency; protected Vector2 center = new Vector2(0.5f, 0.5f); @@ -25,6 +28,9 @@ public class JoystickEditor : Editor snapY = serializedObject.FindProperty("snapY"); background = serializedObject.FindProperty("background"); handle = serializedObject.FindProperty("handle"); + isToTranparency = serializedObject.FindProperty("isToTranparency"); + timeToFade = serializedObject.FindProperty("timeToFade"); + transparency = serializedObject.FindProperty("transparency"); } public override void OnInspectorGUI() @@ -54,6 +60,12 @@ public class JoystickEditor : Editor EditorGUILayout.PropertyField(axisOptions, new GUIContent("Axis Options", "Which axes the joystick uses.")); EditorGUILayout.PropertyField(snapX, new GUIContent("Snap X", "Snap the horizontal input to a whole value.")); EditorGUILayout.PropertyField(snapY, new GUIContent("Snap Y", "Snap the vertical input to a whole value.")); + EditorGUILayout.PropertyField(isToTranparency, new GUIContent("IsTranperancy", "Pick, if joystick has to be visible tranparently while inactive")); + if (isToTranparency.boolValue) + { + EditorGUILayout.PropertyField(timeToFade, new GUIContent("Fade time", "Time to made joystick transparant")); + EditorGUILayout.PropertyField(transparency, new GUIContent("Transparency")); + } } protected virtual void DrawComponents() diff --git a/Assets/Joystick Pack/Scripts/Joysticks/DynamicJoystick.cs b/Assets/Joystick Pack/Scripts/Joysticks/DynamicJoystick.cs index 3ca48c9a..7da84c6b 100644 --- a/Assets/Joystick Pack/Scripts/Joysticks/DynamicJoystick.cs +++ b/Assets/Joystick Pack/Scripts/Joysticks/DynamicJoystick.cs @@ -1,11 +1,18 @@ using System.Collections; using System.Collections.Generic; +using DG.Tweening; using UnityEngine; using UnityEngine.EventSystems; public class DynamicJoystick : Joystick { - public float MoveThreshold { get { return moveThreshold; } set { moveThreshold = Mathf.Abs(value); } } + private float MoveThreshold + { + get { return moveThreshold; } + set { moveThreshold = Mathf.Abs(value); } + } + + private Vector2 starPos; [SerializeField] private float moveThreshold = 1; @@ -13,19 +20,21 @@ public class DynamicJoystick : Joystick { MoveThreshold = moveThreshold; base.Start(); - background.gameObject.SetActive(false); + starPos = background.anchoredPosition; + FadeJoystick(false); } public override void OnPointerDown(PointerEventData eventData) { background.anchoredPosition = ScreenPointToAnchoredPosition(eventData.position); - background.gameObject.SetActive(true); + FadeJoystick(true); base.OnPointerDown(eventData); } public override void OnPointerUp(PointerEventData eventData) { - background.gameObject.SetActive(false); + FadeJoystick(false); + background.anchoredPosition = starPos; base.OnPointerUp(eventData); } @@ -36,6 +45,7 @@ public class DynamicJoystick : Joystick Vector2 difference = normalised * (magnitude - moveThreshold) * radius; background.anchoredPosition += difference; } + base.HandleInput(magnitude, normalised, radius, cam); } } \ No newline at end of file diff --git a/Assets/Joystick Pack/Scripts/Joysticks/FloatingJoystick.cs b/Assets/Joystick Pack/Scripts/Joysticks/FloatingJoystick.cs index 602d56d1..fa0e5303 100644 --- a/Assets/Joystick Pack/Scripts/Joysticks/FloatingJoystick.cs +++ b/Assets/Joystick Pack/Scripts/Joysticks/FloatingJoystick.cs @@ -1,26 +1,31 @@ using System.Collections; using System.Collections.Generic; +using System.ComponentModel; using UnityEngine; using UnityEngine.EventSystems; +using UnityEngine.UI; public class FloatingJoystick : Joystick { + protected override void Start() { base.Start(); - background.gameObject.SetActive(false); + FadeJoystick(false); + } public override void OnPointerDown(PointerEventData eventData) { background.anchoredPosition = ScreenPointToAnchoredPosition(eventData.position); - background.gameObject.SetActive(true); + FadeJoystick(true); base.OnPointerDown(eventData); } public override void OnPointerUp(PointerEventData eventData) { - background.gameObject.SetActive(false); + + FadeJoystick(false); base.OnPointerUp(eventData); } } \ No newline at end of file diff --git a/Assets/Prefab/AimCanvas.prefab b/Assets/Prefab/AimPrefab.prefab similarity index 99% rename from Assets/Prefab/AimCanvas.prefab rename to Assets/Prefab/AimPrefab.prefab index 6355ec34..eac68c71 100644 --- a/Assets/Prefab/AimCanvas.prefab +++ b/Assets/Prefab/AimPrefab.prefab @@ -13,7 +13,7 @@ GameObject: - component: {fileID: 3748583951425988394} - component: {fileID: 6763014501615571600} m_Layer: 5 - m_Name: AimCanvas + m_Name: AimPrefab m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Prefab/AimCanvas.prefab.meta b/Assets/Prefab/AimPrefab.prefab.meta similarity index 100% rename from Assets/Prefab/AimCanvas.prefab.meta rename to Assets/Prefab/AimPrefab.prefab.meta diff --git a/Assets/Prefab/Canvas.prefab b/Assets/Prefab/Canvas.prefab index 15d89dcb..728a94c8 100644 --- a/Assets/Prefab/Canvas.prefab +++ b/Assets/Prefab/Canvas.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &4726489279989878083 +--- !u!1 &6856228295846885034 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,45 +8,46 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4726489279989878082} - - component: {fileID: 4726489279989878080} - - component: {fileID: 4726489279989878081} - m_Layer: 0 + - component: {fileID: 4578579232741126039} + - component: {fileID: 3022236851805642197} + - component: {fileID: 1626605468953962268} + - component: {fileID: 7982525548056895049} + m_Layer: 5 m_Name: Canvas m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &4726489279989878082 +--- !u!224 &4578579232741126039 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4726489279989878083} - m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_GameObject: {fileID: 6856228295846885034} + 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_LocalScale: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0.099975586} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!223 &4726489279989878080 + m_Pivot: {x: 0, y: 0} +--- !u!223 &3022236851805642197 Canvas: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4726489279989878083} + m_GameObject: {fileID: 6856228295846885034} m_Enabled: 1 serializedVersion: 3 - m_RenderMode: 2 + m_RenderMode: 0 m_Camera: {fileID: 0} m_PlaneDistance: 100 m_PixelPerfect: 0 @@ -58,26 +59,43 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 ---- !u!114 &4726489279989878081 +--- !u!114 &1626605468953962268 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4726489279989878083} + m_GameObject: {fileID: 6856228295846885034} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 + m_ReferenceResolution: {x: 1080, y: 1920} + m_ScreenMatchMode: 1 m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 10 - m_PresetInfoIsWorld: 1 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!114 &7982525548056895049 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6856228295846885034} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 diff --git a/Assets/Prefab/Canvas.prefab.meta b/Assets/Prefab/Canvas.prefab.meta index f0dbf3c3..976f0adc 100644 --- a/Assets/Prefab/Canvas.prefab.meta +++ b/Assets/Prefab/Canvas.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f31e0880dd078104bb31dc0fd7ef9f19 +guid: 682042d5dd3e7d94bbe2a67ec2c1245a PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Prefab/Cheats.meta b/Assets/Prefab/Cheats.meta new file mode 100644 index 00000000..fb5ae07a --- /dev/null +++ b/Assets/Prefab/Cheats.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c24cca6be79d7df49ade12881ef7e2db +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefab/Cheats/CheatButton.prefab b/Assets/Prefab/Cheats/CheatButton.prefab new file mode 100644 index 00000000..fdfa8c8f --- /dev/null +++ b/Assets/Prefab/Cheats/CheatButton.prefab @@ -0,0 +1,257 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3528214882097960320 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9164921100788991987} + - component: {fileID: 7680007330534579005} + - component: {fileID: 8438747523624622182} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9164921100788991987 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3528214882097960320} + 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_Children: [] + m_Father: {fileID: 7862865703951521409} + m_RootOrder: 0 + 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!222 &7680007330534579005 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3528214882097960320} + m_CullTransparentMesh: 1 +--- !u!114 &8438747523624622182 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3528214882097960320} + 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: button + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: c2f49fe8c22d94f9a9e6cd06ad490155, type: 2} + m_sharedMaterial: {fileID: 3074828514974314926, guid: c2f49fe8c22d94f9a9e6cd06ad490155, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4292861925 + m_fontColor: {r: 0.8962264, g: 0.875089, b: 0.875089, 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: 72 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 1 + 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: 4 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 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!1 &7594676903353794629 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7862865703951521409} + - component: {fileID: 1455670366857308375} + - component: {fileID: 8036039828477737226} + - component: {fileID: 4167671523903823318} + m_Layer: 5 + m_Name: CheatButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7862865703951521409 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7594676903353794629} + 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_Children: + - {fileID: 9164921100788991987} + m_Father: {fileID: 0} + m_RootOrder: 0 + 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: 250, y: 250} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1455670366857308375 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7594676903353794629} + m_CullTransparentMesh: 1 +--- !u!114 &8036039828477737226 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7594676903353794629} + 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: 21300000, guid: 804461bef59b141dba258fc997c8ca15, type: 3} + 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!114 &4167671523903823318 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7594676903353794629} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 8036039828477737226} + m_OnClick: + m_PersistentCalls: + m_Calls: [] diff --git a/Assets/Prefab/Cheats/CheatButton.prefab.meta b/Assets/Prefab/Cheats/CheatButton.prefab.meta new file mode 100644 index 00000000..55a73ccf --- /dev/null +++ b/Assets/Prefab/Cheats/CheatButton.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: dc551d6552aaddd44bd523f97d9c4315 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefab/Cheats/Cheats.prefab b/Assets/Prefab/Cheats/Cheats.prefab new file mode 100644 index 00000000..ed9f2476 --- /dev/null +++ b/Assets/Prefab/Cheats/Cheats.prefab @@ -0,0 +1,505 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &791049003986290286 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 791049003986290285} + - component: {fileID: 791049003986290290} + - component: {fileID: 791049003986290291} + - component: {fileID: 791049003986290284} + m_Layer: 5 + m_Name: Menu + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &791049003986290285 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 791049003986290286} + 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_Children: + - {fileID: 791049004691836316} + m_Father: {fileID: 791049004453965679} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -124, y: -122} + m_SizeDelta: {x: 200, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &791049003986290290 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 791049003986290286} + m_CullTransparentMesh: 1 +--- !u!114 &791049003986290291 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 791049003986290286} + 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: 21300000, guid: 804461bef59b141dba258fc997c8ca15, type: 3} + 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!114 &791049003986290284 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 791049003986290286} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 791049003986290291} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &791049004318647767 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 791049004318647766} + - component: {fileID: 791049004318647771} + - component: {fileID: 400903456837396925} + - component: {fileID: 6391977752877355874} + m_Layer: 5 + m_Name: CheatMenu + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &791049004318647766 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 791049004318647767} + 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_Children: [] + m_Father: {fileID: 6793198660103271386} + m_RootOrder: 0 + 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: -959.99963} + m_SizeDelta: {x: 1080, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &791049004318647771 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 791049004318647767} + m_CullTransparentMesh: 1 +--- !u!114 &400903456837396925 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 791049004318647767} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!114 &6391977752877355874 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 791049004318647767} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 10 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 1 + m_ReverseArrangement: 0 +--- !u!1 &791049004453965672 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 791049004453965679} + - component: {fileID: 791049004453965678} + m_Layer: 5 + m_Name: Cheats + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &791049004453965679 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 791049004453965672} + 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_Children: + - {fileID: 791049003986290285} + - {fileID: 6793198660103271386} + m_Father: {fileID: 0} + m_RootOrder: 0 + 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 &791049004453965678 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 791049004453965672} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f266648a97232b489e11d8149e482fb, type: 3} + m_Name: + m_EditorClassIdentifier: + showButton: {fileID: 791049003986290284} + scrollRect: {fileID: 6556942205273115522} + grid: {fileID: 791049004318647767} + buttonPrefab: {fileID: 4167671523903823318, guid: dc551d6552aaddd44bd523f97d9c4315, type: 3} + gridPrefab: {fileID: 714523624684858823, guid: 9bd2ef532d947ba45aba6c30098a7ab2, type: 3} +--- !u!1 &791049004691836317 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 791049004691836316} + - component: {fileID: 791049004691836322} + - component: {fileID: 791049004691836323} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &791049004691836316 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 791049004691836317} + 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_Children: [] + m_Father: {fileID: 791049003986290285} + m_RootOrder: 0 + 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!222 &791049004691836322 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 791049004691836317} + m_CullTransparentMesh: 1 +--- !u!114 &791049004691836323 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 791049004691836317} + 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: Cheats + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 9a2157e1f9c4c4d38841fbb92558f587, type: 2} + m_sharedMaterial: {fileID: -6360588970910393389, guid: 9a2157e1f9c4c4d38841fbb92558f587, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 43.6 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 43.6 + 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_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 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!1 &6556942205273115522 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6793198660103271386} + - component: {fileID: 2795823041881404252} + - component: {fileID: 6706572122927358412} + - component: {fileID: 8762395074591941718} + m_Layer: 5 + m_Name: ScrollRect + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6793198660103271386 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6556942205273115522} + 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_Children: + - {fileID: 791049004318647766} + m_Father: {fileID: 791049004453965679} + m_RootOrder: 1 + 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 &2795823041881404252 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6556942205273115522} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 791049004318647766} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 20 + m_Viewport: {fileID: 6793198660103271386} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 0} + m_HorizontalScrollbarVisibility: 0 + m_VerticalScrollbarVisibility: 0 + m_HorizontalScrollbarSpacing: 0 + m_VerticalScrollbarSpacing: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!222 &6706572122927358412 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6556942205273115522} + m_CullTransparentMesh: 1 +--- !u!114 &8762395074591941718 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6556942205273115522} + 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, g: 0, b: 0, a: 0.3137255} + 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: 0} + 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 diff --git a/Assets/Prefab/Cheats/Cheats.prefab.meta b/Assets/Prefab/Cheats/Cheats.prefab.meta new file mode 100644 index 00000000..a35b9359 --- /dev/null +++ b/Assets/Prefab/Cheats/Cheats.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 33deb58e3852451419239c8df4119f91 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefab/Cheats/GridPrefab.prefab b/Assets/Prefab/Cheats/GridPrefab.prefab new file mode 100644 index 00000000..2e3ddde4 --- /dev/null +++ b/Assets/Prefab/Cheats/GridPrefab.prefab @@ -0,0 +1,288 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &714523624684858823 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2085477635123581026} + - component: {fileID: 7719330412259157066} + - component: {fileID: 6471023686478568768} + m_Layer: 5 + m_Name: GridPrefab + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2085477635123581026 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 714523624684858823} + 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_Children: + - {fileID: 4923699247198040045} + m_Father: {fileID: 0} + m_RootOrder: 0 + 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: -125} + m_SizeDelta: {x: 1080, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &7719330412259157066 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 714523624684858823} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 250, y: 250} + m_Spacing: {x: 10, y: 10} + m_Constraint: 0 + m_ConstraintCount: 2 +--- !u!114 &6471023686478568768 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 714523624684858823} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!1 &4120300587030065781 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6354141475223046272} + - component: {fileID: 4874473959373459238} + - component: {fileID: 4921597349614415287} + m_Layer: 5 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6354141475223046272 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4120300587030065781} + 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_Children: [] + m_Father: {fileID: 4923699247198040045} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -30, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4874473959373459238 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4120300587030065781} + m_CullTransparentMesh: 1 +--- !u!114 &4921597349614415287 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4120300587030065781} + 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: New Text + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 50c12c23294124aa48490c44ac65a9e4, type: 2} + m_sharedMaterial: {fileID: 7746803525459343344, guid: 50c12c23294124aa48490c44ac65a9e4, 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: 72 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 4 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 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!1 &5766105947932543636 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4923699247198040045} + - component: {fileID: 1761270617033489979} + - component: {fileID: 1071269669473557415} + m_Layer: 5 + m_Name: TitleBack + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4923699247198040045 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5766105947932543636} + 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_Children: + - {fileID: 6354141475223046272} + m_Father: {fileID: 2085477635123581026} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1761270617033489979 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5766105947932543636} + m_CullTransparentMesh: 1 +--- !u!114 &1071269669473557415 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5766105947932543636} + 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: 21300000, guid: d60ccf0feab112a4baa66853572c90ad, 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 diff --git a/Assets/Prefab/Cheats/GridPrefab.prefab.meta b/Assets/Prefab/Cheats/GridPrefab.prefab.meta new file mode 100644 index 00000000..70651a45 --- /dev/null +++ b/Assets/Prefab/Cheats/GridPrefab.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9bd2ef532d947ba45aba6c30098a7ab2 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefab/CoordCanvas.prefab b/Assets/Prefab/CoordCanvas.prefab new file mode 100644 index 00000000..fe54f9d5 --- /dev/null +++ b/Assets/Prefab/CoordCanvas.prefab @@ -0,0 +1,83 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4726489279989878083 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4726489279989878082} + - component: {fileID: 4726489279989878080} + - component: {fileID: 4726489279989878081} + m_Layer: 0 + m_Name: CoordCanvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4726489279989878082 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4726489279989878083} + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0.099975586} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &4726489279989878080 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4726489279989878083} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &4726489279989878081 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4726489279989878083} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 10 + m_PresetInfoIsWorld: 1 diff --git a/Assets/Prefab/CoordCanvas.prefab.meta b/Assets/Prefab/CoordCanvas.prefab.meta new file mode 100644 index 00000000..f0dbf3c3 --- /dev/null +++ b/Assets/Prefab/CoordCanvas.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f31e0880dd078104bb31dc0fd7ef9f19 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefab/InventoryCanas.prefab b/Assets/Prefab/InventoryCanvas.prefab similarity index 60% rename from Assets/Prefab/InventoryCanas.prefab rename to Assets/Prefab/InventoryCanvas.prefab index 2d23cf26..bf91430e 100644 --- a/Assets/Prefab/InventoryCanas.prefab +++ b/Assets/Prefab/InventoryCanvas.prefab @@ -9,12 +9,9 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5757677100394197073} - - component: {fileID: 5200306858852700959} - - component: {fileID: 5828887965330480077} - - component: {fileID: 5815360006936303551} - component: {fileID: 1527356263590969195} m_Layer: 5 - m_Name: InventoryCanas + m_Name: InventoryCanvas m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -29,78 +26,17 @@ RectTransform: m_GameObject: {fileID: 1967491301176557388} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2902167093541798520} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!223 &5200306858852700959 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1967491301176557388} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!114 &5828887965330480077 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1967491301176557388} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 1 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 1080, y: 1920} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!114 &5815360006936303551 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1967491301176557388} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 192.39255} + m_SizeDelta: {x: 0, y: 400} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1527356263590969195 MonoBehaviour: m_ObjectHideFlags: 0 @@ -148,7 +84,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 231} + m_AnchoredPosition: {x: 0, y: 200} m_SizeDelta: {x: 0, y: 228.46094} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2902167093541798521 diff --git a/Assets/Prefab/InventoryCanas.prefab.meta b/Assets/Prefab/InventoryCanvas.prefab.meta similarity index 100% rename from Assets/Prefab/InventoryCanas.prefab.meta rename to Assets/Prefab/InventoryCanvas.prefab.meta diff --git a/Assets/Prefab/PauseMenu.prefab b/Assets/Prefab/PauseMenu.prefab index 386f2c71..391ec6a4 100644 --- a/Assets/Prefab/PauseMenu.prefab +++ b/Assets/Prefab/PauseMenu.prefab @@ -153,10 +153,10 @@ RectTransform: m_Father: {fileID: 7535381195931813741} m_RootOrder: 0 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: 10} - m_SizeDelta: {x: -300, y: -1680} + 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: 600, y: 250} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1469258782187354179 CanvasRenderer: @@ -341,9 +341,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5296751824488078437} - - component: {fileID: 5296751824488078438} - - component: {fileID: 5296751824488078439} - - component: {fileID: 5296751824488078360} - component: {fileID: 5296751824488078436} m_Layer: 5 m_Name: PauseMenu @@ -361,7 +358,7 @@ RectTransform: m_GameObject: {fileID: 5296751824488078361} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 5296751825971116042} - {fileID: 7535381195931813741} @@ -369,71 +366,10 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {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, y: 0} ---- !u!223 &5296751824488078438 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5296751824488078361} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 25 - m_SortingLayerID: 0 - m_SortingOrder: 1 - m_TargetDisplay: 0 ---- !u!114 &5296751824488078439 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5296751824488078361} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 1 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 1080, y: 1920} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 1 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!114 &5296751824488078360 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5296751824488078361} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5296751824488078436 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1154,7 +1090,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 0} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 diff --git a/Assets/Prefab/BarCAnvas.prefab b/Assets/Prefab/PlayerBar.prefab similarity index 99% rename from Assets/Prefab/BarCAnvas.prefab rename to Assets/Prefab/PlayerBar.prefab index 0492c139..f5022678 100644 --- a/Assets/Prefab/BarCAnvas.prefab +++ b/Assets/Prefab/PlayerBar.prefab @@ -310,7 +310,7 @@ GameObject: - component: {fileID: 1271697267505620599} - component: {fileID: 482855193181693567} m_Layer: 5 - m_Name: BarCanvas + m_Name: PlayerBar m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Prefab/BarCAnvas.prefab.meta b/Assets/Prefab/PlayerBar.prefab.meta similarity index 100% rename from Assets/Prefab/BarCAnvas.prefab.meta rename to Assets/Prefab/PlayerBar.prefab.meta diff --git a/Assets/Prefab/PlayerControlView.prefab b/Assets/Prefab/PlayerControlView.prefab index ce547c8c..2090d72e 100644 --- a/Assets/Prefab/PlayerControlView.prefab +++ b/Assets/Prefab/PlayerControlView.prefab @@ -9,9 +9,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2346010271288414180} - - component: {fileID: 2346010271288414183} - - component: {fileID: 2346010271288414182} - - component: {fileID: 2346010271288414169} - component: {fileID: 4385872142190176059} m_Layer: 5 m_Name: PlayerControlView @@ -29,7 +26,7 @@ RectTransform: m_GameObject: {fileID: 2346010271288414168} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1663236856136613725} - {fileID: 5903238893920995269} @@ -38,71 +35,10 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {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, y: 0} ---- !u!223 &2346010271288414183 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2346010271288414168} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!114 &2346010271288414182 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2346010271288414168} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 1 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 1080, y: 1920} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!114 &2346010271288414169 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2346010271288414168} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4385872142190176059 MonoBehaviour: m_ObjectHideFlags: 0 @@ -129,6 +65,18 @@ PrefabInstance: propertyPath: deadZone value: 0.2 objectReference: {fileID: 0} + - target: {fileID: 8170153791668043265, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} + propertyPath: timeToFade + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 8170153791668043265, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} + propertyPath: transparency + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 8170153791668043265, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} + propertyPath: isToTranparency + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_Pivot.x value: 0 @@ -227,11 +175,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8170153791961219456, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_SizeDelta.x - value: 180 + value: 100 objectReference: {fileID: 0} - target: {fileID: 8170153791961219456, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_SizeDelta.y - value: 180 + value: 100 objectReference: {fileID: 0} - target: {fileID: 8170153791961219459, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_Sprite @@ -243,11 +191,11 @@ PrefabInstance: objectReference: {fileID: 21300000, guid: 4db2952f6e3f0bc43889874a9299ff0e, type: 3} - target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_SizeDelta.x - value: 512 + value: 300 objectReference: {fileID: 0} - target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_SizeDelta.y - value: 512 + value: 300 objectReference: {fileID: 0} - target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_AnchoredPosition.x @@ -286,6 +234,18 @@ PrefabInstance: propertyPath: deadZone value: 0.2 objectReference: {fileID: 0} + - target: {fileID: 8170153791668043265, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} + propertyPath: timeToFade + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 8170153791668043265, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} + propertyPath: transparency + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 8170153791668043265, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} + propertyPath: isToTranparency + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_Pivot.x value: 0 @@ -388,11 +348,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8170153791961219456, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_SizeDelta.x - value: 180 + value: 100 objectReference: {fileID: 0} - target: {fileID: 8170153791961219456, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_SizeDelta.y - value: 180 + value: 100 objectReference: {fileID: 0} - target: {fileID: 8170153791961219459, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_Sprite @@ -404,11 +364,11 @@ PrefabInstance: objectReference: {fileID: 21300000, guid: 2f51e0c9d4b837c419aab13bd3a5a8c9, type: 3} - target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_SizeDelta.x - value: 512 + value: 300 objectReference: {fileID: 0} - target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_SizeDelta.y - value: 512 + value: 300 objectReference: {fileID: 0} - target: {fileID: 8170153792821263258, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3} propertyPath: m_AnchoredPosition.x @@ -527,6 +487,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8135886326569738823, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: timeToFade + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 8135886326569738823, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: transparency + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 8135886326569738823, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: isToTranparency + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8135886326569738825, guid: 56fae09712773584fb63896d473a98ee, type: 3} propertyPath: m_Name value: MovementJoystic @@ -537,11 +509,19 @@ PrefabInstance: objectReference: {fileID: 21300000, guid: 762431f3bc929244dbafb8adebe33a20, type: 3} - target: {fileID: 8135886327475159579, guid: 56fae09712773584fb63896d473a98ee, type: 3} propertyPath: m_SizeDelta.x - value: 512 + value: 300 objectReference: {fileID: 0} - target: {fileID: 8135886327475159579, guid: 56fae09712773584fb63896d473a98ee, type: 3} propertyPath: m_SizeDelta.y - value: 512 + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 8135886327475159579, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: m_AnchoredPosition.x + value: 162.04314 + objectReference: {fileID: 0} + - target: {fileID: 8135886327475159579, guid: 56fae09712773584fb63896d473a98ee, type: 3} + propertyPath: m_AnchoredPosition.y + value: 162.04315 objectReference: {fileID: 0} - target: {fileID: 8135886327784587630, guid: 56fae09712773584fb63896d473a98ee, type: 3} propertyPath: m_Sprite @@ -549,11 +529,11 @@ PrefabInstance: objectReference: {fileID: 21300000, guid: e4cafc2ebb0780147b883e0519c14216, type: 3} - target: {fileID: 8135886327784587633, guid: 56fae09712773584fb63896d473a98ee, type: 3} propertyPath: m_SizeDelta.x - value: 182 + value: 100 objectReference: {fileID: 0} - target: {fileID: 8135886327784587633, guid: 56fae09712773584fb63896d473a98ee, type: 3} propertyPath: m_SizeDelta.y - value: 182 + value: 100 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 56fae09712773584fb63896d473a98ee, type: 3} diff --git a/Assets/Resources/1/_NewSprites/1. Game_Scene/Dead_Window/Dead_Window.prefab b/Assets/Resources/1/_NewSprites/1. Game_Scene/Dead_Window/Dead_Window.prefab index fa904629..cac5b1b5 100644 --- a/Assets/Resources/1/_NewSprites/1. Game_Scene/Dead_Window/Dead_Window.prefab +++ b/Assets/Resources/1/_NewSprites/1. Game_Scene/Dead_Window/Dead_Window.prefab @@ -1245,9 +1245,6 @@ GameObject: m_Component: - component: {fileID: 838699096359249966} - component: {fileID: 4936557783008875079} - - component: {fileID: 6820510404950984226} - - component: {fileID: 6334355650341377095} - - component: {fileID: 7453366928266034421} m_Layer: 5 m_Name: Dead_Window m_TagString: Untagged @@ -1264,7 +1261,7 @@ RectTransform: m_GameObject: {fileID: 838699096359249953} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2943717077549803572} m_Father: {fileID: 0} @@ -1272,9 +1269,9 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} + m_AnchoredPosition: {x: 540, y: 960} + m_SizeDelta: {x: 1080, y: 1920} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4936557783008875079 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1290,67 +1287,6 @@ MonoBehaviour: buttonContinue: {fileID: 876052218403704068} buttonExit: {fileID: 1122319894897876458} canvas: {fileID: 4897827894332987057} ---- !u!223 &6820510404950984226 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 838699096359249953} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 1 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 25 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!114 &6334355650341377095 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 838699096359249953} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 1 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 1080, y: 1920} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 1 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!114 &7453366928266034421 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 838699096359249953} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 --- !u!1 &2412316510347200025 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Data/ItemData.asset b/Assets/Resources/Data/ItemData.asset index cfdfdf37..34884635 100644 --- a/Assets/Resources/Data/ItemData.asset +++ b/Assets/Resources/Data/ItemData.asset @@ -14,18 +14,23 @@ MonoBehaviour: m_EditorClassIdentifier: items: - item: {fileID: 11400000, guid: e7adbedb55c5db341a823370b696f709, type: 2} - _spawnChance: 0.48 + _spawnChance: 0.848 - item: {fileID: 11400000, guid: 62849ddbcd32e834887aac5eb3d98db0, type: 2} - _spawnChance: 0.846 + _spawnChance: 0.505 - item: {fileID: 11400000, guid: ef628c3158b0ea34bb919ca105507009, type: 2} _spawnChance: 0.721 - item: {fileID: 11400000, guid: f824f23273de8df429d37f10b51f9a6f, type: 2} - _spawnChance: 0.83 + _spawnChance: 0.705 - item: {fileID: 11400000, guid: 98f59e15ea7ad2d47b2e3ffd67e2a650, type: 2} - _spawnChance: 0.927 + _spawnChance: 0.64 - item: {fileID: 11400000, guid: 133e523fdd159754e8bf8927faec5b0f, type: 2} - _spawnChance: 0.756 + _spawnChance: 0.833 - item: {fileID: 11400000, guid: 133e523fdd159754e8bf8927faec5b0f, type: 2} - _spawnChance: 0.756 + _spawnChance: 0.848 fromTimeSpawn: 2.93 toTimeSpawn: 10 + icons: + - type: 0 + prefab: {fileID: 3197816592181874056, guid: 2704c4f795b0d7748a3e3fa53be4d893, type: 3} + - type: 1 + prefab: {fileID: 8639522512577941448, guid: 7b6a7f64e52da514d88aa97ad8f863df, type: 3} diff --git a/Assets/Resources/Data/Items/Bomb.asset b/Assets/Resources/Data/Items/Bomb.asset index df43cf40..813288f8 100644 --- a/Assets/Resources/Data/Items/Bomb.asset +++ b/Assets/Resources/Data/Items/Bomb.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f23a091c5733400f8f0092a4c0f33c6e, type: 3} m_Name: Bomb m_EditorClassIdentifier: - iconPrefab: {fileID: 8639522512577941448, guid: 7b6a7f64e52da514d88aa97ad8f863df, type: 3} icon: {fileID: 21300000, guid: 5a80ac41b33ef3f43945efa70e6dfdb0, type: 3} + isInvokeOnPickUp: 0 + type: 1 buildingPrefab: {fileID: 6736513976106828952, guid: 18fb35664a7886842aa1702160b555a8, type: 3} diff --git a/Assets/Resources/Data/Items/Heal.asset b/Assets/Resources/Data/Items/Heal.asset index 54a26a5d..9113b52d 100644 --- a/Assets/Resources/Data/Items/Heal.asset +++ b/Assets/Resources/Data/Items/Heal.asset @@ -12,10 +12,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2b016eba27de41629261b965b3e2be0c, type: 3} m_Name: Heal m_EditorClassIdentifier: - iconPrefab: {fileID: 8639522512577941448, guid: 7b6a7f64e52da514d88aa97ad8f863df, type: 3} icon: {fileID: 0} isInvokeOnPickUp: 1 + type: 1 duration: 0 value: 50 - type: 2 + bonusType: 2 usisngVFX: {fileID: 2206085988447087323, guid: d353016f44d2f164e9e0cbfae078e7c4, type: 3} diff --git a/Assets/Resources/Data/Items/Tower.asset b/Assets/Resources/Data/Items/Tower.asset index ca634c06..8169dc81 100644 --- a/Assets/Resources/Data/Items/Tower.asset +++ b/Assets/Resources/Data/Items/Tower.asset @@ -12,6 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f23a091c5733400f8f0092a4c0f33c6e, type: 3} m_Name: Tower m_EditorClassIdentifier: - iconPrefab: {fileID: 8639522512577941448, guid: 7b6a7f64e52da514d88aa97ad8f863df, type: 3} icon: {fileID: 21300000, guid: b7771b47a72ca7947bf18f664e53a983, type: 3} + isInvokeOnPickUp: 0 + type: 1 buildingPrefab: {fileID: 3496656575117217171, guid: 38edd53c7f09f41409153241c78268f9, type: 3} diff --git a/Assets/Resources/Data/UIData.asset b/Assets/Resources/Data/UIData.asset index 3ebdc6ec..2b26dd9d 100644 --- a/Assets/Resources/Data/UIData.asset +++ b/Assets/Resources/Data/UIData.asset @@ -15,6 +15,8 @@ MonoBehaviour: _objectsToSpawn: - {fileID: 5336165614562949988, guid: b65a64902764f84428e8a07b071bad15, type: 3} - {fileID: 5296751824488078361, guid: 7305318dc10267546b643a42c7c21af3, type: 3} + _canvas: {fileID: 3022236851805642197, guid: 682042d5dd3e7d94bbe2a67ec2c1245a, type: 3} joystickView: {fileID: 4385872142190176059, guid: 4df6913b39f4979429158c344680d83f, type: 3} inventoryView: {fileID: 1527356263590969195, guid: ff3bc3b17ddefd14eb798b22cf0a854f, type: 3} adsMob: {fileID: 4936557783008875079, guid: dc329921d00a27f4480b6ef5cda0a822, type: 3} + cheatMenu: {fileID: 791049004453965678, guid: 33deb58e3852451419239c8df4119f91, type: 3} diff --git a/Assets/Scenes/Level 1.unity b/Assets/Scenes/Level 1.unity index 8d072227..7159ad7a 100644 --- a/Assets/Scenes/Level 1.unity +++ b/Assets/Scenes/Level 1.unity @@ -587,7 +587,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1475618469 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/AI/AIManager.cs b/Assets/Scripts/AI/AIManager.cs index 4f5fecc8..9ef15b18 100644 --- a/Assets/Scripts/AI/AIManager.cs +++ b/Assets/Scripts/AI/AIManager.cs @@ -92,7 +92,7 @@ namespace AI public BotState GetNewBehaviour(AIAgent agent) { - var attack = agent.Unit.Inventory.Where(x => x is Bonus { Type: BonusType.Attack }).ToList(); + var attack = agent.Unit.Inventory.Where(x => x is Bonus { BonusType: BonusType.Attack }).ToList(); if (agent.CurentState is BotState.Attack && agent.Unit.AttackBonus == 0 && attack.Count > 0) { SetBehaviour(BotState.AttackBonusUsage, agent); @@ -130,7 +130,7 @@ namespace AI return BotState.CollectingBonus; } - var protect = agent.Unit.Inventory.Where(x => x is Bonus { Type: BonusType.Defence }).ToList(); + var protect = agent.Unit.Inventory.Where(x => x is Bonus { BonusType: BonusType.Defence }).ToList(); if (protect.Count > 0 && agent.Unit.Hp <= agent.Unit.Data.maxHP * _data.PercentToUseProtectBonus && agent.Unit.DefenceBonus == 0) { @@ -177,7 +177,7 @@ namespace AI private void UseBonus(AIAgent agent, BonusType type) { - var attack = agent.Unit.Inventory.Where(x => x is Bonus bonus && bonus.Type == type).ToList(); + var attack = agent.Unit.Inventory.Where(x => x is Bonus bonus && bonus.BonusType == type).ToList(); if (attack.Count == 0 || !agent.Unit.IsAlive) { GetNewBehaviour(agent); diff --git a/Assets/Scripts/Data/Data.cs b/Assets/Scripts/Data/Data.cs index 16352047..5a3a76aa 100644 --- a/Assets/Scripts/Data/Data.cs +++ b/Assets/Scripts/Data/Data.cs @@ -1,5 +1,4 @@ using System.IO; -using Chars; using DefaultNamespace.Weapons; using UnityEngine; using Weapons; diff --git a/Assets/Scripts/Data/ItemsData.cs b/Assets/Scripts/Data/ItemsData.cs index c9ce31be..08c8632e 100644 --- a/Assets/Scripts/Data/ItemsData.cs +++ b/Assets/Scripts/Data/ItemsData.cs @@ -14,8 +14,12 @@ namespace Data [SerializeField] private float fromTimeSpawn; [SerializeField] private float toTimeSpawn; + [SerializeField] private List icons; public List ItemInfos => items; + + public List Icons => icons; + public (float from, float to) SpawnTime => (fromTimeSpawn, toTimeSpawn); } diff --git a/Assets/Scripts/Data/UIData.cs b/Assets/Scripts/Data/UIData.cs index 843dabe5..463a0649 100644 --- a/Assets/Scripts/Data/UIData.cs +++ b/Assets/Scripts/Data/UIData.cs @@ -9,14 +9,20 @@ namespace Data public class UIData : ScriptableObject { [SerializeField] private List _objectsToSpawn; + [SerializeField] private Canvas _canvas; [SerializeField] private PlayerControlView joystickView; [SerializeField] private PlayerInventoryView inventoryView; [SerializeField] private AdsMob adsMob; + [SerializeField] private CheatMenu cheatMenu; public List ObjectsToSpawn => _objectsToSpawn; public PlayerControlView PlayerControlView => joystickView; public PlayerInventoryView InventoryView => inventoryView; public AdsMob AdsMob => adsMob; + + public CheatMenu CheatMenu => cheatMenu; + + public Canvas Canvas => _canvas; } } \ No newline at end of file diff --git a/Assets/Scripts/GameUI/PlayerInventoryView.cs b/Assets/Scripts/GameUI/PlayerInventoryView.cs index bf9b8547..0a0f9c6d 100644 --- a/Assets/Scripts/GameUI/PlayerInventoryView.cs +++ b/Assets/Scripts/GameUI/PlayerInventoryView.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Linq; using Items; using Units; using UnityEngine; @@ -14,80 +15,66 @@ namespace GameUI public event Action OnBuildingInvoked; - private List itemsGo; + private List itemsGo; private List