temp fixes and stability improvements
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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())
|
||||
{
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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<MeshFilter>();
|
||||
@@ -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<MeshFilter>();
|
||||
|
||||
@@ -6,6 +6,7 @@ using UnityEngine;
|
||||
// Token: 0x0200010D RID: 269
|
||||
public class GalleryInputNameWindow : BaseWindow
|
||||
{
|
||||
private Dictionary<string,int> 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<string, int>(1)
|
||||
this.dict = new Dictionary<string, int>(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)
|
||||
{
|
||||
|
||||
@@ -5,6 +5,8 @@ using UnityEngine;
|
||||
// Token: 0x02000111 RID: 273
|
||||
public abstract class GallerySelectWindow : BaseWindow
|
||||
{
|
||||
private Dictionary<string,int> 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<string, int>(13)
|
||||
this.dict = new Dictionary<string, int>(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)
|
||||
{
|
||||
|
||||
@@ -7,6 +7,8 @@ using UnityEngine;
|
||||
// Token: 0x02000113 RID: 275
|
||||
public class HelpWindow : BaseWindow
|
||||
{
|
||||
private Dictionary<string,int> 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<string, int>(1)
|
||||
this.dict = new Dictionary<string, int>(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)
|
||||
{
|
||||
|
||||
@@ -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<ImageObject>();
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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];
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -6,6 +6,8 @@ using UnityEngine;
|
||||
// Token: 0x0200011D RID: 285
|
||||
public class OptionBackWindow : OptionBaseWindow
|
||||
{
|
||||
private Dictionary<string,int> 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<string, int>(2)
|
||||
this.dict = new Dictionary<string, int>(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)
|
||||
{
|
||||
|
||||
@@ -6,6 +6,8 @@ using UnityEngine;
|
||||
// Token: 0x02000121 RID: 289
|
||||
public class OptionTextWindow : OptionBaseWindow
|
||||
{
|
||||
private Dictionary<string,int> 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<string, int>(10)
|
||||
this.dict = new Dictionary<string, int>(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)
|
||||
{
|
||||
|
||||
@@ -7,6 +7,8 @@ using UnityEngine;
|
||||
// Token: 0x02000122 RID: 290
|
||||
public class OptionVoiceWindow : OptionBaseWindow
|
||||
{
|
||||
private Dictionary<string,int> 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<string, int>(1)
|
||||
this.dict = new Dictionary<string, int>(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)
|
||||
{
|
||||
|
||||
@@ -6,6 +6,8 @@ using Qoo;
|
||||
// Token: 0x02000123 RID: 291
|
||||
public class PaymentDialogWindow : BaseWindow
|
||||
{
|
||||
private Dictionary<string,int> 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<string, int>(1)
|
||||
this.dict = new Dictionary<string, int>(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)
|
||||
{
|
||||
|
||||
@@ -6,6 +6,8 @@ using Qoo;
|
||||
// Token: 0x02000127 RID: 295
|
||||
public class PaymentListWindow : BaseWindow
|
||||
{
|
||||
private Dictionary<string,int> 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<string, int>(1)
|
||||
this.dict = new Dictionary<string, int>(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)
|
||||
{
|
||||
|
||||
@@ -2,4 +2,4 @@
|
||||
using System.Reflection;
|
||||
using System.Runtime.CompilerServices;
|
||||
|
||||
[assembly: AssemblyVersion("0.0.0.0")]
|
||||
//[assembly: AssemblyVersion("0.0.0.0")]
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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<string,int> dict = null;
|
||||
if (Func != null)
|
||||
{
|
||||
if (KsExec.<>f__switch$map1 == null)
|
||||
if (dict == null)
|
||||
{
|
||||
KsExec.<>f__switch$map1 = new Dictionary<string, int>(2)
|
||||
dict = new Dictionary<string, int>(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:
|
||||
|
||||
@@ -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++;
|
||||
|
||||
@@ -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; }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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<string> 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)
|
||||
{
|
||||
|
||||
@@ -156,7 +156,10 @@ public class SelectWnd : Singleton<SelectWnd>
|
||||
goto IL_1DB;
|
||||
}
|
||||
}
|
||||
goto IL_198;
|
||||
//goto IL_198;
|
||||
Singleton<Man2D>.Instance.RemoveSprite(this.m_LoveAnim);
|
||||
this.m_LoveAnim = null;
|
||||
goto IL_1DB;
|
||||
}
|
||||
yield return new WaitForSeconds(1f);
|
||||
IL_1DB:
|
||||
|
||||
@@ -5,6 +5,8 @@ using PaymentGameApi;
|
||||
// Token: 0x02000133 RID: 307
|
||||
public class TitleRestoreWindow : BaseWindow
|
||||
{
|
||||
private Dictionary<string,int> 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<string, int>(1)
|
||||
this.dict = new Dictionary<string, int>(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)
|
||||
{
|
||||
|
||||
@@ -10,6 +10,11 @@ public class UIActionButton : UIAction
|
||||
UIActionButton uiactionButton = go.AddComponent<UIActionButton>();
|
||||
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);
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user