Erik Wittkorn 9 anni fa
parent
commit
ce8ab2ca92

+ 64 - 42
game/Assets/Prefabs/DayTimeManager.prefab

@@ -9,91 +9,73 @@ Prefab:
     m_Modifications: []
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 0}
-  m_RootGameObject: {fileID: 1918410337494552}
+  m_RootGameObject: {fileID: 1960232569590872}
   m_IsPrefabParent: 1
---- !u!1 &1918410337494552
+--- !u!1 &1506175633501982
 GameObject:
   m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   serializedVersion: 5
   m_Component:
-  - component: {fileID: 4618518221219600}
-  - component: {fileID: 114038366060908416}
+  - component: {fileID: 4068608461427198}
+  - component: {fileID: 108055089003181920}
   m_Layer: 0
-  m_Name: DayTimeManager
-  m_TagString: DayTimeManager
+  m_Name: Sunlight
+  m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!1 &1982852636499602
+--- !u!1 &1960232569590872
 GameObject:
   m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   serializedVersion: 5
   m_Component:
-  - component: {fileID: 4086179075244344}
-  - component: {fileID: 108209417384162848}
-  - component: {fileID: 95461355863206716}
+  - component: {fileID: 4930176882217988}
+  - component: {fileID: 114806071709842584}
   m_Layer: 0
-  m_Name: Sunlight
-  m_TagString: Untagged
+  m_Name: DayTimeManager
+  m_TagString: DayTimeManager
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &4086179075244344
+--- !u!4 &4068608461427198
 Transform:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1982852636499602}
+  m_GameObject: {fileID: 1506175633501982}
   m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
   m_LocalPosition: {x: 0, y: 10, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 4618518221219600}
+  m_Father: {fileID: 4930176882217988}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
---- !u!4 &4618518221219600
+--- !u!4 &4930176882217988
 Transform:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1918410337494552}
+  m_GameObject: {fileID: 1960232569590872}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 4086179075244344}
+  - {fileID: 4068608461427198}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!95 &95461355863206716
-Animator:
-  serializedVersion: 3
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1982852636499602}
-  m_Enabled: 1
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 0}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
---- !u!108 &108209417384162848
+--- !u!108 &108055089003181920
 Light:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1982852636499602}
+  m_GameObject: {fileID: 1506175633501982}
   m_Enabled: 1
   serializedVersion: 8
   m_Type: 1
@@ -138,18 +120,58 @@ Light:
   m_UseColorTemperature: 0
   m_ShadowRadius: 0
   m_ShadowAngle: 0
---- !u!114 &114038366060908416
+--- !u!114 &114806071709842584
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1918410337494552}
+  m_GameObject: {fileID: 1960232569590872}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: fa3a4f9ebf76b4ac2bc610f0f6b7d935, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  sunlight: {fileID: 108209417384162848}
-  secondsPerDay: 15
-  rotAxis: 0
+  sunlight: {fileID: 108055089003181920}
+  secondsPerDay: 60
+  MorningColor: {r: 1, g: 0.83205926, b: 0.36764705, a: 0}
+  NoonColor: {r: 0.9485294, g: 0.84463364, b: 0.6695502, a: 0}
+  EveningColor: {r: 0.23529412, g: 0.3137255, b: 0.47058824, a: 0}
+  NightColor: {r: 0.1254902, g: 0.1254902, b: 0.18431373, a: 0}
   maxAngle: 50
+  colorCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 2
+      time: 0
+      value: 0
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+    - serializedVersion: 2
+      time: 0.50038546
+      value: 0.105107576
+      inSlope: 0.26548746
+      outSlope: 0.26548746
+      tangentMode: 0
+    - serializedVersion: 2
+      time: 0.7999664
+      value: 0.20412965
+      inSlope: 1.2750924
+      outSlope: 1.2750924
+      tangentMode: 0
+    - serializedVersion: 2
+      time: 1
+      value: 1
+      inSlope: 2
+      outSlope: 2
+      tangentMode: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 0
+  dayTime: 0
+  morningStartTime: 8
+  noonStartTime: 11
+  eveningStartTime: 17
+  nightStartTime: 20
+  startTime: 1
+  dayTimeLabel: 3

+ 1 - 1
game/Assets/Prefabs/DayTimeManager.prefab.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 673629bba9f02458cacf9d13115e1078
-timeCreated: 1501361428
+timeCreated: 1501421844
 licenseType: Free
 NativeFormatImporter:
   mainObjectFileID: 100100000

+ 9 - 235
game/Assets/Scenes/DayNightChange.unity

@@ -756,265 +756,39 @@ Prefab:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
-    - target: {fileID: 114038366060908416, guid: 673629bba9f02458cacf9d13115e1078,
-        type: 2}
-      propertyPath: aCurve.m_Curve.Array.size
-      value: 3
-      objectReference: {fileID: 0}
-    - target: {fileID: 114038366060908416, guid: 673629bba9f02458cacf9d13115e1078,
-        type: 2}
-      propertyPath: colorCurve.m_Curve.Array.size
-      value: 4
-      objectReference: {fileID: 0}
-    - target: {fileID: 4618518221219600, guid: 673629bba9f02458cacf9d13115e1078, type: 2}
+    - target: {fileID: 4930176882217988, guid: 673629bba9f02458cacf9d13115e1078, type: 2}
       propertyPath: m_LocalPosition.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4618518221219600, guid: 673629bba9f02458cacf9d13115e1078, type: 2}
+    - target: {fileID: 4930176882217988, guid: 673629bba9f02458cacf9d13115e1078, type: 2}
       propertyPath: m_LocalPosition.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4618518221219600, guid: 673629bba9f02458cacf9d13115e1078, type: 2}
+    - target: {fileID: 4930176882217988, guid: 673629bba9f02458cacf9d13115e1078, type: 2}
       propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4618518221219600, guid: 673629bba9f02458cacf9d13115e1078, type: 2}
+    - target: {fileID: 4930176882217988, guid: 673629bba9f02458cacf9d13115e1078, type: 2}
       propertyPath: m_LocalRotation.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4618518221219600, guid: 673629bba9f02458cacf9d13115e1078, type: 2}
+    - target: {fileID: 4930176882217988, guid: 673629bba9f02458cacf9d13115e1078, type: 2}
       propertyPath: m_LocalRotation.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4618518221219600, guid: 673629bba9f02458cacf9d13115e1078, type: 2}
+    - target: {fileID: 4930176882217988, guid: 673629bba9f02458cacf9d13115e1078, type: 2}
       propertyPath: m_LocalRotation.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 4618518221219600, guid: 673629bba9f02458cacf9d13115e1078, type: 2}
+    - target: {fileID: 4930176882217988, guid: 673629bba9f02458cacf9d13115e1078, type: 2}
       propertyPath: m_LocalRotation.w
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: 4618518221219600, guid: 673629bba9f02458cacf9d13115e1078, type: 2}
+    - target: {fileID: 4930176882217988, guid: 673629bba9f02458cacf9d13115e1078, type: 2}
       propertyPath: m_RootOrder
       value: 5
       objectReference: {fileID: 0}
-    - target: {fileID: 4086179075244344, guid: 673629bba9f02458cacf9d13115e1078, type: 2}
-      propertyPath: m_LocalRotation.x
-      value: 0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 4086179075244344, guid: 673629bba9f02458cacf9d13115e1078, type: 2}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4086179075244344, guid: 673629bba9f02458cacf9d13115e1078, type: 2}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4086179075244344, guid: 673629bba9f02458cacf9d13115e1078, type: 2}
-      propertyPath: m_LocalRotation.w
-      value: 0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 4086179075244344, guid: 673629bba9f02458cacf9d13115e1078, type: 2}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 114038366060908416, guid: 673629bba9f02458cacf9d13115e1078,
-        type: 2}
-      propertyPath: NightColor.r
-      value: 0.1254902
-      objectReference: {fileID: 0}
-    - target: {fileID: 114038366060908416, guid: 673629bba9f02458cacf9d13115e1078,
-        type: 2}
-      propertyPath: NightColor.g
-      value: 0.1254902
-      objectReference: {fileID: 0}
-    - target: {fileID: 114038366060908416, guid: 673629bba9f02458cacf9d13115e1078,
-        type: 2}
-      propertyPath: NightColor.b
-      value: 0.18431373
-      objectReference: {fileID: 0}
-    - target: {fileID: 114038366060908416, guid: 673629bba9f02458cacf9d13115e1078,
-        type: 2}
-      propertyPath: EveningColor.r
-      value: 0.23529412
-      objectReference: {fileID: 0}
-    - target: {fileID: 114038366060908416, guid: 673629bba9f02458cacf9d13115e1078,
-        type: 2}
-      propertyPath: EveningColor.g
-      value: 0.3137255
-      objectReference: {fileID: 0}
-    - target: {fileID: 114038366060908416, guid: 673629bba9f02458cacf9d13115e1078,
-        type: 2}
-      propertyPath: EveningColor.b
-      value: 0.47058824
-      objectReference: {fileID: 0}
-    - target: {fileID: 114038366060908416, guid: 673629bba9f02458cacf9d13115e1078,
-        type: 2}
-      propertyPath: NoonColor.r
-      value: 0.9485294
-      objectReference: {fileID: 0}
-    - target: {fileID: 114038366060908416, guid: 673629bba9f02458cacf9d13115e1078,
-        type: 2}
-      propertyPath: NoonColor.g
-      value: 0.84463364
-      objectReference: {fileID: 0}
-    - target: {fileID: 114038366060908416, guid: 673629bba9f02458cacf9d13115e1078,
-        type: 2}
-      propertyPath: NoonColor.b
-      value: 0.6695502
-      objectReference: {fileID: 0}
-    - target: {fileID: 114038366060908416, guid: 673629bba9f02458cacf9d13115e1078,
-        type: 2}
-      propertyPath: MorningColor.r
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 114038366060908416, guid: 673629bba9f02458cacf9d13115e1078,
-        type: 2}
-      propertyPath: MorningColor.g
-      value: 0.83205926
-      objectReference: {fileID: 0}
-    - target: {fileID: 114038366060908416, guid: 673629bba9f02458cacf9d13115e1078,
-        type: 2}
-      propertyPath: MorningColor.b
-      value: 0.36764705
-      objectReference: {fileID: 0}
-    - target: {fileID: 114038366060908416, guid: 673629bba9f02458cacf9d13115e1078,
-        type: 2}
-      propertyPath: secondsPerDay
-      value: 60
-      objectReference: {fileID: 0}
-    - target: {fileID: 114038366060908416, guid: 673629bba9f02458cacf9d13115e1078,
-        type: 2}
-      propertyPath: aCurve.m_Curve.Array.data[0].inSlope
-      value: 0.14161837
-      objectReference: {fileID: 0}
-    - target: {fileID: 114038366060908416, guid: 673629bba9f02458cacf9d13115e1078,
-        type: 2}
-      propertyPath: aCurve.m_Curve.Array.data[0].outSlope
-      value: 0.14161837
-      objectReference: {fileID: 0}
-    - target: {fileID: 114038366060908416, guid: 673629bba9f02458cacf9d13115e1078,
-        type: 2}
-      propertyPath: aCurve.m_Curve.Array.data[1].time
-      value: 0.74611384
-      objectReference: {fileID: 0}
-    - target: {fileID: 114038366060908416, guid: 673629bba9f02458cacf9d13115e1078,
-        type: 2}
-      propertyPath: aCurve.m_Curve.Array.data[1].value
-      value: 0.101069294
-      objectReference: {fileID: 0}
-    - target: {fileID: 114038366060908416, guid: 673629bba9f02458cacf9d13115e1078,
-        type: 2}
-      propertyPath: aCurve.m_RotationOrder
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 114038366060908416, guid: 673629bba9f02458cacf9d13115e1078,
-        type: 2}
-      propertyPath: aCurve.m_Curve.Array.data[0].value
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 114038366060908416, guid: 673629bba9f02458cacf9d13115e1078,
-        type: 2}
-      propertyPath: aCurve.m_Curve.Array.data[1].inSlope
-      value: 0.43818286
-      objectReference: {fileID: 0}
-    - target: {fileID: 114038366060908416, guid: 673629bba9f02458cacf9d13115e1078,
-        type: 2}
-      propertyPath: aCurve.m_Curve.Array.data[1].outSlope
-      value: 0.43818286
-      objectReference: {fileID: 0}
-    - target: {fileID: 114038366060908416, guid: 673629bba9f02458cacf9d13115e1078,
-        type: 2}
-      propertyPath: aCurve.m_Curve.Array.data[2].time
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 114038366060908416, guid: 673629bba9f02458cacf9d13115e1078,
-        type: 2}
-      propertyPath: aCurve.m_Curve.Array.data[2].value
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 114038366060908416, guid: 673629bba9f02458cacf9d13115e1078,
-        type: 2}
-      propertyPath: aCurve.m_Curve.Array.data[0].time
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 114038366060908416, guid: 673629bba9f02458cacf9d13115e1078,
-        type: 2}
-      propertyPath: aCurve.m_Curve.Array.data[2].inSlope
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 114038366060908416, guid: 673629bba9f02458cacf9d13115e1078,
-        type: 2}
-      propertyPath: aCurve.m_Curve.Array.data[2].outSlope
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 114038366060908416, guid: 673629bba9f02458cacf9d13115e1078,
-        type: 2}
-      propertyPath: colorCurve.m_Curve.Array.data[1].time
-      value: 0.50038546
-      objectReference: {fileID: 0}
-    - target: {fileID: 114038366060908416, guid: 673629bba9f02458cacf9d13115e1078,
-        type: 2}
-      propertyPath: colorCurve.m_Curve.Array.data[1].value
-      value: 0.105107576
-      objectReference: {fileID: 0}
-    - target: {fileID: 114038366060908416, guid: 673629bba9f02458cacf9d13115e1078,
-        type: 2}
-      propertyPath: colorCurve.m_Curve.Array.data[1].inSlope
-      value: 0.26548746
-      objectReference: {fileID: 0}
-    - target: {fileID: 114038366060908416, guid: 673629bba9f02458cacf9d13115e1078,
-        type: 2}
-      propertyPath: colorCurve.m_Curve.Array.data[1].outSlope
-      value: 0.26548746
-      objectReference: {fileID: 0}
-    - target: {fileID: 114038366060908416, guid: 673629bba9f02458cacf9d13115e1078,
-        type: 2}
-      propertyPath: colorCurve.m_RotationOrder
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 114038366060908416, guid: 673629bba9f02458cacf9d13115e1078,
-        type: 2}
-      propertyPath: colorCurve.m_Curve.Array.data[2].time
-      value: 0.7999664
-      objectReference: {fileID: 0}
-    - target: {fileID: 114038366060908416, guid: 673629bba9f02458cacf9d13115e1078,
-        type: 2}
-      propertyPath: colorCurve.m_Curve.Array.data[2].value
-      value: 0.20412965
-      objectReference: {fileID: 0}
-    - target: {fileID: 114038366060908416, guid: 673629bba9f02458cacf9d13115e1078,
-        type: 2}
-      propertyPath: colorCurve.m_Curve.Array.data[2].inSlope
-      value: 1.2750924
-      objectReference: {fileID: 0}
-    - target: {fileID: 114038366060908416, guid: 673629bba9f02458cacf9d13115e1078,
-        type: 2}
-      propertyPath: colorCurve.m_Curve.Array.data[2].outSlope
-      value: 1.2750924
-      objectReference: {fileID: 0}
-    - target: {fileID: 114038366060908416, guid: 673629bba9f02458cacf9d13115e1078,
-        type: 2}
-      propertyPath: colorCurve.m_Curve.Array.data[3].time
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 114038366060908416, guid: 673629bba9f02458cacf9d13115e1078,
-        type: 2}
-      propertyPath: colorCurve.m_Curve.Array.data[3].value
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 114038366060908416, guid: 673629bba9f02458cacf9d13115e1078,
-        type: 2}
-      propertyPath: colorCurve.m_Curve.Array.data[3].inSlope
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 114038366060908416, guid: 673629bba9f02458cacf9d13115e1078,
-        type: 2}
-      propertyPath: colorCurve.m_Curve.Array.data[3].outSlope
-      value: 2
-      objectReference: {fileID: 0}
-    m_RemovedComponents:
-    - {fileID: 95461355863206716, guid: 673629bba9f02458cacf9d13115e1078, type: 2}
+    m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 673629bba9f02458cacf9d13115e1078, type: 2}
   m_IsPrefabParent: 0
 --- !u!1 &2104481372