Merged in Tweaks (pull request #8)

Linux and Android support
pull/5/head
Arneth Myndraavn 3 years ago
commit b49239402c

1
.gitignore vendored

@ -17,6 +17,7 @@ sysinfo.txt
/[Aa]ssets/AssetBundles/*
/[Aa]ssets/StreamingAssets/*
/[Aa]ssets/Resources/mp3
/[Ss]ave/*
#Unity Meta Files
*.meta

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 MiB

After

Width:  |  Height:  |  Size: 2.3 MiB

@ -104,7 +104,7 @@ NavMeshSettings:
serializedVersion: 2
m_ObjectHideFlags: 0
m_BuildSettings:
serializedVersion: 2
serializedVersion: 3
agentTypeID: 0
agentRadius: 0.5
agentHeight: 2
@ -117,7 +117,7 @@ NavMeshSettings:
cellSize: 0.16666666
manualTileSize: 0
tileSize: 256
accuratePlacement: 0
buildHeightMesh: 0
maxJobWorkers: 0
preserveTilesOutsideBounds: 0
debug:
@ -130,7 +130,7 @@ LightingSettings:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Settings.lighting
serializedVersion: 4
serializedVersion: 6
m_GIWorkflowMode: 1
m_EnableBakedLightmaps: 1
m_EnableRealtimeLightmaps: 0
@ -139,7 +139,7 @@ LightingSettings:
m_AlbedoBoost: 1
m_IndirectOutputScale: 1
m_UsingShadowmask: 0
m_BakeBackend: 0
m_BakeBackend: 1
m_LightmapMaxSize: 1024
m_BakeResolution: 50
m_Padding: 2
@ -170,7 +170,7 @@ LightingSettings:
m_LightProbeSampleCountMultiplier: 4
m_PVRBounces: 2
m_PVRMinBounces: 2
m_PVREnvironmentMIS: 0
m_PVREnvironmentImportanceSampling: 0
m_PVRFilteringMode: 0
m_PVRDenoiserTypeDirect: 0
m_PVRDenoiserTypeIndirect: 0
@ -185,6 +185,8 @@ LightingSettings:
m_PVRFilteringAtrousPositionSigmaIndirect: 2
m_PVRFilteringAtrousPositionSigmaAO: 1
m_PVRTiledBaking: 0
m_NumRaysToShootPerTexel: -1
m_RespectSceneVisibilityWhenBakingGI: 0
--- !u!1 &501161484
GameObject:
m_ObjectHideFlags: 0
@ -218,6 +220,7 @@ MonoBehaviour:
InitScene: SceneLogoMovie
InitDebugScene: SceneLogoMovie
isJapanese: 0
preferredFontSize: 28
--- !u!4 &501161486
Transform:
m_ObjectHideFlags: 0

@ -105,7 +105,7 @@ NavMeshSettings:
serializedVersion: 2
m_ObjectHideFlags: 0
m_BuildSettings:
serializedVersion: 2
serializedVersion: 3
agentTypeID: 0
agentRadius: 0.5
agentHeight: 2
@ -118,7 +118,7 @@ NavMeshSettings:
cellSize: 0.16666666
manualTileSize: 0
tileSize: 256
accuratePlacement: 0
buildHeightMesh: 0
maxJobWorkers: 0
preserveTilesOutsideBounds: 0
debug:

@ -1,10 +1,8 @@
using System;
using System.Collections.Generic;
using Qoo;
using Qoo.Application;
using Qoo.Application;
using Qoo.Input;
using Qoo.Message;
using Qoo.SoundSystem;
using System.Collections.Generic;
using UnityEngine;
// Token: 0x020000A9 RID: 169
@ -56,7 +54,16 @@ public class CBackLogWnd : UserBaseClass
unityTextSprite.z = 1301;
unityTextSprite.SetColor(new Color32(byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue));
unityTextSprite.SetTextColor(new Color32(byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue));
unityTextSprite.AddText("♪", 28);
if (!UnityApp.PlatformApp.isJapanese)
{
UnityEngine.Debug.LogWarning(UnityApp.PlatformApp.preferredFontSize);
unityTextSprite.AddText("♪", UnityApp.PlatformApp.preferredFontSize);
}
else
{
unityTextSprite.AddText("♪", 28);
}
unityTextSprite.Show = false;
}
this.InitLog();
@ -382,8 +389,18 @@ public class CBackLogWnd : UserBaseClass
unityTextSprite.SetTextColor(new Color32(byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue));
unityTextSprite2.SetTextColor(new Color32(byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue));
}
unityTextSprite.AddText(linedata.pszTxt, 28);
unityTextSprite2.AddText("♪", 28);
if (!UnityApp.PlatformApp.isJapanese)
{
UnityEngine.Debug.LogWarning(UnityApp.PlatformApp.preferredFontSize);
unityTextSprite.AddText(linedata.pszTxt, UnityApp.PlatformApp.preferredFontSize);
unityTextSprite2.AddText("♪", UnityApp.PlatformApp.preferredFontSize);
}
else
{
unityTextSprite.AddText(linedata.pszTxt, 28);
unityTextSprite2.AddText("♪", 28);
}
if (linedata.nType == CBackLogWnd.LINETYPE.LINETYPE_MES)
{
unityTextSprite.x = 204;

@ -1,9 +1,8 @@
using System;
using Qoo.Def;
using Qoo.Game;
using System.Collections.Generic;
using System.Text;
using System.Text.RegularExpressions;
using Qoo;
using Qoo.Def;
using Qoo.Game;
using UnityEngine;
// Token: 0x020000B2 RID: 178
@ -25,7 +24,7 @@ public class CMessageText
this.m_Clip.SetSize(0, 0);
this.m_nChNum = 0;
this.m_nClipWEx = 0;
this.m_isAutoRet = false;
this.m_isAutoRet = true;
this.m_anDefCol = new Color32(byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue);
this.m_anKeyCol = new Color32(byte.MaxValue, 192, 0, byte.MaxValue);
this.m_KeyCursor.BgColor = new Color32(0, 0, 0, 0);
@ -33,7 +32,8 @@ public class CMessageText
this.SpCode.AddRange(MsgDef.SP_CODES);
this.LineCode.AddRange(MsgDef.LINETOP_CODES);
this.m_isKerning = IsKerning;
}
}
// Token: 0x170000BD RID: 189
// (get) Token: 0x0600052C RID: 1324 RVA: 0x00013D1C File Offset: 0x00011F1C
@ -175,6 +175,49 @@ public class CMessageText
// Token: 0x06000533 RID: 1331 RVA: 0x00014174 File Offset: 0x00012374
public void AddMessage(string szMsg, Color32 color, MSGFONTSIZE nFontType = MSGFONTSIZE.NORMAL, int nKeywordNo = -1)
{
int testWidth = 0;
if (!UnityApp.PlatformApp.isJapanese)
{
for (int i = 0; i < szMsg.Length; i++)
{
//Force diacritics to closest letter with no accent mark
if (Regex.IsMatch(szMsg[i].ToString(), "[À-ž]"))
{
szMsg = szMsg.Remove(i, 1).Insert(i, szMsg[i].ToString().Normalize(NormalizationForm.FormC).Normalize(NormalizationForm.FormD));
}
//Auto line breaker based on character widths
BMGlyph glyph = this.font.Font.GetGlyph((int)szMsg[i], true);
if (glyph != null)
{
testWidth += glyph.width;
}
else
{
break;
}
if (szMsg[i] == '\n')
{
testWidth = 0;
}
if (testWidth > 960)
{
for (int j = i; j >= 0; j--)
{
if (szMsg[j] == ' ')
{
szMsg = szMsg.Remove(j, 1).Insert(j, "\n");
i = j;
testWidth = 0;
break;
}
}
}
}
}
foreach (char c in szMsg)
{
char c2 = '\0';
@ -484,7 +527,7 @@ public class CMessageText
{
this.AddChar('-', color, nFontType, true, nKeywordNo);
}
return false;
return false;
}
if (this.m_CurPos.nX >= this.m_ChNum.nCx)
{
@ -526,7 +569,7 @@ public class CMessageText
if (CMessageText.IsHyphenation)
{
CharObject lastChrInfo = this.GetLastChrInfo(this.m_CurPos.nY);
return Regex.IsMatch(lastChrInfo.code.ToString(), "^[a-zA-Z0-9]+$") && Regex.IsMatch(chCode.ToString(), "^[a-zA-Z0-9]+$");
return Regex.IsMatch(lastChrInfo.code.ToString(), "^[a-zA-Z0-9]+$") && Regex.IsMatch(chCode.ToString(), "^[a-zA-Z0-9]+$");
}
return false;
}
@ -659,7 +702,7 @@ public class CMessageText
// Token: 0x06000550 RID: 1360 RVA: 0x00014FF8 File Offset: 0x000131F8
private CharObject GetLastChrInfo(int y)
{
for (int i = this.m_ChNum.nCx - 1; i >= 0; i--)
for (int i = this.m_ChNum.nCx - 1; i >= 0; i--)
{
CharObject chrInfo = this.GetChrInfo(i, y);
if (chrInfo != null && chrInfo.code != '\0')

@ -66,7 +66,7 @@ public class CSVCGList
// Token: 0x06000A2D RID: 2605 RVA: 0x0002D5DC File Offset: 0x0002B7DC
public void Update()
{
this.read = SysData.IsReadCG(this.fpath);
this.read = SysData.IsReadCG(this.fpath);
}
// Token: 0x04000851 RID: 2129

@ -24,8 +24,9 @@ public class CSVSceneMemory
// Token: 0x06000A61 RID: 2657 RVA: 0x0002E01C File Offset: 0x0002C21C
public void Update()
{
//Set to True for 100% Scene Unlock
bool flag = SysData.IsRead(this.triggerKs, (this.triggerLabel.Length != 0) ? this.triggerLabel.Substring(1) : string.Empty, 0);
this.collectCount = ((!flag) ? 0 : 1);
this.collectCount = ((!flag) ? 0 : 1);
}
// Token: 0x04000864 RID: 2148

@ -145,8 +145,9 @@ public class GalleryInputNameDialogWindow : BaseWindow
if (line == 0)
{
string galleryInputNameDialog_Name = UIValue.GalleryInputNameDialog_Name;
string paramString = GameData.GetParamString("familyname", string.Empty);
return string.Format("Is {0} {1} correct?", galleryInputNameDialog_Name, paramString);
string galleryInputNameDialog_LastName = UIValue.GalleryInputNameDialog_LastName;
//string paramString = GameData.GetParamString("familyname", string.Empty);
return string.Format("Is {0} {1} correct?", galleryInputNameDialog_Name, galleryInputNameDialog_LastName);
}
if (line != 1)
{

@ -1,4 +1,5 @@
using System;
using Qoo.Game;
using System;
using System.Collections;
using UnityEngine;
@ -15,7 +16,8 @@ public class GalleryInputNameKeyboardWindow : BaseWindow
public IEnumerator Run()
{
string initvalue = UIValue.GalleryInputNameDialog_Name;
yield return NameInputKeyboard.Open(initvalue, false);
string initvalue2 = UIValue.GalleryInputNameDialog_LastName;
yield return NameInputKeyboard.Open(initvalue, initvalue2, false);
/*switch (Application.platform)
{
case RuntimePlatform.IPhonePlayer:
@ -26,7 +28,8 @@ public class GalleryInputNameKeyboardWindow : BaseWindow
//NameInputKeyboard.DebugInputText = initvalue;
IL_82:
UIValue.GalleryInputNameDialog_Name = NameInputKeyboard.InputText;
UIValue.GalleryInputNameDialog_Exit = GalleryInputNameDialogExitType.INPUT;
UIValue.GalleryInputNameDialog_LastName = NameInputKeyboard.InputTextLastName;
UIValue.GalleryInputNameDialog_Exit = GalleryInputNameDialogExitType.INPUT;
base.DeleteLastAddScene();
NameInputKeyboard.Close();
yield break;

@ -12,7 +12,8 @@ public class GalleryInputNameWindow : BaseWindow
{
UIValue.GalleryInputNameDialog_Exit = GalleryInputNameDialogExitType.INVALID;
UIValue.GalleryInputNameDialog_Name = GameData.GetParamString("firstname", string.Empty);
this.edit = true;
UIValue.GalleryInputNameDialog_LastName = GameData.GetParamString("familyname", string.Empty);
this.edit = true;
this.wait = 0f;
}
@ -79,16 +80,17 @@ public class GalleryInputNameWindow : BaseWindow
case GalleryInputNameDialogExitType.INPUT:
{
UIValue.GalleryInputNameDialog_Exit = GalleryInputNameDialogExitType.INVALID;
string galleryInputNameDialog_Name = UIValue.GalleryInputNameDialog_Name;
if (galleryInputNameDialog_Name.Length == 0 || this.checkSpaceOnly(galleryInputNameDialog_Name))
string galleryInputNameDialog_Name = UIValue.GalleryInputNameDialog_Name;
string galleryInputNameDialog_LastName = UIValue.GalleryInputNameDialog_LastName;
if (galleryInputNameDialog_Name.Length == 0 || this.checkSpaceOnly(galleryInputNameDialog_Name) || galleryInputNameDialog_LastName.Length == 0 || this.checkSpaceOnly(galleryInputNameDialog_LastName))
{
UIValue.GalleryInputNameDialog_Type = GalleryInputNameDialogType.EMPTY;
}
else if (galleryInputNameDialog_Name.Length > 7)
else if (galleryInputNameDialog_Name.Length > 7 || galleryInputNameDialog_LastName.Length > 7)
{
UIValue.GalleryInputNameDialog_Type = GalleryInputNameDialogType.OVER;
}
else if (!this.checkValidString(galleryInputNameDialog_Name))
else if (!this.checkValidString(galleryInputNameDialog_Name) || !this.checkValidString(galleryInputNameDialog_LastName))
{
UIValue.GalleryInputNameDialog_Type = GalleryInputNameDialogType.INVALIDCHAR;
}
@ -102,6 +104,7 @@ public class GalleryInputNameWindow : BaseWindow
case GalleryInputNameDialogExitType.YES:
UIValue.GalleryInputNameDialog_Exit = GalleryInputNameDialogExitType.INVALID;
GameData.SetParamString("firstname", string.Empty, UIValue.GalleryInputNameDialog_Name);
GameData.SetParamString("familyname", string.Empty, UIValue.GalleryInputNameDialog_LastName);
SceneManager.BackScene();
break;
case GalleryInputNameDialogExitType.NO:

@ -40,7 +40,7 @@ public class GalleryMovieWindow : BaseWindow
{
//TODO fix movie playing. either make platform specific versions OR make platform agnostic
//yield return base.StartCoroutine(MovieManager.PlayMovie("mp4/high/op_movie.mp4", FullScreenMovieControlMode.CancelOnInput));
yield return base.StartCoroutine(MovieManager.PlayMovie("mp4/high/op_movie.mp4", this.gameObject));
yield return base.StartCoroutine(MovieManager.PlayMovie("mp4/high/op_movie.webm", this.gameObject));
this.state = GalleryMovieWindow.STATE.END;
yield break;
}

@ -32,12 +32,20 @@ namespace Game
msgwnd_STYLE_DATA.posFrm = new Point3(0, 181, 800);
msgwnd_STYLE_DATA.posName[0] = new Point3(86, 170, 803);
msgwnd_STYLE_DATA.posName[1] = new Point3(126, 170, 802);
msgwnd_STYLE_DATA.posTxt = new Point3(109, 198, 801);
msgwnd_STYLE_DATA.posFace = new Point3(0, 173, 803);
if (!UnityApp.PlatformApp.isJapanese)
{
msgwnd_STYLE_DATA.posTxt = new Point3(104, 198, 801);
msgwnd_STYLE_DATA.sizeTxt = new Size(704, 136);
}
else
{
msgwnd_STYLE_DATA.posTxt = new Point3(109, 198, 801);
msgwnd_STYLE_DATA.sizeTxt = new Size(654, 136);
}
msgwnd_STYLE_DATA.posFace = new Point3(0, 173, 803);
msgwnd_STYLE_DATA.posBrk = new Point3(459, 252, 802);
msgwnd_STYLE_DATA.sizeBrkSplit = new Size(32, 1);
msgwnd_STYLE_DATA.nBrkWait = 4;
msgwnd_STYLE_DATA.sizeTxt = new Size(654, 136);
msgwnd_STYLE_DATA.nTxtWEx = 58;
msgwnd_STYLE_DATA.bTxtAutoRet = true;
msgwnd_STYLE_DATA.colTxt = new Color32(byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue);

@ -34,7 +34,7 @@ public class LogoMovieWindow : BaseWindow
{
//TODO fix movie playing. either make platform specific versions OR make platform agnostic
//yield return base.StartCoroutine(MovieManager.PlayMovie("mp4/normal/quinrose_logo_8.mp4", FullScreenMovieControlMode.CancelOnInput));
yield return base.StartCoroutine(MovieManager.PlayMovie("mp4/normal/quinrose_logo_8.mp4", this.gameObject));
yield return base.StartCoroutine(MovieManager.PlayMovie("mp4/normal/quinrose_logo_8.webm", this.gameObject));
this.state = LogoMovieWindow.STATE.END;
yield break;
}

@ -4,7 +4,7 @@
public class MovieDef
{
// Token: 0x04000550 RID: 1360
public const string MOVIE_EXT = ".mp4";
public const string MOVIE_EXT = ".webm";
// Token: 0x04000551 RID: 1361
public const string EFFECT_MOVIE_EXT = ".ogv";

@ -42,7 +42,7 @@ public static class MovieManager
VideoPlayer m_tex = movieFrame.obj.transform.gameObject.AddComponent<VideoPlayer>();
m_tex.playOnAwake = true;
Material newMat = new Material(Shader.Find("QO/Sprite") as Shader);
m_tex.url = Application.streamingAssetsPath + "/" + path + ".mp4";
m_tex.url = Application.streamingAssetsPath + "/" + path + ".webm";
m_tex.isLooping = false;
movieFrame.SetMaterial(newMat, 960, 544);
m_tex.renderMode = UnityEngine.Video.VideoRenderMode.MaterialOverride;

@ -46,7 +46,7 @@ public class MovieTex : MonoBehaviour
/*this.m_tex.url = "file:///" + Application.streamingAssetsPath + "/" + path;
this.m_tex.isLooping = isLoop;*/
//this.m_tex.m_path = path + ".mp4";
this.m_tex.url = "file:///" + Application.streamingAssetsPath + "/" + path + ".mp4";
this.m_tex.url = "file:///" + Application.streamingAssetsPath + "/" + path + ".webm";
this.m_tex.isLooping = isLoop;
this.m_tex.renderMode = UnityEngine.Video.VideoRenderMode.MaterialOverride;
//this.m_tex.targetMaterialRenderer = newMat;

@ -20,7 +20,8 @@ public class NameInputKeyboard : MonoBehaviour
}
NameInputKeyboard.m_instance = gameObject.AddComponent<NameInputKeyboard>();
NameInputKeyboard.m_instance.m_inputText = string.Empty;
}
NameInputKeyboard.m_instance.m_inputTextLastName = string.Empty;
}
return NameInputKeyboard.m_instance;
}
}
@ -45,33 +46,57 @@ public class NameInputKeyboard : MonoBehaviour
}
}
// Token: 0x0600060E RID: 1550 RVA: 0x00019310 File Offset: 0x00017510
public static IEnumerator Open(string defaultString = "", bool isUnitySubTask = false)
// Token: 0x170000D4 RID: 212
// (get) Token: 0x0600060C RID: 1548 RVA: 0x000192F4 File Offset: 0x000174F4
public static string InputTextLastName
{
get
{
return NameInputKeyboard.Instance.m_inputTextLastName;
}
}
// Token: 0x170000D5 RID: 213
// (set) Token: 0x0600060D RID: 1549 RVA: 0x00019300 File Offset: 0x00017500
public static string DebugInputTextLastName
{
set
{
NameInputKeyboard.Instance.m_inputTextLastName = value;
}
}
// Token: 0x0600060E RID: 1550 RVA: 0x00019310 File Offset: 0x00017510
public static IEnumerator Open(string defaultString = "", string defaultString2 = "", bool isUnitySubTask = false)
{
if (isUnitySubTask)
{
yield return NameInputKeyboard.Instance.StartCoroutine(ScreenKeyboardManager.Open(defaultString));
//Debug.LogWarning("Name" + defaultString + " = " + defaultString2);
yield return NameInputKeyboard.Instance.StartCoroutine(ScreenKeyboardManager.Open(defaultString, defaultString2));
}
else
{
yield return ScreenKeyboardManager.Open(defaultString);
yield return ScreenKeyboardManager.Open(defaultString, defaultString2);
}
if (ScreenKeyboardManager.IsCancel)
{
if (UnityApp.Instance.isJapanese)
{
NameInputKeyboard.Instance.m_inputText = "アリス";
}
NameInputKeyboard.Instance.m_inputTextLastName = "リデル";
}
else
{
NameInputKeyboard.Instance.m_inputText = "Alice";
}
NameInputKeyboard.Instance.m_inputTextLastName = "Liddell";
}
}
else
{
NameInputKeyboard.Instance.m_inputText = ScreenKeyboardManager.InputText;
}
NameInputKeyboard.Instance.m_inputTextLastName = ScreenKeyboardManager.InputTextLastName;
}
yield break;
}
@ -90,4 +115,6 @@ public class NameInputKeyboard : MonoBehaviour
// Token: 0x040005A8 RID: 1448
private string m_inputText;
private string m_inputTextLastName;
}

@ -22,7 +22,17 @@ public static class Pathing
get
{
string path = Application.streamingAssetsPath.TrimStart('/');
return "file://localhost/" + path;
if(Application.platform == RuntimePlatform.Android)
{
string url = path;
//UnityEngine.Debug.LogWarning(url);
return url;
}
else
{
return "file://localhost/" + path;
}
}
}

@ -11,8 +11,13 @@ namespace Qoo.Def
return FontDef.FontInfo[(int)eSize];
}
// Token: 0x040004D7 RID: 1239
public const bool KERNING_MODE = true;
public static void SetFontInfo(FONTINFO[] newFontInfo)
{
FontDef.FontInfo = newFontInfo;
}
// Token: 0x040004D7 RID: 1239
public const bool KERNING_MODE = true;
// Token: 0x040004D8 RID: 1240
public const int FONT_SMALL_FONT = 22;

@ -324,7 +324,7 @@ namespace Qoo.Game
// Token: 0x0600009B RID: 155 RVA: 0x00004340 File Offset: 0x00002540
public static void StartVoiceCheck()
{
GameData.SetParamInt("voicecheck", string.Empty, 1);
GameData.SetParamInt("voicecheck", string.Empty, 0);
}
// Token: 0x0600009C RID: 156 RVA: 0x00004354 File Offset: 0x00002554
@ -342,7 +342,7 @@ namespace Qoo.Game
// Token: 0x0600009E RID: 158 RVA: 0x00004388 File Offset: 0x00002588
public static bool IsFullVoiceCheck()
{
return GameData.GetParamInt("voicecheck", string.Empty) > 1;
return GameData.GetParamInt("voicecheck", string.Empty) > 0;
}
// Token: 0x0600009F RID: 159 RVA: 0x000043A8 File Offset: 0x000025A8
@ -428,13 +428,24 @@ namespace Qoo.Game
}
// Token: 0x060000A9 RID: 169 RVA: 0x000044D8 File Offset: 0x000026D8
public static void SetFirstName(string name)
public static void SetLastName(string name)
{
GameData.SetParamString("firstname", string.Empty, name);
GameData.SetParamString("familyname", string.Empty, name);
}
// Token: 0x060000AA RID: 170 RVA: 0x000044EC File Offset: 0x000026EC
public static byte[] Save()
public static string GetLastName()
{
return GameData.GetParamString("familyname", string.Empty);
}
// Token: 0x060000A9 RID: 169 RVA: 0x000044D8 File Offset: 0x000026D8
public static void SetFirstName(string name)
{
GameData.SetParamString("firstname", string.Empty, name);
}
// Token: 0x060000AA RID: 170 RVA: 0x000044EC File Offset: 0x000026EC
public static byte[] Save()
{
if (!GameData.m_isLoadData)
{
@ -473,7 +484,8 @@ namespace Qoo.Game
GameParam gameParam = new GameParam();
gameParam.Copy(GameData.LockParam);
gameParam.Set("firstname", GameData.GetFirstName());
return gameParam;
gameParam.Set("familyname", GameData.GetLastName());
return gameParam;
}
// Token: 0x060000AF RID: 175 RVA: 0x000045AC File Offset: 0x000027AC

@ -85,20 +85,24 @@ namespace Qoo.Game
if (UnityApp.Instance.isJapanese)
{
KsExec.editName = "アリス";
}
KsExec.editLastName = "リデル";
}
else
{
KsExec.editName = "Alice";
}
KsExec.editLastName = "Liddell";
}
NameInputKeyboard.DebugInputText = KsExec.editName;
KsExec.KeyboardMain();
NameInputKeyboard.DebugInputTextLastName = KsExec.editLastName;
KsExec.KeyboardMain();
}
else if (KsExec.confirm)
{
if (KsExec.confirmResult)
{
GameData.SetParamString("firstname", string.Empty, KsExec.editName);
NameInputKeyboard.Close();
GameData.SetParamString("familyname", string.Empty, KsExec.editLastName);
NameInputKeyboard.Close();
return true;
}
KsExec.KeyboardMain();
@ -108,7 +112,8 @@ namespace Qoo.Game
else
{
KsExec.editName = NameInputKeyboard.InputText;
if (KsExec.editName.Length == 0 || KsExec.checkSpaceOnly(KsExec.editName))
KsExec.editLastName = NameInputKeyboard.InputTextLastName;
if (KsExec.editName.Length == 0 || KsExec.checkSpaceOnly(KsExec.editName))
{
UnityTask.SetSubNoUnityTask(MessageDlg.ExecDlg("No name entered", null));
KsExec.KeyboardMain();
@ -126,9 +131,10 @@ namespace Qoo.Game
else
{
string arg = KsExec.editName;
string paramString = GameData.GetParamString("familyname", string.Empty);
string arg2 = KsExec.editLastName;
string paramString = GameData.GetParamString("familyname", string.Empty);
string[] msgs;
if (UnityApp.Instance.isJapanese)
/*if (UnityApp.Instance.isJapanese)
{
msgs = new string[]
{
@ -143,8 +149,25 @@ namespace Qoo.Game
string.Format("Is {0} {1} correct?", arg, paramString)
};
}
UnityTask.SetSubNoUnityTask(MessageDlg.ExecDlg(msgs, new Action<bool>(KsExec.SetResult)));
}*/
if (UnityApp.Instance.isJapanese)
{
msgs = new string[]
{
string.Format("「{0}{1}」です。", arg, arg2),
"よろしいですか?"
};
}
else
{
msgs = new string[]
{
string.Format("Is {0} {1} correct?", arg, arg2)
};
}
UnityTask.SetSubNoUnityTask(MessageDlg.ExecDlg(msgs, new Action<bool>(KsExec.SetResult)));
KsExec.confirm = true;
KsExec.confirmResult = false;
}
@ -168,7 +191,7 @@ namespace Qoo.Game
// Token: 0x06000614 RID: 1556 RVA: 0x00019604 File Offset: 0x00017804
private static void KeyboardMain()
{
UnityTask.SetSubTask(NameInputKeyboard.Open(KsExec.editName, true));
UnityTask.SetSubTask(NameInputKeyboard.Open(KsExec.editName, KsExec.editLastName, true));
/*switch (UnityEngine.Application.platform)
{
case RuntimePlatform.IPhonePlayer:
@ -259,5 +282,7 @@ namespace Qoo.Game
// Token: 0x040005AB RID: 1451
private static string editName = string.Empty;
}
private static string editLastName = string.Empty;
}
}

@ -66,7 +66,7 @@ namespace Qoo.Game
{
SysData.InitCg();
SysData.InitBgm();
return SysData.m_Param.Init();
return SysData.m_Param.Init();
}
// Token: 0x06000119 RID: 281 RVA: 0x00005EBC File Offset: 0x000040BC
@ -281,7 +281,7 @@ namespace Qoo.Game
// Token: 0x0600013B RID: 315 RVA: 0x00006170 File Offset: 0x00004370
public static bool IsReadCG(string name)
{
return SysData.m_LookCg.IsLook(FileId.Normalize(name));
return SysData.m_LookCg.IsLook(FileId.Normalize(name));
}
// Token: 0x0600013C RID: 316 RVA: 0x00006184 File Offset: 0x00004384
@ -297,6 +297,7 @@ namespace Qoo.Game
}
// Token: 0x0600013E RID: 318 RVA: 0x000061A4 File Offset: 0x000043A4
//Will 100% all CGs if called
public static void SetReadCGAll()
{
SysData.m_LookCg.SetAll(true);

@ -1,7 +1,9 @@

using System;
using System.Collections;
using UnityEditor;
using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.UI;
// Token: 0x02000174 RID: 372
@ -21,8 +23,12 @@ public class ScreenKeyboardManager : MonoBehaviour
gameObject = new GameObject("_ScreenKeyboardManager");
}
ScreenKeyboardManager.m_instance = gameObject.AddComponent<ScreenKeyboardManager>();
gameObject.AddComponent<EventSystem>();
gameObject.AddComponent<StandaloneInputModule>();
ScreenKeyboardManager.m_instance.m_inputText = string.Empty;
}
ScreenKeyboardManager.m_instance.m_inputTextLastName = string.Empty;
ScreenKeyboardManager.m_instance.isKeyboardActive = true;
}
return ScreenKeyboardManager.m_instance;
}
}
@ -47,9 +53,29 @@ public class ScreenKeyboardManager : MonoBehaviour
}
}
// Token: 0x1700015D RID: 349
// (get) Token: 0x06000A96 RID: 2710 RVA: 0x0002EAB4 File Offset: 0x0002CCB4
public static bool IsCancel
// Token: 0x1700015B RID: 347
// (get) Token: 0x06000A94 RID: 2708 RVA: 0x0002EA98 File Offset: 0x0002CC98
public static string InputTextLastName
{
get
{
return ScreenKeyboardManager.Instance.m_inputTextLastName;
}
}
// Token: 0x1700015C RID: 348
// (set) Token: 0x06000A95 RID: 2709 RVA: 0x0002EAA4 File Offset: 0x0002CCA4
public static string DebugInputTextLastName
{
set
{
ScreenKeyboardManager.Instance.m_inputTextLastName = value;
}
}
// Token: 0x1700015D RID: 349
// (get) Token: 0x06000A96 RID: 2710 RVA: 0x0002EAB4 File Offset: 0x0002CCB4
public static bool IsCancel
{
get
{
@ -59,108 +85,191 @@ public class ScreenKeyboardManager : MonoBehaviour
}
// Token: 0x06000A97 RID: 2711 RVA: 0x0002EAC8 File Offset: 0x0002CCC8
public static IEnumerator Open(string defaultString = "")
public static IEnumerator Open(string defaultString = "", string defaultString2 = "")
{
bool isKeyboardActive = true;
int width = 350;
int height = 50;
int fontSize = 24;
Color fontColor = Color.white;
Color inputBoxColor = new Color(87f/255f,48f / 255f, 55f / 255f, 255f / 255f);
GameObject manager= ScreenKeyboardManager.Instance.gameObject;
//ScreenKeyboardManager.m_instance.isKeyboardActive = true;
//Debug.LogWarning("Name: " + defaultString + " = " + defaultString2);
GameObject manager = ScreenKeyboardManager.Instance.gameObject;
Canvas canvas = manager.AddComponent<Canvas>();
canvas.gameObject.AddComponent<CanvasScaler>();
CanvasScaler scaler = canvas.gameObject.AddComponent<CanvasScaler>();
scaler.uiScaleMode = CanvasScaler.ScaleMode.ScaleWithScreenSize;
canvas.gameObject.AddComponent<GraphicRaycaster>();
canvas.renderMode = RenderMode.ScreenSpaceOverlay;
GameObject container = new GameObject();
container.name = "InputField";
container.transform.parent = canvas.transform;
container.AddComponent<CanvasRenderer>();
Image _image = container.AddComponent<Image>();
//_image.sprite = UnityEditor.AssetDatabase.GetBuiltinExtraResource<Sprite>("UI/Skin/UISprite.psd");
_image.type = Image.Type.Sliced;
_image.color = inputBoxColor;
Font font = (Font)Resources.Load("font/Cabin");
GameObject textContainer = new GameObject();
textContainer.name = "Text";
textContainer.transform.parent = container.transform;
Text _text = textContainer.AddComponent<Text>();
RectTransform _textTransform = _text.GetComponent<RectTransform>();
_textTransform.sizeDelta = new Vector2(width, height);
_text.supportRichText = false;
_text.color = fontColor;
_text.font = font;
_text.fontSize = fontSize;
_text.horizontalOverflow = HorizontalWrapMode.Overflow;
_text.alignment = TextAnchor.MiddleCenter;
GameObject placeholderContainer = new GameObject();
placeholderContainer.name = "Placeholder";
placeholderContainer.transform.parent = container.transform;
Text _placeholder = placeholderContainer.AddComponent<Text>();
RectTransform _placeholderTransform = _placeholder.GetComponent<RectTransform>();
_placeholderTransform.sizeDelta = new Vector2(width, height);
_placeholder.color = fontColor;
_placeholder.font = font;
_placeholder.fontSize = fontSize;
_placeholder.fontStyle = FontStyle.Italic;
_placeholder.supportRichText = false;
_placeholder.horizontalOverflow = HorizontalWrapMode.Overflow;
_placeholder.text = "Enter your Name";
_placeholder.alignment = TextAnchor.MiddleCenter;
InputField _inputField = container.AddComponent<InputField>();
_inputField.targetGraphic = _image;
_inputField.textComponent = _text;
_inputField.placeholder = _placeholder;
RectTransform _inputFieldTransform = _inputField.GetComponent<RectTransform>();
_inputFieldTransform.localPosition = new Vector3(0, 0, 0);
_inputFieldTransform.sizeDelta = new Vector2(width, height);
_inputField.characterLimit = 7;
_inputField.characterValidation = InputField.CharacterValidation.Name;
_inputField.text = defaultString;
string nameString = _inputField.text;
while (isKeyboardActive)
InputField _inputFieldFirstName = createInputBox(canvas, "FirstName", defaultString, "Input First Name", new Vector3(-250, 50, 0));
InputField _inputFieldLastName = createInputBox(canvas, "LastName", defaultString2, "Input Last Name", new Vector3(0, 50, 0));
createEqualsBox(canvas, "Equals", new Vector3(-125, 50, 0));
createButton(canvas, "SubmitButton", new Vector3(-125, -35, 0));
string firstNameString = _inputFieldFirstName.text;
string lastNameString = _inputFieldLastName.text;
while (ScreenKeyboardManager.m_instance.isKeyboardActive)
{
yield return 0;
if (Input.GetKeyDown(KeyCode.Return))
{
nameString = _inputField.text;
ScreenKeyboardManager.Instance.m_inputText = nameString;
GameObject.Destroy(canvas.gameObject);
/*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;
}
}*/
}
//TODO fix TouchScreenKeyboard issue
/*ScreenKeyboardManager.Instance.m_inputText = defaultString;
ScreenKeyboardManager.Instance.m_keyboard = TouchScreenKeyboard.Open(defaultString, TouchScreenKeyboardType.NamePhonePad);
while (!ScreenKeyboardManager.Instance.m_keyboard.active)
{
yield return 0;
}
while (ScreenKeyboardManager.Instance.m_keyboard.active)
{
yield return 0;
}
if (ScreenKeyboardManager.Instance.m_keyboard.done)
{
ScreenKeyboardManager.Instance.m_inputText = ScreenKeyboardManager.Instance.m_keyboard.text;
}*/
yield break;
}
// Token: 0x06000A98 RID: 2712 RVA: 0x0002EAEC File Offset: 0x0002CCEC
public static void Close()
public static InputField createInputBox(Canvas canvas, string objectName, string defaultString, string placeholderString, Vector3 position)
{
int width = 200;
int height = 50;
int fontSize = 24;
Color fontColor = Color.white;
Color inputBoxColor = new Color(87f / 255f, 48f / 255f, 55f / 255f, 255f / 255f);
GameObject container = new GameObject();
container.name = objectName;
container.transform.parent = canvas.transform;
container.AddComponent<CanvasRenderer>();
Image _image = container.AddComponent<Image>();
//_image.sprite = UnityEditor.AssetDatabase.GetBuiltinExtraResource<Sprite>("UI/Skin/UISprite.psd");
_image.type = Image.Type.Sliced;
_image.color = inputBoxColor;
Font font = (Font)Resources.Load("font/Cabin");
GameObject textContainer = new GameObject();
textContainer.name = "Text";
textContainer.transform.parent = container.transform;
container.transform.localScale = new Vector3(1, 1, 1);
Text _text = textContainer.AddComponent<Text>();
RectTransform _textTransform = _text.GetComponent<RectTransform>();
_textTransform.sizeDelta = new Vector2(width, height);
_text.supportRichText = false;
_text.color = fontColor;
_text.font = font;
_text.fontSize = fontSize;
_text.horizontalOverflow = HorizontalWrapMode.Overflow;
_text.alignment = TextAnchor.MiddleCenter;
GameObject placeholderContainer = new GameObject();
placeholderContainer.name = "Placeholder";
placeholderContainer.transform.parent = container.transform;
Text _placeholder = placeholderContainer.AddComponent<Text>();
RectTransform _placeholderTransform = _placeholder.GetComponent<RectTransform>();
_placeholderTransform.sizeDelta = new Vector2(width, height);
_placeholder.color = fontColor;
_placeholder.font = font;
_placeholder.fontSize = fontSize;
_placeholder.fontStyle = FontStyle.Italic;
_placeholder.supportRichText = false;
_placeholder.horizontalOverflow = HorizontalWrapMode.Overflow;
_placeholder.text = placeholderString;
_placeholder.alignment = TextAnchor.MiddleCenter;
InputField _inputField = container.AddComponent<InputField>();
_inputField.targetGraphic = _image;
_inputField.textComponent = _text;
_inputField.placeholder = _placeholder;
RectTransform _inputFieldTransform = _inputField.GetComponent<RectTransform>();
_inputFieldTransform.localPosition = position;
_inputFieldTransform.sizeDelta = new Vector2(width, height);
_inputField.characterLimit = 7;
_inputField.characterValidation = InputField.CharacterValidation.Name;
_inputField.text = defaultString;
return _inputField;
}
public static void createButton(Canvas canvas, string objectName, Vector3 position)
{
int width = 150;
int height = 50;
int fontSize = 24;
Color fontColor = Color.white;
Color inputBoxColor = new Color(242f / 255f, 151f / 255f, 161f / 255f, 255f / 255f);
GameObject container = new GameObject();
container.name = objectName;
container.transform.parent = canvas.transform;
container.transform.localPosition = position;
container.AddComponent<CanvasRenderer>();
Image _image = container.AddComponent<Image>();
_image.type = Image.Type.Sliced;
_image.color = inputBoxColor;
Button _button = container.AddComponent<Button>();
_button.onClick.AddListener(delegate { OnButtonClick(container.transform.parent.GetChild(0).gameObject.GetComponent<InputField>(), container.transform.parent.GetChild(1).gameObject.GetComponent<InputField>(), canvas); });
RectTransform _containerTransform = container.GetComponent<RectTransform>();
_containerTransform.sizeDelta = new Vector2(width, height);
Font font = (Font)Resources.Load("font/Cabin");
GameObject textContainer = new GameObject();
textContainer.name = "Text";
textContainer.transform.parent = container.transform;
textContainer.transform.localPosition = new Vector3(0,0,0);
container.transform.localScale = new Vector3(1, 1, 1);
Text _text = textContainer.AddComponent<Text>();
RectTransform _textTransform = _text.GetComponent<RectTransform>();
_textTransform.sizeDelta = new Vector2(width, height);
_text.supportRichText = false;
_text.color = fontColor;
_text.font = font;
_text.fontSize = fontSize;
_text.horizontalOverflow = HorizontalWrapMode.Overflow;
_text.alignment = TextAnchor.MiddleCenter;
_text.text = "Confirm";
}
public static void createEqualsBox(Canvas canvas, string objectName, Vector3 position)
{
int width = 50;
int height = 50;
int fontSize = 40;
Color fontColor = Color.white;
GameObject container = new GameObject();
container.name = objectName;
container.transform.parent = canvas.transform;
container.AddComponent<CanvasRenderer>();
Font font = (Font)Resources.Load("font/Cabin");
container.transform.localScale = new Vector3(1, 1, 1);
Text _text = container.AddComponent<Text>();
RectTransform _textTransform = _text.GetComponent<RectTransform>();
_textTransform.localPosition = position;
_textTransform.sizeDelta = new Vector2(width, height);
_text.supportRichText = false;
_text.color = fontColor;
_text.font = font;
_text.fontSize = fontSize;
_text.horizontalOverflow = HorizontalWrapMode.Overflow;
_text.alignment = TextAnchor.MiddleCenter;
_text.text = "=";
}
public static void OnButtonClick(InputField firstname, InputField lastname, Canvas canvas )
{
String firstNameString = firstname.text;
String lastNameString = lastname.text;
ScreenKeyboardManager.Instance.m_inputText = firstNameString;
ScreenKeyboardManager.Instance.m_inputTextLastName = lastNameString;
Debug.LogWarning("Name: " + firstNameString + " = " + lastNameString);
ScreenKeyboardManager.m_instance.isKeyboardActive = false;
GameObject.Destroy(canvas.gameObject);
}
// Token: 0x06000A98 RID: 2712 RVA: 0x0002EAEC File Offset: 0x0002CCEC
public static void Close()
{
if (ScreenKeyboardManager.m_instance != null)
{
@ -177,4 +286,9 @@ public class ScreenKeyboardManager : MonoBehaviour
// Token: 0x04000887 RID: 2183
private string m_inputText;
// Token: 0x04000887 RID: 2183
private string m_inputTextLastName;
private bool isKeyboardActive;
}

@ -10,7 +10,7 @@ public class ScreenMovieSample : MonoBehaviour
{
//TODO fix movie playing. either make platform specific versions OR make platform agnostic
//yield return base.StartCoroutine(MovieManager.PlayMovie("mp4/high/op_movie.mp4", FullScreenMovieControlMode.CancelOnInput));
yield return base.StartCoroutine(MovieManager.PlayMovie("mp4/high/op_movie.mp4", this.gameObject));
yield return base.StartCoroutine(MovieManager.PlayMovie("mp4/high/op_movie.webm", this.gameObject));
Debug.Log(" #DEBUGLOG::MOVIE OWATA ");
yield break;
}

@ -2,6 +2,7 @@
using System.Collections;
using System.Collections.Generic;
using Qoo;
using Qoo.Def;
using UnityEngine;
// Token: 0x02000113 RID: 275
@ -83,8 +84,13 @@ public class ScreenResWindow : BaseWindow
new BaseWindow.UIButton("2560×1440", 475, 250, this.wndz + 3, "screen/title/buy05", true, true, 1, 2, 0),
new BaseWindow.UIText("2560×1440res", 630, 285, this.wndz + 4, "2560 × 1440", 30, UnityTextSprite.PositionType.Center, UnityTextSprite.PositionType.Center, byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue),
new BaseWindow.UIButton("Fullscreen", 300, 400, this.wndz + 3, "screen/title/buy05", true, true, 1, 2, 0),
new BaseWindow.UIText("Fullscreenres", 455, 435, this.wndz + 4, "Fullscreen", 30, UnityTextSprite.PositionType.Center, UnityTextSprite.PositionType.Center, byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue),
new BaseWindow.UIButton("Fullscreen", 300, 350, this.wndz + 3, "screen/title/buy05", true, true, 1, 2, 0),
new BaseWindow.UIText("Fullscreenres", 455, 385, this.wndz + 4, "Fullscreen", 30, UnityTextSprite.PositionType.Center, UnityTextSprite.PositionType.Center, byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue),
new BaseWindow.UIButton("SmallFont", 125, 450, this.wndz + 3, "screen/title/buy05", true, true, 1, 2, 0),
new BaseWindow.UIText("SmallFontOption", 280, 485, this.wndz + 4, "Small Font", 30, UnityTextSprite.PositionType.Center, UnityTextSprite.PositionType.Center, byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue),
new BaseWindow.UIButton("NormalFont", 475, 450, this.wndz + 3, "screen/title/buy05", true, true, 1, 2, 0),
new BaseWindow.UIText("NormalFontOption", 630, 485, this.wndz + 4, "Normal Font", 30, UnityTextSprite.PositionType.Center, UnityTextSprite.PositionType.Center, byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue),
//new BaseWindow.UIImage("ArrowL", 33, 80, this.wndz + 3, "screen/cgmemory/cgm_arwl", false, true),
//new BaseWindow.UIImage("ArrowR", 848, 80, this.wndz + 3, "screen/cgmemory/cgm_arwr", false, true)
};
@ -130,8 +136,16 @@ public class ScreenResWindow : BaseWindow
{
"Fullscreen",
7
}
};
},
{
"SmallFont",
8
},
{
"NormalFont",
9
}
};
}
int num;
if (this.dict.TryGetValue(obj, out num))
@ -169,7 +183,29 @@ public class ScreenResWindow : BaseWindow
{
Screen.fullScreen = !Screen.fullScreen;
}
}
else if (num == 8)
{
UnityApp.PlatformApp.preferredFontSize = 22;
FontDef.SetFontInfo(new FONTINFO[]
{
new FONTINFO(22, 22, 1f, 0),
new FONTINFO(22, 22, 1f, 0),
new FONTINFO(42, 42, 1f, -1),
new FONTINFO(62, 62, 1f, -2)
});
}
else if (num == 9)
{
UnityApp.PlatformApp.preferredFontSize = 28;
FontDef.SetFontInfo(new FONTINFO[]
{
new FONTINFO(22, 22, 1f, 0),
new FONTINFO(28, 28, 1f, 0),
new FONTINFO(42, 42, 1f, -1),
new FONTINFO(62, 62, 1f, -2)
});
}
}
}
}

@ -115,8 +115,10 @@ public class UIValue
// Token: 0x0400064F RID: 1615
public static string GalleryInputNameDialog_Name;
// Token: 0x04000650 RID: 1616
public static GalleryInputNameDialogExitType GalleryInputNameDialog_Exit;
public static string GalleryInputNameDialog_LastName;
// Token: 0x04000650 RID: 1616
public static GalleryInputNameDialogExitType GalleryInputNameDialog_Exit;
// Token: 0x04000651 RID: 1617
public static SaveLoadType SaveLoadType;

@ -24,8 +24,10 @@ public class UnityApp : Singleton<UnityApp>
{
UnityEngine.Object.DontDestroyOnLoad(this);
Application.targetFrameRate = 60;
//Screen.SetResolution(1024, 576, false, 60);
this.task = base.gameObject.AddComponent<TaskManager>();
this.preferredFontSize = 28;
Application.runInBackground = true;
//Screen.SetResolution(1024, 576, false, 60);
this.task = base.gameObject.AddComponent<TaskManager>();
this.time = base.gameObject.AddComponent<UnityTimer>();
this.file = base.gameObject.AddComponent<UnityFileLoader>();
this.input = base.gameObject.AddComponent<GameInput>();
@ -43,13 +45,13 @@ public class UnityApp : Singleton<UnityApp>
// Token: 0x06000897 RID: 2199 RVA: 0x00026538 File Offset: 0x00024738
private void OnEnable()
{
AMAppStore.RegistrationEvent();
//AMAppStore.RegistrationEvent();
}
// Token: 0x06000898 RID: 2200 RVA: 0x00026540 File Offset: 0x00024740
private void OnDisable()
{
AMAppStore.DeleteEvent();
//AMAppStore.DeleteEvent();
}
// Token: 0x06000899 RID: 2201 RVA: 0x00026548 File Offset: 0x00024748
@ -84,7 +86,7 @@ public class UnityApp : Singleton<UnityApp>
{
Qoo.Debug.Print("APP QUIT!!");
UnityApp.AutoSave();
AMAppStore.End();
//AMAppStore.End();
}
// Token: 0x0600089C RID: 2204 RVA: 0x000265B8 File Offset: 0x000247B8
@ -308,4 +310,6 @@ public class UnityApp : Singleton<UnityApp>
private bool m_isInit;
public bool isJapanese;
public int preferredFontSize = 28;
}

@ -2,6 +2,7 @@
using System.Collections;
using Qoo;
using UnityEngine;
using UnityEngine.Networking;
// Token: 0x02000148 RID: 328
public class UnityFile
@ -130,7 +131,7 @@ public class UnityFile
name = Pathing.ToPlatformAssetBundleName(name);
}
string text = Pathing.appContentDataPath + localpath + name;
Qoo.Debug.Print("FileLoad:" + text);
Qoo.Debug.Print("first possible spot:");
return text;
}
@ -187,10 +188,50 @@ public class UnityFile
}
else if (this.m_IsAssetBandle)
{
UnityEngine.Debug.Log (Application.streamingAssetsPath + m_szPath + m_szName + ".png");
if (Application.platform == RuntimePlatform.Android)
{
string url;
if (Application.platform == RuntimePlatform.Android)
{
// On Android, use "jar:file://" URL to load file from StreamingAssets
url = ("jar:file://" + Application.dataPath + "!/assets" + m_szPath + m_szName + ".png").TrimStart('/');
UnityEngine.Debug.LogWarning(url);
}
else
{
// On other platforms, use file:// URL to load file from StreamingAssets
url = Application.streamingAssetsPath + m_szPath + m_szName + ".png";
}
//UnityEngine.Debug.LogWarning(url);
UnityWebRequest request = UnityWebRequest.Get(url);
yield return request.SendWebRequest();
if (request.result == UnityWebRequest.Result.Success)
{
byte[] data = request.downloadHandler.data;
this.m_ReadData = data;
// Use the loaded image data here
}
else
{
UnityEngine.Debug.LogError("Failed to load image: " + request.error);
}
}
else
{
UnityEngine.Debug.Log(Application.streamingAssetsPath + m_szPath + m_szName + ".png");
byte[] data = System.IO.File.ReadAllBytes(Application.streamingAssetsPath + m_szPath + m_szName + ".png");
this.m_ReadData = data;
}
/*UnityEngine.Debug.Log (Application.streamingAssetsPath + m_szPath + m_szName + ".png");
byte[] data = System.IO.File.ReadAllBytes(Application.streamingAssetsPath + m_szPath + m_szName + ".png");
this.m_ReadData = data;
}
this.m_ReadData = data;*/
}
else
{
this.m_ReadData = loader.bytes;

@ -41,6 +41,7 @@ public class UnityFileLoader : Singleton<UnityFileLoader>
// Token: 0x06000914 RID: 2324 RVA: 0x00027884 File Offset: 0x00025A84
public UnityFile LoadFile(string name, string localpath, bool IsAssetBandle = false)
{
UnityEngine.Debug.LogWarning("in Load File");
if (this.IsLoadedAssetBundle())
{
string name2 = this.NormalizeImageName(name);
@ -72,7 +73,7 @@ public class UnityFileLoader : Singleton<UnityFileLoader>
name = Pathing.ToPlatformAssetBundleName(name);
}
string text = Pathing.appContentDataPath + localpath + name;
Qoo.Debug.Print("FileLoad:" + text);
Qoo.Debug.Print("FileLoad:" + text);
return new WWW(text);
}

@ -361,7 +361,7 @@ public class UnityGraph : Singleton<UnityGraph>
VideoPlayer m_tex = movieFrame.obj.transform.gameObject.AddComponent<VideoPlayer>();
m_tex.playOnAwake = false;
Material newMat = new Material(Shader.Find("QO/Sprite Add") as Shader);
m_tex.url = Application.streamingAssetsPath + "/" + path + ".mp4";
m_tex.url = Application.streamingAssetsPath + "/" + path + ".webm";
m_tex.isLooping = false;
movieFrame.SetMaterial(newMat, 960, 544);
m_tex.renderMode = UnityEngine.Video.VideoRenderMode.MaterialOverride;

@ -15,7 +15,7 @@ public class keyboard_sample_main : MonoBehaviour
// Token: 0x0600000A RID: 10 RVA: 0x00002194 File Offset: 0x00000394
private IEnumerator UserInput()
{
yield return base.StartCoroutine(ScreenKeyboardManager.Open(ScreenKeyboardManager.InputText));
yield return base.StartCoroutine(ScreenKeyboardManager.Open(ScreenKeyboardManager.InputText, ScreenKeyboardManager.InputTextLastName));
TextMesh tMesh = base.GetComponent<TextMesh>();
tMesh.text = ScreenKeyboardManager.InputText;
yield break;

Loading…
Cancel
Save