Merge branch 'develop' into feature/Add-buttons-to-cheat-window

Author: LPLafontaineB

Assets/BossRoom/GameData/Action/Archer/ArcherBaseAttack.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:21a470a8f30ac8d33fcebc3a0da8d0d6cd5d4459ec3860fe2897e4481fd7c142
-size 1185
+oid sha256:add1740f30f9604edabacd15b1667e7e87e8d87f7e7f460df83283493815be6f
+size 1190

Assets/BossRoom/GameData/Action/Boss/BossImpBaseAttack.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f42c8b44098bce11f911f490c2a9b591154ec91ea45ac7f976bcf4fd9a777d90
-size 893
+oid sha256:78a688221c3c529b0ad804a5b0f9124886aea12bb393066d8aa35e4578d9e6a1
+size 916

Assets/BossRoom/GameData/Action/Boss/BossImpTrampleAttack.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:db2842d2b13725ad76131a5033581688d829341806fa39a4acc6695f54edc30e
-size 995
+oid sha256:e931108c6883dc893a12f829d908afcf5f266246c8897d7f7074f1c92410262d
+size 1016

Assets/BossRoom/GameData/Action/Imp/ImpBaseAttack.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a98f1f8a7a639885e253211c2db5d07a2a584b8f1278a85bf65b9b9f1e69f104
-size 891
+oid sha256:394895e048b1e10db039698943484303db2a89e69dcb57d329ce627e0145eaac
+size 913

Assets/BossRoom/GameData/Action/Mage/MageBaseAttack.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ef8c664c1fa4913e17558d5d856f619841e865406e737be18e17e0380df75635
-size 1237
+oid sha256:7e5be6a23abcddd484cc7260eeb5994d71819db7b38d3e86e8cb71bf6ce5d70c
+size 1240

Assets/BossRoom/GameData/Action/Mage/MageHeal.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c31e29db020255b5b54a4153b3692e757474629c0dfcf88e865926ccf0e439a1
-size 1111
+oid sha256:74ab0fac7294b7d7a2445fcb3446f3407813756a6f747a1ade70ac8ba12df3b6
+size 1114

Assets/BossRoom/GameData/Action/Rogue/RogueBaseAttack.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fca28ad3dfb101896c93e1bffb13a0c7e2c6343bc9ba82ff132f366eb0d94777
+oid sha256:632593cdc46477fe5ac9d0723c5486a094c146b690f201c6e4e3d1cd2f52420e
 size 1041

Assets/BossRoom/GameData/Action/Rogue/RogueDashAttack.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fea3f4f1d992f72a3d6b970a2d333a9d4e798b9b6ed47a3cb561bc5fbca8ecce
-size 1109
+oid sha256:51cf453826c56dbe95e242f997f7d89e3d9088346b0eac1ef0dfe286688bb0f5
+size 1107

Assets/BossRoom/GameData/Action/Tank/TankBaseAttack.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f410171a065de91b302077a46b292de2134cefde702c0fb9030b0be51dc338bd
-size 1033
+oid sha256:80c72a81acc09cc7c11c34daf87b425726759f25bb736530272e63703cefbc6f
+size 1034

Assets/BossRoom/GameData/Action/Tank/TankShieldBuff.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:62c559c1217f50f851e9cebc82a25a3a657f0e03c5778fa3397dbcf5cadf43d4
-size 1345
+oid sha256:f052fd6beabaf4e1bf4d5607e42ead147b165f59a5a36b519ed056642d5dd86a
+size 1367

Assets/BossRoom/GameData/Character/Archer/Archer.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:46af12e5b6fa15272734ec6f61b68490cf226ab91879b1a59d0c76fcdd6254a7
+oid sha256:9d525de16846e73d76bc72eb190c57ea8d35257d79d6da6ab1d3b3775955d0d7
 size 782

Assets/BossRoom/GameData/Character/Imp/Imp.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:320a6fd1653e534b4c85d9c8b4a55037adfc6c11f356d92253c051f888e671d5
+oid sha256:43e076424e36f94f11d46a4b2d88d30a94457458535d89ee20f302d7c19f49c4
 size 659

Assets/BossRoom/GameData/Character/ImpBoss/ImpBoss.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4fc71ffcb26824597f21af7610672dc907d791aedf1bae232d155f96c857dede
+oid sha256:82289028624e8b897ca15a2b4f568f473dc232ca52a507bee6aa020fa92d1a04
 size 666

Assets/BossRoom/GameData/Character/Mage/Mage.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eef86ade765d6f6732976451e436630c1a0aeae573ed6e8ed6c1f4d91dc46c95
+oid sha256:3eaf176772d79ce896b5b0a291f6e70de5fed160891da4e1268ea33b40e56b82
 size 777

Assets/BossRoom/GameData/Character/Rogue/Rogue.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:da201b412899840350e9f55fe5e692bcf0c0a962b10f9c0651863f37e76cd5d0
+oid sha256:851dc11f3c17e3416b1957397a5e89d7aca441f3d9d6681bc701966da3516541
 size 780

Assets/BossRoom/GameData/Character/Tank/Tank.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:899af2464725b90fb7e7ff4d6e668016d57dc5006ba8fec32db7e1ea0496b1e1
+oid sha256:d223ee27a5e5c44fe5a98342f9e997dc00e4afd11f8a8cd6a537eaef40460f30
 size 777

Assets/BossRoom/Models/Animation Controllers/CharacterSetController.controller

@@ -1396,7 +1396,7 @@ AnimatorState:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: SkillHeal
-  m_Speed: 1
+  m_Speed: 1.2
   m_CycleOffset: 0
   m_Transitions:
   - {fileID: 7908433373164699421}
@@ -2229,7 +2229,7 @@ AnimatorState:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: TankShieldBuff (start)
-  m_Speed: 1
+  m_Speed: 1.2
   m_CycleOffset: 0
   m_Transitions:
   - {fileID: 8849726690194494114}
@@ -2914,7 +2914,7 @@ AnimatorState:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Attack1
-  m_Speed: 1
+  m_Speed: 1.66
   m_CycleOffset: 0
   m_Transitions:
   - {fileID: -3576141394984483750}

Assets/BossRoom/Models/Animation Controllers/DoorController.controller

@@ -139,7 +139,7 @@ AnimatorState:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Closed
-  m_Speed: -1
+  m_Speed: -1.5
   m_CycleOffset: 0
   m_Transitions:
   - {fileID: 2526322587758064571}

Assets/BossRoom/Prefabs/CharGFX/PlayerGraphics_Rogue.prefab

@@ -167,7 +167,7 @@ MonoBehaviour:
   - m_AnimatorNodeName: Attack1
     m_AnimatorNodeNameHash: -47317214
     m_Prefab: {fileID: 2787649059963953560, guid: 5121957b2fabba043a36ec5641e54be7, type: 3}
-    m_PrefabSpawnDelaySeconds: 0.8
+    m_PrefabSpawnDelaySeconds: 0.4
     m_PrefabCanBeAbortedUntilSecs: 0
     m_PrefabParent: {fileID: 0}
     m_PrefabParentOffset: {x: 0, y: 0, z: 0}

Assets/BossRoom/Prefabs/UI/CharacterSelectCanvas.prefab

@@ -2256,7 +2256,6 @@ RectTransform:
   - {fileID: 5940892341081814334}
   - {fileID: 5940892341616097038}
   - {fileID: 5940892342402192878}
-  - {fileID: 5940892342009533631}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2326,138 +2325,6 @@ MonoBehaviour:
   m_BlockingMask:
     serializedVersion: 2
     m_Bits: 4294967295
---- !u!1 &5940892342009533628
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 5940892342009533631}
-  - component: {fileID: 5940892342009533600}
-  - component: {fileID: 5940892342009533601}
-  - component: {fileID: 5940892342009533630}
-  m_Layer: 5
-  m_Name: ExitButton
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &5940892342009533631
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5940892342009533628}
-  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: 5940892341882885326}
-  m_RootOrder: 9
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 1}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 2, y: -2}
-  m_SizeDelta: {x: 60, y: 60}
-  m_Pivot: {x: 1, y: 1}
---- !u!222 &5940892342009533600
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5940892342009533628}
-  m_CullTransparentMesh: 1
---- !u!114 &5940892342009533601
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5940892342009533628}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: 60ca69669387e034393c7f486bf3ae19, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 1
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!114 &5940892342009533630
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5940892342009533628}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_WrapAround: 0
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Selected
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 5940892342009533601}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls:
-      - m_Target: {fileID: 0}
-        m_TargetAssemblyTypeName: BossRoom.Client.ClientCharSelectState, BossRoom.Client
-        m_MethodName: OnPlayerExit
-        m_Mode: 1
-        m_Arguments:
-          m_ObjectArgument: {fileID: 0}
-          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
-          m_IntArgument: 0
-          m_FloatArgument: 0
-          m_StringArgument: 
-          m_BoolArgument: 0
-        m_CallState: 2
 --- !u!1 &5940892342078424648
 GameObject:
   m_ObjectHideFlags: 0
@@ -4045,14 +3912,14 @@ PrefabInstance:
       objectReference: {fileID: 21300000, guid: 3deeeda2d4bbab248b53d86205131eec, type: 3}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: ff848390065bf914fb60582f4d872815, type: 3}
---- !u!224 &4148434299653504326 stripped
+--- !u!224 &8367260898287675216 stripped
 RectTransform:
-  m_CorrespondingSourceObject: {fileID: 7773346133266671123, guid: ff848390065bf914fb60582f4d872815, type: 3}
+  m_CorrespondingSourceObject: {fileID: 2768642224677944325, guid: ff848390065bf914fb60582f4d872815, type: 3}
   m_PrefabInstance: {fileID: 5940892341121358677}
   m_PrefabAsset: {fileID: 0}
---- !u!224 &8367260898287675216 stripped
+--- !u!224 &4148434299653504326 stripped
 RectTransform:
-  m_CorrespondingSourceObject: {fileID: 2768642224677944325, guid: ff848390065bf914fb60582f4d872815, type: 3}
+  m_CorrespondingSourceObject: {fileID: 7773346133266671123, guid: ff848390065bf914fb60582f4d872815, type: 3}
   m_PrefabInstance: {fileID: 5940892341121358677}
   m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5940892341293245294
@@ -4477,14 +4344,14 @@ PrefabInstance:
       objectReference: {fileID: 21300000, guid: f69b90ed162b0584b8c989ba5bdd268f, type: 3}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: ff848390065bf914fb60582f4d872815, type: 3}
---- !u!224 &4148434299847700733 stripped
+--- !u!224 &8367260898093476587 stripped
 RectTransform:
-  m_CorrespondingSourceObject: {fileID: 7773346133266671123, guid: ff848390065bf914fb60582f4d872815, type: 3}
+  m_CorrespondingSourceObject: {fileID: 2768642224677944325, guid: ff848390065bf914fb60582f4d872815, type: 3}
   m_PrefabInstance: {fileID: 5940892341466552046}
   m_PrefabAsset: {fileID: 0}
---- !u!224 &8367260898093476587 stripped
+--- !u!224 &4148434299847700733 stripped
 RectTransform:
-  m_CorrespondingSourceObject: {fileID: 2768642224677944325, guid: ff848390065bf914fb60582f4d872815, type: 3}
+  m_CorrespondingSourceObject: {fileID: 7773346133266671123, guid: ff848390065bf914fb60582f4d872815, type: 3}
   m_PrefabInstance: {fileID: 5940892341466552046}
   m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5940892341536731491