ArnethMyndraavn/unityshinsoubanheart
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changes

Browse Source
This commit is contained in:
Arneth
2022-03-13 13:56:59 -04:00
parent f98eb96584
commit 2816ca2aff
128 changed files with 15790 additions and 1635 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scripts/Assembly-CSharp/AdventureMenuWindow.cs
+13 -5
View File
@@ -52,8 +52,8 @@ public class AdventureMenuWindow : SubTaskBaseWindow
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(Shader.Find("QO/Sprite") as Shader);
gameObject.renderer.material.mainTexture = tex;
gameObject.GetComponent<Renderer>().material = new Material(Shader.Find("QO/Sprite") as Shader);
gameObject.GetComponent<Renderer>().material.mainTexture = tex;
gameObject.transform.parent = base.transform;
float num3 = (float)tex.width * scale_w;
float num4 = (float)tex.height * scale_h;
@@ -138,7 +138,7 @@ public class AdventureMenuWindow : SubTaskBaseWindow
new BaseWindow.UIImage("Confirm", 136, 182, this.wndz + 3, "screen/common/sys_dialog", true, false),
new BaseWindow.UIButton("Confirm_YES", 312, 277, this.wndz + 4, "screen/common/dlog_btn_y", true, false, 1, 2, 0),
new BaseWindow.UIButton("Confirm_NO", 513, 277, this.wndz + 4, "screen/common/dlog_btn_n", true, false, 1, 2, 0),
new BaseWindow.UIText("Confirm_MSG", 480, 230, this.wndz + 4, "タイトル画面へ戻りますか？", 28, UnityTextSprite.PositionType.Center, UnityTextSprite.PositionType.TopLeft, byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue)
new BaseWindow.UIText("Confirm_MSG", 480, 230, this.wndz + 4, UnityApp.Instance.isJapanese ? "タイトル画面へ戻りますか？" : "Return to Title Screen？", 28, UnityTextSprite.PositionType.Center, UnityTextSprite.PositionType.TopLeft, byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue)
};
}
return new BaseWindow.UIComponent[]
@@ -157,7 +157,7 @@ public class AdventureMenuWindow : SubTaskBaseWindow
new BaseWindow.UIImage("Confirm", 136, 182, this.wndz + 3, "screen/common/sys_dialog", true, false),
new BaseWindow.UIButton("Confirm_YES", 312, 277, this.wndz + 4, "screen/common/dlog_btn_y", true, false, 1, 2, 0),
new BaseWindow.UIButton("Confirm_NO", 513, 277, this.wndz + 4, "screen/common/dlog_btn_n", true, false, 1, 2, 0),
new BaseWindow.UIText("Confirm_MSG", 480, 230, this.wndz + 4, "回想を停止しますか？", 28, UnityTextSprite.PositionType.Center, UnityTextSprite.PositionType.TopLeft, byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue)
new BaseWindow.UIText("Confirm_MSG", 480, UnityApp.Instance.isJapanese ? 230 : 210, this.wndz + 4, UnityApp.Instance.isJapanese ? "回想を停止しますか？" : "Do you want to stop\nreplaying this event？", 28, UnityTextSprite.PositionType.Center, UnityTextSprite.PositionType.TopLeft, byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue)
};
}
@@ -254,7 +254,15 @@ public class AdventureMenuWindow : SubTaskBaseWindow
base.GameObjectShow("CofirmCollision", show);
if (show)
{
this.SetText("Confirm_MSG", (!AdventureMenuWindow.IsNormal) ? "回想を停止しますか？" : "タイトル画面へ戻りますか？");
if (UnityApp.Instance.isJapanese)
{
this.SetText("Confirm_MSG", (!AdventureMenuWindow.IsNormal) ? "回想を停止しますか？" : "タイトル画面へ戻りますか？");
}
else
{
this.SetText("Confirm_MSG", (!AdventureMenuWindow.IsNormal) ? "Do you want to stop\nreplaying this event？" : "Return to Title Screen？");
}
}
else
{
Assets/Scripts/Assembly-CSharp/BaseWindow.cs
+8 -7
View File
@@ -247,9 +247,9 @@ public abstract class BaseWindow : MonoBehaviourWrap
ImageObject imageObject = ImageObject.Create(uiObject, base.transform, collisionEnable);
imageObject.RendererEnableAfterLoad = RendererEnableAfterLoad;
GameObject gameObject = imageObject.gameObject;
if (gameObject.collider != null)
if (gameObject.GetComponent<Collider>() != null)
{
gameObject.collider.enabled = (collisionEnable && RendererEnableAfterLoad);
gameObject.GetComponent<Collider>().enabled = (collisionEnable && RendererEnableAfterLoad);
}
this.UIGameObjectsDic.Add(gameObject.name, gameObject);
this.imageObjectList.Add(imageObject);
@@ -300,13 +300,13 @@ public abstract class BaseWindow : MonoBehaviourWrap
{
return;
}
if (go.renderer != null)
if (go.GetComponent<Renderer>() != null)
{
go.renderer.enabled = show;
go.GetComponent<Renderer>().enabled = show;
}
if (go.collider != null)
if (go.GetComponent<Collider>() != null)
{
go.collider.enabled = show;
go.GetComponent<Collider>().enabled = show;
}
}
@@ -573,7 +573,8 @@ public abstract class BaseWindow : MonoBehaviourWrap
GameObject gameObject = window.gameObject;
UnityTextSprite unityTextSprite = new UnityTextSprite(false, gameObject);
unityTextSprite.obj.name = this.name;
unityTextSprite.Show = false;
//Changed to true, revisit later
unityTextSprite.Show = true;
unityTextSprite.Font = Singleton<UnityGraph>.Instance.Font;
unityTextSprite.ClearText();
unityTextSprite.SetColor(this.color);
Assets/Scripts/Assembly-CSharp/CreateSprite.cs
+11 -11
View File
@@ -49,7 +49,7 @@ public class CreateSprite : MonoBehaviour
{
Mesh mesh = CreateSprite.CreateMesh();
mesh.RecalculateBounds();
mesh.Optimize();
;
return mesh;
}
@@ -70,21 +70,21 @@ public class CreateSprite : MonoBehaviour
{
obj.transform.localPosition = new Vector3(0f, 0f, -1000f);
obj.transform.localScale = new Vector3(1f, 1f, 1f);
obj.camera.orthographic = true;
obj.camera.orthographicSize = (float)(ScreenH / 2);
obj.camera.nearClipPlane = 0f;
obj.camera.farClipPlane = 20000f;
obj.camera.renderingPath = RenderingPath.VertexLit;
obj.camera.clearFlags = CameraClearFlags.Color;
obj.camera.backgroundColor = new Color(0f, 0f, 0f, 1f);
obj.GetComponent<Camera>().orthographic = true;
obj.GetComponent<Camera>().orthographicSize = (float)(ScreenH / 2);
obj.GetComponent<Camera>().nearClipPlane = 0f;
obj.GetComponent<Camera>().farClipPlane = 20000f;
obj.GetComponent<Camera>().renderingPath = RenderingPath.VertexLit;
obj.GetComponent<Camera>().clearFlags = CameraClearFlags.Color;
obj.GetComponent<Camera>().backgroundColor = new Color(0f, 0f, 0f, 1f);
if (IsSprite)
{
obj.camera.cullingMask &= 1 << LayerMask.NameToLayer("Sprite");
obj.camera.gameObject.layer = LayerMask.NameToLayer("Sprite");
obj.GetComponent<Camera>().cullingMask &= 1 << LayerMask.NameToLayer("Sprite");
obj.GetComponent<Camera>().gameObject.layer = LayerMask.NameToLayer("Sprite");
}
else
{
obj.camera.cullingMask &= ~(1 << LayerMask.NameToLayer("Sprite"));
obj.GetComponent<Camera>().cullingMask &= ~(1 << LayerMask.NameToLayer("Sprite"));
}
}
Assets/Scripts/Assembly-CSharp/CreditsWindow.cs
+406
View File
@@ -0,0 +1,406 @@
using System;
using System.Collections;
using System.Collections.Generic;
using Qoo;
using UnityEngine;
// Token: 0x02000113 RID: 275
public class CreditsWindow : BaseWindow
{
private Dictionary<string,int> dict = null;
// Token: 0x06000746 RID: 1862 RVA: 0x0001F45C File Offset: 0x0001D65C
protected sealed override string GetBGMName()
{
return "honobono1_a_ali";
}
// Token: 0x06000747 RID: 1863 RVA: 0x0001F464 File Offset: 0x0001D664
protected sealed override void OnAwake()
{
this.moveBackGround = new CreditsWindow.MoveBackGround();
this.pageManager = new CreditsWindow.PageManager(5);
}
// Token: 0x06000748 RID: 1864 RVA: 0x0001F480 File Offset: 0x0001D680
protected sealed override string[] newSceneTextureNameArray()
{
return new string[]
{
"screen/title/help_01",
"screen/title/help_02",
"screen/title/help_03",
"screen/title/help_04",
"screen/title/help_05",
"screen/common/cancel",
"screen/cgmemory/cgm_arwl",
"screen/cgmemory/cgm_arwr"
};
}
// Token: 0x06000749 RID: 1865 RVA: 0x0001F4D8 File Offset: 0x0001D6D8
protected sealed override void BeforeInit()
{
}
// Token: 0x0600074A RID: 1866 RVA: 0x0001F4DC File Offset: 0x0001D6DC
protected sealed override void AfterInit()
{
//this.moveBackGround.Init(base.GetGameObject("Before"), base.GetGameObject("After"), base.GetGameObject("BackGround"));
float delay = 0f;
int repeat = 0;
float speed = 0.8f;
//ImageObject imageObject = base.GetImageObject("ArrowL");
//imageObject.AddImageAnimation(new ImageAnimationLocalPosition(repeat, speed, delay, MoveType.LoopSin000to180, new Vector3(0f, 0f, 0f), new Vector3(-25f, 0f, 0f)));
//ImageObject imageObject2 = base.GetImageObject("ArrowR");
//imageObject2.AddImageAnimation(new ImageAnimationLocalPosition(repeat, speed, delay, MoveType.LoopSin000to180, new Vector3(0f, 0f, 0f), new Vector3(25f, 0f, 0f)));
}
// Token: 0x0600074B RID: 1867 RVA: 0x0001F5AC File Offset: 0x0001D7AC
protected sealed override BaseWindow.UIComponent[] newComponentArray()
{
//string currentFPath = this.pageManager.GetCurrentFPath();
return new BaseWindow.UIComponent[]
{
//new BaseWindow.UIImage("Before", 0, 0, this.wndz - 1, currentFPath, false, false),
//new BaseWindow.UIImage("After", 0, 0, this.wndz - 1, currentFPath, false, false),
//new BaseWindow.UIImage("BackGround", 0, 0, this.wndz, currentFPath, true, true),
new BaseWindow.UIImage("BackGround", 0, 0, this.wndz, "screen/title/cgm_bg_1", true, true),
new BaseWindow.UIText("Credits", 480, 0, this.wndz + 4, "English Translation Credits", 50, UnityTextSprite.PositionType.Center, UnityTextSprite.PositionType.TopLeft, byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue),
new BaseWindow.UIText("Credits_1", 10, 100, this.wndz + 4, "Administrator:\n *vocaotome\n *stellarroze \n\nImage Editor:\n *Spicy Diamond\n *Straydog12\n *vocaotome\n *Pandora \n *andi_91\n\nProgrammer:\n *Falaina\n\nTesters:\n *Eldiatricc\n *vocaotome", 20, UnityTextSprite.PositionType.TopLeft, UnityTextSprite.PositionType.TopLeft, byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue),
new BaseWindow.UIText("Credits_2", 255, 100, this.wndz + 4, "Translators:\n *vocaotome \n *final_account\n *Kaylin \n *Aubrey\n *Noriri\n *HakaiEve\n *Yukihime\n *Spinster\n *Chirigirl13\n *Shinsuki\n *Ciara\n *amuletcross\n *NuitNoire\n *Atikal07\n *Neri\n *ask-the-mock-turtle", 20, UnityTextSprite.PositionType.TopLeft, UnityTextSprite.PositionType.TopLeft, byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue),
new BaseWindow.UIText("Credits_3", 510, 100, this.wndz + 4, "Editors:\n *Hattingmad\n *Eldiatricc\n *Shay\n *Liza\n *Mimi\n *Lucy\n *Jes\n *Shinsuki\n *Suzubelle-chan\n *Pandora\n *Daeyamati\n *Kytana\n\nTranslation-Checkers:\n *vocaotome", 20, UnityTextSprite.PositionType.TopLeft, UnityTextSprite.PositionType.TopLeft, byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue),
new BaseWindow.UIText("Credits_4", 765, 100, this.wndz + 4, "Proof-Readers:\n *sonic\n *Shay\n *Shinsuki\n *Liza\n *Grimm\n *Mio\n *Maisa\n *Marie\n *Mellissa \n *Jes\n *Ayame Jay\n *Kyatana\n\nSpecial Thanks:\n *yu_eriyama\n *yuvie", 20, UnityTextSprite.PositionType.TopLeft, UnityTextSprite.PositionType.TopLeft, byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue),
new BaseWindow.UIButton("Cancel", 887, 6, this.wndz + 3, "screen/common/cancel", true, true, 1, 2, 0),
//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)
};
}
// Token: 0x0600074C RID: 1868 RVA: 0x0001F684 File Offset: 0x0001D884
protected sealed override void OnBaseWindowOnButton(string obj)
{
if (obj != null)
{
if (this.dict == null)
{
this.dict = new Dictionary<string, int>(1)
{
{
"Cancel",
0
}
};
}
int num;
if (this.dict.TryGetValue(obj, out num))
{
if (num == 0)
{
base.PlaySE_Cancel();
SceneManager.BackScene();
}
}
}
}
// Token: 0x0600074D RID: 1869 RVA: 0x0001F6EC File Offset: 0x0001D8EC
protected override void OnBaseWindowUpdate()
{
if (this.moveBackGround.Moving)
{
if (!this.moveBackGround.Update())
{
base.SetTexture("BackGround", "screen/title/" + this.pageManager.GetCurrentFPath());
}
return;
}
INPUT_STATUS status = UnityApp.Input.Status;
if (status == INPUT_STATUS.DRAG || status == INPUT_STATUS.FLICK)
{
//this.OnFlick(UnityApp.Input.SlideDragVector);
}
}
// Token: 0x0600074E RID: 1870 RVA: 0x0001F770 File Offset: 0x0001D970
/*private void OnFlick(SLIDE_VECTOR slide)
{
string currentFPath = this.pageManager.GetCurrentFPath();
if (slide != SLIDE_VECTOR.LEFT)
{
if (slide == SLIDE_VECTOR.RIGHT)
{
base.PlaySE_Select();
this.pageManager.Left();
}
}
else
{
base.PlaySE_Select();
this.pageManager.Right();
}
string currentFPath2 = this.pageManager.GetCurrentFPath();
if (currentFPath2 != currentFPath)
{
Qoo.Debug.Print(currentFPath2);
this.ChangeBG(currentFPath, currentFPath2, slide);
}
}*/
// Token: 0x0600074F RID: 1871 RVA: 0x0001F7F4 File Offset: 0x0001D9F4
private void ChangeBG(string beforePath, string afterPath, SLIDE_VECTOR slide)
{
this.moveBackGround.ChangeBG(beforePath, afterPath, slide);
if (this.moveBackGround.Update())
{
base.StartCoroutine(this.TransitionCoroutine(this.moveBackGround.param));
}
}
// Token: 0x06000750 RID: 1872 RVA: 0x0001F838 File Offset: 0x0001DA38
private IEnumerator TransitionCoroutine(CreditsWindow.TransitionParam param)
{
EffectManager.Init(param.effectName, 500, param.renderer, param.before, param.after);
yield return base.StartCoroutine(EffectManager.StartEffect());
param.action();
yield break;
}
// Token: 0x040006A8 RID: 1704
private readonly int wndz;
// Token: 0x040006A9 RID: 1705
private CreditsWindow.MoveBackGround moveBackGround;
// Token: 0x040006AA RID: 1706
private CreditsWindow.PageManager pageManager;
// Token: 0x02000114 RID: 276
private class PageManager
{
// Token: 0x06000751 RID: 1873 RVA: 0x0001F864 File Offset: 0x0001DA64
public PageManager(int pageMax_)
{
this.page = 0;
this.pageMax = pageMax_;
}
// Token: 0x06000752 RID: 1874 RVA: 0x0001F87C File Offset: 0x0001DA7C
public string GetCurrentFPath()
{
return this.getName(this.page);
}
// Token: 0x06000753 RID: 1875 RVA: 0x0001F88C File Offset: 0x0001DA8C
public string LeftFPath()
{
return this.getName(this.getLeft());
}
// Token: 0x06000754 RID: 1876 RVA: 0x0001F89C File Offset: 0x0001DA9C
public string RightFPath()
{
return this.getName(this.getRight());
}
// Token: 0x06000755 RID: 1877 RVA: 0x0001F8AC File Offset: 0x0001DAAC
public void Left()
{
this.page = this.getLeft();
}
// Token: 0x06000756 RID: 1878 RVA: 0x0001F8BC File Offset: 0x0001DABC
public void Right()
{
this.page = this.getRight();
}
// Token: 0x06000757 RID: 1879 RVA: 0x0001F8CC File Offset: 0x0001DACC
private string getName(int page)
{
return (page + 1).ToString("screen/title/help_00");
}
// Token: 0x06000758 RID: 1880 RVA: 0x0001F8EC File Offset: 0x0001DAEC
private int getLeft()
{
return (this.page != 0) ? (this.page - 1) : (this.pageMax - 1);
}
// Token: 0x06000759 RID: 1881 RVA: 0x0001F91C File Offset: 0x0001DB1C
private int getRight()
{
return (this.page != this.pageMax - 1) ? (this.page + 1) : 0;
}
// Token: 0x040006AC RID: 1708
private int page;
// Token: 0x040006AD RID: 1709
private int pageMax;
}
// Token: 0x02000115 RID: 277
private class MoveImage
{
// Token: 0x0600075A RID: 1882 RVA: 0x0001F940 File Offset: 0x0001DB40
public MoveImage()
{
this.go = null;
}
// Token: 0x0600075B RID: 1883 RVA: 0x0001F950 File Offset: 0x0001DB50
public void Init(GameObject go_)
{
this.go = go_;
}
// Token: 0x0600075C RID: 1884 RVA: 0x0001F95C File Offset: 0x0001DB5C
public void SetTexture(string fpath)
{
ImageObject component = this.go.GetComponent<ImageObject>();
if (component == null)
{
return;
}
component.SetTexture("screen/title/" + fpath);
}
// Token: 0x0600075D RID: 1885 RVA: 0x0001F994 File Offset: 0x0001DB94
public Texture Texture()
{
ImageObject component = this.go.GetComponent<ImageObject>();
if (component == null)
{
return null;
}
return component.Texture;
}
// Token: 0x040006AE RID: 1710
private GameObject go;
}
// Token: 0x02000116 RID: 278
private class TransitionParam
{
// Token: 0x0600075E RID: 1886 RVA: 0x0001F9C4 File Offset: 0x0001DBC4
public TransitionParam(string effectName_ = null, Texture before_ = null, Texture after_ = null, Renderer renderer_ = null, Action action_ = null)
{
this.effectName = effectName_;
this.before = before_;
this.after = after_;
this.renderer = renderer_;
this.action = action_;
}
// Token: 0x040006AF RID: 1711
public string effectName;
// Token: 0x040006B0 RID: 1712
public Texture before;
// Token: 0x040006B1 RID: 1713
public Texture after;
// Token: 0x040006B2 RID: 1714
public Renderer renderer;
// Token: 0x040006B3 RID: 1715
public Action action;
}
// Token: 0x02000117 RID: 279
private class MoveBackGround
{
// Token: 0x0600075F RID: 1887 RVA: 0x0001F9F4 File Offset: 0x0001DBF4
public MoveBackGround()
{
this.param = null;
this.before = new CreditsWindow.MoveImage();
this.after = new CreditsWindow.MoveImage();
this.moving = false;
}
// Token: 0x170000DE RID: 222
// (get) Token: 0x06000760 RID: 1888 RVA: 0x0001FA2C File Offset: 0x0001DC2C
public bool Moving
{
get
{
return this.moving;
}
}
// Token: 0x06000761 RID: 1889 RVA: 0x0001FA34 File Offset: 0x0001DC34
public void Init(GameObject before_, GameObject after_, GameObject bg_)
{
this.before.Init(before_);
this.after.Init(after_);
ImageObject component = bg_.GetComponent<ImageObject>();
if (component == null)
{
return;
}
this.renderer = component.GetComponent<Renderer>();
}
// Token: 0x06000762 RID: 1890 RVA: 0x0001FA7C File Offset: 0x0001DC7C
public void ChangeBG(string beforePath, string afterPath, SLIDE_VECTOR slide)
{
string text = this.calcVector(slide);
this.before.SetTexture(beforePath);
this.after.SetTexture(afterPath);
if (text != null)
{
this.moving = true;
this.param = new CreditsWindow.TransitionParam(text, this.before.Texture(), this.after.Texture(), this.renderer, new Action(this.SetTransitionFinish));
}
}
// Token: 0x06000763 RID: 1891 RVA: 0x0001FAEC File Offset: 0x0001DCEC
public bool Update()
{
return this.moving;
}
// Token: 0x06000764 RID: 1892 RVA: 0x0001FAF4 File Offset: 0x0001DCF4
private string calcVector(SLIDE_VECTOR slide)
{
switch (slide)
{
case SLIDE_VECTOR.LEFT:
return "/bytes/effect/grad_r";
case SLIDE_VECTOR.RIGHT:
return "/bytes/effect/grad_l";
case SLIDE_VECTOR.UP:
return "/bytes/effect/grad_d";
case SLIDE_VECTOR.DOWN:
return "/bytes/effect/grad_u";
default:
return null;
}
}
// Token: 0x06000765 RID: 1893 RVA: 0x0001FB3C File Offset: 0x0001DD3C
private void SetTransitionFinish()
{
this.moving = false;
}
// Token: 0x040006B4 RID: 1716
public CreditsWindow.TransitionParam param;
// Token: 0x040006B5 RID: 1717
private CreditsWindow.MoveImage before;
// Token: 0x040006B6 RID: 1718
private CreditsWindow.MoveImage after;
// Token: 0x040006B7 RID: 1719
private Renderer renderer;
// Token: 0x040006B8 RID: 1720
private bool moving;
}
}
Assets/Scripts/Assembly-CSharp/EffectManager.cs
-1
View File
@@ -253,7 +253,6 @@ public class EffectManager : MonoBehaviour
// Token: 0x060008E4 RID: 2276 RVA: 0x0002728C File Offset: 0x0002548C
private static IEnumerator loadTexture()
{
Debug.LogWarning (EffectManager.Instance.EffectName);
string path = Application.streamingAssetsPath + Pathing.ToPlatformAssetBundleName(EffectManager.Instance.EffectName);
byte[] data = System.IO.File.ReadAllBytes(path + ".png");
Texture2D tex = new Texture2D(0, 0, TextureFormat.RGBA32, false, true);
Assets/Scripts/Assembly-CSharp/GalleryCGWindow.cs
+4 -4
View File
@@ -330,10 +330,10 @@ public class GalleryCGWindow : BaseWindow
// Token: 0x060006DD RID: 1757 RVA: 0x0001CFF8 File Offset: 0x0001B1F8
public void SetRendererEnable(bool lr, bool ud)
{
this.gameObject[0].renderer.enabled = lr;
this.gameObject[1].renderer.enabled = lr;
this.gameObject[2].renderer.enabled = ud;
this.gameObject[3].renderer.enabled = ud;
this.gameObject[0].GetComponent<Renderer>().enabled = lr;
this.gameObject[1].GetComponent<Renderer>().enabled = lr;
this.gameObject[2].GetComponent<Renderer>().enabled = ud;
this.gameObject[3].GetComponent<Renderer>().enabled = ud;
}
// Token: 0x0400066D RID: 1645
Assets/Scripts/Assembly-CSharp/GalleryInputNameDialogWindow.cs
+33 -14
View File
@@ -119,23 +119,42 @@ public class GalleryInputNameDialogWindow : BaseWindow
switch (this.type)
{
case GalleryInputNameDialogType.EMPTY:
return "名前が入力されていません。";
return UnityApp.Instance.isJapanese ? "名前が入力されていません。" : "No name entered";
case GalleryInputNameDialogType.OVER:
return "入力できる名前は７文字までです。";
return UnityApp.Instance.isJapanese ? "入力できる名前は７文字までです。" : "You can enter up to 7 characters";
case GalleryInputNameDialogType.INVALIDCHAR:
return "表示できない文字が含まれています。";
return UnityApp.Instance.isJapanese ? "表示できない文字が含まれています。" : "Input contains characters that cannot be displayed";
case GalleryInputNameDialogType.CONFIRM:
if (line == 0)
{
string galleryInputNameDialog_Name = UIValue.GalleryInputNameDialog_Name;
string paramString = GameData.GetParamString("familyname", string.Empty);
return string.Format("「{0}＝{1}」です。", galleryInputNameDialog_Name, paramString);
}
if (line != 1)
{
return string.Empty;
}
return "よろしいですか？";
if (UnityApp.Instance.isJapanese)
{
if (line == 0)
{
string galleryInputNameDialog_Name = UIValue.GalleryInputNameDialog_Name;
string paramString = GameData.GetParamString("familyname", string.Empty);
return string.Format("「{0}＝{1}」です。", galleryInputNameDialog_Name, paramString);
}
if (line != 1)
{
return string.Empty;
}
return "よろしいですか？";
}
else
{
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);
}
if (line != 1)
{
return string.Empty;
}
return string.Empty;
}
default:
return string.Empty;
}
Assets/Scripts/Assembly-CSharp/GalleryInputNameKeyboardWindow.cs
+4 -3
View File
@@ -15,14 +15,15 @@ public class GalleryInputNameKeyboardWindow : BaseWindow
public IEnumerator Run()
{
string initvalue = UIValue.GalleryInputNameDialog_Name;
switch (Application.platform)
yield return NameInputKeyboard.Open(initvalue, false);
/*switch (Application.platform)
{
case RuntimePlatform.IPhonePlayer:
case RuntimePlatform.Android:
yield return NameInputKeyboard.Open(initvalue, false);
goto IL_82;
}
NameInputKeyboard.DebugInputText = initvalue;
}*/
//NameInputKeyboard.DebugInputText = initvalue;
IL_82:
UIValue.GalleryInputNameDialog_Name = NameInputKeyboard.InputText;
UIValue.GalleryInputNameDialog_Exit = GalleryInputNameDialogExitType.INPUT;
Assets/Scripts/Assembly-CSharp/GalleryMovieWindow.cs
+1 -1
View File
@@ -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", ""));
yield return base.StartCoroutine(MovieManager.PlayMovie("mp4/high/op_movie.mp4", this.gameObject));
this.state = GalleryMovieWindow.STATE.END;
yield break;
}
Assets/Scripts/Assembly-CSharp/HelpWindow.cs
+1 -1
View File
@@ -336,7 +336,7 @@ public class HelpWindow : BaseWindow
{
return;
}
this.renderer = component.renderer;
this.renderer = component.GetComponent<Renderer>();
}
// Token: 0x06000762 RID: 1890 RVA: 0x0001FA7C File Offset: 0x0001DC7C
Assets/Scripts/Assembly-CSharp/ImageObject.cs
+7 -7
View File
@@ -85,9 +85,9 @@ public class ImageObject : MonoBehaviour
{
GameObject gameObject = GameObject.CreatePrimitive(PrimitiveType.Quad);
//gameObject.renderer.material = new Material(Resources.Load("Shader/Sprite/Sprite") as Shader);
gameObject.renderer.material = new Material(Shader.Find("QO/Sprite") as Shader);
gameObject.GetComponent<Renderer>().material = new Material(Shader.Find("QO/Sprite") as Shader);
gameObject.transform.parent = parent;
gameObject.collider.enabled = collisionEnable;
gameObject.GetComponent<Collider>().enabled = collisionEnable;
ImageObject imageObject = gameObject.AddComponent<ImageObject>();
imageObject.UIObject = uiObject;
imageObject.InitObject(true, uiObject);
@@ -119,7 +119,7 @@ public class ImageObject : MonoBehaviour
{
GraphicManager.ReleaseTexture(this.imageUnityTexture);
this.imageUnityTexture = null;
base.renderer.material.mainTexture = null;
base.GetComponent<Renderer>().material.mainTexture = null;
}
this.changeTexture = true;
this.UIObject.UITexture.TexturePath = texturePath;
@@ -180,7 +180,7 @@ public class ImageObject : MonoBehaviour
int num2 = this.ImageBlockIndex % this.UIObject.UITexture.BlockNum + 1;
Vector2 vector = new Vector2(1f / (float)this.UIObject.UITexture.BlockX, 1f / (float)this.UIObject.UITexture.BlockY);
Vector2 vector2 = new Vector2(1f - vector.x * (float)num, 1f - vector.y * (float)num2);
base.transform.renderer.material.SetVector("_UVWH", new Vector4(vector2.x, vector2.y, vector.x, vector.y));
base.transform.GetComponent<Renderer>().material.SetVector("_UVWH", new Vector4(vector2.x, vector2.y, vector.x, vector.y));
}
// Token: 0x06000BC8 RID: 3016 RVA: 0x00031B74 File Offset: 0x0002FD74
@@ -188,17 +188,17 @@ public class ImageObject : MonoBehaviour
{
this.loadCompleted = true;
this.imageUnityTexture = unityTexture;
base.renderer.material.mainTexture = unityTexture.m_Texture;
base.GetComponent<Renderer>().material.mainTexture = unityTexture.m_Texture;
// TODO issue with changeTexture, fix later
//base.renderer.enabled = (this.changeTexture && this.rendererEnableAfterLoad);
base.renderer.enabled = this.rendererEnableAfterLoad;
base.GetComponent<Renderer>().enabled = this.rendererEnableAfterLoad;
this.OnTextureLoadComplete2();
}
// Token: 0x06000BC9 RID: 3017 RVA: 0x00031BD0 File Offset: 0x0002FDD0
public void ApplyRendererEnableAfterLoad()
{
base.renderer.enabled = this.rendererEnableAfterLoad;
base.GetComponent<Renderer>().enabled = this.rendererEnableAfterLoad;
}
// Token: 0x06000BCA RID: 3018 RVA: 0x00031BE4 File Offset: 0x0002FDE4
Assets/Scripts/Assembly-CSharp/ImageObject2.cs
+9 -9
View File
@@ -79,11 +79,11 @@ public class ImageObject2
{
get
{
return this.m_GameObject.collider.enabled;
return this.m_GameObject.GetComponent<Collider>().enabled;
}
set
{
this.m_GameObject.collider.enabled = value;
this.m_GameObject.GetComponent<Collider>().enabled = value;
}
}
@@ -94,11 +94,11 @@ public class ImageObject2
{
get
{
return this.m_GameObject.renderer.enabled;
return this.m_GameObject.GetComponent<Renderer>().enabled;
}
set
{
this.m_GameObject.collider.enabled = value;
this.m_GameObject.GetComponent<Collider>().enabled = value;
}
}
@@ -117,7 +117,7 @@ public class ImageObject2
{
GameObject gameObject = GameObject.CreatePrimitive(PrimitiveType.Quad);
//gameObject.renderer.material = new Material(Resources.Load("Shader/Sprite/Sprite") as Shader);
gameObject.renderer.material = new Material(Shader.Find("QO/Sprite") as Shader);
gameObject.GetComponent<Renderer>().material = new Material(Shader.Find("QO/Sprite") as Shader);
gameObject.name = name;
gameObject.transform.parent = parent;
return new ImageObject2(gameObject, x, y, z, uniTex);
@@ -126,8 +126,8 @@ public class ImageObject2
// Token: 0x06000BDB RID: 3035 RVA: 0x00031E0C File Offset: 0x0003000C
public void Hidden(bool hidden)
{
this.m_GameObject.renderer.enabled = !hidden;
this.m_GameObject.collider.enabled = !hidden;
this.m_GameObject.GetComponent<Renderer>().enabled = !hidden;
this.m_GameObject.GetComponent<Collider>().enabled = !hidden;
}
// Token: 0x06000BDC RID: 3036 RVA: 0x00031E44 File Offset: 0x00030044
@@ -171,7 +171,7 @@ public class ImageObject2
{
return;
}
this.m_GameObject.renderer.material.mainTexture = this.m_UniTex.m_Texture;
this.m_GameObject.GetComponent<Renderer>().material.mainTexture = this.m_UniTex.m_Texture;
if (fixedTexture)
{
this.FixedTexture();
@@ -188,7 +188,7 @@ public class ImageObject2
public void SetTextureUVWH(Vector4 uvwh)
{
this.m_UVWH = uvwh;
this.m_GameObject.renderer.material.SetVector("_UVWH", this.m_UVWH);
this.m_GameObject.GetComponent<Renderer>().material.SetVector("_UVWH", this.m_UVWH);
}
// Token: 0x06000BE4 RID: 3044 RVA: 0x00031F30 File Offset: 0x00030130
Assets/Scripts/Assembly-CSharp/IntroductionWindow.cs
+3 -3
View File
@@ -71,7 +71,7 @@ public class IntroductionWindow : BaseWindow
new BaseWindow.UIImage("DummyMessage", 304, 275, this.wndz + 1, filenameMessage, false, false),
new BaseWindow.UIImage("BackGround", 0, 0, this.wndz, filenameBackGround, false, true),
new BaseWindow.UIImage("Message", 304, 275, this.wndz + 1, filenameMessage, false, true),
new BaseWindow.UIButton("Start", 465, 172, this.wndz + 1, filenameButton, true, this.GetStartButtonShow(), 1, 2, 0),
//new BaseWindow.UIButton("Start", 465, 172, this.wndz + 1, filenameButton, true, this.GetStartButtonShow(), 1, 2, 0),
new BaseWindow.UIImage("SampleVoice", 50, 423, this.wndz + 1, "screen/title/kyara_voice", true, voiceButtonShow),
new BaseWindow.UIButton("SampleVoice1", 45, 460, this.wndz + 1, "screen/sysmenu/sys_smv", true, voiceButtonShow, 1, 2, 0),
new BaseWindow.UIButton("SampleVoice2", 127, 460, this.wndz + 1, "screen/sysmenu/sys_smv", true, voiceButtonShow, 1, 2, 0),
@@ -92,7 +92,7 @@ public class IntroductionWindow : BaseWindow
return;
}
this.SetCharaTexture(string.Empty);
base.SetTexture("Start", this.GetFilenameButton());
//base.SetTexture("Start", this.GetFilenameButton());
this.SetButtonShow();
base.RestartAnimation("ArrowL");
base.RestartAnimation("ArrowR");
@@ -153,7 +153,7 @@ public class IntroductionWindow : BaseWindow
base.GameObjectShow("SampleVoice1", voiceButtonShow);
base.GameObjectShow("SampleVoice2", voiceButtonShow);
base.GameObjectShow("SampleVoice3", voiceButtonShow);
base.GameObjectShow("Start", this.GetStartButtonShow());
//base.GameObjectShow("Start", this.GetStartButtonShow());
}
// Token: 0x0600076F RID: 1903 RVA: 0x00020184 File Offset: 0x0001E384
Assets/Scripts/Assembly-CSharp/ListItemObject.cs
+6 -6
View File
@@ -30,7 +30,7 @@ public class ListItemObject : MonoBehaviour
// Token: 0x06000646 RID: 1606 RVA: 0x0001A064 File Offset: 0x00018264
private IEnumerator WaitLoadTextureCoroutine()
{
while (base.renderer.material.mainTexture == null)
while (base.GetComponent<Renderer>().material.mainTexture == null)
{
yield return 0;
}
@@ -67,10 +67,10 @@ public class ListItemObject : MonoBehaviour
this.m_ImageObject.OriginalPosition = base.transform.localPosition;
this.m_ImageObject.OnViewPosition = this.m_ImageObject.OriginalPosition;
this.m_ImageObject.OnViewScale = this.m_ImageObject.OriginalScale;
if (base.renderer.material.mainTexture != null)
if (base.GetComponent<Renderer>().material.mainTexture != null)
{
localScale.x = (float)base.renderer.material.mainTexture.width;
localScale.y = (float)base.renderer.material.mainTexture.height;
localScale.x = (float)base.GetComponent<Renderer>().material.mainTexture.width;
localScale.y = (float)base.GetComponent<Renderer>().material.mainTexture.height;
base.transform.localScale = localScale;
this.scaling();
this.positioning();
@@ -126,11 +126,11 @@ public class ListItemObject : MonoBehaviour
float num = this.ListViewScale.y / this.m_ImageObject.OriginalScale.y;
if (this.isBotOver)
{
base.renderer.material.SetVector("_UVWH", new Vector4(0f, 1f - num, 1f, num));
base.GetComponent<Renderer>().material.SetVector("_UVWH", new Vector4(0f, 1f - num, 1f, num));
}
else
{
base.renderer.material.SetVector("_UVWH", new Vector4(0f, 0f, 1f, num));
base.GetComponent<Renderer>().material.SetVector("_UVWH", new Vector4(0f, 0f, 1f, num));
}
}
Assets/Scripts/Assembly-CSharp/LogoMovieWindow.cs
+1 -1
View File
@@ -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", ""));
yield return base.StartCoroutine(MovieManager.PlayMovie("mp4/normal/quinrose_logo_8.mp4", this.gameObject));
this.state = LogoMovieWindow.STATE.END;
yield break;
}
Assets/Scripts/Assembly-CSharp/Man2D.cs
+9 -11
View File
@@ -51,16 +51,14 @@ public class Man2D : Singleton<Man2D>
private void OnEnable()
{
this.m_Sprite.Enable();
//TODO determine why camera breaks
base.camera.enabled = true;
//base.camera.enabled = false;
base.GetComponent<Camera>().enabled = true;
}
// Token: 0x06000978 RID: 2424 RVA: 0x00029EF4 File Offset: 0x000280F4
private void OnDisable()
{
this.m_Sprite.Disable();
base.camera.enabled = false;
base.GetComponent<Camera>().enabled = false;
}
// Token: 0x06000979 RID: 2425 RVA: 0x00029F10 File Offset: 0x00028110
@@ -266,7 +264,7 @@ public class Man2D : Singleton<Man2D>
// Token: 0x0600098E RID: 2446 RVA: 0x0002A2A4 File Offset: 0x000284A4
public void UpdateFrameBuffer()
{
if (base.camera.targetTexture != null && this.m_FrameBufferAr[this.m_nFrameNo] != null)
if (base.GetComponent<Camera>().targetTexture != null && this.m_FrameBufferAr[this.m_nFrameNo] != null)
{
this.m_FrameBufferAr[this.m_nFrameNo].IsReady = true;
}
@@ -277,7 +275,7 @@ public class Man2D : Singleton<Man2D>
}
if (this.m_FrameBufferAr[this.m_nFrameNo] != null)
{
base.camera.targetTexture = this.m_FrameBufferAr[this.m_nFrameNo].Tex;
base.GetComponent<Camera>().targetTexture = this.m_FrameBufferAr[this.m_nFrameNo].Tex;
}
}
@@ -286,15 +284,15 @@ public class Man2D : Singleton<Man2D>
{
base.gameObject.AddComponent<Camera>();
CreateSprite.CreateSpriteCamera(base.gameObject, this.m_nScreenH, true);
base.gameObject.camera.aspect = 1.7647059f;
base.gameObject.GetComponent<Camera>().aspect = 1.7647059f;
}
// Token: 0x06000990 RID: 2448 RVA: 0x0002A390 File Offset: 0x00028590
private void CreateSpriteManager()
{
this.m_Sprite = new ManSprite();
float z = base.camera.transform.localPosition.z;
this.m_Sprite.SetZ(base.camera.nearClipPlane + z, base.camera.farClipPlane + z);
float z = base.GetComponent<Camera>().transform.localPosition.z;
this.m_Sprite.SetZ(base.GetComponent<Camera>().nearClipPlane + z, base.GetComponent<Camera>().farClipPlane + z);
this.m_Sprite.SetScreenSize(this.m_nScreenW, this.m_nScreenH);
}
@@ -316,14 +314,14 @@ public class Man2D : Singleton<Man2D>
this.m_FrameBufferAr[i] = new FrameBuffer(w, h, "2D Sprite FrameBuffer" + i);
}
this.m_nFrameNo = 0;
base.camera.targetTexture = this.m_FrameBufferAr[this.m_nFrameNo].Tex;
base.GetComponent<Camera>().targetTexture = this.m_FrameBufferAr[this.m_nFrameNo].Tex;
}
// Token: 0x06000992 RID: 2450 RVA: 0x0002A4B8 File Offset: 0x000286B8
public void ReleaseFrameBuffer()
{
Qoo.Debug.Print("Release Frame Buffer");
base.camera.targetTexture = null;
base.GetComponent<Camera>().targetTexture = null;
for (int i = 0; i < this.m_FrameBufferAr.Length; i++)
{
if (this.m_FrameBufferAr[i] != null)
Assets/Scripts/Assembly-CSharp/Meter.cs
+1 -1
View File
@@ -27,7 +27,7 @@ public class Meter : MonoBehaviour
// Token: 0x0600064F RID: 1615 RVA: 0x0001A4D0 File Offset: 0x000186D0
protected virtual IEnumerator WaitLoadTextureCoroutine()
{
while (base.gameObject.renderer.material.mainTexture == null)
while (base.gameObject.GetComponent<Renderer>().material.mainTexture == null)
{
yield return 0;
}
Assets/Scripts/Assembly-CSharp/MeterCollider.cs
+2 -2
View File
@@ -16,7 +16,7 @@ public class MeterCollider : MonoBehaviour
// Token: 0x06000656 RID: 1622 RVA: 0x0001A5E0 File Offset: 0x000187E0
private IEnumerator WaitLoadTextureCoroutine()
{
while (this.m_MeterObject.renderer.material.mainTexture == null)
while (this.m_MeterObject.GetComponent<Renderer>().material.mainTexture == null)
{
yield return 0;
}
@@ -27,7 +27,7 @@ public class MeterCollider : MonoBehaviour
{
this.m_Collider = base.gameObject.AddComponent<BoxCollider>();
}
this.m_Collider.size = new Vector3((float)this.m_MeterObject.renderer.material.mainTexture.width, (float)this.m_MeterObject.renderer.material.mainTexture.height, 1f);
this.m_Collider.size = new Vector3((float)this.m_MeterObject.GetComponent<Renderer>().material.mainTexture.width, (float)this.m_MeterObject.GetComponent<Renderer>().material.mainTexture.height, 1f);
this.m_Collider.center = new Vector3(0f, 0f, -3f);
this.m_ImageObject = this.m_MeterObject.GetComponent<ImageObject>();
yield break;
Assets/Scripts/Assembly-CSharp/MovieManager.cs
+56 -2
View File
@@ -1,9 +1,10 @@
using System;
using System.Collections;
using UnityEngine;
using UnityEngine.Video;
// Token: 0x0200017E RID: 382
public class MovieManager
public static class MovieManager
{
//TODO fix movie playing. either make platform specific versions OR make platform agnostic
@@ -15,11 +16,64 @@ public class MovieManager
yield break;
}*/
public static IEnumerator PlayMovie(string path, string mode)
//public static IEnumerator PlayMovie(string path, string mode)
public static IEnumerator PlayMovie(string filePath, GameObject gameObject)
{
int m_width = 960;
int m_height = 544;
yield return 0;
yield return 0;
UnitySprite movieFrame = new UnitySprite(false, gameObject, false);
movieFrame.CalcRenderImageOffset(m_width, m_height);
movieFrame.Update(m_width, m_height, 10f);
movieFrame.SetName("Movie Frame");
//NewCode
string path = filePath;
if (path.IndexOf('/') == 0)
{
path = path.Substring(1);
}
string pathExt = System.IO.Path.GetExtension(path);
path = path.Substring(0, path.Length - pathExt.Length);
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.isLooping = false;
movieFrame.SetMaterial(newMat, 960, 544);
m_tex.renderMode = UnityEngine.Video.VideoRenderMode.MaterialOverride;
//OLD Code
//movieFrame.SetMaterial(movie.Play(name, MOVIE_TEX_TYPE.ADD, false), 960, 544);
//yield return 0;
//while (movie.IsPlay)
//m_tex.Play();
yield return 0;
while (!m_tex.isPrepared)
{
yield return 0;
}
yield return 0;
while (m_tex.isPlaying || !m_tex.isPrepared)
{
if (Input.GetMouseButtonDown(0))
{
break;
}
movieFrame.CalcRenderImageOffset(m_width, m_height);
movieFrame.Update(m_width, m_height, 10f);
yield return 0;
}
//GameObject.Destroy(gameObject);
//Handheld.PlayFullScreenMovie(path, Color.black, mode);
yield return 0;
yield break;
}
}
Assets/Scripts/Assembly-CSharp/MovieTex.cs
+31 -10
View File
@@ -1,6 +1,7 @@
using System;
using Qoo;
using UnityEngine;
using UnityEngine.Video;
// Token: 0x02000180 RID: 384
public class MovieTex : MonoBehaviour
@@ -34,10 +35,25 @@ public class MovieTex : MonoBehaviour
{
path = path.Substring(1);
}
this.m_tex = base.gameObject.AddComponent<MobileMovieTexture>();
this.m_tex.m_path = path;
this.m_tex.m_loop = isLoop;
if (eType != MOVIE_TEX_TYPE.NORMAL)
string pathExt = System.IO.Path.GetExtension(path);
path = path.Substring(0, path.Length - pathExt.Length);
//this.m_tex = base.gameObject.AddComponent<MobileMovieTexture>();
this.m_tex = base.gameObject.AddComponent<VideoPlayer>();
this.m_tex.playOnAwake = false;
Material newMat = new Material(Shader.Find("QO/Sprite") as Shader);
/*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.isLooping = isLoop;
this.m_tex.renderMode = UnityEngine.Video.VideoRenderMode.MaterialOverride;
//this.m_tex.targetMaterialRenderer = newMat;
this.m_tex.Play();
//GameObject.Find();
/*if (eType != MOVIE_TEX_TYPE.NORMAL)
{
if (eType != MOVIE_TEX_TYPE.ADD)
{
@@ -46,15 +62,19 @@ public class MovieTex : MonoBehaviour
}
else
{
this.m_tex.m_movieMaterial = new Material(Resources.Load("Shader/Movie/YCrCbtoRGB Add") as Shader);
//this.m_tex.m_movieMaterial = new Material(Resources.Load("Shader/Movie/YCrCbtoRGB Add") as Shader);
this.m_tex.m_movieMaterial = new Material(Shader.Find("QO/Sprite") as Shader);
}
}
else
{
this.m_tex.m_movieMaterial = new Material(Resources.Load("Shader/Movie/YCrCbtoRGB") as Shader);
}
this.m_tex.Play();
return this.m_tex.MovieMaterial;
//this.m_tex.m_movieMaterial = new Material(Resources.Load("Shader/Movie/YCrCbtoRGB") as Shader);
this.m_tex.m_movieMaterial = new Material(Shader.Find("QO/Sprite") as Shader);
}*/
//return gameObject.GetComponent<Renderer>().material;
//return this.m_tex.MovieMaterial;
return newMat;
}
// Token: 0x06000AD3 RID: 2771 RVA: 0x0002F764 File Offset: 0x0002D964
@@ -69,5 +89,6 @@ public class MovieTex : MonoBehaviour
}
// Token: 0x040008C0 RID: 2240
private MobileMovieTexture m_tex;
//private MobileMovieTexture m_tex;
private VideoPlayer m_tex;
}
Assets/Scripts/Assembly-CSharp/NameInputKeyboard.cs
+9 -1
View File
@@ -58,7 +58,15 @@ public class NameInputKeyboard : MonoBehaviour
}
if (ScreenKeyboardManager.IsCancel)
{
NameInputKeyboard.Instance.m_inputText = "アリス";
if (UnityApp.Instance.isJapanese)
{
NameInputKeyboard.Instance.m_inputText = "アリス";
}
else
{
NameInputKeyboard.Instance.m_inputText = "Alice";
}
}
else
{
Assets/Scripts/Assembly-CSharp/OptionSoundMeter.cs
+1 -1
View File
@@ -28,7 +28,7 @@ public class OptionSoundMeter : Meter
// Token: 0x06000679 RID: 1657 RVA: 0x0001AE14 File Offset: 0x00019014
protected override IEnumerator WaitLoadTextureCoroutine()
{
while (base.gameObject.renderer.material.mainTexture == null)
while (base.gameObject.GetComponent<Renderer>().material.mainTexture == null)
{
yield return 0;
}
Assets/Scripts/Assembly-CSharp/OptionVoiceMeter.cs
+1 -1
View File
@@ -19,7 +19,7 @@ public class OptionVoiceMeter : Meter
// Token: 0x0600067F RID: 1663 RVA: 0x0001AF2C File Offset: 0x0001912C
protected override IEnumerator WaitLoadTextureCoroutine()
{
while (base.gameObject.renderer.material.mainTexture == null)
while (base.gameObject.GetComponent<Renderer>().material.mainTexture == null)
{
yield return 0;
}
Assets/Scripts/Assembly-CSharp/ParamWnd.cs
+1 -1
View File
@@ -60,7 +60,7 @@ public class ParamWnd : Singleton<ParamWnd>
"fps:",
(1f / Time.deltaTime).ToString("0.0"),
" heap:",
Profiler.usedHeapSize / 1048576U,
UnityEngine.Profiling.Profiler.usedHeapSize / 1048576U,
"MB all=",
SystemInfo.systemMemorySize,
"MB"
Assets/Scripts/Assembly-CSharp/QO/AllocMem.cs
+1 -1
View File
@@ -46,7 +46,7 @@ namespace QO
stringBuilder.Append("usedHeapSize ");
stringBuilder.Append(string.Concat(new object[]
{
Profiler.usedHeapSize / 1024f,
UnityEngine.Profiling.Profiler.usedHeapSize / 1024f,
" KB / ",
(float)SystemInfo.systemMemorySize * 1024f,
" KB"
Assets/Scripts/Assembly-CSharp/Qoo/Def/ErrorDef.cs
+25 -10
View File
@@ -5,6 +5,21 @@ namespace Qoo.Def
// Token: 0x020000C8 RID: 200
public class ErrorDef
{
void Awake()
{
ERROR_MSG_NO_GLYPH = "Contains characters that cannot be displayed";
ERROR_MSG_MAX_OVER = "You can enter up to 7 characters for the name.";
ERROR_MSG_NO_NAME = "No name has been entered.";
ERROR_MSG_FAIL_CONNECT = "Connection failed. Try again later";
ERROR_MSG_ASSERT_FORMAT = "We apologize for the inconvenience.\nA critical error has occurred.\n\nError Code ={0}\n{1}\n\nPlease send the above information to\n<ArnethMyndraavn@gmail.com>\n\nThank you";
ERROR_MSG_UNKOWN = "Unexpected error";
ERROR_MSG_FAIL_SAVE = "Failed to save game";
ERROR_MSG_FAIL_LOAD = "Failed to load save file";
CONFIRM_MSG_0 = "Is {0} {1} Correct?";
CONFIRM_MSG_1 = "";
}
// Token: 0x040004A1 RID: 1185
public const string DLG_CG = "sys_dialog";
@@ -57,34 +72,34 @@ namespace Qoo.Def
public const int DLG_MSG_OFS_Y = 40;
// Token: 0x040004B2 RID: 1202
public const string ERROR_MSG_NO_GLYPH = "表示できない文字が含まれています。";
public string ERROR_MSG_NO_GLYPH = "表示できない文字が含まれています。";
// Token: 0x040004B3 RID: 1203
public const string ERROR_MSG_MAX_OVER = "入力できる名前は７文字までです。";
public string ERROR_MSG_MAX_OVER = "入力できる名前は７文字までです。";
// Token: 0x040004B4 RID: 1204
public const string ERROR_MSG_NO_NAME = "名前が入力されていません。";
public string ERROR_MSG_NO_NAME = "名前が入力されていません。";
// Token: 0x040004B5 RID: 1205
public const string ERROR_MSG_FAIL_CONNECT = "通信に失敗しました。通信状態の良いところで再度接続を試みてください。";
public string ERROR_MSG_FAIL_CONNECT = "通信に失敗しました。通信状態の良いところで再度接続を試みてください。";
// Token: 0x040004B6 RID: 1206
public const string ERROR_MSG_ASSERT_FORMAT = "ご迷惑をお掛けし、大変申し訳ございません。\n継続不能なエラーが発生しました。\n\nエラーコード={0}\n{1}\n\n上記のエラーコードを記載し、\n＜info@quinrose.com＞までご連絡ください。\n\nご協力のほどよろしくお願い申し上げます。";
public string ERROR_MSG_ASSERT_FORMAT = "ご迷惑をお掛けし、大変申し訳ございません。\n継続不能なエラーが発生しました。\n\nエラーコード={0}\n{1}\n\n上記のエラーコードを記載し、\n＜info@quinrose.com＞までご連絡ください。\n\nご協力のほどよろしくお願い申し上げます。";
// Token: 0x040004B7 RID: 1207
public const string ERROR_MSG_UNKOWN = "予期せぬエラー";
public string ERROR_MSG_UNKOWN = "予期せぬエラー";
// Token: 0x040004B8 RID: 1208
public const string ERROR_MSG_FAIL_SAVE = "ゲームデータの保存を正常に終了できませんでした。";
public string ERROR_MSG_FAIL_SAVE = "ゲームデータの保存を正常に終了できませんでした。";
// Token: 0x040004B9 RID: 1209
public const string ERROR_MSG_FAIL_LOAD = "ゲームデータの読込を正常に終了できませんでした。";
public string ERROR_MSG_FAIL_LOAD = "ゲームデータの読込を正常に終了できませんでした。";
// Token: 0x040004BA RID: 1210
public const string CONFIRM_MSG_0 = "「{0}＝{1}」です。";
public string CONFIRM_MSG_0 = "「{0}＝{1}」です。";
// Token: 0x040004BB RID: 1211
public const string CONFIRM_MSG_1 = "よろしいですか？";
public string CONFIRM_MSG_1 = "よろしいですか？";
// Token: 0x040004BC RID: 1212
public const float WAIT_TIME = 1f;
Assets/Scripts/Assembly-CSharp/Qoo/Def/GameDef.cs
+2 -2
View File
@@ -90,8 +90,8 @@ namespace Qoo.Def
// Token: 0x040004FE RID: 1278
private static readonly GameDef.GAME_PARAM_TABLE[] g_GameParamTable = new GameDef.GAME_PARAM_TABLE[]
{
new GameDef.GAME_PARAM_TABLE("firstname", "アリス", false),
new GameDef.GAME_PARAM_TABLE("familyname", "リデル", false),
UnityApp.Instance.isJapanese? new GameDef.GAME_PARAM_TABLE("firstname", "アリス", false) : new GameDef.GAME_PARAM_TABLE("firstname", "Alice", false),
UnityApp.Instance.isJapanese? new GameDef.GAME_PARAM_TABLE("familyname", "リデル", false) : new GameDef.GAME_PARAM_TABLE("familyname", "Liddell", false),
new GameDef.GAME_PARAM_TABLE("scene", string.Empty, false),
new GameDef.GAME_PARAM_TABLE("memory", string.Empty, false),
new GameDef.GAME_PARAM_TABLE("map_bg", string.Empty, false),
Assets/Scripts/Assembly-CSharp/Qoo/Def/PaymentDef.cs
+10 -23
View File
@@ -5,6 +5,7 @@ namespace Qoo.Def
// Token: 0x020000D7 RID: 215
public class PaymentDef
{
// Token: 0x04000554 RID: 1364
public const string APLICATION_ID = "";
@@ -32,28 +33,14 @@ namespace Qoo.Def
// Token: 0x0400055C RID: 1372
public const float DLG_ENDTIME = 1f;
// Token: 0x0400055D RID: 1373
public const string SCCESS_MSG_PURCHASE = "アドオンの購入が完了しました。";
// Token: 0x0400055E RID: 1374
public const string PROCESS_MSG_PURCHASE = "購入処理中です。";
// Token: 0x0400055F RID: 1375
public const string SCCESS_MSG_RENEWAL_LIST = "アドオンの購入履歴を更新しました。";
// Token: 0x04000560 RID: 1376
public const string PROCESS_MSG_RENEWAL_LIST = "アドオン購入履歴を更新中です。";
// Token: 0x04000561 RID: 1377
public const string SCCESS_MSG_RESTORE = "リストア（アドオン情報の復元）が完了しました。";
// Token: 0x04000562 RID: 1378
public const string PROCESS_MSG_RESTORE = "リストア処理中です。";
// Token: 0x04000563 RID: 1379
public const string ERROR_MSG_FAIL_CONNECT = "通信に失敗しました。\n通信状態の良いところで再度接続を試みてください。";
// Token: 0x04000564 RID: 1380
public const string ERROR_MSG_NOUSE_APP = "App内での購入が許可されていません。\n「機能制限」の設定画面から\n「App内での購入」をオンにしてください。";
//Should no longer be needed
public string SCCESS_MSG_PURCHASE = "アドオンの購入が完了しました。";
public string PROCESS_MSG_PURCHASE = "購入処理中です。";
public string SCCESS_MSG_RENEWAL_LIST = "アドオンの購入履歴を更新しました。";
public string PROCESS_MSG_RENEWAL_LIST = "アドオン購入履歴を更新中です。";
public string SCCESS_MSG_RESTORE = "リストア（アドオン情報の復元）が完了しました。";
public string PROCESS_MSG_RESTORE = "リストア処理中です。";
public string ERROR_MSG_FAIL_CONNECT = "通信に失敗しました。\n通信状態の良いところで再度接続を試みてください。";
public string ERROR_MSG_NOUSE_APP = "App内での購入が許可されていません。\n「機能制限」の設定画面から\n「App内での購入」をオンにしてください。";
}
}
Assets/Scripts/Assembly-CSharp/Qoo/Def/SaveLoadDef.cs
+13 -3
View File
@@ -5,6 +5,16 @@ namespace Qoo.Def
// Token: 0x020000D8 RID: 216
public class SaveLoadDef
{
void Awake()
{
if (!UnityApp.Instance.isJapanese)
{
MSG_SAVE_CONFIRM = "Do you want to save?";
MSG_OVER_CONFIRM = "Do you want to overwrite this save？";
MSG_LOAD_CONFIRM = "Do you want to load this save？";
}
}
// Token: 0x04000565 RID: 1381
public const string DLG_CG = "screen/common/sys_dialog";
@@ -21,12 +31,12 @@ namespace Qoo.Def
public const int DLG_MSG_Y = 230;
// Token: 0x0400056A RID: 1386
public const string MSG_SAVE_CONFIRM = "セーブしますか？";
public string MSG_SAVE_CONFIRM = "セーブしますか？";
// Token: 0x0400056B RID: 1387
public const string MSG_OVER_CONFIRM = "上書きしますか？";
public string MSG_OVER_CONFIRM = "上書きしますか？";
// Token: 0x0400056C RID: 1388
public const string MSG_LOAD_CONFIRM = "ロードしますか？";
public string MSG_LOAD_CONFIRM = "ロードしますか？";
}
}
Assets/Scripts/Assembly-CSharp/Qoo/DispAssert.cs
+1 -1
View File
@@ -71,7 +71,7 @@ namespace Qoo
{
this.guiStyle = GUI.skin.textArea;
this.guiStyle.fontSize = 20;
string format = "ご迷惑をお掛けし、大変申し訳ございません。\n継続不能なエラーが発生しました。\n\nエラーコード={0}\n{1}\n\n上記のエラーコードを記載し、\n＜info@quinrose.com＞までご連絡ください。\n\nご協力のほどよろしくお願い申し上げます。";
string format = "ご迷惑をお掛けし、大変申し訳ございません。\n継続不能なエラーが発生しました。\n\nエラーコード={0}\n{1}\n\n上記のエラーコードを記載し、\n＜ArnethMyndraavn@gmail.com＞までご連絡ください。\n\nご協力のほどよろしくお願い申し上げます。";
string str = "E";
int num = (int)this.errorCode;
string text = string.Format(format, str + num.ToString("0000"), this.errorMessage);
Assets/Scripts/Assembly-CSharp/Qoo/Game/KsExec.cs
+37 -13
View File
@@ -44,12 +44,14 @@ namespace Qoo.Game
}
KsInput.Enable = false;
KsInput.Clear();
bool flag = KsExec.ExecPay(Param, Value, count);
/*bool flag = KsExec.ExecPay(Param, Value, count);
if (flag)
{
KsInput.Enable = true;
}
return flag;
return flag;*/
//should disable all payment checks
return true;
}
}
else
@@ -74,11 +76,20 @@ namespace Qoo.Game
// Token: 0x06000612 RID: 1554 RVA: 0x0001943C File Offset: 0x0001763C
public static bool InputName(int count)
{
//UnityEngine.Debug.LogWarning(count);
if (count == 0)
{
UnityEngine.Debug.LogWarning("first");
KsExec.confirm = false;
KsExec.confirmResult = false;
KsExec.editName = "アリス";
if (UnityApp.Instance.isJapanese)
{
KsExec.editName = "アリス";
}
else
{
KsExec.editName = "Alice";
}
NameInputKeyboard.DebugInputText = KsExec.editName;
KsExec.KeyboardMain();
}
@@ -99,28 +110,40 @@ namespace Qoo.Game
KsExec.editName = NameInputKeyboard.InputText;
if (KsExec.editName.Length == 0 || KsExec.checkSpaceOnly(KsExec.editName))
{
UnityTask.SetSubNoUnityTask(MessageDlg.ExecDlg("名前が入力されていません。", null));
UnityTask.SetSubNoUnityTask(MessageDlg.ExecDlg("No name entered", null));
KsExec.KeyboardMain();
}
else if (KsExec.editName.Length > 7)
{
UnityTask.SetSubNoUnityTask(MessageDlg.ExecDlg("入力できる名前は７文字までです。", null));
UnityTask.SetSubNoUnityTask(MessageDlg.ExecDlg("You can enter up to 7 characters for the name.", null));
KsExec.KeyboardMain();
}
else if (!Singleton<UnityGraph>.Instance.Font.Font.CheckGlyph(KsExec.editName))
{
UnityTask.SetSubNoUnityTask(MessageDlg.ExecDlg("表示できない文字が含まれています。", null));
UnityTask.SetSubNoUnityTask(MessageDlg.ExecDlg("Contains characters that cannot be displayed.", null));
KsExec.KeyboardMain();
}
else
{
string arg = KsExec.editName;
string paramString = GameData.GetParamString("familyname", string.Empty);
string[] msgs = new string[]
{
string.Format("「{0}＝{1}」です。", arg, paramString),
"よろしいですか？"
};
string[] msgs;
if (UnityApp.Instance.isJapanese)
{
msgs = new string[]
{
string.Format("「{0}＝{1}」です。", arg, paramString),
"よろしいですか？"
};
}
else
{
msgs = new string[]
{
string.Format("Is {0} {1} correct?", arg, paramString)
};
}
UnityTask.SetSubNoUnityTask(MessageDlg.ExecDlg(msgs, new Action<bool>(KsExec.SetResult)));
KsExec.confirm = true;
KsExec.confirmResult = false;
@@ -145,13 +168,14 @@ namespace Qoo.Game
// Token: 0x06000614 RID: 1556 RVA: 0x00019604 File Offset: 0x00017804
private static void KeyboardMain()
{
switch (UnityEngine.Application.platform)
UnityTask.SetSubTask(NameInputKeyboard.Open(KsExec.editName, true));
/*switch (UnityEngine.Application.platform)
{
case RuntimePlatform.IPhonePlayer:
case RuntimePlatform.Android:
UnityTask.SetSubTask(NameInputKeyboard.Open(KsExec.editName, true));
break;
}
}*/
}
// Token: 0x06000615 RID: 1557 RVA: 0x0001964C File Offset: 0x0001784C
Assets/Scripts/Assembly-CSharp/Qoo/Graphics/Movie.cs
+3 -2
View File
@@ -1,4 +1,5 @@
using System;
using System.Collections;
using Qoo.File;
using UnityEngine;
@@ -8,7 +9,7 @@ namespace Qoo.Graphics
public static class Movie
{
// Token: 0x06000165 RID: 357 RVA: 0x000066A4 File Offset: 0x000048A4
internal static void Play(string name, bool IsSkip)
internal static IEnumerator Play(string name, bool IsSkip)
{
FileId fileId = new FileId(string.Empty);
fileId.Set(name);
@@ -17,7 +18,7 @@ namespace Qoo.Graphics
Debug.Print(string.Format("INFO:Start Movie({0} Skip={1})", text, IsSkip.ToString()));
//TODO fix movie playing. either make platform specific versions OR make platform agnostic
//UnityTask.SetSubTask(MovieManager.PlayMovie(text, FullScreenMovieControlMode.CancelOnInput));
UnityTask.SetSubTask(MovieManager.PlayMovie(text, ""));
yield return MovieManager.PlayMovie(text, new GameObject());
}
}
}
Assets/Scripts/Assembly-CSharp/Qoo/Ks/KsTagInfo_MOVIE.cs
+1
View File
@@ -29,6 +29,7 @@ namespace Qoo.Ks
// Token: 0x060002DF RID: 735 RVA: 0x00009ED0 File Offset: 0x000080D0
public override TAG_RESULT Run(EventPlayer player, TagData tag)
{
UnityEngine.Debug.LogWarning("RUN");
Singleton<MsgWnd>.Instance.ResetMessage();
Singleton<MsgWnd>.Instance.Show(false);
if (!player.RestoreOn)
Assets/Scripts/Assembly-CSharp/SaveLoadManager.cs
+7 -7
View File
@@ -77,28 +77,28 @@ public class SaveLoadManager
catch (Exception ex2)
{
Qoo.Debug.Print(ex2.Message);
DispAssert.Show(ErrorDef.ASSERT_ERROR_CODE.FAIL_SAVE_CATCH_EXCEPTION, "ゲームデータの保存を正常に終了できませんでした。");
DispAssert.Show(ErrorDef.ASSERT_ERROR_CODE.FAIL_SAVE_CATCH_EXCEPTION, UnityApp.Instance.isJapanese ? "ゲームデータの保存を正常に終了できませんでした。" : "The game data could not be saved");
break;
}
}
if (array == null)
{
Qoo.Debug.Print("####Save file create error");
DispAssert.Show(ErrorDef.ASSERT_ERROR_CODE.FAIL_SAVE_DATA_CREATE, "ゲームデータの保存を正常に終了できませんでした。");
DispAssert.Show(ErrorDef.ASSERT_ERROR_CODE.FAIL_SAVE_DATA_CREATE, UnityApp.Instance.isJapanese ? "ゲームデータの保存を正常に終了できませんでした。" : "The game data could not be saved");
return false;
}
string text2 = BytesHash.CreateHashCode(array);
if (text2 == null)
{
Qoo.Debug.Print("####hash = null death");
DispAssert.Show(ErrorDef.ASSERT_ERROR_CODE.FAIL_SAVE_HASHCODE_CREATE, "ゲームデータの保存を正常に終了できませんでした。");
DispAssert.Show(ErrorDef.ASSERT_ERROR_CODE.FAIL_SAVE_HASHCODE_CREATE, UnityApp.Instance.isJapanese ? "ゲームデータの保存を正常に終了できませんでした。" : "The game data could not be saved");
return false;
}
info.HashCode = text2;
if (SaveLoadManager.SaveToXML<SaveFileInfo>("H_" + text + "_TMP", info, Encoding.UTF8, false) == null)
{
Qoo.Debug.Print("header file save error");
DispAssert.Show(ErrorDef.ASSERT_ERROR_CODE.FAIL_SAVE_HEADER_CREATE, "ゲームデータの保存を正常に終了できませんでした。");
DispAssert.Show(ErrorDef.ASSERT_ERROR_CODE.FAIL_SAVE_HEADER_CREATE, UnityApp.Instance.isJapanese ? "ゲームデータの保存を正常に終了できませんでした。" : "The game data could not be saved");
return false;
}
try
@@ -180,20 +180,20 @@ public class SaveLoadManager
catch (Exception ex2)
{
Qoo.Debug.Print(ex2.Message);
DispAssert.Show(ErrorDef.ASSERT_ERROR_CODE.FAIL_LOAD_CATCH_EXCEPTION, "ゲームデータの読込を正常に終了できませんでした。");
DispAssert.Show(ErrorDef.ASSERT_ERROR_CODE.FAIL_LOAD_CATCH_EXCEPTION, UnityApp.Instance.isJapanese ? "ゲームデータの読込を正常に終了できませんでした。" : "The game data could not be loaded");
break;
}
}
if (array == null)
{
DispAssert.Show(ErrorDef.ASSERT_ERROR_CODE.FAIL_LOAD, "ゲームデータの読込を正常に終了できませんでした。");
DispAssert.Show(ErrorDef.ASSERT_ERROR_CODE.FAIL_LOAD, UnityApp.Instance.isJapanese ? "ゲームデータの読込を正常に終了できませんでした。" : "The game data could not be loaded");
return null;
}
string hashCode = BytesHash.CreateHashCode(array);
if (!saveFileInfo.CheckHash(hashCode))
{
Qoo.Debug.Print("hash ga tigau yo");
DispAssert.Show(ErrorDef.ASSERT_ERROR_CODE.UNMATCH_SAVE_HASH, "ゲームデータの読込を正常に終了できませんでした。");
DispAssert.Show(ErrorDef.ASSERT_ERROR_CODE.UNMATCH_SAVE_HASH, UnityApp.Instance.isJapanese ? "ゲームデータの読込を正常に終了できませんでした。" : "The game data could not be loaded");
return null;
}
return array;
Assets/Scripts/Assembly-CSharp/SaveLoadWindow.cs
+6 -6
View File
@@ -91,13 +91,13 @@ public class SaveLoadWindow : BaseWindow
switch (ct)
{
case SaveLoadWindow.ConfrmType.Save:
this.SetText("SaveConfirmMsg", (!show) ? string.Empty : "セーブしますか？");
this.SetText("SaveConfirmMsg", (!show) ? string.Empty : UnityApp.Instance.isJapanese ? "セーブしますか？" : "Do you want to save?");
break;
case SaveLoadWindow.ConfrmType.Load:
this.SetText("LoadConfirmMsg", (!show) ? string.Empty : "ロードしますか？");
this.SetText("LoadConfirmMsg", (!show) ? string.Empty : UnityApp.Instance.isJapanese ? "ロードしますか？" : "Do you want to load this save?");
break;
case SaveLoadWindow.ConfrmType.Over:
this.SetText("OverConfirmMsg", (!show) ? string.Empty : "上書きしますか？");
this.SetText("OverConfirmMsg", (!show) ? string.Empty : UnityApp.Instance.isJapanese ? "上書きしますか？" : "Do you want to overwrite this Save?");
break;
}
}
@@ -329,9 +329,9 @@ public class SaveLoadWindow : BaseWindow
new BaseWindow.UIImage("Confirm", 136, 182, this.wndz + 3, "screen/common/sys_dialog", true, false),
new BaseWindow.UIButton("Confirm_YES", 312, 277, this.wndz + 4, "screen/common/dlog_btn_y", true, false, 1, 2, 0),
new BaseWindow.UIButton("Confirm_NO", 513, 277, this.wndz + 4, "screen/common/dlog_btn_n", true, false, 1, 2, 0),
new BaseWindow.UIText("SaveConfirmMsg", 480, 230, this.wndz + 4, "セーブしますか？", 28, UnityTextSprite.PositionType.Center, UnityTextSprite.PositionType.TopLeft, byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue),
new BaseWindow.UIText("LoadConfirmMsg", 480, 230, this.wndz + 4, "ロードしますか？", 28, UnityTextSprite.PositionType.Center, UnityTextSprite.PositionType.TopLeft, byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue),
new BaseWindow.UIText("OverConfirmMsg", 480, 230, this.wndz + 4, "上書きしますか？", 28, UnityTextSprite.PositionType.Center, UnityTextSprite.PositionType.TopLeft, byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue)
new BaseWindow.UIText("SaveConfirmMsg", 480, 230, this.wndz + 4, UnityApp.Instance.isJapanese ? "セーブしますか？" : "Do you want to save?", 28, UnityTextSprite.PositionType.Center, UnityTextSprite.PositionType.TopLeft, byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue),
new BaseWindow.UIText("LoadConfirmMsg", 480, 230, this.wndz + 4, UnityApp.Instance.isJapanese ? "ロードしますか？" : "Do you want to load this save?", 28, UnityTextSprite.PositionType.Center, UnityTextSprite.PositionType.TopLeft, byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue),
new BaseWindow.UIText("OverConfirmMsg", 480, 230, this.wndz + 4, UnityApp.Instance.isJapanese ? "上書きしますか？" : "Do you want to overwrite this Save?", 28, UnityTextSprite.PositionType.Center, UnityTextSprite.PositionType.TopLeft, byte.MaxValue, byte.MaxValue, byte.MaxValue, byte.MaxValue)
};
}
Assets/Scripts/Assembly-CSharp/SceneManager.cs
+11 -11
View File
@@ -1,6 +1,7 @@
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine.SceneManagement;
using UnityEngine;
// Token: 0x0200013B RID: 315
@@ -114,24 +115,23 @@ 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);
return UnityEngine.SceneManagement.SceneManager.LoadSceneAsync(sceneName, LoadSceneMode.Additive);
//return Application.LoadLevelAdditiveAsync(sceneName);
}
// Token: 0x0600088D RID: 2189 RVA: 0x00026390 File Offset: 0x00024590
private static void UnloadScene(string sceneName)
{
//UnityEngine.SceneManagement.SceneManager.UnloadScene(sceneName);
GameObject gameObject = GameObject.Find(sceneName);
if (gameObject != null)
{
UnityEngine.Object.Destroy(gameObject);
}
Application.UnloadLevel(sceneName);
Resources.UnloadUnusedAssets();
}
@@ -156,8 +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);
SceneManager.LoadScene(nextSceneName);
AsyncOperation ao = SceneManager.LoadScene(nextSceneName);
//SceneManager.LoadScene(nextSceneName);
if (currentSceneName != null)
{
SceneManager.UnloadScene(currentSceneName);
@@ -166,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)
{
Assets/Scripts/Assembly-CSharp/ScreenEffect.cs
+3 -3
View File
@@ -42,7 +42,7 @@ public class ScreenEffect
{
ScreenEffect.Init(99, Color.black, null);
}
ScreenEffect.goScreenEffect.renderer.material.SetColor("_Color", work.Offset);
ScreenEffect.goScreenEffect.GetComponent<Renderer>().material.SetColor("_Color", work.Offset);
work.Update();
yield return 0;
}
@@ -57,7 +57,7 @@ public class ScreenEffect
if (ScreenEffect.goScreenEffect == null)
{
ScreenEffect.goScreenEffect = GameObject.CreatePrimitive(PrimitiveType.Quad);
ScreenEffect.goScreenEffect.renderer.material = new Material(Resources.Load("Shader/Color/UnlitColor") as Shader);
ScreenEffect.goScreenEffect.GetComponent<Renderer>().material = new Material(Resources.Load("Shader/Color/UnlitColor") as Shader);
ScreenEffect.goScreenEffect.transform.localScale = new Vector3(960f, 544f, 1f);
ScreenEffect.goScreenEffect.name = "__ScreenEffenct";
}
@@ -71,7 +71,7 @@ public class ScreenEffect
//ScreenEffect.goScreenEffect.transform.localPosition = new Vector3(2000f, 0f, (float)(-(float)z));
ScreenEffect.goScreenEffect.transform.localPosition = new Vector3(0f, 0f, (float)(-(float)z));
}
ScreenEffect.goScreenEffect.renderer.material.SetColor("_Color", color);
ScreenEffect.goScreenEffect.GetComponent<Renderer>().material.SetColor("_Color", color);
}
// Token: 0x060008EF RID: 2287 RVA: 0x000274EC File Offset: 0x000256EC
Assets/Scripts/Assembly-CSharp/ScreenKeyboardManager.cs
+83 -1
View File
@@ -1,6 +1,8 @@
using System;
using System;
using System.Collections;
using UnityEngine;
using UnityEngine.UI;
// Token: 0x02000174 RID: 372
public class ScreenKeyboardManager : MonoBehaviour
@@ -59,6 +61,86 @@ public class ScreenKeyboardManager : MonoBehaviour
// Token: 0x06000A97 RID: 2711 RVA: 0x0002EAC8 File Offset: 0x0002CCC8
public static IEnumerator Open(string defaultString = "")
{
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;
Canvas canvas = manager.AddComponent<Canvas>();
canvas.gameObject.AddComponent<CanvasScaler>();
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)
{
yield return 0;
if (Input.GetKeyDown(KeyCode.Return))
{
nameString = _inputField.text;
ScreenKeyboardManager.Instance.m_inputText = nameString;
GameObject.Destroy(canvas.gameObject);
isKeyboardActive = false;
}
}
//TODO fix TouchScreenKeyboard issue
/*ScreenKeyboardManager.Instance.m_inputText = defaultString;
ScreenKeyboardManager.Instance.m_keyboard = TouchScreenKeyboard.Open(defaultString, TouchScreenKeyboardType.NamePhonePad);
Assets/Scripts/Assembly-CSharp/ScreenMovieSample.cs
+1 -1
View File
@@ -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", ""));
yield return base.StartCoroutine(MovieManager.PlayMovie("mp4/high/op_movie.mp4", this.gameObject));
Debug.Log(" #DEBUGLOG::MOVIE OWATA ");
yield break;
}
Assets/Scripts/Assembly-CSharp/SoundVoice.cs
+3 -3
View File
@@ -152,7 +152,7 @@ public class SoundVoice : MonoBehaviour
private void Awake()
{
this.voice = base.gameObject.AddComponent<AudioSource>();
this.voice.panLevel = 0f;
this.voice.spatialBlend = 0f;
}
// Token: 0x06000B5A RID: 2906 RVA: 0x000308B4 File Offset: 0x0002EAB4
@@ -161,7 +161,7 @@ public class SoundVoice : MonoBehaviour
if (this.m_data != null && this.voice.clip == null && this.m_data.Data != null)
{
this.voice.clip = this.m_data.Data;
this.voice.panLevel = 0f;
this.voice.spatialBlend = 0f;
this.m_data = null;
}
if (this.isStart && this.voice.clip != null)
@@ -188,7 +188,7 @@ public class SoundVoice : MonoBehaviour
}
this.voice.clip = null;
this.voice.clip = SoundData.Load(category, name_);
this.voice.panLevel = 0f;
this.voice.spatialBlend = 0f;
return this.voice.clip != null;
}
Assets/Scripts/Assembly-CSharp/SubPartCamera.cs
+1 -1
View File
@@ -40,7 +40,7 @@ public class SubPartCamera : MonoBehaviour
SubPartCamera.Instance.m_Camera.enabled = true;
//TODO Camera change
//SubPartCamera.Instance.gameObject.transform.localPosition = new Vector3(2000f, 0f, -1000f);
SubPartCamera.Instance.gameObject.transform.localPosition = new Vector3(0f, 0f, -1000f);
SubPartCamera.Instance.gameObject.transform.localPosition = new Vector3(0f, 0f, -1100f);
}
// Token: 0x0600063A RID: 1594 RVA: 0x00019EE8 File Offset: 0x000180E8
Assets/Scripts/Assembly-CSharp/TitleWindow.cs
+14 -2
View File
@@ -1,4 +1,5 @@
using System;
using System.Collections.Generic;
using Qoo.Application;
using Qoo.Game;
using UnityEngine;
@@ -54,8 +55,9 @@ public class TitleWindow : BaseWindow
// Token: 0x0600084C RID: 2124 RVA: 0x0002543C File Offset: 0x0002363C
protected sealed override BaseWindow.UIComponent[] newComponentArray()
{
List<BaseWindow.UIComponent> components;
string str = (!base.IsTrial) ? string.Empty : "_tri";
return new BaseWindow.UIComponent[]
components = new List<BaseWindow.UIComponent>
{
new BaseWindow.UIImage("BackGround", 0, 0, this.wndz, "screen/title/title_base", true, true),
new BaseWindow.UIButton("Btn0", 171, 272, this.wndz + 1, "screen/title/title_0", true, true, 1, 2, 0),
@@ -67,6 +69,11 @@ public class TitleWindow : BaseWindow
new BaseWindow.UIButton("BtnRestore", 814, 472, this.wndz + 1, "screen/title/restore", !base.IsTrial, !base.IsTrial, 1, 2, 0),
new BaseWindow.UICollision("BtnGuard", 0, 0, this.wndz + 3, 960, 544)
};
if (!UnityApp.Instance.isJapanese)
{
components.Add(new BaseWindow.UIButton("BtnCredits", 16, 472, this.wndz + 1, "screen/title/restore", !base.IsTrial, !base.IsTrial, 1, 2, 0));
}
return components.ToArray();
}
// Token: 0x0600084D RID: 2125 RVA: 0x000255E8 File Offset: 0x000237E8
@@ -122,8 +129,13 @@ public class TitleWindow : BaseWindow
SceneManager.ChangeScene(UIValue.SCENE_HELP);
break;
case "BtnRestore":
Application.Quit();
//base.PlaySE_Ok();
//base.AddScene(UIValue.SCENE_TITLERESTORE);
break;
case "BtnCredits":
base.PlaySE_Ok();
base.AddScene(UIValue.SCENE_TITLERESTORE);
SceneManager.ChangeScene(UIValue.SCENE_TITLECREDITS);
break;
}
}
Assets/Scripts/Assembly-CSharp/UIValue.cs
+2
View File
@@ -15,6 +15,8 @@ public class UIValue
// Token: 0x0400062F RID: 1583
public static readonly string SCENE_TITLERESTORE = "SceneTitleRestore";
public static readonly string SCENE_TITLECREDITS = "SceneTitleCredits";
// Token: 0x04000630 RID: 1584
public static readonly string SCENE_GALLERYMENU = "SceneGalleryMenu";
Assets/Scripts/Assembly-CSharp/UnityApp.cs
+3
View File
@@ -23,6 +23,7 @@ public class UnityApp : Singleton<UnityApp>
private void Awake()
{
UnityEngine.Object.DontDestroyOnLoad(this);
Application.targetFrameRate = 60;
this.task = base.gameObject.AddComponent<TaskManager>();
this.time = base.gameObject.AddComponent<UnityTimer>();
this.file = base.gameObject.AddComponent<UnityFileLoader>();
@@ -304,4 +305,6 @@ public class UnityApp : Singleton<UnityApp>
// Token: 0x04000774 RID: 1908
private bool m_isInit;
public bool isJapanese;
}
Assets/Scripts/Assembly-CSharp/UnityFile.cs
+2 -2
View File
@@ -91,7 +91,7 @@ public class UnityFile
public bool CreateFromAssetBundle(AssetBundle asset, string name)
{
this.m_szName = name;
this.m_ReadData = (asset.Load(name) as TextAsset).bytes;
this.m_ReadData = (asset.LoadAsset(name) as TextAsset).bytes;
this.m_isReadEnd = true;
return true;
}
@@ -139,7 +139,7 @@ public class UnityFile
{
if (this.m_isLoadPackFile)
{
AssetBundleCreateRequest req = AssetBundle.CreateFromMemory(this.m_ReadData);
AssetBundleCreateRequest req = AssetBundle.LoadFromMemoryAsync(this.m_ReadData);
yield return req;
this.m_object = req.assetBundle.mainAsset;
req.assetBundle.Unload(false);
Assets/Scripts/Assembly-CSharp/UnityGraph.cs
+70 -34
View File
@@ -4,6 +4,7 @@ using Qoo;
using Qoo.Application;
using Qoo.File;
using UnityEngine;
using UnityEngine.Video;
// Token: 0x02000157 RID: 343
public class UnityGraph : Singleton<UnityGraph>
@@ -46,6 +47,7 @@ public class UnityGraph : Singleton<UnityGraph>
// Token: 0x060009B2 RID: 2482 RVA: 0x0002AD30 File Offset: 0x00028F30
private void Awake()
{
this.sprite_obj = new GameObject("2D Sprite Manager");
this.sprite_obj.transform.parent = base.gameObject.transform;
this.m_ManSprite = this.sprite_obj.AddComponent<Man2D>();
@@ -58,8 +60,8 @@ public class UnityGraph : Singleton<UnityGraph>
this.m_FrameDraw = new UnitySprite(false, base.gameObject, false);
this.m_FrameDraw.obj.name = "FrameBuffer Sprite";
this.m_FrameDraw.z = 100;
this.m_FrameDraw.Brend = SPRITE_DRAW_MODE.MUL_NOTEXALPHA;
this.m_FrameDraw.Update(Screen.width, Screen.height, 0f);
//this.m_FrameDraw.Brend = SPRITE_DRAW_MODE.MUL_NOTEXALPHA;
this.m_FrameDraw.Update(this.m_width, this.m_height, 0f);
this.FadeParam = 0;
this.m_FrameBg = new UnitySprite(false, base.gameObject, false);
this.m_FrameBg.obj.name = "FrameBufferBG";
@@ -81,10 +83,10 @@ public class UnityGraph : Singleton<UnityGraph>
this.RunEffect = false;
this.m_ManSprite.enabled = true;
CreateSprite.CreateSpriteCamera(base.gameObject, Screen.height, false);
base.gameObject.camera.aspect = (float)Screen.width / (float)Screen.height;
base.gameObject.GetComponent<Camera>().aspect = (float)Screen.width / (float)Screen.height;
//TODO fix camera issues, find out why this is needed
//base.gameObject.camera.enabled = true;
base.gameObject.camera.enabled = false;
base.gameObject.GetComponent<Camera>().enabled = false;
this.m_FrameBg.obj.SetActive(true);
if (this.m_FrameBg.tex == null)
{
@@ -105,10 +107,10 @@ public class UnityGraph : Singleton<UnityGraph>
{
this.m_FrameDraw.SetRenderImage(this.m_ManSprite.GetFrameBuffer(), 960, 544);
}
this.m_FrameDraw.CalcRenderImageOffset(Screen.width, Screen.height);
this.m_FrameDraw.Brend = SPRITE_DRAW_MODE.MUL_NOTEXALPHA;
this.m_FrameDraw.Update(Screen.width, Screen.height, 0f);
UnityApp.Input.SetScreenRect(this.m_FrameDraw.x, this.m_FrameDraw.y, this.m_FrameDraw.w, this.m_FrameDraw.h, 960, 544);
this.m_FrameDraw.CalcRenderImageOffset(this.m_width, this.m_height);
//this.m_FrameDraw.Brend = SPRITE_DRAW_MODE.MUL_NOTEXALPHA;
this.m_FrameDraw.Update(this.m_width, this.m_height, 0f);
UnityApp.Input.SetScreenRect(this.m_FrameDraw.x, this.m_FrameDraw.y, Screen.width, Screen.height, 960, 544);
base.enabled = true;
}
@@ -116,7 +118,7 @@ public class UnityGraph : Singleton<UnityGraph>
public void Disable(bool IsClean = false)
{
base.enabled = false;
base.gameObject.camera.enabled = false;
base.gameObject.GetComponent<Camera>().enabled = false;
this.m_ManSprite.enabled = false;
this.m_FrameDraw.obj.SetActive(false);
this.m_FrameBg.obj.SetActive(false);
@@ -200,8 +202,8 @@ public class UnityGraph : Singleton<UnityGraph>
{
this.m_FrameDraw.A = 0;
}
this.m_FrameDraw.CalcRenderImageOffset(Screen.width, Screen.height);
this.m_FrameDraw.Update(Screen.width, Screen.height, 0f);
this.m_FrameDraw.CalcRenderImageOffset(this.m_width, this.m_height);
this.m_FrameDraw.Update(this.m_width, this.m_height, 0f);
}
}
@@ -305,7 +307,7 @@ public class UnityGraph : Singleton<UnityGraph>
name = imageDir + name;
return this.EffectMain(name, time);
}
return this.CrossFade(time);
//return this.CrossFade(time);
NMB_FILEINFO fileInfo = Nmb.GetFileInfo(name);
if (fileInfo == null)
{
@@ -321,13 +323,11 @@ public class UnityGraph : Singleton<UnityGraph>
// Token: 0x060009C0 RID: 2496 RVA: 0x0002B524 File Offset: 0x00029724
protected IEnumerator EffectMain(string name, float time)
{
UnityEngine.Debug.LogWarning ("NAME: " + name);
yield return 0;
yield return 0;
this.m_ManSprite.UpdateFrameBuffer();
this.m_ManSprite.enabled = false;
EffectManager.Init(name, (int)(time * 1000f), this.m_FrameDraw.obj.renderer, this.m_ManSprite.GetFrameBufferOld(), this.m_ManSprite.GetFrameBuffer());
EffectManager.Init(name, (int)(time * 1000f), this.m_FrameDraw.obj.GetComponent<Renderer>(), this.m_ManSprite.GetFrameBufferOld(), this.m_ManSprite.GetFrameBuffer());
yield return base.StartCoroutine(EffectManager.StartEffect());
this.m_isRunEffect = false;
this.m_ManSprite.enabled = true;
@@ -342,23 +342,56 @@ public class UnityGraph : Singleton<UnityGraph>
yield return 0;
this.m_ManSprite.UpdateFrameBuffer();
this.m_ManSprite.enabled = false;
MovieTex movie = base.gameObject.AddComponent<MovieTex>();
//MovieTex movie = base.gameObject.AddComponent<MovieTex>();
this.m_FrameDraw.SetRenderImage(this.m_ManSprite.GetFrameBuffer(), 960, 544);
UnitySprite movieFrame = new UnitySprite(false, base.gameObject, false);
movieFrame.SetName("Movie Frame");
this.m_FrameDraw.A = (movieFrame.R = (movieFrame.G = (movieFrame.B = (movieFrame.A = byte.MaxValue))));
movieFrame.SetMaterial(movie.Play(name, MOVIE_TEX_TYPE.ADD, false), 960, 544);
yield return 0;
while (movie.IsPlay)
//NewCode
string path = name;
if (path.IndexOf('/') == 0)
{
this.m_FrameDraw.CalcRenderImageOffset(Screen.width, Screen.height);
movieFrame.CalcRenderImageOffset(Screen.width, Screen.height);
this.m_FrameDraw.Update(Screen.width, Screen.height, 10f);
movieFrame.Update(Screen.width, Screen.height, 0f);
path = path.Substring(1);
}
string pathExt = System.IO.Path.GetExtension(path);
path = path.Substring(0, path.Length - pathExt.Length);
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.isLooping = false;
movieFrame.SetMaterial(newMat, 960, 544);
m_tex.renderMode = UnityEngine.Video.VideoRenderMode.MaterialOverride;
//OLD Code
//movieFrame.SetMaterial(movie.Play(name, MOVIE_TEX_TYPE.ADD, false), 960, 544);
//yield return 0;
//while (movie.IsPlay)
m_tex.Play();
yield return 0;
yield return 0;
yield return 0;
while (m_tex.isPlaying || !m_tex.isPrepared)
{
if (Input.GetMouseButtonDown(0))
{
break;
}
UnityEngine.Debug.LogWarning(m_tex.isPlaying + ", " + !m_tex.isPrepared);
this.m_FrameDraw.CalcRenderImageOffset(this.m_width, this.m_height);
movieFrame.CalcRenderImageOffset(this.m_width, this.m_height);
this.m_FrameDraw.Update(this.m_width, this.m_height, 10f);
movieFrame.Update(this.m_width, this.m_height, 0f);
yield return 0;
yield return 0;
yield return 0;
}
UnityEngine.Object.Destroy(movie);
movieFrame.obj.renderer.material = null;
//UnityEngine.Object.Destroy(movie);
movieFrame.obj.GetComponent<Renderer>().material = null;
movieFrame.tex = null;
this.m_ManSprite.RemoveSprite(movieFrame);
movieFrame = null;
@@ -371,7 +404,7 @@ public class UnityGraph : Singleton<UnityGraph>
// Token: 0x060009C2 RID: 2498 RVA: 0x0002B588 File Offset: 0x00029788
private IEnumerator CrossFade(float time)
{
/*int ms = (int)(time * 1000f);
int ms = (int)(time * 1000f);
this.m_isRunEffect = true;
yield return 0;
yield return 0;
@@ -379,10 +412,10 @@ public class UnityGraph : Singleton<UnityGraph>
this.m_ManSprite.enabled = false;
UnitySprite BaseFrame = new UnitySprite(false, base.gameObject, false);
BaseFrame.SetName("CrossFade Frame");
BaseFrame.Brend = SPRITE_DRAW_MODE.MUL_NOTEXALPHA;
BaseFrame.Brend = SPRITE_DRAW_MODE.MUL;
BaseFrame.Update(Screen.width, Screen.height, 0f);
this.m_FrameDraw.Brend = SPRITE_DRAW_MODE.MUL_NOTEXALPHA;
this.m_FrameDraw.Update(Screen.width, Screen.height, 10f);
//this.m_FrameDraw.Brend = SPRITE_DRAW_MODE.MUL_NOTEXALPHA;
this.m_FrameDraw.Update(this.m_width, this.m_height, 10f);
BaseFrame.SetRenderImage(this.m_ManSprite.GetFrameBufferOld(), 960, 544);
this.m_FrameDraw.SetRenderImage(this.m_ManSprite.GetFrameBuffer(), 960, 544);
BaseFrame.R = (this.m_FrameBg.G = (this.m_FrameBg.B = byte.MaxValue));
@@ -403,10 +436,10 @@ public class UnityGraph : Singleton<UnityGraph>
param = 0f;
}
BaseFrame.A = (byte)(255f * (1f - param));
this.m_FrameDraw.CalcRenderImageOffset(Screen.width, Screen.height);
BaseFrame.CalcRenderImageOffset(Screen.width, Screen.height);
this.m_FrameDraw.Update(Screen.width, Screen.height, 10f);
BaseFrame.Update(Screen.width, Screen.height, 0f);
this.m_FrameDraw.CalcRenderImageOffset(this.m_width, this.m_height);
BaseFrame.CalcRenderImageOffset(this.m_width, this.m_height);
this.m_FrameDraw.Update(this.m_width, this.m_height, 10f);
BaseFrame.Update(this.m_width, this.m_height, 0f);
yield return 0;
}
BaseFrame.tex = null;
@@ -415,7 +448,7 @@ public class UnityGraph : Singleton<UnityGraph>
this.m_FrameDraw.A = byte.MaxValue;
this.m_ManSprite.enabled = true;
this.m_isRunEffect = false;
yield return 0;*/
yield return 0;
yield break;
}
@@ -502,4 +535,7 @@ public class UnityGraph : Singleton<UnityGraph>
// Token: 0x040007E9 RID: 2025
private bool m_isRunEffect;
private int m_width = 960;
private int m_height = 544;
}
Assets/Scripts/Assembly-CSharp/UnitySprite.cs
+11 -11
View File
@@ -212,10 +212,10 @@ public class UnitySprite
// Token: 0x060009DC RID: 2524 RVA: 0x0002B874 File Offset: 0x00029A74
public void DeleteMaterial()
{
if (this.obj != null && this.obj.renderer != null && this.obj.renderer.material != null && this.obj.renderer.material.shader != null)
if (this.obj != null && this.obj.GetComponent<Renderer>() != null && this.obj.GetComponent<Renderer>().material != null && this.obj.GetComponent<Renderer>().material.shader != null)
{
UnityEngine.Object.Destroy(this.obj.renderer.material);
this.obj.renderer.material = null;
UnityEngine.Object.Destroy(this.obj.GetComponent<Renderer>().material);
this.obj.GetComponent<Renderer>().material = null;
}
}
@@ -223,7 +223,7 @@ public class UnitySprite
public void SetMaterial(string shader_name)
{
this.DeleteMaterial();
this.obj.renderer.material = new Material(Resources.Load(shader_name) as Shader);
this.obj.GetComponent<Renderer>().material = new Material(Resources.Load(shader_name) as Shader);
}
// Token: 0x060009DE RID: 2526 RVA: 0x0002B940 File Offset: 0x00029B40
@@ -258,11 +258,11 @@ public class UnitySprite
{
if (this.tex != null)
{
this.obj.renderer.material.mainTexture = this.tex.m_Texture;
this.obj.GetComponent<Renderer>().material.mainTexture = this.tex.m_Texture;
}
else
{
this.obj.renderer.material.mainTexture = null;
this.obj.GetComponent<Renderer>().material.mainTexture = null;
}
}
this.UpdateUVAnim();
@@ -277,14 +277,14 @@ public class UnitySprite
}
if (this.Brend != SPRITE_DRAW_MODE.OTHER)
{
this.obj.renderer.material.SetVector("_UVWH", new Vector4((float)this.U / (float)this.OrgW, (float)(this.OrgH - this.V) / (float)this.OrgH - (float)this.VH / (float)this.OrgH, (float)this.UW / (float)this.OrgW, (float)this.VH / (float)this.OrgH));
this.obj.GetComponent<Renderer>().material.SetVector("_UVWH", new Vector4((float)this.U / (float)this.OrgW, (float)(this.OrgH - this.V) / (float)this.OrgH - (float)this.VH / (float)this.OrgH, (float)this.UW / (float)this.OrgW, (float)this.VH / (float)this.OrgH));
SPRITE_DRAW_MODE brend = this.Brend;
if (brend == SPRITE_DRAW_MODE.TEX_ALPHA)
{
this.obj.renderer.material.SetColor("_EffectColor", this.m_colorFx);
this.obj.GetComponent<Renderer>().material.SetColor("_EffectColor", this.m_colorFx);
}
}
this.obj.renderer.material.color = new Color((float)this.R / 255f, (float)this.G / 255f, (float)this.B / 255f, (float)this.A / 255f);
this.obj.GetComponent<Renderer>().material.color = new Color((float)this.R / 255f, (float)this.G / 255f, (float)this.B / 255f, (float)this.A / 255f);
}
// Token: 0x060009DF RID: 2527 RVA: 0x0002BC1C File Offset: 0x00029E1C
@@ -333,7 +333,7 @@ public class UnitySprite
{
this.A = 0;
}
this.obj.renderer.material.mainTexture = offscreen;
this.obj.GetComponent<Renderer>().material.mainTexture = offscreen;
this.OrgW = w_;
this.UW = w_;
this.w = w_;
@@ -349,7 +349,7 @@ public class UnitySprite
this.IsUseTex = false;
if (this.obj)
{
this.obj.renderer.material = mat_;
this.obj.GetComponent<Renderer>().material = mat_;
this.OrgW = screenW;
this.UW = screenW;
this.w = screenW;
Assets/Scripts/Assembly-CSharp/UnityTextSprite.cs
+8 -4
View File
@@ -284,16 +284,16 @@ public class UnityTextSprite : UnitySprite
{
if (this.tex != null)
{
this.obj.renderer.material.mainTexture = this.tex.m_Texture;
this.obj.GetComponent<Renderer>().material.mainTexture = this.tex.m_Texture;
}
else
{
this.obj.renderer.material.mainTexture = null;
this.obj.GetComponent<Renderer>().material.mainTexture = null;
}
}
this.obj.transform.localPosition = new Vector3((float)(this.x - ScrW / 2), (float)(-(float)this.y + ScrH / 2), worldZ);
this.obj.transform.localScale = new Vector3(this.fWidth, this.fHeight, 0f);
this.obj.renderer.material.color = new Color((float)this.R / 255f, (float)this.G / 255f, (float)this.B / 255f, (float)this.A / 255f);
this.obj.GetComponent<Renderer>().material.color = new Color((float)this.R / 255f, (float)this.G / 255f, (float)this.B / 255f, (float)this.A / 255f);
this.obj.SetActive(this.Show);
}
@@ -335,7 +335,11 @@ public class UnityTextSprite : UnitySprite
this.mesh.triangles = this.mIndices;
}
this.mesh.RecalculateBounds();
this.mFilter.mesh = this.mesh;
if (this.mFilter != null)
{
this.mFilter.mesh = this.mesh;
}
}
// Token: 0x06000A11 RID: 2577 RVA: 0x0002CCE4 File Offset: 0x0002AEE4
Assets/Scripts/Assembly-CSharp/effect_sample_main.cs
+2 -2
View File
@@ -11,10 +11,10 @@ public class effect_sample_main : MonoBehaviour
this.idx = 0;
yield return base.StartCoroutine(this.loadAssetBundle());
GameObject panel = GameObject.Find("Panel");
panel.renderer.material.mainTexture = this.fromTex;
panel.GetComponent<Renderer>().material.mainTexture = this.fromTex;
for (;;)
{
EffectManager.Init(this.ManageEffects[this.idx], this.transTime, panel.renderer, this.fromTex, this.toTex);
EffectManager.Init(this.ManageEffects[this.idx], this.transTime, panel.GetComponent<Renderer>(), this.fromTex, this.toTex);
yield return new WaitForSeconds(1f);
yield return base.StartCoroutine(EffectManager.StartEffect());
this.idx++;
Assets/Scripts/Assembly-CSharp/obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache
BIN
View File
Binary file not shown.
Assets/Scripts/Assembly-CSharp/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
BIN
View File
Binary file not shown.
Assets/Scripts/P31RestKit/AbstractManager.cs
+1 -1
View File
@@ -74,7 +74,7 @@ namespace Prime31
GameObject gameObject = new GameObject(type.ToString());
gameObject.AddComponent(type);
gameObject.transform.parent = prime31ManagerGameObject.transform;
UnityEngine.Object.DontDestroyOnLoad(gameObject);
//UnityEngine.Object.DontDestroyOnLoad(gameObject);
}
}
catch (UnityException)