move lang into streaming assets

callistoAshley · Nov 2, 2021 · 57c57ed · 57c57ed
1 parent ef30262
commit 57c57ed
Show file tree

Hide file tree

Showing 44 changed files with 13 additions and 12 deletions.
diff --git a/.vs/space!!!!/v16/.suo b/.vs/space!!!!/v16/.suo
diff --git a/Assets/StreamingAssets.meta b/Assets/StreamingAssets.meta
diff --git a/Assets/lang.meta → Assets/StreamingAssets/lang.meta b/Assets/lang.meta → Assets/StreamingAssets/lang.meta
diff --git a/Assets/lang/en.meta → Assets/StreamingAssets/lang/en.meta b/Assets/lang/en.meta → Assets/StreamingAssets/lang/en.meta
diff --git a/Assets/lang/en/debug.meta → Assets/StreamingAssets/lang/en/debug.meta b/Assets/lang/en/debug.meta → Assets/StreamingAssets/lang/en/debug.meta
diff --git a/Assets/lang/en/debug/test.alisonscript → ...ingAssets/lang/en/debug/test.alisonscript b/Assets/lang/en/debug/test.alisonscript → ...ingAssets/lang/en/debug/test.alisonscript
diff --git a/Assets/lang/en/debug/test.alisonscript.meta → ...sets/lang/en/debug/test.alisonscript.meta b/Assets/lang/en/debug/test.alisonscript.meta → ...sets/lang/en/debug/test.alisonscript.meta
diff --git a/Assets/lang/en/debug/test2.alisonscript → ...ngAssets/lang/en/debug/test2.alisonscript b/Assets/lang/en/debug/test2.alisonscript → ...ngAssets/lang/en/debug/test2.alisonscript
diff --git a/Assets/lang/en/debug/test2.alisonscript.meta → ...ets/lang/en/debug/test2.alisonscript.meta b/Assets/lang/en/debug/test2.alisonscript.meta → ...ets/lang/en/debug/test2.alisonscript.meta
diff --git a/Assets/lang/en/debug/test3.alisonscript → ...ngAssets/lang/en/debug/test3.alisonscript b/Assets/lang/en/debug/test3.alisonscript → ...ngAssets/lang/en/debug/test3.alisonscript
diff --git a/Assets/lang/en/debug/test3.alisonscript.meta → ...ets/lang/en/debug/test3.alisonscript.meta b/Assets/lang/en/debug/test3.alisonscript.meta → ...ets/lang/en/debug/test3.alisonscript.meta
diff --git a/Assets/lang/en/debug/test4.alisonscript → ...ngAssets/lang/en/debug/test4.alisonscript b/Assets/lang/en/debug/test4.alisonscript → ...ngAssets/lang/en/debug/test4.alisonscript
diff --git a/Assets/lang/en/debug/test4.alisonscript.meta → ...ets/lang/en/debug/test4.alisonscript.meta b/Assets/lang/en/debug/test4.alisonscript.meta → ...ets/lang/en/debug/test4.alisonscript.meta
diff --git a/...s/lang/en/debug/test_bigtext.alisonscript → ...s/lang/en/debug/test_bigtext.alisonscript b/...s/lang/en/debug/test_bigtext.alisonscript → ...s/lang/en/debug/test_bigtext.alisonscript
diff --git a/...g/en/debug/test_bigtext.alisonscript.meta → ...g/en/debug/test_bigtext.alisonscript.meta b/...g/en/debug/test_bigtext.alisonscript.meta → ...g/en/debug/test_bigtext.alisonscript.meta
diff --git a/...ts/lang/en/debug/test_choice.alisonscript → ...ts/lang/en/debug/test_choice.alisonscript b/...ts/lang/en/debug/test_choice.alisonscript → ...ts/lang/en/debug/test_choice.alisonscript
diff --git a/...ng/en/debug/test_choice.alisonscript.meta → ...ng/en/debug/test_choice.alisonscript.meta b/...ng/en/debug/test_choice.alisonscript.meta → ...ng/en/debug/test_choice.alisonscript.meta
diff --git a/...lang/en/debug/test_condition.alisonscript → ...lang/en/debug/test_condition.alisonscript b/...lang/en/debug/test_condition.alisonscript → ...lang/en/debug/test_condition.alisonscript
diff --git a/...en/debug/test_condition.alisonscript.meta → ...en/debug/test_condition.alisonscript.meta b/...en/debug/test_condition.alisonscript.meta → ...en/debug/test_condition.alisonscript.meta
diff --git a/Assets/alisonscript/Functions.cs b/Assets/alisonscript/Functions.cs
@@ -59,7 +59,7 @@ public IEnumerator Log(FunctionArgs args)
             foreach (string s in args.args) 
                 Debug.Log(s);
             args.callback.Invoke();
-            
+
             yield break;
         }
 

diff --git a/Assets/alisonscript/Interpreter.cs b/Assets/alisonscript/Interpreter.cs
@@ -62,7 +62,7 @@ public static void Run(string script)
             Controller.instance.canMove = false;
 
             // read lines of file
-            string[] file = File.ReadAllLines(Application.dataPath + "/lang/en/" + script + ".alisonscript");
+            string[] file = File.ReadAllLines(Application.streamingAssetsPath + "/lang/en/" + script + ".alisonscript");
 
             // create running script
             runningScript = new RunningScript(Line.FromStringArray(file));

diff --git a/Assets/scripts/UI.cs b/Assets/scripts/UI.cs
@@ -122,19 +122,12 @@ public virtual IEnumerator PrintText(
                 {
                     inputProcessedCallback = new Action(() =>
                     {
-                        Debug.Log("invoking thingimajig " + text);
                         callback.Invoke();
                     });
                 }
 
                 //Debug.Log("enqueing " + text);
                 UIManager.instance.inputQueue.Push(this);
-
-                Debug.Log("ok so!");
-                foreach (UI ui in UIManager.instance.inputQueue)
-                {
-                    Debug.Log(ui.text.text);
-                }
             }
         }
 

diff --git a/Library/EditorInstance.json b/Library/EditorInstance.json
@@ -1,5 +1,5 @@
 {
-	"process_id" : 11388,
+	"process_id" : 6608,
 	"version" : "2019.2.8f1",
 	"app_path" : "C:/Program Files/Unity/Hub/Editor/2019.2.8f1/Editor/Unity.exe",
 	"app_contents_path" : "C:/Program Files/Unity/Hub/Editor/2019.2.8f1/Editor/Data"

diff --git a/Library/ScriptAssemblies/Assembly-CSharp.dll b/Library/ScriptAssemblies/Assembly-CSharp.dll
diff --git a/Library/ScriptAssemblies/Assembly-CSharp.pdb b/Library/ScriptAssemblies/Assembly-CSharp.pdb
diff --git a/Library/StateCache/Hierarchy/3a1511-mainStage.json b/Library/StateCache/Hierarchy/3a1511-mainStage.json
@@ -1 +1 @@
-{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[-17144,-17100,-16856,-16820,-16816,-14684,-14640,-14396,-14360,-14356,-14120,-14076,-13832,-13796,-13792,-12862,-12818,-12570,-12530,-12522,-11012,-10998,-9654,-9408,-8786,-6868,-6504,-6118,-3970,-2324,-2310,-1174,-12],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
+{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[-1174],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
diff --git a/Library/StateCache/SceneView/e4d1cd-mainStage.json b/Library/StateCache/SceneView/e4d1cd-mainStage.json
@@ -1 +1 @@
-{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":0.48868799209594729,"y":-0.7446132898330689,"z":-1311.155029296875},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":13.45053482055664,"orthographic":true}
+{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":-5.923569202423096,"y":1.7080830335617066,"z":-1553.3385009765625},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":20.606281280517579,"orthographic":true}
diff --git a/Library/assetDatabase3 b/Library/assetDatabase3
diff --git a/Library/metadata/03/034275478b274924fad89f2574a7a211 b/Library/metadata/03/034275478b274924fad89f2574a7a211
diff --git a/Library/metadata/1a/1aebe45c36ed3d949928e2649732f557 b/Library/metadata/1a/1aebe45c36ed3d949928e2649732f557
diff --git a/Library/metadata/1d/1d5c944e563dc3642854acfdc19283e7 b/Library/metadata/1d/1d5c944e563dc3642854acfdc19283e7
diff --git a/Library/metadata/1d/1d5c944e563dc3642854acfdc19283e7.info b/Library/metadata/1d/1d5c944e563dc3642854acfdc19283e7.info
diff --git a/Library/metadata/2b/2b9ac2402d2297d49b2bcbaf82571537 b/Library/metadata/2b/2b9ac2402d2297d49b2bcbaf82571537
diff --git a/Library/metadata/2b/2b9ac2402d2297d49b2bcbaf82571537.info b/Library/metadata/2b/2b9ac2402d2297d49b2bcbaf82571537.info
diff --git a/Library/metadata/69/69eba865caa17f34b8433d7256a07e7e b/Library/metadata/69/69eba865caa17f34b8433d7256a07e7e
diff --git a/Library/metadata/7b/7b41853a1c4586d4080475bebfa90026 b/Library/metadata/7b/7b41853a1c4586d4080475bebfa90026
diff --git a/Library/metadata/8a/8a55aa5b50727ce4b9e7087e56be839b b/Library/metadata/8a/8a55aa5b50727ce4b9e7087e56be839b
diff --git a/Library/metadata/8f/8f82fed108bf7ea4c8a76a48be634bd6 b/Library/metadata/8f/8f82fed108bf7ea4c8a76a48be634bd6
diff --git a/Library/metadata/a3/a30e12859aaa822439f4df596718f931 b/Library/metadata/a3/a30e12859aaa822439f4df596718f931
diff --git a/Library/metadata/b5/b5ddd9e2159436c45862e53b3254ee08 b/Library/metadata/b5/b5ddd9e2159436c45862e53b3254ee08
diff --git a/Library/metadata/c9/c9a3a7de369692443a281ab60353c828 b/Library/metadata/c9/c9a3a7de369692443a281ab60353c828
diff --git a/Library/metadata/d1/d1ed48e316fa5e440830c947b6978a81 b/Library/metadata/d1/d1ed48e316fa5e440830c947b6978a81
diff --git a/Library/metadata/d6/d60d803793d0744499906b87c773caab b/Library/metadata/d6/d60d803793d0744499906b87c773caab
diff --git a/Library/metadata/e4/e4d823a7941686f49b93a2608f662950 b/Library/metadata/e4/e4d823a7941686f49b93a2608f662950
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[-17144,-17100,-16856,-16820,-16816,-14684,-14640,-14396,-14360,-14356,-14120,-14076,-13832,-13796,-13792,-12862,-12818,-12570,-12530,-12522,-11012,-10998,-9654,-9408,-8786,-6868,-6504,-6118,-3970,-2324,-2310,-1174,-12],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
		{"m_ExpandedPrefabGameObjectFileIDs":[],"m_ExpandedSceneGameObjectInstanceIDs":[-1174],"m_ScrollY":0.0,"m_LastClickedFileID":0,"m_LastClickedInstanceID":0}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":0.48868799209594729,"y":-0.7446132898330689,"z":-1311.155029296875},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":13.45053482055664,"orthographic":true}
		{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":true,"pivot":{"x":-5.923569202423096,"y":1.7080830335617066,"z":-1553.3385009765625},"rotation":{"x":0.0,"y":0.0,"z":0.0,"w":1.0},"size":20.606281280517579,"orthographic":true}