diff --git a/.vs/2D Shooter/v15/.suo b/.vs/2D Shooter/v15/.suo index f4afec8..926c4f2 100644 Binary files a/.vs/2D Shooter/v15/.suo and b/.vs/2D Shooter/v15/.suo differ diff --git a/.vs/2D Shooter/v15/sqlite3/storage.ide b/.vs/2D Shooter/v15/sqlite3/storage.ide index d0a971a..0e544d0 100644 Binary files a/.vs/2D Shooter/v15/sqlite3/storage.ide and b/.vs/2D Shooter/v15/sqlite3/storage.ide differ diff --git a/Assets/Scripts/GameController.cs b/Assets/Scripts/GameController.cs index a5c2b74..0bb601f 100644 --- a/Assets/Scripts/GameController.cs +++ b/Assets/Scripts/GameController.cs @@ -168,7 +168,8 @@ public void RestartButton() //this method will close the application public void QuitButton() { - PlayerPrefs.Save(); + PlayerPrefs.Save(); + UnityEditor.EditorApplication.isPlaying = false; Application.Quit(); } diff --git a/Infinite Warfare - Windows/InfiniteWarfare.zip b/Infinite Warfare - Windows/Infinite Warfare.zip similarity index 95% rename from Infinite Warfare - Windows/InfiniteWarfare.zip rename to Infinite Warfare - Windows/Infinite Warfare.zip index 2e2a437..a0bb704 100644 Binary files a/Infinite Warfare - Windows/InfiniteWarfare.zip and b/Infinite Warfare - Windows/Infinite Warfare.zip differ diff --git a/Library/CurrentLayout.dwlt b/Library/CurrentLayout.dwlt index eec7da6..27dec38 100644 --- a/Library/CurrentLayout.dwlt +++ b/Library/CurrentLayout.dwlt @@ -20,7 +20,7 @@ MonoBehaviour: m_ShowMode: 4 m_Title: m_RootView: {fileID: 2} - m_MinSize: {x: 950, y: 300} + m_MinSize: {x: 950, y: 542} m_MaxSize: {x: 10000, y: 10000} --- !u!114 &2 MonoBehaviour: @@ -109,7 +109,7 @@ MonoBehaviour: m_MinSize: {x: 683, y: 492} m_MaxSize: {x: 14004, y: 14042} vertical: 0 - controlID: 102 + controlID: 250 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -133,7 +133,7 @@ MonoBehaviour: m_MinSize: {x: 202, y: 342} m_MaxSize: {x: 4002, y: 8042} vertical: 1 - controlID: 44 + controlID: 229 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -152,8 +152,8 @@ MonoBehaviour: y: 0 width: 1231 height: 448 - m_MinSize: {x: 102, y: 121} - m_MaxSize: {x: 4002, y: 4021} + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} @@ -177,8 +177,8 @@ MonoBehaviour: y: 448 width: 1231 height: 499 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 15} m_Panes: - {fileID: 15} @@ -207,7 +207,7 @@ MonoBehaviour: m_MinSize: {x: 481, y: 492} m_MaxSize: {x: 10002, y: 14042} vertical: 1 - controlID: 103 + controlID: 251 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -231,7 +231,7 @@ MonoBehaviour: m_MinSize: {x: 481, y: 221} m_MaxSize: {x: 8006, y: 4021} vertical: 0 - controlID: 89 + controlID: 252 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -275,8 +275,8 @@ MonoBehaviour: y: 0 width: 461 height: 631 - m_MinSize: {x: 277, y: 71} - m_MaxSize: {x: 4002, y: 4021} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 17} m_Panes: - {fileID: 17} @@ -485,9 +485,9 @@ MonoBehaviour: height: 610 m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: 1afcffff00000000f826000008270000 + m_SelectedIDs: e2290000 + m_LastClickedID: 10722 + m_ExpandedIDs: a2d2ffff64d3ffff64d4ffff1afcffff00000000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -593,7 +593,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: 42260000 m_LastClickedID: 9794 - m_ExpandedIDs: 000000002026000050260000c8270000ca270000cc270000ce270000d0270000d2270000d4270000d627000000ca9a3bffffff7f + m_ExpandedIDs: 000000002026000050260000ce270000d0270000d2270000d4270000d6270000d8270000da270000dc27000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -621,7 +621,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000002026000050260000c8270000ca270000cc270000ce270000d0270000d2270000d4270000d6270000 + m_ExpandedIDs: 000000002026000050260000ce270000d0270000d2270000d4270000d6270000d8270000da270000dc27000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: diff --git a/Library/CurrentMaximizeLayout.dwlt b/Library/CurrentMaximizeLayout.dwlt index ff4fe22..38f00ac 100644 --- a/Library/CurrentMaximizeLayout.dwlt +++ b/Library/CurrentMaximizeLayout.dwlt @@ -123,7 +123,7 @@ MonoBehaviour: m_MinSize: {x: 202, y: 342} m_MaxSize: {x: 4002, y: 8042} vertical: 1 - controlID: 44 + controlID: 10 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -142,8 +142,8 @@ MonoBehaviour: y: 0 width: 1231 height: 448 - m_MinSize: {x: 102, y: 121} - m_MaxSize: {x: 4002, y: 4021} + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 2} m_Panes: - {fileID: 2} @@ -167,8 +167,8 @@ MonoBehaviour: y: 448 width: 1231 height: 499 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 6} m_Panes: - {fileID: 6} @@ -314,8 +314,8 @@ MonoBehaviour: y: 0 width: 228 height: 631 - m_MinSize: {x: 204, y: 221} - m_MaxSize: {x: 4004, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 10} m_Panes: - {fileID: 10} @@ -349,9 +349,9 @@ MonoBehaviour: height: 610 m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 04fcffff - m_LastClickedID: -1020 - m_ExpandedIDs: 1afcffff00000000f226000002270000 + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 1afcffff00000000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -450,8 +450,8 @@ MonoBehaviour: y: 631 width: 689 height: 316 - m_MinSize: {x: 232, y: 271} - m_MaxSize: {x: 10002, y: 10021} + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} @@ -505,9 +505,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 40260000 - m_LastClickedID: 9792 - m_ExpandedIDs: 000000001e2600004c260000b6270000b8270000ba270000bc270000be270000c0270000c2270000c427000000ca9a3bffffff7f + m_SelectedIDs: 42260000 + m_LastClickedID: 9794 + m_ExpandedIDs: 000000002026000050260000ce270000d0270000d2270000d4270000d6270000d8270000da270000dc27000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -535,7 +535,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000001e2600004c260000b6270000b8270000ba270000bc270000be270000c0270000c2270000c4270000 + m_ExpandedIDs: 000000002026000050260000ce270000d0270000d2270000d4270000d6270000d8270000da270000dc270000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -560,9 +560,9 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 04fcffff - m_LastClickedInstanceID: -1020 - m_HadKeyboardFocusLastEvent: 1 + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000 m_RenameOverlay: m_UserAcceptedRename: 0 diff --git a/Library/EditorUserBuildSettings.asset b/Library/EditorUserBuildSettings.asset index ec7a482..ac8ff61 100644 Binary files a/Library/EditorUserBuildSettings.asset and b/Library/EditorUserBuildSettings.asset differ diff --git a/Library/LastBuild.buildreport b/Library/LastBuild.buildreport index 771d96b..60310fb 100644 Binary files a/Library/LastBuild.buildreport and b/Library/LastBuild.buildreport differ diff --git a/Library/PlayerDataCache/Data/Managed/Assembly-CSharp.dll b/Library/PlayerDataCache/Data/Managed/Assembly-CSharp.dll index dd28619..825d1fe 100644 Binary files a/Library/PlayerDataCache/Data/Managed/Assembly-CSharp.dll and b/Library/PlayerDataCache/Data/Managed/Assembly-CSharp.dll differ diff --git a/Library/PlayerDataCache/Data/globalgamemanagers b/Library/PlayerDataCache/Data/globalgamemanagers index f38745e..318e13c 100644 Binary files a/Library/PlayerDataCache/Data/globalgamemanagers and b/Library/PlayerDataCache/Data/globalgamemanagers differ diff --git a/Library/PlayerDataCache/Data/globalgamemanagers.assets b/Library/PlayerDataCache/Data/globalgamemanagers.assets index 0895e05..71dfb80 100644 Binary files a/Library/PlayerDataCache/Data/globalgamemanagers.assets and b/Library/PlayerDataCache/Data/globalgamemanagers.assets differ diff --git a/Library/PlayerDataCache/Data/level0 b/Library/PlayerDataCache/Data/level0 index 4adc1d6..3895e6e 100644 Binary files a/Library/PlayerDataCache/Data/level0 and b/Library/PlayerDataCache/Data/level0 differ diff --git a/Library/PlayerDataCache/Data/sharedassets0.assets b/Library/PlayerDataCache/Data/sharedassets0.assets index dcc63ae..a4e0bc7 100644 Binary files a/Library/PlayerDataCache/Data/sharedassets0.assets and b/Library/PlayerDataCache/Data/sharedassets0.assets differ diff --git a/Library/PlayerDataCache/Data/sharedassets0.assets.resS b/Library/PlayerDataCache/Data/sharedassets0.assets.resS index 5ddb5fb..f01215f 100644 Binary files a/Library/PlayerDataCache/Data/sharedassets0.assets.resS and b/Library/PlayerDataCache/Data/sharedassets0.assets.resS differ diff --git a/Library/PlayerDataCache/Data/sharedassets0.resource b/Library/PlayerDataCache/Data/sharedassets0.resource index 5452b6c..fd5b2dd 100644 Binary files a/Library/PlayerDataCache/Data/sharedassets0.resource and b/Library/PlayerDataCache/Data/sharedassets0.resource differ diff --git a/Library/PlayerDataCache/ScriptLayoutHashes.txt b/Library/PlayerDataCache/ScriptLayoutHashes.txt index 9f8085d..c14b59b 100644 --- a/Library/PlayerDataCache/ScriptLayoutHashes.txt +++ b/Library/PlayerDataCache/ScriptLayoutHashes.txt @@ -109,6 +109,7 @@ bc68edb0af574bf79f9550ead8ebae5c UnityEngine.HoloLens.dll:UnityEngine.Audio.Audi 463516d5b5fe8e67a0a24c48f2095b04 UnityEngine.HoloLens.dll:UnityEngine.EventSystems.HoloLensInputModule c2275a8bfbb9f9942cad75ecdfded41d UnityEngine.HoloLens.dll:UnityEngine.VR.WSA.SpatialMappingCollider 45f3431f0103c41611e8d4eec3d439df UnityEngine.HoloLens.dll:UnityEngine.VR.WSA.SpatialMappingRenderer +a9c91a35984d577c9e0f3e2516344cd9 Assembly-CSharp.dll:.BalloonController fc1e0f4d8439d9928083474691511a13 UnityEngine.Networking.dll:UnityEngine.Networking.NetworkAnimator 05524b8f659e7bfe5756d1335fec24ba UnityEngine.Networking.dll:UnityEngine.Networking.NetworkBehaviour 60b2bb652410a5867a5ab9a01cd38461 UnityEngine.Networking.dll:UnityEngine.Networking.NetworkDiscovery @@ -132,7 +133,7 @@ bc68edb0af574bf79f9550ead8ebae5c UnityEngine.HoloLens.dll:UnityEngine.Audio.Audi 463516d5b5fe8e67a0a24c48f2095b04 UnityEngine.HoloLens.dll:UnityEngine.EventSystems.HoloLensInputModule c2275a8bfbb9f9942cad75ecdfded41d UnityEngine.HoloLens.dll:UnityEngine.VR.WSA.SpatialMappingCollider 45f3431f0103c41611e8d4eec3d439df UnityEngine.HoloLens.dll:UnityEngine.VR.WSA.SpatialMappingRenderer -bb4d814165970d135b2954724238fae1 Assembly-CSharp.dll:.PlayerCollision +32110d23ec309d4b53a8dcf004c743f4 Assembly-CSharp.dll:.PlayerCollision 05524b8f659e7bfe5756d1335fec24ba Assembly-CSharp.dll:.Explosion 1bd19ab26041927866a4ca95c5ad44a2 Assembly-CSharp.dll:.GameController 529e3771e9c1e3afbb9068daefb83932 Assembly-CSharp.dll:.PlayerController diff --git a/Library/ScriptAssemblies/Assembly-CSharp.dll b/Library/ScriptAssemblies/Assembly-CSharp.dll index 936aea7..4198c71 100644 Binary files a/Library/ScriptAssemblies/Assembly-CSharp.dll and b/Library/ScriptAssemblies/Assembly-CSharp.dll differ diff --git a/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb b/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb index 32d7b67..79327f8 100644 Binary files a/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb and b/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb differ diff --git a/Library/assetDatabase3 b/Library/assetDatabase3 index 5d9d956..eaa9964 100644 Binary files a/Library/assetDatabase3 and b/Library/assetDatabase3 differ diff --git a/Library/metadata/00/00000000000000004000000000000000 b/Library/metadata/00/00000000000000004000000000000000 index 73d15c0..08ee5eb 100644 Binary files a/Library/metadata/00/00000000000000004000000000000000 and b/Library/metadata/00/00000000000000004000000000000000 differ diff --git a/Library/metadata/62/6298f67e3466ed243ba81173bfa57318 b/Library/metadata/62/6298f67e3466ed243ba81173bfa57318 index 9cd947e..63b422b 100644 Binary files a/Library/metadata/62/6298f67e3466ed243ba81173bfa57318 and b/Library/metadata/62/6298f67e3466ed243ba81173bfa57318 differ