diff --git a/Assets/Scripts/Assembly-CSharp/GalleryMovieWindow.cs b/Assets/Scripts/Assembly-CSharp/GalleryMovieWindow.cs index f81a8d19a..811e8283e 100644 --- a/Assets/Scripts/Assembly-CSharp/GalleryMovieWindow.cs +++ b/Assets/Scripts/Assembly-CSharp/GalleryMovieWindow.cs @@ -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.webm", this.gameObject)); + yield return base.StartCoroutine(MovieManager.PlayMovie("mp4/high/op_movie" + HelperFunctions.getMovieFileTypeForPlatform(), this.gameObject)); this.state = GalleryMovieWindow.STATE.END; yield break; } diff --git a/Assets/Scripts/Assembly-CSharp/LogoMovieWindow.cs b/Assets/Scripts/Assembly-CSharp/LogoMovieWindow.cs index 477cb6070..37f5bf8c9 100644 --- a/Assets/Scripts/Assembly-CSharp/LogoMovieWindow.cs +++ b/Assets/Scripts/Assembly-CSharp/LogoMovieWindow.cs @@ -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.webm", this.gameObject)); + yield return base.StartCoroutine(MovieManager.PlayMovie("mp4/normal/quinrose_logo_8" + HelperFunctions.getMovieFileTypeForPlatform(), this.gameObject)); this.state = LogoMovieWindow.STATE.END; yield break; } diff --git a/Assets/Scripts/Assembly-CSharp/MovieManager.cs b/Assets/Scripts/Assembly-CSharp/MovieManager.cs index dfd467cdf..b5d8357a6 100644 --- a/Assets/Scripts/Assembly-CSharp/MovieManager.cs +++ b/Assets/Scripts/Assembly-CSharp/MovieManager.cs @@ -46,10 +46,10 @@ public static class MovieManager /*string url = Pathing.BaseContentPath + path + ".webm"; if (!System.IO.File.Exists(url)) { - url = Application.streamingAssetsPath + "/JP/" + path + ".webm"; + url = Application.streamingAssetsPath + "/JP/" + path + HelperFunctions.getMovieFileTypeForPlatform(); } m_tex.url = url;*/ - m_tex.url = HelperFunctions.CreateFilePath("/" + path + ".webm"); + m_tex.url = HelperFunctions.CreateFilePath("/" + path + HelperFunctions.getMovieFileTypeForPlatform()); m_tex.isLooping = false; movieFrame.SetMaterial(newMat, 960, 544); m_tex.renderMode = UnityEngine.Video.VideoRenderMode.MaterialOverride; diff --git a/Assets/Scripts/Assembly-CSharp/MovieTex.cs b/Assets/Scripts/Assembly-CSharp/MovieTex.cs index d63783970..7ef05db02 100644 --- a/Assets/Scripts/Assembly-CSharp/MovieTex.cs +++ b/Assets/Scripts/Assembly-CSharp/MovieTex.cs @@ -44,13 +44,13 @@ public class MovieTex : MonoBehaviour this.m_tex.playOnAwake = false; Material newMat = new Material(Shader.Find("QO/Sprite") as Shader); //this.m_tex.m_path = path + ".mp4"; - /*string url = Pathing.BaseContentPath + path + ".webm"; + /*string url = Pathing.BaseContentPath + path + HelperFunctions.getMovieFileTypeForPlatform(); if (!System.IO.File.Exists(url)) { - url = Application.streamingAssetsPath + "/JP" + path + ".webm"; + url = Application.streamingAssetsPath + "/JP" + path + HelperFunctions.getMovieFileTypeForPlatform(); } this.m_tex.url = "file:///" + url;*/ - this.m_tex.url = HelperFunctions.CreateFilePath(path + ".webm"); + this.m_tex.url = HelperFunctions.CreateFilePath(path + HelperFunctions.getMovieFileTypeForPlatform()); this.m_tex.isLooping = isLoop; this.m_tex.renderMode = UnityEngine.Video.VideoRenderMode.MaterialOverride; //this.m_tex.targetMaterialRenderer = newMat; diff --git a/Assets/Scripts/Assembly-CSharp/ScreenMovieSample.cs b/Assets/Scripts/Assembly-CSharp/ScreenMovieSample.cs index db07589b8..2733f9821 100644 --- a/Assets/Scripts/Assembly-CSharp/ScreenMovieSample.cs +++ b/Assets/Scripts/Assembly-CSharp/ScreenMovieSample.cs @@ -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.webm", this.gameObject)); + yield return base.StartCoroutine(MovieManager.PlayMovie("mp4/high/op_movie" + HelperFunctions.getMovieFileTypeForPlatform(), this.gameObject)); Debug.Log(" #DEBUGLOG::MOVIE OWATA "); yield break; } diff --git a/Assets/Scripts/Assembly-CSharp/UnityGraph.cs b/Assets/Scripts/Assembly-CSharp/UnityGraph.cs index 39fdcb7cb..104a7ef17 100644 --- a/Assets/Scripts/Assembly-CSharp/UnityGraph.cs +++ b/Assets/Scripts/Assembly-CSharp/UnityGraph.cs @@ -313,7 +313,7 @@ public class UnityGraph : Singleton NMB_FILEINFO fileInfo = Nmb.GetFileInfo(name); if (fileInfo == null) { - name = "ogv/effect/" + name + ".webm"; + name = "ogv/effect/" + name + HelperFunctions.getMovieFileTypeForPlatform(); } else { @@ -363,15 +363,15 @@ public class UnityGraph : Singleton VideoPlayer m_tex = movieFrame.obj.transform.gameObject.AddComponent(); m_tex.playOnAwake = false; Material newMat = new Material(Shader.Find("QO/Sprite Add") as Shader); - //Material newMat = new Material(Shader.Find("Unlit/Texture") as Shader); - /*string url = Pathing.BaseContentPath + path + ".webm"; + //Material newMat = new Material(Shader.Find("Unlit/Texture") as Shader); + /*string url = Pathing.BaseContentPath + path + HelperFunctions.getMovieFileTypeForPlatform(); if (!System.IO.File.Exists(url)) { - url = Application.streamingAssetsPath + "/JP/" + path + ".webm"; + url = Application.streamingAssetsPath + "/JP/" + path + HelperFunctions.getMovieFileTypeForPlatform(); }*/ - //m_tex.url = Pathing.BaseContentPath + path + ".webm"; - //m_tex.url = url; - m_tex.url = HelperFunctions.CreateFilePath("/" + path.TrimStart('/') + ".webm"); + //m_tex.url = Pathing.BaseContentPath + path + HelperFunctions.getMovieFileTypeForPlatform(); + //m_tex.url = url; + m_tex.url = HelperFunctions.CreateFilePath("/" + path.TrimStart('/') + HelperFunctions.getMovieFileTypeForPlatform()); m_tex.isLooping = false; movieFrame.SetMaterial(newMat, 960, 544); m_tex.renderMode = UnityEngine.Video.VideoRenderMode.MaterialOverride; diff --git a/Assets/Scripts/HelperFunctions.cs b/Assets/Scripts/HelperFunctions.cs index 151ef0d46..15ae8fa8d 100644 --- a/Assets/Scripts/HelperFunctions.cs +++ b/Assets/Scripts/HelperFunctions.cs @@ -32,5 +32,23 @@ public static class HelperFunctions return updatedPath; } + + public static string getMovieFileTypeForPlatform() + { + if (Application.platform == RuntimePlatform.WindowsPlayer || + Application.platform == RuntimePlatform.WindowsEditor || + Application.platform == RuntimePlatform.OSXPlayer || + Application.platform == RuntimePlatform.OSXEditor || + Application.platform == RuntimePlatform.Android || + Application.platform == RuntimePlatform.IPhonePlayer + ) + { + return ".mp4"; + } + else + { + return ".webm"; + } + } } diff --git a/Assets/StreamingAssets/JP/mp4/high/op_movie.mp4 b/Assets/StreamingAssets/JP/mp4/high/op_movie.mp4 new file mode 100644 index 000000000..f13ed00d4 --- /dev/null +++ b/Assets/StreamingAssets/JP/mp4/high/op_movie.mp4 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d32fe41114ddf34d176b8a38a33594f0f849afb4c7c3262e8e5405b8719ca273 +size 66868135 diff --git a/Assets/StreamingAssets/JP/mp4/high/op_movie.mp4.meta b/Assets/StreamingAssets/JP/mp4/high/op_movie.mp4.meta new file mode 100644 index 000000000..f8fa62321 --- /dev/null +++ b/Assets/StreamingAssets/JP/mp4/high/op_movie.mp4.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 35e148d09a9c9504eb4e19fcfaee9f85 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/JP/mp4/high/op_movie.webm b/Assets/StreamingAssets/JP/mp4/high/op_movie.webm index 7b39ef9ad..59270e3d3 100644 --- a/Assets/StreamingAssets/JP/mp4/high/op_movie.webm +++ b/Assets/StreamingAssets/JP/mp4/high/op_movie.webm @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cfce00195d6abc2fd5178e2cf70cc13f5f09f2cc769169a5f528168ef88735b5 -size 66290247 +oid sha256:bdf23cdff7aa5c275655d28cc440cfec0b8b772effa98aca3d9aa5ba944b0995 +size 67336246 diff --git a/Assets/StreamingAssets/JP/mp4/normal/quinrose_logo_8.mp4 b/Assets/StreamingAssets/JP/mp4/normal/quinrose_logo_8.mp4 new file mode 100644 index 000000000..93dad0ca8 --- /dev/null +++ b/Assets/StreamingAssets/JP/mp4/normal/quinrose_logo_8.mp4 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:958d64e5b2389570d9030e353cd02f796ebbd26b1bfebd7af129d399bc1cf0ca +size 3344687 diff --git a/Assets/StreamingAssets/JP/mp4/normal/quinrose_logo_8.mp4.meta b/Assets/StreamingAssets/JP/mp4/normal/quinrose_logo_8.mp4.meta new file mode 100644 index 000000000..8a58074df --- /dev/null +++ b/Assets/StreamingAssets/JP/mp4/normal/quinrose_logo_8.mp4.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ed0b302b57cb08d45b7dbade4fd0a360 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/JP/mp4/normal/quinrose_logo_8.webm b/Assets/StreamingAssets/JP/mp4/normal/quinrose_logo_8.webm index d17c49d46..79e4e6682 100644 --- a/Assets/StreamingAssets/JP/mp4/normal/quinrose_logo_8.webm +++ b/Assets/StreamingAssets/JP/mp4/normal/quinrose_logo_8.webm @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:32bddbd013a0baaa10c2391fa84ebe77e73ac7bc43bc276bc430d4421f6682b2 -size 3130695 +oid sha256:d81cd9ffd93604209b785d5cbcbc2a02833725dfd639cfd1939396f724c8f254 +size 5141578 diff --git a/Assets/StreamingAssets/JP/ogv/effect/kiseki01.mp4 b/Assets/StreamingAssets/JP/ogv/effect/kiseki01.mp4 new file mode 100644 index 000000000..811273efc --- /dev/null +++ b/Assets/StreamingAssets/JP/ogv/effect/kiseki01.mp4 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c756571026a0111a72825a08ef08d74c80fff2402414434de078c588ad49cddf +size 424090 diff --git a/Assets/StreamingAssets/JP/ogv/effect/kiseki01.mp4.meta b/Assets/StreamingAssets/JP/ogv/effect/kiseki01.mp4.meta new file mode 100644 index 000000000..532805394 --- /dev/null +++ b/Assets/StreamingAssets/JP/ogv/effect/kiseki01.mp4.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 96d5c81d30b2b984e88589d790da0df2 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/JP/ogv/effect/kiseki01.webm b/Assets/StreamingAssets/JP/ogv/effect/kiseki01.webm index e6fb31125..4ab6761b5 100644 --- a/Assets/StreamingAssets/JP/ogv/effect/kiseki01.webm +++ b/Assets/StreamingAssets/JP/ogv/effect/kiseki01.webm @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6ed69583bb99becb1961567274839c51d2244a9e2e70e28ce1732314552955e8 -size 232628 +oid sha256:a934bfcaba618414454727c10794c3f6412a7c412022281fb01e586ae550c7ba +size 224841 diff --git a/Assets/StreamingAssets/JP/ogv/effect/kiseki02.mp4 b/Assets/StreamingAssets/JP/ogv/effect/kiseki02.mp4 new file mode 100644 index 000000000..28113031f --- /dev/null +++ b/Assets/StreamingAssets/JP/ogv/effect/kiseki02.mp4 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:044c499f4d9791fa2b605ae8cfe0fed9c10f999394a63fa6a11e60b76f9e102f +size 425924 diff --git a/Assets/StreamingAssets/JP/ogv/effect/kiseki02.mp4.meta b/Assets/StreamingAssets/JP/ogv/effect/kiseki02.mp4.meta new file mode 100644 index 000000000..484ff981c --- /dev/null +++ b/Assets/StreamingAssets/JP/ogv/effect/kiseki02.mp4.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2b2a39a4dc0dfbc43bda0cc77e6209b8 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/JP/ogv/effect/kiseki02.webm b/Assets/StreamingAssets/JP/ogv/effect/kiseki02.webm index fdb3712b9..10fac92bb 100644 --- a/Assets/StreamingAssets/JP/ogv/effect/kiseki02.webm +++ b/Assets/StreamingAssets/JP/ogv/effect/kiseki02.webm @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8bcdf0eeee023c11af069c2e79e2a612853ac00a5ef3b097be4a085d1285c3ac -size 253237 +oid sha256:6cf9192a7a57a8130dbd1195529aba53f7e10c31bb5402e4c79ab8304849b0e3 +size 245648 diff --git a/Assets/StreamingAssets/JP/ogv/effect/kiseki03.mp4 b/Assets/StreamingAssets/JP/ogv/effect/kiseki03.mp4 new file mode 100644 index 000000000..0bb0e2d76 --- /dev/null +++ b/Assets/StreamingAssets/JP/ogv/effect/kiseki03.mp4 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:856c5871a1f97e04d6d15c89e71336723b976e7477606f49b69abee16465fef8 +size 454548 diff --git a/Assets/StreamingAssets/JP/ogv/effect/kiseki03.mp4.meta b/Assets/StreamingAssets/JP/ogv/effect/kiseki03.mp4.meta new file mode 100644 index 000000000..7d93c8f76 --- /dev/null +++ b/Assets/StreamingAssets/JP/ogv/effect/kiseki03.mp4.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 288d7e48cc0af8045b80fd545a0bd69c +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/JP/ogv/effect/kiseki03.webm b/Assets/StreamingAssets/JP/ogv/effect/kiseki03.webm index 51b13f950..f7f6959d9 100644 --- a/Assets/StreamingAssets/JP/ogv/effect/kiseki03.webm +++ b/Assets/StreamingAssets/JP/ogv/effect/kiseki03.webm @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7fbf58fdb67c44be753bb2f245dc9f570f27e423c75617bf7eb186f30c06bd8a -size 218246 +oid sha256:a6c570826e6be1c8d79e0d19b661528eb16e0b5de9866d515d74cc96db67229a +size 206848 diff --git a/Assets/StreamingAssets/JP/ogv/effect/kiseki04.mp4 b/Assets/StreamingAssets/JP/ogv/effect/kiseki04.mp4 new file mode 100644 index 000000000..065bb1f70 --- /dev/null +++ b/Assets/StreamingAssets/JP/ogv/effect/kiseki04.mp4 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5891ee8b56e894dc58cb7e673074c5554c713c5003121195009a4eaa3729d135 +size 405542 diff --git a/Assets/StreamingAssets/JP/ogv/effect/kiseki04.mp4.meta b/Assets/StreamingAssets/JP/ogv/effect/kiseki04.mp4.meta new file mode 100644 index 000000000..733fa5147 --- /dev/null +++ b/Assets/StreamingAssets/JP/ogv/effect/kiseki04.mp4.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ecc4063470ed6dc4fa15112c2f669d10 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/JP/ogv/effect/kiseki04.webm b/Assets/StreamingAssets/JP/ogv/effect/kiseki04.webm index f305c5886..ddcdb997f 100644 --- a/Assets/StreamingAssets/JP/ogv/effect/kiseki04.webm +++ b/Assets/StreamingAssets/JP/ogv/effect/kiseki04.webm @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f60f00131df794e4e8f0e7991018d66f2a12ca4fb37dc8ab4092dad0186d46ef -size 215585 +oid sha256:c07c771a5530819b9bbcf30d6eb37bb8ca44cb5e3cffdb9139fd194e2f90309a +size 204308 diff --git a/Assets/StreamingAssets/JP/ogv/effect/roses.mp4 b/Assets/StreamingAssets/JP/ogv/effect/roses.mp4 new file mode 100644 index 000000000..028226705 --- /dev/null +++ b/Assets/StreamingAssets/JP/ogv/effect/roses.mp4 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dad3e0a31b501d91fce3a3773b077ae011833c8dce13b04ba5163d2e70134e5e +size 2599653 diff --git a/Assets/StreamingAssets/JP/ogv/effect/roses.mp4.meta b/Assets/StreamingAssets/JP/ogv/effect/roses.mp4.meta new file mode 100644 index 000000000..6f92820e8 --- /dev/null +++ b/Assets/StreamingAssets/JP/ogv/effect/roses.mp4.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1ea91315eec11a34ea32b46aa7c2d310 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/JP/ogv/effect/roses.webm b/Assets/StreamingAssets/JP/ogv/effect/roses.webm index 50fce0e86..6e9b8d085 100644 --- a/Assets/StreamingAssets/JP/ogv/effect/roses.webm +++ b/Assets/StreamingAssets/JP/ogv/effect/roses.webm @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7a8a9835b6d208e4e335f8f6d3e12a56a70b07dfbf1b77da4619908307bbc2d6 -size 1887728 +oid sha256:083f9f064a9506b0e282a9fcf529c87b44f60402e48d0d138bc2fd656bcb32f5 +size 2157492 diff --git a/Assets/StreamingAssets/JP/ogv/effect/sunrise.mp4 b/Assets/StreamingAssets/JP/ogv/effect/sunrise.mp4 new file mode 100644 index 000000000..cd0a6c780 --- /dev/null +++ b/Assets/StreamingAssets/JP/ogv/effect/sunrise.mp4 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7024a3fd149387b0e7a4de9f8c49563c0971df9d54129b05332ef659f2f6b160 +size 243914 diff --git a/Assets/StreamingAssets/JP/ogv/effect/sunrise.mp4.meta b/Assets/StreamingAssets/JP/ogv/effect/sunrise.mp4.meta new file mode 100644 index 000000000..876d5bf71 --- /dev/null +++ b/Assets/StreamingAssets/JP/ogv/effect/sunrise.mp4.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7ab19317885cb6b4baf895b047ccbff0 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/JP/ogv/effect/sunrise.webm b/Assets/StreamingAssets/JP/ogv/effect/sunrise.webm index e124ecd1f..da34dd24b 100644 --- a/Assets/StreamingAssets/JP/ogv/effect/sunrise.webm +++ b/Assets/StreamingAssets/JP/ogv/effect/sunrise.webm @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:66f17743766d62ca3f895c8d2f0c4fbdbc44340f2c9affaabecb637efea5bd59 -size 151178 +oid sha256:31d24e1d2d63fd310b83525d7e193926daa8d0f7be87e93854091f53052a33af +size 128045