diff --git a/Assembly-CSharp-vs.csproj b/Assembly-CSharp-vs.csproj
new file mode 100644
index 000000000..d317fded6
--- /dev/null
+++ b/Assembly-CSharp-vs.csproj
@@ -0,0 +1,471 @@
+
+
+
+ Debug
+ AnyCPU
+ 10.0.20506
+ 2.0
+ {8064C318-980D-5E6D-F7D0-C6A8C4DBEB3C}
+ Library
+ Properties
+
+ Assembly-CSharp
+ v3.5
+ 512
+ Assets
+
+
+ true
+ full
+ false
+ Temp\bin\Debug\
+ DEBUG;TRACE;UNITY_STANDALONE_WIN;ENABLE_MICROPHONE;ENABLE_TEXTUREID_MAP;ENABLE_AUDIO_FMOD;UNITY_STANDALONE;ENABLE_MONO;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_GENERICS;ENABLE_SUBSTANCE;INCLUDE_WP8SUPPORT;ENABLE_MOVIES;ENABLE_WWW;ENABLE_IMAGEEFFECTS;ENABLE_WEBCAM;INCLUDE_METROSUPPORT;RENDER_SOFTWARE_CURSOR;ENABLE_NETWORK;ENABLE_PHYSICS;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_2D_PHYSICS;ENABLE_SHADOWS;ENABLE_AUDIO;ENABLE_NAVMESH_CARVING;ENABLE_DUCK_TYPING;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;UNITY_4_3_1;UNITY_4_3;ENABLE_PROFILER;UNITY_EDITOR;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE
+ prompt
+ 4
+ 0169
+
+
+ pdbonly
+ true
+ Temp\bin\Release\
+ TRACE
+ prompt
+ 4
+ 0169
+
+
+
+
+
+
+
+ C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEngine.dll
+
+
+ C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEditor.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj
new file mode 100644
index 000000000..d317fded6
--- /dev/null
+++ b/Assembly-CSharp.csproj
@@ -0,0 +1,471 @@
+
+
+
+ Debug
+ AnyCPU
+ 10.0.20506
+ 2.0
+ {8064C318-980D-5E6D-F7D0-C6A8C4DBEB3C}
+ Library
+ Properties
+
+ Assembly-CSharp
+ v3.5
+ 512
+ Assets
+
+
+ true
+ full
+ false
+ Temp\bin\Debug\
+ DEBUG;TRACE;UNITY_STANDALONE_WIN;ENABLE_MICROPHONE;ENABLE_TEXTUREID_MAP;ENABLE_AUDIO_FMOD;UNITY_STANDALONE;ENABLE_MONO;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_GENERICS;ENABLE_SUBSTANCE;INCLUDE_WP8SUPPORT;ENABLE_MOVIES;ENABLE_WWW;ENABLE_IMAGEEFFECTS;ENABLE_WEBCAM;INCLUDE_METROSUPPORT;RENDER_SOFTWARE_CURSOR;ENABLE_NETWORK;ENABLE_PHYSICS;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_2D_PHYSICS;ENABLE_SHADOWS;ENABLE_AUDIO;ENABLE_NAVMESH_CARVING;ENABLE_DUCK_TYPING;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;UNITY_4_3_1;UNITY_4_3;ENABLE_PROFILER;UNITY_EDITOR;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE
+ prompt
+ 4
+ 0169
+
+
+ pdbonly
+ true
+ Temp\bin\Release\
+ TRACE
+ prompt
+ 4
+ 0169
+
+
+
+
+
+
+
+ C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEngine.dll
+
+
+ C:/Program Files (x86)/Unity/Editor/Data/Managed/UnityEditor.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Assets/Scene/Scenes/DebugScene.unity b/Assets/Scene/Scenes/DebugScene.unity
index 9849448ae..18e0466ed 100644
Binary files a/Assets/Scene/Scenes/DebugScene.unity and b/Assets/Scene/Scenes/DebugScene.unity differ
diff --git a/Assets/Scene/Scenes/Init.unity b/Assets/Scene/Scenes/Init.unity
index 54c19247c..6ef5c3a05 100644
Binary files a/Assets/Scene/Scenes/Init.unity and b/Assets/Scene/Scenes/Init.unity differ
diff --git a/Assets/Scene/Scenes/SceneAdvMenu.unity b/Assets/Scene/Scenes/SceneAdvMenu.unity
index d3b1aa207..baeabdbca 100644
Binary files a/Assets/Scene/Scenes/SceneAdvMenu.unity and b/Assets/Scene/Scenes/SceneAdvMenu.unity differ
diff --git a/Assets/Scene/Scenes/SceneAdvMode.unity b/Assets/Scene/Scenes/SceneAdvMode.unity
index 31abd698b..3ed638f13 100644
Binary files a/Assets/Scene/Scenes/SceneAdvMode.unity and b/Assets/Scene/Scenes/SceneAdvMode.unity differ
diff --git a/Assets/Scene/Scenes/SceneCGCharaSelect.unity b/Assets/Scene/Scenes/SceneCGCharaSelect.unity
index 742400070..ac26dddf1 100644
Binary files a/Assets/Scene/Scenes/SceneCGCharaSelect.unity and b/Assets/Scene/Scenes/SceneCGCharaSelect.unity differ
diff --git a/Assets/Scene/Scenes/SceneCGSelect.unity b/Assets/Scene/Scenes/SceneCGSelect.unity
index 55d10c5ee..bc950c865 100644
Binary files a/Assets/Scene/Scenes/SceneCGSelect.unity and b/Assets/Scene/Scenes/SceneCGSelect.unity differ
diff --git a/Assets/Scene/Scenes/SceneGalleryCG.unity b/Assets/Scene/Scenes/SceneGalleryCG.unity
index 3154f4cf8..03eee7998 100644
Binary files a/Assets/Scene/Scenes/SceneGalleryCG.unity and b/Assets/Scene/Scenes/SceneGalleryCG.unity differ
diff --git a/Assets/Scene/Scenes/SceneGalleryInputName.unity b/Assets/Scene/Scenes/SceneGalleryInputName.unity
index 4ad81fce7..f856d2c5b 100644
Binary files a/Assets/Scene/Scenes/SceneGalleryInputName.unity and b/Assets/Scene/Scenes/SceneGalleryInputName.unity differ
diff --git a/Assets/Scene/Scenes/SceneGalleryInputNameDialog.unity b/Assets/Scene/Scenes/SceneGalleryInputNameDialog.unity
index 7a1464bfd..a7be0dd80 100644
Binary files a/Assets/Scene/Scenes/SceneGalleryInputNameDialog.unity and b/Assets/Scene/Scenes/SceneGalleryInputNameDialog.unity differ
diff --git a/Assets/Scene/Scenes/SceneGalleryInputNameKeyboard.unity b/Assets/Scene/Scenes/SceneGalleryInputNameKeyboard.unity
index 14a56922d..bd9d07bae 100644
Binary files a/Assets/Scene/Scenes/SceneGalleryInputNameKeyboard.unity and b/Assets/Scene/Scenes/SceneGalleryInputNameKeyboard.unity differ
diff --git a/Assets/Scene/Scenes/SceneGalleryMenu.unity b/Assets/Scene/Scenes/SceneGalleryMenu.unity
index 55d977bce..7f8a557f8 100644
Binary files a/Assets/Scene/Scenes/SceneGalleryMenu.unity and b/Assets/Scene/Scenes/SceneGalleryMenu.unity differ
diff --git a/Assets/Scene/Scenes/SceneGalleryMovie.unity b/Assets/Scene/Scenes/SceneGalleryMovie.unity
index dcd27fbab..69c7a17ed 100644
Binary files a/Assets/Scene/Scenes/SceneGalleryMovie.unity and b/Assets/Scene/Scenes/SceneGalleryMovie.unity differ
diff --git a/Assets/Scene/Scenes/SceneGameInit.unity b/Assets/Scene/Scenes/SceneGameInit.unity
index cb081d3d7..8c57cc42e 100644
Binary files a/Assets/Scene/Scenes/SceneGameInit.unity and b/Assets/Scene/Scenes/SceneGameInit.unity differ
diff --git a/Assets/Scene/Scenes/SceneHelp.unity b/Assets/Scene/Scenes/SceneHelp.unity
index 693b5595f..6aa921abd 100644
Binary files a/Assets/Scene/Scenes/SceneHelp.unity and b/Assets/Scene/Scenes/SceneHelp.unity differ
diff --git a/Assets/Scene/Scenes/SceneIntroduction.unity b/Assets/Scene/Scenes/SceneIntroduction.unity
index c0fc43cd7..c3c86a1af 100644
Binary files a/Assets/Scene/Scenes/SceneIntroduction.unity and b/Assets/Scene/Scenes/SceneIntroduction.unity differ
diff --git a/Assets/Scene/Scenes/SceneLogoMovie.unity b/Assets/Scene/Scenes/SceneLogoMovie.unity
index 49c774050..bf9d03406 100644
Binary files a/Assets/Scene/Scenes/SceneLogoMovie.unity and b/Assets/Scene/Scenes/SceneLogoMovie.unity differ
diff --git a/Assets/Scene/Scenes/SceneMemoryCharaSelect.unity b/Assets/Scene/Scenes/SceneMemoryCharaSelect.unity
index 63dbf05c1..4471062ce 100644
Binary files a/Assets/Scene/Scenes/SceneMemoryCharaSelect.unity and b/Assets/Scene/Scenes/SceneMemoryCharaSelect.unity differ
diff --git a/Assets/Scene/Scenes/SceneMemorySelect.unity b/Assets/Scene/Scenes/SceneMemorySelect.unity
index 64f73c453..d191b9eaa 100644
Binary files a/Assets/Scene/Scenes/SceneMemorySelect.unity and b/Assets/Scene/Scenes/SceneMemorySelect.unity differ
diff --git a/Assets/Scene/Scenes/SceneOptionBack.unity b/Assets/Scene/Scenes/SceneOptionBack.unity
index 3f60c720c..660d72b27 100644
Binary files a/Assets/Scene/Scenes/SceneOptionBack.unity and b/Assets/Scene/Scenes/SceneOptionBack.unity differ
diff --git a/Assets/Scene/Scenes/SceneOptionScreen.unity b/Assets/Scene/Scenes/SceneOptionScreen.unity
index 93d6187f4..183390444 100644
Binary files a/Assets/Scene/Scenes/SceneOptionScreen.unity and b/Assets/Scene/Scenes/SceneOptionScreen.unity differ
diff --git a/Assets/Scene/Scenes/SceneOptionSkip.unity b/Assets/Scene/Scenes/SceneOptionSkip.unity
index efd06e727..d0d869cd3 100644
Binary files a/Assets/Scene/Scenes/SceneOptionSkip.unity and b/Assets/Scene/Scenes/SceneOptionSkip.unity differ
diff --git a/Assets/Scene/Scenes/SceneOptionSound.unity b/Assets/Scene/Scenes/SceneOptionSound.unity
index c11c5afd7..3d6ee3ef9 100644
Binary files a/Assets/Scene/Scenes/SceneOptionSound.unity and b/Assets/Scene/Scenes/SceneOptionSound.unity differ
diff --git a/Assets/Scene/Scenes/SceneOptionText.unity b/Assets/Scene/Scenes/SceneOptionText.unity
index 4ade1a3a4..8d74299a9 100644
Binary files a/Assets/Scene/Scenes/SceneOptionText.unity and b/Assets/Scene/Scenes/SceneOptionText.unity differ
diff --git a/Assets/Scene/Scenes/SceneOptionVoice.unity b/Assets/Scene/Scenes/SceneOptionVoice.unity
index b07b5fff9..c4677da2a 100644
Binary files a/Assets/Scene/Scenes/SceneOptionVoice.unity and b/Assets/Scene/Scenes/SceneOptionVoice.unity differ
diff --git a/Assets/Scene/Scenes/ScenePayment.unity b/Assets/Scene/Scenes/ScenePayment.unity
index 6d041aee0..30370ad17 100644
Binary files a/Assets/Scene/Scenes/ScenePayment.unity and b/Assets/Scene/Scenes/ScenePayment.unity differ
diff --git a/Assets/Scene/Scenes/ScenePaymentDialog.unity b/Assets/Scene/Scenes/ScenePaymentDialog.unity
index bfd4f9848..796946d75 100644
Binary files a/Assets/Scene/Scenes/ScenePaymentDialog.unity and b/Assets/Scene/Scenes/ScenePaymentDialog.unity differ
diff --git a/Assets/Scene/Scenes/ScenePaymentList.unity b/Assets/Scene/Scenes/ScenePaymentList.unity
index b130d4b9d..77c6af1eb 100644
Binary files a/Assets/Scene/Scenes/ScenePaymentList.unity and b/Assets/Scene/Scenes/ScenePaymentList.unity differ
diff --git a/Assets/Scene/Scenes/SceneSaveLoad.unity b/Assets/Scene/Scenes/SceneSaveLoad.unity
index d613613f0..f643c80da 100644
Binary files a/Assets/Scene/Scenes/SceneSaveLoad.unity and b/Assets/Scene/Scenes/SceneSaveLoad.unity differ
diff --git a/Assets/Scene/Scenes/SceneStorySelect.unity b/Assets/Scene/Scenes/SceneStorySelect.unity
index bd1da02fe..e60f43b79 100644
Binary files a/Assets/Scene/Scenes/SceneStorySelect.unity and b/Assets/Scene/Scenes/SceneStorySelect.unity differ
diff --git a/Assets/Scene/Scenes/SceneTitle.unity b/Assets/Scene/Scenes/SceneTitle.unity
index b5be14620..a0a9f36c6 100644
Binary files a/Assets/Scene/Scenes/SceneTitle.unity and b/Assets/Scene/Scenes/SceneTitle.unity differ
diff --git a/Assets/Scene/Scenes/SceneTitleRestore.unity b/Assets/Scene/Scenes/SceneTitleRestore.unity
index b7ae1c5f2..71ce172d0 100644
Binary files a/Assets/Scene/Scenes/SceneTitleRestore.unity and b/Assets/Scene/Scenes/SceneTitleRestore.unity differ
diff --git a/Assets/Scene/Scenes/UIDebug.unity b/Assets/Scene/Scenes/UIDebug.unity
index dc055e4f6..a50cb5753 100644
Binary files a/Assets/Scene/Scenes/UIDebug.unity and b/Assets/Scene/Scenes/UIDebug.unity differ
diff --git a/Assets/Scripts/Assembly-CSharp-firstpass/Properties/AssemblyInfo.cs b/Assets/Scripts/Assembly-CSharp-firstpass/Properties/AssemblyInfo.cs
index 1b279f879..aaedfbe55 100644
--- a/Assets/Scripts/Assembly-CSharp-firstpass/Properties/AssemblyInfo.cs
+++ b/Assets/Scripts/Assembly-CSharp-firstpass/Properties/AssemblyInfo.cs
@@ -2,4 +2,4 @@
using System.Reflection;
using System.Runtime.CompilerServices;
-[assembly: AssemblyVersion("0.0.0.0")]
+//[assembly: AssemblyVersion("0.0.0.0")]
diff --git a/Assets/Scripts/Assembly-CSharp/AdventureMenuWindow.cs b/Assets/Scripts/Assembly-CSharp/AdventureMenuWindow.cs
index cac5213c8..c17714cbe 100644
--- a/Assets/Scripts/Assembly-CSharp/AdventureMenuWindow.cs
+++ b/Assets/Scripts/Assembly-CSharp/AdventureMenuWindow.cs
@@ -50,7 +50,8 @@ public class AdventureMenuWindow : SubTaskBaseWindow
int num = -480;
int num2 = 272;
GameObject gameObject = GameObject.CreatePrimitive(PrimitiveType.Quad);
- gameObject.renderer.material = new Material(Resources.Load("Shader/Sprite/Sprite") as Shader);
+ //gameObject.renderer.material = new Material(Resources.Load("Shader/Sprite/Sprite") as Shader);
+ gameObject.renderer.material = new Material(Shader.Find("Unlit/Transparent") as Shader);
gameObject.renderer.material.mainTexture = tex;
gameObject.transform.parent = base.transform;
float num3 = (float)tex.width * scale_w;
diff --git a/Assets/Scripts/Assembly-CSharp/BaseWindow.cs b/Assets/Scripts/Assembly-CSharp/BaseWindow.cs
index e49b6bbef..3c79fb715 100644
--- a/Assets/Scripts/Assembly-CSharp/BaseWindow.cs
+++ b/Assets/Scripts/Assembly-CSharp/BaseWindow.cs
@@ -91,7 +91,8 @@ public abstract class BaseWindow : MonoBehaviourWrap
// Token: 0x06000C18 RID: 3096 RVA: 0x0003243C File Offset: 0x0003063C
public sealed override void Start()
{
- base.transform.parent.localPosition = new Vector3(2000f, 0f, 0f);
+ //base.transform.parent.localPosition = new Vector3(2000f, 0f, 0f);
+ base.transform.gameObject.transform.position = new Vector3(2000f, 0f, 0f);
this.BeforeInit();
foreach (BaseWindow.UIComponent uicomponent in this.newComponentArray())
{
diff --git a/Assets/Scripts/Assembly-CSharp/ByteReader.cs b/Assets/Scripts/Assembly-CSharp/ByteReader.cs
index 60f8302b0..4e4d8ca3f 100644
--- a/Assets/Scripts/Assembly-CSharp/ByteReader.cs
+++ b/Assets/Scripts/Assembly-CSharp/ByteReader.cs
@@ -50,14 +50,17 @@ public class ByteReader
int num2 = (int)this.mBuffer[i++];
if (num2 == 10 || num2 == 13)
{
- IL_81:
+ //IL_81:
string result = ByteReader.ReadLine(this.mBuffer, this.mOffset, i - this.mOffset - 1);
this.mOffset = i;
return result;
}
}
i++;
- goto IL_81;
+ //goto IL_81;
+ string result1 = ByteReader.ReadLine(this.mBuffer, this.mOffset, i - this.mOffset - 1);
+ this.mOffset = i;
+ return result1;
}
this.mOffset = num;
return null;
diff --git a/Assets/Scripts/Assembly-CSharp/CreateSprite.cs b/Assets/Scripts/Assembly-CSharp/CreateSprite.cs
index 0fb73597e..fb7d9f00c 100644
--- a/Assets/Scripts/Assembly-CSharp/CreateSprite.cs
+++ b/Assets/Scripts/Assembly-CSharp/CreateSprite.cs
@@ -13,7 +13,8 @@ public class CreateSprite : MonoBehaviour
{
UnityEngine.Object.Destroy(meshRenderer.material);
}
- meshRenderer.material = new Material(Resources.Load("Shader/Sprite/Sprite") as Shader);
+ //meshRenderer.material = new Material(Resources.Load("Shader/Sprite/Sprite") as Shader);
+ meshRenderer.material = new Material(Shader.Find("Unlit/Transparent") as Shader);
meshRenderer.castShadows = false;
meshRenderer.receiveShadows = false;
MeshFilter meshFilter = gameObject.AddComponent();
@@ -31,7 +32,10 @@ public class CreateSprite : MonoBehaviour
{
UnityEngine.Object.Destroy(meshRenderer.material);
}
- meshRenderer.material = new Material(Resources.Load("Shader/Sprite/TextSprite") as Shader);
+ // TODO Font
+ //meshRenderer.material = new Material(Resources.Load("Shader/Sprite/TextSprite") as Shader);
+ meshRenderer.material = new Material(Shader.Find("Unlit/Transparent") as Shader);
+
meshRenderer.castShadows = false;
meshRenderer.receiveShadows = false;
MeshFilter meshFilter = gameObject.AddComponent();
diff --git a/Assets/Scripts/Assembly-CSharp/GalleryInputNameWindow.cs b/Assets/Scripts/Assembly-CSharp/GalleryInputNameWindow.cs
index 0e1ea9151..9f313b419 100644
--- a/Assets/Scripts/Assembly-CSharp/GalleryInputNameWindow.cs
+++ b/Assets/Scripts/Assembly-CSharp/GalleryInputNameWindow.cs
@@ -6,6 +6,7 @@ using UnityEngine;
// Token: 0x0200010D RID: 269
public class GalleryInputNameWindow : BaseWindow
{
+ private Dictionary dict = null;
// Token: 0x06000711 RID: 1809 RVA: 0x0001E2CC File Offset: 0x0001C4CC
protected sealed override void OnAwake()
{
@@ -38,9 +39,9 @@ public class GalleryInputNameWindow : BaseWindow
{
if (obj != null)
{
- if (GalleryInputNameWindow.<>f__switch$mapA == null)
+ if (this.dict == null)
{
- GalleryInputNameWindow.<>f__switch$mapA = new Dictionary(1)
+ this.dict = new Dictionary(1)
{
{
"BackGround",
@@ -49,7 +50,7 @@ public class GalleryInputNameWindow : BaseWindow
};
}
int num;
- if (GalleryInputNameWindow.<>f__switch$mapA.TryGetValue(obj, out num))
+ if (this.dict.TryGetValue(obj, out num))
{
if (num != 0)
{
diff --git a/Assets/Scripts/Assembly-CSharp/GallerySelectWindow.cs b/Assets/Scripts/Assembly-CSharp/GallerySelectWindow.cs
index f41867d6c..5674d3e59 100644
--- a/Assets/Scripts/Assembly-CSharp/GallerySelectWindow.cs
+++ b/Assets/Scripts/Assembly-CSharp/GallerySelectWindow.cs
@@ -5,6 +5,8 @@ using UnityEngine;
// Token: 0x02000111 RID: 273
public abstract class GallerySelectWindow : BaseWindow
{
+ private Dictionary dict = null;
+
// Token: 0x06000725 RID: 1829
protected abstract void BeforeInitGallerySelect();
@@ -228,9 +230,9 @@ public abstract class GallerySelectWindow : BaseWindow
}
if (obj != null)
{
- if (GallerySelectWindow.<>f__switch$map7 == null)
+ if (this.dict == null)
{
- GallerySelectWindow.<>f__switch$map7 = new Dictionary(13)
+ this.dict = new Dictionary(13)
{
{
"Thumbnail00",
@@ -287,7 +289,7 @@ public abstract class GallerySelectWindow : BaseWindow
};
}
int num;
- if (GallerySelectWindow.<>f__switch$map7.TryGetValue(obj, out num))
+ if (this.dict.TryGetValue(obj, out num))
{
if (num != 0)
{
diff --git a/Assets/Scripts/Assembly-CSharp/HelpWindow.cs b/Assets/Scripts/Assembly-CSharp/HelpWindow.cs
index d5b8062f9..bad1cf462 100644
--- a/Assets/Scripts/Assembly-CSharp/HelpWindow.cs
+++ b/Assets/Scripts/Assembly-CSharp/HelpWindow.cs
@@ -7,6 +7,8 @@ using UnityEngine;
// Token: 0x02000113 RID: 275
public class HelpWindow : BaseWindow
{
+ private Dictionary dict = null;
+
// Token: 0x06000746 RID: 1862 RVA: 0x0001F45C File Offset: 0x0001D65C
protected sealed override string GetBGMName()
{
@@ -74,9 +76,9 @@ public class HelpWindow : BaseWindow
{
if (obj != null)
{
- if (HelpWindow.<>f__switch$mapC == null)
+ if (this.dict == null)
{
- HelpWindow.<>f__switch$mapC = new Dictionary(1)
+ this.dict = new Dictionary(1)
{
{
"Cancel",
@@ -85,7 +87,7 @@ public class HelpWindow : BaseWindow
};
}
int num;
- if (HelpWindow.<>f__switch$mapC.TryGetValue(obj, out num))
+ if (this.dict.TryGetValue(obj, out num))
{
if (num == 0)
{
diff --git a/Assets/Scripts/Assembly-CSharp/ImageObject.cs b/Assets/Scripts/Assembly-CSharp/ImageObject.cs
index 7db75759f..fc8f63c70 100644
--- a/Assets/Scripts/Assembly-CSharp/ImageObject.cs
+++ b/Assets/Scripts/Assembly-CSharp/ImageObject.cs
@@ -72,17 +72,20 @@ public class ImageObject : MonoBehaviour
{
base.transform.localScale = vector2;
}
+ // TODO Color
+ /*
if (base.renderer.material.color != color)
{
- base.renderer.material.color = color;
- }
+ base.renderer.material.color = color;
+ }*/
}
// Token: 0x06000BC0 RID: 3008 RVA: 0x00031778 File Offset: 0x0002F978
public static ImageObject Create(UIObjectInfo uiObject, Transform parent = null, bool collisionEnable = false)
{
GameObject gameObject = GameObject.CreatePrimitive(PrimitiveType.Quad);
- gameObject.renderer.material = new Material(Resources.Load("Shader/Sprite/Sprite") as Shader);
+ //gameObject.renderer.material = new Material(Resources.Load("Shader/Sprite/Sprite") as Shader);
+ gameObject.renderer.material = new Material(Shader.Find("Unlit/Transparent") as Shader);
gameObject.transform.parent = parent;
gameObject.collider.enabled = collisionEnable;
ImageObject imageObject = gameObject.AddComponent();
@@ -105,7 +108,8 @@ public class ImageObject : MonoBehaviour
{
this.OnTextureLoadComplete2();
}
- this.OnViewColor = base.renderer.material.color;
+ //not needed when using unity unlit. if custom shaders fixed, add back
+ //this.OnViewColor = base.renderer.material.color;
}
// Token: 0x06000BC2 RID: 3010 RVA: 0x00031844 File Offset: 0x0002FA44
@@ -185,7 +189,9 @@ public class ImageObject : MonoBehaviour
this.loadCompleted = true;
this.imageUnityTexture = unityTexture;
base.renderer.material.mainTexture = unityTexture.m_Texture;
- base.renderer.enabled = (this.changeTexture && this.rendererEnableAfterLoad);
+ // TODO issue with changeTexture, fix later
+ // base.renderer.enabled = (this.changeTexture && this.rendererEnableAfterLoad);
+ base.renderer.enabled = true;
this.OnTextureLoadComplete2();
}
diff --git a/Assets/Scripts/Assembly-CSharp/ImageObject2.cs b/Assets/Scripts/Assembly-CSharp/ImageObject2.cs
index f31599da8..362d42593 100644
--- a/Assets/Scripts/Assembly-CSharp/ImageObject2.cs
+++ b/Assets/Scripts/Assembly-CSharp/ImageObject2.cs
@@ -116,7 +116,8 @@ public class ImageObject2
public static ImageObject2 Create(Transform parent, string name, int x, int y, int z, UnityTexture uniTex)
{
GameObject gameObject = GameObject.CreatePrimitive(PrimitiveType.Quad);
- gameObject.renderer.material = new Material(Resources.Load("Shader/Sprite/Sprite") as Shader);
+ //gameObject.renderer.material = new Material(Resources.Load("Shader/Sprite/Sprite") as Shader);
+ gameObject.renderer.material = new Material(Shader.Find("Unlit/Transparent") as Shader);
gameObject.name = name;
gameObject.transform.parent = parent;
return new ImageObject2(gameObject, x, y, z, uniTex);
diff --git a/Assets/Scripts/Assembly-CSharp/ManTexture.cs b/Assets/Scripts/Assembly-CSharp/ManTexture.cs
index 3ef013276..c23db4aec 100644
--- a/Assets/Scripts/Assembly-CSharp/ManTexture.cs
+++ b/Assets/Scripts/Assembly-CSharp/ManTexture.cs
@@ -47,7 +47,7 @@ public class ManTexture : MonoBehaviour
this.array[name].IncCount();
return this.array[name];
}
- this.array.Add(name, new UnityTexture(name, tex, null));
+ this.array.Add(name, new UnityTexture(name, tex));
return this.array[name];
}
diff --git a/Assets/Scripts/Assembly-CSharp/NsQT/CQTkReader.cs b/Assets/Scripts/Assembly-CSharp/NsQT/CQTkReader.cs
index acff6bef4..f8c4ec08d 100644
--- a/Assets/Scripts/Assembly-CSharp/NsQT/CQTkReader.cs
+++ b/Assets/Scripts/Assembly-CSharp/NsQT/CQTkReader.cs
@@ -76,12 +76,14 @@ namespace NsQT
{
if (this._NEXT())
{
- IL_35:
+ //IL_35:
this.END_ID();
return Q_TOKEN.QTK_NUM;
}
}
- goto IL_35;
+ //goto IL_35;
+ this.END_ID();
+ return Q_TOKEN.QTK_NUM;
}
// Token: 0x06000489 RID: 1161 RVA: 0x000108C8 File Offset: 0x0000EAC8
@@ -646,16 +648,20 @@ namespace NsQT
}
if (this._NEXT())
{
- IL_7D:
+ //IL_7D:
this.END_ID();
return Q_TOKEN.QTK_STR;
}
}
if (this.INC_READPTR)
{
- goto IL_7D;
+ //goto IL_7D;
+ this.END_ID();
+ return Q_TOKEN.QTK_STR;
}
- goto IL_7D;
+ //goto IL_7D;
+ this.END_ID();
+ return Q_TOKEN.QTK_STR;
}
// Token: 0x06000495 RID: 1173 RVA: 0x000112E8 File Offset: 0x0000F4E8
@@ -772,15 +778,19 @@ namespace NsQT
continue;
}
}
- IL_8C:
+ //IL_8C:
this.RESET_ID();
return Q_TOKEN.QTK_STR;
}
if (this.INC_READPTR)
{
- goto IL_8C;
+ //goto IL_8C;
+ this.RESET_ID();
+ return Q_TOKEN.QTK_STR;
}
- goto IL_8C;
+ //goto IL_8C;
+ this.RESET_ID();
+ return Q_TOKEN.QTK_STR;
}
// Token: 0x06000498 RID: 1176 RVA: 0x00011518 File Offset: 0x0000F718
diff --git a/Assets/Scripts/Assembly-CSharp/OptionBackWindow.cs b/Assets/Scripts/Assembly-CSharp/OptionBackWindow.cs
index 856971759..9276f8e55 100644
--- a/Assets/Scripts/Assembly-CSharp/OptionBackWindow.cs
+++ b/Assets/Scripts/Assembly-CSharp/OptionBackWindow.cs
@@ -6,6 +6,8 @@ using UnityEngine;
// Token: 0x0200011D RID: 285
public class OptionBackWindow : OptionBaseWindow
{
+ private Dictionary dict = null;
+
// Token: 0x06000793 RID: 1939 RVA: 0x000205AC File Offset: 0x0001E7AC
private void OnClose()
{
@@ -67,9 +69,9 @@ public class OptionBackWindow : OptionBaseWindow
{
if (obj != null)
{
- if (OptionBackWindow.<>f__switch$mapF == null)
+ if (this.dict == null)
{
- OptionBackWindow.<>f__switch$mapF = new Dictionary(2)
+ this.dict = new Dictionary(2)
{
{
"NextNodeSkip",
@@ -82,7 +84,7 @@ public class OptionBackWindow : OptionBaseWindow
};
}
int num;
- if (OptionBackWindow.<>f__switch$mapF.TryGetValue(obj, out num))
+ if (this.dict.TryGetValue(obj, out num))
{
if (num != 0)
{
diff --git a/Assets/Scripts/Assembly-CSharp/OptionTextWindow.cs b/Assets/Scripts/Assembly-CSharp/OptionTextWindow.cs
index 7ca15fead..ff58cb01f 100644
--- a/Assets/Scripts/Assembly-CSharp/OptionTextWindow.cs
+++ b/Assets/Scripts/Assembly-CSharp/OptionTextWindow.cs
@@ -6,6 +6,8 @@ using UnityEngine;
// Token: 0x02000121 RID: 289
public class OptionTextWindow : OptionBaseWindow
{
+ private Dictionary dict = null;
+
// Token: 0x060007BF RID: 1983 RVA: 0x0002138C File Offset: 0x0001F58C
private void SetTextWaitHandler(int value)
{
@@ -113,9 +115,9 @@ public class OptionTextWindow : OptionBaseWindow
base.OnBaseWindowOnButton(obj);
if (obj != null)
{
- if (OptionTextWindow.<>f__switch$map12 == null)
+ if (this.dict == null)
{
- OptionTextWindow.<>f__switch$map12 = new Dictionary(10)
+ this.dict = new Dictionary(10)
{
{
"TextWait0",
@@ -160,7 +162,7 @@ public class OptionTextWindow : OptionBaseWindow
};
}
int num;
- if (OptionTextWindow.<>f__switch$map12.TryGetValue(obj, out num))
+ if (this.dict.TryGetValue(obj, out num))
{
if (num != 0)
{
diff --git a/Assets/Scripts/Assembly-CSharp/OptionVoiceWindow.cs b/Assets/Scripts/Assembly-CSharp/OptionVoiceWindow.cs
index 2392ec2f3..641de704d 100644
--- a/Assets/Scripts/Assembly-CSharp/OptionVoiceWindow.cs
+++ b/Assets/Scripts/Assembly-CSharp/OptionVoiceWindow.cs
@@ -7,6 +7,8 @@ using UnityEngine;
// Token: 0x02000122 RID: 290
public class OptionVoiceWindow : OptionBaseWindow
{
+ private Dictionary dict = null;
+
// Token: 0x060007CC RID: 1996 RVA: 0x00021A0C File Offset: 0x0001FC0C
private void OnVoiceFlag()
{
@@ -180,9 +182,9 @@ public class OptionVoiceWindow : OptionBaseWindow
base.OnBaseWindowOnButton(obj);
if (obj != null)
{
- if (OptionVoiceWindow.<>f__switch$map15 == null)
+ if (this.dict == null)
{
- OptionVoiceWindow.<>f__switch$map15 = new Dictionary(1)
+ this.dict = new Dictionary(1)
{
{
"VoiceFlag",
@@ -191,7 +193,7 @@ public class OptionVoiceWindow : OptionBaseWindow
};
}
int num;
- if (OptionVoiceWindow.<>f__switch$map15.TryGetValue(obj, out num))
+ if (this.dict.TryGetValue(obj, out num))
{
if (num == 0)
{
diff --git a/Assets/Scripts/Assembly-CSharp/PaymentDialogWindow.cs b/Assets/Scripts/Assembly-CSharp/PaymentDialogWindow.cs
index 058c3b13c..0a6377716 100644
--- a/Assets/Scripts/Assembly-CSharp/PaymentDialogWindow.cs
+++ b/Assets/Scripts/Assembly-CSharp/PaymentDialogWindow.cs
@@ -6,6 +6,8 @@ using Qoo;
// Token: 0x02000123 RID: 291
public class PaymentDialogWindow : BaseWindow
{
+ private Dictionary dict = null;
+
// Token: 0x060007D7 RID: 2007 RVA: 0x0002241C File Offset: 0x0002061C
protected sealed override void OnAwake()
{
@@ -50,9 +52,9 @@ public class PaymentDialogWindow : BaseWindow
{
if (obj != null)
{
- if (PaymentDialogWindow.<>f__switch$map16 == null)
+ if (this.dict == null)
{
- PaymentDialogWindow.<>f__switch$map16 = new Dictionary(1)
+ this.dict = new Dictionary(1)
{
{
"Close",
@@ -61,7 +63,7 @@ public class PaymentDialogWindow : BaseWindow
};
}
int num;
- if (PaymentDialogWindow.<>f__switch$map16.TryGetValue(obj, out num))
+ if (this.dict.TryGetValue(obj, out num))
{
if (num == 0)
{
diff --git a/Assets/Scripts/Assembly-CSharp/PaymentListWindow.cs b/Assets/Scripts/Assembly-CSharp/PaymentListWindow.cs
index c4b4ba6e1..889ba0939 100644
--- a/Assets/Scripts/Assembly-CSharp/PaymentListWindow.cs
+++ b/Assets/Scripts/Assembly-CSharp/PaymentListWindow.cs
@@ -6,6 +6,8 @@ using Qoo;
// Token: 0x02000127 RID: 295
public class PaymentListWindow : BaseWindow
{
+ private Dictionary dict = null;
+
// Token: 0x060007EB RID: 2027 RVA: 0x000228BC File Offset: 0x00020ABC
protected sealed override void OnAwake()
{
@@ -40,9 +42,9 @@ public class PaymentListWindow : BaseWindow
{
if (obj != null)
{
- if (PaymentListWindow.<>f__switch$map17 == null)
+ if (this.dict == null)
{
- PaymentListWindow.<>f__switch$map17 = new Dictionary(1)
+ this.dict = new Dictionary(1)
{
{
"Close",
@@ -51,7 +53,7 @@ public class PaymentListWindow : BaseWindow
};
}
int num;
- if (PaymentListWindow.<>f__switch$map17.TryGetValue(obj, out num))
+ if (this.dict.TryGetValue(obj, out num))
{
if (num == 0)
{
diff --git a/Assets/Scripts/Assembly-CSharp/Properties/AssemblyInfo.cs b/Assets/Scripts/Assembly-CSharp/Properties/AssemblyInfo.cs
index 1b279f879..aaedfbe55 100644
--- a/Assets/Scripts/Assembly-CSharp/Properties/AssemblyInfo.cs
+++ b/Assets/Scripts/Assembly-CSharp/Properties/AssemblyInfo.cs
@@ -2,4 +2,4 @@
using System.Reflection;
using System.Runtime.CompilerServices;
-[assembly: AssemblyVersion("0.0.0.0")]
+//[assembly: AssemblyVersion("0.0.0.0")]
diff --git a/Assets/Scripts/Assembly-CSharp/Qoo/Debug.cs b/Assets/Scripts/Assembly-CSharp/Qoo/Debug.cs
index 61ae02beb..e907ec35e 100644
--- a/Assets/Scripts/Assembly-CSharp/Qoo/Debug.cs
+++ b/Assets/Scripts/Assembly-CSharp/Qoo/Debug.cs
@@ -11,7 +11,7 @@ namespace Qoo
// Token: 0x06000021 RID: 33 RVA: 0x0000231C File Offset: 0x0000051C
static Debug()
{
- if (Debug.isDebugBuild)
+ if (UnityEngine.Debug.isDebugBuild)
{
Debug.m_IsDebug = true;
}
@@ -50,7 +50,7 @@ namespace Qoo
{
if (Debug.IsDebug)
{
- Debug.Log(message);
+ UnityEngine.Debug.Log(message);
}
}
@@ -60,7 +60,7 @@ namespace Qoo
if (Debug.IsDebug && !assert)
{
Debug.Print("ASSERT!!");
- Debug.DebugBreak();
+ UnityEngine.Debug.DebugBreak();
}
}
@@ -70,7 +70,7 @@ namespace Qoo
if (Debug.IsDebug && !assert)
{
Debug.Print(message);
- Debug.DebugBreak();
+ UnityEngine.Debug.DebugBreak();
}
}
diff --git a/Assets/Scripts/Assembly-CSharp/Qoo/Game/KsExec.cs b/Assets/Scripts/Assembly-CSharp/Qoo/Game/KsExec.cs
index 9ce20698d..e47e08cea 100644
--- a/Assets/Scripts/Assembly-CSharp/Qoo/Game/KsExec.cs
+++ b/Assets/Scripts/Assembly-CSharp/Qoo/Game/KsExec.cs
@@ -14,11 +14,12 @@ namespace Qoo.Game
// Token: 0x06000611 RID: 1553 RVA: 0x00019374 File Offset: 0x00017574
internal static bool KsExecProc(string Func, string Param, string Value, int count)
{
+ Dictionary dict = null;
if (Func != null)
{
- if (KsExec.<>f__switch$map1 == null)
+ if (dict == null)
{
- KsExec.<>f__switch$map1 = new Dictionary(2)
+ dict = new Dictionary(2)
{
{
"inputname",
@@ -31,7 +32,7 @@ namespace Qoo.Game
};
}
int num;
- if (KsExec.<>f__switch$map1.TryGetValue(Func, out num))
+ if (dict.TryGetValue(Func, out num))
{
if (num != 0)
{
@@ -144,7 +145,7 @@ namespace Qoo.Game
// Token: 0x06000614 RID: 1556 RVA: 0x00019604 File Offset: 0x00017804
private static void KeyboardMain()
{
- switch (Application.platform)
+ switch (UnityEngine.Application.platform)
{
case RuntimePlatform.IPhonePlayer:
case RuntimePlatform.Android:
diff --git a/Assets/Scripts/Assembly-CSharp/Qoo/Input/KsInput.cs b/Assets/Scripts/Assembly-CSharp/Qoo/Input/KsInput.cs
index 5a0c8dc4b..c324b89b4 100644
--- a/Assets/Scripts/Assembly-CSharp/Qoo/Input/KsInput.cs
+++ b/Assets/Scripts/Assembly-CSharp/Qoo/Input/KsInput.cs
@@ -22,12 +22,16 @@ namespace Qoo.Input
}
KsInput.m_eState = value;
}
- } = INPUT_STATE.WAIT;
+ }
+ // TODO add default initialization later
+ //= INPUT_STATE.WAIT;
// Token: 0x1700002A RID: 42
// (get) Token: 0x06000169 RID: 361 RVA: 0x00006740 File Offset: 0x00004940
// (set) Token: 0x0600016A RID: 362 RVA: 0x00006748 File Offset: 0x00004948
- public static bool IsLock { get; private set; } = false;
+ public static bool IsLock { get; private set; }
+ // TODO add default initialization later
+ //= false;
// Token: 0x1700002B RID: 43
// (get) Token: 0x0600016B RID: 363 RVA: 0x00006750 File Offset: 0x00004950
@@ -152,7 +156,9 @@ namespace Qoo.Input
// Token: 0x17000036 RID: 54
// (get) Token: 0x0600017C RID: 380 RVA: 0x00006804 File Offset: 0x00004A04
// (set) Token: 0x0600017D RID: 381 RVA: 0x0000680C File Offset: 0x00004A0C
- public static bool IsAutoLock { get; set; } = false;
+ public static bool IsAutoLock { get; set; }
+ // TODO add default initialization later
+ //= false;
// Token: 0x0600017E RID: 382 RVA: 0x00006814 File Offset: 0x00004A14
public static void SetAuto()
@@ -225,7 +231,7 @@ namespace Qoo.Input
break;
case INPUT_STATUS.PUSH:
{
- bool isDebugBuild = Debug.isDebugBuild;
+ bool isDebugBuild = UnityEngine.Debug.isDebugBuild;
if (isDebugBuild)
{
KsInput.m_iPushTime++;
diff --git a/Assets/Scripts/Assembly-CSharp/Qoo/Ks/CONFIG.cs b/Assets/Scripts/Assembly-CSharp/Qoo/Ks/CONFIG.cs
index d2098e45a..3e05855e2 100644
--- a/Assets/Scripts/Assembly-CSharp/Qoo/Ks/CONFIG.cs
+++ b/Assets/Scripts/Assembly-CSharp/Qoo/Ks/CONFIG.cs
@@ -9,6 +9,7 @@ namespace Qoo.Ks
static CONFIG()
{
CONFIG.LABEL_MAX = 200;
+ CONFIG.KS_MAX = 200;
}
// Token: 0x17000052 RID: 82
@@ -19,6 +20,6 @@ namespace Qoo.Ks
// Token: 0x17000053 RID: 83
// (get) Token: 0x060001ED RID: 493 RVA: 0x000083A8 File Offset: 0x000065A8
// (set) Token: 0x060001EE RID: 494 RVA: 0x000083B0 File Offset: 0x000065B0
- public static int KS_MAX { get; private set; } = 200;
+ public static int KS_MAX { get; private set; }
}
}
diff --git a/Assets/Scripts/Assembly-CSharp/Qoo/Ks/EventPlayer.cs b/Assets/Scripts/Assembly-CSharp/Qoo/Ks/EventPlayer.cs
index 8956b8786..934be52bf 100644
--- a/Assets/Scripts/Assembly-CSharp/Qoo/Ks/EventPlayer.cs
+++ b/Assets/Scripts/Assembly-CSharp/Qoo/Ks/EventPlayer.cs
@@ -468,7 +468,7 @@ namespace Qoo.Ks
continue;
}
}
- IL_165:
+ //IL_165:
if (ksTagInfo.GetId() == KSID.MOVIE)
{
this.Scene.SceneApply(false, true);
@@ -482,7 +482,19 @@ namespace Qoo.Ks
{
this.Scene.SceneResetEffect();
}
- goto IL_165;
+ //goto IL_165;
+ if (ksTagInfo.GetId() == KSID.MOVIE)
+ {
+ this.Scene.SceneApply(false, true);
+ }
+ this.RestoreOn = false;
+ KsInput.Unlock();
+ base.ResetCallCount(-1);
+ return TAG_RESULT.CONTINUE_EXIT;
+ if (ksTagInfo.IsJumpEffectResetTag())
+ {
+ this.Scene.SceneResetEffect();
+ }
}
SKIP_MODE skip = SysData.GetSkip();
if (skip != SKIP_MODE.DISABLE)
diff --git a/Assets/Scripts/Assembly-CSharp/Qoo/Memory/MemFile.cs b/Assets/Scripts/Assembly-CSharp/Qoo/Memory/MemFile.cs
index 383ae19db..5780320cc 100644
--- a/Assets/Scripts/Assembly-CSharp/Qoo/Memory/MemFile.cs
+++ b/Assets/Scripts/Assembly-CSharp/Qoo/Memory/MemFile.cs
@@ -194,7 +194,14 @@ namespace Qoo.Memory
// Token: 0x060005CF RID: 1487 RVA: 0x0001737C File Offset: 0x0001557C
internal void SetBool(bool IsString)
{
- this.SetInt8((!IsString) ? 0 : 1);
+ //Unity didn't like the ternary operator
+ //this.SetInt8((!IsString) ? 0 : 1);
+ if(!IsString){
+ this.SetInt8(0);
+ }
+ else{
+ this.SetInt8(1);
+ }
}
// Token: 0x060005D0 RID: 1488 RVA: 0x00017394 File Offset: 0x00015594
diff --git a/Assets/Scripts/Assembly-CSharp/SceneManager.cs b/Assets/Scripts/Assembly-CSharp/SceneManager.cs
index d6e3343c2..2a6f587c6 100644
--- a/Assets/Scripts/Assembly-CSharp/SceneManager.cs
+++ b/Assets/Scripts/Assembly-CSharp/SceneManager.cs
@@ -114,9 +114,14 @@ public class SceneManager : MonoBehaviour
}
// Token: 0x0600088C RID: 2188 RVA: 0x00026388 File Offset: 0x00024588
- private static AsyncOperation LoadScene(string sceneName)
+ /*private static AsyncOperation LoadScene(string sceneName)
{
return Application.LoadLevelAdditiveAsync(sceneName);
+ }*/
+
+ private static void LoadScene(string sceneName)
+ {
+ Application.LoadLevelAdditive(sceneName);
}
// Token: 0x0600088D RID: 2189 RVA: 0x00026390 File Offset: 0x00024590
@@ -151,7 +156,8 @@ public class SceneManager : MonoBehaviour
// Token: 0x06000891 RID: 2193 RVA: 0x000263FC File Offset: 0x000245FC
private IEnumerator WaitForLoadScene(string currentSceneName, string nextSceneName, Action action)
{
- AsyncOperation ao = SceneManager.LoadScene(nextSceneName);
+ //AsyncOperation ao = SceneManager.LoadScene(nextSceneName);
+ SceneManager.LoadScene(nextSceneName);
if (currentSceneName != null)
{
SceneManager.UnloadScene(currentSceneName);
@@ -160,10 +166,10 @@ public class SceneManager : MonoBehaviour
{
action(nextSceneName);
}
- while (ao.progress < 1f)
+ /*while (ao.progress < 1f)
{
yield return new WaitForSeconds(0.1f);
- }
+ }*/
GameObject go = GameObject.Find(nextSceneName + "/Wnd");
if (go != null)
{
diff --git a/Assets/Scripts/Assembly-CSharp/SelectWnd.cs b/Assets/Scripts/Assembly-CSharp/SelectWnd.cs
index 66f51f4fe..f4dddf02a 100644
--- a/Assets/Scripts/Assembly-CSharp/SelectWnd.cs
+++ b/Assets/Scripts/Assembly-CSharp/SelectWnd.cs
@@ -156,7 +156,10 @@ public class SelectWnd : Singleton
goto IL_1DB;
}
}
- goto IL_198;
+ //goto IL_198;
+ Singleton.Instance.RemoveSprite(this.m_LoveAnim);
+ this.m_LoveAnim = null;
+ goto IL_1DB;
}
yield return new WaitForSeconds(1f);
IL_1DB:
diff --git a/Assets/Scripts/Assembly-CSharp/TitleRestoreWindow.cs b/Assets/Scripts/Assembly-CSharp/TitleRestoreWindow.cs
index 9d658ae79..84963d975 100644
--- a/Assets/Scripts/Assembly-CSharp/TitleRestoreWindow.cs
+++ b/Assets/Scripts/Assembly-CSharp/TitleRestoreWindow.cs
@@ -5,6 +5,8 @@ using PaymentGameApi;
// Token: 0x02000133 RID: 307
public class TitleRestoreWindow : BaseWindow
{
+ private Dictionary dict = null;
+
// Token: 0x06000840 RID: 2112 RVA: 0x00025028 File Offset: 0x00023228
protected sealed override void OnAwake()
{
@@ -38,9 +40,9 @@ public class TitleRestoreWindow : BaseWindow
{
if (obj != null)
{
- if (TitleRestoreWindow.<>f__switch$map1B == null)
+ if (this.dict == null)
{
- TitleRestoreWindow.<>f__switch$map1B = new Dictionary(1)
+ this.dict = new Dictionary(1)
{
{
"Close",
@@ -49,7 +51,7 @@ public class TitleRestoreWindow : BaseWindow
};
}
int num;
- if (TitleRestoreWindow.<>f__switch$map1B.TryGetValue(obj, out num))
+ if (this.dict.TryGetValue(obj, out num))
{
if (num == 0)
{
diff --git a/Assets/Scripts/Assembly-CSharp/UIActionButton.cs b/Assets/Scripts/Assembly-CSharp/UIActionButton.cs
index 3fb9a4bb4..716300565 100644
--- a/Assets/Scripts/Assembly-CSharp/UIActionButton.cs
+++ b/Assets/Scripts/Assembly-CSharp/UIActionButton.cs
@@ -10,6 +10,11 @@ public class UIActionButton : UIAction
UIActionButton uiactionButton = go.AddComponent();
uiactionButton.m_NormalIndex = normal;
uiactionButton.m_PressIndex = press;
+ // TODO determine why game isn't handling texture offset correctly
+ // below is a temp fix
+ go.renderer.material.SetTextureOffset ("_MainTex",new Vector2(0f,.5f));
+ go.renderer.material.SetTextureScale ("_MainTex",new Vector2(1f,.5f));
+
return uiactionButton;
}
@@ -32,12 +37,22 @@ public class UIActionButton : UIAction
// Token: 0x06000BFA RID: 3066 RVA: 0x000321D4 File Offset: 0x000303D4
private void OnMouseDown()
{
+ // TODO determine why game isn't handling texture offset correctly
+ // below is a temp fix
+ this.gameObject.renderer.material.SetTextureOffset ("_MainTex",new Vector2(0f,0f));
+ this.gameObject.renderer.material.SetTextureScale ("_MainTex",new Vector2(1f,.5f));
+
this.SetImageIndex(this.m_PressIndex);
}
// Token: 0x06000BFB RID: 3067 RVA: 0x000321E4 File Offset: 0x000303E4
private void OnMouseUp()
{
+ //TODO determine why game isn't handling texture offset correctly
+ // below is a temp fix
+ this.gameObject.renderer.material.SetTextureOffset ("_MainTex",new Vector2(0f,.5f));
+ this.gameObject.renderer.material.SetTextureScale ("_MainTex",new Vector2(1f,.5f));
+
this.SetImageIndex(this.m_NormalIndex);
}
diff --git a/Assets/Scripts/Assembly-CSharp/UnityInput.cs b/Assets/Scripts/Assembly-CSharp/UnityInput.cs
index 997e1f957..ad6c3b07b 100644
--- a/Assets/Scripts/Assembly-CSharp/UnityInput.cs
+++ b/Assets/Scripts/Assembly-CSharp/UnityInput.cs
@@ -92,13 +92,16 @@ public class UnityInput : MonoBehaviour
// Token: 0x1700016E RID: 366
// (get) Token: 0x06000AB8 RID: 2744 RVA: 0x0002F22C File Offset: 0x0002D42C
// (set) Token: 0x06000AB9 RID: 2745 RVA: 0x0002F234 File Offset: 0x0002D434
- private protected TOUCH_STATE State
+ //private
+ protected TOUCH_STATE State
{
- protected get
+ //protected
+ get
{
return this.m_eState;
}
- private set
+ //private
+ set
{
this.m_eState = value;
}
diff --git a/Assets/Scripts/P31RestKit/SimpleJson.cs b/Assets/Scripts/P31RestKit/SimpleJson.cs
index a4bc7067e..51ae0c34d 100644
--- a/Assets/Scripts/P31RestKit/SimpleJson.cs
+++ b/Assets/Scripts/P31RestKit/SimpleJson.cs
@@ -95,7 +95,7 @@ namespace Prime31
// Token: 0x06000095 RID: 149 RVA: 0x000064D0 File Offset: 0x000046D0
public static T decode(string json)
{
- return (T)((object)SimpleJson.decode(json, typeof(T)));
+ return (T)((object)SimpleJson.decode(json, typeof(T), null));
}
// Token: 0x06000096 RID: 150 RVA: 0x000064FC File Offset: 0x000046FC
diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
index 78b89a77f..0009a3068 100644
Binary files a/ProjectSettings/EditorBuildSettings.asset and b/ProjectSettings/EditorBuildSettings.asset differ
diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset
index dcae11ddb..4a440d2c7 100644
Binary files a/ProjectSettings/GraphicsSettings.asset and b/ProjectSettings/GraphicsSettings.asset differ
diff --git a/ProjectSettings/Physics2DSettings.asset b/ProjectSettings/Physics2DSettings.asset
index 9469ff8ca..6bd756baf 100644
Binary files a/ProjectSettings/Physics2DSettings.asset and b/ProjectSettings/Physics2DSettings.asset differ
diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset
index 606f55ca0..0437cd40a 100644
Binary files a/ProjectSettings/TagManager.asset and b/ProjectSettings/TagManager.asset differ
diff --git a/unityshinsoubanalice-csharp.sln b/unityshinsoubanalice-csharp.sln
new file mode 100644
index 000000000..c71b685cd
--- /dev/null
+++ b/unityshinsoubanalice-csharp.sln
@@ -0,0 +1,40 @@
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2008
+
+Project("{F49C4458-A18F-61D2-2434-21FA1E281883}") = "unityshinsoubanalice", "Assembly-CSharp-vs.csproj", "{8064C318-980D-5E6D-F7D0-C6A8C4DBEB3C}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {8064C318-980D-5E6D-F7D0-C6A8C4DBEB3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {8064C318-980D-5E6D-F7D0-C6A8C4DBEB3C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {8064C318-980D-5E6D-F7D0-C6A8C4DBEB3C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {8064C318-980D-5E6D-F7D0-C6A8C4DBEB3C}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(MonoDevelopProperties) = preSolution
+ StartupItem = Assembly-CSharp.csproj
+ Policies = $0
+ $0.TextStylePolicy = $1
+ $1.inheritsSet = null
+ $1.scope = text/x-csharp
+ $0.CSharpFormattingPolicy = $2
+ $2.inheritsSet = Mono
+ $2.inheritsScope = text/x-csharp
+ $2.scope = text/x-csharp
+ $0.TextStylePolicy = $3
+ $3.FileWidth = 120
+ $3.TabWidth = 4
+ $3.IndentWidth = 4
+ $3.EolMarker = Unix
+ $3.inheritsSet = Mono
+ $3.inheritsScope = text/plain
+ $3.scope = text/plain
+ EndGlobalSection
+
+EndGlobal
diff --git a/unityshinsoubanalice.sln b/unityshinsoubanalice.sln
new file mode 100644
index 000000000..2bded50d9
--- /dev/null
+++ b/unityshinsoubanalice.sln
@@ -0,0 +1,40 @@
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2008
+
+Project("{F49C4458-A18F-61D2-2434-21FA1E281883}") = "unityshinsoubanalice", "Assembly-CSharp.csproj", "{8064C318-980D-5E6D-F7D0-C6A8C4DBEB3C}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {8064C318-980D-5E6D-F7D0-C6A8C4DBEB3C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {8064C318-980D-5E6D-F7D0-C6A8C4DBEB3C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {8064C318-980D-5E6D-F7D0-C6A8C4DBEB3C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {8064C318-980D-5E6D-F7D0-C6A8C4DBEB3C}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(MonoDevelopProperties) = preSolution
+ StartupItem = Assembly-CSharp.csproj
+ Policies = $0
+ $0.TextStylePolicy = $1
+ $1.inheritsSet = null
+ $1.scope = text/x-csharp
+ $0.CSharpFormattingPolicy = $2
+ $2.inheritsSet = Mono
+ $2.inheritsScope = text/x-csharp
+ $2.scope = text/x-csharp
+ $0.TextStylePolicy = $3
+ $3.FileWidth = 120
+ $3.TabWidth = 4
+ $3.IndentWidth = 4
+ $3.EolMarker = Unix
+ $3.inheritsSet = Mono
+ $3.inheritsScope = text/plain
+ $3.scope = text/plain
+ EndGlobalSection
+
+EndGlobal
diff --git a/unityshinsoubanalice.userprefs b/unityshinsoubanalice.userprefs
new file mode 100644
index 000000000..441d29cf9
--- /dev/null
+++ b/unityshinsoubanalice.userprefs
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file