Building movable, Position save, Overlapse prevention

This commit is contained in:
Sewmina 2022-04-17 07:14:20 +05:30
parent 04ee196e6b
commit 62a909795b
24 changed files with 5433 additions and 3037 deletions

View File

@ -2,73 +2,28 @@
<project>
<component name="ChangeListManager">
<list default="true" id="fcd1c2e0-4257-408a-b55a-3b05c72f2f0c" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Assembly-CSharp.csproj" afterPath="$PROJECT_DIR$/Assembly-CSharp.csproj" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Assets/Game/Scenes/GameScene.unity" afterPath="$PROJECT_DIR$/Assets/Game/Scenes/GameScene.unity" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Assets/Game/Scenes/Login.unity" afterPath="$PROJECT_DIR$/Assets/Game/Scenes/Login.unity" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Assets/Game/ScriptableObjects/BuildingData/Hall.asset" afterPath="$PROJECT_DIR$/Assets/Game/ScriptableObjects/BuildingData/Hall.asset" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Assets/Game/ScriptableObjects/BuildingData/Mine.asset" afterPath="$PROJECT_DIR$/Assets/Game/ScriptableObjects/BuildingData/Mine.asset" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Assets/Game/ScriptableObjects/BuildingData/MoonMineral.asset" afterPath="$PROJECT_DIR$/Assets/Game/ScriptableObjects/BuildingData/MoonMineral.asset" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Assets/Game/ScriptableObjects/BuildingData/O2Mine.asset" afterPath="$PROJECT_DIR$/Assets/Game/ScriptableObjects/BuildingData/O2Mine.asset" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Assets/Game/ScriptableObjects/BuildingData/Research Facility.asset" afterPath="$PROJECT_DIR$/Assets/Game/ScriptableObjects/BuildingData/Research Facility.asset" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Assets/Game/Scenes/GameScene/LightingData.asset" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Assets/Game/Scenes/GameScene/LightingData.asset.meta" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Assets/Game/Scenes/GameScene/ReflectionProbe-0.exr" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Assets/Game/Scenes/GameScene/ReflectionProbe-0.exr.meta" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.consulo/workspace.xml" afterPath="$PROJECT_DIR$/.consulo/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Assets/Game/Scenes/GameScene/GameScene.unity" afterPath="$PROJECT_DIR$/Assets/Game/Scenes/GameScene/GameScene.unity" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Assets/Game/Scripts/Building.cs" afterPath="$PROJECT_DIR$/Assets/Game/Scripts/Building.cs" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Assets/Game/Scripts/BuildingManager.cs" afterPath="$PROJECT_DIR$/Assets/Game/Scripts/BuildingManager.cs" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Assets/Game/Scripts/CameraController.cs" afterPath="$PROJECT_DIR$/Assets/Game/Scripts/CameraController.cs" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Assets/Game/Scripts/DBmanager.cs" afterPath="$PROJECT_DIR$/Assets/Game/Scripts/DBmanager.cs" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Assets/Game/Scripts/LoginManager.cs" afterPath="$PROJECT_DIR$/Assets/Game/Scripts/LoginManager.cs" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Assets/Game/Scripts/New Lighting Settings.lighting" afterPath="$PROJECT_DIR$/Assets/Game/Scripts/New Lighting Settings.lighting" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Assets/Game/Scripts/ScrollAndPinch.cs" afterPath="$PROJECT_DIR$/Assets/Game/Scripts/ScrollAndPinch.cs" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Assets/Game/Scripts/SelectedItemMenu.cs" afterPath="$PROJECT_DIR$/Assets/Game/Scripts/SelectedItemMenu.cs" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Assets/Game/Scripts/WorldItemSelector.cs" afterPath="$PROJECT_DIR$/Assets/Game/Scripts/WorldItemSelector.cs" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Assets/TextMesh Pro/Examples &amp; Extras/Resources/Fonts &amp; Materials/Oswald Bold SDF.asset" afterPath="$PROJECT_DIR$/Assets/TextMesh Pro/Examples &amp; Extras/Resources/Fonts &amp; Materials/Oswald Bold SDF.asset" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Assets/TextMesh Pro/Examples &amp; Extras/Resources/Fonts &amp; Materials/Roboto-Bold SDF.asset" afterPath="$PROJECT_DIR$/Assets/TextMesh Pro/Examples &amp; Extras/Resources/Fonts &amp; Materials/Roboto-Bold SDF.asset" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Assets/TextMesh Pro/Resources/Fonts &amp; Materials/LiberationSans SDF - Fallback.asset" afterPath="$PROJECT_DIR$/Assets/TextMesh Pro/Resources/Fonts &amp; Materials/LiberationSans SDF - Fallback.asset" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Packages/manifest.json" afterPath="$PROJECT_DIR$/Packages/manifest.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Packages/packages-lock.json" afterPath="$PROJECT_DIR$/Packages/packages-lock.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/ProjectSettings/PackageManagerSettings.asset" afterPath="$PROJECT_DIR$/ProjectSettings/PackageManagerSettings.asset" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/UPF.sln" afterPath="$PROJECT_DIR$/UPF.sln" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Unity.CollabProxy.Editor.csproj" afterPath="$PROJECT_DIR$/Unity.CollabProxy.Editor.csproj" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Unity.Mathematics.Editor.csproj" afterPath="$PROJECT_DIR$/Unity.Mathematics.Editor.csproj" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Unity.Mathematics.csproj" afterPath="$PROJECT_DIR$/Unity.Mathematics.csproj" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Unity.PlasticSCM.Editor.csproj" afterPath="$PROJECT_DIR$/Unity.PlasticSCM.Editor.csproj" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Unity.RenderPipeline.Universal.ShaderLibrary.csproj" afterPath="$PROJECT_DIR$/Unity.RenderPipeline.Universal.ShaderLibrary.csproj" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Unity.RenderPipelines.Core.Editor.csproj" afterPath="$PROJECT_DIR$/Unity.RenderPipelines.Core.Editor.csproj" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Unity.RenderPipelines.Core.Runtime.csproj" afterPath="$PROJECT_DIR$/Unity.RenderPipelines.Core.Runtime.csproj" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Unity.RenderPipelines.Core.ShaderLibrary.csproj" afterPath="$PROJECT_DIR$/Unity.RenderPipelines.Core.ShaderLibrary.csproj" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Unity.RenderPipelines.ShaderGraph.ShaderGraphLibrary.csproj" afterPath="$PROJECT_DIR$/Unity.RenderPipelines.ShaderGraph.ShaderGraphLibrary.csproj" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Unity.RenderPipelines.Universal.Editor.csproj" afterPath="$PROJECT_DIR$/Unity.RenderPipelines.Universal.Editor.csproj" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Unity.RenderPipelines.Universal.Runtime.csproj" afterPath="$PROJECT_DIR$/Unity.RenderPipelines.Universal.Runtime.csproj" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Unity.RenderPipelines.Universal.Shaders.csproj" afterPath="$PROJECT_DIR$/Unity.RenderPipelines.Universal.Shaders.csproj" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Unity.Searcher.Editor.csproj" afterPath="$PROJECT_DIR$/Unity.Searcher.Editor.csproj" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Unity.Services.Core.Editor.csproj" afterPath="$PROJECT_DIR$/Unity.Services.Core.Editor.csproj" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Unity.ShaderGraph.Editor.csproj" afterPath="$PROJECT_DIR$/Unity.ShaderGraph.Editor.csproj" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Unity.ShaderGraph.Utilities.csproj" afterPath="$PROJECT_DIR$/Unity.ShaderGraph.Utilities.csproj" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Unity.TextMeshPro.Editor.csproj" afterPath="$PROJECT_DIR$/Unity.TextMeshPro.Editor.csproj" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Unity.TextMeshPro.csproj" afterPath="$PROJECT_DIR$/Unity.TextMeshPro.csproj" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Unity.Timeline.Editor.csproj" afterPath="$PROJECT_DIR$/Unity.Timeline.Editor.csproj" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Unity.Timeline.csproj" afterPath="$PROJECT_DIR$/Unity.Timeline.csproj" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Unity.VSCode.Editor.csproj" afterPath="$PROJECT_DIR$/Unity.VSCode.Editor.csproj" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Unity.VisualStudio.Editor.csproj" afterPath="$PROJECT_DIR$/Unity.VisualStudio.Editor.csproj" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/UnityEditor.TestRunner.csproj" afterPath="$PROJECT_DIR$/UnityEditor.TestRunner.csproj" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/UnityEditor.UI.csproj" afterPath="$PROJECT_DIR$/UnityEditor.UI.csproj" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/UnityEngine.TestRunner.csproj" afterPath="$PROJECT_DIR$/UnityEngine.TestRunner.csproj" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/UnityEngine.UI.csproj" afterPath="$PROJECT_DIR$/UnityEngine.UI.csproj" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache" afterPath="$PROJECT_DIR$/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/obj/Debug/Unity.CollabProxy.Editor.csproj.AssemblyReference.cache" afterPath="$PROJECT_DIR$/obj/Debug/Unity.CollabProxy.Editor.csproj.AssemblyReference.cache" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/obj/Debug/Unity.Mathematics.Editor.csproj.AssemblyReference.cache" afterPath="$PROJECT_DIR$/obj/Debug/Unity.Mathematics.Editor.csproj.AssemblyReference.cache" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/obj/Debug/Unity.Mathematics.csproj.AssemblyReference.cache" afterPath="$PROJECT_DIR$/obj/Debug/Unity.Mathematics.csproj.AssemblyReference.cache" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/obj/Debug/Unity.PlasticSCM.Editor.csproj.AssemblyReference.cache" afterPath="$PROJECT_DIR$/obj/Debug/Unity.PlasticSCM.Editor.csproj.AssemblyReference.cache" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/obj/Debug/Unity.RenderPipeline.Universal.ShaderLibrary.csproj.AssemblyReference.cache" afterPath="$PROJECT_DIR$/obj/Debug/Unity.RenderPipeline.Universal.ShaderLibrary.csproj.AssemblyReference.cache" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/obj/Debug/Unity.RenderPipelines.Core.Editor.csproj.AssemblyReference.cache" afterPath="$PROJECT_DIR$/obj/Debug/Unity.RenderPipelines.Core.Editor.csproj.AssemblyReference.cache" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/obj/Debug/Unity.RenderPipelines.Core.Runtime.csproj.AssemblyReference.cache" afterPath="$PROJECT_DIR$/obj/Debug/Unity.RenderPipelines.Core.Runtime.csproj.AssemblyReference.cache" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/obj/Debug/Unity.RenderPipelines.Core.ShaderLibrary.csproj.AssemblyReference.cache" afterPath="$PROJECT_DIR$/obj/Debug/Unity.RenderPipelines.Core.ShaderLibrary.csproj.AssemblyReference.cache" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/obj/Debug/Unity.RenderPipelines.ShaderGraph.ShaderGraphLibrary.csproj.AssemblyReference.cache" afterPath="$PROJECT_DIR$/obj/Debug/Unity.RenderPipelines.ShaderGraph.ShaderGraphLibrary.csproj.AssemblyReference.cache" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/obj/Debug/Unity.RenderPipelines.Universal.Editor.csproj.AssemblyReference.cache" afterPath="$PROJECT_DIR$/obj/Debug/Unity.RenderPipelines.Universal.Editor.csproj.AssemblyReference.cache" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/obj/Debug/Unity.RenderPipelines.Universal.Runtime.csproj.AssemblyReference.cache" afterPath="$PROJECT_DIR$/obj/Debug/Unity.RenderPipelines.Universal.Runtime.csproj.AssemblyReference.cache" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/obj/Debug/Unity.RenderPipelines.Universal.Shaders.csproj.AssemblyReference.cache" afterPath="$PROJECT_DIR$/obj/Debug/Unity.RenderPipelines.Universal.Shaders.csproj.AssemblyReference.cache" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/obj/Debug/Unity.Searcher.Editor.csproj.AssemblyReference.cache" afterPath="$PROJECT_DIR$/obj/Debug/Unity.Searcher.Editor.csproj.AssemblyReference.cache" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/obj/Debug/Unity.Services.Core.Editor.csproj.AssemblyReference.cache" afterPath="$PROJECT_DIR$/obj/Debug/Unity.Services.Core.Editor.csproj.AssemblyReference.cache" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/obj/Debug/Unity.ShaderGraph.Editor.csproj.AssemblyReference.cache" afterPath="$PROJECT_DIR$/obj/Debug/Unity.ShaderGraph.Editor.csproj.AssemblyReference.cache" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/obj/Debug/Unity.ShaderGraph.Utilities.csproj.AssemblyReference.cache" afterPath="$PROJECT_DIR$/obj/Debug/Unity.ShaderGraph.Utilities.csproj.AssemblyReference.cache" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/obj/Debug/Unity.TextMeshPro.Editor.csproj.AssemblyReference.cache" afterPath="$PROJECT_DIR$/obj/Debug/Unity.TextMeshPro.Editor.csproj.AssemblyReference.cache" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/obj/Debug/Unity.TextMeshPro.csproj.AssemblyReference.cache" afterPath="$PROJECT_DIR$/obj/Debug/Unity.TextMeshPro.csproj.AssemblyReference.cache" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/obj/Debug/Unity.Timeline.Editor.csproj.AssemblyReference.cache" afterPath="$PROJECT_DIR$/obj/Debug/Unity.Timeline.Editor.csproj.AssemblyReference.cache" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/obj/Debug/Unity.Timeline.csproj.AssemblyReference.cache" afterPath="$PROJECT_DIR$/obj/Debug/Unity.Timeline.csproj.AssemblyReference.cache" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/obj/Debug/Unity.VSCode.Editor.csproj.AssemblyReference.cache" afterPath="$PROJECT_DIR$/obj/Debug/Unity.VSCode.Editor.csproj.AssemblyReference.cache" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/obj/Debug/Unity.VisualStudio.Editor.csproj.AssemblyReference.cache" afterPath="$PROJECT_DIR$/obj/Debug/Unity.VisualStudio.Editor.csproj.AssemblyReference.cache" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/obj/Debug/UnityEditor.UI.csproj.AssemblyReference.cache" afterPath="$PROJECT_DIR$/obj/Debug/UnityEditor.UI.csproj.AssemblyReference.cache" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/obj/Debug/UnityEngine.UI.csproj.AssemblyReference.cache" afterPath="$PROJECT_DIR$/obj/Debug/UnityEngine.UI.csproj.AssemblyReference.cache" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/ProjectSettings/ProjectSettings.asset" afterPath="$PROJECT_DIR$/ProjectSettings/ProjectSettings.asset" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/ProjectSettings/TagManager.asset" afterPath="$PROJECT_DIR$/ProjectSettings/TagManager.asset" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
@ -81,6 +36,95 @@
<option name="PATCH_PATH" value="" />
</component>
<component name="EditorHistoryManager">
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/Building.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="765">
<caret line="45" column="75" lean-forward="false" selection-start-line="45" selection-start-column="75" selection-end-line="45" selection-end-column="75" />
<folding>
<element signature="e#0#33#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/BuildingData.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="408">
<caret line="25" column="5" lean-forward="false" selection-start-line="25" selection-start-column="5" selection-end-line="25" selection-end-column="5" />
<folding>
<element signature="e#0#18#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/DBmanager.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1802">
<caret line="106" column="65" lean-forward="false" selection-start-line="106" selection-start-column="65" selection-end-line="106" selection-end-column="65" />
<folding>
<element signature="e#0#13#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Packages/manifest.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
<caret line="11" column="19" lean-forward="false" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/LoginManager.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1479">
<caret line="87" column="53" lean-forward="false" selection-start-line="87" selection-start-column="53" selection-end-line="87" selection-end-column="53" />
<folding>
<element signature="e#0#25#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/BuildingManager.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323">
<caret line="19" column="34" lean-forward="false" selection-start-line="19" selection-start-column="34" selection-end-line="19" selection-end-column="34" />
<folding>
<element signature="e#0#18#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/ShopBuildingButton.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323">
<caret line="19" column="31" lean-forward="false" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/ShopScript.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="85">
<caret line="5" column="13" lean-forward="false" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/SelectedItemMenu.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1581">
<caret line="93" column="47" lean-forward="false" selection-start-line="93" selection-start-column="40" selection-end-line="93" selection-end-column="47" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/Building.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="765">
<caret line="45" column="75" lean-forward="false" selection-start-line="45" selection-start-column="75" selection-end-line="45" selection-end-column="75" />
<folding>
<element signature="e#0#33#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/BuildingData.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
@ -105,7 +149,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
<caret line="11" column="19" lean-forward="false" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
@ -134,7 +177,7 @@
<state relative-caret-position="867">
<caret line="51" column="27" lean-forward="false" selection-start-line="51" selection-start-column="27" selection-end-line="51" selection-end-column="27" />
<folding>
<element signature="e#0#25#0" expanded="true" />
<element signature="e#0#33#0" expanded="true" />
</folding>
</state>
</provider>
@ -143,9 +186,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="442">
<caret line="30" column="37" lean-forward="false" selection-start-line="30" selection-start-column="37" selection-end-line="30" selection-end-column="37" />
<folding>
<element signature="e#0#25#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
@ -163,7 +203,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
<caret line="11" column="19" lean-forward="false" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
@ -192,7 +231,7 @@
<state relative-caret-position="867">
<caret line="51" column="27" lean-forward="false" selection-start-line="51" selection-start-column="27" selection-end-line="51" selection-end-column="27" />
<folding>
<element signature="e#0#25#0" expanded="true" />
<element signature="e#0#33#0" expanded="true" />
</folding>
</state>
</provider>
@ -242,7 +281,7 @@
<state relative-caret-position="646">
<caret line="38" column="48" lean-forward="false" selection-start-line="38" selection-start-column="48" selection-end-line="38" selection-end-column="48" />
<folding>
<element signature="e#0#25#0" expanded="true" />
<element signature="e#0#33#0" expanded="true" />
</folding>
</state>
</provider>
@ -282,7 +321,7 @@
<state relative-caret-position="850">
<caret line="50" column="21" lean-forward="true" selection-start-line="50" selection-start-column="21" selection-end-line="50" selection-end-column="21" />
<folding>
<element signature="e#0#25#0" expanded="true" />
<element signature="e#0#33#0" expanded="true" />
</folding>
</state>
</provider>
@ -297,64 +336,107 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Packages/manifest.json">
<entry file="file://$PROJECT_DIR$/Assets/TextMesh Pro/Examples &amp; Extras/Scripts/DropdownSample.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
<caret line="11" column="19" lean-forward="false" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="19" />
<state relative-caret-position="221">
<caret line="14" column="16" lean-forward="false" selection-start-line="14" selection-start-column="16" selection-end-line="14" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Game/Scenes/TestScene/TestSceneScripts/DragAndDrop.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Game/Scenes/TestScene/TestSceneScripts/Grabber.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/LoginManager.cs">
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/CameraController.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1411">
<caret line="87" column="53" lean-forward="false" selection-start-line="87" selection-start-column="53" selection-end-line="87" selection-end-column="53" />
<state relative-caret-position="272">
<caret line="19" column="4" lean-forward="false" selection-start-line="19" selection-start-column="4" selection-end-line="19" selection-end-column="4" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/ScrollAndPinch.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="493">
<caret line="29" column="34" lean-forward="false" selection-start-line="29" selection-start-column="34" selection-end-line="29" selection-end-column="34" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/BuildingData.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="51">
<caret line="4" column="13" lean-forward="false" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
<folding>
<element signature="e#0#18#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Packages/manifest.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="357">
<caret line="24" column="53" lean-forward="false" selection-start-line="24" selection-start-column="53" selection-end-line="24" selection-end-column="53" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/GemsManager.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="34">
<caret line="4" column="13" lean-forward="false" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/GetPrice.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="34">
<caret line="6" column="13" lean-forward="false" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Game/Scenes/GameScene/GameScene.unity">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="20161" column="22" lean-forward="false" selection-start-line="20161" selection-start-column="22" selection-end-line="20161" selection-end-column="22" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/ShopBuildingButton.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="391">
<caret line="27" column="21" lean-forward="false" selection-start-line="27" selection-start-column="21" selection-end-line="27" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/GameManager.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="243">
<caret line="19" column="31" lean-forward="false" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
<folding>
<element signature="e#0#25#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/BuildingData.cs">
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/LoginManager.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="25" column="5" lean-forward="false" selection-start-line="25" selection-start-column="5" selection-end-line="25" selection-end-column="5" />
<folding>
<element signature="e#0#18#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/ShopScript.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-680">
<caret line="5" column="13" lean-forward="false" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/SelectedItemMenu.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="447">
<caret line="93" column="47" lean-forward="false" selection-start-line="93" selection-start-column="40" selection-end-line="93" selection-end-column="47" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/BuildingManager.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323">
<caret line="19" column="34" lean-forward="false" selection-start-line="19" selection-start-column="34" selection-end-line="19" selection-end-column="34" />
<folding>
<element signature="e#0#18#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/ShopBuildingButton.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323">
<caret line="19" column="31" lean-forward="false" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
<state relative-caret-position="396">
<caret line="98" column="35" lean-forward="false" selection-start-line="98" selection-start-column="35" selection-end-line="98" selection-end-column="35" />
<folding>
<element signature="e#0#25#0" expanded="true" />
</folding>
@ -363,20 +445,56 @@
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/DBmanager.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="106" column="65" lean-forward="false" selection-start-line="106" selection-start-column="65" selection-end-line="106" selection-end-column="65" />
<state relative-caret-position="-51">
<caret line="108" column="13" lean-forward="false" selection-start-line="108" selection-start-column="13" selection-end-line="108" selection-end-column="13" />
<folding>
<element signature="e#0#13#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/Building.cs">
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/ShopScript.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-116">
<caret line="40" column="0" lean-forward="false" selection-start-line="40" selection-start-column="0" selection-end-line="40" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/BuildingManager.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="391">
<caret line="45" column="75" lean-forward="false" selection-start-line="45" selection-start-column="75" selection-end-line="45" selection-end-column="75" />
<caret line="23" column="61" lean-forward="false" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
<folding>
<element signature="e#0#25#0" expanded="true" />
<element signature="e#0#18#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/SelectedItemMenu.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-99">
<caret line="63" column="9" lean-forward="false" selection-start-line="63" selection-start-column="9" selection-end-line="63" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/Building.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="119">
<caret line="7" column="30" lean-forward="false" selection-start-line="7" selection-start-column="30" selection-end-line="7" selection-end-column="30" />
<folding>
<element signature="e#0#33#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/WorldItemSelector.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="411">
<caret line="82" column="191" lean-forward="false" selection-start-line="82" selection-start-column="191" selection-end-line="82" selection-end-column="191" />
<folding>
<element signature="e#0#13#0" expanded="true" />
</folding>
</state>
</provider>
@ -385,23 +503,11 @@
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
<leaf>
<file leaf-file-name="BuildingData.cs" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/BuildingData.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="25" column="5" lean-forward="false" selection-start-line="25" selection-start-column="5" selection-end-line="25" selection-end-column="5" />
<folding>
<element signature="e#0#18#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="DBmanager.cs" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/DBmanager.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="106" column="65" lean-forward="false" selection-start-line="106" selection-start-column="65" selection-end-line="106" selection-end-column="65" />
<state relative-caret-position="-51">
<caret line="108" column="13" lean-forward="false" selection-start-line="108" selection-start-column="13" selection-end-line="108" selection-end-column="13" />
<folding>
<element signature="e#0#13#0" expanded="true" />
</folding>
@ -409,57 +515,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="manifest.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Packages/manifest.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
<caret line="11" column="19" lean-forward="false" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="LoginManager.cs" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/LoginManager.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1411">
<caret line="87" column="53" lean-forward="false" selection-start-line="87" selection-start-column="53" selection-end-line="87" selection-end-column="53" />
<folding>
<element signature="e#0#25#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="BuildingManager.cs" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/BuildingManager.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323">
<caret line="19" column="34" lean-forward="false" selection-start-line="19" selection-start-column="34" selection-end-line="19" selection-end-column="34" />
<folding>
<element signature="e#0#18#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ShopBuildingButton.cs" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/ShopBuildingButton.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323">
<caret line="19" column="31" lean-forward="false" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
<folding>
<element signature="e#0#25#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Building.cs" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/Building.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="391">
<caret line="45" column="75" lean-forward="false" selection-start-line="45" selection-start-column="75" selection-end-line="45" selection-end-column="75" />
<state relative-caret-position="396">
<caret line="98" column="35" lean-forward="false" selection-start-line="98" selection-start-column="35" selection-end-line="98" selection-end-column="35" />
<folding>
<element signature="e#0#25#0" expanded="true" />
</folding>
@ -470,18 +530,86 @@
<file leaf-file-name="ShopScript.cs" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/ShopScript.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-680">
<caret line="5" column="13" lean-forward="false" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
<state relative-caret-position="-116">
<caret line="40" column="0" lean-forward="false" selection-start-line="40" selection-start-column="0" selection-end-line="40" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="WorldItemSelector.cs" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/WorldItemSelector.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="411">
<caret line="82" column="191" lean-forward="false" selection-start-line="82" selection-start-column="191" selection-end-line="82" selection-end-column="191" />
<folding>
<element signature="e#0#13#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="GetPrice.cs" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/GetPrice.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="34">
<caret line="6" column="13" lean-forward="false" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="GameManager.cs" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/GameManager.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="243">
<caret line="19" column="31" lean-forward="false" selection-start-line="19" selection-start-column="31" selection-end-line="19" selection-end-column="31" />
<folding>
<element signature="e#0#25#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ShopBuildingButton.cs" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/ShopBuildingButton.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="391">
<caret line="27" column="21" lean-forward="false" selection-start-line="27" selection-start-column="21" selection-end-line="27" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="BuildingManager.cs" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/BuildingManager.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="391">
<caret line="23" column="61" lean-forward="false" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
<folding>
<element signature="e#0#18#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Building.cs" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/Building.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="119">
<caret line="7" column="30" lean-forward="false" selection-start-line="7" selection-start-column="30" selection-end-line="7" selection-end-column="30" />
<folding>
<element signature="e#0#33#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="SelectedItemMenu.cs" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/SelectedItemMenu.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="447">
<caret line="93" column="47" lean-forward="false" selection-start-line="93" selection-start-column="40" selection-end-line="93" selection-end-column="47" />
<state relative-caret-position="-99">
<caret line="63" column="9" lean-forward="false" selection-start-line="63" selection-start-column="9" selection-end-line="63" selection-end-column="9" />
<folding />
</state>
</provider>
@ -492,7 +620,17 @@
<component name="FindInProjectRecents">
<findStrings>
<find>JsonUtility</find>
<find>await</find>
<find>cheat</find>
<find>instance.</find>
<find>DBmanager.</find>
</findStrings>
<replaceStrings>
<replace>Instance.</replace>
</replaceStrings>
<dirStrings>
<dir>$PROJECT_DIR$/Assets</dir>
</dirStrings>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@ -507,19 +645,24 @@
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/Assets/Game/Scripts/BuildingData.cs" />
<option value="$PROJECT_DIR$/Assets/Game/Scripts/ScrollAndPinch.cs" />
<option value="$PROJECT_DIR$/Assets/Game/Scripts/CameraController.cs" />
<option value="$PROJECT_DIR$/Packages/manifest.json" />
<option value="$PROJECT_DIR$/Assets/Game/Scripts/LoginManager.cs" />
<option value="$PROJECT_DIR$/Assets/Game/Scripts/BuildingManager.cs" />
<option value="$PROJECT_DIR$/Assets/Game/Scripts/ShopBuildingButton.cs" />
<option value="$PROJECT_DIR$/Assets/Game/Scripts/SelectedItemMenu.cs" />
<option value="$PROJECT_DIR$/Assets/Game/Scripts/ShopScript.cs" />
<option value="$PROJECT_DIR$/Assets/Game/Scripts/GameManager.cs" />
<option value="$PROJECT_DIR$/Assets/Game/Scripts/BuildingManager.cs" />
<option value="$PROJECT_DIR$/Assets/Game/Scripts/DBmanager.cs" />
<option value="$PROJECT_DIR$/Assets/Game/Scripts/SelectedItemMenu.cs" />
<option value="$PROJECT_DIR$/Assets/Game/Scripts/Building.cs" />
<option value="$PROJECT_DIR$/Assets/Game/Scripts/WorldItemSelector.cs" />
</list>
</option>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="2085" />
<option name="y" value="71" />
<option name="x" value="2102" />
<option name="y" value="81" />
<option name="width" value="1530" />
<option name="height" value="888" />
</component>
@ -649,12 +792,18 @@
<workItem from="1649902106594" duration="1783000" />
<workItem from="1649903954636" duration="3953000" />
<workItem from="1649908330367" duration="3265000" />
<workItem from="1649956297618" duration="1991000" />
<workItem from="1649956297618" duration="2288000" />
<workItem from="1650032012753" duration="36000" />
<workItem from="1650032071936" duration="44000" />
<workItem from="1650032155596" duration="79000" />
<workItem from="1650122597962" duration="7020000" />
<workItem from="1650144316866" duration="1155000" />
<workItem from="1650145578989" duration="8887000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="14211000" />
<option name="totallyTimeSpent" value="31729000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@ -667,13 +816,15 @@
<todo-panel id="default-changelist" />
</component>
<component name="ToolWindowManager">
<frame x="2085" y="71" width="1530" height="888" extended-state="0" />
<frame x="2102" y="81" width="1530" height="888" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16854678" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980132" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32806325" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980132" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980132" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
@ -684,7 +835,6 @@
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32980132" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
</layout>
</component>
@ -750,6 +900,22 @@
<screen x="1920" y="0" width="1920" height="1080" />
</state>
<state width="1507" height="274" key="GridCell.Tab.1.right/0.0.1920.1050/1920.0.1920.1080@1920.0.1920.1080" timestamp="1649903446824" />
<state x="2722" y="240" width="280" height="572" key="RollbackChangesDialog" timestamp="1650147450930">
<screen x="1920" y="0" width="1920" height="1080" />
</state>
<state x="2722" y="240" width="280" height="572" key="RollbackChangesDialog/0.0.1920.1050/1920.0.1920.1080@1920.0.1920.1080" timestamp="1650147450930" />
<state x="2577" y="151" width="643" height="750" key="find.popup" timestamp="1650146581508">
<screen x="1920" y="0" width="1920" height="1080" />
</state>
<state x="2577" y="151" width="643" height="750" key="find.popup/0.0.1920.1050/1920.0.1920.1080@1920.0.1920.1080" timestamp="1650146581508" />
<state x="2531" y="238" key="run.anything.popup" timestamp="1650155629327">
<screen x="1920" y="0" width="1920" height="1080" />
</state>
<state x="2531" y="238" key="run.anything.popup/0.0.1920.1050/1920.0.1920.1080@1920.0.1920.1080" timestamp="1650155629327" />
<state x="597" y="241" width="672" height="682" key="search.everywhere.popup" timestamp="1650032227224">
<screen x="0" y="0" width="1920" height="1050" />
</state>
<state x="597" y="241" width="672" height="682" key="search.everywhere.popup/0.0.1920.1050/1920.0.1920.1080@0.0.1920.1050" timestamp="1650032227224" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager />

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 57a9dfba5a6399f839b2e0d779de61ee
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: f56e18467d914a7c39317263b81852b6
guid: 0f864d91a51b9b4428f54c9afa78d64a
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 112000000
mainObjectFileID: 36300000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,96 +0,0 @@
fileFormatVersion: 2
guid: c7d12ab5d9daab245931f1a47f0609e5
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 1
seamlessCubemap: 1
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: 0
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 2
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 100
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,6 +1,4 @@
using System.Collections;
using System.Collections.Generic;
using System.Threading.Tasks;
using UnityEngine;
public class Building : MonoBehaviour
@ -9,26 +7,44 @@ public class Building : MonoBehaviour
public int curLevel;
public Outline[] outlines;
void OnDrawGizmos() {
Gizmos.color = Color.blue;
//Gizmos.DrawWireSphere(transform.position + new Vector3(0,spaceRadius,0), spaceRadius);
Collider col = GetComponent<Collider>();
Gizmos.DrawWireCube(col.bounds.center, col.bounds.size);
}
void Awake(){
//if(outline == null){outline = GetComponent<Outline>();}
outlines = GetComponentsInChildren<Outline>();
ToggleOutlines(false);
Selector.OnSelectedChanged.AddListener(OnSelectedChanged);
transform.tag = "Building";
}
void OnSelectedChanged(){
if(Selector.selectedBuilding == null){ToggleOutlines(false); return;}
ToggleOutlines(Selector.selectedBuilding == this);
ToggleOutlines(Selector.selectedBuilding == this);
//GetComponent<Collider>().isTrigger=(Selector.movingBuilding==this);
}
void ToggleOutlines(bool value){
bool isMoving = Selector.movingBuilding==this;
foreach(Outline outline in outlines){
outline.enabled = value;
outline.OutlineColor = (isMoving) ? Color.green : Color.yellow;
}
}
public async Task Upgrade(){
public void ChangeOutlineColor(Color color){
foreach(Outline outline in outlines){
outline.OutlineColor = color;
}
}
public void Upgrade(){
if(curLevel >= buildingData.levels.Count-1){Debug.Log("Already max");return;}
int cost = buildingData.levels[curLevel+1].price;
// Debug.Log("Upgrading " + buildingData.buildingName + " for " + cost + " coins");
@ -40,11 +56,41 @@ public class Building : MonoBehaviour
}
await (DBmanager.SetCoins(DBmanager.Coins-cost));
DBmanager.SetCoins(DBmanager.Coins-cost);
Mathf.Clamp(curLevel++,0, buildingData.levels.Count-1);
await DBmanager.UpgradeBuilding(buildingData.buildingName, curLevel);
DBmanager.UpgradeBuilding(buildingData.buildingName, curLevel);
}
//
// public List<Collider> buildingsInsideMe = new List<Collider>();
// public bool locationInvalid {get{return buildingsInsideMe.Count == 0;}}
//
// void OnTriggerEnter(Collider other) {
// Debug.Log("Trigger enter : " + other.name);
// if(other.GetComponent<Collider>().tag == "Building" && other != GetComponent<Collider>()){
// if(buildingsInsideMe.Contains(other)){
// //Already got him
// }else{
// buildingsInsideMe.Add(other);ChangeOutlineColor(locationInvalid ? Color.red : Color.green);
// }
// }
//
//
// }
//
// void OnTriggerExit(Collider other){
// Debug.Log("Trigger exit : " + other.name);
// if(other.GetComponent<Collider>().tag == "Building" && other != GetComponent<Collider>()){
// if(buildingsInsideMe.Contains(other)){
// buildingsInsideMe.Remove(other);
// ChangeOutlineColor(locationInvalid ? Color.green : Color.red);
// }else{
// //Nothing to remove
// }
// }
//
// }
/* */
}
@ -54,9 +100,11 @@ public class Building : MonoBehaviour
public class BuildingState{
public string id;
public int level;
public Vector3 position;
public BuildingState(string m_id, int m_level){
public BuildingState(string m_id, int m_level, Vector3 m_position){
id = m_id;
level = m_level;
position = m_position;
}
}

View File

@ -25,6 +25,7 @@ public class BuildingManager : MonoBehaviour
if(buildingState.id == building.buildingData.buildingName){
buildingExists =true;
building.curLevel = buildingState.level;
building.transform.position = (buildingState.position != Vector3.zero) ? buildingState.position : building.transform.position;
break;
}
}

View File

@ -22,27 +22,21 @@ public class CameraController : MonoBehaviour
private Vector3 cameraStartPos = Vector2.zero;
public bool moving = false;
public void OnMouseDown(BaseEventData e){
#if UNITY_EDITOR
PointerEventData ped = (PointerEventData) e as PointerEventData;
mouseStartPos = ped.position;
cameraStartPos = cam.transform.position;
moving=true;
#endif
}
public void OnMouseUp(BaseEventData e){
#if UNITY_EDITOR
PointerEventData ped = (PointerEventData) e as PointerEventData;
moving=false;
#endif
}
public void OnMouseMove(BaseEventData e){
#if UNITY_EDITOR
PointerEventData ped = (PointerEventData) e as PointerEventData;
if(moving){
if(moving && !Selector.isMovingBuilding){
Vector3 offset = (mouseStartPos-ped.position) * sensitivity;
cam.transform.position = cameraStartPos + new Vector3(offset.x,0,offset.y);
}
#endif
}

View File

@ -93,7 +93,7 @@ public class DBmanager : MonoBehaviour
}
}
buildingStates.Add(new BuildingState(buildingData.buildingName, 0));
buildingStates.Add(new BuildingState(buildingData.buildingName, 0,Vector3.zero));
Debug.Log("Added new building "+ buildingData.buildingName);
await UpdateBuildingsToServer();
@ -114,6 +114,20 @@ public class DBmanager : MonoBehaviour
OnStateChanged.Invoke();
}
public async static Task RelocateBuilding(string id, Vector3 newPosition){
for(int i=0; i < buildingStates.Count; i++){
if(buildingStates[i].id == id){
buildingStates[i].position = newPosition;
Debug.Log("Relocating " + id + " to " + newPosition);
// break;
}
}
Debug.Log("Going to update to server" + JsonConvert.SerializeObject(buildingStates));
await UpdateBuildingsToServer();
OnStateChanged.Invoke();
}
public async static Task UpdateBuildingsToServer(){
string buildingsJson = JsonConvert.SerializeObject(buildingStates);
Debug.Log(buildingsJson);

View File

@ -26,7 +26,7 @@ LightingSettings:
m_CompAOExponent: 1
m_CompAOExponentDirect: 0
m_ExtractAO: 0
m_MixedBakeMode: 0
m_MixedBakeMode: 1
m_LightmapsBakeMode: 1
m_FilterMode: 1
m_LightmapParameters: {fileID: 15201, guid: 0000000000000000f000000000000000, type: 0}

View File

@ -23,8 +23,8 @@ class ScrollAndPinch : MonoBehaviour
{
//Update Plane
if (Input.touchCount >= 1)
Plane.SetNormalAndPosition(transform.up, transform.position);
// if (Input.touchCount >= 1)
//Plane.SetNormalAndPosition(transform.up, transform.position);
var Delta1 = Vector3.zero;
var Delta2 = Vector3.zero;

View File

@ -88,10 +88,10 @@ public class SelectedItemMenu : MonoBehaviour
}
}
async void OnUpgrade()
void OnUpgrade()
{
upgradeBtn.interactable= false;
await Selector.selectedBuilding.Upgrade();
Selector.selectedBuilding.Upgrade();
OnUpgradeMenuClicked();
}

View File

@ -1,14 +1,14 @@
using UnityEngine.UI;
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.Events;
using UnityEngine.EventSystems;
public class WorldItemSelector : MonoBehaviour
{
public float moveThreshold = 1;
public float moveThreshold = 10;
public LayerMask layerMask;
public LayerMask gndMask;
public void SelectScreenPoint(Vector2 screenPoint){
Ray ray = Camera.main.ScreenPointToRay(screenPoint);
@ -16,38 +16,102 @@ public class WorldItemSelector : MonoBehaviour
if(Physics.Raycast(ray,out hit, Mathf.Infinity, layerMask)){
Building selectedB = hit.collider.GetComponent<Building>();
if(selectedB!=null){
Debug.Log("Selected building : " + selectedB.buildingData.buildingName);
Selector.selectBuilding(selectedB);
}else{
Debug.Log("No target here, Unselecting");
Selector.selectBuilding(null);
}
// if(selectedB!=null){
// Debug.Log("Selected building : " + selectedB.buildingData.buildingName);
//
// }else{
// Debug.Log("No target here, Unselecting");
// //Selector.selectBuilding(null);
// }
Selector.selectBuilding(selectedB);
}else{
Selector.selectBuilding(null);
}
}
public Vector3? GetTouchingWorldPoint(Vector2 screenPoint){
Ray ray = Camera.main.ScreenPointToRay(screenPoint);
RaycastHit hit = new RaycastHit();
if(Physics.Raycast(ray,out hit, Mathf.Infinity, gndMask)){
return hit.point;
}else{
return null;
}
}
private Vector2 startedPos= Vector2.zero;
private Vector2? startedPos= null;
private bool isPointerDown => startedPos!=null;
private bool holdingPointer = false;
public float dragDelay = 0.85f;
private long pointerDownTimestamp;
public void OnPointerDown(BaseEventData e){
PointerEventData ped = (PointerEventData) e as PointerEventData;
startedPos = ped.position;
holdingPointer =true;
Debug.Log($"Pointer timestamp : {pointerDownTimestamp}");
StartCoroutine(startDragCheck());
}
IEnumerator startDragCheck(){
yield return new WaitForSeconds(dragDelay);
if(holdingPointer){
Debug.Log("Initiating Drag");
SelectScreenPoint(startedPos ?? Vector2.zero);
Selector.setMoving(Selector.selectedBuilding);
}
}
public void OnPointerMove(BaseEventData e){
PointerEventData ped = (PointerEventData) e as PointerEventData;
if(isPointerDown){
float pointerDiff = Mathf.Abs(ped.position.magnitude - (startedPos ?? Vector2.zero).magnitude);
holdingPointer=(pointerDiff < moveThreshold);
if(Selector.isMovingBuilding){
// Debug.Log("Gnd position: " + GetTouchingWorldPoint(ped.position));
Vector3 worldPos = GetTouchingWorldPoint(ped.position) ?? Selector.movingBuilding.transform.position;
//validatePoint
Selector.movingPointValid = true;
Collider[] buildingsInside = Physics.OverlapBox(Selector.movingBuilding.GetComponent<Collider>().bounds.center, Selector.movingBuilding.GetComponent<Collider>().bounds.extents);
foreach(Collider collider in buildingsInside){
if((collider.tag == "Building" || collider.tag == "Obstacle" ) && collider.transform != Selector.movingBuilding.transform){
Selector.movingPointValid =false;
}
}
Selector.movingBuilding.ChangeOutlineColor(Selector.movingPointValid ? Color.green : Color.red);
Selector.movingBuilding.transform.position = worldPos;
}
}
}
public void OnPointerUp(BaseEventData e){
Selector.resetMoving();
PointerEventData ped = (PointerEventData) e as PointerEventData;
float pointerDiff = Mathf.Abs(ped.position.magnitude - startedPos.magnitude);
float pointerDiff = Mathf.Abs(ped.position.magnitude - (startedPos ?? Vector2.zero).magnitude);
if(pointerDiff < moveThreshold){
SelectScreenPoint(ped.position);
}else{
Debug.Log("Pointer moved (" + pointerDiff+ "), Not gonna select item");
}
startedPos = null;
holdingPointer=false;
Selector.refresh();
}
}
public static class Selector{
public static bool movingPointValid;
public static Building movingBuilding;
public static bool isMovingBuilding => movingBuilding!=null;
public static Building selectedBuilding;
public static BuildingData selectedData => selectedBuilding.buildingData;
public static UnityEvent OnSelectedChanged = new UnityEvent();
@ -56,4 +120,28 @@ public static class Selector{
selectedBuilding = e;
OnSelectedChanged.Invoke();
}
public static void resetMoving(){
if(movingBuilding!=null ){
if(movingPointValid) {
DBmanager.RelocateBuilding(movingBuilding.buildingData.buildingName, movingBuilding.transform.position);
}else{
movingBuilding.transform.position = movingStartedPosition;
}
}
movingBuilding=null;
refresh();
}
private static Vector3 movingStartedPosition;
public static void setMoving(Building e){
movingBuilding=e;
if(e!=null){ movingStartedPosition=e.transform.position;}
refresh();
}
public static void refresh(){
OnSelectedChanged.Invoke();
}
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -7,6 +7,13 @@
"com.madsbangh.easybuttons",
"com.openupm"
]
},
{
"name": "Packages from jillejr",
"url": "https://npm.cloudsmith.io/jillejr/newtonsoft-json-for-unity/",
"scopes": [
"jillejr"
]
}
],
"dependencies": {
@ -15,12 +22,13 @@
"com.unity.collab-proxy": "1.15.13",
"com.unity.ide.visualstudio": "2.0.14",
"com.unity.ide.vscode": "1.2.4",
"com.unity.nuget.newtonsoft-json": "3.0.2",
"com.unity.render-pipelines.universal": "10.8.1",
"com.unity.test-framework": "1.1.31",
"com.unity.textmeshpro": "3.0.6",
"com.unity.timeline": "1.4.8",
"com.unity.ugui": "1.0.0",
"jillejr.newtonsoft.json-for-unity": "13.0.102",
"jillejr.newtonsoft.json-for-unity.converters": "1.4.0",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
"com.unity.modules.animation": "1.0.0",

View File

@ -53,13 +53,6 @@
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.nuget.newtonsoft-json": {
"version": "3.0.2",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.render-pipelines.core": {
"version": "10.8.1",
"depth": 1,
@ -149,6 +142,20 @@
"com.unity.modules.imgui": "1.0.0"
}
},
"jillejr.newtonsoft.json-for-unity": {
"version": "13.0.102",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://npm.cloudsmith.io/jillejr/newtonsoft-json-for-unity"
},
"jillejr.newtonsoft.json-for-unity.converters": {
"version": "1.4.0",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://npm.cloudsmith.io/jillejr/newtonsoft-json-for-unity"
},
"com.unity.modules.ai": {
"version": "1.0.0",
"depth": 0,

View File

@ -32,6 +32,13 @@ MonoBehaviour:
- com.openupm
m_IsDefault: 0
m_Capabilities: 0
- m_Id: scoped:Packages from jillejr
m_Name: Packages from jillejr
m_Url: https://npm.cloudsmith.io/jillejr/newtonsoft-json-for-unity
m_Scopes:
- jillejr
m_IsDefault: 0
m_Capabilities: 0
m_UserSelectedRegistryName:
m_UserAddingNewScopedRegistry: 0
m_RegistryInfoDraft:

View File

@ -704,7 +704,7 @@ PlayerSettings:
assemblyVersionValidation: 1
gcWBarrierValidation: 0
apiCompatibilityLevelPerPlatform:
Android: 6
Android: 3
m_RenderingPath: 1
m_MobileRenderingPath: 1
metroPackageName: Template_3D

View File

@ -5,11 +5,13 @@ TagManager:
serializedVersion: 2
tags:
- Drag
- Building
- Obstacle
layers:
- Default
- TransparentFX
- Ignore Raycast
-
- Gnd
- Water
- UI
-