diff options
author | Jakob Stendahl <jakob.stendahl@outlook.com> | 2017-10-17 22:05:53 +0200 |
---|---|---|
committer | Jakob Stendahl <jakob.stendahl@outlook.com> | 2017-10-17 22:05:53 +0200 |
commit | 893160bc3047aa14321943fa52fcd20330d804db (patch) | |
tree | c45502accbbfb75035f7da92dc7c787b462189af | |
parent | 0aff61a37fa8502521e760a78d8e51b614503773 (diff) | |
download | TD-893160bc3047aa14321943fa52fcd20330d804db.tar.gz TD-893160bc3047aa14321943fa52fcd20330d804db.zip |
Added paycheck-system, player gets payed after wave is finished
-rw-r--r-- | td/.idea/.idea.td/.idea/workspace.xml | 910 | ||||
-rw-r--r-- | td/Assets/Scripts/Enemy.cs | 1 | ||||
-rw-r--r-- | td/Assets/Scripts/Projectile.cs | 1 | ||||
-rw-r--r-- | td/Assets/Scripts/player.cs | 14 | ||||
-rw-r--r-- | td/Assets/Scripts/waveSpawner.cs | 32 | ||||
-rw-r--r-- | td/Assets/Scripts/waveSpawner.cs.meta | 2 |
6 files changed, 556 insertions, 404 deletions
diff --git a/td/.idea/.idea.td/.idea/workspace.xml b/td/.idea/.idea.td/.idea/workspace.xml index c304f2f..5934d93 100644 --- a/td/.idea/.idea.td/.idea/workspace.xml +++ b/td/.idea/.idea.td/.idea/workspace.xml @@ -2,8 +2,8 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="60ebe84b-2a99-4077-bdde-5542cfeedadb" name="Default" comment=""> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Assets/Scenes/Level 1.unity" afterPath="$PROJECT_DIR$/Assets/Scenes/Level 1.unity" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/.idea.td/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/.idea.td/.idea/workspace.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Assets/Scripts/waveSpawner.cs" afterPath="$PROJECT_DIR$/Assets/Scripts/waveSpawner.cs" /> </list> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="TRACKING_ENABLED" value="true" /> @@ -33,120 +33,63 @@ </component> <component name="FileEditorManager"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> - <file leaf-file-name="Player.cs" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/Assets/Scripts/Player.cs"> + <file leaf-file-name="player.cs" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/player.cs"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="1029"> - <caret line="82" column="5" lean-forward="false" selection-start-line="82" selection-start-column="5" selection-end-line="82" selection-end-column="5" /> + <state relative-caret-position="441"> + <caret line="21" column="0" lean-forward="false" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" /> <folding> - <marker date="1507664734000" expanded="true" signature="56:1741" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="304:508" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="511:1138" ph="stats" /> - <marker date="1507664734000" expanded="true" signature="548:584" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="623:662" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="687:723" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="759:795" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="836:872" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="895:923" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="957:1061" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="1099:1126" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="1186:1388" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="1422:1499" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="1450:1496" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="1529:1589" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="1616:1663" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="1691:1738" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="56:1741" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="304:508" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="511:1138" ph="stats" /> + <marker date="1508016033000" expanded="true" signature="548:584" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="623:662" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="687:723" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="759:795" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="836:872" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="895:923" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="957:1061" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1099:1126" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1186:1388" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1422:1499" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1450:1496" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1529:1589" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1616:1663" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1691:1738" ph="{...}" /> </folding> </state> </provider> </entry> </file> - <file leaf-file-name="MainGui.cs" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/Assets/Scripts/MainGui.cs"> + <file leaf-file-name="waveSpawner.cs" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/waveSpawner.cs"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="168"> - <caret line="11" column="14" lean-forward="false" selection-start-line="11" selection-start-column="14" selection-end-line="11" selection-end-column="14" /> + <state relative-caret-position="21"> + <caret line="47" column="61" lean-forward="false" selection-start-line="47" selection-start-column="61" selection-end-line="47" selection-end-column="61" /> <folding> - <marker date="1507664902000" expanded="false" signature="6:89" ph="..." /> - <marker date="1507664902000" expanded="true" signature="128:6849" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="1021:3635" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="3674:3784" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="3819:4041" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="4080:4303" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="4340:4399" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="4436:4730" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="4578:4727" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="4771:5022" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="5066:5172" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="5213:5679" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="5297:5484" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="5714:5748" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="5784:5906" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="5943:6047" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="5995:6016" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="6088:6846" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="6212:6323" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="6288:6319" ph="{...}" /> - </folding> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="WaveSpawner.cs" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/Assets/Scripts/WaveSpawner.cs"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="1252"> - <caret line="86" column="1" lean-forward="false" selection-start-line="86" selection-start-column="1" selection-end-line="86" selection-end-column="1" /> - <folding> - <marker date="1507992520000" expanded="false" signature="6:143" ph="..." /> - <marker date="1507992520000" expanded="true" signature="186:2187" ph="{...}" /> - <marker date="1507992520000" expanded="true" signature="615:929" ph="{...}" /> - <marker date="1507992520000" expanded="true" signature="641:657" ph="{...}" /> - <marker date="1507992520000" expanded="true" signature="683:765" ph="{...}" /> - <marker date="1507992520000" expanded="true" signature="972:1096" ph="{...}" /> - <marker date="1507992520000" expanded="true" signature="1125:1822" ph="{...}" /> - <marker date="1507992520000" expanded="true" signature="1327:1635" ph="{...}" /> - <marker date="1507992520000" expanded="true" signature="1462:1557" ph="{...}" /> - <marker date="1507992520000" expanded="true" signature="1717:1802" ph="{...}" /> - <marker date="1507992520000" expanded="true" signature="1860:1930" ph="{...}" /> - <marker date="1507992520000" expanded="true" signature="1980:2076" ph="{...}" /> - <marker date="1507992520000" expanded="true" signature="2104:2183" ph="{...}" /> - </folding> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="EnemySpawner.cs" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/Assets/Scripts/EnemySpawner.cs"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="745"> - <caret line="45" column="9" lean-forward="false" selection-start-line="45" selection-start-column="9" selection-end-line="45" selection-end-column="9" /> - <folding> - <marker date="1507664979000" expanded="false" signature="6:78" ph="..." /> - <marker date="1507664979000" expanded="true" signature="122:1415" ph="{...}" /> - <marker date="1507664979000" expanded="true" signature="125:263" ph="/* This is a class that spawns an enemy with a random interval ... */" /> - <marker date="1507664979000" expanded="true" signature="646:731" ph="{...}" /> - <marker date="1507664979000" expanded="true" signature="687:728" ph="{...}" /> - <marker date="1507664979000" expanded="true" signature="747:836" ph="{...}" /> - <marker date="1507664979000" expanded="true" signature="854:1413" ph="{...}" /> - <marker date="1507664979000" expanded="true" signature="969:1409" ph="{...}" /> - </folding> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="Enemy.cs" pinned="false" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/Assets/Scripts/Enemy.cs"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="378"> - <caret line="19" column="0" lean-forward="false" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" /> - <folding> - <marker date="1507665002000" expanded="false" signature="6:52" ph="..." /> - <marker date="1507665002000" expanded="true" signature="89:1376" ph="{...}" /> - <marker date="1507665002000" expanded="true" signature="92:214" ph="/* This is a general class that contains an enemy, ... */" /> - <marker date="1507665002000" expanded="true" signature="745:1371" ph="{...}" /> - <marker date="1507665002000" expanded="true" signature="940:1060" ph="{...}" /> - <marker date="1507665002000" expanded="true" signature="1292:1368" ph="{...}" /> + <marker date="1508073291000" expanded="false" signature="6:114" ph="..." /> + <marker date="1508073291000" expanded="true" signature="158:3691" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="752:837" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="793:834" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="854:943" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="962:1345" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="988:1004" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="1030:1181" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="1388:1512" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="1578:1799" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="1686:1781" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="1828:2520" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2012:2243" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2140:2235" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2279:2471" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2327:2420" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2551:3049" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2732:2998" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2890:2896" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2923:2934" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="3093:3434" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="3484:3580" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="3608:3687" ph="{...}" /> </folding> </state> </provider> @@ -157,6 +100,7 @@ <component name="FindInProjectRecents"> <findStrings> <find>toggle</find> + <find>spawnRa</find> </findStrings> </component> <component name="Git.Settings"> @@ -176,25 +120,23 @@ </favorite-branches> </component> <component name="HighlightingSettingsPerFile"> - <setting file="file://$PROJECT_DIR$/Assets/Scripts/Castle.cs" root0="FORCE_HIGHLIGHTING" /> - <setting file="file://$PROJECT_DIR$/Assets/Scripts/Tower.cs" root0="FORCE_HIGHLIGHTING" /> - <setting file="file://$PROJECT_DIR$/Assets/Scripts/MainGui.cs" root0="FORCE_HIGHLIGHTING" /> - <setting file="file://$PROJECT_DIR$/Assets/Scripts/Player.cs" root0="FORCE_HIGHLIGHTING" /> - <setting file="file://$PROJECT_DIR$/Assets/Scripts/EnableChild.cs" root0="FORCE_HIGHLIGHTING" /> - <setting file="file://$PROJECT_DIR$/Assets/Scripts/EnemySpawner.cs" root0="FORCE_HIGHLIGHTING" /> + <setting file="file://$PROJECT_DIR$/Assets/Scripts/castle.cs" root0="FORCE_HIGHLIGHTING" /> + <setting file="file://$PROJECT_DIR$/Assets/Scripts/tower.cs" root0="FORCE_HIGHLIGHTING" /> + <setting file="file://$PROJECT_DIR$/Assets/Scripts/mainGUI.cs" root0="FORCE_HIGHLIGHTING" /> + <setting file="file://$PROJECT_DIR$/Assets/Scripts/player.cs" root0="FORCE_HIGHLIGHTING" /> + <setting file="file://$PROJECT_DIR$/Assets/Scripts/enableChild.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/Assets/Scripts/Enemy.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/Assets/Scripts/Projectile.cs" root0="FORCE_HIGHLIGHTING" /> - <setting file="file://$PROJECT_DIR$/Assets/Scripts/CameraHandler.cs" root0="FORCE_HIGHLIGHTING" /> - <setting file="file://$PROJECT_DIR$/Assets/Scripts/WaveSpawner.cs" root0="FORCE_HIGHLIGHTING" /> + <setting file="file://$PROJECT_DIR$/Assets/Scripts/cameraHandler.cs" root0="FORCE_HIGHLIGHTING" /> + <setting file="file://$PROJECT_DIR$/Assets/Scripts/waveSpawner.cs" root0="FORCE_HIGHLIGHTING" /> <setting file="file://$PROJECT_DIR$/Assets/Plugins/Editor/JetBrains/Unity3DRider.cs" root0="FORCE_HIGHLIGHTING" /> - <setting file="file://$PROJECT_DIR$/Assets/Scripts/GameStats.cs" root0="FORCE_HIGHLIGHTING" /> + <setting file="file://$PROJECT_DIR$/Assets/Scripts/gameStats.cs" root0="FORCE_HIGHLIGHTING" /> </component> <component name="IdeDocumentHistory"> <option name="CHANGED_PATHS"> <list> <option value="$PROJECT_DIR$/Assets/Scripts/castle.cs" /> <option value="$PROJECT_DIR$/Assets/Scripts/projectile.cs" /> - <option value="$PROJECT_DIR$/Assets/Scripts/Projectile.cs" /> <option value="$PROJECT_DIR$/Assets/Scripts/tower.cs" /> <option value="$PROJECT_DIR$/Assets/Scripts/cameraHandler.cs" /> <option value="$PROJECT_DIR$/Assets/Scripts/player.cs" /> @@ -202,9 +144,12 @@ <option value="$PROJECT_DIR$/Assets/Scripts/CameraHandler.cs" /> <option value="$PROJECT_DIR$/Assets/Scripts/EnemySpawner.cs" /> <option value="$PROJECT_DIR$/Assets/Scripts/MainGui.cs" /> - <option value="$PROJECT_DIR$/Assets/Scripts/Enemy.cs" /> <option value="$PROJECT_DIR$/Assets/Scripts/Player.cs" /> + <option value="$PROJECT_DIR$/Assets/Scripts/Tower.cs" /> + <option value="$PROJECT_DIR$/Assets/Scripts/Projectile.cs" /> + <option value="$PROJECT_DIR$/Assets/Scripts/Enemy.cs" /> <option value="$PROJECT_DIR$/Assets/Scripts/WaveSpawner.cs" /> + <option value="$PROJECT_DIR$/Assets/Scripts/waveSpawner.cs" /> </list> </option> </component> @@ -234,7 +179,6 @@ <foldersAlwaysOnTop value="true" /> </navigator> <panes> - <pane id="Scratches" /> <pane id="SolutionExplorer"> <subPane> <PATH> @@ -247,47 +191,16 @@ <option name="myItemType" value="com.jetbrains.rider.projectView.solutionExplorer.SolutionExplorerNodeRider" /> </PATH_ELEMENT> </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" /> - <option name="myItemType" value="com.jetbrains.rider.projectView.solutionExplorer.SolutionExplorerViewPane$ProjectViewPaneTreeStructure$createRoot$1" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="td (2 projects)" /> - <option name="myItemType" value="com.jetbrains.rider.projectView.solutionExplorer.SolutionExplorerNodeRider" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="Assembly-CSharp" /> - <option name="myItemType" value="com.jetbrains.rider.projectView.solutionExplorer.SolutionExplorerNodeRider" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="Assets" /> - <option name="myItemType" value="com.jetbrains.rider.projectView.solutionExplorer.SolutionExplorerNodeRider" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" /> - <option name="myItemType" value="com.jetbrains.rider.projectView.solutionExplorer.SolutionExplorerViewPane$ProjectViewPaneTreeStructure$createRoot$1" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="td (2 projects)" /> - <option name="myItemType" value="com.jetbrains.rider.projectView.solutionExplorer.SolutionExplorerNodeRider" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="Assembly-CSharp" /> - <option name="myItemType" value="com.jetbrains.rider.projectView.solutionExplorer.SolutionExplorerNodeRider" /> - </PATH_ELEMENT> - </PATH> </subPane> <option name="show-file-system" value="false" /> <option name="show-all-items" value="false" /> </pane> + <pane id="Scratches" /> </panes> </component> <component name="PropertiesComponent"> <property name="WebServerToolWindowFactoryState" value="false" /> - <property name="settings.editor.selected.configurable" value="reference.settingsdialog.IDE.editor.colors" /> + <property name="settings.editor.selected.configurable" value="reference.settings.deploy.options" /> <property name="FullScreen" value="true" /> <property name="nodejs_interpreter_path" value="/opt/local/bin/node" /> <property name="node.js.path.for.package.stylelint" value="project" /> @@ -373,7 +286,7 @@ <recursive>false</recursive> <method /> </configuration> - <configuration default="false" name="Attach to Unity Editor" type="UNITY_DEBUG_RUN_CONFIGURATION" factoryName="Unity Debug" pid="5319"> + <configuration default="false" name="Attach to Unity Editor" type="UNITY_DEBUG_RUN_CONFIGURATION" factoryName="Unity Debug"> <method /> </configuration> <list size="1"> @@ -401,11 +314,15 @@ <workItem from="1507453479306" duration="2188000" /> <workItem from="1507456734191" duration="8537000" /> <workItem from="1507988744342" duration="4691000" /> + <workItem from="1508000078864" duration="6945000" /> + <workItem from="1508068594474" duration="2506000" /> + <workItem from="1508172384130" duration="597000" /> + <workItem from="1508178537852" duration="124000" /> </task> <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="22976000" /> + <option name="totallyTimeSpent" value="33148000" /> </component> <component name="TodoView"> <todo-panel id="selected-file"> @@ -427,7 +344,7 @@ <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.33673468" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32959184" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> <window_info id="NuGet" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32857144" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17521368" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17887668" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32967034" sideWeight="0.5" order="3" 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.24969475" 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" /> @@ -488,146 +405,380 @@ <watches-manager /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/Assets/Scripts/Player.cs"> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/player.cs"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="1029"> + <state relative-caret-position="441"> + <caret line="21" column="0" lean-forward="false" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" /> + <folding> + <marker date="1508016033000" expanded="true" signature="56:1741" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="304:508" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="511:1138" ph="stats" /> + <marker date="1508016033000" expanded="true" signature="548:584" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="623:662" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="687:723" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="759:795" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="836:872" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="895:923" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="957:1061" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1099:1126" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1186:1388" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1422:1499" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1450:1496" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1529:1589" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1616:1663" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1691:1738" ph="{...}" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/waveSpawner.cs"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="903"> + <caret line="47" column="61" lean-forward="false" selection-start-line="47" selection-start-column="61" selection-end-line="47" selection-end-column="61" /> + <folding> + <marker date="1508073291000" expanded="false" signature="6:114" ph="..." /> + <marker date="1508073291000" expanded="true" signature="158:3691" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="752:837" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="793:834" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="854:943" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="962:1345" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="988:1004" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="1030:1181" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="1388:1512" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="1578:1799" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="1686:1781" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="1828:2520" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2012:2243" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2140:2235" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2279:2471" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2327:2420" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2551:3049" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2732:2998" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2890:2896" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2923:2934" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="3093:3434" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="3484:3580" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="3608:3687" ph="{...}" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/player.cs"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="441"> + <caret line="21" column="0" lean-forward="false" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" /> + <folding> + <marker date="1508016033000" expanded="true" signature="56:1741" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="304:508" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="511:1138" ph="stats" /> + <marker date="1508016033000" expanded="true" signature="548:584" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="623:662" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="687:723" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="759:795" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="836:872" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="895:923" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="957:1061" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1099:1126" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1186:1388" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1422:1499" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1450:1496" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1529:1589" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1616:1663" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1691:1738" ph="{...}" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/waveSpawner.cs"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="987"> + <caret line="47" column="61" lean-forward="false" selection-start-line="47" selection-start-column="61" selection-end-line="47" selection-end-column="61" /> + <folding> + <marker date="1508073291000" expanded="false" signature="6:114" ph="..." /> + <marker date="1508073291000" expanded="true" signature="158:3691" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="752:837" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="793:834" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="854:943" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="962:1345" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="988:1004" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="1030:1181" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="1388:1512" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="1578:1799" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="1686:1781" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="1828:2520" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2012:2243" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2140:2235" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2279:2471" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2327:2420" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2551:3049" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2732:2998" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2890:2896" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2923:2934" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="3093:3434" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="3484:3580" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="3608:3687" ph="{...}" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/player.cs"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="1722"> + <caret line="82" column="5" lean-forward="false" selection-start-line="82" selection-start-column="5" selection-end-line="82" selection-end-column="5" /> + <folding> + <marker date="1508016033000" expanded="true" signature="56:1741" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="304:508" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="511:1138" ph="stats" /> + <marker date="1508016033000" expanded="true" signature="548:584" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="623:662" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="687:723" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="759:795" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="836:872" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="895:923" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="957:1061" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1099:1126" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1186:1388" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1422:1499" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1450:1496" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1529:1589" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1616:1663" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1691:1738" ph="{...}" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/mainGUI.cs"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="231"> + <caret line="11" column="14" lean-forward="false" selection-start-line="11" selection-start-column="14" selection-end-line="11" selection-end-column="14" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/Enemy.cs"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="651"> + <caret line="32" column="39" lean-forward="false" selection-start-line="32" selection-start-column="39" selection-end-line="32" selection-end-column="39" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/tower.cs"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="1890"> + <caret line="90" column="0" lean-forward="false" selection-start-line="90" selection-start-column="0" selection-end-line="90" selection-end-column="0" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/Projectile.cs"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="756"> + <caret line="36" column="8" lean-forward="false" selection-start-line="36" selection-start-column="8" selection-end-line="36" selection-end-column="35" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/waveSpawner.cs"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="2184"> + <caret line="108" column="61" lean-forward="false" selection-start-line="108" selection-start-column="61" selection-end-line="108" selection-end-column="61" /> + <folding> + <marker date="1508073291000" expanded="false" signature="6:114" ph="..." /> + <marker date="1508073291000" expanded="true" signature="158:3691" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="752:837" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="793:834" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="854:943" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="962:1345" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="988:1004" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="1030:1181" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="1388:1512" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="1578:1799" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="1686:1781" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="1828:2520" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2012:2243" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2140:2235" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2279:2471" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2327:2420" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2551:3049" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2732:2998" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2890:2896" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2923:2934" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="3093:3434" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="3484:3580" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="3608:3687" ph="{...}" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/player.cs"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="1722"> <caret line="82" column="5" lean-forward="false" selection-start-line="82" selection-start-column="5" selection-end-line="82" selection-end-column="5" /> <folding> - <marker date="1507664734000" expanded="true" signature="56:1741" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="304:508" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="511:1138" ph="stats" /> - <marker date="1507664734000" expanded="true" signature="548:584" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="623:662" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="687:723" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="759:795" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="836:872" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="895:923" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="957:1061" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="1099:1126" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="1186:1388" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="1422:1499" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="1450:1496" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="1529:1589" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="1616:1663" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="1691:1738" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="56:1741" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="304:508" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="511:1138" ph="stats" /> + <marker date="1508016033000" expanded="true" signature="548:584" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="623:662" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="687:723" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="759:795" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="836:872" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="895:923" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="957:1061" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1099:1126" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1186:1388" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1422:1499" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1450:1496" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1529:1589" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1616:1663" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1691:1738" ph="{...}" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/Assets/Scripts/MainGui.cs"> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/mainGUI.cs"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="168"> <caret line="11" column="14" lean-forward="false" selection-start-line="11" selection-start-column="14" selection-end-line="11" selection-end-column="14" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/waveSpawner.cs"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="1701"> + <caret line="86" column="1" lean-forward="false" selection-start-line="86" selection-start-column="1" selection-end-line="86" selection-end-column="1" /> <folding> - <marker date="1507664902000" expanded="false" signature="6:89" ph="..." /> - <marker date="1507664902000" expanded="true" signature="128:6849" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="1021:3635" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="3674:3784" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="3819:4041" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="4080:4303" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="4340:4399" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="4436:4730" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="4578:4727" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="4771:5022" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="5066:5172" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="5213:5679" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="5297:5484" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="5714:5748" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="5784:5906" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="5943:6047" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="5995:6016" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="6088:6846" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="6212:6323" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="6288:6319" ph="{...}" /> + <marker date="1508073291000" expanded="false" signature="6:114" ph="..." /> + <marker date="1508073291000" expanded="true" signature="158:3691" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="752:837" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="793:834" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="854:943" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="962:1345" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="988:1004" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="1030:1181" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="1388:1512" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="1578:1799" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="1686:1781" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="1828:2520" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2012:2243" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2140:2235" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2279:2471" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2327:2420" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2551:3049" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2732:2998" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2890:2896" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2923:2934" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="3093:3434" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="3484:3580" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="3608:3687" ph="{...}" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/Assets/Scripts/WaveSpawner.cs"> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/EnemySpawner.cs" /> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/Enemy.cs"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="567"> - <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" /> + <state relative-caret-position="378"> + <caret line="19" column="0" lean-forward="false" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/player.cs"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="1029"> + <caret line="82" column="5" lean-forward="false" selection-start-line="82" selection-start-column="5" selection-end-line="82" selection-end-column="5" /> <folding> - <marker date="1507992520000" expanded="false" signature="6:143" ph="..." /> - <marker date="1507992520000" expanded="true" signature="186:2187" ph="{...}" /> - <marker date="1507992520000" expanded="true" signature="615:929" ph="{...}" /> - <marker date="1507992520000" expanded="true" signature="641:657" ph="{...}" /> - <marker date="1507992520000" expanded="true" signature="683:765" ph="{...}" /> - <marker date="1507992520000" expanded="true" signature="972:1096" ph="{...}" /> - <marker date="1507992520000" expanded="true" signature="1125:1822" ph="{...}" /> - <marker date="1507992520000" expanded="true" signature="1327:1635" ph="{...}" /> - <marker date="1507992520000" expanded="true" signature="1462:1557" ph="{...}" /> - <marker date="1507992520000" expanded="true" signature="1717:1802" ph="{...}" /> - <marker date="1507992520000" expanded="true" signature="1860:1930" ph="{...}" /> - <marker date="1507992520000" expanded="true" signature="1980:2076" ph="{...}" /> - <marker date="1507992520000" expanded="true" signature="2104:2183" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="56:1741" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="304:508" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="511:1138" ph="stats" /> + <marker date="1508016033000" expanded="true" signature="548:584" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="623:662" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="687:723" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="759:795" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="836:872" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="895:923" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="957:1061" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1099:1126" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1186:1388" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1422:1499" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1450:1496" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1529:1589" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1616:1663" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1691:1738" ph="{...}" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/Assets/Scripts/Player.cs"> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/mainGUI.cs"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="609"> - <caret line="64" column="34" lean-forward="false" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" /> + <state relative-caret-position="168"> + <caret line="11" column="14" lean-forward="false" selection-start-line="11" selection-start-column="14" selection-end-line="11" selection-end-column="14" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/waveSpawner.cs"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="567"> + <caret line="27" column="9" lean-forward="true" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" /> <folding> - <marker date="1507664734000" expanded="true" signature="56:1741" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="304:508" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="511:1138" ph="stats" /> - <marker date="1507664734000" expanded="true" signature="548:584" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="623:662" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="687:723" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="759:795" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="836:872" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="895:923" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="957:1061" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="1099:1126" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="1186:1388" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="1422:1499" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="1450:1496" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="1529:1589" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="1616:1663" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="1691:1738" ph="{...}" /> + <marker date="1508073291000" expanded="false" signature="6:114" ph="..." /> + <marker date="1508073291000" expanded="true" signature="158:3691" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="752:837" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="793:834" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="854:943" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="962:1345" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="988:1004" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="1030:1181" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="1388:1512" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="1578:1799" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="1686:1781" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="1828:2520" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2012:2243" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2140:2235" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2279:2471" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2327:2420" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2551:3049" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2732:2998" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2890:2896" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2923:2934" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="3093:3434" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="3484:3580" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="3608:3687" ph="{...}" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/Assets/Scripts/MainGui.cs"> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/player.cs"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="399"> - <caret line="21" column="0" lean-forward="true" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" /> + <state relative-caret-position="609"> + <caret line="64" column="34" lean-forward="false" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" /> <folding> - <marker date="1507664902000" expanded="false" signature="6:89" ph="..." /> - <marker date="1507664902000" expanded="true" signature="128:6849" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="1021:3635" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="3674:3784" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="3819:4041" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="4080:4303" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="4340:4399" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="4436:4730" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="4578:4727" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="4771:5022" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="5066:5172" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="5213:5679" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="5297:5484" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="5714:5748" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="5784:5906" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="5943:6047" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="5995:6016" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="6088:6846" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="6212:6323" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="6288:6319" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="56:1741" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="304:508" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="511:1138" ph="stats" /> + <marker date="1508016033000" expanded="true" signature="548:584" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="623:662" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="687:723" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="759:795" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="836:872" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="895:923" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="957:1061" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1099:1126" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1186:1388" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1422:1499" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1450:1496" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1529:1589" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1616:1663" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1691:1738" ph="{...}" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/Assets/Scripts/EnemySpawner.cs"> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/mainGUI.cs"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="546"> - <caret line="28" column="0" lean-forward="false" selection-start-line="28" selection-start-column="0" selection-end-line="28" selection-end-column="0" /> - <folding /> + <state relative-caret-position="399"> + <caret line="21" column="0" lean-forward="true" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" /> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/EnemySpawner.cs" /> <entry file="file://$PROJECT_DIR$/Assets/Scripts/Projectile.cs"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="294"> @@ -635,71 +786,49 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/Assets/Scripts/MainGui.cs"> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/mainGUI.cs"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="672"> <caret line="36" column="73" lean-forward="false" selection-start-line="36" selection-start-column="73" selection-end-line="36" selection-end-column="73" /> - <folding> - <marker date="1507664902000" expanded="false" signature="6:89" ph="..." /> - <marker date="1507664902000" expanded="true" signature="128:6849" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="1021:3635" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="3674:3784" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="3819:4041" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="4080:4303" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="4340:4399" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="4436:4730" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="4578:4727" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="4771:5022" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="5066:5172" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="5213:5679" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="5297:5484" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="5714:5748" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="5784:5906" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="5943:6047" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="5995:6016" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="6088:6846" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="6212:6323" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="6288:6319" ph="{...}" /> - </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/Assets/Scripts/EnableChild.cs"> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/enableChild.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/Scripts/Tower.cs"> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/tower.cs"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="231"> <caret line="11" column="31" lean-forward="false" selection-start-line="11" selection-start-column="31" selection-end-line="11" selection-end-column="31" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/Assets/Scripts/Player.cs"> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/player.cs"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="1029"> <caret line="51" column="28" lean-forward="false" selection-start-line="51" selection-start-column="28" selection-end-line="51" selection-end-column="28" /> <folding> - <marker date="1507664734000" expanded="true" signature="56:1741" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="304:508" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="511:1138" ph="stats" /> - <marker date="1507664734000" expanded="true" signature="548:584" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="623:662" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="687:723" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="759:795" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="836:872" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="895:923" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="957:1061" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="1099:1126" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="1186:1388" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="1422:1499" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="1450:1496" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="1529:1589" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="1616:1663" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="1691:1738" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="56:1741" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="304:508" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="511:1138" ph="stats" /> + <marker date="1508016033000" expanded="true" signature="548:584" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="623:662" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="687:723" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="759:795" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="836:872" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="895:923" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="957:1061" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1099:1126" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1186:1388" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1422:1499" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1450:1496" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1529:1589" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1616:1663" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1691:1738" ph="{...}" /> </folding> </state> </provider> @@ -708,25 +837,24 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="588"> <caret line="29" column="0" lean-forward="false" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" /> - <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/Assets/Scripts/Castle.cs"> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/castle.cs"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="105"> <caret line="7" column="10" lean-forward="false" selection-start-line="7" selection-start-column="10" selection-end-line="7" selection-end-column="10" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/Assets/Scripts/GameStats.cs"> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/gameStats.cs"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="210"> <caret line="13" column="32" lean-forward="false" selection-start-line="13" selection-start-column="32" selection-end-line="13" selection-end-column="32" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/Assets/Scripts/CameraHandler.cs"> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/cameraHandler.cs"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="1560"> <caret line="106" column="27" lean-forward="false" selection-start-line="106" selection-start-column="27" selection-end-line="106" selection-end-column="27" /> @@ -744,32 +872,31 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="30"> <caret line="2" column="17" lean-forward="false" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" /> - <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/Assets/Scripts/Tower.cs"> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/tower.cs"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="1560"> <caret line="106" column="47" lean-forward="false" selection-start-line="106" selection-start-column="47" selection-end-line="106" selection-end-column="47" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/Assets/Scripts/CameraHandler.cs"> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/cameraHandler.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/Scripts/CameraHandler.cs"> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/cameraHandler.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/Scripts/CameraHandler.cs"> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/cameraHandler.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" /> @@ -783,146 +910,125 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/Assets/Scripts/EnableChild.cs"> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/enableChild.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/Scripts/Castle.cs"> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/castle.cs"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="126"> <caret line="8" column="5" lean-forward="false" selection-start-line="8" selection-start-column="5" selection-end-line="8" selection-end-column="5" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/Assets/Scripts/Tower.cs"> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/gameStats.cs"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="712"> - <caret line="63" column="20" lean-forward="false" selection-start-line="63" selection-start-column="20" selection-end-line="63" selection-end-column="63" /> + <state relative-caret-position="603"> + <caret line="40" column="40" lean-forward="false" selection-start-line="40" selection-start-column="40" selection-end-line="40" selection-end-column="40" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/Assets/Scripts/Projectile.cs"> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/cameraHandler.cs"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="294"> - <caret line="14" column="0" lean-forward="false" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" /> + <state relative-caret-position="2058"> + <caret line="98" column="31" lean-forward="true" selection-start-line="98" selection-start-column="31" selection-end-line="98" selection-end-column="31" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/Assets/Scripts/GameStats.cs"> + <entry file="file://$PROJECT_DIR$/.idea/.idea.td/.idea/workspace.xml"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="603"> - <caret line="40" column="40" lean-forward="false" selection-start-line="40" selection-start-column="40" selection-end-line="40" selection-end-column="40" /> + <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/Scripts/CameraHandler.cs"> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/EnemySpawner.cs" /> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/tower.cs"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="2058"> - <caret line="98" column="31" lean-forward="true" selection-start-line="98" selection-start-column="31" selection-end-line="98" selection-end-column="31" /> + <state relative-caret-position="1890"> + <caret line="90" column="0" lean-forward="false" selection-start-line="90" selection-start-column="0" selection-end-line="90" selection-end-column="0" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/Assets/Scripts/MainGui.cs"> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/Enemy.cs"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="168"> - <caret line="11" column="14" lean-forward="false" selection-start-line="11" selection-start-column="14" selection-end-line="11" selection-end-column="14" /> - <folding> - <marker date="1507664902000" expanded="false" signature="6:89" ph="..." /> - <marker date="1507664902000" expanded="true" signature="128:6849" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="1021:3635" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="3674:3784" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="3819:4041" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="4080:4303" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="4340:4399" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="4436:4730" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="4578:4727" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="4771:5022" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="5066:5172" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="5213:5679" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="5297:5484" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="5714:5748" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="5784:5906" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="5943:6047" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="5995:6016" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="6088:6846" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="6212:6323" ph="{...}" /> - <marker date="1507664902000" expanded="true" signature="6288:6319" ph="{...}" /> - </folding> + <state relative-caret-position="651"> + <caret line="32" column="39" lean-forward="false" selection-start-line="32" selection-start-column="39" selection-end-line="32" selection-end-column="39" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/Assets/Scripts/Player.cs"> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/Projectile.cs"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="1029"> - <caret line="82" column="5" lean-forward="false" selection-start-line="82" selection-start-column="5" selection-end-line="82" selection-end-column="5" /> - <folding> - <marker date="1507664734000" expanded="true" signature="56:1741" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="304:508" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="511:1138" ph="stats" /> - <marker date="1507664734000" expanded="true" signature="548:584" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="623:662" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="687:723" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="759:795" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="836:872" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="895:923" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="957:1061" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="1099:1126" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="1186:1388" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="1422:1499" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="1450:1496" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="1529:1589" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="1616:1663" ph="{...}" /> - <marker date="1507664734000" expanded="true" signature="1691:1738" ph="{...}" /> - </folding> + <state relative-caret-position="703"> + <caret line="36" column="8" lean-forward="false" selection-start-line="36" selection-start-column="8" selection-end-line="36" selection-end-column="35" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/.idea/.idea.td/.idea/workspace.xml"> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/mainGUI.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 relative-caret-position="-2313"> + <caret line="11" column="14" lean-forward="false" selection-start-line="11" selection-start-column="14" selection-end-line="11" selection-end-column="14" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/Assets/Scripts/WaveSpawner.cs"> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/player.cs"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="1252"> - <caret line="86" column="1" lean-forward="false" selection-start-line="86" selection-start-column="1" selection-end-line="86" selection-end-column="1" /> + <state relative-caret-position="441"> + <caret line="21" column="0" lean-forward="false" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" /> <folding> - <marker date="1507992520000" expanded="false" signature="6:143" ph="..." /> - <marker date="1507992520000" expanded="true" signature="186:2187" ph="{...}" /> - <marker date="1507992520000" expanded="true" signature="615:929" ph="{...}" /> - <marker date="1507992520000" expanded="true" signature="641:657" ph="{...}" /> - <marker date="1507992520000" expanded="true" signature="683:765" ph="{...}" /> - <marker date="1507992520000" expanded="true" signature="972:1096" ph="{...}" /> - <marker date="1507992520000" expanded="true" signature="1125:1822" ph="{...}" /> - <marker date="1507992520000" expanded="true" signature="1327:1635" ph="{...}" /> - <marker date="1507992520000" expanded="true" signature="1462:1557" ph="{...}" /> - <marker date="1507992520000" expanded="true" signature="1717:1802" ph="{...}" /> - <marker date="1507992520000" expanded="true" signature="1860:1930" ph="{...}" /> - <marker date="1507992520000" expanded="true" signature="1980:2076" ph="{...}" /> - <marker date="1507992520000" expanded="true" signature="2104:2183" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="56:1741" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="304:508" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="511:1138" ph="stats" /> + <marker date="1508016033000" expanded="true" signature="548:584" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="623:662" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="687:723" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="759:795" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="836:872" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="895:923" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="957:1061" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1099:1126" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1186:1388" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1422:1499" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1450:1496" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1529:1589" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1616:1663" ph="{...}" /> + <marker date="1508016033000" expanded="true" signature="1691:1738" ph="{...}" /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/Assets/Scripts/EnemySpawner.cs"> + <entry file="file://$PROJECT_DIR$/Assets/Scripts/waveSpawner.cs"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="745"> - <caret line="45" column="9" lean-forward="false" selection-start-line="45" selection-start-column="9" selection-end-line="45" selection-end-column="9" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/Assets/Scripts/Enemy.cs"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="378"> - <caret line="19" column="0" lean-forward="false" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" /> - <folding /> + <state relative-caret-position="21"> + <caret line="47" column="61" lean-forward="false" selection-start-line="47" selection-start-column="61" selection-end-line="47" selection-end-column="61" /> + <folding> + <marker date="1508073291000" expanded="false" signature="6:114" ph="..." /> + <marker date="1508073291000" expanded="true" signature="158:3691" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="752:837" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="793:834" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="854:943" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="962:1345" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="988:1004" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="1030:1181" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="1388:1512" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="1578:1799" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="1686:1781" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="1828:2520" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2012:2243" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2140:2235" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2279:2471" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2327:2420" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2551:3049" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2732:2998" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2890:2896" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="2923:2934" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="3093:3434" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="3484:3580" ph="{...}" /> + <marker date="1508073291000" expanded="true" signature="3608:3687" ph="{...}" /> + </folding> </state> </provider> </entry> diff --git a/td/Assets/Scripts/Enemy.cs b/td/Assets/Scripts/Enemy.cs index 4d15b64..931f301 100644 --- a/td/Assets/Scripts/Enemy.cs +++ b/td/Assets/Scripts/Enemy.cs @@ -6,6 +6,7 @@ public class Enemy : MonoBehaviour { * Currently it follows the pathway, and dies when reacing the end */ [Header("Attributes")] + public int HeadPrice; public float Speed; // Speed multiplier public int InitialHp; // HealthPoints public int Damage; diff --git a/td/Assets/Scripts/Projectile.cs b/td/Assets/Scripts/Projectile.cs index 3b02763..e8c427c 100644 --- a/td/Assets/Scripts/Projectile.cs +++ b/td/Assets/Scripts/Projectile.cs @@ -36,6 +36,7 @@ public class Projectile : MonoBehaviour { void HitTarget() { WaveSpawner.EnemiesAlive--; Player.ScoreAdd (PointsPerHit); + Player.PaycheckAdd(_target.GetComponent<Enemy>().HeadPrice); Destroy (_target.gameObject); Destroy (gameObject); } diff --git a/td/Assets/Scripts/player.cs b/td/Assets/Scripts/player.cs index cb55357..608d09c 100644 --- a/td/Assets/Scripts/player.cs +++ b/td/Assets/Scripts/player.cs @@ -9,6 +9,7 @@ public class Player : MonoBehaviour { private int _gameState; private GameObject[] _towers; private int _playerMoney; + private int _playerPaycheck; private int _playerScore; private int _playerHealth; @@ -41,6 +42,19 @@ public class Player : MonoBehaviour { _playerMoney -= sum; } + public int Paycheck() { + return _playerPaycheck; + } + + public void PaycheckAdd(int sum) { + _playerPaycheck += sum; + } + + public void Payday() { + _playerMoney += _playerPaycheck; + _playerPaycheck = 0; + } + public int Health() { return _playerHealth; } diff --git a/td/Assets/Scripts/waveSpawner.cs b/td/Assets/Scripts/waveSpawner.cs index 3a6d7d4..6444cfd 100644 --- a/td/Assets/Scripts/waveSpawner.cs +++ b/td/Assets/Scripts/waveSpawner.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; + public class WaveSpawner : MonoBehaviour { [Header("Attributes")] @@ -27,6 +28,7 @@ public class WaveSpawner : MonoBehaviour { public static int EnemiesAlive = 0; private float _countdown = 2f; private int _waveIndex = 0; + private bool _lastWavePayed; void Awake() { foreach (Transform child in PathWay) { @@ -43,8 +45,13 @@ public class WaveSpawner : MonoBehaviour { return; } + if (EnemiesAlive == 0 && !_lastWavePayed) { + Player.Payday(); + _lastWavePayed = true; + } + if (_countdown <= 0f) { - StartCoroutine(SpawnWave()); + StartCoroutine(SpawnWave()); // TODO Bytt ut denne med SpawnWaveRand (Gjør ferdig SpawnWaveRand) _countdown = TimeBetweenWaves; return; } @@ -97,6 +104,29 @@ public class WaveSpawner : MonoBehaviour { SpawnRate = SpawnRate * 2; _waveIndex++; + _lastWavePayed = false; + } + + IEnumerator SpawnWaveRand() { + int enemiesToSpawn = WaveEnemyCount(_waveIndex); + int[] waveEnemies = new int[Enemies.Length - 1]; + EnemiesAlive = enemiesToSpawn; + + for (int i = 1; i < enemiesToSpawn; i++) { + int currentEnemyInt = UnityEngine.Random.Range(0, Enemies.Length - 1); + EnemyType currentEnemy = Enemies[currentEnemyInt]; + + if (_waveIndex <= 1) { + } else if (_waveIndex <= 5) { + + } + + + yield return new WaitForSeconds(1f / SpawnRate); + } + + SpawnRate = SpawnRate * 2; + _waveIndex++; } void SpawnEnemy (GameObject enemyPrefab) { diff --git a/td/Assets/Scripts/waveSpawner.cs.meta b/td/Assets/Scripts/waveSpawner.cs.meta index 1f1e3cb..ed1c24d 100644 --- a/td/Assets/Scripts/waveSpawner.cs.meta +++ b/td/Assets/Scripts/waveSpawner.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 9ea53d824cbfc4eb8a4eb4ee6a247bc7 -timeCreated: 1507241433 +timeCreated: 1508270424 licenseType: Free MonoImporter: serializedVersion: 2 |