CS3247-Game-Development-Team-6 · trxe · Nov 10, 2022 · Nov 10, 2022 · Nov 10, 2022 · Nov 11, 2022
diff --git a/Assets/3rd-Party/Font/Sniglet/TextMeshPro/Sniglet-Regular SDF.asset b/Assets/3rd-Party/Font/Sniglet/TextMeshPro/Sniglet-Regular SDF.asset
diff --git a/Assets/Prefabs/UI/HUD/MainUI.prefab b/Assets/Prefabs/UI/HUD/MainUI.prefab
@@ -3481,6 +3481,10 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2439164831590390608, guid: 1fccfca17179b444fa4598277202d027, type: 3}
+      propertyPath: m_text
+      value: 40
+      objectReference: {fileID: 0}
     - target: {fileID: 2505456383458267595, guid: 1fccfca17179b444fa4598277202d027, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0
@@ -3729,6 +3733,14 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 5335523902743475775, guid: 1fccfca17179b444fa4598277202d027, type: 3}
+      propertyPath: m_text
+      value: 50
+      objectReference: {fileID: 0}
+    - target: {fileID: 5577564157962286433, guid: 1fccfca17179b444fa4598277202d027, type: 3}
+      propertyPath: m_text
+      value: 80
+      objectReference: {fileID: 0}
     - target: {fileID: 5655379010861613050, guid: 1fccfca17179b444fa4598277202d027, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0
@@ -3841,6 +3853,14 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8437426988627093306, guid: 1fccfca17179b444fa4598277202d027, type: 3}
+      propertyPath: m_text
+      value: 75
+      objectReference: {fileID: 0}
+    - target: {fileID: 8576940534309709643, guid: 1fccfca17179b444fa4598277202d027, type: 3}
+      propertyPath: m_text
+      value: 75
+      objectReference: {fileID: 0}
     - target: {fileID: 8609875051912018108, guid: 1fccfca17179b444fa4598277202d027, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0

diff --git a/Assets/Prefabs/UI/InGame/NodePanelUI.prefab b/Assets/Prefabs/UI/InGame/NodePanelUI.prefab
@@ -452,8 +452,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 30
-  m_fontSizeBase: 36
+  m_fontSize: 25
+  m_fontSizeBase: 25
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -2123,7 +2123,7 @@ RectTransform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4076195005231737183}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: -0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 2158720840442904696}
@@ -2132,12 +2132,13 @@ RectTransform:
   - {fileID: 4642249291064922296}
   - {fileID: 1702033043006961580}
   - {fileID: 2396878625990748774}
+  - {fileID: 6616147855692573696}
   m_Father: {fileID: 8417401075115610738}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -200, y: 31.885}
+  m_AnchoredPosition: {x: -187, y: 106}
   m_SizeDelta: {x: 189.968, y: 286.071}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &3882107185871038057
@@ -2632,14 +2633,14 @@ RectTransform:
   m_GameObject: {fileID: 5876710398817745598}
   m_LocalRotation: {x: -0.70710677, y: -0, z: -0, w: 0.7071069}
   m_LocalPosition: {x: 0, y: 0, z: 5}
-  m_LocalScale: {x: 26, y: 199.99998, z: 35}
+  m_LocalScale: {x: 26, y: 199.99998, z: 41.11}
   m_Children: []
   m_Father: {fileID: 8417401075115610738}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: -45, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -187, y: 23}
+  m_AnchoredPosition: {x: -178.5, y: 53.9}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!33 &3259083614057917844
@@ -3631,6 +3632,7 @@ MonoBehaviour:
   speedUi: {fileID: 8478456795006040576}
   rateUi: {fileID: 6572642789909484319}
   rangeUi: {fileID: 1416954604144567862}
+  descUI: {fileID: 5162680853213358932}
   backgrounds:
   - {fileID: 5876710398817745598}
   - {fileID: 8942625043760377177}
@@ -3857,6 +3859,140 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1 &8577370383754183807
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6616147855692573696}
+  - component: {fileID: 8087219475070786823}
+  - component: {fileID: 5162680853213358932}
+  m_Layer: 5
+  m_Name: Description
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6616147855692573696
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8577370383754183807}
+  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: 6690128020421969783}
+  m_RootOrder: 6
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 220.6, y: 70.6}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8087219475070786823
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8577370383754183807}
+  m_CullTransparentMesh: 1
+--- !u!114 &5162680853213358932
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8577370383754183807}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: sdsdsdasdads
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: 892c1d85cd5592c4d8c668d04a926dfb, type: 2}
+  m_sharedMaterial: {fileID: 4497220659931531076, guid: 892c1d85cd5592c4d8c668d04a926dfb, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4282596658
+  m_fontColor: {r: 0.19607845, g: 0.2392157, b: 0.2627451, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 20
+  m_fontSizeBase: 20
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 0
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 1024
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!1 &8759831705287618124
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/Assets/Prefabs/UI/InGame/NodeUIContainer.prefab b/Assets/Prefabs/UI/InGame/NodeUIContainer.prefab
@@ -307,6 +307,46 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6223601651196466931, guid: c8569635911975d4bb95cdb3cea487d6, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 230.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 6223601651196466931, guid: c8569635911975d4bb95cdb3cea487d6, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 75.7
+      objectReference: {fileID: 0}
+    - target: {fileID: 6223601651196466931, guid: c8569635911975d4bb95cdb3cea487d6, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0.0000048429
+      objectReference: {fileID: 0}
+    - target: {fileID: 6223601651196466931, guid: c8569635911975d4bb95cdb3cea487d6, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -4.85
+      objectReference: {fileID: 0}
+    - target: {fileID: 6223601651196466931, guid: c8569635911975d4bb95cdb3cea487d6, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 26
+      objectReference: {fileID: 0}
+    - target: {fileID: 6616147855692573696, guid: c8569635911975d4bb95cdb3cea487d6, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6616147855692573696, guid: c8569635911975d4bb95cdb3cea487d6, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6616147855692573696, guid: c8569635911975d4bb95cdb3cea487d6, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6616147855692573696, guid: c8569635911975d4bb95cdb3cea487d6, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6616147855692573696, guid: c8569635911975d4bb95cdb3cea487d6, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6624680016977587612, guid: c8569635911975d4bb95cdb3cea487d6, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0
@@ -323,6 +363,10 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6690128020421969783, guid: c8569635911975d4bb95cdb3cea487d6, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -0
+      objectReference: {fileID: 0}
     - target: {fileID: 8313091310290656487, guid: c8569635911975d4bb95cdb3cea487d6, type: 3}
       propertyPath: m_Name
       value: NodePanelUI

diff --git a/Assets/Scenes/Levels/TutorialScene-beta.unity b/Assets/Scenes/Levels/TutorialScene-beta.unity
@@ -362,6 +362,22 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 2565051181514142219, guid: d77921e919e5e554489ee37fad227dac, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2565051181514142219, guid: d77921e919e5e554489ee37fad227dac, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2565051181514142219, guid: d77921e919e5e554489ee37fad227dac, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2565051181514142219, guid: d77921e919e5e554489ee37fad227dac, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 2568798353270764439, guid: d77921e919e5e554489ee37fad227dac, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0
@@ -672,7 +688,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8667638309010086148, guid: d77921e919e5e554489ee37fad227dac, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: 1.12
       objectReference: {fileID: 0}
     - target: {fileID: 8667638309010086148, guid: d77921e919e5e554489ee37fad227dac, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x

diff --git a/Assets/ScriptableObjects/Elements/ElementInfos/FireElement.asset b/Assets/ScriptableObjects/Elements/ElementInfos/FireElement.asset
@@ -15,3 +15,4 @@ MonoBehaviour:
   type: 0
   effect: {fileID: 11400000, guid: 44bd50d33ed57d64fbcfdf5b9b908176, type: 2}
   weakness: 2
+  description: Deals damage over time (5/s) for 5s .
diff --git a/Assets/ScriptableObjects/Elements/ElementInfos/IceElement.asset b/Assets/ScriptableObjects/Elements/ElementInfos/IceElement.asset
@@ -14,3 +14,5 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   type: 1
   effect: {fileID: 11400000, guid: 3e4f165effe58eb42b45a1abe6f895ae, type: 2}
+  weakness: 0
+  description: Slows down enemies for 1s per bullet.
diff --git a/Assets/ScriptableObjects/Elements/ElementInfos/WaterElement.asset b/Assets/ScriptableObjects/Elements/ElementInfos/WaterElement.asset
@@ -15,3 +15,4 @@ MonoBehaviour:
   type: 2
   effect: {fileID: 11400000, guid: a620402c788011848a12b7a2ef9ad464, type: 2}
   weakness: 1
+  description: Reduces ATK by 5 for 5s.
diff --git a/Assets/ScriptableObjects/Spells/SuperDoodle.asset b/Assets/ScriptableObjects/Spells/SuperDoodle.asset
@@ -13,8 +13,8 @@ MonoBehaviour:
   m_Name: SuperDoodle
   m_EditorClassIdentifier: 
   spellName: Super Doodle
-  description: Regenerates Doodle's health by 10% per second and increase his attack
-    by 30 damages in the next 10 seconds!
+  description: Regenerates Doodle's health by 10% per second and increase their DMG
+    by 30 in the next 10 seconds!
   cost: 20
   level: 1
   cooldownTime: 40

diff --git a/Assets/ScriptableObjects/Towers/Ballista/0_BallistaBase.asset b/Assets/ScriptableObjects/Towers/Ballista/0_BallistaBase.asset
@@ -17,7 +17,6 @@ MonoBehaviour:
   towerDesc: 'Arrows explode on impact, dealing to the area damage and elemental
     effects.
 
-
 '
   range: 3
   upgradeNum: 0

diff --git a/Assets/ScriptableObjects/Towers/Ballista/0_BallistaFire.asset b/Assets/ScriptableObjects/Towers/Ballista/0_BallistaFire.asset
@@ -14,12 +14,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   towerName: Fire Ballista
   sprite: {fileID: 21300000, guid: ab714a7e068cc4ea0b5bb8255526711e, type: 3}
-  towerDesc: 'Deals DoT to enemies for 5 seconds
-
-    (Fire + Ice: Decreases enemy
-    defense for 5 seconds)
-
-    (Fire + Water: Deal DoT in one burst)'
+  towerDesc: Arrows explode on impact, dealing to the area damage and elemental effects.
   range: 3
   upgradeNum: 0
   fireRate: 1

diff --git a/Assets/ScriptableObjects/Towers/Ballista/0_BallistaIce.asset b/Assets/ScriptableObjects/Towers/Ballista/0_BallistaIce.asset
@@ -14,7 +14,10 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   towerName: Ice Ballista
   sprite: {fileID: 21300000, guid: 2924bd8bda1a8479a84bee012b7bbf75, type: 3}
-  towerDesc: 
+  towerDesc: 'Arrows explode on impact, dealing to the area damage and elemental
+    effects.
+
+'
   range: 3
   upgradeNum: 0
   fireRate: 1