diff --git a/Prototype/.idea/.idea.Prototype/.idea/encodings.xml b/Prototype/.idea/.idea.Prototype/.idea/encodings.xml new file mode 100644 index 0000000..df87cf9 --- /dev/null +++ b/Prototype/.idea/.idea.Prototype/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Prototype/.idea/.idea.Prototype/.idea/indexLayout.xml b/Prototype/.idea/.idea.Prototype/.idea/indexLayout.xml new file mode 100644 index 0000000..7b08163 --- /dev/null +++ b/Prototype/.idea/.idea.Prototype/.idea/indexLayout.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/Prototype/.idea/.idea.Prototype/.idea/projectSettingsUpdater.xml b/Prototype/.idea/.idea.Prototype/.idea/projectSettingsUpdater.xml new file mode 100644 index 0000000..4bb9f4d --- /dev/null +++ b/Prototype/.idea/.idea.Prototype/.idea/projectSettingsUpdater.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/Prototype/.idea/.idea.Prototype/.idea/vcs.xml b/Prototype/.idea/.idea.Prototype/.idea/vcs.xml new file mode 100644 index 0000000..6c0b863 --- /dev/null +++ b/Prototype/.idea/.idea.Prototype/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Prototype/.idea/.idea.Prototype/.idea/workspace.xml b/Prototype/.idea/.idea.Prototype/.idea/workspace.xml new file mode 100644 index 0000000..ff0f04a --- /dev/null +++ b/Prototype/.idea/.idea.Prototype/.idea/workspace.xml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1624809637856 + + + + + + + + + + \ No newline at end of file diff --git a/Prototype/Assets/Prefabs/goodSmile.prefab.meta b/Prototype/Assets/Plugins.meta similarity index 52% rename from Prototype/Assets/Prefabs/goodSmile.prefab.meta rename to Prototype/Assets/Plugins.meta index 032aa0e..92ed2de 100644 --- a/Prototype/Assets/Prefabs/goodSmile.prefab.meta +++ b/Prototype/Assets/Plugins.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 01264942e63954943ba47aa2d6d52740 -NativeFormatImporter: +guid: 6ea5757ce1a32e9409e1b5321c65465e +folderAsset: yes +DefaultImporter: externalObjects: {} - mainObjectFileID: 100100000 userData: assetBundleName: assetBundleVariant: diff --git a/Prototype/Assets/Plugins/Editor.meta b/Prototype/Assets/Plugins/Editor.meta new file mode 100644 index 0000000..582d7d2 --- /dev/null +++ b/Prototype/Assets/Plugins/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e76325da93560e04b895cb73fb470109 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Prototype/Assets/Plugins/Editor/JetBrains.meta b/Prototype/Assets/Plugins/Editor/JetBrains.meta new file mode 100644 index 0000000..f97de94 --- /dev/null +++ b/Prototype/Assets/Plugins/Editor/JetBrains.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9a50caebd6ec15b4c83f8f9bfad2468a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Prototype/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll b/Prototype/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll new file mode 100644 index 0000000..1ee2674 Binary files /dev/null and b/Prototype/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll differ diff --git a/Prototype/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll.meta b/Prototype/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll.meta new file mode 100644 index 0000000..499c27c --- /dev/null +++ b/Prototype/Assets/Plugins/Editor/JetBrains/JetBrains.Rider.Unity.Editor.Plugin.Repacked.dll.meta @@ -0,0 +1,30 @@ +fileFormatVersion: 2 +guid: e6bea81ba7c2b3e458c9a20e482529eb +PluginImporter: + externalObjects: {} + serializedVersion: 2 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + isOverridable: 0 + platformData: + - first: + Any: + second: + enabled: 0 + settings: {} + - first: + Editor: Editor + second: + enabled: 1 + settings: + DefaultValueInitialized: true + - first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/Prototype/Assets/Prefabs/goodSmile.prefab b/Prototype/Assets/Prefabs/goodSmile.prefab deleted file mode 100644 index 92db845..0000000 --- a/Prototype/Assets/Prefabs/goodSmile.prefab +++ /dev/null @@ -1,142 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &100100000 -Prefab: - m_ObjectHideFlags: 1 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: [] - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 0} - m_RootGameObject: {fileID: 1606677245037588} - m_IsPrefabAsset: 1 ---- !u!1 &1606677245037588 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 6 - m_Component: - - component: {fileID: 4848052366342088} - - component: {fileID: 212100749619683522} - - component: {fileID: 114880291302347842} - - component: {fileID: 58507608348887176} - - component: {fileID: 50276781725797630} - m_Layer: 0 - m_Name: goodSmile - m_TagString: Smile - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4848052366342088 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1606677245037588} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.016, y: 0.016, z: 0} - m_LocalScale: {x: 0.2, y: 0.2, z: 0.20000002} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!50 &50276781725797630 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1606677245037588} - m_BodyType: 0 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDrag: 0 - m_AngularDrag: 0.05 - m_GravityScale: 0 - m_Material: {fileID: 6200000, guid: c4433b433563e6b4ebc0ebe3c48f14cc, type: 2} - m_Interpolate: 0 - m_SleepingMode: 1 - m_CollisionDetection: 0 - m_Constraints: 0 ---- !u!58 &58507608348887176 -CircleCollider2D: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1606677245037588} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 6200000, guid: c4433b433563e6b4ebc0ebe3c48f14cc, type: 2} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - serializedVersion: 2 - m_Radius: 2.56 ---- !u!114 &114880291302347842 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1606677245037588} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fadd07783bf438e41bd40dc68e79337c, type: 3} - m_Name: - m_EditorClassIdentifier: - gameController: {fileID: 0} - goodSmile: {fileID: 21300000, guid: a2bd550470c31e845b6c26f543e9e582, type: 3} - badSmile: {fileID: 21300000, guid: caf166d1667cea7438d3a73945735d13, type: 3} - goldSmile: {fileID: 21300000, guid: 9f9e496e96effc64486d79e3e6066ffa, type: 3} - isGold: 0 ---- !u!212 &212100749619683522 -SpriteRenderer: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1606677245037588} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: a2bd550470c31e845b6c26f543e9e582, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 5.12, y: 5.12} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 diff --git a/Prototype/Assets/Scenes/Main menu.unity b/Prototype/Assets/Scenes/Main menu.unity index f974e35..3418090 100644 --- a/Prototype/Assets/Scenes/Main menu.unity +++ b/Prototype/Assets/Scenes/Main menu.unity @@ -232,6 +232,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6e92c96e95066574aa3130ef9cde1514, type: 3} m_Name: m_EditorClassIdentifier: + buttonType: 0 sourceSound: {fileID: 1365437298} --- !u!1 &552923905 GameObject: @@ -539,6 +540,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6e92c96e95066574aa3130ef9cde1514, type: 3} m_Name: m_EditorClassIdentifier: + buttonType: 1 sourceSound: {fileID: 1365437298} --- !u!1 &1170947644 GameObject: @@ -1080,6 +1082,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6e92c96e95066574aa3130ef9cde1514, type: 3} m_Name: m_EditorClassIdentifier: + buttonType: 4 sourceSound: {fileID: 1365437298} --- !u!1 &1566214676 GameObject: diff --git a/Prototype/Assets/Scripts/Buttons.cs b/Prototype/Assets/Scripts/Button.cs similarity index 68% rename from Prototype/Assets/Scripts/Buttons.cs rename to Prototype/Assets/Scripts/Button.cs index 0f2c667..327b50d 100644 --- a/Prototype/Assets/Scripts/Buttons.cs +++ b/Prototype/Assets/Scripts/Button.cs @@ -1,34 +1,35 @@ using System.Collections; -using System.Collections.Generic; using UnityEngine; using UnityEngine.SceneManagement; -public class Buttons : MonoBehaviour { - +public class Button : MonoBehaviour { + public enum ButtonType { Play, Tutorial, Market, Ads, Options, Main} + public ButtonType buttonType; + public AudioSource sourceSound; - + private IEnumerator OnMouseUpAsButton() { SoundEffect(sourceSound); yield return new WaitForSeconds(0.5f); - switch (gameObject.name) + switch (buttonType) { - case "PlayButton": + case ButtonType.Play: SceneManager.LoadScene("Play"); break; - case "TutorialButton": + case ButtonType.Tutorial: SceneManager.LoadScene("Tutorial"); break; - case "MarketButton": + case ButtonType.Market: SceneManager.LoadScene("Market"); break; - case "AdsButton": + case ButtonType.Ads: SceneManager.LoadScene("Ads"); break; - case "OptionsButton": + case ButtonType.Options: SceneManager.LoadScene("Options"); break; - case "MainMenuButton": + case ButtonType.Main: SceneManager.LoadScene("Main menu"); break; diff --git a/Prototype/Assets/Scripts/Buttons.cs.meta b/Prototype/Assets/Scripts/Button.cs.meta similarity index 100% rename from Prototype/Assets/Scripts/Buttons.cs.meta rename to Prototype/Assets/Scripts/Button.cs.meta diff --git a/Prototype/Assets/Scripts/MaxGems.cs b/Prototype/Assets/Scripts/MaxGems.cs index 9d7e457..fa33ab0 100644 --- a/Prototype/Assets/Scripts/MaxGems.cs +++ b/Prototype/Assets/Scripts/MaxGems.cs @@ -1,6 +1,4 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; +using UnityEngine; using UnityEngine.UI; public class MaxGems : MonoBehaviour { diff --git a/Prototype/Assets/Scripts/MaxScore.cs b/Prototype/Assets/Scripts/MaxScore.cs index d60bbdf..3ce897e 100644 --- a/Prototype/Assets/Scripts/MaxScore.cs +++ b/Prototype/Assets/Scripts/MaxScore.cs @@ -1,11 +1,10 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; +using UnityEngine; using UnityEngine.UI; public class MaxScore : MonoBehaviour { - void Start () { + void Start () + { GetComponent().text = PlayerPrefs.GetInt("Score").ToString(); } diff --git a/Prototype/Assets/Scripts/MeteorButton.cs b/Prototype/Assets/Scripts/MeteorButton.cs index b4033fd..910120d 100644 --- a/Prototype/Assets/Scripts/MeteorButton.cs +++ b/Prototype/Assets/Scripts/MeteorButton.cs @@ -13,14 +13,15 @@ public class MeteorButton : MonoBehaviour [SerializeField] private Vector3 _rotateOrientation; [SerializeField] private int _localScore = 0; [SerializeField] private int _randomAngerActivator; - + + #region Cached component private Transform _transformMeteor = null; private Transform _transformButton = null; private bool _transformMeteorCached = false; private bool _transformButtonCached = false; - public Transform cachedMeteorTransform + public Transform CachedMeteorTransform { get { @@ -34,7 +35,7 @@ public Transform cachedMeteorTransform } } - public Transform cachedButtonTransform + public Transform CachedButtonTransform { get { @@ -47,7 +48,9 @@ public Transform cachedButtonTransform } } - + + #endregion + private void Start() { if (mainSpawner) @@ -61,15 +64,15 @@ private void Start() private void Update() { - cachedButtonTransform.position = Vector3.MoveTowards(cachedButtonTransform.position, _target, Time.deltaTime * _speed); - cachedMeteorTransform.Rotate(_rotateOrientation * _tilt); + CachedButtonTransform.position = Vector3.MoveTowards(CachedButtonTransform.position, _target, Time.deltaTime * _speed); + CachedMeteorTransform.Rotate(_rotateOrientation * _tilt); } private void OnCollisionEnter2D(Collision2D nearObj) { - if (nearObj.gameObject.tag == "Wall") + if (nearObj.gameObject.CompareTag("Wall")) { Debug.Log(nearObj.gameObject.name); if (objectMeteor.Anger == true) @@ -85,7 +88,7 @@ private void OnCollisionEnter2D(Collision2D nearObj) } } - if (nearObj.gameObject.tag == "Meteor") + if (nearObj.gameObject.CompareTag("Meteor")) { if (objectMeteor.Anger == true && nearObj.gameObject.GetComponent().objectMeteor.Anger == false) { @@ -101,11 +104,6 @@ private void OnCollisionEnter2D(Collision2D nearObj) } } - private void OnMouseDrag() - { - - } - private void OnMouseDown() { SoundEffect(_sourceSound); diff --git a/Prototype/Library/CurrentLayout.dwlt b/Prototype/Library/CurrentLayout.dwlt index 2e0a4c3..c321e31 100644 --- a/Prototype/Library/CurrentLayout.dwlt +++ b/Prototype/Library/CurrentLayout.dwlt @@ -20,7 +20,7 @@ MonoBehaviour: m_ShowMode: 4 m_Title: m_RootView: {fileID: 7} - m_MinSize: {x: 950, y: 542} + m_MinSize: {x: 950, y: 300} m_MaxSize: {x: 10000, y: 10000} --- !u!114 &2 MonoBehaviour: @@ -36,12 +36,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1031 + x: 1168 y: 0 - width: 529 - height: 608 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + width: 392 + height: 600 + m_MinSize: {x: 204, y: 221} + m_MaxSize: {x: 4004, y: 4021} m_ActualView: {fileID: 21} m_Panes: - {fileID: 21} @@ -67,10 +67,10 @@ MonoBehaviour: y: 30 width: 1920 height: 947 - m_MinSize: {x: 887, y: 492} - m_MaxSize: {x: 16012, y: 14042} + m_MinSize: {x: 883, y: 492} + m_MaxSize: {x: 16008, y: 14042} vertical: 0 - controlID: 83 + controlID: 10 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -89,8 +89,8 @@ MonoBehaviour: y: 0 width: 360 height: 947 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 277, y: 71} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 18} m_Panes: - {fileID: 18} @@ -112,10 +112,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 252 - height: 608 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + width: 259 + height: 600 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 19} m_Panes: - {fileID: 19} @@ -136,9 +136,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 608 + y: 600 width: 1560 - height: 339 + height: 347 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} m_ActualView: {fileID: 17} @@ -233,10 +233,10 @@ MonoBehaviour: y: 0 width: 1560 height: 947 - m_MinSize: {x: 610, y: 492} - m_MaxSize: {x: 12010, y: 14042} + m_MinSize: {x: 606, y: 492} + m_MaxSize: {x: 12006, y: 14042} vertical: 1 - controlID: 84 + controlID: 11 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -257,9 +257,9 @@ MonoBehaviour: x: 0 y: 0 width: 1560 - height: 608 - m_MinSize: {x: 610, y: 221} - m_MaxSize: {x: 12010, y: 4021} + height: 600 + m_MinSize: {x: 606, y: 221} + m_MaxSize: {x: 12006, y: 4021} vertical: 0 controlID: 12 --- !u!114 &12 @@ -276,12 +276,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 252 + x: 259 y: 0 - width: 779 - height: 608 - m_MinSize: {x: 204, y: 221} - m_MaxSize: {x: 4004, y: 4021} + width: 909 + height: 600 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 20} m_Panes: - {fileID: 20} @@ -497,7 +497,7 @@ MonoBehaviour: m_AnimEditor: {fileID: 0} m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: -216808 + m_LastSelectedObjectID: 12492 --- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 @@ -544,9 +544,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 700 + y: 692 width: 1558 - height: 318 + height: 326 m_PersistentViewDataDictionary: {fileID: 0} m_SearchFilter: m_NameFilter: @@ -560,34 +560,34 @@ MonoBehaviour: m_ShowAllHits: 0 m_SearchArea: 1 m_Folders: - - Assets/Sprite + - Assets/Scripts m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Sprite + - Assets/Scripts m_LastFoldersGridSize: -1 m_LastProjectPath: D:\Documents\Prototype\Prototype m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 482b0000 - m_LastClickedID: 11080 + m_SelectedIDs: 102d0000 + m_LastClickedID: 11536 m_ExpandedIDs: 00000000f42900000a2c000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: Plugins + m_OriginalName: Plugins m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: 12116 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 1 m_ClientGUIView: {fileID: 6} m_SearchString: @@ -628,8 +628,8 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 - m_ExpandedInstanceIDs: c623000000700200000000007c260000448ef7ff342b0000a02a0000a22c00008e2a00007c2b0000 + m_HadKeyboardFocusLastEvent: 1 + m_ExpandedInstanceIDs: c623000000700200000000007c260000448ef7ff342b0000a02a0000a22c00008e2a00007c2b0000902a0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -686,7 +686,7 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_PreviewResizer: - m_CachedPref: 374 + m_CachedPref: 244 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_PreviewWindow: {fileID: 0} @@ -712,28 +712,28 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 92 - width: 250 - height: 587 + width: 257 + height: 579 m_PersistentViewDataDictionary: {fileID: 0} m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: c631fdff1839fdfff041fdffa2f1ffffe4fbffff000000008e2d0000cc2d0000d4300000 + m_SelectedIDs: cc300000 + m_LastClickedID: 12492 + m_ExpandedIDs: 7a47ffffbec4ffffe4fbffff00000000842d0000c2300000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: Background + m_OriginalName: Background m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: 12462 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 5} m_SearchString: @@ -762,10 +762,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 254 + x: 261 y: 92 - width: 775 - height: 587 + width: 905 + height: 579 m_PersistentViewDataDictionary: {fileID: 0} m_SceneLighting: 0 lastFramingTime: 574.0630027 @@ -773,9 +773,9 @@ MonoBehaviour: m_isRotationLocked: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -0.4354028, y: 0.12867455, z: -2.3755674} + m_Target: {x: -0.2816295, y: -2.0439444, z: -2.4265132} speed: 2 - m_Value: {x: -0.4354028, y: 0.12867455, z: -2.3755674} + m_Value: {x: -0.2816295, y: -2.0439444, z: -2.4265132} m_RenderMode: 2 m_CameraMode: drawMode: 2 @@ -807,9 +807,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 12.054688 + m_Target: 17.321348 speed: 2 - m_Value: 12.054688 + m_Value: 17.321348 m_Ortho: m_Target: 1 speed: 2 @@ -841,10 +841,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1033 + x: 1170 y: 92 - width: 525 - height: 587 + width: 388 + height: 579 m_PersistentViewDataDictionary: {fileID: 0} m_MaximizeOnPlay: 0 m_Gizmos: 0 @@ -856,10 +856,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -160.5 - m_HBaseRangeMax: 160.5 - m_VBaseRangeMin: -285 - m_VBaseRangeMax: 285 + m_HBaseRangeMin: -158 + m_HBaseRangeMax: 158 + m_VBaseRangeMin: -281 + m_VBaseRangeMax: 281 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -877,25 +877,25 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 17 - width: 525 - height: 570 + width: 388 + height: 562 m_Scale: {x: 1, y: 1} - m_Translation: {x: 262.5, y: 285} + m_Translation: {x: 194, y: 281} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -262.5 - y: -285 - width: 525 - height: 570 + x: -194 + y: -281 + width: 388 + height: 562 m_MinimalGUI: 1 m_defaultScale: 1 m_TargetTexture: {fileID: 0} m_CurrentColorSpace: 0 - m_LastWindowPixelSize: {x: 525, y: 587} + m_LastWindowPixelSize: {x: 388, y: 579} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000001000100000100 @@ -921,7 +921,7 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 700 + y: 617 width: 1558 - height: 318 + height: 401 m_PersistentViewDataDictionary: {fileID: 0} diff --git a/Prototype/Library/LastSceneManagerSetup.txt b/Prototype/Library/LastSceneManagerSetup.txt index 3201e86..88234d9 100644 --- a/Prototype/Library/LastSceneManagerSetup.txt +++ b/Prototype/Library/LastSceneManagerSetup.txt @@ -1,4 +1,4 @@ sceneSetups: -- path: Assets/Scenes/Play.unity +- path: Assets/Scenes/Main menu.unity isLoaded: 1 isActive: 1 diff --git a/Prototype/Library/ScriptAssemblies/Assembly-CSharp.dll b/Prototype/Library/ScriptAssemblies/Assembly-CSharp.dll index df74b12..c645ccb 100644 Binary files a/Prototype/Library/ScriptAssemblies/Assembly-CSharp.dll and b/Prototype/Library/ScriptAssemblies/Assembly-CSharp.dll differ diff --git a/Prototype/Library/assetDatabase3 b/Prototype/Library/assetDatabase3 index a47f719..307f371 100644 Binary files a/Prototype/Library/assetDatabase3 and b/Prototype/Library/assetDatabase3 differ diff --git a/Prototype/Library/metadata/01/01264942e63954943ba47aa2d6d52740.info b/Prototype/Library/metadata/01/01264942e63954943ba47aa2d6d52740.info deleted file mode 100644 index 8b830b5..0000000 Binary files a/Prototype/Library/metadata/01/01264942e63954943ba47aa2d6d52740.info and /dev/null differ diff --git a/Prototype/Library/metadata/29/296082495497b7748aa74239edcb6c12 b/Prototype/Library/metadata/29/296082495497b7748aa74239edcb6c12 index 1586178..39155eb 100644 Binary files a/Prototype/Library/metadata/29/296082495497b7748aa74239edcb6c12 and b/Prototype/Library/metadata/29/296082495497b7748aa74239edcb6c12 differ diff --git a/Prototype/Library/metadata/6e/6e92c96e95066574aa3130ef9cde1514 b/Prototype/Library/metadata/6e/6e92c96e95066574aa3130ef9cde1514 index 30aa9e1..1708fdc 100644 Binary files a/Prototype/Library/metadata/6e/6e92c96e95066574aa3130ef9cde1514 and b/Prototype/Library/metadata/6e/6e92c96e95066574aa3130ef9cde1514 differ diff --git a/Prototype/Library/metadata/6e/6e92c96e95066574aa3130ef9cde1514.info b/Prototype/Library/metadata/6e/6e92c96e95066574aa3130ef9cde1514.info index f4fff68..29958c8 100644 Binary files a/Prototype/Library/metadata/6e/6e92c96e95066574aa3130ef9cde1514.info and b/Prototype/Library/metadata/6e/6e92c96e95066574aa3130ef9cde1514.info differ diff --git a/Prototype/Library/metadata/01/01264942e63954943ba47aa2d6d52740 b/Prototype/Library/metadata/6e/6ea5757ce1a32e9409e1b5321c65465e similarity index 54% rename from Prototype/Library/metadata/01/01264942e63954943ba47aa2d6d52740 rename to Prototype/Library/metadata/6e/6ea5757ce1a32e9409e1b5321c65465e index ced39df..bfb271c 100644 Binary files a/Prototype/Library/metadata/01/01264942e63954943ba47aa2d6d52740 and b/Prototype/Library/metadata/6e/6ea5757ce1a32e9409e1b5321c65465e differ diff --git a/Prototype/Library/metadata/6e/6ea5757ce1a32e9409e1b5321c65465e.info b/Prototype/Library/metadata/6e/6ea5757ce1a32e9409e1b5321c65465e.info new file mode 100644 index 0000000..3dbabb3 Binary files /dev/null and b/Prototype/Library/metadata/6e/6ea5757ce1a32e9409e1b5321c65465e.info differ diff --git a/Prototype/Library/metadata/9a/9a50caebd6ec15b4c83f8f9bfad2468a b/Prototype/Library/metadata/9a/9a50caebd6ec15b4c83f8f9bfad2468a new file mode 100644 index 0000000..75e9ec3 Binary files /dev/null and b/Prototype/Library/metadata/9a/9a50caebd6ec15b4c83f8f9bfad2468a differ diff --git a/Prototype/Library/metadata/9a/9a50caebd6ec15b4c83f8f9bfad2468a.info b/Prototype/Library/metadata/9a/9a50caebd6ec15b4c83f8f9bfad2468a.info new file mode 100644 index 0000000..52c1bd0 Binary files /dev/null and b/Prototype/Library/metadata/9a/9a50caebd6ec15b4c83f8f9bfad2468a.info differ diff --git a/Prototype/Library/metadata/e4/e4c2c89d5c433704ea0573053e0d094e b/Prototype/Library/metadata/e4/e4c2c89d5c433704ea0573053e0d094e index 0b73eee..51bc4a2 100644 Binary files a/Prototype/Library/metadata/e4/e4c2c89d5c433704ea0573053e0d094e and b/Prototype/Library/metadata/e4/e4c2c89d5c433704ea0573053e0d094e differ diff --git a/Prototype/Library/metadata/e6/e6bea81ba7c2b3e458c9a20e482529eb b/Prototype/Library/metadata/e6/e6bea81ba7c2b3e458c9a20e482529eb new file mode 100644 index 0000000..e98e068 Binary files /dev/null and b/Prototype/Library/metadata/e6/e6bea81ba7c2b3e458c9a20e482529eb differ diff --git a/Prototype/Library/metadata/e6/e6bea81ba7c2b3e458c9a20e482529eb.info b/Prototype/Library/metadata/e6/e6bea81ba7c2b3e458c9a20e482529eb.info new file mode 100644 index 0000000..d553536 Binary files /dev/null and b/Prototype/Library/metadata/e6/e6bea81ba7c2b3e458c9a20e482529eb.info differ diff --git a/Prototype/Library/metadata/e7/e76325da93560e04b895cb73fb470109 b/Prototype/Library/metadata/e7/e76325da93560e04b895cb73fb470109 new file mode 100644 index 0000000..6d14170 Binary files /dev/null and b/Prototype/Library/metadata/e7/e76325da93560e04b895cb73fb470109 differ diff --git a/Prototype/Library/metadata/e7/e76325da93560e04b895cb73fb470109.info b/Prototype/Library/metadata/e7/e76325da93560e04b895cb73fb470109.info new file mode 100644 index 0000000..9026acf Binary files /dev/null and b/Prototype/Library/metadata/e7/e76325da93560e04b895cb73fb470109.info differ diff --git a/Prototype/Library/metadata/fa/fadd07783bf438e41bd40dc68e79337c b/Prototype/Library/metadata/fa/fadd07783bf438e41bd40dc68e79337c index bd768bc..c917004 100644 Binary files a/Prototype/Library/metadata/fa/fadd07783bf438e41bd40dc68e79337c and b/Prototype/Library/metadata/fa/fadd07783bf438e41bd40dc68e79337c differ diff --git a/Prototype/Library/shadercompiler-UnityShaderCompiler.exe0.log b/Prototype/Library/shadercompiler-UnityShaderCompiler.exe0.log index 1b9f920..fb2e10f 100644 --- a/Prototype/Library/shadercompiler-UnityShaderCompiler.exe0.log +++ b/Prototype/Library/shadercompiler-UnityShaderCompiler.exe0.log @@ -2,3 +2,12 @@ Base path: C:/Program Files/Unity/Hub/Editor/2018.2.21f1/Editor/Data Cmd: initializeCompiler Cmd: initializeCompiler Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler diff --git a/Prototype/ProjectSettings/EditorSettings.asset b/Prototype/ProjectSettings/EditorSettings.asset index 8d9e83b..1eee343 100644 --- a/Prototype/ProjectSettings/EditorSettings.asset +++ b/Prototype/ProjectSettings/EditorSettings.asset @@ -14,8 +14,9 @@ EditorSettings: m_EtcTextureFastCompressor: 1 m_EtcTextureNormalCompressor: 2 m_EtcTextureBestCompressor: 4 - m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd + m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef m_ProjectGenerationRootNamespace: m_UserGeneratedProjectSuffix: m_CollabEditorSettings: inProgressEnabled: 1 + m_EnableTextureStreamingInPlayMode: 1 diff --git a/Prototype/obj/Debug/.NETFramework,Version=v4.5.AssemblyAttributes.cs b/Prototype/obj/Debug/.NETFramework,Version=v4.5.AssemblyAttributes.cs new file mode 100644 index 0000000..e5dc9b8 --- /dev/null +++ b/Prototype/obj/Debug/.NETFramework,Version=v4.5.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5", FrameworkDisplayName = ".NET Framework 4.5")] diff --git a/Prototype/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache b/Prototype/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache index 3de2983..0315fff 100644 Binary files a/Prototype/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache and b/Prototype/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache differ