2 scenes not connected

smz11006 · Oct 6, 2015 · 22f22e3 · 22f22e3
1 parent ef75701
commit 22f22e3
Show file tree

Hide file tree

Showing 34 changed files with 128 additions and 1 deletion.
diff --git a/Test_CYOA/Assembly-CSharp.csproj b/Test_CYOA/Assembly-CSharp.csproj
@@ -50,6 +50,7 @@
      <Compile Include="Assets\Scripts\HiddenRoom.cs" />
      <Compile Include="Assets\Scripts\LeftyRighty.cs" />
      <Compile Include="Assets\Scripts\Puzzle_231.cs" />
+     <Compile Include="Assets\Scripts\Scriptory.cs" />
      <Compile Include="Assets\Scripts\WorldUpdates.cs" />
  <Reference Include="UnityEngine.UI">
  <HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>

diff --git a/Test_CYOA/Assets/CYO_Layout.unity b/Test_CYOA/Assets/CYO_Layout.unity
diff --git a/Test_CYOA/Assets/CYO_Victory.unity b/Test_CYOA/Assets/CYO_Victory.unity
diff --git a/Test_CYOA/Assets/CYO_Victory.unity.meta b/Test_CYOA/Assets/CYO_Victory.unity.meta
diff --git a/Test_CYOA/Assets/Materials/CYO_Win.jpg b/Test_CYOA/Assets/Materials/CYO_Win.jpg
diff --git a/Test_CYOA/Assets/Materials/CYO_Win.jpg.meta b/Test_CYOA/Assets/Materials/CYO_Win.jpg.meta
diff --git a/Test_CYOA/Assets/Materials/Materials/CYO_Win.mat b/Test_CYOA/Assets/Materials/Materials/CYO_Win.mat
diff --git a/Test_CYOA/Assets/Materials/Materials/CYO_Win.mat.meta b/Test_CYOA/Assets/Materials/Materials/CYO_Win.mat.meta
diff --git a/Test_CYOA/Assets/Materials/black.mat b/Test_CYOA/Assets/Materials/black.mat
diff --git a/Test_CYOA/Assets/Materials/black.mat.meta b/Test_CYOA/Assets/Materials/black.mat.meta
diff --git a/Test_CYOA/Assets/Scripts/Scriptory.cs 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
diff --git a/Test_CYOA/Assets/Scripts/WorldUpdates.cs b/Test_CYOA/Assets/Scripts/WorldUpdates.cs
@@ -193,6 +193,17 @@ void Update()
 
             }
         }
+        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
diff --git a/Test_CYOA/Assets/WorldAssets/TreasureTube.prefab.meta b/Test_CYOA/Assets/WorldAssets/TreasureTube.prefab.meta
diff --git a/Test_CYOA/Library/CurrentLayout.dwlt b/Test_CYOA/Library/CurrentLayout.dwlt
diff --git a/Test_CYOA/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb b/Test_CYOA/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
diff --git a/Test_CYOA/Library/assetDatabase3 b/Test_CYOA/Library/assetDatabase3
diff --git a/Test_CYOA/Library/expandedItems b/Test_CYOA/Library/expandedItems
diff --git a/Test_CYOA/Library/metadata/00/00000000000000004000000000000000 b/Test_CYOA/Library/metadata/00/00000000000000004000000000000000
diff --git a/Test_CYOA/Library/metadata/1f/1f1cc475562ffd84598833b0ea55c570 b/Test_CYOA/Library/metadata/1f/1f1cc475562ffd84598833b0ea55c570
diff --git a/Test_CYOA/Library/metadata/1f/1f1cc475562ffd84598833b0ea55c570.info b/Test_CYOA/Library/metadata/1f/1f1cc475562ffd84598833b0ea55c570.info
diff --git a/Test_CYOA/Library/metadata/27/27508ec7269108042903d01046a2ea11 b/Test_CYOA/Library/metadata/27/27508ec7269108042903d01046a2ea11
diff --git a/Test_CYOA/Library/metadata/27/27508ec7269108042903d01046a2ea11.info b/Test_CYOA/Library/metadata/27/27508ec7269108042903d01046a2ea11.info
diff --git a/Test_CYOA/Library/metadata/31/31edcb54fa18bed48b8459f19445f3f8 b/Test_CYOA/Library/metadata/31/31edcb54fa18bed48b8459f19445f3f8
diff --git a/Test_CYOA/Library/metadata/31/31edcb54fa18bed48b8459f19445f3f8.info b/Test_CYOA/Library/metadata/31/31edcb54fa18bed48b8459f19445f3f8.info
diff --git a/Test_CYOA/Library/metadata/4c/4c174363ed7d9b643a75524470d5fdd9 b/Test_CYOA/Library/metadata/4c/4c174363ed7d9b643a75524470d5fdd9
diff --git a/Test_CYOA/Library/metadata/4c/4c174363ed7d9b643a75524470d5fdd9.info b/Test_CYOA/Library/metadata/4c/4c174363ed7d9b643a75524470d5fdd9.info
diff --git a/Test_CYOA/Library/metadata/a8/a885b24ab7d97474ea177ababeeaf25b b/Test_CYOA/Library/metadata/a8/a885b24ab7d97474ea177ababeeaf25b
diff --git a/Test_CYOA/Library/metadata/a8/a885b24ab7d97474ea177ababeeaf25b.info b/Test_CYOA/Library/metadata/a8/a885b24ab7d97474ea177ababeeaf25b.info
diff --git a/Test_CYOA/Library/metadata/d9/d928191460a3b3146888f7b669385d64 b/Test_CYOA/Library/metadata/d9/d928191460a3b3146888f7b669385d64
diff --git a/Test_CYOA/Library/metadata/db/db0ffecb5ce741044b3867376c7c72ac b/Test_CYOA/Library/metadata/db/db0ffecb5ce741044b3867376c7c72ac
diff --git a/Test_CYOA/Library/metadata/db/db0ffecb5ce741044b3867376c7c72ac.info b/Test_CYOA/Library/metadata/db/db0ffecb5ce741044b3867376c7c72ac.info
diff --git 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