diff --git a/FallUnity/Assets/Game/LeafSpawner.cs b/FallUnity/Assets/Game/LeafSpawner.cs old mode 100644 new mode 100755 index 98828bf..cde82d1 --- a/FallUnity/Assets/Game/LeafSpawner.cs +++ b/FallUnity/Assets/Game/LeafSpawner.cs @@ -4,34 +4,34 @@ using UnityEditor; public class LeafSpawner : MonoBehaviour { - public Radius Radius = new Radius { Radius = 1 }; + public float Radius = 3; + public float Rate = 5; + public LeafPhysics Leaf; // Use this for initialization void Start () { } + + private List leaves = new List(); + + private float time = 0; // Update is called once per frame void Update () { - - } - void OnSceneGUI() - { - Handles.matrix = transform.localToWorldMatrix; - Radius = Handles.RadiusHandle(Quaternion.identity, Vector3.zero, Radius); - } + float interval = 1 / Rate; + time += Time.deltaTime; + while (time > interval) + { + time -= interval; + Vector2 offset = Random.insideUnitCircle; + Vector3 point = transform.position + new Vector3(offset.x * Radius, 0, offset.y * Radius); + LeafPhysics leaf = GameObject.Instantiate(Leaf); + leaves.Add(leaf); + leaf.transform.position = point; + } + } } -[CustomEditor(typeof(Radius)] -public class RadiusEditor : Editor -{ - -} - -public struct Radius -{ - public float Radius; -} - diff --git a/FallUnity/Assets/Game/LeafSpawner.cs b/FallUnity/Assets/Game/LeafSpawner.cs old mode 100644 new mode 100755 index 98828bf..cde82d1 --- a/FallUnity/Assets/Game/LeafSpawner.cs +++ b/FallUnity/Assets/Game/LeafSpawner.cs @@ -4,34 +4,34 @@ using UnityEditor; public class LeafSpawner : MonoBehaviour { - public Radius Radius = new Radius { Radius = 1 }; + public float Radius = 3; + public float Rate = 5; + public LeafPhysics Leaf; // Use this for initialization void Start () { } + + private List leaves = new List(); + + private float time = 0; // Update is called once per frame void Update () { - - } - void OnSceneGUI() - { - Handles.matrix = transform.localToWorldMatrix; - Radius = Handles.RadiusHandle(Quaternion.identity, Vector3.zero, Radius); - } + float interval = 1 / Rate; + time += Time.deltaTime; + while (time > interval) + { + time -= interval; + Vector2 offset = Random.insideUnitCircle; + Vector3 point = transform.position + new Vector3(offset.x * Radius, 0, offset.y * Radius); + LeafPhysics leaf = GameObject.Instantiate(Leaf); + leaves.Add(leaf); + leaf.transform.position = point; + } + } } -[CustomEditor(typeof(Radius)] -public class RadiusEditor : Editor -{ - -} - -public struct Radius -{ - public float Radius; -} - diff --git a/FallUnity/Assets/level.unity b/FallUnity/Assets/level.unity old mode 100644 new mode 100755 index 5fb4304..067020c --- a/FallUnity/Assets/level.unity +++ b/FallUnity/Assets/level.unity @@ -38,7 +38,7 @@ m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.447304, g: 0.4926479, b: 0.55053383, a: 1} + m_IndirectSpecularColor: {r: 0.45042115, g: 0.5004266, b: 0.57522225, a: 1} --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 @@ -88,6 +88,7 @@ m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ShowResolutionOverlay: 1 m_LightingDataAsset: {fileID: 0} m_UseShadowmask: 1 --- !u!196 &4 @@ -183,9 +184,9 @@ m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Convex: 0 - m_InflateMesh: 0 + m_CookingOptions: 14 m_SkinWidth: 0.01 m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &277372081 @@ -317,6 +318,7 @@ m_TargetEye: 3 m_HDR: 1 m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 m_ForceIntoRT: 0 m_OcclusionCulling: 1 m_StereoConvergence: 10 @@ -447,13 +449,13 @@ m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 763199060} - m_LocalRotation: {x: 0.17022383, y: 0.2886038, z: 0.052221533, w: 0.94074684} + m_LocalRotation: {x: 0.33640918, y: 0.29329005, z: -0.00045924273, w: 0.89487964} m_LocalPosition: {x: -8.81, y: 4.62, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 257733089} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 16.866001, y: 35.873, z: 11.849001} + m_LocalEulerAnglesHint: {x: 37.039, y: 41.088, z: 14.252001} --- !u!108 &763199062 Light: m_ObjectHideFlags: 0 @@ -490,34 +492,6 @@ m_UseColorTemperature: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 ---- !u!1 &951496405 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 951496406} - m_Layer: 0 - m_Name: LeafHandler - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &951496406 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 951496405} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 3.890625, y: 2.002445, z: 4.985762} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1118406554 GameObject: m_ObjectHideFlags: 0 @@ -541,7 +515,7 @@ m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1118406554} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.06, y: 0, z: -5.79} + m_LocalPosition: {x: -0.06, y: 0, z: 2.42} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1777425977} @@ -600,6 +574,7 @@ m_Component: - component: {fileID: 1206131916} - component: {fileID: 1206131917} + - component: {fileID: 1206131918} m_Layer: 0 m_Name: Spawner m_TagString: Untagged @@ -614,7 +589,7 @@ m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1206131915} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.09, y: 7.71, z: 4.985762} + m_LocalPosition: {x: -0.42, y: 7.71, z: -0.41} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -632,6 +607,22 @@ m_Name: m_EditorClassIdentifier: Radius: 1 + Rate: 5 + Leaf: {fileID: 0} +--- !u!114 &1206131918 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1206131915} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 540cb6c0be5490d4687e3eb9c06ab209, type: 3} + m_Name: + m_EditorClassIdentifier: + Radius: 6.1 + Rate: 20 + Leaf: {fileID: 114579094665962866, guid: 1701be1f15e160d4d904862548ae69de, type: 2} --- !u!1 &1272122407 GameObject: m_ObjectHideFlags: 0 @@ -757,7 +748,7 @@ far clip plane: 1000 field of view: 60 orthographic: 1 - orthographic size: 2 + orthographic size: 6.24 m_Depth: 0 m_CullingMask: serializedVersion: 2 @@ -768,6 +759,7 @@ m_TargetEye: 3 m_HDR: 1 m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 m_ForceIntoRT: 0 m_OcclusionCulling: 1 m_StereoConvergence: 10 diff --git a/FallUnity/Assets/Game/LeafSpawner.cs b/FallUnity/Assets/Game/LeafSpawner.cs old mode 100644 new mode 100755 index 98828bf..cde82d1 --- a/FallUnity/Assets/Game/LeafSpawner.cs +++ b/FallUnity/Assets/Game/LeafSpawner.cs @@ -4,34 +4,34 @@ using UnityEditor; public class LeafSpawner : MonoBehaviour { - public Radius Radius = new Radius { Radius = 1 }; + public float Radius = 3; + public float Rate = 5; + public LeafPhysics Leaf; // Use this for initialization void Start () { } + + private List leaves = new List(); + + private float time = 0; // Update is called once per frame void Update () { - - } - void OnSceneGUI() - { - Handles.matrix = transform.localToWorldMatrix; - Radius = Handles.RadiusHandle(Quaternion.identity, Vector3.zero, Radius); - } + float interval = 1 / Rate; + time += Time.deltaTime; + while (time > interval) + { + time -= interval; + Vector2 offset = Random.insideUnitCircle; + Vector3 point = transform.position + new Vector3(offset.x * Radius, 0, offset.y * Radius); + LeafPhysics leaf = GameObject.Instantiate(Leaf); + leaves.Add(leaf); + leaf.transform.position = point; + } + } } -[CustomEditor(typeof(Radius)] -public class RadiusEditor : Editor -{ - -} - -public struct Radius -{ - public float Radius; -} - diff --git a/FallUnity/Assets/level.unity b/FallUnity/Assets/level.unity old mode 100644 new mode 100755 index 5fb4304..067020c --- a/FallUnity/Assets/level.unity +++ b/FallUnity/Assets/level.unity @@ -38,7 +38,7 @@ m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.447304, g: 0.4926479, b: 0.55053383, a: 1} + m_IndirectSpecularColor: {r: 0.45042115, g: 0.5004266, b: 0.57522225, a: 1} --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 @@ -88,6 +88,7 @@ m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ShowResolutionOverlay: 1 m_LightingDataAsset: {fileID: 0} m_UseShadowmask: 1 --- !u!196 &4 @@ -183,9 +184,9 @@ m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Convex: 0 - m_InflateMesh: 0 + m_CookingOptions: 14 m_SkinWidth: 0.01 m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &277372081 @@ -317,6 +318,7 @@ m_TargetEye: 3 m_HDR: 1 m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 m_ForceIntoRT: 0 m_OcclusionCulling: 1 m_StereoConvergence: 10 @@ -447,13 +449,13 @@ m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 763199060} - m_LocalRotation: {x: 0.17022383, y: 0.2886038, z: 0.052221533, w: 0.94074684} + m_LocalRotation: {x: 0.33640918, y: 0.29329005, z: -0.00045924273, w: 0.89487964} m_LocalPosition: {x: -8.81, y: 4.62, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 257733089} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 16.866001, y: 35.873, z: 11.849001} + m_LocalEulerAnglesHint: {x: 37.039, y: 41.088, z: 14.252001} --- !u!108 &763199062 Light: m_ObjectHideFlags: 0 @@ -490,34 +492,6 @@ m_UseColorTemperature: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 ---- !u!1 &951496405 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 951496406} - m_Layer: 0 - m_Name: LeafHandler - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &951496406 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 951496405} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 3.890625, y: 2.002445, z: 4.985762} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1118406554 GameObject: m_ObjectHideFlags: 0 @@ -541,7 +515,7 @@ m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1118406554} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.06, y: 0, z: -5.79} + m_LocalPosition: {x: -0.06, y: 0, z: 2.42} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1777425977} @@ -600,6 +574,7 @@ m_Component: - component: {fileID: 1206131916} - component: {fileID: 1206131917} + - component: {fileID: 1206131918} m_Layer: 0 m_Name: Spawner m_TagString: Untagged @@ -614,7 +589,7 @@ m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1206131915} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.09, y: 7.71, z: 4.985762} + m_LocalPosition: {x: -0.42, y: 7.71, z: -0.41} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -632,6 +607,22 @@ m_Name: m_EditorClassIdentifier: Radius: 1 + Rate: 5 + Leaf: {fileID: 0} +--- !u!114 &1206131918 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1206131915} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 540cb6c0be5490d4687e3eb9c06ab209, type: 3} + m_Name: + m_EditorClassIdentifier: + Radius: 6.1 + Rate: 20 + Leaf: {fileID: 114579094665962866, guid: 1701be1f15e160d4d904862548ae69de, type: 2} --- !u!1 &1272122407 GameObject: m_ObjectHideFlags: 0 @@ -757,7 +748,7 @@ far clip plane: 1000 field of view: 60 orthographic: 1 - orthographic size: 2 + orthographic size: 6.24 m_Depth: 0 m_CullingMask: serializedVersion: 2 @@ -768,6 +759,7 @@ m_TargetEye: 3 m_HDR: 1 m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 m_ForceIntoRT: 0 m_OcclusionCulling: 1 m_StereoConvergence: 10 diff --git a/FallUnity/ProjectSettings/EditorBuildSettings.asset b/FallUnity/ProjectSettings/EditorBuildSettings.asset old mode 100644 new mode 100755 index 6dc24f7..64b028d --- a/FallUnity/ProjectSettings/EditorBuildSettings.asset +++ b/FallUnity/ProjectSettings/EditorBuildSettings.asset @@ -4,4 +4,7 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 - m_Scenes: [] + m_Scenes: + - enabled: 1 + path: Assets/level.unity + guid: 53067de3b28c1da4c825e26fc4518a46 diff --git a/FallUnity/Assets/Game/LeafSpawner.cs b/FallUnity/Assets/Game/LeafSpawner.cs old mode 100644 new mode 100755 index 98828bf..cde82d1 --- a/FallUnity/Assets/Game/LeafSpawner.cs +++ b/FallUnity/Assets/Game/LeafSpawner.cs @@ -4,34 +4,34 @@ using UnityEditor; public class LeafSpawner : MonoBehaviour { - public Radius Radius = new Radius { Radius = 1 }; + public float Radius = 3; + public float Rate = 5; + public LeafPhysics Leaf; // Use this for initialization void Start () { } + + private List leaves = new List(); + + private float time = 0; // Update is called once per frame void Update () { - - } - void OnSceneGUI() - { - Handles.matrix = transform.localToWorldMatrix; - Radius = Handles.RadiusHandle(Quaternion.identity, Vector3.zero, Radius); - } + float interval = 1 / Rate; + time += Time.deltaTime; + while (time > interval) + { + time -= interval; + Vector2 offset = Random.insideUnitCircle; + Vector3 point = transform.position + new Vector3(offset.x * Radius, 0, offset.y * Radius); + LeafPhysics leaf = GameObject.Instantiate(Leaf); + leaves.Add(leaf); + leaf.transform.position = point; + } + } } -[CustomEditor(typeof(Radius)] -public class RadiusEditor : Editor -{ - -} - -public struct Radius -{ - public float Radius; -} - diff --git a/FallUnity/Assets/level.unity b/FallUnity/Assets/level.unity old mode 100644 new mode 100755 index 5fb4304..067020c --- a/FallUnity/Assets/level.unity +++ b/FallUnity/Assets/level.unity @@ -38,7 +38,7 @@ m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.447304, g: 0.4926479, b: 0.55053383, a: 1} + m_IndirectSpecularColor: {r: 0.45042115, g: 0.5004266, b: 0.57522225, a: 1} --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 @@ -88,6 +88,7 @@ m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ShowResolutionOverlay: 1 m_LightingDataAsset: {fileID: 0} m_UseShadowmask: 1 --- !u!196 &4 @@ -183,9 +184,9 @@ m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Convex: 0 - m_InflateMesh: 0 + m_CookingOptions: 14 m_SkinWidth: 0.01 m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!23 &277372081 @@ -317,6 +318,7 @@ m_TargetEye: 3 m_HDR: 1 m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 m_ForceIntoRT: 0 m_OcclusionCulling: 1 m_StereoConvergence: 10 @@ -447,13 +449,13 @@ m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 763199060} - m_LocalRotation: {x: 0.17022383, y: 0.2886038, z: 0.052221533, w: 0.94074684} + m_LocalRotation: {x: 0.33640918, y: 0.29329005, z: -0.00045924273, w: 0.89487964} m_LocalPosition: {x: -8.81, y: 4.62, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 257733089} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 16.866001, y: 35.873, z: 11.849001} + m_LocalEulerAnglesHint: {x: 37.039, y: 41.088, z: 14.252001} --- !u!108 &763199062 Light: m_ObjectHideFlags: 0 @@ -490,34 +492,6 @@ m_UseColorTemperature: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 ---- !u!1 &951496405 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 951496406} - m_Layer: 0 - m_Name: LeafHandler - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &951496406 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 951496405} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 3.890625, y: 2.002445, z: 4.985762} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1118406554 GameObject: m_ObjectHideFlags: 0 @@ -541,7 +515,7 @@ m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1118406554} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.06, y: 0, z: -5.79} + m_LocalPosition: {x: -0.06, y: 0, z: 2.42} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1777425977} @@ -600,6 +574,7 @@ m_Component: - component: {fileID: 1206131916} - component: {fileID: 1206131917} + - component: {fileID: 1206131918} m_Layer: 0 m_Name: Spawner m_TagString: Untagged @@ -614,7 +589,7 @@ m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1206131915} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.09, y: 7.71, z: 4.985762} + m_LocalPosition: {x: -0.42, y: 7.71, z: -0.41} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -632,6 +607,22 @@ m_Name: m_EditorClassIdentifier: Radius: 1 + Rate: 5 + Leaf: {fileID: 0} +--- !u!114 &1206131918 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1206131915} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 540cb6c0be5490d4687e3eb9c06ab209, type: 3} + m_Name: + m_EditorClassIdentifier: + Radius: 6.1 + Rate: 20 + Leaf: {fileID: 114579094665962866, guid: 1701be1f15e160d4d904862548ae69de, type: 2} --- !u!1 &1272122407 GameObject: m_ObjectHideFlags: 0 @@ -757,7 +748,7 @@ far clip plane: 1000 field of view: 60 orthographic: 1 - orthographic size: 2 + orthographic size: 6.24 m_Depth: 0 m_CullingMask: serializedVersion: 2 @@ -768,6 +759,7 @@ m_TargetEye: 3 m_HDR: 1 m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 m_ForceIntoRT: 0 m_OcclusionCulling: 1 m_StereoConvergence: 10 diff --git a/FallUnity/ProjectSettings/EditorBuildSettings.asset b/FallUnity/ProjectSettings/EditorBuildSettings.asset old mode 100644 new mode 100755 index 6dc24f7..64b028d --- a/FallUnity/ProjectSettings/EditorBuildSettings.asset +++ b/FallUnity/ProjectSettings/EditorBuildSettings.asset @@ -4,4 +4,7 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 - m_Scenes: [] + m_Scenes: + - enabled: 1 + path: Assets/level.unity + guid: 53067de3b28c1da4c825e26fc4518a46 diff --git a/FallUnity/ProjectSettings/ProjectVersion.txt b/FallUnity/ProjectSettings/ProjectVersion.txt old mode 100644 new mode 100755 index 7a6fffb..a6a4bc5 --- a/FallUnity/ProjectSettings/ProjectVersion.txt +++ b/FallUnity/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2017.2.0f3 +m_EditorVersion: 2017.4.28f1