From fe17ead9c5d4394e8bbf01abb43db4cc711e2057 Mon Sep 17 00:00:00 2001 From: Arneth Date: Thu, 27 Jan 2022 20:44:06 -0500 Subject: [PATCH] in progress changes --- Assembly-CSharp-vs.csproj | 20 +++- Assembly-CSharp.csproj | 20 +++- Assets/Scene/Scenes/Init.unity | Bin 10256 -> 10264 bytes Assets/Scene/ShaderTestingGrounds.unity | Bin 0 -> 15640 bytes Assets/Scripts/Assembly-CSharp/BaseWindow.cs | 3 +- .../Scripts/Assembly-CSharp/CreateSprite.cs | 4 +- .../Assembly-CSharp/GalleryMovieWindow.cs | 3 +- .../Assembly-CSharp/LogoMovieWindow.cs | 3 +- Assets/Scripts/Assembly-CSharp/Man2D.cs | 10 +- .../Scripts/Assembly-CSharp/MovieManager.cs | 3 + .../Assembly-CSharp/Qoo/Graphics/Movie.cs | 3 +- .../Scripts/Assembly-CSharp/Qoo/Ks/KsScene.cs | 1 + .../Scripts/Assembly-CSharp/ScreenEffect.cs | 3 +- .../Assembly-CSharp/ScreenKeyboardManager.cs | 10 +- .../Assembly-CSharp/ScreenMovieSample.cs | 3 +- .../Scripts/Assembly-CSharp/SubPartCamera.cs | 4 +- Assets/Scripts/Assembly-CSharp/UnityFile.cs | 13 ++ Assets/Scripts/Assembly-CSharp/UnityGraph.cs | 9 +- Assets/Scripts/Assembly-CSharp/UnitySprite.cs | 9 +- .../GUI - Text Shader (AlphaClip).shader | 111 +++++++++++++++++ .../GUI - Text Shader (SoftClip).shader | 109 +++++++++++++++++ .../Unlit - Additive Colored.shader | 36 ++++++ .../TestShaders/Unlit - Depth Cutout.shader | 35 ++++++ Assets/TestShaders/Unlit - Depth.shader | 20 ++++ .../Unlit - Dynamic Font (AlphaClip).shader | 112 ++++++++++++++++++ .../Unlit - Dynamic Font (SoftClip).shader | 109 +++++++++++++++++ .../TestShaders/Unlit - Dynamic Font.shader | 99 ++++++++++++++++ .../TestShaders/Unlit - Masked Colored.shader | 106 +++++++++++++++++ ...- Premultiplied Colored (AlphaClip).shader | 111 +++++++++++++++++ ... - Premultiplied Colored (SoftClip).shader | 109 +++++++++++++++++ .../Unlit - Premultiplied Colored.shader | 100 ++++++++++++++++ ...t - Transparent Colored (AlphaClip).shader | 110 +++++++++++++++++ ...arent Colored (Packed) (AlphaClip) .shader | 80 +++++++++++++ ...sparent Colored (Packed) (SoftClip).shader | 80 +++++++++++++ ...nlit - Transparent Colored (Packed).shader | 75 ++++++++++++ ...it - Transparent Colored (SoftClip).shader | 107 +++++++++++++++++ .../Unlit - Transparent Colored.shader | 68 +++++++++++ ProjectSettings/EditorBuildSettings.asset | Bin 5724 -> 5724 bytes ProjectSettings/ProjectSettings.asset | Bin 29704 -> 19820 bytes unityshinsoubanalice-csharp.sln | 2 +- unityshinsoubanalice.sln | 2 +- unityshinsoubanalice.userprefs | 25 ++-- 42 files changed, 1693 insertions(+), 34 deletions(-) create mode 100644 Assets/Scene/ShaderTestingGrounds.unity create mode 100644 Assets/TestShaders/GUI - Text Shader (AlphaClip).shader create mode 100644 Assets/TestShaders/GUI - Text Shader (SoftClip).shader create mode 100644 Assets/TestShaders/Unlit - Additive Colored.shader create mode 100644 Assets/TestShaders/Unlit - Depth Cutout.shader create mode 100644 Assets/TestShaders/Unlit - Depth.shader create mode 100644 Assets/TestShaders/Unlit - Dynamic Font (AlphaClip).shader create mode 100644 Assets/TestShaders/Unlit - Dynamic Font (SoftClip).shader create mode 100644 Assets/TestShaders/Unlit - Dynamic Font.shader create mode 100644 Assets/TestShaders/Unlit - Masked Colored.shader create mode 100644 Assets/TestShaders/Unlit - Premultiplied Colored (AlphaClip).shader create mode 100644 Assets/TestShaders/Unlit - Premultiplied Colored (SoftClip).shader create mode 100644 Assets/TestShaders/Unlit - Premultiplied Colored.shader create mode 100644 Assets/TestShaders/Unlit - Transparent Colored (AlphaClip).shader create mode 100644 Assets/TestShaders/Unlit - Transparent Colored (Packed) (AlphaClip) .shader create mode 100644 Assets/TestShaders/Unlit - Transparent Colored (Packed) (SoftClip).shader create mode 100644 Assets/TestShaders/Unlit - Transparent Colored (Packed).shader create mode 100644 Assets/TestShaders/Unlit - Transparent Colored (SoftClip).shader create mode 100644 Assets/TestShaders/Unlit - Transparent Colored.shader diff --git a/Assembly-CSharp-vs.csproj b/Assembly-CSharp-vs.csproj index d317fded6..77670f57d 100644 --- a/Assembly-CSharp-vs.csproj +++ b/Assembly-CSharp-vs.csproj @@ -19,7 +19,7 @@ full false Temp\bin\Debug\ - DEBUG;TRACE;UNITY_STANDALONE_WIN;ENABLE_MICROPHONE;ENABLE_TEXTUREID_MAP;ENABLE_AUDIO_FMOD;UNITY_STANDALONE;ENABLE_MONO;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_GENERICS;ENABLE_SUBSTANCE;INCLUDE_WP8SUPPORT;ENABLE_MOVIES;ENABLE_WWW;ENABLE_IMAGEEFFECTS;ENABLE_WEBCAM;INCLUDE_METROSUPPORT;RENDER_SOFTWARE_CURSOR;ENABLE_NETWORK;ENABLE_PHYSICS;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_2D_PHYSICS;ENABLE_SHADOWS;ENABLE_AUDIO;ENABLE_NAVMESH_CARVING;ENABLE_DUCK_TYPING;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;UNITY_4_3_1;UNITY_4_3;ENABLE_PROFILER;UNITY_EDITOR;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE + DEBUG;TRACE;UNITY_STANDALONE_WIN;ENABLE_MICROPHONE;ENABLE_TEXTUREID_MAP;ENABLE_AUDIO_FMOD;UNITY_STANDALONE;ENABLE_MONO;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_GENERICS;ENABLE_SUBSTANCE;INCLUDE_WP8SUPPORT;ENABLE_MOVIES;ENABLE_WWW;ENABLE_IMAGEEFFECTS;ENABLE_WEBCAM;INCLUDE_METROSUPPORT;RENDER_SOFTWARE_CURSOR;ENABLE_NETWORK;ENABLE_PHYSICS;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_2D_PHYSICS;ENABLE_SHADOWS;ENABLE_AUDIO;ENABLE_NAVMESH_CARVING;ENABLE_DUCK_TYPING;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;UNITY_4_3_1;UNITY_4_3;DEVELOPMENT_BUILD;ENABLE_PROFILER;UNITY_EDITOR;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE prompt 4 0169 @@ -440,19 +440,37 @@ + + + + + + + + + + + + + + + + + + diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index d317fded6..77670f57d 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -19,7 +19,7 @@ full false Temp\bin\Debug\ - DEBUG;TRACE;UNITY_STANDALONE_WIN;ENABLE_MICROPHONE;ENABLE_TEXTUREID_MAP;ENABLE_AUDIO_FMOD;UNITY_STANDALONE;ENABLE_MONO;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_GENERICS;ENABLE_SUBSTANCE;INCLUDE_WP8SUPPORT;ENABLE_MOVIES;ENABLE_WWW;ENABLE_IMAGEEFFECTS;ENABLE_WEBCAM;INCLUDE_METROSUPPORT;RENDER_SOFTWARE_CURSOR;ENABLE_NETWORK;ENABLE_PHYSICS;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_2D_PHYSICS;ENABLE_SHADOWS;ENABLE_AUDIO;ENABLE_NAVMESH_CARVING;ENABLE_DUCK_TYPING;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;UNITY_4_3_1;UNITY_4_3;ENABLE_PROFILER;UNITY_EDITOR;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE + DEBUG;TRACE;UNITY_STANDALONE_WIN;ENABLE_MICROPHONE;ENABLE_TEXTUREID_MAP;ENABLE_AUDIO_FMOD;UNITY_STANDALONE;ENABLE_MONO;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_GENERICS;ENABLE_SUBSTANCE;INCLUDE_WP8SUPPORT;ENABLE_MOVIES;ENABLE_WWW;ENABLE_IMAGEEFFECTS;ENABLE_WEBCAM;INCLUDE_METROSUPPORT;RENDER_SOFTWARE_CURSOR;ENABLE_NETWORK;ENABLE_PHYSICS;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_2D_PHYSICS;ENABLE_SHADOWS;ENABLE_AUDIO;ENABLE_NAVMESH_CARVING;ENABLE_DUCK_TYPING;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;UNITY_4_3_1;UNITY_4_3;DEVELOPMENT_BUILD;ENABLE_PROFILER;UNITY_EDITOR;UNITY_EDITOR_WIN;UNITY_TEAM_LICENSE prompt 4 0169 @@ -440,19 +440,37 @@ + + + + + + + + + + + + + + + + + + diff --git a/Assets/Scene/Scenes/Init.unity b/Assets/Scene/Scenes/Init.unity index 6ef5c3a05c04017930b964bf32d00e76af5c70e6..865d4b6f88aa279a7d3b3505c845e1acf8c12e42 100644 GIT binary patch delta 79 zcmbObFe8A2fkCyGfk8uJBS)O7U!O5w4sUevq TIjIZ`sQk$bRpln%P`3a8e3%ze delta 66 zcmbOcFd=}0fkCyGfk8uHBS)O7pbrBB!+#(s0@9z9gY^V9m#gYBi2`{Hd_WwWoSK*F Qlb@dNn_reW`Jj3@09{KG^#A|> diff --git a/Assets/Scene/ShaderTestingGrounds.unity b/Assets/Scene/ShaderTestingGrounds.unity new file mode 100644 index 0000000000000000000000000000000000000000..f7f687eac3afe72df26dc11bdb8260add274a962 GIT binary patch literal 15640 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 literal 0 HcmV?d00001 diff --git a/Assets/Scripts/Assembly-CSharp/BaseWindow.cs b/Assets/Scripts/Assembly-CSharp/BaseWindow.cs index 3c79fb715..127f8af12 100644 --- a/Assets/Scripts/Assembly-CSharp/BaseWindow.cs +++ b/Assets/Scripts/Assembly-CSharp/BaseWindow.cs @@ -92,7 +92,8 @@ public abstract class BaseWindow : MonoBehaviourWrap public sealed override void Start() { //base.transform.parent.localPosition = new Vector3(2000f, 0f, 0f); - base.transform.gameObject.transform.position = new Vector3(2000f, 0f, 0f); + //base.transform.gameObject.transform.position = new Vector3(2000f, 0f, 0f); + base.transform.gameObject.transform.position = new Vector3(0f, 0f, 0f); this.BeforeInit(); foreach (BaseWindow.UIComponent uicomponent in this.newComponentArray()) { diff --git a/Assets/Scripts/Assembly-CSharp/CreateSprite.cs b/Assets/Scripts/Assembly-CSharp/CreateSprite.cs index fb7d9f00c..7bc4fbefa 100644 --- a/Assets/Scripts/Assembly-CSharp/CreateSprite.cs +++ b/Assets/Scripts/Assembly-CSharp/CreateSprite.cs @@ -32,9 +32,7 @@ public class CreateSprite : MonoBehaviour { UnityEngine.Object.Destroy(meshRenderer.material); } - // TODO Font - //meshRenderer.material = new Material(Resources.Load("Shader/Sprite/TextSprite") as Shader); - meshRenderer.material = new Material(Shader.Find("Unlit/Transparent") as Shader); + meshRenderer.material = new Material(Resources.Load("Shader/Sprite/TextSprite") as Shader); meshRenderer.castShadows = false; meshRenderer.receiveShadows = false; diff --git a/Assets/Scripts/Assembly-CSharp/GalleryMovieWindow.cs b/Assets/Scripts/Assembly-CSharp/GalleryMovieWindow.cs index efcb54234..ff3e4ab73 100644 --- a/Assets/Scripts/Assembly-CSharp/GalleryMovieWindow.cs +++ b/Assets/Scripts/Assembly-CSharp/GalleryMovieWindow.cs @@ -38,7 +38,8 @@ public class GalleryMovieWindow : BaseWindow // Token: 0x06000723 RID: 1827 RVA: 0x0001E854 File Offset: 0x0001CA54 private IEnumerator PlayMovie() { - yield return base.StartCoroutine(MovieManager.PlayMovie("mp4/high/op_movie.mp4", FullScreenMovieControlMode.CancelOnInput)); + //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)); this.state = GalleryMovieWindow.STATE.END; yield break; } diff --git a/Assets/Scripts/Assembly-CSharp/LogoMovieWindow.cs b/Assets/Scripts/Assembly-CSharp/LogoMovieWindow.cs index 791bcaa68..15306d71c 100644 --- a/Assets/Scripts/Assembly-CSharp/LogoMovieWindow.cs +++ b/Assets/Scripts/Assembly-CSharp/LogoMovieWindow.cs @@ -32,7 +32,8 @@ public class LogoMovieWindow : BaseWindow // Token: 0x06000781 RID: 1921 RVA: 0x0002049C File Offset: 0x0001E69C private IEnumerator PlayMovie() { - yield return base.StartCoroutine(MovieManager.PlayMovie("mp4/normal/quinrose_logo_8.mp4", FullScreenMovieControlMode.CancelOnInput)); + //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)); this.state = LogoMovieWindow.STATE.END; yield break; } diff --git a/Assets/Scripts/Assembly-CSharp/Man2D.cs b/Assets/Scripts/Assembly-CSharp/Man2D.cs index 5e364d9a1..ee358ef92 100644 --- a/Assets/Scripts/Assembly-CSharp/Man2D.cs +++ b/Assets/Scripts/Assembly-CSharp/Man2D.cs @@ -51,7 +51,9 @@ public class Man2D : Singleton private void OnEnable() { this.m_Sprite.Enable(); - base.camera.enabled = true; + //TODO determine why camera breaks + //base.camera.enabled = true; + base.camera.enabled = false; } // Token: 0x06000978 RID: 2424 RVA: 0x00029EF4 File Offset: 0x000280F4 @@ -303,12 +305,12 @@ public class Man2D : Singleton Qoo.Debug.Print("Create Frame Buffer"); int w = 960; int h = 544; - if (iPhone.generation == iPhoneGeneration.iPhone4) + /*if (iPhone.generation == iPhoneGeneration.iPhone4) { w = 512; h = 512; - } - Qoo.Debug.Print("Info:iPhone.generation:" + iPhone.generation); + }*/ + //Qoo.Debug.Print("Info:iPhone.generation:" + iPhone.generation); for (int i = 0; i < this.m_FrameBufferAr.Length; i++) { this.m_FrameBufferAr[i] = new FrameBuffer(w, h, "2D Sprite FrameBuffer" + i); diff --git a/Assets/Scripts/Assembly-CSharp/MovieManager.cs b/Assets/Scripts/Assembly-CSharp/MovieManager.cs index 9327654d2..f599352a7 100644 --- a/Assets/Scripts/Assembly-CSharp/MovieManager.cs +++ b/Assets/Scripts/Assembly-CSharp/MovieManager.cs @@ -5,6 +5,8 @@ using UnityEngine; // Token: 0x0200017E RID: 382 public class MovieManager { + //TODO fix movie playing. either make platform specific versions OR make platform agnostic + /* // Token: 0x06000ACD RID: 2765 RVA: 0x0002F630 File Offset: 0x0002D830 public static IEnumerator PlayMovie(string path, FullScreenMovieControlMode mode) { @@ -12,4 +14,5 @@ public class MovieManager yield return 0; yield break; } + */ } diff --git a/Assets/Scripts/Assembly-CSharp/Qoo/Graphics/Movie.cs b/Assets/Scripts/Assembly-CSharp/Qoo/Graphics/Movie.cs index 37ab68df8..b7d4583bd 100644 --- a/Assets/Scripts/Assembly-CSharp/Qoo/Graphics/Movie.cs +++ b/Assets/Scripts/Assembly-CSharp/Qoo/Graphics/Movie.cs @@ -15,7 +15,8 @@ namespace Qoo.Graphics NMB_FILEINFO fileInfo = Nmb.GetFileInfo(fileId.Name); string text = fileInfo.DirName + fileInfo.FileName; Debug.Print(string.Format("INFO:Start Movie({0} Skip={1})", text, IsSkip.ToString())); - UnityTask.SetSubTask(MovieManager.PlayMovie(text, FullScreenMovieControlMode.CancelOnInput)); + //TODO fix movie playing. either make platform specific versions OR make platform agnostic + //UnityTask.SetSubTask(MovieManager.PlayMovie(text, FullScreenMovieControlMode.CancelOnInput)); } } } diff --git a/Assets/Scripts/Assembly-CSharp/Qoo/Ks/KsScene.cs b/Assets/Scripts/Assembly-CSharp/Qoo/Ks/KsScene.cs index b08f23526..057a53b25 100644 --- a/Assets/Scripts/Assembly-CSharp/Qoo/Ks/KsScene.cs +++ b/Assets/Scripts/Assembly-CSharp/Qoo/Ks/KsScene.cs @@ -490,6 +490,7 @@ namespace Qoo.Ks } // Token: 0x06000384 RID: 900 RVA: 0x0000BECC File Offset: 0x0000A0CC + // TODO investigate for message printing private EVENTSCENE SceneApplySub(EVENTSCENE Scene, bool bMsg, bool IsVoice = true) { if (Scene.Message.Sw == SWITCH.ON && Scene.Message.Tag != null) diff --git a/Assets/Scripts/Assembly-CSharp/ScreenEffect.cs b/Assets/Scripts/Assembly-CSharp/ScreenEffect.cs index d92d8750c..8bc6253e1 100644 --- a/Assets/Scripts/Assembly-CSharp/ScreenEffect.cs +++ b/Assets/Scripts/Assembly-CSharp/ScreenEffect.cs @@ -68,7 +68,8 @@ public class ScreenEffect } else { - ScreenEffect.goScreenEffect.transform.localPosition = new Vector3(2000f, 0f, (float)(-(float)z)); + //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); } diff --git a/Assets/Scripts/Assembly-CSharp/ScreenKeyboardManager.cs b/Assets/Scripts/Assembly-CSharp/ScreenKeyboardManager.cs index 8811994b9..e514c0e66 100644 --- a/Assets/Scripts/Assembly-CSharp/ScreenKeyboardManager.cs +++ b/Assets/Scripts/Assembly-CSharp/ScreenKeyboardManager.cs @@ -51,14 +51,16 @@ public class ScreenKeyboardManager : MonoBehaviour { get { - return ScreenKeyboardManager.Instance.m_keyboard.wasCanceled; + return false; + //return ScreenKeyboardManager.Instance.m_keyboard.wasCanceled; } } // Token: 0x06000A97 RID: 2711 RVA: 0x0002EAC8 File Offset: 0x0002CCC8 public static IEnumerator Open(string defaultString = "") { - ScreenKeyboardManager.Instance.m_inputText = defaultString; + //TODO fix TouchScreenKeyboard issue + /*ScreenKeyboardManager.Instance.m_inputText = defaultString; ScreenKeyboardManager.Instance.m_keyboard = TouchScreenKeyboard.Open(defaultString, TouchScreenKeyboardType.NamePhonePad); while (!ScreenKeyboardManager.Instance.m_keyboard.active) { @@ -71,7 +73,7 @@ public class ScreenKeyboardManager : MonoBehaviour if (ScreenKeyboardManager.Instance.m_keyboard.done) { ScreenKeyboardManager.Instance.m_inputText = ScreenKeyboardManager.Instance.m_keyboard.text; - } + }*/ yield break; } @@ -89,7 +91,7 @@ public class ScreenKeyboardManager : MonoBehaviour private static ScreenKeyboardManager m_instance; // Token: 0x04000886 RID: 2182 - private TouchScreenKeyboard m_keyboard; + //private TouchScreenKeyboard m_keyboard; // Token: 0x04000887 RID: 2183 private string m_inputText; diff --git a/Assets/Scripts/Assembly-CSharp/ScreenMovieSample.cs b/Assets/Scripts/Assembly-CSharp/ScreenMovieSample.cs index e216db700..8f2286c0f 100644 --- a/Assets/Scripts/Assembly-CSharp/ScreenMovieSample.cs +++ b/Assets/Scripts/Assembly-CSharp/ScreenMovieSample.cs @@ -8,7 +8,8 @@ public class ScreenMovieSample : MonoBehaviour // Token: 0x06000011 RID: 17 RVA: 0x00002238 File Offset: 0x00000438 private IEnumerator Start() { - yield return base.StartCoroutine(MovieManager.PlayMovie("mp4/high/op_movie.mp4", FullScreenMovieControlMode.CancelOnInput)); + //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)); Debug.Log(" #DEBUGLOG::MOVIE OWATA "); yield break; } diff --git a/Assets/Scripts/Assembly-CSharp/SubPartCamera.cs b/Assets/Scripts/Assembly-CSharp/SubPartCamera.cs index 0e86df53b..fe661f553 100644 --- a/Assets/Scripts/Assembly-CSharp/SubPartCamera.cs +++ b/Assets/Scripts/Assembly-CSharp/SubPartCamera.cs @@ -38,7 +38,9 @@ public class SubPartCamera : MonoBehaviour SubPartCamera.Instance.m_Camera.nearClipPlane = 0.3f; SubPartCamera.Instance.m_Camera.rect = SubPartCamera.Instance.calcAspect(SubPartCamera.Instance.m_AspectWidth, SubPartCamera.Instance.m_AspectHeight); SubPartCamera.Instance.m_Camera.enabled = true; - SubPartCamera.Instance.gameObject.transform.localPosition = new Vector3(2000f, 0f, -1000f); + //TODO Camera change + //SubPartCamera.Instance.gameObject.transform.localPosition = new Vector3(2000f, 0f, -1000f); + SubPartCamera.Instance.gameObject.transform.localPosition = new Vector3(0f, 0f, -1000f); } // Token: 0x0600063A RID: 1594 RVA: 0x00019EE8 File Offset: 0x000180E8 diff --git a/Assets/Scripts/Assembly-CSharp/UnityFile.cs b/Assets/Scripts/Assembly-CSharp/UnityFile.cs index 4ccb81346..4b535d9d8 100644 --- a/Assets/Scripts/Assembly-CSharp/UnityFile.cs +++ b/Assets/Scripts/Assembly-CSharp/UnityFile.cs @@ -83,6 +83,7 @@ public class UnityFile this.m_szPath = path; this.m_IsAssetBandle = IsAssetBandle; UnityTask.SetReadTask(this.LoadWait()); + return true; } @@ -185,11 +186,23 @@ public class UnityFile } else if (this.m_IsAssetBandle) { + + //TODO fix issue with resources ang streaming assets folders and the build + //New code start. This loads PNGs directly rather than from assetbundles + UnityEngine.Debug.Log (Application.dataPath + "/Resources" + m_szPath + m_szName + ".png"); + byte[] data = System.IO.File.ReadAllBytes(Application.dataPath + "/Resources" + m_szPath + m_szName + ".png"); + this.m_ReadData = data; + //New code end + + //Old code for asset bundles + /* AssetBundle ab = loader.assetBundle; TextAsset ta = ab.mainAsset as TextAsset; + this.m_ReadData = data; this.m_ReadData = ta.bytes; Resources.UnloadAsset(ta); ab.Unload(false); + */ } else { diff --git a/Assets/Scripts/Assembly-CSharp/UnityGraph.cs b/Assets/Scripts/Assembly-CSharp/UnityGraph.cs index a52b2fa24..3a30b86dd 100644 --- a/Assets/Scripts/Assembly-CSharp/UnityGraph.cs +++ b/Assets/Scripts/Assembly-CSharp/UnityGraph.cs @@ -82,7 +82,9 @@ public class UnityGraph : Singleton this.m_ManSprite.enabled = true; CreateSprite.CreateSpriteCamera(base.gameObject, Screen.height, false); base.gameObject.camera.aspect = (float)Screen.width / (float)Screen.height; - base.gameObject.camera.enabled = true; + //TODO fix camera issues, find out why this is needed + //base.gameObject.camera.enabled = true; + base.gameObject.camera.enabled = false; this.m_FrameBg.obj.SetActive(true); if (this.m_FrameBg.tex == null) { @@ -275,6 +277,8 @@ public class UnityGraph : Singleton // Token: 0x060009BF RID: 2495 RVA: 0x0002B3BC File Offset: 0x000295BC public IEnumerator Effect(string name, float time = 1f) { + //TODO effect movies crash game and standard effects need shaders. Fix and re-add them + /* string text = name; switch (text) { @@ -311,11 +315,14 @@ public class UnityGraph : Singleton name = fileInfo.DirName + fileInfo.FileName; } return this.EffectMovie(name); + */ + yield break; } // Token: 0x060009C0 RID: 2496 RVA: 0x0002B524 File Offset: 0x00029724 private IEnumerator EffectMain(string name, float time) { + yield return 0; yield return 0; this.m_ManSprite.UpdateFrameBuffer(); diff --git a/Assets/Scripts/Assembly-CSharp/UnitySprite.cs b/Assets/Scripts/Assembly-CSharp/UnitySprite.cs index 11b85ed81..92fe41c4c 100644 --- a/Assets/Scripts/Assembly-CSharp/UnitySprite.cs +++ b/Assets/Scripts/Assembly-CSharp/UnitySprite.cs @@ -223,7 +223,14 @@ public class UnitySprite public void SetMaterial(string shader_name) { this.DeleteMaterial(); - this.obj.renderer.material = new Material(Resources.Load(shader_name) as Shader); + //TODO get all shaders working or implement workarounds + //added workaround + if (shader_name == "Shader/Sprite/Sprite") { + this.obj.renderer.material = new Material (Shader.Find ("Unlit/Transparent") as Shader); + } else { + this.obj.renderer.material = new Material(Resources.Load(shader_name) as Shader); + } + //this.obj.renderer.material = new Material(Resources.Load(shader_name) as Shader); } // Token: 0x060009DE RID: 2526 RVA: 0x0002B940 File Offset: 0x00029B40 diff --git a/Assets/TestShaders/GUI - Text Shader (AlphaClip).shader b/Assets/TestShaders/GUI - Text Shader (AlphaClip).shader new file mode 100644 index 000000000..c46d222b3 --- /dev/null +++ b/Assets/TestShaders/GUI - Text Shader (AlphaClip).shader @@ -0,0 +1,111 @@ +Shader "GUI/Text Shader (AlphaClip)" +{ + Properties + { + _MainTex ("Alpha (A)", 2D) = "white" {} + } + + SubShader + { + LOD 200 + + Tags + { + "Queue" = "Transparent" + "IgnoreProjector" = "True" + "RenderType" = "Transparent" + } + + Pass + { + Cull Off + Lighting Off + ZWrite Off + Offset -1, -1 + Fog { Mode Off } + //ColorMask RGB + Blend SrcAlpha OneMinusSrcAlpha + + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #include "UnityCG.cginc" + + sampler2D _MainTex; + float4 _MainTex_ST; + + struct appdata_t + { + float4 vertex : POSITION; + half4 color : COLOR; + float2 texcoord : TEXCOORD0; + }; + + struct v2f + { + float4 vertex : POSITION; + half4 color : COLOR; + float2 texcoord : TEXCOORD0; + float2 worldPos : TEXCOORD1; + }; + + v2f vert (appdata_t v) + { + v2f o; + o.vertex = mul(UNITY_MATRIX_MVP, v.vertex); + o.color = v.color; + o.texcoord = v.texcoord; + o.worldPos = TRANSFORM_TEX(v.vertex.xy, _MainTex); + return o; + } + + half4 frag (v2f IN) : COLOR + { + // Sample the texture + half4 col = IN.color; + col.a *= tex2D(_MainTex, IN.texcoord).a; + + float2 factor = abs(IN.worldPos); + float val = 1.0 - max(factor.x, factor.y); + + // Option 1: 'if' statement + if (val < 0.0) col.a = 0.0; + + // Option 2: no 'if' statement -- may be faster on some devices + //col.a *= ceil(clamp(val, 0.0, 1.0)); + + return col; + } + ENDCG + } + } + + SubShader + { + LOD 100 + + Tags + { + "Queue" = "Transparent" + "IgnoreProjector" = "True" + "RenderType" = "Transparent" + } + + Pass + { + Cull Off + Lighting Off + ZWrite Off + Fog { Mode Off } + ColorMask RGB + AlphaTest Greater .01 + Blend SrcAlpha OneMinusSrcAlpha + ColorMaterial AmbientAndDiffuse + + SetTexture [_MainTex] + { + Combine Texture * Primary + } + } + } +} diff --git a/Assets/TestShaders/GUI - Text Shader (SoftClip).shader b/Assets/TestShaders/GUI - Text Shader (SoftClip).shader new file mode 100644 index 000000000..51e2932a4 --- /dev/null +++ b/Assets/TestShaders/GUI - Text Shader (SoftClip).shader @@ -0,0 +1,109 @@ +Shader "GUI/Text Shader (SoftClip)" +{ + Properties + { + _MainTex ("Alpha (A)", 2D) = "white" {} + } + + SubShader + { + LOD 200 + + Tags + { + "Queue" = "Transparent" + "IgnoreProjector" = "True" + "RenderType" = "Transparent" + } + + Pass + { + Cull Off + Lighting Off + ZWrite Off + Offset -1, -1 + Fog { Mode Off } + //ColorMask RGB + AlphaTest Greater .01 + Blend SrcAlpha OneMinusSrcAlpha + + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + + #include "UnityCG.cginc" + + sampler2D _MainTex; + float4 _MainTex_ST; + float2 _ClipSharpness = float2(20.0, 20.0); + + struct appdata_t + { + float4 vertex : POSITION; + half4 color : COLOR; + float2 texcoord : TEXCOORD0; + }; + + struct v2f + { + float4 vertex : POSITION; + half4 color : COLOR; + float2 texcoord : TEXCOORD0; + float2 worldPos : TEXCOORD1; + }; + + v2f vert (appdata_t v) + { + v2f o; + o.vertex = mul(UNITY_MATRIX_MVP, v.vertex); + o.color = v.color; + o.texcoord = v.texcoord; + o.worldPos = TRANSFORM_TEX(v.vertex.xy, _MainTex); + return o; + } + + half4 frag (v2f IN) : COLOR + { + // Softness factor + float2 factor = (float2(1.0, 1.0) - abs(IN.worldPos)) * _ClipSharpness; + + // Sample the texture + half4 col = IN.color; + col.a *= tex2D(_MainTex, IN.texcoord).a; + col.a *= clamp( min(factor.x, factor.y), 0.0, 1.0); + + return col; + } + ENDCG + } + } + + SubShader + { + LOD 100 + + Tags + { + "Queue" = "Transparent" + "IgnoreProjector" = "True" + "RenderType" = "Transparent" + } + + Pass + { + Cull Off + Lighting Off + ZWrite Off + Fog { Mode Off } + ColorMask RGB + AlphaTest Greater .01 + Blend SrcAlpha OneMinusSrcAlpha + ColorMaterial AmbientAndDiffuse + + SetTexture [_MainTex] + { + Combine Texture * Primary + } + } + } +} diff --git a/Assets/TestShaders/Unlit - Additive Colored.shader b/Assets/TestShaders/Unlit - Additive Colored.shader new file mode 100644 index 000000000..ad4223196 --- /dev/null +++ b/Assets/TestShaders/Unlit - Additive Colored.shader @@ -0,0 +1,36 @@ +Shader "Unlit/Additive Colored" +{ + Properties + { + _MainTex ("Base (RGB), Alpha (A)", 2D) = "white" {} + } + + SubShader + { + Tags + { + "Queue" = "Transparent" + "IgnoreProjector" = "True" + "RenderType" = "Transparent" + } + + LOD 100 + Cull Off + Lighting Off + ZWrite Off + Fog { Mode Off } + ColorMask RGB + AlphaTest Greater .01 + Blend One One + + Pass + { + ColorMaterial AmbientAndDiffuse + + SetTexture [_MainTex] + { + Combine Texture * Primary + } + } + } +} \ No newline at end of file diff --git a/Assets/TestShaders/Unlit - Depth Cutout.shader b/Assets/TestShaders/Unlit - Depth Cutout.shader new file mode 100644 index 000000000..fbfbd6992 --- /dev/null +++ b/Assets/TestShaders/Unlit - Depth Cutout.shader @@ -0,0 +1,35 @@ +Shader "Unlit/Depth Cutout" +{ + Properties + { + _MainTex ("Base (RGB), Alpha (A)", 2D) = "white" {} + } + + SubShader + { + LOD 100 + + Tags + { + "Queue" = "Background" + "IgnoreProjector" = "True" + } + + Pass + { + Cull Off + Lighting Off + Blend Off + ColorMask 0 + ZWrite On + ZTest Less + AlphaTest Greater .99 + ColorMaterial AmbientAndDiffuse + + SetTexture [_MainTex] + { + Combine Texture * Primary + } + } + } +} \ No newline at end of file diff --git a/Assets/TestShaders/Unlit - Depth.shader b/Assets/TestShaders/Unlit - Depth.shader new file mode 100644 index 000000000..091ee9541 --- /dev/null +++ b/Assets/TestShaders/Unlit - Depth.shader @@ -0,0 +1,20 @@ +Shader "Unlit/Depth" +{ + SubShader + { + Lod 100 + + Tags + { + "Queue" = "Geometry+1" + "RenderType"="Opaque" + } + + Pass + { + ZWrite On + ZTest LEqual + ColorMask 0 + } + } +} \ No newline at end of file diff --git a/Assets/TestShaders/Unlit - Dynamic Font (AlphaClip).shader b/Assets/TestShaders/Unlit - Dynamic Font (AlphaClip).shader new file mode 100644 index 000000000..0fbc7f7ab --- /dev/null +++ b/Assets/TestShaders/Unlit - Dynamic Font (AlphaClip).shader @@ -0,0 +1,112 @@ +Shader "Unlit/Dynamic Font (AlphaClip)" +{ + Properties + { + _MainTex ("Alpha (A)", 2D) = "white" {} + } + + SubShader + { + LOD 200 + + Tags + { + "Queue" = "Transparent" + "IgnoreProjector" = "True" + "RenderType" = "Transparent" + } + + Pass + { + Cull Off + Lighting Off + ZWrite Off + Offset -1, -1 + Fog { Mode Off } + //ColorMask RGB + Blend SrcAlpha OneMinusSrcAlpha + + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #include "UnityCG.cginc" + + sampler2D _MainTex; + float4 _MainTex_ST; + + struct appdata_t + { + float4 vertex : POSITION; + half4 color : COLOR; + float2 texcoord : TEXCOORD0; + }; + + struct v2f + { + float4 vertex : POSITION; + half4 color : COLOR; + float2 texcoord : TEXCOORD0; + float2 worldPos : TEXCOORD1; + }; + + v2f vert (appdata_t v) + { + v2f o; + o.vertex = mul(UNITY_MATRIX_MVP, v.vertex); + o.color = v.color; + o.texcoord = v.texcoord; + o.worldPos = TRANSFORM_TEX(v.vertex.xy, _MainTex); + return o; + } + + half4 frag (v2f IN) : COLOR + { + // Sample the texture + //half4 col = tex2D(_MainTex, IN.texcoord) * IN.color; + half4 col = IN.color; + col.a *= tex2D(_MainTex, IN.texcoord).a; + + float2 factor = abs(IN.worldPos); + float val = 1.0 - max(factor.x, factor.y); + + // Option 1: 'if' statement + if (val < 0.0) col.a = 0.0; + + // Option 2: no 'if' statement -- may be faster on some devices + //col.a *= ceil(clamp(val, 0.0, 1.0)); + + return col; + } + ENDCG + } + } + + SubShader + { + LOD 100 + + Tags + { + "Queue" = "Transparent" + "IgnoreProjector" = "True" + "RenderType" = "Transparent" + } + + Pass + { + Cull Off + Lighting Off + ZWrite Off + Fog { Mode Off } + ColorMask RGB + AlphaTest Greater .01 + Blend SrcAlpha OneMinusSrcAlpha + ColorMaterial AmbientAndDiffuse + + SetTexture [_MainTex] + { + Combine Texture * Primary + } + } + } +} diff --git a/Assets/TestShaders/Unlit - Dynamic Font (SoftClip).shader b/Assets/TestShaders/Unlit - Dynamic Font (SoftClip).shader new file mode 100644 index 000000000..f0c2f804d --- /dev/null +++ b/Assets/TestShaders/Unlit - Dynamic Font (SoftClip).shader @@ -0,0 +1,109 @@ +Shader "Unlit/Dynamic Font (SoftClip)" +{ + Properties + { + _MainTex ("Alpha (A)", 2D) = "white" {} + } + + SubShader + { + LOD 200 + + Tags + { + "Queue" = "Transparent" + "IgnoreProjector" = "True" + "RenderType" = "Transparent" + } + + Pass + { + Cull Off + Lighting Off + ZWrite Off + Offset -1, -1 + Fog { Mode Off } + //ColorMask RGB + AlphaTest Greater .01 + Blend SrcAlpha OneMinusSrcAlpha + + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + + #include "UnityCG.cginc" + + sampler2D _MainTex; + float4 _MainTex_ST; + float2 _ClipSharpness = float2(20.0, 20.0); + + struct appdata_t + { + float4 vertex : POSITION; + half4 color : COLOR; + float2 texcoord : TEXCOORD0; + }; + + struct v2f + { + float4 vertex : POSITION; + half4 color : COLOR; + float2 texcoord : TEXCOORD0; + float2 worldPos : TEXCOORD1; + }; + + v2f vert (appdata_t v) + { + v2f o; + o.vertex = mul(UNITY_MATRIX_MVP, v.vertex); + o.color = v.color; + o.texcoord = v.texcoord; + o.worldPos = TRANSFORM_TEX(v.vertex.xy, _MainTex); + return o; + } + + half4 frag (v2f IN) : COLOR + { + // Softness factor + float2 factor = (float2(1.0, 1.0) - abs(IN.worldPos)) * _ClipSharpness; + + // Sample the texture + half4 col = IN.color; + col.a *= tex2D(_MainTex, IN.texcoord).a; + col.a *= clamp( min(factor.x, factor.y), 0.0, 1.0); + + return col; + } + ENDCG + } + } + + SubShader + { + LOD 100 + + Tags + { + "Queue" = "Transparent" + "IgnoreProjector" = "True" + "RenderType" = "Transparent" + } + + Pass + { + Cull Off + Lighting Off + ZWrite Off + Fog { Mode Off } + ColorMask RGB + AlphaTest Greater .01 + Blend SrcAlpha OneMinusSrcAlpha + ColorMaterial AmbientAndDiffuse + + SetTexture [_MainTex] + { + Combine Texture * Primary + } + } + } +} diff --git a/Assets/TestShaders/Unlit - Dynamic Font.shader b/Assets/TestShaders/Unlit - Dynamic Font.shader new file mode 100644 index 000000000..20ea42097 --- /dev/null +++ b/Assets/TestShaders/Unlit - Dynamic Font.shader @@ -0,0 +1,99 @@ +Shader "Unlit/Dynamic Font" +{ + Properties + { + _MainTex ("Alpha (A)", 2D) = "white" {} + } + SubShader + { + Tags + { + "Queue"="Transparent" + "IgnoreProjector"="True" + "RenderType"="Transparent" + } + + Cull Off + Lighting Off + ZWrite Off + Fog { Mode Off } + Offset -1, -1 + AlphaTest Greater .01 + Blend SrcAlpha OneMinusSrcAlpha + + Pass + { + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #pragma fragmentoption ARB_precision_hint_fastest + + #include "UnityCG.cginc" + + struct appdata_t + { + float4 vertex : POSITION; + fixed4 color : COLOR; + float2 texcoord : TEXCOORD0; + }; + + struct v2f + { + float4 vertex : POSITION; + fixed4 color : COLOR; + float2 texcoord : TEXCOORD0; + }; + + sampler2D _MainTex; + uniform float4 _MainTex_ST; + + v2f vert (appdata_t v) + { + v2f o; + o.vertex = mul(UNITY_MATRIX_MVP, v.vertex); + o.color = v.color; + o.texcoord = TRANSFORM_TEX(v.texcoord,_MainTex); + return o; + } + + fixed4 frag (v2f i) : COLOR + { + fixed4 col = i.color; + col.a *= tex2D(_MainTex, i.texcoord).a; + return col; + } + ENDCG + } + } + + SubShader + { + Tags + { + "Queue"="Transparent" + "IgnoreProjector"="True" + "RenderType"="Transparent" + } + Lighting Off + Cull Off + ZTest Always + ZWrite Off + Fog { Mode Off } + Blend SrcAlpha OneMinusSrcAlpha + + BindChannels + { + Bind "Color", color + Bind "Vertex", vertex + Bind "TexCoord", texcoord + } + + Pass + { + SetTexture [_MainTex] + { + constantColor [_Color] combine constant * primary, constant * texture + } + } + } +} diff --git a/Assets/TestShaders/Unlit - Masked Colored.shader b/Assets/TestShaders/Unlit - Masked Colored.shader new file mode 100644 index 000000000..a8e9ebf53 --- /dev/null +++ b/Assets/TestShaders/Unlit - Masked Colored.shader @@ -0,0 +1,106 @@ +Shader "Unlit/Masked Colored" +{ + Properties + { + _MainTex ("Base (RGB) Mask (A)", 2D) = "white" {} + _Color ("Tint Color", Color) = (1,1,1,1) + } + + SubShader + { + Tags + { + "Queue" = "Transparent" + "IgnoreProjector" = "True" + "RenderType" = "Transparent" + } + + LOD 200 + Cull Off + Lighting Off + ZWrite Off + Fog { Mode Off } + ColorMask RGB + Blend Off + + Pass + { + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #pragma fragmentoption ARB_precision_hint_fastest + + #include "UnityCG.cginc" + + sampler2D _MainTex; + fixed4 _Color; + + struct appdata_t + { + float4 vertex : POSITION; + fixed4 color : COLOR; + float2 texcoord : TEXCOORD0; + }; + + struct v2f + { + float4 vertex : POSITION; + fixed4 color : COLOR; + float2 texcoord : TEXCOORD0; + }; + + float4 _MainTex_ST; + + v2f vert (appdata_t v) + { + v2f o; + o.vertex = mul(UNITY_MATRIX_MVP, v.vertex); + o.color = v.color; + o.texcoord = TRANSFORM_TEX(v.texcoord, _MainTex); + return o; + } + + fixed4 frag (v2f i) : COLOR + { + half4 col = tex2D(_MainTex, i.texcoord) * i.color; + return half4( lerp(col.rgb, col.rgb * _Color.rgb, col.a), col.a ); + } + ENDCG + } + } + + SubShader + { + Tags + { + "Queue" = "Transparent" + "IgnoreProjector" = "True" + "RenderType" = "Transparent" + } + + LOD 100 + Cull Off + Lighting Off + ZWrite Off + Fog { Mode Off } + ColorMask RGB + AlphaTest Greater .01 + Blend Off + + Pass + { + ColorMaterial AmbientAndDiffuse + + SetTexture [_MainTex] + { + Combine Texture * Primary + } + + SetTexture [_MainTex] + { + ConstantColor [_Color] + Combine Previous * Constant + } + } + } +} \ No newline at end of file diff --git a/Assets/TestShaders/Unlit - Premultiplied Colored (AlphaClip).shader b/Assets/TestShaders/Unlit - Premultiplied Colored (AlphaClip).shader new file mode 100644 index 000000000..5958e5998 --- /dev/null +++ b/Assets/TestShaders/Unlit - Premultiplied Colored (AlphaClip).shader @@ -0,0 +1,111 @@ +Shader "Unlit/Premultiplied Colored (AlphaClip)" +{ + Properties + { + _MainTex ("Base (RGB), Alpha (A)", 2D) = "white" {} + } + + SubShader + { + LOD 200 + + Tags + { + "Queue" = "Transparent" + "IgnoreProjector" = "True" + "RenderType" = "Transparent" + } + + Pass + { + Cull Off + Lighting Off + ZWrite Off + AlphaTest Off + Fog { Mode Off } + Offset -1, -1 + ColorMask RGB + Blend One OneMinusSrcAlpha + + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #include "UnityCG.cginc" + + sampler2D _MainTex; + float4 _MainTex_ST; + + struct appdata_t + { + float4 vertex : POSITION; + half4 color : COLOR; + float2 texcoord : TEXCOORD0; + }; + + struct v2f + { + float4 vertex : POSITION; + half4 color : COLOR; + float2 texcoord : TEXCOORD0; + float2 worldPos : TEXCOORD1; + }; + + v2f vert (appdata_t v) + { + v2f o; + o.vertex = mul(UNITY_MATRIX_MVP, v.vertex); + o.color = v.color; + o.texcoord = v.texcoord; + o.worldPos = TRANSFORM_TEX(v.vertex.xy, _MainTex); + return o; + } + + half4 frag (v2f IN) : COLOR + { + // Sample the texture + half4 col = tex2D(_MainTex, IN.texcoord) * IN.color; + + float2 factor = abs(IN.worldPos); + float val = 1.0 - max(factor.x, factor.y); + + // Option 1: 'if' statement + if (val < 0.0) col = half4(0.0, 0.0, 0.0, 0.0); + + // Option 2: no 'if' statement -- may be faster on some devices + //col *= ceil(clamp(val, 0.0, 1.0)); + return col; + } + ENDCG + } + } + + SubShader + { + LOD 100 + + Tags + { + "Queue" = "Transparent" + "IgnoreProjector" = "True" + "RenderType" = "Transparent" + } + + Pass + { + Cull Off + Lighting Off + ZWrite Off + AlphaTest Off + Fog { Mode Off } + Offset -1, -1 + ColorMask RGB + Blend One OneMinusSrcAlpha + ColorMaterial AmbientAndDiffuse + + SetTexture [_MainTex] + { + Combine Texture * Primary + } + } + } +} diff --git a/Assets/TestShaders/Unlit - Premultiplied Colored (SoftClip).shader b/Assets/TestShaders/Unlit - Premultiplied Colored (SoftClip).shader new file mode 100644 index 000000000..2f5e5fae5 --- /dev/null +++ b/Assets/TestShaders/Unlit - Premultiplied Colored (SoftClip).shader @@ -0,0 +1,109 @@ +Shader "Unlit/Premultiplied Colored (SoftClip)" +{ + Properties + { + _MainTex ("Base (RGB), Alpha (A)", 2D) = "white" {} + } + + SubShader + { + LOD 200 + + Tags + { + "Queue" = "Transparent" + "IgnoreProjector" = "True" + "RenderType" = "Transparent" + } + + Pass + { + Cull Off + Lighting Off + ZWrite Off + AlphaTest Off + Fog { Mode Off } + Offset -1, -1 + ColorMask RGB + Blend One OneMinusSrcAlpha + + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #include "UnityCG.cginc" + + sampler2D _MainTex; + float4 _MainTex_ST; + float2 _ClipSharpness = float2(20.0, 20.0); + + struct appdata_t + { + float4 vertex : POSITION; + half4 color : COLOR; + float2 texcoord : TEXCOORD0; + }; + + struct v2f + { + float4 vertex : POSITION; + half4 color : COLOR; + float2 texcoord : TEXCOORD0; + float2 worldPos : TEXCOORD1; + }; + + v2f vert (appdata_t v) + { + v2f o; + o.vertex = mul(UNITY_MATRIX_MVP, v.vertex); + o.color = v.color; + o.texcoord = v.texcoord; + o.worldPos = TRANSFORM_TEX(v.vertex.xy, _MainTex); + return o; + } + + half4 frag (v2f IN) : COLOR + { + // Softness factor + float2 factor = (float2(1.0, 1.0) - abs(IN.worldPos)) * _ClipSharpness; + + // Sample the texture + half4 col = tex2D(_MainTex, IN.texcoord) * IN.color; + float fade = clamp( min(factor.x, factor.y), 0.0, 1.0); + col.a *= fade; + col.rgb = lerp(half3(0.0, 0.0, 0.0), col.rgb, fade); + return col; + } + ENDCG + } + } + + SubShader + { + LOD 100 + + Tags + { + "Queue" = "Transparent" + "IgnoreProjector" = "True" + "RenderType" = "Transparent" + } + + Pass + { + Cull Off + Lighting Off + ZWrite Off + AlphaTest Off + Fog { Mode Off } + Offset -1, -1 + ColorMask RGB + Blend One OneMinusSrcAlpha + ColorMaterial AmbientAndDiffuse + + SetTexture [_MainTex] + { + Combine Texture * Primary + } + } + } +} diff --git a/Assets/TestShaders/Unlit - Premultiplied Colored.shader b/Assets/TestShaders/Unlit - Premultiplied Colored.shader new file mode 100644 index 000000000..9f5380bcb --- /dev/null +++ b/Assets/TestShaders/Unlit - Premultiplied Colored.shader @@ -0,0 +1,100 @@ +Shader "Unlit/Premultiplied Colored" +{ + Properties + { + _MainTex ("Base (RGB), Alpha (A)", 2D) = "white" {} + } + + SubShader + { + LOD 200 + + Tags + { + "Queue" = "Transparent" + "IgnoreProjector" = "True" + "RenderType" = "Transparent" + } + + Pass + { + Cull Off + Lighting Off + ZWrite Off + AlphaTest Off + Fog { Mode Off } + Offset -1, -1 + ColorMask RGB + Blend One OneMinusSrcAlpha + + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #include "UnityCG.cginc" + + sampler2D _MainTex; + float4 _MainTex_ST; + + struct appdata_t + { + float4 vertex : POSITION; + half4 color : COLOR; + float2 texcoord : TEXCOORD0; + }; + + struct v2f + { + float4 vertex : POSITION; + half4 color : COLOR; + float2 texcoord : TEXCOORD0; + }; + + v2f vert (appdata_t v) + { + v2f o; + o.vertex = mul(UNITY_MATRIX_MVP, v.vertex); + o.color = v.color; + o.texcoord = v.texcoord; + return o; + } + + half4 frag (v2f IN) : COLOR + { + half4 col = tex2D(_MainTex, IN.texcoord) * IN.color; + //col.rgb = lerp(half3(0.0, 0.0, 0.0), col.rgb, col.a); + return col; + } + ENDCG + } + } + + SubShader + { + LOD 100 + + Tags + { + "Queue" = "Transparent" + "IgnoreProjector" = "True" + "RenderType" = "Transparent" + } + + Pass + { + Cull Off + Lighting Off + ZWrite Off + AlphaTest Off + Fog { Mode Off } + Offset -1, -1 + ColorMask RGB + Blend One OneMinusSrcAlpha + ColorMaterial AmbientAndDiffuse + + SetTexture [_MainTex] + { + Combine Texture * Primary + } + } + } +} diff --git a/Assets/TestShaders/Unlit - Transparent Colored (AlphaClip).shader b/Assets/TestShaders/Unlit - Transparent Colored (AlphaClip).shader new file mode 100644 index 000000000..a3344a058 --- /dev/null +++ b/Assets/TestShaders/Unlit - Transparent Colored (AlphaClip).shader @@ -0,0 +1,110 @@ +Shader "Unlit/Transparent Colored (AlphaClip)" +{ + Properties + { + _MainTex ("Base (RGB), Alpha (A)", 2D) = "white" {} + } + + SubShader + { + LOD 200 + + Tags + { + "Queue" = "Transparent" + "IgnoreProjector" = "True" + "RenderType" = "Transparent" + } + + Pass + { + Cull Off + Lighting Off + ZWrite Off + Offset -1, -1 + Fog { Mode Off } + ColorMask RGB + Blend SrcAlpha OneMinusSrcAlpha + + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #include "UnityCG.cginc" + + sampler2D _MainTex; + float4 _MainTex_ST; + + struct appdata_t + { + float4 vertex : POSITION; + half4 color : COLOR; + float2 texcoord : TEXCOORD0; + }; + + struct v2f + { + float4 vertex : POSITION; + half4 color : COLOR; + float2 texcoord : TEXCOORD0; + float2 worldPos : TEXCOORD1; + }; + + v2f vert (appdata_t v) + { + v2f o; + o.vertex = mul(UNITY_MATRIX_MVP, v.vertex); + o.color = v.color; + o.texcoord = v.texcoord; + o.worldPos = TRANSFORM_TEX(v.vertex.xy, _MainTex); + return o; + } + + half4 frag (v2f IN) : COLOR + { + // Sample the texture + half4 col = tex2D(_MainTex, IN.texcoord) * IN.color; + + float2 factor = abs(IN.worldPos); + float val = 1.0 - max(factor.x, factor.y); + + // Option 1: 'if' statement + if (val < 0.0) col.a = 0.0; + + // Option 2: no 'if' statement -- may be faster on some devices + //col.a *= ceil(clamp(val, 0.0, 1.0)); + + return col; + } + ENDCG + } + } + + SubShader + { + LOD 100 + + Tags + { + "Queue" = "Transparent" + "IgnoreProjector" = "True" + "RenderType" = "Transparent" + } + + Pass + { + Cull Off + Lighting Off + ZWrite Off + Fog { Mode Off } + ColorMask RGB + AlphaTest Greater .01 + Blend SrcAlpha OneMinusSrcAlpha + ColorMaterial AmbientAndDiffuse + + SetTexture [_MainTex] + { + Combine Texture * Primary + } + } + } +} \ No newline at end of file diff --git a/Assets/TestShaders/Unlit - Transparent Colored (Packed) (AlphaClip) .shader b/Assets/TestShaders/Unlit - Transparent Colored (Packed) (AlphaClip) .shader new file mode 100644 index 000000000..7ab602daf --- /dev/null +++ b/Assets/TestShaders/Unlit - Transparent Colored (Packed) (AlphaClip) .shader @@ -0,0 +1,80 @@ +Shader "Unlit/Transparent Colored (Packed) (AlphaClip)" +{ + Properties + { + _MainTex ("Base (RGB), Alpha (A)", 2D) = "white" {} + } + + SubShader + { + LOD 200 + + Tags + { + "Queue" = "Transparent" + "IgnoreProjector" = "True" + "RenderType" = "Transparent" + } + + Pass + { + Cull Off + Lighting Off + ZWrite Off + Offset -1, -1 + Fog { Mode Off } + ColorMask RGB + Blend SrcAlpha OneMinusSrcAlpha + + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + + #include "UnityCG.cginc" + + sampler2D _MainTex; + half4 _MainTex_ST; + + struct appdata_t + { + float4 vertex : POSITION; + half4 color : COLOR; + float2 texcoord : TEXCOORD0; + }; + + struct v2f + { + float4 vertex : POSITION; + half4 color : COLOR; + float2 texcoord : TEXCOORD0; + float2 worldPos : TEXCOORD1; + }; + + v2f vert (appdata_t v) + { + v2f o; + o.vertex = mul(UNITY_MATRIX_MVP, v.vertex); + o.color = v.color; + o.texcoord = v.texcoord; + o.worldPos = TRANSFORM_TEX(v.vertex.xy, _MainTex); + return o; + } + + half4 frag (v2f IN) : COLOR + { + half4 mask = tex2D(_MainTex, IN.texcoord); + half4 mixed = saturate(ceil(IN.color - 0.5)); + half4 col = saturate((mixed * 0.51 - IN.color) / -0.49); + float2 factor = abs(IN.worldPos); + float val = 1.0 - max(factor.x, factor.y); + + if (val < 0.0) col.a = 0.0; + mask *= mixed; + col.a *= mask.r + mask.g + mask.b + mask.a; + return col; + } + ENDCG + } + } + Fallback Off +} \ No newline at end of file diff --git a/Assets/TestShaders/Unlit - Transparent Colored (Packed) (SoftClip).shader b/Assets/TestShaders/Unlit - Transparent Colored (Packed) (SoftClip).shader new file mode 100644 index 000000000..c4a900498 --- /dev/null +++ b/Assets/TestShaders/Unlit - Transparent Colored (Packed) (SoftClip).shader @@ -0,0 +1,80 @@ +Shader "Unlit/Transparent Colored (Packed) (SoftClip)" +{ + Properties + { + _MainTex ("Base (RGB), Alpha (A)", 2D) = "white" {} + } + + SubShader + { + LOD 200 + + Tags + { + "Queue" = "Transparent" + "IgnoreProjector" = "True" + "RenderType" = "Transparent" + } + + Pass + { + Cull Off + Lighting Off + ZWrite Off + Offset -1, -1 + Fog { Mode Off } + ColorMask RGB + Blend SrcAlpha OneMinusSrcAlpha + + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + + #include "UnityCG.cginc" + + sampler2D _MainTex; + half4 _MainTex_ST; + float2 _ClipSharpness = float2(20.0, 20.0); + + struct appdata_t + { + float4 vertex : POSITION; + half4 color : COLOR; + float2 texcoord : TEXCOORD0; + }; + + struct v2f + { + float4 vertex : POSITION; + half4 color : COLOR; + float2 texcoord : TEXCOORD0; + float2 worldPos : TEXCOORD1; + }; + + v2f vert (appdata_t v) + { + v2f o; + o.vertex = mul(UNITY_MATRIX_MVP, v.vertex); + o.color = v.color; + o.texcoord = v.texcoord; + o.worldPos = TRANSFORM_TEX(v.vertex.xy, _MainTex); + return o; + } + + half4 frag (v2f IN) : COLOR + { + half4 mask = tex2D(_MainTex, IN.texcoord); + half4 mixed = saturate(ceil(IN.color - 0.5)); + half4 col = saturate((mixed * 0.51 - IN.color) / -0.49); + float2 factor = (float2(1.0, 1.0) - abs(IN.worldPos)) * _ClipSharpness; + + mask *= mixed; + col.a *= clamp( min(factor.x, factor.y), 0.0, 1.0); + col.a *= mask.r + mask.g + mask.b + mask.a; + return col; + } + ENDCG + } + } + Fallback Off +} \ No newline at end of file diff --git a/Assets/TestShaders/Unlit - Transparent Colored (Packed).shader b/Assets/TestShaders/Unlit - Transparent Colored (Packed).shader new file mode 100644 index 000000000..5d091b7bf --- /dev/null +++ b/Assets/TestShaders/Unlit - Transparent Colored (Packed).shader @@ -0,0 +1,75 @@ +Shader "Unlit/Transparent Colored (Packed)" +{ + Properties + { + _MainTex ("Base (RGB), Alpha (A)", 2D) = "white" {} + } + + SubShader + { + LOD 200 + + Tags + { + "Queue" = "Transparent" + "IgnoreProjector" = "True" + "RenderType" = "Transparent" + } + + Pass + { + Cull Off + Lighting Off + ZWrite Off + Offset -1, -1 + Fog { Mode Off } + ColorMask RGB + Blend SrcAlpha OneMinusSrcAlpha + + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + + #include "UnityCG.cginc" + + sampler2D _MainTex; + half4 _MainTex_ST; + + struct appdata_t + { + float4 vertex : POSITION; + half4 color : COLOR; + float2 texcoord : TEXCOORD0; + }; + + struct v2f + { + float4 vertex : POSITION; + half4 color : COLOR; + float2 texcoord : TEXCOORD0; + }; + + v2f vert (appdata_t v) + { + v2f o; + o.vertex = mul(UNITY_MATRIX_MVP, v.vertex); + o.color = v.color; + o.texcoord = v.texcoord; + return o; + } + + half4 frag (v2f IN) : COLOR + { + half4 mask = tex2D(_MainTex, IN.texcoord); + half4 mixed = saturate(ceil(IN.color - 0.5)); + half4 col = saturate((mixed * 0.51 - IN.color) / -0.49); + + mask *= mixed; + col.a *= mask.r + mask.g + mask.b + mask.a; + return col; + } + ENDCG + } + } + Fallback Off +} \ No newline at end of file diff --git a/Assets/TestShaders/Unlit - Transparent Colored (SoftClip).shader b/Assets/TestShaders/Unlit - Transparent Colored (SoftClip).shader new file mode 100644 index 000000000..2e5dd1ad4 --- /dev/null +++ b/Assets/TestShaders/Unlit - Transparent Colored (SoftClip).shader @@ -0,0 +1,107 @@ +Shader "Unlit/Transparent Colored (SoftClip)" +{ + Properties + { + _MainTex ("Base (RGB), Alpha (A)", 2D) = "white" {} + } + + SubShader + { + LOD 200 + + Tags + { + "Queue" = "Transparent" + "IgnoreProjector" = "True" + "RenderType" = "Transparent" + } + + Pass + { + Cull Off + Lighting Off + ZWrite Off + Offset -1, -1 + Fog { Mode Off } + ColorMask RGB + AlphaTest Greater .01 + Blend SrcAlpha OneMinusSrcAlpha + + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + + #include "UnityCG.cginc" + + sampler2D _MainTex; + float4 _MainTex_ST; + float2 _ClipSharpness = float2(20.0, 20.0); + + struct appdata_t + { + float4 vertex : POSITION; + half4 color : COLOR; + float2 texcoord : TEXCOORD0; + }; + + struct v2f + { + float4 vertex : POSITION; + half4 color : COLOR; + float2 texcoord : TEXCOORD0; + float2 worldPos : TEXCOORD1; + }; + + v2f vert (appdata_t v) + { + v2f o; + o.vertex = mul(UNITY_MATRIX_MVP, v.vertex); + o.color = v.color; + o.texcoord = v.texcoord; + o.worldPos = TRANSFORM_TEX(v.vertex.xy, _MainTex); + return o; + } + + half4 frag (v2f IN) : COLOR + { + // Softness factor + float2 factor = (float2(1.0, 1.0) - abs(IN.worldPos)) * _ClipSharpness; + + // Sample the texture + half4 col = tex2D(_MainTex, IN.texcoord) * IN.color; + col.a *= clamp( min(factor.x, factor.y), 0.0, 1.0); + return col; + } + ENDCG + } + } + + SubShader + { + LOD 100 + + Tags + { + "Queue" = "Transparent" + "IgnoreProjector" = "True" + "RenderType" = "Transparent" + } + + Pass + { + Cull Off + Lighting Off + ZWrite Off + Fog { Mode Off } + ColorMask RGB + AlphaTest Greater .01 + Blend SrcAlpha OneMinusSrcAlpha + ColorMaterial AmbientAndDiffuse + + SetTexture [_MainTex] + { + Combine Texture * Primary + } + } + } +} \ No newline at end of file diff --git a/Assets/TestShaders/Unlit - Transparent Colored.shader b/Assets/TestShaders/Unlit - Transparent Colored.shader new file mode 100644 index 000000000..997bd37d9 --- /dev/null +++ b/Assets/TestShaders/Unlit - Transparent Colored.shader @@ -0,0 +1,68 @@ +Shader "Unlit/Transparent Colored" +{ + Properties + { + _MainTex ("Base (RGB), Alpha (A)", 2D) = "white" {} + } + + SubShader + { + LOD 100 + + Tags + { + "Queue" = "Transparent" + "IgnoreProjector" = "True" + "RenderType" = "Transparent" + } + + Cull Off + Lighting Off + ZWrite Off + Fog { Mode Off } + Offset -1, -1 + Blend SrcAlpha OneMinusSrcAlpha + + Pass + { + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + + #include "UnityCG.cginc" + + struct appdata_t + { + float4 vertex : POSITION; + float2 texcoord : TEXCOORD0; + fixed4 color : COLOR; + }; + + struct v2f + { + float4 vertex : SV_POSITION; + half2 texcoord : TEXCOORD0; + fixed4 color : COLOR; + }; + + sampler2D _MainTex; + float4 _MainTex_ST; + + v2f vert (appdata_t v) + { + v2f o; + o.vertex = mul(UNITY_MATRIX_MVP, v.vertex); + o.texcoord = TRANSFORM_TEX(v.texcoord, _MainTex); + o.color = v.color; + return o; + } + + fixed4 frag (v2f i) : COLOR + { + fixed4 col = tex2D(_MainTex, i.texcoord) * i.color; + return col; + } + ENDCG + } + } +} diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 0009a30686671155d4fbfd8b91b8cacf5f968c59..9855e5c33e2180e5217c54adea79d178ec2a0130 100644 GIT binary patch delta 30 mcmcbkb4OfgmI#5VinWSSpafB$><%Oy*5y5*DpB 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 Csbg6H diff --git a/unityshinsoubanalice-csharp.sln b/unityshinsoubanalice-csharp.sln index c71b685cd..32cc8aee4 100644 --- a/unityshinsoubanalice-csharp.sln +++ b/unityshinsoubanalice-csharp.sln @@ -17,7 +17,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(MonoDevelopProperties) = preSolution + GlobalSection(MonoDevelopProperties) = preSolution StartupItem = Assembly-CSharp.csproj Policies = $0 $0.TextStylePolicy = $1 diff --git a/unityshinsoubanalice.sln b/unityshinsoubanalice.sln index 2bded50d9..48aa014eb 100644 --- a/unityshinsoubanalice.sln +++ b/unityshinsoubanalice.sln @@ -17,7 +17,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(MonoDevelopProperties) = preSolution + GlobalSection(MonoDevelopProperties) = preSolution StartupItem = Assembly-CSharp.csproj Policies = $0 $0.TextStylePolicy = $1 diff --git a/unityshinsoubanalice.userprefs b/unityshinsoubanalice.userprefs index a303b42e9..10cc16688 100644 --- a/unityshinsoubanalice.userprefs +++ b/unityshinsoubanalice.userprefs @@ -1,19 +1,24 @@  - - + + - - + + + - - - - - + + + - + + + + + + + \ No newline at end of file