GJP/GlobalGameJame
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://git.steelants.cz/PragueGameJam/GlobalGameJame

Browse Source
This commit is contained in:
Kotrba Filip
2020-02-01 14:26:52 +01:00
parent a053afbeb6 98699a746e
commit fedd61fa31
16 changed files with 388 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
Assets/Scenes/Test-JonatanRek.unity
View File

@@ -237,10 +237,10 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 705507993}
m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
m_LocalPosition: {x: 0, y: 3, z: 0}
m_LocalPosition: {x: -112.32495, y: 66.41281, z: -37.77597}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_Father: {fileID: 1649308860}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1 &827899963 stripped
@@ -317,7 +317,7 @@ PrefabInstance:
- target: {fileID: -4216859302048453862, guid: a20f14621725df742ad2c1028ff4f453,
type: 3}
propertyPath: m_RootOrder
value: 2
value: 1
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: a20f14621725df742ad2c1028ff4f453,
type: 3}
@@ -425,7 +425,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 7
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1272265849
GameObject:
@@ -457,6 +457,51 @@ Transform:
m_Father: {fileID: 827899965}
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1649308858
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1649308860}
- component: {fileID: 1649308859}
m_Layer: 0
m_Name: Sun
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1649308859
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1649308858}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 19bf5b78376a3b94882c1e26afe7c633, type: 3}
m_Name:
m_EditorClassIdentifier:
sunSpeed: 30
--- !u!4 &1649308860
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1649308858}
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: 705507995}
m_Father: {fileID: 0}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1753935063
GameObject:
m_ObjectHideFlags: 0
@@ -531,7 +576,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 6
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1838907804
PrefabInstance:
@@ -578,7 +623,7 @@ PrefabInstance:
- target: {fileID: -4216859302048453862, guid: 18a9d16f45ee7544190e7437a99f97de,
type: 3}
propertyPath: m_RootOrder
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 18a9d16f45ee7544190e7437a99f97de,
type: 3}
@@ -687,7 +732,7 @@ PrefabInstance:
- target: {fileID: 5004747464968674621, guid: b4e392e2cdb417b4c8bdf8e683bceb9b,
type: 3}
propertyPath: m_RootOrder
value: 5
value: 4
objectReference: {fileID: 0}
- target: {fileID: 5004747464968674621, guid: b4e392e2cdb417b4c8bdf8e683bceb9b,
type: 3}
@@ -931,7 +976,7 @@ PrefabInstance:
- target: {fileID: 7425287328957043289, guid: 5322794fa1699704b8e50a14cef106b1,
type: 3}
propertyPath: m_RootOrder
value: 3
value: 2
objectReference: {fileID: 0}
- target: {fileID: 7425287328957043289, guid: 5322794fa1699704b8e50a14cef106b1,
type: 3}
@@ -1035,7 +1080,7 @@ PrefabInstance:
- target: {fileID: 7985979212931499549, guid: 204c7411afdd01a478b1a1e25607d50c,
type: 3}
propertyPath: m_RootOrder
value: 4
value: 3
objectReference: {fileID: 0}
- target: {fileID: 7985979212931499549, guid: 204c7411afdd01a478b1a1e25607d50c,
type: 3}