mirror of
https://github.com/ConjureETS/DeathBook.git
synced 2026-03-24 12:30:59 +00:00
Merge branch 'master' of https://github.com/ConjureETS/DeathBook
Conflicts: Assets/Scripts/Models/Person.cs Signed-off-by: RosimInc <rosim_inc@hotmail.com>
This commit is contained in:
RosimInc
commit
1a05475a6a
@ -26,7 +26,7 @@ Transform:
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 182606}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 5.96046448e-08, y: 0, z: 0}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
@ -89,10 +89,10 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
LinkObj: {fileID: 11495142, guid: fab430cecad80ad4391987a06b550cb7, type: 2}
|
||||
PersonObj: {fileID: 11406500, guid: d4b0e683ea5ec974987ea1f6741b333c, type: 2}
|
||||
NumPeople: 100
|
||||
AvgNumFriends: 10
|
||||
FriendshipLikeliness: .300000012
|
||||
PersonObj: {fileID: 11417564, guid: 7a5b1db47a2c30e419038df40dffa79a, type: 2}
|
||||
NumPeople: 50
|
||||
AvgNumFriends: 8
|
||||
FriendshipLikeliness: .400000006
|
||||
SphereRadius: 7
|
||||
rotationSpeed: .699999988
|
||||
torqueForce: 1
|
||||
|
||||
255
Assets/Prefabs/PersonNode.prefab
Normal file
255
Assets/Prefabs/PersonNode.prefab
Normal file
@ -0,0 +1,255 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &136744
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
serializedVersion: 4
|
||||
m_Component:
|
||||
- 4: {fileID: 496448}
|
||||
- 33: {fileID: 3356096}
|
||||
- 23: {fileID: 2363438}
|
||||
m_Layer: 0
|
||||
m_Name: InternalQuad
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!1 &176828
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
serializedVersion: 4
|
||||
m_Component:
|
||||
- 4: {fileID: 498100}
|
||||
- 33: {fileID: 3387390}
|
||||
- 23: {fileID: 2308108}
|
||||
m_Layer: 0
|
||||
m_Name: xQuad
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!1 &193868
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
serializedVersion: 4
|
||||
m_Component:
|
||||
- 4: {fileID: 410576}
|
||||
- 33: {fileID: 3312470}
|
||||
- 23: {fileID: 2341426}
|
||||
- 114: {fileID: 11417564}
|
||||
- 65: {fileID: 6530066}
|
||||
- 54: {fileID: 5464416}
|
||||
- 65: {fileID: 6542408}
|
||||
m_Layer: 0
|
||||
m_Name: PersonNode
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &410576
|
||||
Transform:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 193868}
|
||||
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: 496448}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
--- !u!4 &496448
|
||||
Transform:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 136744}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: -.0500000007}
|
||||
m_LocalScale: {x: .800000012, y: .800000012, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 498100}
|
||||
m_Father: {fileID: 410576}
|
||||
m_RootOrder: 0
|
||||
--- !u!4 &498100
|
||||
Transform:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 176828}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: -.00999999978}
|
||||
m_LocalScale: {x: 1.5, y: 1.5, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 496448}
|
||||
m_RootOrder: 0
|
||||
--- !u!23 &2308108
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 176828}
|
||||
m_Enabled: 0
|
||||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_Materials:
|
||||
- {fileID: 2100000, guid: 30594d2784eed81489fa210d180bdfce, type: 2}
|
||||
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!23 &2341426
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 193868}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 0
|
||||
m_ReceiveShadows: 1
|
||||
m_Materials:
|
||||
- {fileID: 2100000, guid: edb7e65844a12024aaaa3b294fc34b82, type: 2}
|
||||
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!23 &2363438
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 136744}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 0
|
||||
m_ReceiveShadows: 1
|
||||
m_Materials:
|
||||
- {fileID: 2100000, guid: a38e3d30c8debf940b492fdd18635e28, type: 2}
|
||||
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!33 &3312470
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 193868}
|
||||
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!33 &3356096
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 136744}
|
||||
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!33 &3387390
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 176828}
|
||||
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!54 &5464416
|
||||
Rigidbody:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 193868}
|
||||
serializedVersion: 2
|
||||
m_Mass: 1
|
||||
m_Drag: 0
|
||||
m_AngularDrag: .0500000007
|
||||
m_UseGravity: 0
|
||||
m_IsKinematic: 1
|
||||
m_Interpolate: 0
|
||||
m_Constraints: 0
|
||||
m_CollisionDetection: 0
|
||||
--- !u!65 &6530066
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 193868}
|
||||
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!65 &6542408
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 193868}
|
||||
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!114 &11417564
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 193868}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 91655186257590a4297df8939c1a2256, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
SelectedColor: {r: .441176474, g: .653144062, b: 1, a: 1}
|
||||
StartColor: {r: 0, g: 1, b: 0, a: 1}
|
||||
MiddleColor: {r: 1, g: .921568632, b: .0156862754, a: 1}
|
||||
EndColor: {r: 1, g: 0, b: 0, a: 1}
|
||||
internQuad: {fileID: 2363438}
|
||||
xQuad: {fileID: 2308108}
|
||||
--- !u!1001 &100100000
|
||||
Prefab:
|
||||
m_ObjectHideFlags: 1
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications: []
|
||||
m_RemovedComponents: []
|
||||
m_ParentPrefab: {fileID: 0}
|
||||
m_RootGameObject: {fileID: 193868}
|
||||
m_IsPrefabParent: 1
|
||||
@ -1,6 +1,6 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d4b0e683ea5ec974987ea1f6741b333c
|
||||
timeCreated: 1439489111
|
||||
guid: 7a5b1db47a2c30e419038df40dffa79a
|
||||
timeCreated: 1439521919
|
||||
licenseType: Free
|
||||
NativeFormatImporter:
|
||||
userData:
|
||||
@ -581,15 +581,15 @@ Prefab:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22417254, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: .590630949
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22417254, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22417254, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0
|
||||
value: .999632359
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 11414010, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_Value
|
||||
@ -599,6 +599,26 @@ Prefab:
|
||||
propertyPath: m_Size
|
||||
value: .40900141
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 11458616, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_Sprite
|
||||
value:
|
||||
objectReference: {fileID: 21300000, guid: 0c813218655d0a1468d7269b69deb9d5,
|
||||
type: 3}
|
||||
- target: {fileID: 11402414, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_Sprite
|
||||
value:
|
||||
objectReference: {fileID: 21300000, guid: 0c813218655d0a1468d7269b69deb9d5,
|
||||
type: 3}
|
||||
- target: {fileID: 11450318, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_Sprite
|
||||
value:
|
||||
objectReference: {fileID: 21300000, guid: 0c813218655d0a1468d7269b69deb9d5,
|
||||
type: 3}
|
||||
- target: {fileID: 11469610, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_Sprite
|
||||
value:
|
||||
objectReference: {fileID: 21300000, guid: 0c813218655d0a1468d7269b69deb9d5,
|
||||
type: 3}
|
||||
m_RemovedComponents: []
|
||||
m_ParentPrefab: {fileID: 100100000, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
m_IsPrefabParent: 0
|
||||
@ -1028,7 +1048,7 @@ Prefab:
|
||||
m_Modifications:
|
||||
- target: {fileID: 433422, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 5.96046448e-08
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 433422, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2}
|
||||
propertyPath: m_LocalPosition.y
|
||||
|
||||
@ -159,7 +159,6 @@ Camera:
|
||||
m_OcclusionCulling: 1
|
||||
m_StereoConvergence: 10
|
||||
m_StereoSeparation: .0219999999
|
||||
m_StereoMirrorMode: 0
|
||||
--- !u!4 &61719365
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -259,7 +258,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
LinkObj: {fileID: 11495142, guid: fab430cecad80ad4391987a06b550cb7, type: 2}
|
||||
PersonObj: {fileID: 11406500, guid: d4b0e683ea5ec974987ea1f6741b333c, type: 2}
|
||||
PersonObj: {fileID: 11417564, guid: 7a5b1db47a2c30e419038df40dffa79a, type: 2}
|
||||
NumPeople: 50
|
||||
AvgNumFriends: 8
|
||||
FriendshipLikeliness: .400000006
|
||||
|
||||
@ -87,174 +87,6 @@ NavMeshSettings:
|
||||
cellSize: .166666672
|
||||
manualCellSize: 0
|
||||
m_NavMeshData: {fileID: 0}
|
||||
--- !u!1 &100075500
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
serializedVersion: 4
|
||||
m_Component:
|
||||
- 4: {fileID: 100075504}
|
||||
- 33: {fileID: 100075503}
|
||||
- 64: {fileID: 100075502}
|
||||
- 23: {fileID: 100075501}
|
||||
m_Layer: 0
|
||||
m_Name: InternalQuad
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!23 &100075501
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 100075500}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 0
|
||||
m_ReceiveShadows: 1
|
||||
m_Materials:
|
||||
- {fileID: 2100000, guid: a38e3d30c8debf940b492fdd18635e28, type: 2}
|
||||
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!64 &100075502
|
||||
MeshCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 100075500}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Convex: 0
|
||||
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!33 &100075503
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 100075500}
|
||||
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!4 &100075504
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 100075500}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: -.0500000007}
|
||||
m_LocalScale: {x: .800000012, y: .800000012, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 1622257457}
|
||||
m_Father: {fileID: 338311799}
|
||||
m_RootOrder: 0
|
||||
--- !u!1 &338311798
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
serializedVersion: 4
|
||||
m_Component:
|
||||
- 4: {fileID: 338311799}
|
||||
- 33: {fileID: 338311802}
|
||||
- 64: {fileID: 338311801}
|
||||
- 23: {fileID: 338311800}
|
||||
- 114: {fileID: 338311803}
|
||||
m_Layer: 0
|
||||
m_Name: ExternalQuad
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &338311799
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 338311798}
|
||||
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: 100075504}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 2
|
||||
--- !u!23 &338311800
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 338311798}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 0
|
||||
m_ReceiveShadows: 1
|
||||
m_Materials:
|
||||
- {fileID: 2100000, guid: edb7e65844a12024aaaa3b294fc34b82, type: 2}
|
||||
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!64 &338311801
|
||||
MeshCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 338311798}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Convex: 0
|
||||
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!33 &338311802
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 338311798}
|
||||
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!114 &338311803
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 338311798}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 7bf20fbc55af1c64f8459d6b751dbf59, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
awareness: 0
|
||||
startingColor: {r: 0, g: 1, b: 0, a: 0}
|
||||
middleColor: {r: 1, g: 1, b: 0, a: 0}
|
||||
endColor: {r: 1, g: 0, b: 0, a: 0}
|
||||
isAlive: 0
|
||||
isOnline: 0
|
||||
internQuad: {fileID: 100075500}
|
||||
xQuad: {fileID: 1622257453}
|
||||
--- !u!1 &621981424
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -327,7 +159,6 @@ Camera:
|
||||
m_OcclusionCulling: 1
|
||||
m_StereoConvergence: 10
|
||||
m_StereoSeparation: .0219999999
|
||||
m_StereoMirrorMode: 0
|
||||
--- !u!4 &621981429
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -400,76 +231,45 @@ Transform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 1
|
||||
--- !u!1 &1622257453
|
||||
GameObject:
|
||||
--- !u!1001 &1869217960
|
||||
Prefab:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
serializedVersion: 4
|
||||
m_Component:
|
||||
- 4: {fileID: 1622257457}
|
||||
- 33: {fileID: 1622257456}
|
||||
- 64: {fileID: 1622257455}
|
||||
- 23: {fileID: 1622257454}
|
||||
m_Layer: 0
|
||||
m_Name: xQuad
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!23 &1622257454
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 1622257453}
|
||||
m_Enabled: 0
|
||||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_Materials:
|
||||
- {fileID: 2100000, guid: 30594d2784eed81489fa210d180bdfce, type: 2}
|
||||
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!64 &1622257455
|
||||
MeshCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 1622257453}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Convex: 0
|
||||
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!33 &1622257456
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 1622257453}
|
||||
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!4 &1622257457
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 1622257453}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: -.00999999978}
|
||||
m_LocalScale: {x: 1.5, y: 1.5, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 100075504}
|
||||
m_RootOrder: 0
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 410576, guid: 7a5b1db47a2c30e419038df40dffa79a, type: 2}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 410576, guid: 7a5b1db47a2c30e419038df40dffa79a, type: 2}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 410576, guid: 7a5b1db47a2c30e419038df40dffa79a, type: 2}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 410576, guid: 7a5b1db47a2c30e419038df40dffa79a, type: 2}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 410576, guid: 7a5b1db47a2c30e419038df40dffa79a, type: 2}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 410576, guid: 7a5b1db47a2c30e419038df40dffa79a, type: 2}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 410576, guid: 7a5b1db47a2c30e419038df40dffa79a, type: 2}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 410576, guid: 7a5b1db47a2c30e419038df40dffa79a, type: 2}
|
||||
propertyPath: m_RootOrder
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_ParentPrefab: {fileID: 100100000, guid: 7a5b1db47a2c30e419038df40dffa79a, type: 2}
|
||||
m_IsPrefabParent: 0
|
||||
|
||||
@ -32,6 +32,11 @@ namespace DeathBook.Model
|
||||
get { return alive; }
|
||||
}
|
||||
|
||||
public int AwarenessLevel
|
||||
{
|
||||
get { return awarenessLevel; }
|
||||
}
|
||||
|
||||
public List<Friendship> FriendList
|
||||
{
|
||||
get { return friendList; }
|
||||
@ -42,10 +47,10 @@ namespace DeathBook.Model
|
||||
get { return numFriends; }
|
||||
}
|
||||
|
||||
public bool Connected
|
||||
{
|
||||
get { return connected; }
|
||||
}
|
||||
public bool Online
|
||||
{
|
||||
get { return connected; }
|
||||
}
|
||||
|
||||
public Person(int id, Vector3 pos)
|
||||
{
|
||||
@ -53,7 +58,7 @@ namespace DeathBook.Model
|
||||
initialPosition = pos;
|
||||
alive = true;
|
||||
|
||||
// Temporary
|
||||
// TODO Use names from db
|
||||
name = String.Format("Firstname{0} Lastname{0}", id);
|
||||
}
|
||||
|
||||
|
||||
@ -6,7 +6,7 @@ using DeathBook.Model;
|
||||
public class NetworkingSphere : MonoBehaviour
|
||||
{
|
||||
public FriendshipLink LinkObj;
|
||||
public PersonTest PersonObj;
|
||||
public PersonNode PersonObj;
|
||||
public int NumPeople = 50;
|
||||
public int AvgNumFriends = 20;
|
||||
public float FriendshipLikeliness = 0.4f;
|
||||
@ -21,10 +21,10 @@ public class NetworkingSphere : MonoBehaviour
|
||||
private Vector3 delta = new Vector3();
|
||||
private Rigidbody rb;
|
||||
|
||||
private PersonTest[] peopleNodes;
|
||||
private PersonNode[] peopleNodes;
|
||||
//TODO private Friendship[] friendships;
|
||||
|
||||
private PersonTest _selectedNode;
|
||||
private PersonNode _selectedNode;
|
||||
|
||||
void Awake()
|
||||
{
|
||||
@ -38,6 +38,9 @@ public class NetworkingSphere : MonoBehaviour
|
||||
|
||||
void Update()
|
||||
{
|
||||
//TEMPORARY QUICK FIX: Even though we are never moving the sphere, it starts moving as soon as it stops rotating
|
||||
transform.position = Vector3.zero;
|
||||
|
||||
Vector3 screenMousePos = Input.mousePosition;
|
||||
|
||||
screenMousePos.z = transform.position.z - Camera.main.transform.position.z;
|
||||
@ -84,13 +87,13 @@ public class NetworkingSphere : MonoBehaviour
|
||||
|
||||
private void InstantiateNodes(Level lvl)
|
||||
{
|
||||
peopleNodes = new PersonTest[lvl.people.Count];
|
||||
peopleNodes = new PersonNode[lvl.people.Count];
|
||||
|
||||
for (int i = 0; i < lvl.people.Count; i++)
|
||||
{
|
||||
Person person = lvl.people[i];
|
||||
|
||||
PersonTest pInst = Instantiate(PersonObj, person.initialPosition, Quaternion.identity) as PersonTest;
|
||||
PersonNode pInst = Instantiate(PersonObj, person.initialPosition, Quaternion.identity) as PersonNode;
|
||||
|
||||
pInst.OnClicked += OnNodeClicked;
|
||||
|
||||
@ -101,7 +104,7 @@ public class NetworkingSphere : MonoBehaviour
|
||||
}
|
||||
}
|
||||
|
||||
private void OnNodeClicked(PersonTest node)
|
||||
private void OnNodeClicked(PersonNode node)
|
||||
{
|
||||
if (_selectedNode != null)
|
||||
{
|
||||
|
||||
@ -21,9 +21,10 @@ public class PersonDetailsPanel : MonoBehaviour, IObserver
|
||||
_model.UnSubscribe(this);
|
||||
}
|
||||
|
||||
_model = model;
|
||||
|
||||
_model.Subscribe(this);
|
||||
|
||||
_model = model;
|
||||
UpdateInfo();
|
||||
}
|
||||
|
||||
|
||||
154
Assets/Scripts/PersonNode.cs
Normal file
154
Assets/Scripts/PersonNode.cs
Normal file
@ -0,0 +1,154 @@
|
||||
using UnityEngine;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using DeathBook.Model;
|
||||
using System;
|
||||
|
||||
[RequireComponent(typeof(Collider))]
|
||||
public class PersonNode : MonoBehaviour, IObserver
|
||||
{
|
||||
public Action<PersonNode> OnClicked;
|
||||
|
||||
public Color SelectedColor = Color.blue;
|
||||
|
||||
public Color StartColor = Color.green;
|
||||
public Color MiddleColor = Color.yellow;
|
||||
public Color EndColor = Color.red;
|
||||
|
||||
public Renderer internQuad;
|
||||
public Renderer xQuad;
|
||||
|
||||
private List<FriendshipLink> _links;
|
||||
private bool _highlighted = false;
|
||||
private bool _selected = false;
|
||||
|
||||
private Person _model;
|
||||
private Renderer _renderer;
|
||||
private Transform _transform;
|
||||
|
||||
public Person Model
|
||||
{
|
||||
get { return _model; }
|
||||
set
|
||||
{
|
||||
_model = value;
|
||||
_model.Subscribe(this);
|
||||
UpdateInfo();
|
||||
}
|
||||
}
|
||||
|
||||
void Awake()
|
||||
{
|
||||
_links = new List<FriendshipLink>();
|
||||
_renderer = GetComponent<Renderer>();
|
||||
_transform = GetComponent<Transform>();
|
||||
}
|
||||
|
||||
void Update()
|
||||
{
|
||||
// Find another way to do it if it lags to much
|
||||
_transform.LookAt(new Vector3(_transform.position.x, _transform.position.y, _transform.position.z + 1));
|
||||
}
|
||||
|
||||
public void AddLink(FriendshipLink link)
|
||||
{
|
||||
_links.Add(link);
|
||||
}
|
||||
|
||||
public void Select(bool state)
|
||||
{
|
||||
_selected = state;
|
||||
UpdateLinks(state);
|
||||
|
||||
if (state)
|
||||
{
|
||||
_renderer.material.color = SelectedColor;
|
||||
}
|
||||
else
|
||||
{
|
||||
UpdateInfo();
|
||||
}
|
||||
}
|
||||
|
||||
private void UpdateLinks(bool state)
|
||||
{
|
||||
foreach (FriendshipLink link in _links)
|
||||
{
|
||||
link.Highlight(state, 1f);
|
||||
}
|
||||
}
|
||||
|
||||
public void Notify()
|
||||
{
|
||||
UpdateInfo();
|
||||
}
|
||||
|
||||
private void UpdateInfo()
|
||||
{
|
||||
//If dead -> set offline until all friends are aware, then add a big red X to profile pic
|
||||
if (_model.Alive)
|
||||
{
|
||||
xQuad.enabled = false;
|
||||
SetColors();
|
||||
}
|
||||
else
|
||||
{
|
||||
xQuad.enabled = true;
|
||||
gameObject.GetComponent<Renderer>().material.color = new Color32(50, 50, 50, 1);
|
||||
UpdateLinks(false);
|
||||
}
|
||||
}
|
||||
|
||||
private void SetColors()
|
||||
{
|
||||
//set greyed out for offline
|
||||
if (_model.Online)
|
||||
{
|
||||
internQuad.material.color = new Color32(255, 255, 255, 1);
|
||||
}
|
||||
else
|
||||
{
|
||||
internQuad.material.color = new Color32(80, 80, 80, 1);
|
||||
}
|
||||
|
||||
if (_model.AwarenessLevel < 0.5)
|
||||
{
|
||||
gameObject.GetComponent<Renderer>().material.color = Color.Lerp(StartColor, MiddleColor, _model.AwarenessLevel * 2);
|
||||
}
|
||||
else
|
||||
{
|
||||
gameObject.GetComponent<Renderer>().material.color = Color.Lerp(MiddleColor, EndColor, _model.AwarenessLevel * 2 - 1);
|
||||
}
|
||||
}
|
||||
|
||||
void OnMouseEnter()
|
||||
{
|
||||
if (!_selected && !_highlighted)
|
||||
{
|
||||
UpdateLinks(true);
|
||||
}
|
||||
|
||||
_highlighted = true;
|
||||
}
|
||||
|
||||
void OnMouseExit()
|
||||
{
|
||||
if (!_selected)
|
||||
{
|
||||
UpdateLinks(false);
|
||||
}
|
||||
|
||||
_highlighted = false;
|
||||
}
|
||||
|
||||
void OnMouseDown()
|
||||
{
|
||||
// The sphere should be subscribed to this event and update the data accordingly
|
||||
if (OnClicked != null)
|
||||
{
|
||||
OnClicked(this);
|
||||
}
|
||||
|
||||
Debug.Log("clicked");
|
||||
}
|
||||
}
|
||||
@ -1,85 +0,0 @@
|
||||
using UnityEngine;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using DeathBook.Model;
|
||||
using System;
|
||||
|
||||
[RequireComponent(typeof(Collider))]
|
||||
[RequireComponent(typeof(Renderer))]
|
||||
public class PersonTest : MonoBehaviour
|
||||
{
|
||||
public Action<PersonTest> OnClicked;
|
||||
|
||||
public Color NormalColor;
|
||||
public Color SelectedColor;
|
||||
|
||||
private List<FriendshipLink> _links;
|
||||
private bool _highlighted = false;
|
||||
private bool _selected = false;
|
||||
|
||||
private Person _model;
|
||||
private Renderer _renderer;
|
||||
|
||||
public Person Model
|
||||
{
|
||||
set { _model = value; }
|
||||
get { return _model; }
|
||||
}
|
||||
|
||||
void Awake()
|
||||
{
|
||||
_links = new List<FriendshipLink>();
|
||||
_renderer = GetComponent<Renderer>();
|
||||
}
|
||||
|
||||
public void AddLink(FriendshipLink link)
|
||||
{
|
||||
_links.Add(link);
|
||||
}
|
||||
|
||||
public void Select(bool state)
|
||||
{
|
||||
_selected = state;
|
||||
UpdateLinks(state);
|
||||
_renderer.material.color = state ? SelectedColor : NormalColor;
|
||||
}
|
||||
|
||||
private void UpdateLinks(bool state)
|
||||
{
|
||||
foreach (FriendshipLink link in _links)
|
||||
{
|
||||
link.Highlight(state, 1f);
|
||||
}
|
||||
}
|
||||
|
||||
void OnMouseEnter()
|
||||
{
|
||||
if (!_selected && !_highlighted)
|
||||
{
|
||||
UpdateLinks(true);
|
||||
}
|
||||
|
||||
_highlighted = true;
|
||||
}
|
||||
|
||||
void OnMouseExit()
|
||||
{
|
||||
if (!_selected)
|
||||
{
|
||||
UpdateLinks(false);
|
||||
}
|
||||
|
||||
_highlighted = false;
|
||||
}
|
||||
|
||||
void OnMouseDown()
|
||||
{
|
||||
// The sphere should be subscribed to this event and update the data accordingly
|
||||
if (OnClicked != null)
|
||||
{
|
||||
OnClicked(this);
|
||||
}
|
||||
|
||||
Debug.Log("clicked");
|
||||
}
|
||||
}
|
||||
@ -1,120 +0,0 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &140654
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
serializedVersion: 4
|
||||
m_Component:
|
||||
- 4: {fileID: 497334}
|
||||
- 33: {fileID: 3385696}
|
||||
- 135: {fileID: 13525706}
|
||||
- 23: {fileID: 2372112}
|
||||
- 114: {fileID: 11406500}
|
||||
- 54: {fileID: 5488610}
|
||||
m_Layer: 0
|
||||
m_Name: PersonTest
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &497334
|
||||
Transform:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 140654}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -1.38999999, y: -.0725698322, z: -1.32421875}
|
||||
m_LocalScale: {x: .5, y: .5, z: .5}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
--- !u!23 &2372112
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 140654}
|
||||
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!33 &3385696
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 140654}
|
||||
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!54 &5488610
|
||||
Rigidbody:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 140654}
|
||||
serializedVersion: 2
|
||||
m_Mass: 1
|
||||
m_Drag: 0
|
||||
m_AngularDrag: .0500000007
|
||||
m_UseGravity: 0
|
||||
m_IsKinematic: 1
|
||||
m_Interpolate: 0
|
||||
m_Constraints: 0
|
||||
m_CollisionDetection: 0
|
||||
--- !u!114 &11406500
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 140654}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 91655186257590a4297df8939c1a2256, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
SelectedColor: {r: 1, g: 0, b: 0, a: 1}
|
||||
--- !u!135 &13525706
|
||||
SphereCollider:
|
||||
m_ObjectHideFlags: 1
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 100100000}
|
||||
m_GameObject: {fileID: 140654}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Radius: .5
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
--- !u!1001 &100100000
|
||||
Prefab:
|
||||
m_ObjectHideFlags: 1
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 0}
|
||||
propertyPath: m_Enabled
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_ParentPrefab: {fileID: 0}
|
||||
m_RootGameObject: {fileID: 140654}
|
||||
m_IsPrefabParent: 1
|
||||
@ -6,7 +6,7 @@ using DeathBook.Model;
|
||||
public class SphereSR : MonoBehaviour
|
||||
{
|
||||
public FriendshipLink LinkObj;
|
||||
public PersonTest PersonObj;
|
||||
public PersonNode PersonObj;
|
||||
public int NumPeople = 50;
|
||||
public int AvgNumFriends = 20;
|
||||
public float FriendshipLikeliness = 0.4f;
|
||||
@ -18,7 +18,7 @@ public class SphereSR : MonoBehaviour
|
||||
private Vector3 delta = new Vector3();
|
||||
private Rigidbody rb;
|
||||
|
||||
private PersonTest[] peopleNodes;
|
||||
private PersonNode[] peopleNodes;
|
||||
//TODO private Friendship[] friendships;
|
||||
private GameObject[] nodes;
|
||||
|
||||
@ -83,13 +83,13 @@ public class SphereSR : MonoBehaviour
|
||||
|
||||
private void InstantiateNodes(Level lvl)
|
||||
{
|
||||
peopleNodes = new PersonTest[lvl.people.Count];
|
||||
peopleNodes = new PersonNode[lvl.people.Count];
|
||||
|
||||
int ctr = 0;
|
||||
foreach (Person p in lvl.people)
|
||||
{
|
||||
|
||||
PersonTest pInst = Instantiate(PersonObj, p.initialPosition, Quaternion.identity) as PersonTest;
|
||||
PersonNode pInst = Instantiate(PersonObj, p.initialPosition, Quaternion.identity) as PersonNode;
|
||||
|
||||
pInst.transform.parent = this.transform;
|
||||
|
||||
|
||||
@ -3,14 +3,17 @@
|
||||
--- !u!129 &1
|
||||
PlayerSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 7
|
||||
serializedVersion: 6
|
||||
AndroidProfiler: 0
|
||||
defaultScreenOrientation: 4
|
||||
targetDevice: 2
|
||||
targetGlesGraphics: -1
|
||||
targetIOSGraphics: -1
|
||||
targetResolution: 0
|
||||
accelerometerFrequency: 60
|
||||
companyName: DefaultCompany
|
||||
productName: DeathBook
|
||||
cloudProjectId:
|
||||
defaultCursor: {fileID: 0}
|
||||
cursorHotspot: {x: 0, y: 0}
|
||||
m_ShowUnitySplashScreen: 1
|
||||
@ -23,6 +26,7 @@ PlayerSettings:
|
||||
m_ActiveColorSpace: 0
|
||||
m_MTRendering: 1
|
||||
m_MobileMTRendering: 0
|
||||
m_UseDX11: 1
|
||||
m_Stereoscopic3D: 0
|
||||
iosShowActivityIndicatorOnLoading: -1
|
||||
androidShowActivityIndicatorOnLoading: -1
|
||||
@ -77,7 +81,6 @@ PlayerSettings:
|
||||
metroEnableIndependentInputSource: 0
|
||||
metroEnableLowLatencyPresentationAPI: 0
|
||||
xboxOneDisableKinectGpuReservation: 0
|
||||
virtualRealitySupported: 0
|
||||
productGUID: 402278fad2098ce4eab29439139ae9ad
|
||||
AndroidBundleVersionCode: 1
|
||||
AndroidMinSdkVersion: 9
|
||||
@ -120,7 +123,6 @@ PlayerSettings:
|
||||
iOSLaunchScreenCustomXibPath:
|
||||
AndroidTargetDevice: 0
|
||||
AndroidSplashScreenScale: 0
|
||||
androidSplashScreen: {fileID: 0}
|
||||
AndroidKeystoreName:
|
||||
AndroidKeyaliasName:
|
||||
AndroidTVCompatibility: 1
|
||||
@ -134,7 +136,6 @@ PlayerSettings:
|
||||
resolutionDialogBanner: {fileID: 0}
|
||||
m_BuildTargetIcons: []
|
||||
m_BuildTargetBatching: []
|
||||
m_BuildTargetGraphicsAPIs: []
|
||||
webPlayerTemplate: APPLICATION:Default
|
||||
m_TemplateCustomTags: {}
|
||||
actionOnDotNetUnhandledException: 1
|
||||
@ -196,7 +197,6 @@ PlayerSettings:
|
||||
ps4ApplicationParam2: 0
|
||||
ps4ApplicationParam3: 0
|
||||
ps4ApplicationParam4: 0
|
||||
ps4GarlicHeapSize: 2048
|
||||
ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ
|
||||
ps4pnSessions: 1
|
||||
ps4pnPresence: 1
|
||||
@ -339,7 +339,8 @@ PlayerSettings:
|
||||
blackberrySquareSplashScreen: {fileID: 0}
|
||||
tizenProductDescription:
|
||||
tizenProductURL:
|
||||
tizenSigningProfileName:
|
||||
tizenCertificatePath:
|
||||
tizenCertificatePassword:
|
||||
tizenGPSPermissions: 0
|
||||
tizenMicrophonePermissions: 0
|
||||
stvDeviceAddress:
|
||||
@ -397,9 +398,4 @@ PlayerSettings:
|
||||
- WebGL::template
|
||||
WebGL::emscriptenArgs:
|
||||
WebGL::template: APPLICATION:Default
|
||||
firstStreamedSceneWithResources: 0
|
||||
cloudProjectId:
|
||||
projectId:
|
||||
projectName:
|
||||
organizationId:
|
||||
cloudEnabled: 0
|
||||
firstStreamedLevelWithResources: 0
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
m_EditorVersion: 5.1.1f1
|
||||
m_EditorVersion: 5.0.2f1
|
||||
m_StandardAssetsVersion: 0
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user