diff --git a/Assets/AddressableAssetsData/link.xml b/Assets/AddressableAssetsData/link.xml
new file mode 100644
index 000000000..66763552e
--- /dev/null
+++ b/Assets/AddressableAssetsData/link.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Assets/StreamingAssets/EN/mp4/high/op_movie.webm.meta b/Assets/AddressableAssetsData/link.xml.meta
similarity index 62%
rename from Assets/StreamingAssets/EN/mp4/high/op_movie.webm.meta
rename to Assets/AddressableAssetsData/link.xml.meta
index 6a575982d..1675230ee 100644
--- a/Assets/StreamingAssets/EN/mp4/high/op_movie.webm.meta
+++ b/Assets/AddressableAssetsData/link.xml.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
-guid: 830ec29c9956ca44b921523d0895f6e0
-DefaultImporter:
+guid: 09a4f8f2257f5ca41b3db81895d9f313
+TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
diff --git a/Assets/Scripts/Assembly-CSharp/EffectManager.cs b/Assets/Scripts/Assembly-CSharp/EffectManager.cs
index d0ac8917e..f93505d53 100644
--- a/Assets/Scripts/Assembly-CSharp/EffectManager.cs
+++ b/Assets/Scripts/Assembly-CSharp/EffectManager.cs
@@ -1,6 +1,7 @@
using System;
using System.Collections;
using UnityEngine;
+using Assets.Scripts;
// Token: 0x0200013F RID: 319
public class EffectManager : MonoBehaviour
@@ -253,8 +254,30 @@ public class EffectManager : MonoBehaviour
// Token: 0x060008E4 RID: 2276 RVA: 0x0002728C File Offset: 0x0002548C
private static IEnumerator loadTexture()
{
- string path = Pathing.BaseContentPath.TrimEnd('/') + Pathing.ToPlatformAssetBundleName(EffectManager.Instance.EffectName);
- byte[] data = System.IO.File.ReadAllBytes(path + ".png");
+ string path = HelperFunctions.CreateFilePath(Pathing.ToPlatformAssetBundleName(EffectManager.Instance.EffectName) + ".png");
+ Debug.LogWarning("EFFECT" + path);
+ /*string path = Pathing.BaseContentPath.TrimEnd('/') + Pathing.ToPlatformAssetBundleName(EffectManager.Instance.EffectName) + ".png";
+ if (!System.IO.File.Exists(path))
+ {
+ path = Application.streamingAssetsPath + "/JP" + Pathing.ToPlatformAssetBundleName(EffectManager.Instance.EffectName) + ".png";
+ }*/
+ byte[] data;
+
+ if (Application.platform == RuntimePlatform.Android)
+ {
+ WWW reader = new WWW(path);
+ while (!reader.isDone)
+ {
+ }
+ data = reader.bytes;
+
+ }
+ else
+ {
+ data = System.IO.File.ReadAllBytes(path);
+ }
+
+ //byte[] data = System.IO.File.ReadAllBytes(path + ".png");
Texture2D tex = new Texture2D(0, 0, TextureFormat.RGBA32, false, true);
tex.LoadImage(data);
tex.wrapMode = TextureWrapMode.Clamp;
diff --git a/Assets/Scripts/Assembly-CSharp/MobileMovieTexture.cs b/Assets/Scripts/Assembly-CSharp/MobileMovieTexture.cs
index 2c7aafd99..82a6326ab 100644
--- a/Assets/Scripts/Assembly-CSharp/MobileMovieTexture.cs
+++ b/Assets/Scripts/Assembly-CSharp/MobileMovieTexture.cs
@@ -196,8 +196,15 @@ public class MobileMovieTexture : MonoBehaviour
long num2;
if (platform != RuntimePlatform.Android)
{
- path = Pathing.BaseContentPath + this.m_path;
- num = 0L;
+ /*path = path = Pathing.BaseContentPath + this.m_path;
+ if (!System.IO.File.Exists(path))
+ {
+ path = Application.streamingAssetsPath + "/JP" + this.m_path;
+ }*/
+ path = HelperFunctions.CreateFilePath(this.m_path).TrimStart('/');
+ Debug.LogWarning(path);
+
+ num = 0L;
num2 = 0L;
}
else
diff --git a/Assets/Scripts/Assembly-CSharp/MovieManager.cs b/Assets/Scripts/Assembly-CSharp/MovieManager.cs
index 99555837a..26fece376 100644
--- a/Assets/Scripts/Assembly-CSharp/MovieManager.cs
+++ b/Assets/Scripts/Assembly-CSharp/MovieManager.cs
@@ -41,9 +41,16 @@ public static class MovieManager
VideoPlayer m_tex = movieFrame.obj.transform.gameObject.AddComponent();
m_tex.playOnAwake = true;
- Material newMat = new Material(Shader.Find("QO/Sprite") as Shader);
- m_tex.url = Pathing.BaseContentPath + path + ".webm";
- m_tex.isLooping = false;
+ Material newMat = new Material(Shader.Find("QO/Sprite") as Shader);
+ //Material newMat = new Material(Shader.Find("Unlit/Texture") as Shader);
+ /*string url = Pathing.BaseContentPath + path + ".webm";
+ if (!System.IO.File.Exists(url))
+ {
+ url = Application.streamingAssetsPath + "/JP/" + path + ".webm";
+ }
+ m_tex.url = url;*/
+ m_tex.url = HelperFunctions.CreateFilePath("/" + path + ".webm").TrimStart('/');
+ m_tex.isLooping = false;
movieFrame.SetMaterial(newMat, 960, 544);
m_tex.renderMode = UnityEngine.Video.VideoRenderMode.MaterialOverride;
diff --git a/Assets/Scripts/Assembly-CSharp/MovieTex.cs b/Assets/Scripts/Assembly-CSharp/MovieTex.cs
index 9857fc3c4..0378f6539 100644
--- a/Assets/Scripts/Assembly-CSharp/MovieTex.cs
+++ b/Assets/Scripts/Assembly-CSharp/MovieTex.cs
@@ -43,8 +43,14 @@ public class MovieTex : MonoBehaviour
this.m_tex = base.gameObject.AddComponent();
this.m_tex.playOnAwake = false;
Material newMat = new Material(Shader.Find("QO/Sprite") as Shader);
- //this.m_tex.m_path = path + ".mp4";
- this.m_tex.url = "file:///" + Pathing.BaseContentPath + path + ".webm";
+ //this.m_tex.m_path = path + ".mp4";
+ /*string url = Pathing.BaseContentPath + path + ".webm";
+ if (!System.IO.File.Exists(url))
+ {
+ url = Application.streamingAssetsPath + "/JP" + path + ".webm";
+ }
+ this.m_tex.url = "file:///" + url;*/
+ this.m_tex.url = HelperFunctions.CreateFilePath(path + ".webm").TrimStart('/');
this.m_tex.isLooping = isLoop;
this.m_tex.renderMode = UnityEngine.Video.VideoRenderMode.MaterialOverride;
//this.m_tex.targetMaterialRenderer = newMat;
diff --git a/Assets/Scripts/Assembly-CSharp/NameInputKeyboard.cs b/Assets/Scripts/Assembly-CSharp/NameInputKeyboard.cs
index 3740bdc50..1c867eb07 100644
--- a/Assets/Scripts/Assembly-CSharp/NameInputKeyboard.cs
+++ b/Assets/Scripts/Assembly-CSharp/NameInputKeyboard.cs
@@ -102,6 +102,7 @@ public class NameInputKeyboard : MonoBehaviour
{
NameInputKeyboard.Instance.m_inputText = ScreenKeyboardManager.InputText;
NameInputKeyboard.Instance.m_inputTextLastName = ScreenKeyboardManager.InputTextLastName;
+ ScreenKeyboardManager.Close();
}
yield break;
}
diff --git a/Assets/Scripts/Assembly-CSharp/Qoo/Game/KsExec.cs b/Assets/Scripts/Assembly-CSharp/Qoo/Game/KsExec.cs
index 7ecb18f38..5512c810e 100644
--- a/Assets/Scripts/Assembly-CSharp/Qoo/Game/KsExec.cs
+++ b/Assets/Scripts/Assembly-CSharp/Qoo/Game/KsExec.cs
@@ -106,8 +106,10 @@ namespace Qoo.Game
{
if (KsExec.confirmResult)
{
- GameData.SetParamString("firstname", string.Empty, KsExec.editName);
- GameData.SetParamString("familyname", string.Empty, KsExec.editLastName);
+ GameData.SetParamString("firstname", NameInputKeyboard.InputText, KsExec.editName);
+ GameData.SetParamString("familyname", NameInputKeyboard.InputTextLastName, KsExec.editLastName);
+ //GameData.SetParamString("firstname", string.Empty, KsExec.editName);
+ //GameData.SetParamString("familyname", string.Empty, KsExec.editLastName);
NameInputKeyboard.Close();
return true;
}
diff --git a/Assets/Scripts/Assembly-CSharp/ScreenKeyboardManager.cs b/Assets/Scripts/Assembly-CSharp/ScreenKeyboardManager.cs
index 8c71262c3..f93fc294f 100644
--- a/Assets/Scripts/Assembly-CSharp/ScreenKeyboardManager.cs
+++ b/Assets/Scripts/Assembly-CSharp/ScreenKeyboardManager.cs
@@ -25,8 +25,35 @@ public class ScreenKeyboardManager : MonoBehaviour
ScreenKeyboardManager.m_instance = gameObject.AddComponent();
gameObject.AddComponent();
gameObject.AddComponent();
- ScreenKeyboardManager.m_instance.m_inputText = string.Empty;
- ScreenKeyboardManager.m_instance.m_inputTextLastName = string.Empty;
+ string firstName = "アリス";
+ string lastName = "リデル";
+ switch (UnityApp.Instance.locale)
+ {
+ case Assets.Scripts.LocaleEnum.English:
+ firstName = "Alice";
+ lastName = "Liddell";
+ break;
+ case Assets.Scripts.LocaleEnum.Spanish:
+ firstName = "Alice";
+ lastName = "Liddell";
+ break;
+ default:
+ firstName = "アリス";
+ lastName = "リデル";
+ break;
+ }
+ if (ScreenKeyboardManager.m_instance.m_inputText != null)
+ {
+ firstName = ScreenKeyboardManager.m_instance.m_inputText;
+ }
+ if (ScreenKeyboardManager.m_instance.m_inputTextLastName != null)
+ {
+ firstName = ScreenKeyboardManager.m_instance.m_inputTextLastName;
+ }
+ ScreenKeyboardManager.m_instance.m_inputText = firstName;
+ ScreenKeyboardManager.m_instance.m_inputTextLastName = lastName;
+ //ScreenKeyboardManager.m_instance.m_inputText = string.Empty;
+ //ScreenKeyboardManager.m_instance.m_inputTextLastName = string.Empty;
ScreenKeyboardManager.m_instance.isKeyboardActive = true;
}
return ScreenKeyboardManager.m_instance;
@@ -98,29 +125,19 @@ public class ScreenKeyboardManager : MonoBehaviour
canvas.renderMode = RenderMode.ScreenSpaceOverlay;
InputField _inputFieldFirstName = createInputBox(canvas, "FirstName", defaultString, "Input First Name", new Vector3(-250, 50, 0));
+ _inputFieldFirstName.text = defaultString;
InputField _inputFieldLastName = createInputBox(canvas, "LastName", defaultString2, "Input Last Name", new Vector3(0, 50, 0));
+ _inputFieldLastName.text = defaultString2;
+
+ string firstNameString = _inputFieldFirstName.text;
+ string lastNameString = _inputFieldLastName.text;
createEqualsBox(canvas, "Equals", new Vector3(-125, 50, 0));
createButton(canvas, "SubmitButton", new Vector3(-125, -35, 0));
- string firstNameString = _inputFieldFirstName.text;
- string lastNameString = _inputFieldLastName.text;
+ yield return new WaitUntil(() => !ScreenKeyboardManager.m_instance.isKeyboardActive);
- while (ScreenKeyboardManager.m_instance.isKeyboardActive)
- {
- yield return 0;
- /*if (Input.GetKeyDown(KeyCode.Return))
- {
- firstNameString = _inputFieldFirstName.text;
- lastNameString = _inputFieldLastName.text;
- ScreenKeyboardManager.Instance.m_inputText = firstNameString;
- ScreenKeyboardManager.Instance.m_inputTextLastName = lastNameString;
- GameObject.Destroy(canvas.gameObject);
- isKeyboardActive = false;
-
- }*/
- }
- yield break;
+ yield break;
}
public static InputField createInputBox(Canvas canvas, string objectName, string defaultString, string placeholderString, Vector3 position)
@@ -157,11 +174,12 @@ public class ScreenKeyboardManager : MonoBehaviour
_text.horizontalOverflow = HorizontalWrapMode.Overflow;
_text.alignment = TextAnchor.MiddleCenter;
- GameObject placeholderContainer = new GameObject();
+ GameObject placeholderContainer = new GameObject();
placeholderContainer.name = "Placeholder";
placeholderContainer.transform.parent = container.transform;
Text _placeholder = placeholderContainer.AddComponent();
RectTransform _placeholderTransform = _placeholder.GetComponent();
+ placeholderContainer.transform.localScale = new Vector3(1, 1, 1);
_placeholderTransform.sizeDelta = new Vector2(width, height);
_placeholder.color = fontColor;
_placeholder.font = font;
@@ -204,7 +222,7 @@ public class ScreenKeyboardManager : MonoBehaviour
_image.type = Image.Type.Sliced;
_image.color = inputBoxColor;
Button _button = container.AddComponent