From 95caf4453889e9dced9ff428e165249eaee4c96c Mon Sep 17 00:00:00 2001 From: RosimInc Date: Wed, 12 Aug 2015 11:03:39 -0400 Subject: [PATCH] Removed unneeded files Added Friendship Created a namespace for models Signed-off-by: RosimInc --- Assets/Scenes/ToBeRemoved.meta | 9 - Assets/Scenes/ToBeRemoved/SphereTest.unity | 546 ------------------ .../Scenes/ToBeRemoved/SphereTest.unity.meta | 8 - Assets/Scripts/Models/Friendship.cs | 13 + .../Friendship.cs.meta} | 4 +- Assets/Scripts/Models/Headline.cs | 9 +- Assets/Scripts/Models/Level.cs | 20 +- Assets/Scripts/Models/LevelGenerator.cs | 11 +- Assets/Scripts/Models/LinkedList.cs | 9 - Assets/Scripts/Models/LinkedList.cs.meta | 12 - Assets/Scripts/Models/Person.cs | 57 +- Assets/Scripts/Models/Post.cs | 11 +- Assets/Scripts/Models/PostGenerator.cs | 21 +- Assets/Scripts/Models/Status.cs | 9 +- Assets/Scripts/ToBeRemoved.meta | 9 - Assets/Scripts/ToBeRemoved/TestSphereSR.cs | 38 -- 16 files changed, 95 insertions(+), 691 deletions(-) delete mode 100644 Assets/Scenes/ToBeRemoved.meta delete mode 100644 Assets/Scenes/ToBeRemoved/SphereTest.unity delete mode 100644 Assets/Scenes/ToBeRemoved/SphereTest.unity.meta create mode 100644 Assets/Scripts/Models/Friendship.cs rename Assets/Scripts/{ToBeRemoved/TestSphereSR.cs.meta => Models/Friendship.cs.meta} (76%) delete mode 100644 Assets/Scripts/Models/LinkedList.cs delete mode 100644 Assets/Scripts/Models/LinkedList.cs.meta delete mode 100644 Assets/Scripts/ToBeRemoved.meta delete mode 100644 Assets/Scripts/ToBeRemoved/TestSphereSR.cs diff --git a/Assets/Scenes/ToBeRemoved.meta b/Assets/Scenes/ToBeRemoved.meta deleted file mode 100644 index 164b5d3..0000000 --- a/Assets/Scenes/ToBeRemoved.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: b2151854a8359d64ab13d14fbb5a5be2 -folderAsset: yes -timeCreated: 1439357845 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/ToBeRemoved/SphereTest.unity b/Assets/Scenes/ToBeRemoved/SphereTest.unity deleted file mode 100644 index e71b959..0000000 --- a/Assets/Scenes/ToBeRemoved/SphereTest.unity +++ /dev/null @@ -1,546 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!29 &1 -SceneSettings: - m_ObjectHideFlags: 0 - m_PVSData: - m_PVSObjectsArray: [] - m_PVSPortalsArray: [] - m_OcclusionBakeSettings: - smallestOccluder: 5 - smallestHole: .25 - backfaceThreshold: 100 ---- !u!104 &2 -RenderSettings: - m_ObjectHideFlags: 0 - serializedVersion: 6 - m_Fog: 0 - m_FogColor: {r: .5, g: .5, b: .5, a: 1} - m_FogMode: 3 - m_FogDensity: .00999999978 - m_LinearFogStart: 0 - m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: .211999997, g: .226999998, b: .259000003, a: 1} - m_AmbientEquatorColor: {r: .114, g: .125, b: .133000001, a: 1} - m_AmbientGroundColor: {r: .0469999984, g: .0430000015, b: .0350000001, a: 1} - m_AmbientIntensity: 1 - m_AmbientMode: 0 - m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} - m_HaloStrength: .5 - m_FlareStrength: 1 - m_FlareFadeSpeed: 3 - m_HaloTexture: {fileID: 0} - m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} - m_DefaultReflectionMode: 0 - m_DefaultReflectionResolution: 128 - m_ReflectionBounces: 1 - m_ReflectionIntensity: 1 - m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 0} ---- !u!127 &3 -LevelGameManager: - m_ObjectHideFlags: 0 ---- !u!157 &4 -LightmapSettings: - m_ObjectHideFlags: 0 - serializedVersion: 5 - m_GIWorkflowMode: 0 - m_LightmapsMode: 1 - m_GISettings: - serializedVersion: 2 - m_BounceScale: 1 - m_IndirectOutputScale: 1 - m_AlbedoBoost: 1 - m_TemporalCoherenceThreshold: 1 - m_EnvironmentLightingMode: 0 - m_EnableBakedLightmaps: 1 - m_EnableRealtimeLightmaps: 1 - m_LightmapEditorSettings: - serializedVersion: 3 - m_Resolution: 2 - m_BakeResolution: 40 - m_TextureWidth: 1024 - m_TextureHeight: 1024 - m_AOMaxDistance: 1 - m_Padding: 2 - m_CompAOExponent: 0 - m_LightmapParameters: {fileID: 0} - m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherRayCount: 1024 - m_LightmapSnapshot: {fileID: 0} - m_RuntimeCPUUsage: 25 ---- !u!196 &5 -NavMeshSettings: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_BuildSettings: - serializedVersion: 2 - agentRadius: .5 - agentHeight: 2 - agentSlope: 45 - agentClimb: .400000006 - ledgeDropHeight: 0 - maxJumpAcrossDistance: 0 - accuratePlacement: 0 - minRegionArea: 2 - cellSize: .166666672 - manualCellSize: 0 - m_NavMeshData: {fileID: 0} ---- !u!1 &415419404 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 415419408} - - 33: {fileID: 415419407} - - 135: {fileID: 415419406} - - 23: {fileID: 415419405} - m_Layer: 0 - m_Name: Sphere 2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!23 &415419405 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 415419404} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - m_SubsetIndices: - m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 - m_ProbeAnchor: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_ImportantGI: 0 - m_AutoUVMaxDistance: .5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingOrder: 0 ---- !u!135 &415419406 -SphereCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 415419404} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: .5 - m_Center: {x: 0, y: 0, z: 0} ---- !u!33 &415419407 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 415419404} - m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &415419408 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 415419404} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: .666000009, y: 0, z: 0} - m_LocalScale: {x: .100000001, y: .0400000028, z: .0400000028} - m_Children: [] - m_Father: {fileID: 1907162972} - m_RootOrder: 0 ---- !u!1 &1488643805 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 1488643809} - - 33: {fileID: 1488643808} - - 65: {fileID: 1488643807} - - 23: {fileID: 1488643806} - m_Layer: 0 - m_Name: Cube - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!23 &1488643806 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1488643805} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - m_SubsetIndices: - m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 - m_ProbeAnchor: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_ImportantGI: 0 - m_AutoUVMaxDistance: .5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingOrder: 0 ---- !u!65 &1488643807 -BoxCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1488643805} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!33 &1488643808 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1488643805} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &1488643809 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1488643805} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: .100000001, y: .100000001, z: .100000001} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 3 ---- !u!1 &1498627059 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 1498627064} - - 20: {fileID: 1498627063} - - 92: {fileID: 1498627062} - - 124: {fileID: 1498627061} - - 81: {fileID: 1498627060} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &1498627060 -AudioListener: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1498627059} - m_Enabled: 1 ---- !u!124 &1498627061 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1498627059} - m_Enabled: 1 ---- !u!92 &1498627062 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1498627059} - m_Enabled: 1 ---- !u!20 &1498627063 -Camera: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1498627059} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: .192156866, g: .301960796, b: .474509805, a: .0196078438} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: .300000012 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_HDR: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: .0219999999 ---- !u!4 &1498627064 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1498627059} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 ---- !u!1 &1907162971 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 1907162972} - - 33: {fileID: 1907162975} - - 135: {fileID: 1907162974} - - 23: {fileID: 1907162973} - m_Layer: 0 - m_Name: Sphere 1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1907162972 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1907162971} - 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: 415419408} - m_Father: {fileID: 2052850522} - m_RootOrder: 0 ---- !u!23 &1907162973 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1907162971} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - m_SubsetIndices: - m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 - m_ProbeAnchor: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_ImportantGI: 0 - m_AutoUVMaxDistance: .5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingOrder: 0 ---- !u!135 &1907162974 -SphereCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1907162971} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: .5 - m_Center: {x: 0, y: 0, z: 0} ---- !u!33 &1907162975 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1907162971} - m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &2024512596 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 2024512598} - - 108: {fileID: 2024512597} - m_Layer: 0 - m_Name: Directional Light - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!108 &2024512597 -Light: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2024512596} - m_Enabled: 1 - serializedVersion: 6 - m_Type: 1 - m_Color: {r: 1, g: .956862748, b: .839215696, a: 1} - m_Intensity: 1 - m_Range: 10 - m_SpotAngle: 30 - m_CookieSize: 10 - m_Shadows: - m_Type: 2 - m_Resolution: -1 - m_Strength: 1 - m_Bias: .0500000007 - m_NormalBias: .400000006 - m_Cookie: {fileID: 0} - m_DrawHalo: 0 - m_Flare: {fileID: 0} - m_RenderMode: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_Lightmapping: 4 - m_BounceIntensity: 1 - m_ShadowRadius: 0 - m_ShadowAngle: 0 - m_AreaSize: {x: 1, y: 1} ---- !u!4 &2024512598 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2024512596} - m_LocalRotation: {x: .408217937, y: -.234569728, z: .109381676, w: .875426054} - m_LocalPosition: {x: 0, y: 3, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 1 ---- !u!1 &2052850521 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 2052850522} - - 33: {fileID: 2052850526} - - 135: {fileID: 2052850525} - - 23: {fileID: 2052850524} - - 114: {fileID: 2052850523} - m_Layer: 0 - m_Name: Sphere - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2052850522 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2052850521} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 5, y: 5, z: 5} - m_Children: - - {fileID: 1907162972} - m_Father: {fileID: 0} - m_RootOrder: 2 ---- !u!114 &2052850523 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2052850521} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 02d09cd6e493d23428a012786a958ac1, type: 3} - m_Name: - m_EditorClassIdentifier: - cube: {fileID: 1488643805} - sphere1: {fileID: 1907162971} - sphere2: {fileID: 415419404} - hSpeed: .100000001 - vSpeed: 5 - speed: 15 - spawnTime: .100000001 ---- !u!23 &2052850524 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2052850521} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - m_SubsetIndices: - m_StaticBatchRoot: {fileID: 0} - m_UseLightProbes: 1 - m_ReflectionProbeUsage: 1 - m_ProbeAnchor: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_ImportantGI: 0 - m_AutoUVMaxDistance: .5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingOrder: 0 ---- !u!135 &2052850525 -SphereCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2052850521} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: .5 - m_Center: {x: 0, y: 0, z: 0} ---- !u!33 &2052850526 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2052850521} - m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} diff --git a/Assets/Scenes/ToBeRemoved/SphereTest.unity.meta b/Assets/Scenes/ToBeRemoved/SphereTest.unity.meta deleted file mode 100644 index 2403285..0000000 --- a/Assets/Scenes/ToBeRemoved/SphereTest.unity.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3debd00a4aa77c34d82673eade1ece2e -timeCreated: 1439357845 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Models/Friendship.cs b/Assets/Scripts/Models/Friendship.cs new file mode 100644 index 0000000..3cea223 --- /dev/null +++ b/Assets/Scripts/Models/Friendship.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace DeathBook.Model +{ + class Friendship + { + private Person friend1, friend2; + private int importance; //on a scale from 1 to 100 + } +} diff --git a/Assets/Scripts/ToBeRemoved/TestSphereSR.cs.meta b/Assets/Scripts/Models/Friendship.cs.meta similarity index 76% rename from Assets/Scripts/ToBeRemoved/TestSphereSR.cs.meta rename to Assets/Scripts/Models/Friendship.cs.meta index 19a910e..80fc2b1 100644 --- a/Assets/Scripts/ToBeRemoved/TestSphereSR.cs.meta +++ b/Assets/Scripts/Models/Friendship.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 02d09cd6e493d23428a012786a958ac1 -timeCreated: 1439356645 +guid: c881a81537b33424383f54f890c4f13b +timeCreated: 1439391055 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Scripts/Models/Headline.cs b/Assets/Scripts/Models/Headline.cs index b47abd7..47cc667 100644 --- a/Assets/Scripts/Models/Headline.cs +++ b/Assets/Scripts/Models/Headline.cs @@ -3,7 +3,10 @@ using System.Collections.Generic; using System.Linq; using System.Text; -public class Headline : Post +namespace DeathBook.Model { - private Person author; -} + public class Headline : Post + { + private Person author; + } +} \ No newline at end of file diff --git a/Assets/Scripts/Models/Level.cs b/Assets/Scripts/Models/Level.cs index 60102ad..f3c825e 100644 --- a/Assets/Scripts/Models/Level.cs +++ b/Assets/Scripts/Models/Level.cs @@ -1,10 +1,14 @@ using UnityEngine; -using System.Collections; - -public class Level { - private int points; - private Person[] peeps; - //private Generator gen; - private int gameTime; - private int globalAwareness; +using System.Collections; + +namespace DeathBook.Model +{ + public class Level + { + private int points; + private Person[] peeps; + //private Generator gen; + private int gameTime; + private int globalAwareness; + } } diff --git a/Assets/Scripts/Models/LevelGenerator.cs b/Assets/Scripts/Models/LevelGenerator.cs index 453b263..651cd97 100644 --- a/Assets/Scripts/Models/LevelGenerator.cs +++ b/Assets/Scripts/Models/LevelGenerator.cs @@ -1,10 +1,13 @@ using System.Collections.Generic; -public class LevelGenerator +namespace DeathBook.Model { - public Level generateLevel(/*put stuff here*/) + public class LevelGenerator { - //and here... - return null; + public Level generateLevel(/*put stuff here*/) + { + //and here... + return null; + } } } diff --git a/Assets/Scripts/Models/LinkedList.cs b/Assets/Scripts/Models/LinkedList.cs deleted file mode 100644 index e7f1f9d..0000000 --- a/Assets/Scripts/Models/LinkedList.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -public class LinkedList -{ - //TODO -} diff --git a/Assets/Scripts/Models/LinkedList.cs.meta b/Assets/Scripts/Models/LinkedList.cs.meta deleted file mode 100644 index d6cb4cb..0000000 --- a/Assets/Scripts/Models/LinkedList.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 5daed73a22f6a4349b8209a1c516f0d5 -timeCreated: 1439245587 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Models/Person.cs b/Assets/Scripts/Models/Person.cs index c9ed702..e43288d 100644 --- a/Assets/Scripts/Models/Person.cs +++ b/Assets/Scripts/Models/Person.cs @@ -1,31 +1,34 @@ using UnityEngine; -using System.Collections; - -public class Person -{ - private string name; - private Person[] friendList; - private int friendCount; //lazy - private int timeBetweenPosts; // f = 1/T; - private int connectionTime; - private int disconnectionTime; - private int awarenessLevel; - private bool alive; - - private int happiness; - private bool connected; +using System.Collections; - //private Node node; - - - private bool isConnected(int time) +namespace DeathBook.Model +{ + public class Person { - return disconnectionTime > time && time > connectionTime; + private string name; + private Friendship[] friendList; + private int friendCount; //lazy + private int timeBetweenPosts; // f = 1/T; + private int connectionTime; + private int disconnectionTime; + private int awarenessLevel; + private bool alive; + + private int happiness; + private bool connected; + + //private Node node; + + + private bool isConnected(int time) + { + return disconnectionTime > time && time > connectionTime; + } + + private int calculateWeight() + { + //friendCount * ____ + 1/timeBetweenPosts + } + return 0; + } } - - private int calculateWeight() - { - //friendCount * ____ + 1/timeBetweenPosts + } - return 0; - } -} +} \ No newline at end of file diff --git a/Assets/Scripts/Models/Post.cs b/Assets/Scripts/Models/Post.cs index 1e99035..bc137ac 100644 --- a/Assets/Scripts/Models/Post.cs +++ b/Assets/Scripts/Models/Post.cs @@ -1,8 +1,11 @@ using System.Collections.Generic; -public class Post +namespace DeathBook.Model { - private string text; - private string title; - private string date; + public class Post + { + private string text; + private string title; + private string date; + } } diff --git a/Assets/Scripts/Models/PostGenerator.cs b/Assets/Scripts/Models/PostGenerator.cs index 4faaeb5..692d469 100644 --- a/Assets/Scripts/Models/PostGenerator.cs +++ b/Assets/Scripts/Models/PostGenerator.cs @@ -1,16 +1,19 @@ using System.Collections.Generic; -public class PostGenerator +namespace DeathBook.Model { - public Status generateStatus(/*put stuff here*/) + public class PostGenerator { - //and here... - return null; - } + public Status generateStatus(/*put stuff here*/) + { + //and here... + return null; + } - public Headline generateHeadline(/*put stuff here*/) - { - //and here... - return null; + public Headline generateHeadline(/*put stuff here*/) + { + //and here... + return null; + } } } diff --git a/Assets/Scripts/Models/Status.cs b/Assets/Scripts/Models/Status.cs index 022e122..60b01dd 100644 --- a/Assets/Scripts/Models/Status.cs +++ b/Assets/Scripts/Models/Status.cs @@ -1,6 +1,9 @@ using System.Collections.Generic; -public class Status : Post +namespace DeathBook.Model { - //TODO -} + public class Status : Post + { + //TODO + } +} \ No newline at end of file diff --git a/Assets/Scripts/ToBeRemoved.meta b/Assets/Scripts/ToBeRemoved.meta deleted file mode 100644 index cb9c6f5..0000000 --- a/Assets/Scripts/ToBeRemoved.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: eab4467e4fcb26545843d9f013a368f8 -folderAsset: yes -timeCreated: 1439243466 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/ToBeRemoved/TestSphereSR.cs b/Assets/Scripts/ToBeRemoved/TestSphereSR.cs deleted file mode 100644 index 7ce580a..0000000 --- a/Assets/Scripts/ToBeRemoved/TestSphereSR.cs +++ /dev/null @@ -1,38 +0,0 @@ -using UnityEngine; -using System.Collections; - -public class TestSphereSR : MonoBehaviour { - - public GameObject cube; - public GameObject sphere1, sphere2; - public float hSpeed; - public float vSpeed; - public float speed; - public float spawnTime; - private float lastTime = 0; - - // Use this for initialization - void Start () { - - } - - // Update is called once per frame - void Update () { - float dt = Time.deltaTime; - - lastTime -= dt; - if (lastTime < 0) - { - Spawn(); - lastTime += spawnTime; - } - - this.transform.Rotate(Vector3.up, vSpeed * speed * dt); - sphere1.transform.Rotate(Vector3.forward, hSpeed * speed * dt); - } - - private void Spawn() - { - Instantiate(cube, sphere2.transform.position, Quaternion.identity); - } -}