Conjure/DeathBook
6
0
Fork 0
mirror of https://github.com/ConjureETS/DeathBook.git synced 2026-03-24 04:20:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ConjureETS/DeathBook

Browse Source 
Conflicts:
	Assets/Prefabs/PersonNode.prefab
	Assets/Scenes/Gameplay.unity
	Assets/Scripts/FriendshipLink.cs.meta
	Assets/Scripts/Models/FriendshipLink.cs.meta
	Assets/Scripts/Models/Person.cs
	Assets/Scripts/NetworkingSphere.cs
	Assets/Scripts/PersonDetailsPanel.cs
	Assets/Scripts/PersonNode.cs
	Assets/Scripts/UIFriendPicture.cs.meta
This commit is contained in:
Patrice Vignola 2015-08-15 23:21:12 -04:00
commit 97be3def6b
5 changed files with 90 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Prefabs/PersonDetailsPanel.prefab
View File

@ -657,7 +657,7 @@ MonoBehaviour:
WatchButton: {fileID: 11491412}
XButton: {fileID: 11494666}
Container: {fileID: 147852}
UIFriendPicture: {fileID: 11467422, guid: 16a1d168f1ef75b4690435675a9e69b0, type: 2}
FriendPicture: {fileID: 11469406, guid: 16a1d168f1ef75b4690435675a9e69b0, type: 2}
--- !u!114 &11478962
MonoBehaviour:
m_ObjectHideFlags: 1

43
Assets/Prefabs/UIFriendPicture.prefab
View File

@ -10,6 +10,8 @@ GameObject:
- 224: {fileID: 22403202}
- 222: {fileID: 22221002}
- 114: {fileID: 11467422}
- 114: {fileID: 11469406}
- 114: {fileID: 11492734}
m_Layer: 5
m_Name: UIFriendPicture
m_TagString: Untagged
@ -38,6 +40,47 @@ MonoBehaviour:
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!114 &11469406
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 115844}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 343d57f2bac42ae48ba9722c53e5526f, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &11492734
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 115844}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -1862395651, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
delegates:
- eventID: 4
callback:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 11469406}
m_MethodName: OnClick
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_TypeName: UnityEngine.EventSystems.EventTrigger+TriggerEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
--- !u!222 &22221002
CanvasRenderer:
m_ObjectHideFlags: 1

44
Assets/Scenes/Gameplay.unity
View File

@ -591,6 +591,38 @@ Prefab:
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 11414010, guid: c993e87661906234fba410e55ed66832, type: 2}
propertyPath: m_Value
value: .999377966
objectReference: {fileID: 0}
- target: {fileID: 11414010, guid: c993e87661906234fba410e55ed66832, type: 2}
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}
- target: {fileID: 22458514, guid: c993e87661906234fba410e55ed66832, type: 2}
propertyPath: m_AnchoredPosition.y
value: -65.9390106
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: c993e87661906234fba410e55ed66832, type: 2}
m_IsPrefabParent: 0
@ -1054,6 +1086,18 @@ Prefab:
propertyPath: DetailsPanel
value:
objectReference: {fileID: 724043967}
- target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2}
propertyPath: FriendshipLikeliness
value: .600000024
objectReference: {fileID: 0}
- target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2}
propertyPath: NumPeople
value: 50
objectReference: {fileID: 0}
- target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2}
propertyPath: AvgNumFriends
value: 4
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2}
m_IsPrefabParent: 0

12
Assets/Scripts/Models/FriendshipLink.cs.meta
View File

@ -1,12 +0,0 @@
fileFormatVersion: 2
guid: 5c672f95914b3f04088de0f562834941
timeCreated: 1439578834
licenseType: Free
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

2
Assets/Scripts/NetworkingSphere.cs
View File

@ -149,6 +149,8 @@ public class NetworkingSphere : MonoBehaviour
_selectedNode.Select(false);
}
node.Kill();
DetailsPanel.SetNode(node);
node.Select(true);