mirror of
https://github.com/ConjureETS/DeathBook.git
synced 2026-03-24 04:20:58 +00:00
Merge branch 'master' of https://github.com/ConjureETS/DeathBook
Conflicts: Assets/Scenes/Gameplay.unity
This commit is contained in:
Patrice Vignola
commit
025ee107eb
@ -94,7 +94,7 @@ MonoBehaviour:
|
||||
levelOptions:
|
||||
NumPeople: 50
|
||||
AvgNumFriends: 8
|
||||
FriendshipLikeliness: .400000006
|
||||
FriendshipLikeliness: .600000024
|
||||
SphereRadius: 7
|
||||
rotationSpeed: .699999988
|
||||
torqueForce: 1
|
||||
|
||||
@ -136,7 +136,7 @@ Camera:
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_ClearFlags: 2
|
||||
m_BackGroundColor: {r: .847058833, g: .874509811, b: .917647064, a: .0196078438}
|
||||
m_BackGroundColor: {r: .0994694307, g: .150959909, b: .258823544, a: 1}
|
||||
m_NormalizedViewPortRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
@ -196,8 +196,8 @@ RectTransform:
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 1011525171}
|
||||
- {fileID: 941214653}
|
||||
- {fileID: 1728657169}
|
||||
- {fileID: 919656932}
|
||||
- {fileID: 403748470}
|
||||
- {fileID: 350457696}
|
||||
- {fileID: 906703074}
|
||||
@ -651,16 +651,16 @@ CanvasRenderer:
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 906703073}
|
||||
--- !u!1 &941214652
|
||||
--- !u!1 &919656931
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
serializedVersion: 4
|
||||
m_Component:
|
||||
- 224: {fileID: 941214653}
|
||||
- 222: {fileID: 941214655}
|
||||
- 114: {fileID: 941214654}
|
||||
- 224: {fileID: 919656932}
|
||||
- 222: {fileID: 919656934}
|
||||
- 114: {fileID: 919656933}
|
||||
m_Layer: 5
|
||||
m_Name: MaskBot
|
||||
m_TagString: Untagged
|
||||
@ -668,12 +668,12 @@ GameObject:
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &941214653
|
||||
--- !u!224 &919656932
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 941214652}
|
||||
m_GameObject: {fileID: 919656931}
|
||||
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}
|
||||
@ -685,12 +685,12 @@ RectTransform:
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: .5, y: .5}
|
||||
--- !u!114 &941214654
|
||||
--- !u!114 &919656933
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 941214652}
|
||||
m_GameObject: {fileID: 919656931}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
|
||||
@ -706,73 +706,12 @@ MonoBehaviour:
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
--- !u!222 &941214655
|
||||
--- !u!222 &919656934
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 941214652}
|
||||
--- !u!1 &1011525170
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
serializedVersion: 4
|
||||
m_Component:
|
||||
- 224: {fileID: 1011525171}
|
||||
- 222: {fileID: 1011525173}
|
||||
- 114: {fileID: 1011525172}
|
||||
m_Layer: 5
|
||||
m_Name: MaskTop
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1011525171
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 1011525170}
|
||||
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: []
|
||||
m_Father: {fileID: 122634401}
|
||||
m_RootOrder: 0
|
||||
m_AnchorMin: {x: 0, y: .367000014}
|
||||
m_AnchorMax: {x: .5, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -1.90734863e-06}
|
||||
m_SizeDelta: {x: 0, y: -3.81469727e-06}
|
||||
m_Pivot: {x: .5, y: .5}
|
||||
--- !u!114 &1011525172
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 1011525170}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 2100000, guid: c22c190fd4877414fa5e862acdae3e64, type: 2}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_Sprite: {fileID: 0}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
--- !u!222 &1011525173
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 1011525170}
|
||||
m_GameObject: {fileID: 919656931}
|
||||
--- !u!1 &1126063559
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -833,16 +772,179 @@ Transform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 1
|
||||
--- !u!1001 &1197925313
|
||||
Prefab:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 906703074}
|
||||
m_Modifications:
|
||||
- target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_RootOrder
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: .0299999993
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: .0299999993
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: .970000029
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: .970000029
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_Pivot.x
|
||||
value: .5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_Pivot.y
|
||||
value: .5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22417254, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22417254, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22417254, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 11414010, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_Value
|
||||
value: .999384761
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 11414010, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_Size
|
||||
value: .420931697
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 11476684, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: FriendPicture
|
||||
value:
|
||||
objectReference: {fileID: 11469406, guid: 16a1d168f1ef75b4690435675a9e69b0,
|
||||
type: 2}
|
||||
- target: {fileID: 22454288, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: .857309759
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22454288, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22454288, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22454288, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22454288, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22454288, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22454288, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: .465619415
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22454288, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22483690, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22483690, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22483690, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22483690, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: .450309694
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22483690, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22483690, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_ParentPrefab: {fileID: 100100000, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
m_IsPrefabParent: 0
|
||||
--- !u!224 &1197925314 stripped
|
||||
RectTransform:
|
||||
m_PrefabParentObject: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832,
|
||||
type: 2}
|
||||
m_PrefabInternal: {fileID: 1582401601}
|
||||
m_PrefabInternal: {fileID: 1197925313}
|
||||
--- !u!114 &1197925315 stripped
|
||||
MonoBehaviour:
|
||||
m_PrefabParentObject: {fileID: 11476684, guid: c993e87661906234fba410e55ed66832,
|
||||
type: 2}
|
||||
m_PrefabInternal: {fileID: 1582401601}
|
||||
m_PrefabInternal: {fileID: 1197925313}
|
||||
m_Script: {fileID: 11500000, guid: 88fb1885d6f8fd6409e3866b7707a12a, type: 3}
|
||||
--- !u!1 &1366676552
|
||||
GameObject:
|
||||
@ -973,152 +1075,67 @@ CanvasRenderer:
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 1411243505}
|
||||
--- !u!1001 &1582401601
|
||||
Prefab:
|
||||
--- !u!1 &1728657168
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 906703074}
|
||||
m_Modifications:
|
||||
- target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_RootOrder
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: .0299999993
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: .0299999993
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: .970000029
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: .970000029
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_Pivot.x
|
||||
value: .5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22436630, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_Pivot.y
|
||||
value: .5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22417254, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22417254, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22454288, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: .862309754
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22454288, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22454288, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22454288, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22454288, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22454288, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22454288, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: .515309691
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22454288, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22483690, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22483690, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: .515309691
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22483690, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22483690, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22483690, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22483690, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_ParentPrefab: {fileID: 100100000, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
m_IsPrefabParent: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
serializedVersion: 4
|
||||
m_Component:
|
||||
- 224: {fileID: 1728657169}
|
||||
- 222: {fileID: 1728657171}
|
||||
- 114: {fileID: 1728657170}
|
||||
m_Layer: 5
|
||||
m_Name: MaskTop
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1728657169
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 1728657168}
|
||||
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: []
|
||||
m_Father: {fileID: 122634401}
|
||||
m_RootOrder: 0
|
||||
m_AnchorMin: {x: 0, y: .367000014}
|
||||
m_AnchorMax: {x: .455000013, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -1.90734863e-06}
|
||||
m_SizeDelta: {x: 0, y: -3.81469727e-06}
|
||||
m_Pivot: {x: .5, y: .5}
|
||||
--- !u!114 &1728657170
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 1728657168}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 2100000, guid: c22c190fd4877414fa5e862acdae3e64, type: 2}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_Sprite: {fileID: 0}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
--- !u!222 &1728657171
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 1728657168}
|
||||
--- !u!1 &1858163984
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@ -159,7 +159,6 @@ Camera:
|
||||
m_OcclusionCulling: 1
|
||||
m_StereoConvergence: 10
|
||||
m_StereoSeparation: .0219999999
|
||||
m_StereoMirrorMode: 0
|
||||
--- !u!4 &61719365
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -733,15 +732,15 @@ Prefab:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 22417254, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0
|
||||
value: .594142556
|
||||
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: 1
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_ParentPrefab: {fileID: 100100000, guid: c993e87661906234fba410e55ed66832, type: 2}
|
||||
@ -923,7 +922,6 @@ MonoBehaviour:
|
||||
m_SubmitButton: Submit
|
||||
m_CancelButton: Cancel
|
||||
m_InputActionsPerSecond: 10
|
||||
m_RepeatDelay: .5
|
||||
m_AllowActivationOnMobileDevice: 0
|
||||
--- !u!114 &1999982086
|
||||
MonoBehaviour:
|
||||
@ -1056,6 +1054,20 @@ Prefab:
|
||||
propertyPath: DetailsPanel
|
||||
value:
|
||||
objectReference: {fileID: 724043967}
|
||||
- target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2}
|
||||
propertyPath: gameObjects.LinkObj
|
||||
value:
|
||||
objectReference: {fileID: 11495142, guid: fab430cecad80ad4391987a06b550cb7,
|
||||
type: 2}
|
||||
- target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2}
|
||||
propertyPath: gameObjects.PersonObj
|
||||
value:
|
||||
objectReference: {fileID: 11417564, guid: 7a5b1db47a2c30e419038df40dffa79a,
|
||||
type: 2}
|
||||
- target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2}
|
||||
propertyPath: levelOptions.SphereRadius
|
||||
value: 7
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_ParentPrefab: {fileID: 100100000, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2}
|
||||
m_IsPrefabParent: 0
|
||||
|
||||
@ -9,8 +9,10 @@ public class Link : MonoBehaviour, IObserver
|
||||
private float highlightAlpha = 0.8f;
|
||||
private float defaultAlpha = 0.5f;
|
||||
|
||||
private Color currentDefaultColor;
|
||||
private Color currentHighlightColor;
|
||||
private Color color;
|
||||
|
||||
private Color baseColor = new Color(0.3f, 0.7f, 1f);
|
||||
private Color inactiveColor = new Color(0.15f, 0.15f, 0.05f);
|
||||
|
||||
private static float defaultScale = 0.03f;
|
||||
private float hightlightScale = 0.2f;
|
||||
@ -40,7 +42,7 @@ public class Link : MonoBehaviour, IObserver
|
||||
model.Subscribe(this);
|
||||
|
||||
//Make it between 0.1 and 0.4
|
||||
GetColors(Model.Awareness);
|
||||
GetColors();
|
||||
hightlightScale = Model.Importance * 0.3f + 0.1f;
|
||||
Highlight(false);
|
||||
}
|
||||
@ -66,8 +68,10 @@ public class Link : MonoBehaviour, IObserver
|
||||
|
||||
public void Notify()
|
||||
{
|
||||
GetColors(Model.Awareness);
|
||||
GetColors();
|
||||
UpdateBeam();
|
||||
if (Model.KillCount == 2)
|
||||
hightlightScale = 0.1f;
|
||||
//TODO SR
|
||||
}
|
||||
|
||||
@ -115,29 +119,23 @@ public class Link : MonoBehaviour, IObserver
|
||||
UpdateBeam();
|
||||
}
|
||||
|
||||
private void GetColors(float level)
|
||||
private void GetColors()
|
||||
{
|
||||
//If level is 0.0, green [0,1,0].
|
||||
//If level is 0.5, yellow [1,1,0].
|
||||
//If level is 1.0, red [1,0,0].
|
||||
|
||||
float r = 1f;
|
||||
float g = 1f;
|
||||
|
||||
if (level < 0.5f)
|
||||
r = Mathf.Lerp(0, 1, level*2);
|
||||
if (Model.KillCount == 0)
|
||||
color = baseColor;
|
||||
else if (Model.KillCount == 2)
|
||||
color = inactiveColor;
|
||||
else
|
||||
g = Mathf.Lerp(1, 0, level * 2 - 1);
|
||||
|
||||
currentDefaultColor = new Color(r, g, 0f, defaultAlpha);
|
||||
currentHighlightColor = new Color(r, g, 0f, highlightAlpha);
|
||||
color = new Color(1f, Mathf.Lerp(1, 0, Model.Awareness), 0f);
|
||||
}
|
||||
|
||||
private void UpdateBeam()
|
||||
{
|
||||
float width = isHighlighted ? hightlightScale : defaultScale;
|
||||
BeamLine.SetWidth(width, width);
|
||||
|
||||
color.a = isHighlighted ? highlightAlpha : defaultAlpha;
|
||||
|
||||
_renderer.material.SetColor("_TintColor", isHighlighted ? currentHighlightColor : currentDefaultColor);
|
||||
_renderer.material.SetColor("_TintColor", color);
|
||||
}
|
||||
}
|
||||
|
||||
@ -27,6 +27,12 @@ namespace DeathBook.Model
|
||||
this.link = link;
|
||||
}
|
||||
|
||||
public void NotifyFriendWasKilled()
|
||||
{
|
||||
Link.KillCount++;
|
||||
Self.NotifyFriendWasKilled(this);
|
||||
}
|
||||
|
||||
public void Update(float deltaTime)
|
||||
{
|
||||
if (noticedDeath)
|
||||
|
||||
@ -20,6 +20,13 @@ namespace DeathBook.Model
|
||||
set { awareness = value; NotifyObservers(); }
|
||||
}
|
||||
|
||||
private int killCount = 0; //Number of people dead in this relationship
|
||||
public int KillCount
|
||||
{
|
||||
get { return killCount; }
|
||||
set { killCount = value; NotifyObservers(); }
|
||||
}
|
||||
|
||||
public FriendshipLink(Person p1, Person p2, float importance)
|
||||
{
|
||||
friend1 = p1;
|
||||
|
||||
@ -6,7 +6,7 @@ namespace DeathBook.Model
|
||||
{
|
||||
public class Level : Observable, Updatable
|
||||
{
|
||||
private const float TimeScale = 30f;
|
||||
private const float TimeScale = 30*4f;
|
||||
|
||||
private int score;
|
||||
public int Score { get { return score; } }
|
||||
@ -17,8 +17,12 @@ namespace DeathBook.Model
|
||||
public List<FriendshipLink> Friendships { get { return friendships; } }
|
||||
|
||||
//1 = 1 minute
|
||||
private float gameTime;
|
||||
private float gameTime; // real seconds elapsed since beginning
|
||||
public int GameTime { get { return (int)(gameTime * TimeScale); } }
|
||||
//Time of day, between 0 minute to 1440 minutes (a day)
|
||||
public int DayTime { get { return GameTime % (24*60); } }
|
||||
|
||||
private int lastHour = -1;
|
||||
|
||||
private float globalAwareness; //on a scale from 0 to 1
|
||||
public float GlobalAwareness { get { return globalAwareness; } }
|
||||
@ -32,7 +36,12 @@ namespace DeathBook.Model
|
||||
public void Update(float deltaTime)
|
||||
{
|
||||
gameTime += deltaTime;
|
||||
NotifyObservers();
|
||||
int hour = DayTime / 60;
|
||||
if (hour != lastHour)
|
||||
{
|
||||
lastHour = hour;
|
||||
NotifyObservers();
|
||||
}
|
||||
|
||||
//TODO Global awareness - start trends
|
||||
}
|
||||
|
||||
@ -133,9 +133,20 @@ namespace DeathBook.Model
|
||||
private Person CreatePerson(int id, float x, float y, float z)
|
||||
{
|
||||
Vector3 pos = new Vector3(x, y, z);
|
||||
//Vector2 times =
|
||||
//Value between 3 and 21
|
||||
float connectionDuration = Utils.GetRandomValue(12, 9, 3);
|
||||
int connectionTime = Random.Range(0, 24 * 60);
|
||||
int disconnectionTime = (connectionTime + (int)(connectionDuration * 60)) % (24 * 60);
|
||||
float freq = Utils.GetRandomValue(0, 1, 3);
|
||||
|
||||
Person p = new Person(id, pos);
|
||||
bool isFemale = Random.value <= 0.5;
|
||||
|
||||
string fName = "Fifi"; //isFemale ? NameGenerator.GetFemaleName() : NameGenerator.GetMaleName();
|
||||
string lName = "Brindacier"; //NameGenerator.GetLastName();
|
||||
|
||||
Sprite pic = isFemale ? PictureGenerator.GetFemalePicture() : PictureGenerator.GetMalePicture();
|
||||
|
||||
Person p = new Person(id, fName, lName, pos, connectionTime, disconnectionTime, freq, pic);
|
||||
|
||||
return p;
|
||||
}
|
||||
|
||||
@ -7,8 +7,6 @@ namespace DeathBook.Model
|
||||
{
|
||||
public class Person : Observable, Updatable
|
||||
{
|
||||
public Action OnSelected;
|
||||
|
||||
public int id;
|
||||
public int Id { get { return id; } }
|
||||
|
||||
@ -30,14 +28,13 @@ namespace DeathBook.Model
|
||||
private int friendCount = 0;
|
||||
public int FriendCount { get { return friendCount; } }
|
||||
|
||||
private int timeBetweenPosts; // f = 1/T;
|
||||
public int TimeBetweenPosts { get { return timeBetweenPosts; } }
|
||||
private float postFrequency; //on a scale from 0 to 1
|
||||
public float PostFrequency { get { return postFrequency; } }
|
||||
|
||||
private float connectionTime;
|
||||
public float ConnectionTime { get { return connectionTime; } }
|
||||
|
||||
private float disconnectionTime;
|
||||
public float DisconnectionTime { get { return disconnectionTime; } }
|
||||
private int connectionTime;
|
||||
public int ConnectionTime { get { return connectionTime; } }
|
||||
private int disconnectionTime;
|
||||
public int DisconnectionTime { get { return disconnectionTime; } }
|
||||
|
||||
private float awarenessLevel = 0; //on a scale from 0 to 1
|
||||
public float AwarenessLevel { get { return awarenessLevel; } }
|
||||
@ -46,23 +43,27 @@ namespace DeathBook.Model
|
||||
public bool Alive { get { return alive; } }
|
||||
|
||||
private bool online = true;
|
||||
public bool Online { get { return online; } }
|
||||
public bool Online { get { return online; } set { online = value; NotifyObservers(); } }
|
||||
|
||||
private Sprite picture;
|
||||
public Sprite Picture { get { return picture; } }
|
||||
|
||||
private Action onSelected;
|
||||
public Action OnSelected {get {return onSelected;} set { onSelected = value; } }
|
||||
|
||||
public Person(int id, Vector3 pos)
|
||||
public Person(int id, string fName, string lName, Vector3 pos, int conn, int disconn, float freq, Sprite pic)
|
||||
{
|
||||
this.id = id;
|
||||
initialPosition = pos;
|
||||
this.firstName = fName;
|
||||
this.lastName = lName;
|
||||
this.initialPosition = pos;
|
||||
this.connectionTime = conn;
|
||||
this.disconnectionTime = disconn;
|
||||
Debug.Log("I am " + id + " and I connect at " + Utils.GetTimeString(connectionTime) + " until " + Utils.GetTimeString(disconnectionTime));
|
||||
this.postFrequency = freq;
|
||||
this.picture = pic;
|
||||
|
||||
// TODO Use names from db
|
||||
firstName = "Mark";
|
||||
lastName = "Zuckerberg";
|
||||
|
||||
// For testing purposes
|
||||
picture = UnityEngine.Random.Range(0, 2) == 0 ? PictureGenerator.GetFemalePicture() : PictureGenerator.GetMalePicture();
|
||||
online = IsOnline(0);
|
||||
}
|
||||
|
||||
public void AddFriendship(Friendship f)
|
||||
@ -74,36 +75,51 @@ namespace DeathBook.Model
|
||||
|
||||
public void NotifyFriendWasKilled(Friendship f)
|
||||
{
|
||||
//Debug.Log("I am " + id + " and my friend " + f.Friend.Id + " was killed");
|
||||
Debug.Log("I am " + id + " and my friend " + f.Friend.Id + " was killed");
|
||||
numAliveFriends--;
|
||||
numDeadFriends++;
|
||||
deadFriendsList.Add(f);
|
||||
}
|
||||
|
||||
public void Kill()
|
||||
public bool Kill()
|
||||
{
|
||||
//Debug.Log("Person " + id + " died!");
|
||||
if (Online)
|
||||
return false;
|
||||
|
||||
Debug.Log("Person " + id + " died!");
|
||||
alive = false;
|
||||
foreach (Friendship f in friendsList)
|
||||
f.Friend.NotifyFriendWasKilled(f.Other);
|
||||
f.Other.NotifyFriendWasKilled();
|
||||
NotifyObservers();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public void NoticeDeath(Friendship f)
|
||||
{
|
||||
//TODO apply more rules here
|
||||
awarenessLevel = Mathf.Min(AwarenessLevel + 0.2f, 1f);
|
||||
//Debug.Log("I am " + id + " and I know my friend " + f.Friend.Id + " was killed.. " + AwarenessLevel);
|
||||
Debug.Log("I am " + id + " and I know my friend " + f.Friend.Id + " was killed.. " + AwarenessLevel);
|
||||
//TODO remove from dead friends list to accelerate
|
||||
NotifyObservers();
|
||||
}
|
||||
|
||||
//Time in hours
|
||||
private bool IsOnline(int time)
|
||||
{
|
||||
if (ConnectionTime < DisconnectionTime)
|
||||
return (time > ConnectionTime && time < DisconnectionTime);
|
||||
return !(time < ConnectionTime && time > DisconnectionTime);
|
||||
}
|
||||
|
||||
public void Update(float deltaTime)
|
||||
{
|
||||
//TODO Update if connected
|
||||
int time = LevelManager.Instance.GameLevel.GameTime;
|
||||
int time = LevelManager.Instance.GameLevel.DayTime;
|
||||
|
||||
bool isOnline = IsOnline(time);
|
||||
|
||||
if (isOnline != Online)
|
||||
Online = isOnline;
|
||||
|
||||
//The following actions are only performed if user is online
|
||||
if (!Online)
|
||||
@ -112,13 +128,13 @@ namespace DeathBook.Model
|
||||
foreach (Friendship f in deadFriendsList)
|
||||
f.Update(deltaTime);
|
||||
}
|
||||
|
||||
public void SelectNode()
|
||||
{
|
||||
if (OnSelected != null)
|
||||
{
|
||||
OnSelected();
|
||||
}
|
||||
}
|
||||
|
||||
public void SelectNode()
|
||||
{
|
||||
if (OnSelected != null)
|
||||
{
|
||||
OnSelected();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -28,5 +28,10 @@ namespace DeathBook.Model
|
||||
}
|
||||
return (sum / numSteps * 2 - 1) * range + mean;
|
||||
}
|
||||
|
||||
public static string GetTimeString(int time)
|
||||
{
|
||||
return time / 60 + "h " + time % 60 + "m";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -55,10 +55,11 @@ public class NetworkingSphere : MonoBehaviour
|
||||
rb = GetComponent<Rigidbody>();
|
||||
}
|
||||
|
||||
/*void OnGUI()
|
||||
void OnGUI()
|
||||
{
|
||||
GUI.Button(new Rect(10, 100, 400, 40), manager.GameLevel.GameTime + "");
|
||||
}*/
|
||||
int time = manager.GameLevel.DayTime;
|
||||
GUI.Button(new Rect(50, 50, 100, 40), Utils.GetTimeString(time));
|
||||
}
|
||||
|
||||
void Update()
|
||||
{
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user