From e6ea0934834732f4020df45df0377937e51ec447 Mon Sep 17 00:00:00 2001 From: tigerchen Date: Thu, 12 Dec 2019 18:49:27 +0800 Subject: [PATCH] random ice & fix video flickering --- .../{RawImage.prefab => FlakeImage.prefab} | 20 ++++++---- ...age.prefab.meta => FlakeImage.prefab.meta} | 0 .../Assets/Scenes/DarkSea.unity | 8 ++-- .../Assets/Scripts/StatManager.cs | 1 + .../Assets/Scripts/movieController.cs | 38 +++++++++++++++---- .../Assets/Videos/BG.DShowClip.asset | 2 +- .../Assets/Videos/Horse.DShowClip.asset | 2 +- .../Assets/Videos/snow_01.DShowClip.asset | 17 +++++++++ .../Videos/snow_01.DShowClip.asset.meta | 8 ++++ .../Assets/Videos/snow_02.DShowClip.asset | 17 +++++++++ .../Videos/snow_02.DShowClip.asset.meta | 8 ++++ .../Assets/Videos/snow_03.DShowClip.asset | 17 +++++++++ .../Videos/snow_03.DShowClip.asset.meta | 8 ++++ .../Assets/Videos/snow_04.DShowClip.asset | 17 +++++++++ .../Videos/snow_04.DShowClip.asset.meta | 8 ++++ 15 files changed, 150 insertions(+), 21 deletions(-) rename 08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Prefabs/{RawImage.prefab => FlakeImage.prefab} (86%) rename 08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Prefabs/{RawImage.prefab.meta => FlakeImage.prefab.meta} (100%) create mode 100644 08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/snow_01.DShowClip.asset create mode 100644 08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/snow_01.DShowClip.asset.meta create mode 100644 08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/snow_02.DShowClip.asset create mode 100644 08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/snow_02.DShowClip.asset.meta create mode 100644 08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/snow_03.DShowClip.asset create mode 100644 08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/snow_03.DShowClip.asset.meta create mode 100644 08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/snow_04.DShowClip.asset create mode 100644 08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/snow_04.DShowClip.asset.meta diff --git a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Prefabs/RawImage.prefab b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Prefabs/FlakeImage.prefab similarity index 86% rename from 08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Prefabs/RawImage.prefab rename to 08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Prefabs/FlakeImage.prefab index 694f9a5..fd5af3d 100644 --- a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Prefabs/RawImage.prefab +++ b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Prefabs/FlakeImage.prefab @@ -15,7 +15,7 @@ GameObject: - component: {fileID: 1996081109} - component: {fileID: 1996081110} m_Layer: 5 - m_Name: RawImage + m_Name: FlakeImage m_TagString: onFoot m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -38,7 +38,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 200, y: 200} + m_SizeDelta: {x: 256, y: 256} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2142686115215515799 CanvasRenderer: @@ -86,11 +86,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: id: 0 - fade_speed: 0.05 stat: 0 - alpha: 0 + fade_speed: 0.05 + force_destroy: 0 destroy_timer: 0 - CanDsetroy: 0 + wait_sec: 2 + snow_01: {fileID: 11400000, guid: 58421c5bb11f5a841a368be3400d5c2b, type: 2} + snow_02: {fileID: 11400000, guid: f3829d3dc90b3db46a706d2efb7cd1dd, type: 2} + snow_03: {fileID: 11400000, guid: f39b8c9e311ce0a429923c3eef0402b7, type: 2} + snow_04: {fileID: 11400000, guid: 39bb304109cba704492efa5099cc1856, type: 2} --- !u!114 &1996081109 MonoBehaviour: m_ObjectHideFlags: 0 @@ -119,8 +123,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 10f07b3f9fb96524db93eb42d89c229c, type: 3} m_Name: m_EditorClassIdentifier: - VideoAsset: {fileID: 11400000, guid: 232980c200b699741a54e99e165d86a2, type: 2} + VideoAsset: {fileID: 11400000, guid: 58421c5bb11f5a841a368be3400d5c2b, type: 2} LoadOnAwake: 1 - PlayOnStart: 1 - Looping: 1 + PlayOnStart: 0 + Looping: 0 AudioVolume: 0 diff --git a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Prefabs/RawImage.prefab.meta b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Prefabs/FlakeImage.prefab.meta similarity index 100% rename from 08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Prefabs/RawImage.prefab.meta rename to 08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Prefabs/FlakeImage.prefab.meta diff --git a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scenes/DarkSea.unity b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scenes/DarkSea.unity index 4904e16..4427bea 100644 --- a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scenes/DarkSea.unity +++ b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scenes/DarkSea.unity @@ -146,7 +146,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 1000, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 2528, y: 2400} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &229700561 @@ -212,7 +212,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: fade_sec: 1 - loop_to_trigger: 1 + loop_to_trigger: 4 idle_player: {fileID: 540220394} h_player: {fileID: 1232323602} h_grp: {fileID: 1781519744} @@ -264,7 +264,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -1260, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 2528, y: 2400} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &503604497 @@ -756,7 +756,7 @@ MonoBehaviour: img: {fileID: 2829506254029656376, guid: 8bbc036a3be21954681613cbe4f0e9a8, type: 3} canvas: {fileID: 798465533} VisualizeTouches: 1 - frame_gap: 20 + frame_gap: 10 delta_threshold: 100 img_fade_speed: 0.02 img_wait_sec: 2 diff --git a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/StatManager.cs b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/StatManager.cs index 2d87085..287a8d2 100644 --- a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/StatManager.cs +++ b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/StatManager.cs @@ -36,6 +36,7 @@ public class StatManager : MonoBehaviour if (idle_player.Frame == idle_player.TotalNumFrames) { loop_count += 1; + Debug.Log(loop_count); } if (loop_count >= loop_to_trigger) { diff --git a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/movieController.cs b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/movieController.cs index 4c1a27e..7719131 100644 --- a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/movieController.cs +++ b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Scripts/movieController.cs @@ -14,37 +14,44 @@ public class movieController : MonoBehaviour public bool force_destroy; public float destroy_timer; public float wait_sec = 2f; + public DShowClip snow_01; + public DShowClip snow_02; + public DShowClip snow_03; + public DShowClip snow_04; float alpha; void Awake() { player = GetComponent(); - stat = 1; + stat = 0; force_destroy = false; } void Start() - { + { //player = GetComponent(); GetComponent().color = Color.clear; } void Update() { + if(stat == 0){ alpha = 0; - stat = 1; + if (player.IsPlaying) + stat = 1; } else if (stat == 1) { - alpha += fade_speed; + alpha += fade_speed * 5f; if (alpha >= 1) { alpha = 1; stat = 2; } } - else if (stat == 2 && force_destroy) + else + if (stat == 2 && force_destroy) { stat = 3; } @@ -60,22 +67,38 @@ public class movieController : MonoBehaviour Destroy(this.gameObject); } } - } GetComponent().color = new Color(1f, 1f, 1f, alpha); } void OnEnable() { + int seed = Random.Range(0, 4); + switch (seed){ + case 0: + player.VideoAsset = snow_01; + break; + case 1: + player.VideoAsset = snow_02; + break; + case 2: + player.VideoAsset = snow_03; + break; + case 3: + player.VideoAsset = snow_04; + break; + } + if (name != "RawImage") { GetComponent().enabled = true; } //Debug.Log("Hi"); - stat = 1; + stat = 0; alpha = 0f; rotateImg(); + player.Play(); } void OnDestroy() @@ -89,5 +112,6 @@ public class movieController : MonoBehaviour Vector3 mid_pt = new Vector3(GetComponent().position.x, GetComponent().position.y, 0); float rand_deg = Random.Range(0, 360); GetComponent().Rotate(rot_axis, rand_deg); + } } diff --git a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/BG.DShowClip.asset b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/BG.DShowClip.asset index 44e1847..bfb001b 100644 --- a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/BG.DShowClip.asset +++ b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/BG.DShowClip.asset @@ -13,5 +13,5 @@ MonoBehaviour: m_Name: BG.DShowClip m_EditorClassIdentifier: m_VideoLocation: 1 - m_VideoPath: ..\..\..\..\_Deploy_PC\08_DarkSea\Build-19050-08_DarkSea\Material\Frozen2_DarkSea_test_hap.avi + m_VideoPath: ..\..\..\..\_Deploy_PC\08_DarkSea\Build-19050-08_DarkSea\Material\darksea_loop.avi animationClip: {fileID: 0} diff --git a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/Horse.DShowClip.asset b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/Horse.DShowClip.asset index e0c325e..7ef82e3 100644 --- a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/Horse.DShowClip.asset +++ b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/Horse.DShowClip.asset @@ -13,5 +13,5 @@ MonoBehaviour: m_Name: Horse.DShowClip m_EditorClassIdentifier: m_VideoLocation: 1 - m_VideoPath: ..\..\..\..\_Deploy_PC\08_DarkSea\Build-19050-08_DarkSea\Material\Frozen2_DarkSea_test_hap.avi + m_VideoPath: ..\..\..\..\_Deploy_PC\08_DarkSea\Build-19050-08_DarkSea\Material\darksea_nokk_2.avi animationClip: {fileID: 0} diff --git a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/snow_01.DShowClip.asset b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/snow_01.DShowClip.asset new file mode 100644 index 0000000..2c26ad8 --- /dev/null +++ b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/snow_01.DShowClip.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3} + m_Name: snow_01.DShowClip + m_EditorClassIdentifier: + m_VideoLocation: 1 + m_VideoPath: ..\..\..\..\_Deploy_PC\08_DarkSea\Build-19050-08_DarkSea\Material\snow_01.avi + animationClip: {fileID: 0} diff --git a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/snow_01.DShowClip.asset.meta b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/snow_01.DShowClip.asset.meta new file mode 100644 index 0000000..7fe6ac1 --- /dev/null +++ b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/snow_01.DShowClip.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 58421c5bb11f5a841a368be3400d5c2b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/snow_02.DShowClip.asset b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/snow_02.DShowClip.asset new file mode 100644 index 0000000..897ebd5 --- /dev/null +++ b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/snow_02.DShowClip.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3} + m_Name: snow_02.DShowClip + m_EditorClassIdentifier: + m_VideoLocation: 1 + m_VideoPath: ..\..\..\..\_Deploy_PC\08_DarkSea\Build-19050-08_DarkSea\Material\snow_02.avi + animationClip: {fileID: 0} diff --git a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/snow_02.DShowClip.asset.meta b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/snow_02.DShowClip.asset.meta new file mode 100644 index 0000000..263cf2a --- /dev/null +++ b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/snow_02.DShowClip.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f3829d3dc90b3db46a706d2efb7cd1dd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/snow_03.DShowClip.asset b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/snow_03.DShowClip.asset new file mode 100644 index 0000000..1a23cf2 --- /dev/null +++ b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/snow_03.DShowClip.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3} + m_Name: snow_03.DShowClip + m_EditorClassIdentifier: + m_VideoLocation: 1 + m_VideoPath: ..\..\..\..\_Deploy_PC\08_DarkSea\Build-19050-08_DarkSea\Material\snow_03.avi + animationClip: {fileID: 0} diff --git a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/snow_03.DShowClip.asset.meta b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/snow_03.DShowClip.asset.meta new file mode 100644 index 0000000..d97be72 --- /dev/null +++ b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/snow_03.DShowClip.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f39b8c9e311ce0a429923c3eef0402b7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/snow_04.DShowClip.asset b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/snow_04.DShowClip.asset new file mode 100644 index 0000000..6913557 --- /dev/null +++ b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/snow_04.DShowClip.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b7eca376a120a0e49a97afa024778843, type: 3} + m_Name: snow_04.DShowClip + m_EditorClassIdentifier: + m_VideoLocation: 1 + m_VideoPath: ..\..\..\..\_Deploy_PC\08_DarkSea\Build-19050-08_DarkSea\Material\snow_04.avi + animationClip: {fileID: 0} diff --git a/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/snow_04.DShowClip.asset.meta b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/snow_04.DShowClip.asset.meta new file mode 100644 index 0000000..b6a15e8 --- /dev/null +++ b/08_DarkSea/Unity-19050-08-DarkSea/19050-08-DarkSea/Assets/Videos/snow_04.DShowClip.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 39bb304109cba704492efa5099cc1856 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: