warlock/UPF
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Collectables stored + Metal and Oxygen added to game

Browse Source
This commit is contained in:
Sewmina
2022-04-21 07:08:38 +05:30
parent 4e63909cf5
commit fa429899d6
9 changed files with 867 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

161
.consulo/workspace.xml
View File

@@ -2,7 +2,14 @@
<project>
<component name="ChangeListManager">
<list default="true" id="fcd1c2e0-4257-408a-b55a-3b05c72f2f0c" name="Default" comment="">
<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/ScriptableObjects/BuildingData/O2Mine.asset" afterPath="$PROJECT_DIR$/Assets/Game/ScriptableObjects/BuildingData/O2Mine.asset" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Assets/Game/Scripts/BuildingData.cs" afterPath="$PROJECT_DIR$/Assets/Game/Scripts/BuildingData.cs" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Assets/Game/Scripts/CollectBtn.cs" afterPath="$PROJECT_DIR$/Assets/Game/Scripts/CollectBtn.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/GameManager.cs" afterPath="$PROJECT_DIR$/Assets/Game/Scripts/GameManager.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/SelectedItemMenu.cs" afterPath="$PROJECT_DIR$/Assets/Game/Scripts/SelectedItemMenu.cs" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
@@ -352,26 +359,6 @@
</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="238">
<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/LoginManager.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1598">
<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>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/CameraController.cs" />
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/ShopScript.cs">
<provider selected="true" editor-type-id="text-editor">
@@ -389,20 +376,30 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/BuildingManager.cs">
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/WorldItemSelector.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="459">
<caret line="29" column="82" lean-forward="false" selection-start-line="29" selection-start-column="82" selection-end-line="29" selection-end-column="82" />
<state relative-caret-position="1989">
<caret line="121" column="44" lean-forward="false" selection-start-line="121" selection-start-column="44" selection-end-line="121" selection-end-column="44" />
<folding>
<element signature="e#0#13#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/CollectBtn.cs">
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/CameraManager.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153">
<caret line="12" column="0" lean-forward="false" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
<state relative-caret-position="1139">
<caret line="70" column="14" lean-forward="false" selection-start-line="70" selection-start-column="14" selection-end-line="70" selection-end-column="14" />
<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="459">
<caret line="29" column="82" lean-forward="false" selection-start-line="29" selection-start-column="82" selection-end-line="29" selection-end-column="82" />
<folding>
<element signature="e#0#13#0" expanded="true" />
</folding>
@@ -419,28 +416,20 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/SelectedItemMenu.cs">
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/LoginManager.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1088">
<caret line="68" column="55" lean-forward="false" selection-start-line="68" selection-start-column="55" selection-end-line="68" selection-end-column="55" />
<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="1989">
<caret line="121" column="44" lean-forward="false" selection-start-line="121" selection-start-column="44" selection-end-line="121" selection-end-column="44" />
<state relative-caret-position="378">
<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#13#0" expanded="true" />
<element signature="e#0#25#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/CameraManager.cs">
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/GameManager.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="493">
<caret line="70" column="14" lean-forward="false" selection-start-line="70" selection-start-column="14" selection-end-line="70" selection-end-column="14" />
<state relative-caret-position="506">
<caret line="40" column="53" lean-forward="false" selection-start-line="40" selection-start-column="53" selection-end-line="40" selection-end-column="53" />
<folding>
<element signature="e#0#25#0" expanded="true" />
</folding>
@@ -449,24 +438,42 @@
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/DBmanager.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285">
<caret line="144" column="0" lean-forward="false" selection-start-line="144" selection-start-column="0" selection-end-line="144" selection-end-column="0" />
<state relative-caret-position="234">
<caret line="236" column="43" lean-forward="false" selection-start-line="236" selection-start-column="43" selection-end-line="236" selection-end-column="43" />
<folding>
<element signature="e#0#13#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="232">
<caret line="54" column="66" lean-forward="false" selection-start-line="54" selection-start-column="66" selection-end-line="54" selection-end-column="66" />
<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="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 relative-caret-position="238">
<caret line="14" column="54" lean-forward="false" selection-start-line="14" selection-start-column="54" selection-end-line="14" selection-end-column="54" />
<folding>
<element signature="e#0#18#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/CollectBtn.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="421">
<caret line="38" column="51" lean-forward="false" selection-start-line="38" selection-start-column="51" selection-end-line="38" selection-end-column="51" />
<folding>
<element signature="e#0#13#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
@@ -474,8 +481,8 @@
<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="285">
<caret line="144" column="0" lean-forward="false" selection-start-line="144" selection-start-column="0" selection-end-line="144" selection-end-column="0" />
<state relative-caret-position="234">
<caret line="236" column="43" lean-forward="false" selection-start-line="236" selection-start-column="43" selection-end-line="236" selection-end-column="43" />
<folding>
<element signature="e#0#13#0" expanded="true" />
</folding>
@@ -483,11 +490,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="CameraManager.cs" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/CameraManager.cs">
<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="493">
<caret line="70" column="14" lean-forward="false" selection-start-line="70" selection-start-column="14" selection-end-line="70" selection-end-column="14" />
<state relative-caret-position="506">
<caret line="40" column="53" lean-forward="false" selection-start-line="40" selection-start-column="53" selection-end-line="40" selection-end-column="53" />
<folding>
<element signature="e#0#25#0" expanded="true" />
</folding>
@@ -498,8 +505,8 @@
<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="1598">
<caret line="98" column="35" lean-forward="false" selection-start-line="98" selection-start-column="35" selection-end-line="98" selection-end-column="35" />
<state relative-caret-position="378">
<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>
@@ -507,12 +514,14 @@
</provider>
</entry>
</file>
<file leaf-file-name="ShopScript.cs" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/ShopScript.cs">
<file leaf-file-name="CameraManager.cs" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/CameraManager.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="646">
<caret line="41" column="52" lean-forward="false" selection-start-line="41" selection-start-column="52" selection-end-line="41" selection-end-column="52" />
<folding />
<state relative-caret-position="1139">
<caret line="70" column="14" lean-forward="false" selection-start-line="70" selection-start-column="14" selection-end-line="70" selection-end-column="14" />
<folding>
<element signature="e#0#25#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
@@ -553,11 +562,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="BuildingData.cs" pinned="false" current-in-tab="true">
<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="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 relative-caret-position="238">
<caret line="14" column="54" lean-forward="false" selection-start-line="14" selection-start-column="54" selection-end-line="14" selection-end-column="54" />
<folding>
<element signature="e#0#18#0" expanded="true" />
</folding>
@@ -568,18 +577,18 @@
<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="1088">
<caret line="68" column="55" lean-forward="false" selection-start-line="68" selection-start-column="55" selection-end-line="68" selection-end-column="55" />
<state relative-caret-position="232">
<caret line="54" column="66" lean-forward="false" selection-start-line="54" selection-start-column="66" selection-end-line="54" selection-end-column="66" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="CollectBtn.cs" pinned="false" current-in-tab="false">
<file leaf-file-name="CollectBtn.cs" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Assets/Game/Scripts/CollectBtn.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153">
<caret line="12" column="0" lean-forward="false" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
<state relative-caret-position="421">
<caret line="38" column="51" lean-forward="false" selection-start-line="38" selection-start-column="51" selection-end-line="38" selection-end-column="51" />
<folding>
<element signature="e#0#13#0" expanded="true" />
</folding>
@@ -596,6 +605,7 @@
<find>cheat</find>
<find>instance.</find>
<find>DBmanager.</find>
<find>collectBtn</find>
</findStrings>
<replaceStrings>
<replace>Instance.</replace>
@@ -619,18 +629,18 @@
<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/ShopBuildingButton.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/DBmanager.cs" />
<option value="$PROJECT_DIR$/Assets/Game/Scripts/BuildingData.cs" />
<option value="$PROJECT_DIR$/Assets/Game/Scripts/Building.cs" />
<option value="$PROJECT_DIR$/Assets/Game/Scripts/BuildingManager.cs" />
<option value="$PROJECT_DIR$/Assets/Game/Scripts/CollectBtn.cs" />
<option value="$PROJECT_DIR$/Assets/Game/Scripts/WorldItemSelector.cs" />
<option value="$PROJECT_DIR$/Assets/Game/Scripts/SelectedItemMenu.cs" />
<option value="$PROJECT_DIR$/Assets/Game/Scripts/CameraManager.cs" />
<option value="$PROJECT_DIR$/Assets/Game/Scripts/GameManager.cs" />
<option value="$PROJECT_DIR$/Assets/Game/Scripts/BuildingData.cs" />
<option value="$PROJECT_DIR$/Assets/Game/Scripts/LoginManager.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/CollectBtn.cs" />
</list>
</option>
</component>
@@ -658,6 +668,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
@@ -715,7 +726,6 @@
</subPane>
</pane>
<pane id="PackagesPane" />
<pane id="Scope" />
</panes>
</component>
<component name="RunDashboard">
@@ -803,11 +813,12 @@
<workItem from="1650366034414" duration="2932000" />
<workItem from="1650389720547" duration="5487000" />
<workItem from="1650458057340" duration="293000" />
<workItem from="1650502751367" duration="2328000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="44946000" />
<option name="totallyTimeSpent" value="47274000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">