diff --git a/Test_CYOA/Assembly-CSharp.csproj b/Test_CYOA/Assembly-CSharp.csproj index e6bae045..439a3dca 100644 --- a/Test_CYOA/Assembly-CSharp.csproj +++ b/Test_CYOA/Assembly-CSharp.csproj @@ -50,6 +50,7 @@ + C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll diff --git a/Test_CYOA/Assets/CYO_Layout.unity b/Test_CYOA/Assets/CYO_Layout.unity index ac224332..b7173685 100644 Binary files a/Test_CYOA/Assets/CYO_Layout.unity and b/Test_CYOA/Assets/CYO_Layout.unity differ diff --git a/Test_CYOA/Assets/CYO_Victory.unity b/Test_CYOA/Assets/CYO_Victory.unity new file mode 100644 index 00000000..fe35bb3e Binary files /dev/null and b/Test_CYOA/Assets/CYO_Victory.unity differ diff --git a/Test_CYOA/Assets/CYO_Victory.unity.meta b/Test_CYOA/Assets/CYO_Victory.unity.meta new file mode 100644 index 00000000..b3c3e562 --- /dev/null +++ b/Test_CYOA/Assets/CYO_Victory.unity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: db0ffecb5ce741044b3867376c7c72ac +timeCreated: 1444115891 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Test_CYOA/Assets/Materials/CYO_Win.jpg b/Test_CYOA/Assets/Materials/CYO_Win.jpg new file mode 100644 index 00000000..9346938c Binary files /dev/null and b/Test_CYOA/Assets/Materials/CYO_Win.jpg differ diff --git a/Test_CYOA/Assets/Materials/CYO_Win.jpg.meta b/Test_CYOA/Assets/Materials/CYO_Win.jpg.meta new file mode 100644 index 00000000..dbb1c5a7 --- /dev/null +++ b/Test_CYOA/Assets/Materials/CYO_Win.jpg.meta @@ -0,0 +1,56 @@ +fileFormatVersion: 2 +guid: 4c174363ed7d9b643a75524470d5fdd9 +timeCreated: 1444115715 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Test_CYOA/Assets/Materials/Materials/CYO_Win.mat b/Test_CYOA/Assets/Materials/Materials/CYO_Win.mat new file mode 100644 index 00000000..5ee72868 Binary files /dev/null and b/Test_CYOA/Assets/Materials/Materials/CYO_Win.mat differ diff --git a/Test_CYOA/Assets/Materials/Materials/CYO_Win.mat.meta b/Test_CYOA/Assets/Materials/Materials/CYO_Win.mat.meta new file mode 100644 index 00000000..22de3d8b --- /dev/null +++ b/Test_CYOA/Assets/Materials/Materials/CYO_Win.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 31edcb54fa18bed48b8459f19445f3f8 +timeCreated: 1444115721 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Test_CYOA/Assets/Materials/black.mat b/Test_CYOA/Assets/Materials/black.mat new file mode 100644 index 00000000..4cb007c3 Binary files /dev/null and b/Test_CYOA/Assets/Materials/black.mat differ diff --git a/Test_CYOA/Assets/Materials/black.mat.meta b/Test_CYOA/Assets/Materials/black.mat.meta new file mode 100644 index 00000000..7f6d3282 --- /dev/null +++ b/Test_CYOA/Assets/Materials/black.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a885b24ab7d97474ea177ababeeaf25b +timeCreated: 1444116216 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Test_CYOA/Assets/Scripts/Scriptory.cs b/Test_CYOA/Assets/Scripts/Scriptory.cs new file mode 100644 index 00000000..13487b61 --- /dev/null +++ b/Test_CYOA/Assets/Scripts/Scriptory.cs @@ -0,0 +1,15 @@ +using UnityEngine; +using System.Collections; + +public class Scriptory : MonoBehaviour { + + + // Update is called once per frame + void Update () + { + if (Input.GetKeyDown(KeyCode.Escape)) + { + + } + } +} diff --git a/Test_CYOA/Assets/Scripts/Scriptory.cs.meta b/Test_CYOA/Assets/Scripts/Scriptory.cs.meta new file mode 100644 index 00000000..a1e58b5b --- /dev/null +++ b/Test_CYOA/Assets/Scripts/Scriptory.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 27508ec7269108042903d01046a2ea11 +timeCreated: 1444116496 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Test_CYOA/Assets/Scripts/WorldUpdates.cs b/Test_CYOA/Assets/Scripts/WorldUpdates.cs index 5ca094d6..590fce70 100644 --- a/Test_CYOA/Assets/Scripts/WorldUpdates.cs +++ b/Test_CYOA/Assets/Scripts/WorldUpdates.cs @@ -193,6 +193,17 @@ public class WorldUpdates : MonoBehaviour } } + if (Physics.Raycast(ray, out hit)) + { + if (Input.GetKeyDown(KeyCode.Mouse0)) + { + if (hit.transform.name == "DestroyWall") + { + updateField = "maybe i can get past this?"; + } + + } + } //Floors - NOT working if (Physics.Raycast(ray, out hit)) { diff --git a/Test_CYOA/Assets/WorldAssets/TreasureTube.prefab b/Test_CYOA/Assets/WorldAssets/TreasureTube.prefab new file mode 100644 index 00000000..80c7ea6f Binary files /dev/null and b/Test_CYOA/Assets/WorldAssets/TreasureTube.prefab differ diff --git a/Test_CYOA/Assets/WorldAssets/TreasureTube.prefab.meta b/Test_CYOA/Assets/WorldAssets/TreasureTube.prefab.meta new file mode 100644 index 00000000..87140cad --- /dev/null +++ b/Test_CYOA/Assets/WorldAssets/TreasureTube.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1f1cc475562ffd84598833b0ea55c570 +timeCreated: 1444115747 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Test_CYOA/Library/CurrentLayout.dwlt b/Test_CYOA/Library/CurrentLayout.dwlt index e585360d..5ffe7fd1 100644 Binary files a/Test_CYOA/Library/CurrentLayout.dwlt and b/Test_CYOA/Library/CurrentLayout.dwlt differ diff --git a/Test_CYOA/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb b/Test_CYOA/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb index 3854aeff..d028e3cf 100644 Binary files a/Test_CYOA/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb and b/Test_CYOA/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb differ diff --git a/Test_CYOA/Library/assetDatabase3 b/Test_CYOA/Library/assetDatabase3 index 47ef41e7..bff3baf0 100644 Binary files a/Test_CYOA/Library/assetDatabase3 and b/Test_CYOA/Library/assetDatabase3 differ diff --git a/Test_CYOA/Library/expandedItems b/Test_CYOA/Library/expandedItems index f6e758c8..8e44f0dd 100644 Binary files a/Test_CYOA/Library/expandedItems and b/Test_CYOA/Library/expandedItems differ diff --git a/Test_CYOA/Library/metadata/00/00000000000000004000000000000000 b/Test_CYOA/Library/metadata/00/00000000000000004000000000000000 index cff37029..0a3a7c12 100644 Binary files a/Test_CYOA/Library/metadata/00/00000000000000004000000000000000 and b/Test_CYOA/Library/metadata/00/00000000000000004000000000000000 differ diff --git a/Test_CYOA/Library/metadata/1f/1f1cc475562ffd84598833b0ea55c570 b/Test_CYOA/Library/metadata/1f/1f1cc475562ffd84598833b0ea55c570 new file mode 100644 index 00000000..8b276c3e Binary files /dev/null and b/Test_CYOA/Library/metadata/1f/1f1cc475562ffd84598833b0ea55c570 differ diff --git a/Test_CYOA/Library/metadata/1f/1f1cc475562ffd84598833b0ea55c570.info b/Test_CYOA/Library/metadata/1f/1f1cc475562ffd84598833b0ea55c570.info new file mode 100644 index 00000000..54a31bd0 Binary files /dev/null and b/Test_CYOA/Library/metadata/1f/1f1cc475562ffd84598833b0ea55c570.info differ diff --git a/Test_CYOA/Library/metadata/27/27508ec7269108042903d01046a2ea11 b/Test_CYOA/Library/metadata/27/27508ec7269108042903d01046a2ea11 new file mode 100644 index 00000000..4813f8db Binary files /dev/null and b/Test_CYOA/Library/metadata/27/27508ec7269108042903d01046a2ea11 differ diff --git a/Test_CYOA/Library/metadata/27/27508ec7269108042903d01046a2ea11.info b/Test_CYOA/Library/metadata/27/27508ec7269108042903d01046a2ea11.info new file mode 100644 index 00000000..0aadeb6f Binary files /dev/null and b/Test_CYOA/Library/metadata/27/27508ec7269108042903d01046a2ea11.info differ diff --git a/Test_CYOA/Library/metadata/31/31edcb54fa18bed48b8459f19445f3f8 b/Test_CYOA/Library/metadata/31/31edcb54fa18bed48b8459f19445f3f8 new file mode 100644 index 00000000..28378af0 Binary files /dev/null and b/Test_CYOA/Library/metadata/31/31edcb54fa18bed48b8459f19445f3f8 differ diff --git a/Test_CYOA/Library/metadata/31/31edcb54fa18bed48b8459f19445f3f8.info b/Test_CYOA/Library/metadata/31/31edcb54fa18bed48b8459f19445f3f8.info new file mode 100644 index 00000000..e0a90dd5 Binary files /dev/null and b/Test_CYOA/Library/metadata/31/31edcb54fa18bed48b8459f19445f3f8.info differ diff --git a/Test_CYOA/Library/metadata/4c/4c174363ed7d9b643a75524470d5fdd9 b/Test_CYOA/Library/metadata/4c/4c174363ed7d9b643a75524470d5fdd9 new file mode 100644 index 00000000..90cd7d43 Binary files /dev/null and b/Test_CYOA/Library/metadata/4c/4c174363ed7d9b643a75524470d5fdd9 differ diff --git a/Test_CYOA/Library/metadata/4c/4c174363ed7d9b643a75524470d5fdd9.info b/Test_CYOA/Library/metadata/4c/4c174363ed7d9b643a75524470d5fdd9.info new file mode 100644 index 00000000..5e6402be Binary files /dev/null and b/Test_CYOA/Library/metadata/4c/4c174363ed7d9b643a75524470d5fdd9.info differ diff --git a/Test_CYOA/Library/metadata/a8/a885b24ab7d97474ea177ababeeaf25b b/Test_CYOA/Library/metadata/a8/a885b24ab7d97474ea177ababeeaf25b new file mode 100644 index 00000000..46682cd1 Binary files /dev/null and b/Test_CYOA/Library/metadata/a8/a885b24ab7d97474ea177ababeeaf25b differ diff --git a/Test_CYOA/Library/metadata/a8/a885b24ab7d97474ea177ababeeaf25b.info b/Test_CYOA/Library/metadata/a8/a885b24ab7d97474ea177ababeeaf25b.info new file mode 100644 index 00000000..db9b088b Binary files /dev/null and b/Test_CYOA/Library/metadata/a8/a885b24ab7d97474ea177ababeeaf25b.info differ diff --git a/Test_CYOA/Library/metadata/d9/d928191460a3b3146888f7b669385d64 b/Test_CYOA/Library/metadata/d9/d928191460a3b3146888f7b669385d64 index bf2de17a..1243e95f 100644 Binary files a/Test_CYOA/Library/metadata/d9/d928191460a3b3146888f7b669385d64 and b/Test_CYOA/Library/metadata/d9/d928191460a3b3146888f7b669385d64 differ diff --git a/Test_CYOA/Library/metadata/db/db0ffecb5ce741044b3867376c7c72ac b/Test_CYOA/Library/metadata/db/db0ffecb5ce741044b3867376c7c72ac new file mode 100644 index 00000000..aa432085 Binary files /dev/null and b/Test_CYOA/Library/metadata/db/db0ffecb5ce741044b3867376c7c72ac differ diff --git a/Test_CYOA/Library/metadata/db/db0ffecb5ce741044b3867376c7c72ac.info b/Test_CYOA/Library/metadata/db/db0ffecb5ce741044b3867376c7c72ac.info new file mode 100644 index 00000000..bcaef377 Binary files /dev/null and b/Test_CYOA/Library/metadata/db/db0ffecb5ce741044b3867376c7c72ac.info differ diff --git a/Test_CYOA/Test_CYOA.sln b/Test_CYOA/Test_CYOA.sln index dc43121e..124ccece 100644 --- a/Test_CYOA/Test_CYOA.sln +++ b/Test_CYOA/Test_CYOA.sln @@ -17,7 +17,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(MonoDevelopProperties) = preSolution + GlobalSection(MonoDevelopProperties) = preSolution StartupItem = Assembly-CSharp.csproj Policies = $0 $0.TextStylePolicy = $1