Skip to content

Commit 9c03ce1

Browse files
bradburybradbury
authored
Merge pull request #2 from jkanagal/master
Merge fork with base repository
2 parents 1b96540 + d3210a8 commit 9c03ce1

File tree

484 files changed

+8575
-63972
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

484 files changed

+8575
-63972
lines changed

‎.gitignore‎

Lines changed: 62 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,62 @@
1-
.DS_Store
1+
# This .gitignore file should be placed at the root of your Unity project directory
2+
#
3+
# Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore
4+
#
5+
/[Ll]ibrary/
6+
/[Tt]emp/
7+
/[Oo]bj/
8+
/[Bb]uild/
9+
/[Bb]uilds/
10+
/[Ll]ogs/
11+
/[Mm]emoryCaptures/
12+
13+
# Never ignore Asset meta data
14+
!/[Aa]ssets/**/*.meta
15+
16+
# Uncomment this line if you wish to ignore the asset store tools plugin
17+
# /[Aa]ssets/AssetStoreTools*
18+
19+
# TextMesh Pro files
20+
[Aa]ssets/TextMesh*Pro/
21+
22+
# Autogenerated Jetbrains Rider plugin
23+
[Aa]ssets/Plugins/Editor/JetBrains*
24+
25+
# Visual Studio cache directory
26+
.vs/
27+
28+
# Gradle cache directory
29+
.gradle/
30+
31+
# Autogenerated VS/MD/Consulo solution and project files
32+
ExportedObj/
33+
.consulo/
34+
*.csproj
35+
*.unityproj
36+
*.sln
37+
*.suo
38+
*.tmp
39+
*.user
40+
*.userprefs
41+
*.pidb
42+
*.booproj
43+
*.svd
44+
*.pdb
45+
*.mdb
46+
*.opendb
47+
*.VC.db
48+
49+
# Unity3D generated meta files
50+
*.pidb.meta
51+
*.pdb.meta
52+
*.mdb.meta
53+
54+
# Unity3D generated file on crash reports
55+
sysinfo.txt
56+
57+
# Builds
58+
*.apk
59+
*.unitypackage
60+
61+
# Crashlytics generated file
62+
crashlytics-build.properties

‎src/.gitignore‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
# This .gitignore file should be placed at the root of your Unity project directory
2+
#
3+
# Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore
4+
#
5+
/[Ll]ibrary/
6+
/[Tt]emp/
7+
/[Oo]bj/
8+
/[Bb]uild/
9+
/[Bb]uilds/
10+
/[Ll]ogs/
11+
/[Mm]emoryCaptures/
12+
13+
# Never ignore Asset meta data
14+
!/[Aa]ssets/**/*.meta
15+
16+
# Uncomment this line if you wish to ignore the asset store tools plugin
17+
# /[Aa]ssets/AssetStoreTools*
18+
19+
# TextMesh Pro files
20+
[Aa]ssets/TextMesh*Pro/
21+
22+
# Autogenerated Jetbrains Rider plugin
23+
[Aa]ssets/Plugins/Editor/JetBrains*
24+
25+
# Visual Studio cache directory
26+
.vs/
27+
28+
# Gradle cache directory
29+
.gradle/
30+
31+
# Autogenerated VS/MD/Consulo solution and project files
32+
ExportedObj/
33+
.consulo/
34+
*.csproj
35+
*.unityproj
36+
*.sln
37+
*.suo
38+
*.tmp
39+
*.user
40+
*.userprefs
41+
*.pidb
42+
*.booproj
43+
*.svd
44+
*.pdb
45+
*.mdb
46+
*.opendb
47+
*.VC.db
48+
49+
# Unity3D generated meta files
50+
*.pidb.meta
51+
*.pdb.meta
52+
*.mdb.meta
53+
54+
# Unity3D generated file on crash reports
55+
sysinfo.txt
56+
57+
# Builds
58+
*.apk
59+
*.unitypackage
60+
61+
# Crashlytics generated file
62+
crashlytics-build.properties

‎src/.vscode/launch.json‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
{
2+
// Use IntelliSense to learn about possible attributes.
3+
// Hover to view descriptions of existing attributes.
4+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5+
"version": "0.2.0",
6+
"configurations": [
7+
8+
{
9+
"name": "Unity Editor",
10+
"type": "unity",
11+
"path": "/f:/HelpTheDrive/Fiverr/Project_LogginJson/Threaded-Paws-master/src/Library/EditorInstance.json",
12+
"request": "launch"
13+
},
14+
{
15+
"name": "Windows Player",
16+
"type": "unity",
17+
"request": "launch"
18+
},
19+
{
20+
"name": "OSX Player",
21+
"type": "unity",
22+
"request": "launch"
23+
},
24+
{
25+
"name": "Linux Player",
26+
"type": "unity",
27+
"request": "launch"
28+
},
29+
{
30+
"name": "iOS Player",
31+
"type": "unity",
32+
"request": "launch"
33+
},
34+
{
35+
"name": "Android Player",
36+
"type": "unity",
37+
"request": "launch"
38+
}
39+
]
40+
}

‎src/.vscode/settings.json‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
{
2+
"files.exclude":
3+
{
4+
"**/.DS_Store":true,
5+
"**/.git":true,
6+
"**/.gitignore":true,
7+
"**/.gitmodules":true,
8+
"**/*.booproj":true,
9+
"**/*.pidb":true,
10+
"**/*.suo":true,
11+
"**/*.user":true,
12+
"**/*.userprefs":true,
13+
"**/*.unityproj":true,
14+
"**/*.dll":true,
15+
"**/*.exe":true,
16+
"**/*.pdf":true,
17+
"**/*.mid":true,
18+
"**/*.midi":true,
19+
"**/*.wav":true,
20+
"**/*.gif":true,
21+
"**/*.ico":true,
22+
"**/*.jpg":true,
23+
"**/*.jpeg":true,
24+
"**/*.png":true,
25+
"**/*.psd":true,
26+
"**/*.tga":true,
27+
"**/*.tif":true,
28+
"**/*.tiff":true,
29+
"**/*.3ds":true,
30+
"**/*.3DS":true,
31+
"**/*.fbx":true,
32+
"**/*.FBX":true,
33+
"**/*.lxo":true,
34+
"**/*.LXO":true,
35+
"**/*.ma":true,
36+
"**/*.MA":true,
37+
"**/*.obj":true,
38+
"**/*.OBJ":true,
39+
"**/*.asset":true,
40+
"**/*.cubemap":true,
41+
"**/*.flare":true,
42+
"**/*.mat":true,
43+
"**/*.meta":true,
44+
"**/*.prefab":true,
45+
"**/*.unity":true,
46+
"build/":true,
47+
"Build/":true,
48+
"Library/":true,
49+
"library/":true,
50+
"obj/":true,
51+
"Obj/":true,
52+
"ProjectSettings/":true,
53+
"temp/":true,
54+
"Temp/":true
55+
}
56+
}

‎src/Assembly-CSharp.csproj‎

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<ProductVersion>10.0.20506</ProductVersion>
1010
<SchemaVersion>2.0</SchemaVersion>
1111
<RootNamespace></RootNamespace>
12-
<ProjectGuid>{75DBC057-9827-262E-8E14-D0D4DC821340}</ProjectGuid>
12+
<ProjectGuid>{4CFFDA30-0E63-039E-0DCA-DAC117CE2649}</ProjectGuid>
1313
<OutputType>Library</OutputType>
1414
<AppDesignerFolder>Properties</AppDesignerFolder>
1515
<AssemblyName>Assembly-CSharp</AssemblyName>
@@ -22,7 +22,7 @@
2222
<DebugType>full</DebugType>
2323
<Optimize>false</Optimize>
2424
<OutputPath>Temp\bin\Debug\</OutputPath>
25-
<DefineConstants>DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_2_0;UNITY_2017_2;UNITY_2017;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_PACKMAN;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;PLATFORM_WEBGL;UNITY_WEBGL;UNITY_WEBGL_API;UNITY_DISABLE_WEB_VERIFICATION;UNITY_GFX_USE_PLATFORM_VSYNC;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_VR;ENABLE_SPATIALTRACKING;ENABLE_IL2CPP;NET_2_0_SUBSET;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_OSX;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE</DefineConstants>
25+
<DefineConstants>DEBUG;TRACE;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_2_0;UNITY_2017_2;UNITY_2017;UNITY_ANALYTICS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_GENERICS;ENABLE_PVR_GI;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITERENDERER_FLIPPING;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_NATIVE_ARRAY;ENABLE_SPRITE_MASKING;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_PLAYMODE_TESTS_RUNNER;ENABLE_VIDEO;ENABLE_RMGUI;ENABLE_PACKMAN;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_STYLE_SHEETS;PLATFORM_WEBGL;UNITY_WEBGL;UNITY_WEBGL_API;UNITY_DISABLE_WEB_VERIFICATION;UNITY_GFX_USE_PLATFORM_VSYNC;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_VR;ENABLE_SPATIALTRACKING;ENABLE_IL2CPP;NET_2_0_SUBSET;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_NATIVE_ARRAY_CHECKS;UNITY_TEAM_LICENSE</DefineConstants>
2626
<ErrorReport>prompt</ErrorReport>
2727
<WarningLevel>4</WarningLevel>
2828
<NoWarn>0169</NoWarn>
@@ -44,13 +44,17 @@
4444
<Reference Include="System.Runtime.Serialization" />
4545
<Reference Include="System.Xml.Linq" />
4646
<Reference Include="UnityEngine">
47-
<HintPath>/Applications/Unity/Unity.app/Contents/Managed/UnityEngine.dll</HintPath>
47+
<HintPath>C:/Program Files/Unity2017/Editor/Data/Managed\UnityEngine.dll</HintPath>
4848
</Reference>
4949
<Reference Include="UnityEditor">
50-
<HintPath>/Applications/Unity/Unity.app/Contents/Managed/UnityEditor.dll</HintPath>
50+
<HintPath>C:/Program Files/Unity2017/Editor/Data/Managed/UnityEditor.dll</HintPath>
5151
</Reference>
5252
</ItemGroup>
5353
<ItemGroup>
54+
<Compile Include="Assets\SaveLoad\Scripts\GameHandler.cs" />
55+
<Compile Include="Assets\SaveLoad\Scripts\IUnit.cs" />
56+
<Compile Include="Assets\SaveLoad\Scripts\SaveSystem.cs" />
57+
<Compile Include="Assets\scenes\tempLog.cs" />
5458
<Compile Include="Assets\scripts\CreateNewBlock.cs" />
5559
<Compile Include="Assets\scripts\DisablePanel.cs" />
5660
<Compile Include="Assets\scripts\Draggable.cs" />
@@ -60,6 +64,7 @@
6064
<Compile Include="Assets\scripts\ExecuteThreadsLevel2.cs" />
6165
<Compile Include="Assets\scripts\ExecuteThreadsLevel3.cs" />
6266
<Compile Include="Assets\scripts\ExecuteThreadsLevel4.cs" />
67+
<Compile Include="Assets\scripts\GameLogData.cs" />
6368
<Compile Include="Assets\scripts\GenerateTasks.cs" />
6469
<Compile Include="Assets\scripts\Icons.cs" />
6570
<Compile Include="Assets\scripts\InitiateLevel2.cs" />
@@ -70,6 +75,8 @@
7075
<Compile Include="Assets\scripts\Level3InstructionsManager.cs" />
7176
<Compile Include="Assets\scripts\Level4InstructionsManager.cs" />
7277
<Compile Include="Assets\scripts\LevelsInstructionsManager.cs" />
78+
<Compile Include="Assets\scripts\LogData.cs" />
79+
<Compile Include="Assets\scripts\LogManager.cs" />
7380
<Compile Include="Assets\scripts\MainMenuManager.cs" />
7481
<Compile Include="Assets\scripts\ProgressBar.cs" />
7582
<Compile Include="Assets\scripts\ScenesManager.cs" />
@@ -78,38 +85,39 @@
7885
<Compile Include="Assets\scripts\Timer.cs" />
7986
<Compile Include="Assets\scripts\ToolBox.cs" />
8087
<Compile Include="Assets\scripts\ToolboxManager.cs" />
88+
<Compile Include="Assets\scripts\UITextTypeWriter.cs" />
8189
<Reference Include="UnityEngine.UI">
82-
<HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
90+
<HintPath>C:/Program Files/Unity2017/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
8391
</Reference>
8492
<Reference Include="UnityEngine.Networking">
85-
<HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll</HintPath>
93+
<HintPath>C:/Program Files/Unity2017/Editor/Data/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll</HintPath>
8694
</Reference>
8795
<Reference Include="UnityEngine.TestRunner">
88-
<HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/TestRunner/UnityEngine.TestRunner.dll</HintPath>
96+
<HintPath>C:/Program Files/Unity2017/Editor/Data/UnityExtensions/Unity/TestRunner/UnityEngine.TestRunner.dll</HintPath>
8997
</Reference>
9098
<Reference Include="nunit.framework">
91-
<HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/TestRunner/net35/unity-custom/nunit.framework.dll</HintPath>
99+
<HintPath>C:/Program Files/Unity2017/Editor/Data/UnityExtensions/Unity/TestRunner/net35/unity-custom/nunit.framework.dll</HintPath>
92100
</Reference>
93101
<Reference Include="UnityEngine.Timeline">
94-
<HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Timeline/RuntimeEditor/UnityEngine.Timeline.dll</HintPath>
102+
<HintPath>C:/Program Files/Unity2017/Editor/Data/UnityExtensions/Unity/Timeline/RuntimeEditor/UnityEngine.Timeline.dll</HintPath>
95103
</Reference>
96104
<Reference Include="UnityEngine.UIAutomation">
97-
<HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UIAutomation/UnityEngine.UIAutomation.dll</HintPath>
105+
<HintPath>C:/Program Files/Unity2017/Editor/Data/UnityExtensions/Unity/UIAutomation/UnityEngine.UIAutomation.dll</HintPath>
98106
</Reference>
99107
<Reference Include="UnityEngine.GoogleAudioSpatializer">
100-
<HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UnityGoogleAudioSpatializer/RuntimeEditor/UnityEngine.GoogleAudioSpatializer.dll</HintPath>
108+
<HintPath>C:/Program Files/Unity2017/Editor/Data/UnityExtensions/Unity/UnityGoogleAudioSpatializer/RuntimeEditor/UnityEngine.GoogleAudioSpatializer.dll</HintPath>
101109
</Reference>
102110
<Reference Include="UnityEngine.HoloLens">
103-
<HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UnityHoloLens/RuntimeEditor/UnityEngine.HoloLens.dll</HintPath>
111+
<HintPath>C:/Program Files/Unity2017/Editor/Data/UnityExtensions/Unity/UnityHoloLens/RuntimeEditor/UnityEngine.HoloLens.dll</HintPath>
104112
</Reference>
105113
<Reference Include="UnityEngine.SpatialTracking">
106-
<HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UnitySpatialTracking/RuntimeEditor/UnityEngine.SpatialTracking.dll</HintPath>
114+
<HintPath>C:/Program Files/Unity2017/Editor/Data/UnityExtensions/Unity/UnitySpatialTracking/RuntimeEditor/UnityEngine.SpatialTracking.dll</HintPath>
107115
</Reference>
108116
<Reference Include="UnityEngine.Analytics">
109-
<HintPath>/Users/luisarojas/Library/Unity/cache/packages/packages.unity.com/[email protected]/UnityEngine.Analytics.dll</HintPath>
117+
<HintPath>C:/Users/100603975/AppData/LocalLow/Unity/cache/packages/packages.unity.com/[email protected]/UnityEngine.Analytics.dll</HintPath>
110118
</Reference>
111119
<Reference Include="UnityEngine.Purchasing">
112-
<HintPath>/Users/luisarojas/Library/Unity/cache/packages/packages.unity.com/[email protected]/UnityEngine.Purchasing.dll</HintPath>
120+
<HintPath>C:/Users/100603975/AppData/LocalLow/Unity/cache/packages/packages.unity.com/[email protected]/UnityEngine.Purchasing.dll</HintPath>
113121
</Reference>
114122
</ItemGroup>
115123
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

‎src/Assets/SaveLoad.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)