diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 36e1d05..eb09858 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -513,7 +513,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: interaction text + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 4311e961a11edf545ba020d711a5b017, type: 2} m_sharedMaterial: {fileID: -5352834521635484852, guid: 4311e961a11edf545ba020d711a5b017, type: 2} @@ -810,7 +810,6 @@ MonoBehaviour: m_EditorClassIdentifier: partOfDay: 0 intervalTime: 1 - minutesPerInterval: 1 --- !u!4 &273326178 Transform: m_ObjectHideFlags: 0 @@ -911,13 +910,15 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 310196954} - - component: {fileID: 310196953} - component: {fileID: 310196952} - - component: {fileID: 310196951} - - component: {fileID: 310196955} - - component: {fileID: 310196956} - component: {fileID: 310196957} - component: {fileID: 310196958} + - component: {fileID: 310196959} + - component: {fileID: 310196953} + - component: {fileID: 310196956} + - component: {fileID: 310196951} + - component: {fileID: 310196955} + - component: {fileID: 310196960} m_Layer: 3 m_Name: Player m_TagString: Player @@ -1090,6 +1091,36 @@ MonoBehaviour: m_EditorClassIdentifier: interactionText: {fileID: 87507994} interactionProgressImg: {fileID: 138750307} +--- !u!114 &310196959 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 310196950} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 259b4dba2ac00aa4983a6562c5f4eed5, type: 3} + m_Name: + m_EditorClassIdentifier: + health: 1 + food: 1 + drink: 1 + healthModifier: 15 + foodModifier: 0.4 + drinkModifier: 0.6 +--- !u!114 &310196960 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 310196950} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5ee4c18f008d122488cbb74c779ef5c4, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &360525550 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Player.meta b/Assets/Scripts/Player.meta new file mode 100644 index 0000000..03deb67 --- /dev/null +++ b/Assets/Scripts/Player.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 415ae7da5bed43345b965569c9070e15 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Player/Player.cs b/Assets/Scripts/Player/Player.cs new file mode 100644 index 0000000..3367e45 --- /dev/null +++ b/Assets/Scripts/Player/Player.cs @@ -0,0 +1,11 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Player : MonoBehaviour +{ + public void Die() + { + Debug.Log("----- PLAYER DIED!!! -----"); + } +} diff --git a/Assets/Scripts/Player/Player.cs.meta b/Assets/Scripts/Player/Player.cs.meta new file mode 100644 index 0000000..898b88b --- /dev/null +++ b/Assets/Scripts/Player/Player.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5ee4c18f008d122488cbb74c779ef5c4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/Player/PlayerController.cs similarity index 100% rename from Assets/Scripts/PlayerController.cs rename to Assets/Scripts/Player/PlayerController.cs diff --git a/Assets/Scripts/PlayerController.cs.meta b/Assets/Scripts/Player/PlayerController.cs.meta similarity index 100% rename from Assets/Scripts/PlayerController.cs.meta rename to Assets/Scripts/Player/PlayerController.cs.meta diff --git a/Assets/Scripts/PlayerInteraction.cs b/Assets/Scripts/Player/PlayerInteraction.cs similarity index 100% rename from Assets/Scripts/PlayerInteraction.cs rename to Assets/Scripts/Player/PlayerInteraction.cs diff --git a/Assets/Scripts/PlayerInteraction.cs.meta b/Assets/Scripts/Player/PlayerInteraction.cs.meta similarity index 100% rename from Assets/Scripts/PlayerInteraction.cs.meta rename to Assets/Scripts/Player/PlayerInteraction.cs.meta diff --git a/Assets/Scripts/PlayerMovement.cs b/Assets/Scripts/Player/PlayerMovement.cs similarity index 100% rename from Assets/Scripts/PlayerMovement.cs rename to Assets/Scripts/Player/PlayerMovement.cs diff --git a/Assets/Scripts/PlayerMovement.cs.meta b/Assets/Scripts/Player/PlayerMovement.cs.meta similarity index 100% rename from Assets/Scripts/PlayerMovement.cs.meta rename to Assets/Scripts/Player/PlayerMovement.cs.meta diff --git a/Assets/Scripts/TimeManager.cs b/Assets/Scripts/TimeManager.cs index 304f686..44db6c4 100644 --- a/Assets/Scripts/TimeManager.cs +++ b/Assets/Scripts/TimeManager.cs @@ -4,6 +4,7 @@ using UnityEngine; public class TimeManager : MonoBehaviour { + public static Action OnTimeInterval; public enum PartOfDay { MORNING, @@ -17,24 +18,33 @@ public class TimeManager : MonoBehaviour [SerializeField] float intervalTime = 1.0f; // 1.0f -> 1 real second is 1 ingame minute - [SerializeField] int minutesPerInterval = 1; - DateTime dateTime = new DateTime(1, 1, 1, 23, 0, 0); + DateTime dateTime = new DateTime(1, 1, 1, 0, 0, 0); + float timer; public DateTime GetDateTime() => dateTime; public string GetTime() => dateTime.ToString("hh:mm tt"); public string GetDate() => dateTime.ToString("dd/mm/yyyy"); + public float GetintervalTime() => intervalTime; + void Start() { - InvokeRepeating("TimeUp", intervalTime, intervalTime); + timer = intervalTime; } - void TimeUp() + void Update() { - dateTime = dateTime.AddMinutes(minutesPerInterval); - CheckPartsOfDay(); + timer -= Time.deltaTime; + + if (timer <= 0) + { + dateTime = dateTime.AddMinutes(minutesPerInterval); + CheckPartsOfDay(); + OnTimeInterval?.Invoke(); + timer = intervalTime; + } } void CheckPartsOfDay() diff --git a/Assets/Scripts/Vitality.cs b/Assets/Scripts/Vitality.cs new file mode 100644 index 0000000..ae9180b --- /dev/null +++ b/Assets/Scripts/Vitality.cs @@ -0,0 +1,61 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Vitality : MonoBehaviour +{ + TimeManager timeManager; + Player player; + + [Header("Vitality")] + [Range(0f, 1f)] + [SerializeField] + float health = 1f; + + [Range(0f, 1f)] + [SerializeField] + float food = 1f; + + [Range(0f, 1f)] + [SerializeField] + float drink = 1f; + + [Header("Vitality Modifier Per Interval")] + [Range(0f, 50f)] + [SerializeField] + float healthModifier = 15f; + + [Range(0f, 5f)] + [SerializeField] + float foodModifier = 0.4f; + + [Range(0f, 5f)] + [SerializeField] + float drinkModifier = 0.6f; + + private void Start() + { + timeManager = GameObject.Find("GameManager").GetComponent(); + TimeManager.OnTimeInterval += VitalityInterval; + player = gameObject.GetComponent(); + } + + + void VitalityInterval() + { + + food -= foodModifier / 1000; + drink -= drinkModifier / 1000; + + if(food <= 0f || drink <= 0f) + { + health -= healthModifier / 1000; + } + + if(health <= 0f) + { + player.Die(); + } + } + +} diff --git a/Assets/Scripts/Vitality.cs.meta b/Assets/Scripts/Vitality.cs.meta new file mode 100644 index 0000000..8c8a743 --- /dev/null +++ b/Assets/Scripts/Vitality.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 259b4dba2ac00aa4983a6562c5f4eed5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index ccd9d85..31045f6 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -14,21 +14,121 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: -1920 - y: 43 - width: 1920 - height: 1037 + x: 386 + y: 228 + width: 1206 + height: 715 m_ShowMode: 4 -<<<<<<< Updated upstream - m_Title: Hierarchy -======= - m_Title: Project ->>>>>>> Stashed changes - m_RootView: {fileID: 2} - m_MinSize: {x: 875, y: 350} + m_Title: + m_RootView: {fileID: 6} + m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} - m_Maximized: 1 + m_Maximized: 0 --- !u!114 &2 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 9} + - {fileID: 3} + m_Position: + serializedVersion: 2 + x: 0 + y: 30 + width: 1206 + height: 665 + m_MinSize: {x: 300, y: 200} + m_MaxSize: {x: 24288, y: 16192} + vertical: 0 + controlID: 69 +--- !u!114 &3 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 921 + y: 0 + width: 285 + height: 665 + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 13} + m_Panes: + - {fileID: 13} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &4 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 228 + height: 394 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 14} + m_Panes: + - {fileID: 14} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &5 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: ProjectBrowser + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 394 + width: 921 + height: 271 + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 12} + m_Panes: + - {fileID: 12} + - {fileID: 17} + m_Selected: 0 + m_LastSelected: 1 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -41,22 +141,22 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 3} - - {fileID: 5} - - {fileID: 4} + - {fileID: 7} + - {fileID: 2} + - {fileID: 8} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1920 - height: 1037 + width: 1206 + height: 715 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 m_TopViewHeight: 30 m_UseBottomView: 1 m_BottomViewHeight: 20 ---- !u!114 &3 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -73,12 +173,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1920 + width: 1206 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: ---- !u!114 &4 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -94,136 +194,11 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 1017 - width: 1920 + y: 695 + width: 1206 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &5 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 6} - - {fileID: 11} - m_Position: - serializedVersion: 2 - x: 0 - y: 30 - width: 1920 - height: 987 - m_MinSize: {x: 300, y: 200} - m_MaxSize: {x: 24288, y: 16192} - vertical: 0 -<<<<<<< Updated upstream - controlID: 20426 -======= - controlID: 14794 ->>>>>>> Stashed changes ---- !u!114 &6 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 7} - - {fileID: 10} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1477 -<<<<<<< Updated upstream - height: 987 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 16192, y: 16192} - vertical: 1 - controlID: 20427 -======= - height: 939 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 16192, y: 16192} - vertical: 1 - controlID: 14744 ->>>>>>> Stashed changes ---- !u!114 &7 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: - - {fileID: 8} - - {fileID: 9} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1477 -<<<<<<< Updated upstream - height: 646 - m_MinSize: {x: 200, y: 100} - m_MaxSize: {x: 16192, y: 8096} - vertical: 0 - controlID: 20428 -======= - height: 615 - m_MinSize: {x: 200, y: 100} - m_MaxSize: {x: 16192, y: 8096} - vertical: 0 - controlID: 14823 ->>>>>>> Stashed changes ---- !u!114 &8 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 305 -<<<<<<< Updated upstream - height: 646 -======= - height: 615 ->>>>>>> Stashed changes - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 13} - m_Panes: - - {fileID: 13} - m_Selected: 0 - m_LastSelected: 0 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -233,28 +208,22 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: m_EditorClassIdentifier: - m_Children: [] + m_Children: + - {fileID: 10} + - {fileID: 5} m_Position: serializedVersion: 2 - x: 305 + x: 0 y: 0 - width: 1172 -<<<<<<< Updated upstream - height: 646 -======= - height: 615 ->>>>>>> Stashed changes - m_MinSize: {x: 102, y: 121} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 12} - m_Panes: - - {fileID: 14} - - {fileID: 12} - m_Selected: 1 - m_LastSelected: 0 + width: 921 + height: 665 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 16192, y: 16192} + vertical: 1 + controlID: 70 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -264,30 +233,22 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: m_EditorClassIdentifier: - m_Children: [] + m_Children: + - {fileID: 4} + - {fileID: 11} m_Position: serializedVersion: 2 x: 0 -<<<<<<< Updated upstream - y: 646 - width: 1477 - height: 341 -======= - y: 615 - width: 1477 - height: 324 ->>>>>>> Stashed changes - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 15} - m_Panes: - - {fileID: 15} - - {fileID: 16} - m_Selected: 0 - m_LastSelected: 1 + y: 0 + width: 921 + height: 394 + m_MinSize: {x: 200, y: 100} + m_MaxSize: {x: 16192, y: 8096} + vertical: 0 + controlID: 71 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -296,30 +257,25 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 0 + m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: InspectorWindow + m_Name: m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 1477 + x: 228 y: 0 - width: 443 -<<<<<<< Updated upstream - height: 987 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} -======= - height: 939 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} ->>>>>>> Stashed changes - m_ActualView: {fileID: 17} + width: 693 + height: 394 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 15} m_Panes: - - {fileID: 17} + - {fileID: 15} + - {fileID: 16} m_Selected: 0 - m_LastSelected: 0 + m_LastSelected: 1 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -328,106 +284,180 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_EditorHideFlags: 1 + m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} m_TitleContent: - m_Text: Game - m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} + m_Text: Project + m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 -<<<<<<< Updated upstream - x: -1615 -======= - x: 305 ->>>>>>> Stashed changes - y: 73 - width: 1170 - height: 625 + x: 386 + y: 652 + width: 920 + height: 250 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] - m_SerializedViewNames: [] - m_SerializedViewValues: [] - m_PlayModeViewName: GameView - m_ShowGizmos: 0 - m_TargetDisplay: 0 - m_ClearColor: {r: 0, g: 0, b: 0, a: 0} -<<<<<<< Updated upstream - m_TargetSize: {x: 1074, y: 604} -======= - m_TargetSize: {x: 1019, y: 573} ->>>>>>> Stashed changes - m_TextureFilterMode: 0 - m_TextureHideFlags: 61 - m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 0 - m_UseMipMap: 0 - m_VSyncEnabled: 0 - m_Gizmos: 0 - m_Stats: 0 - m_SelectedSizes: 01000000000000000000000000000000000000000000000000000000000000000000000000000000 - m_ZoomArea: - m_HRangeLocked: 0 - m_VRangeLocked: 0 - hZoomLockedByDefault: 0 - vZoomLockedByDefault: 0 -<<<<<<< Updated upstream - m_HBaseRangeMin: -537 - m_HBaseRangeMax: 537 - m_VBaseRangeMin: -302 - m_VBaseRangeMax: 302 -======= - m_HBaseRangeMin: -509.5 - m_HBaseRangeMax: 509.5 - m_VBaseRangeMin: -286.5 - m_VBaseRangeMax: 286.5 ->>>>>>> Stashed changes - m_HAllowExceedBaseRangeMin: 1 - m_HAllowExceedBaseRangeMax: 1 - m_VAllowExceedBaseRangeMin: 1 - m_VAllowExceedBaseRangeMax: 1 - m_ScaleWithWindow: 0 - m_HSlider: 0 - m_VSlider: 0 - m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 - m_EnableSliderZoomHorizontal: 0 - m_EnableSliderZoomVertical: 0 - m_UniformScale: 1 - m_UpDirection: 1 - m_DrawArea: - serializedVersion: 2 - x: 0 - y: 21 - width: 1170 - height: 604 - m_Scale: {x: 1, y: 1} - m_Translation: {x: 585, y: 302} - m_MarginLeft: 0 - m_MarginRight: 0 - m_MarginTop: 0 - m_MarginBottom: 0 - m_LastShownAreaInsideMargins: - serializedVersion: 2 - x: -585 - y: -302 - width: 1170 - height: 604 - m_MinimalGUI: 1 - m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1170, y: 625} - m_ClearInEditMode: 1 - m_NoCameraWarning: 1 - m_LowResolutionForAspectRatios: 01000000000000000000 - m_XRRenderMode: 0 - m_RenderTexture: {fileID: 0} + m_SearchFilter: + m_NameFilter: + m_ClassNames: [] + m_AssetLabels: [] + m_AssetBundleNames: [] + m_VersionControlStates: [] + m_SoftLockControlStates: [] + m_ReferencingInstanceIDs: + m_SceneHandles: + m_ShowAllHits: 0 + m_SkipHidden: 0 + m_SearchArea: 1 + m_Folders: + - Assets + m_Globs: [] + m_OriginalText: + m_ViewMode: 1 + m_StartGridSize: 64 + m_LastFolders: + - Assets + m_LastFoldersGridSize: -1 + m_LastProjectPath: M:\UnityProjects\2d-top-down + m_LockTracker: + m_IsLocked: 0 + m_FolderTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 0e710000 + m_LastClickedID: 28942 + m_ExpandedIDs: 000000000e71000010710000127100001471000000ca9a3bffffff7f + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_AssetTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 000000000e710000107100001271000014710000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_ListAreaState: + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 + m_HadKeyboardFocusLastEvent: 0 + m_ExpandedInstanceIDs: c6230000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_NewAssetIndexInList: -1 + m_ScrollPosition: {x: 0, y: 0} + m_GridSize: 64 + m_SkipHiddenPackages: 0 + m_DirectoriesAreaWidth: 207 --- !u!114 &13 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Inspector + m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 1307 + y: 258 + width: 284 + height: 644 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_ObjectsLockedBeforeSerialization: [] + m_InstanceIDsLockedBeforeSerialization: + m_PreviewResizer: + m_CachedPref: 160 + m_ControlHash: -371814159 + m_PrefName: Preview_InspectorPreview + m_LastInspectedObjectInstanceID: -1 + m_LastVerticalScrollValue: 0 + m_GlobalObjectId: + m_InspectorMode: 0 + m_LockTracker: + m_IsLocked: 0 + m_PreviewWindow: {fileID: 0} +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -447,14 +477,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: -1920 - y: 73 - width: 304 -<<<<<<< Updated upstream - height: 625 -======= - height: 594 ->>>>>>> Stashed changes + x: 386 + y: 258 + width: 227 + height: 373 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -462,31 +488,25 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} -<<<<<<< Updated upstream - m_SelectedIDs: b6f6ffff - m_LastClickedID: -2378 - m_ExpandedIDs: 0273ffff7673ffffea73ffff6a74ffffea79ffff02a4ffff20fbfffffa6a0000 -======= m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: e27effff8e80ffff0a81ffffa283ffff2efbffff806b0000946b0000406c000042a4000054a4000026a500006cbb0000 ->>>>>>> Stashed changes + m_ExpandedIDs: 2efbffff m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: Calendar - m_OriginalName: Calendar + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 48208 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 8} + m_ClientGUIView: {fileID: 0} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -494,7 +514,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 4c969a2b90040154d917609493e03593 ---- !u!114 &14 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -514,14 +534,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 -<<<<<<< Updated upstream - x: -1615 -======= - x: 305 ->>>>>>> Stashed changes - y: 73 - width: 1170 - height: 625 + x: 614 + y: 258 + width: 691 + height: 373 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -592,6 +608,17 @@ MonoBehaviour: id: Scene View/Tilemap Focus index: 3 layout: 4 + - dockPosition: 0 + containerId: overlay-container--left + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-transform-toolbar + index: 0 + layout: 2 - dockPosition: 0 containerId: overlay-container--right floating: 0 @@ -603,17 +630,6 @@ MonoBehaviour: id: Orientation index: 0 layout: 4 - - dockPosition: 0 - containerId: overlay-container--right - floating: 0 - collapsed: 0 - displayed: 1 - snapOffset: {x: 0, y: 26} - snapOffsetDelta: {x: 0, y: 0} - snapCorner: 0 - id: unity-transform-toolbar - index: 1 - layout: 2 - dockPosition: 1 containerId: overlay-container--right floating: 0 @@ -745,15 +761,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: -<<<<<<< Updated upstream - m_Target: {x: 489.49075, y: 238.88454, z: 9.491288} + m_Target: {x: 0, y: 0, z: 0} speed: 2 - m_Value: {x: 489.49075, y: 238.88454, z: 9.491288} -======= - m_Target: {x: 928.354, y: 501.03793, z: 5.644824} - speed: 2 - m_Value: {x: 928.354, y: 501.03793, z: 5.644824} ->>>>>>> Stashed changes + m_Value: {x: 0, y: 0, z: 0} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -790,13 +800,13 @@ MonoBehaviour: m_Size: {x: 1, y: 1} zGrid: m_Fade: - m_Target: 0 + m_Target: 1 speed: 2 - m_Value: 0 + m_Value: 1 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} - m_ShowGrid: 0 + m_ShowGrid: 1 m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: @@ -804,15 +814,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: -<<<<<<< Updated upstream - m_Target: 313.78177 + m_Target: 10 speed: 2 - m_Value: 313.78177 -======= - m_Target: 161.02727 - speed: 2 - m_Value: 161.02727 ->>>>>>> Stashed changes + m_Value: 10 m_Ortho: m_Target: 1 speed: 2 @@ -837,7 +841,7 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &15 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -846,167 +850,90 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 230, y: 250} - m_MaxSize: {x: 10000, y: 10000} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Project - m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} + m_Text: Game + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 -<<<<<<< Updated upstream - x: -1920 - y: 719 - width: 1476 - height: 320 -======= - x: 0 - y: 688 - width: 1476 - height: 303 ->>>>>>> Stashed changes + x: 507 + y: 94 + width: 1532 + height: 790 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] - m_SearchFilter: - m_NameFilter: - m_ClassNames: [] - m_AssetLabels: [] - m_AssetBundleNames: [] - m_VersionControlStates: [] - m_SoftLockControlStates: [] - m_ReferencingInstanceIDs: - m_SceneHandles: - m_ShowAllHits: 0 - m_SkipHidden: 0 - m_SearchArea: 1 - m_Folders: -<<<<<<< Updated upstream - - Assets/Scripts/CharSprites -======= - - Assets/Scripts ->>>>>>> Stashed changes - m_Globs: [] - m_OriginalText: - m_ViewMode: 1 - m_StartGridSize: 74 - m_LastFolders: -<<<<<<< Updated upstream - - Assets/Scripts/CharSprites -======= - - Assets/Scripts ->>>>>>> Stashed changes - m_LastFoldersGridSize: 74 - m_LastProjectPath: M:\UnityProjects\2d-top-down - m_LockTracker: - m_IsLocked: 0 - m_FolderTreeState: - scrollPos: {x: 0, y: 79} -<<<<<<< Updated upstream - m_SelectedIDs: 8ae00000 - m_LastClickedID: 57482 - m_ExpandedIDs: 00000000826f0000846f0000946f0000966f0000d26f000000ca9a3bffffff7f -======= - m_SelectedIDs: 1e710000 - m_LastClickedID: 28958 - m_ExpandedIDs: 00000000fc700000fe70000000710000027100001e7100002e710000ca73000000ca9a3bffffff7f ->>>>>>> Stashed changes - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_AssetTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 -<<<<<<< Updated upstream - m_ExpandedIDs: 00000000826f0000846f000000ca9a3bffffff7f -======= - m_ExpandedIDs: 00000000fc700000fe700000007100000271000000ca9a3bffffff7f ->>>>>>> Stashed changes - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 1 -<<<<<<< Updated upstream - m_ExpandedInstanceIDs: c62300006a8e0000f25e00008861000000000000586d00007ea70000 -======= - m_ExpandedInstanceIDs: c62300006a8e0000f25e00008861000000000000586d00007ea700006cedffff ->>>>>>> Stashed changes - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 10} - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 0} - m_GridSize: 74 - m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 207 ---- !u!114 &16 + m_SerializedViewNames: [] + m_SerializedViewValues: [] + m_PlayModeViewName: GameView + m_ShowGizmos: 0 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 0} + m_TargetSize: {x: 1532, y: 769} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 0 + m_EnterPlayModeBehavior: 0 + m_UseMipMap: 0 + m_VSyncEnabled: 0 + m_Gizmos: 0 + m_Stats: 0 + m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_ZoomArea: + m_HRangeLocked: 0 + m_VRangeLocked: 0 + hZoomLockedByDefault: 0 + vZoomLockedByDefault: 0 + m_HBaseRangeMin: -766 + m_HBaseRangeMax: 766 + m_VBaseRangeMin: -395 + m_VBaseRangeMax: 395 + m_HAllowExceedBaseRangeMin: 1 + m_HAllowExceedBaseRangeMax: 1 + m_VAllowExceedBaseRangeMin: 1 + m_VAllowExceedBaseRangeMax: 1 + m_ScaleWithWindow: 0 + m_HSlider: 0 + m_VSlider: 0 + m_IgnoreScrollWheelUntilClicked: 0 + m_EnableMouseInput: 1 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 0 + width: 1532 + height: 790 + m_Scale: {x: 1, y: 1} + m_Translation: {x: 766, y: 395} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -766 + y: -395 + width: 1532 + height: 790 + m_MinimalGUI: 1 + m_defaultScale: 1 + m_LastWindowPixelSize: {x: 1532, y: 790} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 01000000000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 0} +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1026,59 +953,11 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: -1920 - y: 719 - width: 1476 - height: 320 + x: 2249 + y: 726.5 + width: 920 + height: 250 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &17 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Inspector - m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 -<<<<<<< Updated upstream - x: -443 - y: 73 - width: 442 - height: 966 -======= - x: 1477 - y: 73 - width: 442 - height: 918 ->>>>>>> Stashed changes - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_ObjectsLockedBeforeSerialization: [] - m_InstanceIDsLockedBeforeSerialization: - m_PreviewResizer: - m_CachedPref: -160 - m_ControlHash: -371814159 - m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 - m_GlobalObjectId: - m_InspectorMode: 0 - m_LockTracker: - m_IsLocked: 0 - m_PreviewWindow: {fileID: 0}