Bladeren bron

added daytimemanager to main scene, renamed prefab folder to prefabs

DasGewehr 9 jaren geleden
bovenliggende
commit
39b7b6a88a

+ 0 - 9
game/Assets/Animation.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: d50ec002efdd94687908f0e27e2d45c8
-folderAsset: yes
-timeCreated: 1501346877
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 9
game/Assets/Prefab.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 2b424ed61c6014901a9aadd8006b4318
-folderAsset: yes
-timeCreated: 1501361419
-licenseType: Free
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

game/Assets/Prefab/DayTimeManager.prefab → game/Assets/Prefabs/DayTimeManager.prefab


game/Assets/Prefab/DayTimeManager.prefab.meta → game/Assets/Prefabs/DayTimeManager.prefab.meta


+ 58 - 16
game/Assets/Scenes/Main.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44657868, g: 0.49641263, b: 0.57481706, a: 1}
+  m_IndirectSpecularColor: {r: 0.43667564, g: 0.48427147, b: 0.56452364, a: 1}
 --- !u!157 &3
 LightmapSettings:
   m_ObjectHideFlags: 0
@@ -145,7 +145,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_RootOrder
-      value: 15
+      value: 16
       objectReference: {fileID: 0}
     - target: {fileID: 1196849215294664, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_Name
@@ -270,7 +270,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_RootOrder
-      value: 13
+      value: 14
       objectReference: {fileID: 0}
     - target: {fileID: 1196849215294664, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_Name
@@ -316,7 +316,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_RootOrder
-      value: 12
+      value: 13
       objectReference: {fileID: 0}
     - target: {fileID: 1196849215294664, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_Name
@@ -446,7 +446,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_RootOrder
-      value: 9
+      value: 10
       objectReference: {fileID: 0}
     - target: {fileID: 1196849215294664, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_Name
@@ -492,7 +492,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4413073277323274, guid: e6383ffd9f8688f4a9ba9705843d54e2, type: 2}
       propertyPath: m_RootOrder
-      value: 3
+      value: 4
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: e6383ffd9f8688f4a9ba9705843d54e2, type: 2}
@@ -623,7 +623,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_RootOrder
-      value: 16
+      value: 17
       objectReference: {fileID: 0}
     - target: {fileID: 1196849215294664, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_Name
@@ -669,7 +669,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_RootOrder
-      value: 8
+      value: 9
       objectReference: {fileID: 0}
     - target: {fileID: 1196849215294664, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_Name
@@ -715,7 +715,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_RootOrder
-      value: 6
+      value: 7
       objectReference: {fileID: 0}
     - target: {fileID: 1196849215294664, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_Name
@@ -761,7 +761,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_RootOrder
-      value: 10
+      value: 11
       objectReference: {fileID: 0}
     - target: {fileID: 1196849215294664, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_Name
@@ -830,7 +830,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 17
+  m_RootOrder: 18
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1812503719
 Prefab:
@@ -869,7 +869,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_RootOrder
-      value: 14
+      value: 15
       objectReference: {fileID: 0}
     - target: {fileID: 1196849215294664, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_Name
@@ -878,6 +878,48 @@ Prefab:
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
   m_IsPrefabParent: 0
+--- !u!1001 &1890959033
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4618518221219600, guid: 673629bba9f02458cacf9d13115e1078, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4618518221219600, guid: 673629bba9f02458cacf9d13115e1078, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4618518221219600, guid: 673629bba9f02458cacf9d13115e1078, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4618518221219600, guid: 673629bba9f02458cacf9d13115e1078, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4618518221219600, guid: 673629bba9f02458cacf9d13115e1078, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4618518221219600, guid: 673629bba9f02458cacf9d13115e1078, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4618518221219600, guid: 673629bba9f02458cacf9d13115e1078, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4618518221219600, guid: 673629bba9f02458cacf9d13115e1078, type: 2}
+      propertyPath: m_RootOrder
+      value: 3
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: 673629bba9f02458cacf9d13115e1078, type: 2}
+  m_IsPrefabParent: 0
 --- !u!1001 &1955320057
 Prefab:
   m_ObjectHideFlags: 0
@@ -915,7 +957,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_RootOrder
-      value: 7
+      value: 8
       objectReference: {fileID: 0}
     - target: {fileID: 1196849215294664, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_Name
@@ -961,7 +1003,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_RootOrder
-      value: 4
+      value: 5
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
@@ -1003,7 +1045,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_RootOrder
-      value: 5
+      value: 6
       objectReference: {fileID: 0}
     - target: {fileID: 1196849215294664, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_Name
@@ -1049,7 +1091,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 4394077682102786, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_RootOrder
-      value: 11
+      value: 12
       objectReference: {fileID: 0}
     - target: {fileID: 1196849215294664, guid: 6a04fac6f7a8dea419c1a2e19e3bb8c8, type: 2}
       propertyPath: m_Name

+ 0 - 9
game/Assets/VSCode/Plugins/Editor.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 47b6573edc17b4b19b6f06515ff01748
-folderAsset: yes
-timeCreated: 1444652910
-licenseType: Store
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: