From c895d40e3d5997c2ec821dba36bece90e7a5f96e Mon Sep 17 00:00:00 2001 From: Bernard Laptop Date: Fri, 1 Feb 2019 01:28:24 +1100 Subject: [PATCH] Sun is working --- ...amples.unitypackage.meta => Official.meta} | 3 ++- .../CustomRTRain.meta} | 3 ++- ...s.unitypackage.meta => SimpleTerrain.meta} | 3 ++- ...rrain.unitypackage.meta => Substance.meta} | 3 ++- .../LegacySubstanceExample.unitypackage.meta | 7 ------- .../Examples/Official/Substance2018.meta | 8 ++++++++ .../Substance2018.unitypackage.meta | 7 ------- .../Plugins/EditorResources/Templates.meta | 8 ++++++++ .../CustomRTTemplates.unitypackage.meta | 7 ------- .../EditorResources/Templates/SRP.meta | 8 ++++++++ .../HDSRPTemplates (Legacy).unitypackage.meta | 7 ------- .../SRP/HDSRPTemplates.unitypackage.meta | 7 ------- .../LWSRPTemplates (Legacy).unitypackage.meta | 7 ------- .../SRP/LWSRPTemplates.unitypackage.meta | 7 ------- Assets/Scenes/MainScene.unity | 7 +++++-- Assets/Scipts/Timer.cs | 19 ++++++++++++------- 16 files changed, 49 insertions(+), 62 deletions(-) rename Assets/AmplifyShaderEditor/Examples/{HD SRP Samples.unitypackage.meta => Official.meta} (67%) rename Assets/AmplifyShaderEditor/Examples/{LW SRP Samples.unitypackage.meta => Official/CustomRTRain.meta} (67%) rename Assets/AmplifyShaderEditor/Examples/Official/{CustomRTRain/Custom RT Samples.unitypackage.meta => SimpleTerrain.meta} (67%) rename Assets/AmplifyShaderEditor/Examples/Official/{SimpleTerrain/ApplyGrassWindToTerrain.unitypackage.meta => Substance.meta} (67%) delete mode 100644 Assets/AmplifyShaderEditor/Examples/Official/Substance/LegacySubstanceExample.unitypackage.meta create mode 100644 Assets/AmplifyShaderEditor/Examples/Official/Substance2018.meta delete mode 100644 Assets/AmplifyShaderEditor/Examples/Official/Substance2018/Substance2018.unitypackage.meta create mode 100644 Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates.meta delete mode 100644 Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/CustomRTTemplates.unitypackage.meta create mode 100644 Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP.meta delete mode 100644 Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/HDSRPTemplates (Legacy).unitypackage.meta delete mode 100644 Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/HDSRPTemplates.unitypackage.meta delete mode 100644 Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/LWSRPTemplates (Legacy).unitypackage.meta delete mode 100644 Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/LWSRPTemplates.unitypackage.meta diff --git a/Assets/AmplifyShaderEditor/Examples/HD SRP Samples.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/Official.meta similarity index 67% rename from Assets/AmplifyShaderEditor/Examples/HD SRP Samples.unitypackage.meta rename to Assets/AmplifyShaderEditor/Examples/Official.meta index 872a1e1..15d9465 100644 --- a/Assets/AmplifyShaderEditor/Examples/HD SRP Samples.unitypackage.meta +++ b/Assets/AmplifyShaderEditor/Examples/Official.meta @@ -1,5 +1,6 @@ fileFormatVersion: 2 -guid: d1c0b77896049554fa4b635531caf741 +guid: d32786c99caa66e41baea4ab6d1c1cb8 +folderAsset: yes DefaultImporter: externalObjects: {} userData: diff --git a/Assets/AmplifyShaderEditor/Examples/LW SRP Samples.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/Official/CustomRTRain.meta similarity index 67% rename from Assets/AmplifyShaderEditor/Examples/LW SRP Samples.unitypackage.meta rename to Assets/AmplifyShaderEditor/Examples/Official/CustomRTRain.meta index 74eb369..2d0c900 100644 --- a/Assets/AmplifyShaderEditor/Examples/LW SRP Samples.unitypackage.meta +++ b/Assets/AmplifyShaderEditor/Examples/Official/CustomRTRain.meta @@ -1,5 +1,6 @@ fileFormatVersion: 2 -guid: 6ecbfd0a046659943a69328c98ff0442 +guid: 917f314cd7500ab41a37e0c60edaf755 +folderAsset: yes DefaultImporter: externalObjects: {} userData: diff --git a/Assets/AmplifyShaderEditor/Examples/Official/CustomRTRain/Custom RT Samples.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/Official/SimpleTerrain.meta similarity index 67% rename from Assets/AmplifyShaderEditor/Examples/Official/CustomRTRain/Custom RT Samples.unitypackage.meta rename to Assets/AmplifyShaderEditor/Examples/Official/SimpleTerrain.meta index 5b4b6c6..d50bf8c 100644 --- a/Assets/AmplifyShaderEditor/Examples/Official/CustomRTRain/Custom RT Samples.unitypackage.meta +++ b/Assets/AmplifyShaderEditor/Examples/Official/SimpleTerrain.meta @@ -1,5 +1,6 @@ fileFormatVersion: 2 -guid: 88dfe89a073bdf748bf05396f5285cdd +guid: e14f9199031928442a76fcb851644355 +folderAsset: yes DefaultImporter: externalObjects: {} userData: diff --git a/Assets/AmplifyShaderEditor/Examples/Official/SimpleTerrain/ApplyGrassWindToTerrain.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/Official/Substance.meta similarity index 67% rename from Assets/AmplifyShaderEditor/Examples/Official/SimpleTerrain/ApplyGrassWindToTerrain.unitypackage.meta rename to Assets/AmplifyShaderEditor/Examples/Official/Substance.meta index f13afd9..68bce78 100644 --- a/Assets/AmplifyShaderEditor/Examples/Official/SimpleTerrain/ApplyGrassWindToTerrain.unitypackage.meta +++ b/Assets/AmplifyShaderEditor/Examples/Official/Substance.meta @@ -1,5 +1,6 @@ fileFormatVersion: 2 -guid: 11f44bcb01ea56742bb7177b439b1a4f +guid: 3a1c9292d8fac714e9091922355abcd7 +folderAsset: yes DefaultImporter: externalObjects: {} userData: diff --git a/Assets/AmplifyShaderEditor/Examples/Official/Substance/LegacySubstanceExample.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/Official/Substance/LegacySubstanceExample.unitypackage.meta deleted file mode 100644 index 5417a54..0000000 --- a/Assets/AmplifyShaderEditor/Examples/Official/Substance/LegacySubstanceExample.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 490e8164148c52c468b633dcc1c12d57 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Examples/Official/Substance2018.meta b/Assets/AmplifyShaderEditor/Examples/Official/Substance2018.meta new file mode 100644 index 0000000..2a2c78c --- /dev/null +++ b/Assets/AmplifyShaderEditor/Examples/Official/Substance2018.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 50c3f69bf74856340867f04dd9288b24 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Examples/Official/Substance2018/Substance2018.unitypackage.meta b/Assets/AmplifyShaderEditor/Examples/Official/Substance2018/Substance2018.unitypackage.meta deleted file mode 100644 index bed3c3e..0000000 --- a/Assets/AmplifyShaderEditor/Examples/Official/Substance2018/Substance2018.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: af7de8b91a27c254fa1bd24c01ae6e8e -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates.meta new file mode 100644 index 0000000..9cf984b --- /dev/null +++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 211faf49d0bea6c4081e4e1135d19686 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/CustomRTTemplates.unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/CustomRTTemplates.unitypackage.meta deleted file mode 100644 index 1e0464d..0000000 --- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/CustomRTTemplates.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 191365b4aece81443875ae2bb7243b55 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP.meta new file mode 100644 index 0000000..7e6002c --- /dev/null +++ b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cc9e432e1a0a4764f80870c080173cb7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/HDSRPTemplates (Legacy).unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/HDSRPTemplates (Legacy).unitypackage.meta deleted file mode 100644 index 2d96284..0000000 --- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/HDSRPTemplates (Legacy).unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 4dc1afbcc68875c4780502f5e6b80158 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/HDSRPTemplates.unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/HDSRPTemplates.unitypackage.meta deleted file mode 100644 index e51ee6d..0000000 --- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/HDSRPTemplates.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 9a5e61a8b3421b944863d0946e32da0a -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/LWSRPTemplates (Legacy).unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/LWSRPTemplates (Legacy).unitypackage.meta deleted file mode 100644 index 8a216b9..0000000 --- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/LWSRPTemplates (Legacy).unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: b53d2f3b156ff104f90d4d7693d769c8 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/LWSRPTemplates.unitypackage.meta b/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/LWSRPTemplates.unitypackage.meta deleted file mode 100644 index 0f3221b..0000000 --- a/Assets/AmplifyShaderEditor/Plugins/EditorResources/Templates/SRP/LWSRPTemplates.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 4c816894a3147d343891060451241bfe -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 9df0091..90a4381 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -1314,8 +1314,11 @@ MonoBehaviour: MaxTimer: 180 Pivot: {fileID: 264010775} Sun: {fileID: 2018855991} - Dawn: {r: 1, g: 0.490047, b: 0, a: 1} - Noon: {r: 1, g: 0.97088087, b: 0, a: 1} + Dawn: 125 + Noon: 248 + sunR: 255 + sunB: 0 + SunImage: {fileID: 2018855992} mode: {fileID: 340012153} --- !u!4 &340012150 Transform: diff --git a/Assets/Scipts/Timer.cs b/Assets/Scipts/Timer.cs index 5b4c5f9..4fc147a 100644 --- a/Assets/Scipts/Timer.cs +++ b/Assets/Scipts/Timer.cs @@ -15,14 +15,17 @@ public class Timer : MonoBehaviour { public float Dawn = 125; //FF7D00 125 public float Noon = 248; //FFF800 248 + public float sunR; + public float sunB; + float sunG; float colorDif; - Image SunImage; + public Image SunImage; public GameMode mode; void Start() { - SunImage = Sun.gameObject.GetComponent(); + sunG = Dawn; colorDif = Mathf.Abs(Noon - Dawn); } @@ -33,17 +36,19 @@ public class Timer : MonoBehaviour { mode.PreGameLose(); } - // Color newColor; - + + float offset = colorDif * (2 / MaxTimer) * Time.deltaTime; if (curTime > MaxTimer / 2) { - // newColor = new Color(SunImage.color.r, SunImage.color.g - (colorDif / (1/(0.5 * MaxTimer))), SunImage.color.b); + sunG -= offset; } else { - // newColor = new Color(SunImage.color.r, SunImage.color.g + (colorDif / (1/(0.5 * MaxTimer))), SunImage.color.b); + sunG += offset; } - // SunImage.color = newColor; + Color32 col = new Color32((byte)sunR, (byte)sunG, (byte)sunB, (byte)255); + Debug.Log(col); + SunImage.color = col; Sun.RotateAround(Pivot.transform.position, -1 * Sun.transform.forward, (180 / MaxTimer) * Time.deltaTime); }