Merge pull request #109 from hackerspace-ntnu/feature/message_ui

Feature/message UI
hackerspace-ntnu · Mar 24, 2022 · f4416bc · f4416bc
2 parents cf903e3 + b01c993
commit f4416bc
Show file tree

Hide file tree

Showing 11 changed files with 424 additions and 1 deletion.
diff --git a/Assets/Animations/UI/MessageUI.anim b/Assets/Animations/UI/MessageUI.anim
@@ -0,0 +1,53 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: MessageUI
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings: []
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 1
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 1
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []
diff --git a/Assets/Animations/UI/MessageUI.anim.meta b/Assets/Animations/UI/MessageUI.anim.meta
diff --git a/Assets/Prefabs/Player/Characters/Player_Dahl.prefab b/Assets/Prefabs/Player/Characters/Player_Dahl.prefab
@@ -1415,6 +1415,7 @@ GameObject:
   - component: {fileID: 4548851910134379976}
   - component: {fileID: 4071846026879171964}
   - component: {fileID: 4071846026879171967}
+  - component: {fileID: 3761819511940449729}
   m_Layer: 9
   m_Name: Player_Dahl
   m_TagString: Player
@@ -1603,6 +1604,22 @@ Rigidbody:
   m_Interpolate: 1
   m_Constraints: 112
   m_CollisionDetection: 0
+--- !u!114 &3761819511940449729
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4071846026879171966}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b034a9373fc7a27498edfc794863ec1c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  messagePrefab: {fileID: 6402128102586948173, guid: 3dd95c6d5eac8454aa924ac546df1e4e, type: 3}
+  colors:
+  - {r: 1, g: 0, b: 0, a: 1}
+  - {r: 0, g: 0.7169812, b: 0.07178865, a: 1}
 --- !u!1 &4138943945869748027
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/Assets/Prefabs/Player/Characters/Player_Pirate.prefab b/Assets/Prefabs/Player/Characters/Player_Pirate.prefab
@@ -1366,6 +1366,7 @@ GameObject:
   - component: {fileID: 1334833252313079424}
   - component: {fileID: 4071846026879171964}
   - component: {fileID: 4071846026879171967}
+  - component: {fileID: 8476718979267706415}
   m_Layer: 9
   m_Name: Player_Pirate
   m_TagString: Player
@@ -1554,6 +1555,22 @@ Rigidbody:
   m_Interpolate: 1
   m_Constraints: 112
   m_CollisionDetection: 0
+--- !u!114 &8476718979267706415
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4071846026879171966}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b034a9373fc7a27498edfc794863ec1c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  messagePrefab: {fileID: 6402128102586948173, guid: 3dd95c6d5eac8454aa924ac546df1e4e, type: 3}
+  colors:
+  - {r: 1, g: 0, b: 0, a: 1}
+  - {r: 0, g: 0.7169812, b: 0.07178865, a: 1}
 --- !u!1 &4086062940647090856
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/Assets/Prefabs/Player/Characters/Player_Strongman.prefab b/Assets/Prefabs/Player/Characters/Player_Strongman.prefab
@@ -1441,6 +1441,7 @@ GameObject:
   - component: {fileID: 6226741701120917524}
   - component: {fileID: 4315586048534869637}
   - component: {fileID: 4315586048534869638}
+  - component: {fileID: 6574620329045622771}
   m_Layer: 9
   m_Name: Player_Strongman
   m_TagString: Player
@@ -1629,6 +1630,22 @@ Rigidbody:
   m_Interpolate: 1
   m_Constraints: 112
   m_CollisionDetection: 0
+--- !u!114 &6574620329045622771
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4315586048534869639}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b034a9373fc7a27498edfc794863ec1c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  messagePrefab: {fileID: 6402128102586948173, guid: 3dd95c6d5eac8454aa924ac546df1e4e, type: 3}
+  colors:
+  - {r: 1, g: 0, b: 0, a: 1}
+  - {r: 0, g: 0.7169812, b: 0.07178865, a: 1}
 --- !u!1 &4406181753404703009
 GameObject:
   m_ObjectHideFlags: 0