From 9397215eb13c169b7518888b3fd4d74e689ba9c3 Mon Sep 17 00:00:00 2001 From: Patrice Vignola Date: Sun, 16 Aug 2015 21:26:05 -0400 Subject: [PATCH 1/2] - Added anchors to the tutorial popups --- .../Prefabs/NetworkingSphereTutorial.prefab | 137 +++ .../NetworkingSphereTutorial.prefab.meta | 8 + Assets/Scenes/Tutoriel.unity | 904 ++++++++++++------ Assets/Scripts/NetworkingSphere.cs | 4 +- Assets/Scripts/TutorialScript.cs | 2 +- 5 files changed, 735 insertions(+), 320 deletions(-) create mode 100644 Assets/Prefabs/NetworkingSphereTutorial.prefab create mode 100644 Assets/Prefabs/NetworkingSphereTutorial.prefab.meta diff --git a/Assets/Prefabs/NetworkingSphereTutorial.prefab b/Assets/Prefabs/NetworkingSphereTutorial.prefab new file mode 100644 index 0000000..062a86a --- /dev/null +++ b/Assets/Prefabs/NetworkingSphereTutorial.prefab @@ -0,0 +1,137 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &121098 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 4 + m_Component: + - 4: {fileID: 485072} + - 33: {fileID: 3344238} + - 23: {fileID: 2342116} + - 114: {fileID: 11438324} + - 54: {fileID: 5425960} + m_Layer: 0 + m_Name: NetworkingSphereTutorial + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &485072 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 121098} + 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: 0} + m_RootOrder: 0 +--- !u!23 &2342116 +MeshRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 121098} + m_Enabled: 0 + 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 &3344238 +MeshFilter: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 121098} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!54 &5425960 +Rigidbody: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 121098} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: .800000012 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &11438324 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 121098} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d11858fd0dc89d1409d681deb6fd8a07, type: 3} + m_Name: + m_EditorClassIdentifier: + gameObjects: + LinkObj: {fileID: 11495142, guid: fab430cecad80ad4391987a06b550cb7, type: 2} + PersonObj: {fileID: 11417564, guid: 7a5b1db47a2c30e419038df40dffa79a, type: 2} + levelOptions: + NumPeople: 10 + AvgNumFriends: 8 + FriendshipLikeliness: .600000024 + SphereRadius: 7 + strategy: + awarenessChange: + friendRatio: {x: .200000003, y: .800000012, z: 1.5} + lastDeath: {x: .600000024, y: .400000006, z: 1} + maxDeathDuration: 10080 + modifier: .219999999 + deathNoticing: + popularity: {x: .600000024, y: .400000006, z: 1} + importance: {x: .75, y: .25, z: 1} + numFriends: {x: .800000012, y: .200000003, z: 1} + awareness: {x: .800000012, y: .200000003, z: 1} + modifier: .0299999993 + chanceToPost: + popularity: {x: .699999988, y: .300000012, z: 1} + importance: {x: .699999988, y: .300000012, z: 1} + frequency: {x: .699999988, y: .300000012, z: 1} + modifier: .100000001 + sphere: 0 + rotationSpeed: .699999988 + torqueForce: 1 + DetailsPanel: {fileID: 0} + dragging: 0 + delta: {x: 0, y: 0, z: 0} + rb: {fileID: 0} + peopleNodes: [] + _selectedNode: {fileID: 0} + _timeSinceLastClick: 0 + _isRotatingTowardsNode: 0 +--- !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: 121098} + m_IsPrefabParent: 1 diff --git a/Assets/Prefabs/NetworkingSphereTutorial.prefab.meta b/Assets/Prefabs/NetworkingSphereTutorial.prefab.meta new file mode 100644 index 0000000..6fed079 --- /dev/null +++ b/Assets/Prefabs/NetworkingSphereTutorial.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9adefd6039fcc8644b6aa63861ae1632 +timeCreated: 1439773169 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Tutoriel.unity b/Assets/Scenes/Tutoriel.unity index 662e128..f84eeb7 100644 --- a/Assets/Scenes/Tutoriel.unity +++ b/Assets/Scenes/Tutoriel.unity @@ -170,7 +170,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 1 --- !u!1 &122634400 GameObject: m_ObjectHideFlags: 0 @@ -196,12 +196,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1728657169} - - {fileID: 919656932} + - {fileID: 836354994} + - {fileID: 663155753} - {fileID: 403748470} - {fileID: 350457696} - {fileID: 906703074} - - {fileID: 1411243506} + - {fileID: 1360955016} m_Father: {fileID: 750965895} m_RootOrder: 1 m_AnchorMin: {x: .699999988, y: 0} @@ -209,104 +209,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: .5, y: .5} ---- !u!1 &142867287 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 224: {fileID: 142867288} - m_Layer: 5 - m_Name: Content - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &142867288 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 142867287} - 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: 1411243506} - m_RootOrder: 1 - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: .850000024} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: .5, y: .5} ---- !u!1 &268520029 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 224: {fileID: 268520030} - - 222: {fileID: 268520032} - - 114: {fileID: 268520031} - m_Layer: 5 - m_Name: Title - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &268520030 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 268520029} - 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: 1411243506} - m_RootOrder: 0 - m_AnchorMin: {x: 0, y: .699999988} - m_AnchorMax: {x: 1, y: .925000012} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -3.05175781e-05, y: 0} - m_Pivot: {x: .5, y: .5} ---- !u!114 &268520031 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 268520029} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 1 - m_MinSize: 0 - m_MaxSize: 40 - m_Alignment: 4 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Watchs ---- !u!222 &268520032 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 268520029} --- !u!1 &350457695 GameObject: m_ObjectHideFlags: 0 @@ -460,10 +362,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1810646881} m_RootOrder: 0 - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 165, y: -65} - m_SizeDelta: {x: 300, y: 110} + m_AnchorMin: {x: .0280000009, y: .2707403} + m_AnchorMax: {x: .968000054, y: .944302976} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: .5, y: .5} --- !u!114 &540952210 MonoBehaviour: @@ -482,9 +384,9 @@ MonoBehaviour: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 14 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 + m_BestFit: 1 + m_MinSize: 0 + m_MaxSize: 20 m_Alignment: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -499,6 +401,128 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 540952208} +--- !u!1 &663155750 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 663155753} + - 222: {fileID: 663155752} + - 114: {fileID: 663155751} + m_Layer: 5 + m_Name: MaskBot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &663155751 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 663155750} + 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 &663155752 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 663155750} +--- !u!224 &663155753 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 663155750} + 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: 1 + m_AnchorMin: {x: .566316545, y: 0} + m_AnchorMax: {x: 1, y: .224000007} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!1 &664856230 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 664856231} + - 222: {fileID: 664856233} + - 114: {fileID: 664856232} + m_Layer: 5 + m_Name: Logo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &664856231 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 664856230} + 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: 1858163985} + m_RootOrder: 0 + m_AnchorMin: {x: 0, y: .0500000007} + m_AnchorMax: {x: .182673752, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &664856232 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 664856230} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Sprite: {fileID: 21300000, guid: eaaa90877e079004eb38be08a3e86db7, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &664856233 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 664856230} --- !u!1 &667257315 GameObject: m_ObjectHideFlags: 0 @@ -530,10 +554,10 @@ RectTransform: - {fileID: 1051568343} m_Father: {fileID: 1810646881} m_RootOrder: 1 - m_AnchorMin: {x: .5, y: 0} - m_AnchorMax: {x: .5, y: 0} - m_AnchoredPosition: {x: 0, y: 15.46} - m_SizeDelta: {x: 60, y: 25} + m_AnchorMin: {x: .380000025, y: .0397835858} + m_AnchorMax: {x: .620000005, y: .223000005} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: .5, y: .5} --- !u!114 &667257317 MonoBehaviour: @@ -547,7 +571,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Navigation: - m_Mode: 3 + m_Mode: 0 m_SelectOnUp: {fileID: 0} m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} @@ -680,6 +704,126 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 724929355} +--- !u!1 &742870603 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 121098, guid: 9adefd6039fcc8644b6aa63861ae1632, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 742870608} + - 33: {fileID: 742870607} + - 23: {fileID: 742870606} + - 114: {fileID: 742870605} + - 54: {fileID: 742870604} + m_Layer: 0 + m_Name: NetworkingSphere + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!54 &742870604 +Rigidbody: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 5425960, guid: 9adefd6039fcc8644b6aa63861ae1632, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 742870603} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: .800000012 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &742870605 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11438324, guid: 9adefd6039fcc8644b6aa63861ae1632, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 742870603} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0907c1567bad554c8b995de3459e517, type: 3} + m_Name: + m_EditorClassIdentifier: + gameObjects: + LinkObj: {fileID: 11495142, guid: fab430cecad80ad4391987a06b550cb7, type: 2} + PersonObj: {fileID: 11417564, guid: 7a5b1db47a2c30e419038df40dffa79a, type: 2} + levelOptions: + NumPeople: 10 + AvgNumFriends: 8 + FriendshipLikeliness: .600000024 + SphereRadius: 7 + strategy: + awarenessChange: + friendRatio: {x: .200000003, y: .800000012, z: 1.5} + lastDeath: {x: .600000024, y: .400000006, z: 1} + maxDeathDuration: 10080 + modifier: .219999999 + deathNoticing: + popularity: {x: .600000024, y: .400000006, z: 1} + importance: {x: .75, y: .25, z: 1} + numFriends: {x: .800000012, y: .200000003, z: 1} + awareness: {x: .800000012, y: .200000003, z: 1} + modifier: .0299999993 + chanceToPost: + popularity: {x: .699999988, y: .300000012, z: 1} + importance: {x: .699999988, y: .300000012, z: 1} + frequency: {x: .699999988, y: .300000012, z: 1} + modifier: .100000001 + rotationSpeed: .699999988 + torqueForce: 1 + DetailsPanel: {fileID: 1197925315} +--- !u!23 &742870606 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 2342116, guid: 9adefd6039fcc8644b6aa63861ae1632, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 742870603} + m_Enabled: 0 + 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 &742870607 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 3344238, guid: 9adefd6039fcc8644b6aa63861ae1632, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 742870603} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &742870608 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 485072, guid: 9adefd6039fcc8644b6aa63861ae1632, type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 742870603} + 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: 0} + m_RootOrder: 0 --- !u!1 &750965894 GameObject: m_ObjectHideFlags: 0 @@ -787,6 +931,67 @@ MonoBehaviour: panel: {fileID: 1810646880} tutorialText: {fileID: 540952210} btnNext: {fileID: 667257317} +--- !u!1 &836354993 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 836354994} + - 222: {fileID: 836354996} + - 114: {fileID: 836354995} + m_Layer: 5 + m_Name: MaskTop + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &836354994 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 836354993} + 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: 1, 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 &836354995 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 836354993} + 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 &836354996 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 836354993} --- !u!1 &906703073 GameObject: m_ObjectHideFlags: 0 @@ -850,67 +1055,6 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 906703073} ---- !u!1 &919656931 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 224: {fileID: 919656932} - - 222: {fileID: 919656934} - - 114: {fileID: 919656933} - m_Layer: 5 - m_Name: MaskBot - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &919656932 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - 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} - m_Children: [] - m_Father: {fileID: 122634401} - m_RootOrder: 1 - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: .224000007} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: .5, y: .5} ---- !u!114 &919656933 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 919656931} - 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 &919656934 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 919656931} --- !u!1 &1051568342 GameObject: m_ObjectHideFlags: 0 @@ -977,6 +1121,83 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1051568342} +--- !u!1 &1099658726 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 163070, guid: c993e87661906234fba410e55ed66832, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1099658727} + - 222: {fileID: 1099658730} + - 114: {fileID: 1099658729} + - 114: {fileID: 1099658728} + m_Layer: 5 + m_Name: AwarenessBar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1099658727 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22454288, guid: c993e87661906234fba410e55ed66832, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1099658726} + 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: 1360955016} + m_RootOrder: 1 + m_AnchorMin: {x: .0531043299, y: .215897292} + m_AnchorMax: {x: .566316485, y: .618000031} + m_AnchoredPosition: {x: 0, y: -.5} + m_SizeDelta: {x: 0, y: 1} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1099658728 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11476856, guid: c993e87661906234fba410e55ed66832, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1099658726} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 51e725985a0e317458c006132d935c25, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1099658729 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11478634, guid: c993e87661906234fba410e55ed66832, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1099658726} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 085386af6af570a47b29380efacfa18d, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Sprite: {fileID: 21300000, guid: a023c2b27dbaaec45ae34c278711bc24, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1099658730 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 22205402, guid: c993e87661906234fba410e55ed66832, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1099658726} --- !u!1 &1126063559 GameObject: m_ObjectHideFlags: 0 @@ -1036,7 +1257,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 --- !u!1001 &1197925313 Prefab: m_ObjectHideFlags: 0 @@ -1122,7 +1343,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 22417254, guid: c993e87661906234fba410e55ed66832, type: 2} propertyPath: m_AnchorMax.y - value: .999999702 + value: 1 objectReference: {fileID: 0} - target: {fileID: 11452870, guid: c993e87661906234fba410e55ed66832, type: 2} propertyPath: m_ScrollSensitivity @@ -1156,6 +1377,14 @@ Prefab: propertyPath: m_Color.b value: .741176486 objectReference: {fileID: 0} + - target: {fileID: 11414010, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_Value + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11414010, guid: c993e87661906234fba410e55ed66832, type: 2} + propertyPath: m_Size + value: .999999881 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: c993e87661906234fba410e55ed66832, type: 2} m_IsPrefabParent: 0 @@ -1170,6 +1399,84 @@ MonoBehaviour: type: 2} m_PrefabInternal: {fileID: 1197925313} m_Script: {fileID: 11500000, guid: 88fb1885d6f8fd6409e3866b7707a12a, type: 3} +--- !u!1 &1360955015 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 1360955016} + - 222: {fileID: 1360955019} + - 114: {fileID: 1360955018} + - 114: {fileID: 1360955017} + m_Layer: 5 + m_Name: WatchArea + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1360955016 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1360955015} + 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: 1590742289} + - {fileID: 1099658727} + - {fileID: 2078229236} + m_Father: {fileID: 122634401} + m_RootOrder: 5 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: .200000003} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &1360955017 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1360955015} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 292d41d787a32ef42aa6bc4f48643f9c, type: 3} + m_Name: + m_EditorClassIdentifier: + AwarenessBar: {fileID: 1099658728} + Percentage: {fileID: 2078229237} +--- !u!114 &1360955018 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1360955015} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: .847058833, g: .874509811, b: .917647064, a: 1} + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 +--- !u!222 &1360955019 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1360955015} --- !u!1 &1366676552 GameObject: m_ObjectHideFlags: 0 @@ -1236,130 +1543,72 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1366676552} ---- !u!1 &1411243505 +--- !u!1 &1590742288 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 4 m_Component: - - 224: {fileID: 1411243506} - - 222: {fileID: 1411243508} - - 114: {fileID: 1411243507} + - 224: {fileID: 1590742289} + - 222: {fileID: 1590742291} + - 114: {fileID: 1590742290} m_Layer: 5 - m_Name: WatchArea + m_Name: Title m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1411243506 +--- !u!224 &1590742289 RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1411243505} - 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: 268520030} - - {fileID: 142867288} - m_Father: {fileID: 122634401} - m_RootOrder: 5 - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: .200000003} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: .5, y: .5} ---- !u!114 &1411243507 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1411243505} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: .847058833, g: .874509811, b: .917647064, a: 1} - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 ---- !u!222 &1411243508 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1411243505} ---- !u!1 &1728657168 -GameObject: - m_ObjectHideFlags: 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_GameObject: {fileID: 1590742288} 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_Father: {fileID: 1360955016} 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_AnchorMin: {x: .0500000007, y: .696616352} + m_AnchorMax: {x: .949999988, y: .925000012} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: .5, y: .5} ---- !u!114 &1728657170 +--- !u!114 &1590742290 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1728657168} + m_GameObject: {fileID: 1590742288} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Script: {fileID: 708705254, 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 + m_Material: {fileID: 0} + m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 4 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Global Awareness +--- !u!222 &1590742291 CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1728657168} + m_GameObject: {fileID: 1590742288} --- !u!1 &1810646880 GameObject: m_ObjectHideFlags: 0 @@ -1391,10 +1640,10 @@ RectTransform: - {fileID: 667257316} m_Father: {fileID: 750965895} m_RootOrder: 2 - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 172.460007, y: -162.589996} - m_SizeDelta: {x: 300, y: 120} + m_AnchorMin: {x: .0213474818, y: .66071701} + m_AnchorMax: {x: .257347494, y: .857717037} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: .5, y: .5} --- !u!114 &1810646882 MonoBehaviour: @@ -1449,7 +1698,8 @@ RectTransform: 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_Children: + - {fileID: 664856231} m_Father: {fileID: 750965895} m_RootOrder: 0 m_AnchorMin: {x: 0, y: .899999976} @@ -1623,49 +1873,69 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2009587058} ---- !u!1001 &2065124246 -Prefab: +--- !u!1 &2078229235 +GameObject: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 433422, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 433422, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 433422, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 433422, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 433422, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 433422, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 433422, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 433422, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 11432906, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2} - propertyPath: DetailsPanel - value: - objectReference: {fileID: 1197925315} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 136ea38d5deb4c9418beb879167d9b03, type: 2} - m_IsPrefabParent: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 224: {fileID: 2078229236} + - 222: {fileID: 2078229238} + - 114: {fileID: 2078229237} + m_Layer: 5 + m_Name: Percentage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2078229236 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2078229235} + 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: 1360955016} + m_RootOrder: 2 + m_AnchorMin: {x: .676841795, y: .150383666} + m_AnchorMax: {x: .911104441, y: .670410872} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: .5, y: .5} +--- !u!114 &2078229237 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2078229235} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: .196078435, g: .196078435, b: .196078435, a: 1} + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 4 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 100% +--- !u!222 &2078229238 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2078229235} diff --git a/Assets/Scripts/NetworkingSphere.cs b/Assets/Scripts/NetworkingSphere.cs index 75203e0..427e839 100644 --- a/Assets/Scripts/NetworkingSphere.cs +++ b/Assets/Scripts/NetworkingSphere.cs @@ -7,7 +7,7 @@ public class NetworkingSphere : MonoBehaviour { public GameObjectsOptions gameObjects = new GameObjectsOptions(); public LevelOptions levelOptions = new LevelOptions(); - public GameStrategy strategy = new GameStrategy(); + public GameStrategy strategy = new GameStrategy(); private NetworkDisconnection sphere; [System.Serializable] @@ -60,7 +60,7 @@ public class NetworkingSphere : MonoBehaviour { int time = manager.GameLevel.DayTime; GUI.Button(new Rect(50, 50, 100, 40), Utils.GetTimeString(time)); - GUI.Button(new Rect(160, 50, 100, 40), manager.GameLevel.Awareness + ""); + GUI.Button(new Rect(160, 50, 100, 40), manager.GameLevel.Awareness + ""); } void Update() diff --git a/Assets/Scripts/TutorialScript.cs b/Assets/Scripts/TutorialScript.cs index 6d5b2b7..9f50b38 100644 --- a/Assets/Scripts/TutorialScript.cs +++ b/Assets/Scripts/TutorialScript.cs @@ -19,7 +19,7 @@ public class TutorialScript : MonoBehaviour { void Update() { - btnNext.enabled = lvl.allowNext; + btnNext.gameObject.SetActive(lvl.allowNext); From 932e7e90c0d771210d18a70140a1854cd8be802d Mon Sep 17 00:00:00 2001 From: Patrice Vignola Date: Sun, 16 Aug 2015 22:09:18 -0400 Subject: [PATCH 2/2] - Fixed the tutorial --- Assets/Scenes/Tutoriel.unity | 4 +-- Assets/Scripts/Models/Level.cs | 2 +- Assets/Scripts/Models/Person.cs | 7 +++- Assets/Scripts/NetworkingSphere.cs | 2 +- Assets/Scripts/TutorialScript.cs | 43 ++++++++++++++--------- ProjectSettings/EditorBuildSettings.asset | 6 ++-- 6 files changed, 40 insertions(+), 24 deletions(-) diff --git a/Assets/Scenes/Tutoriel.unity b/Assets/Scenes/Tutoriel.unity index f84eeb7..42c4983 100644 --- a/Assets/Scenes/Tutoriel.unity +++ b/Assets/Scenes/Tutoriel.unity @@ -1640,8 +1640,8 @@ RectTransform: - {fileID: 667257316} m_Father: {fileID: 750965895} m_RootOrder: 2 - m_AnchorMin: {x: .0213474818, y: .66071701} - m_AnchorMax: {x: .257347494, y: .857717037} + m_AnchorMin: {x: .0213474818, y: .606641531} + m_AnchorMax: {x: .286652535, y: .857717037} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: .5, y: .5} diff --git a/Assets/Scripts/Models/Level.cs b/Assets/Scripts/Models/Level.cs index 4c81f7f..9a9e372 100644 --- a/Assets/Scripts/Models/Level.cs +++ b/Assets/Scripts/Models/Level.cs @@ -26,7 +26,7 @@ namespace DeathBook.Model private float globalAwareness; //on a scale from 0 to 1 public float GlobalAwareness { get { return globalAwareness; } } - public int tutorialInt = 0; + public int tutorialInt = -1; public bool allowNext = true; private GameStrategy strategy = null; diff --git a/Assets/Scripts/Models/Person.cs b/Assets/Scripts/Models/Person.cs index 1be3156..a49f8ff 100644 --- a/Assets/Scripts/Models/Person.cs +++ b/Assets/Scripts/Models/Person.cs @@ -104,7 +104,7 @@ namespace DeathBook.Model public bool Kill() { - if (Online || ((LevelManager.Instance.GameLevel.tutorialInt < 4) && (LevelManager.Instance.GameLevel.tutorialInt >= 0))) + if (Online || (LevelManager.Instance.GameLevel.tutorialInt > -1 && LevelManager.Instance.GameLevel.tutorialInt < 4)) return false; //Debug.Log("Person " + id + " died!"); @@ -119,6 +119,11 @@ namespace DeathBook.Model LevelManager.Instance.GameLevel.RegisterKill(this); + if (LevelManager.Instance.GameLevel.tutorialInt == 5 && LevelManager.Instance.GameLevel.NumDead == 3) + { + LevelManager.Instance.GameLevel.tutorialInt = 6; + } + return true; } diff --git a/Assets/Scripts/NetworkingSphere.cs b/Assets/Scripts/NetworkingSphere.cs index 4570323..47e5e54 100644 --- a/Assets/Scripts/NetworkingSphere.cs +++ b/Assets/Scripts/NetworkingSphere.cs @@ -167,7 +167,7 @@ public class NetworkingSphere : MonoBehaviour if (!_isRotatingTowardsNode || node != _selectedNode) { - if ((lvl.tutorialInt > 1) || (lvl.tutorialInt > 1)) + if ((lvl.tutorialInt == -1) || (lvl.tutorialInt > 1) || (lvl.tutorialInt > 1)) FocusOnNode(node); } diff --git a/Assets/Scripts/TutorialScript.cs b/Assets/Scripts/TutorialScript.cs index 9f50b38..0c32a78 100644 --- a/Assets/Scripts/TutorialScript.cs +++ b/Assets/Scripts/TutorialScript.cs @@ -14,25 +14,22 @@ public class TutorialScript : MonoBehaviour { void Start() { lvl = LevelManager.Instance.GameLevel; + lvl.tutorialInt = 0; } - void Update() { - - + void Update() + { btnNext.gameObject.SetActive(lvl.allowNext); - - - if (lvl.tutorialInt == 0) { Time.timeScale = 0; lvl.allowNext = true; - tutorialText.text = "The facebook servers are full!\nMark Zuckerberg hired you, Death, to kill off a few of his users.\n\nCareful, or you might scare them away from Mark's website..."; + tutorialText.text = "The Slaugthr servers are full!\nMark Zuckerberg hired you, Death, to kill off a few of his annoying users.\n\nCareful, or you might scare the rest away from Mark's website..."; } else if (lvl.tutorialInt == 1) { - tutorialText.text = "See how navigating works by holding the right mouse button and moving the sphere.\n\nThen, hit Next!"; + tutorialText.text = "See how navigating works by holding the right mouse button and moving the network around.\n\nThen, hit Next!"; } else if (lvl.tutorialInt == 2) { @@ -40,17 +37,23 @@ public class TutorialScript : MonoBehaviour { } else if (lvl.tutorialInt == 3) { - tutorialText.text = "Let's see what happens when you click on a user's friend list."; + tutorialText.text = "Let's see what happens when you click on a friend's picture in the selected user's friend list."; } else if (lvl.tutorialInt == 4) { - tutorialText.text = "Alright, time for our first victim.\nHold the LEFT mouse button over a user until the X is complete.\nBeware! The user must be offline to be killed!"; - tutorialText.text += "\n\nYou can hold the mouse button until the user goes offline."; + tutorialText.text = "Alright, time for our first victim.\nHold down the LEFT mouse button over a user until the X is complete. Beware! The user must be offline (darker picture) to be killed!"; + tutorialText.text += "\n\nIf the user is online, you can hold the mouse button until he goes offline."; } else if (lvl.tutorialInt == 5) { - tutorialText.text = "Kill many users to see how the color changes\n\nRemember, as users realize something is wrong with facebook,\nthe entire network will turn red!\n\nHaveFun!"; + tutorialText.text = "Kill 2 more users to see how the color of the links and the borders changes.\n\nRemember, as users realize something is wrong with Slaugthr, the entire network will turn red!"; + } + else if (lvl.tutorialInt == 6) + { + tutorialText.text = "Finally, notice the big \"Global Awareness\" bar at the bottom right corner of the screen. When it reaches 100%, it means you have been noticed and you lose!"; + tutorialText.text += "\n\nHit next to start playing."; lvl.allowNext = true; + Time.timeScale = 0f; } else { @@ -62,13 +65,19 @@ public class TutorialScript : MonoBehaviour { public void btnClick() { - + if (lvl.tutorialInt == 0) + { + Time.timeScale = 1; + } + + if (lvl.tutorialInt == 6) + { + Application.LoadLevel("Gameplay"); + Time.timeScale = 1; + } + lvl.tutorialInt++; - //Debug.Log(lvl.tutorialInt + ", aasfasf"); - Time.timeScale = 1; - tutorialText.text = "eee"; lvl.allowNext = false; - //panel.transform.Translate(Vector3.right * 100); } } diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 75b856e..7602938 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -5,7 +5,9 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: - - enabled: 1 - path: Assets/Scenes/Gameplay.unity - enabled: 1 path: Assets/Scenes/splash.unity + - enabled: 1 + path: Assets/Scenes/Tutoriel.unity + - enabled: 1 + path: Assets/Scenes/Gameplay.unity