UI Issues resolved

21 hours ago · 52e801e8b2
parent 5d9877b6ec
commit 52e801e8b2
18 changed files with 1478 additions and 207 deletions
--- a/Assets/GameData/Action/Archer/ArcherBaseAttack.asset
+++ b/Assets/GameData/Action/Archer/ArcherBaseAttack.asset
@ -33,6 +33,7 @@ MonoBehaviour:
    Radius: 0
    ActionInput: {fileID: 0}
    ActionInterruptible: 0
+    IsInterruptableBy: []
    BlockingMode: 0
    Projectiles:
    - ProjectilePrefab: {fileID: 2842198241268549130, guid: 30c420f004b8f6445ad2bdb2addb234a, type: 3}
@ -42,6 +43,6 @@ MonoBehaviour:
      MaxVictims: 1
    Spawns: []
    IsFriendly: 0
-    Icon: {fileID: 21300000, guid: 81a26dad52a33d44db38d191f7a1b6a0, type: 3}
+    Icon: {fileID: 21300000, guid: f8b16f75eac08a14191e168ee8eb1bc3, type: 3}
    DisplayedName: Ranged Shot
    Description: Fire an arrow at a target.
--- a/Assets/GameData/Action/Archer/ArcherChargedShot.asset
+++ b/Assets/GameData/Action/Archer/ArcherChargedShot.asset
@ -33,6 +33,7 @@ MonoBehaviour:
    Radius: 0
    ActionInput: {fileID: 5527641269166010573, guid: 14af79f616f5af84096f27ab81c739f1, type: 3}
    ActionInterruptible: 1
+    IsInterruptableBy: []
    BlockingMode: 0
    Projectiles:
    - ProjectilePrefab: {fileID: 2842198241268549130, guid: 7e3b8103f5622f64fa677352730f295c, type: 3}
@ -53,7 +54,7 @@ MonoBehaviour:
    Spawns:
    - {fileID: 2317072454108786653, guid: dd6cb96318a49f84caca6f62c8494ce9, type: 3}
    IsFriendly: 0
-    Icon: {fileID: 21300000, guid: 4938c18455b902748ba6007690f999ff, type: 3}
+    Icon: {fileID: 21300000, guid: 270e9413a7ececc4a905cf5f0f09ce37, type: 3}
    DisplayedName: Charged Shot
    Description: Fire an arrow at a target. Charge it up to increase speed, damage,
      and pierce.
--- a/Assets/GameData/Action/Archer/ArcherVolley.asset
+++ b/Assets/GameData/Action/Archer/ArcherVolley.asset
@ -33,11 +33,12 @@ MonoBehaviour:
    Radius: 4
    ActionInput: {fileID: 8447158110562487606, guid: 88beb3857541f46d9becf14ba3392b89, type: 3}
    ActionInterruptible: 0
+    IsInterruptableBy: []
    BlockingMode: 0
    Projectiles: []
    Spawns:
    - {fileID: 2232111375016833989, guid: 7dd0f80347606ff409a2db4f0aa3ef97, type: 3}
    IsFriendly: 0
-    Icon: {fileID: 21300000, guid: a6ec8825aed32a4429df5e20eb9a9986, type: 3}
+    Icon: {fileID: 21300000, guid: 17827bdf7594ccf478a114bea8394e2b, type: 3}
    DisplayedName: Volley
    Description: Fire a stream of arrows at a target, hitting everyone in the area.
--- a/Assets/GameData/Action/Tank/TankBaseAttack.asset
+++ b/Assets/GameData/Action/Tank/TankBaseAttack.asset
@ -33,10 +33,11 @@ MonoBehaviour:
    Radius: 0
    ActionInput: {fileID: 0}
    ActionInterruptible: 0
+    IsInterruptableBy: []
    BlockingMode: 0
    Projectiles: []
    Spawns: []
    IsFriendly: 0
-    Icon: {fileID: 21300000, guid: c545bd0fd28c988429e5f9aa9d5f5979, type: 3}
+    Icon: {fileID: 21300000, guid: 17827bdf7594ccf478a114bea8394e2b, type: 3}
    DisplayedName: Battle Hammer
    Description: A mighty swing of your trusty hammer.
--- a/Assets/GameData/Action/Tank/TankShieldBuff.asset
+++ b/Assets/GameData/Action/Tank/TankShieldBuff.asset
@ -40,7 +40,7 @@ MonoBehaviour:
    - {fileID: 8834900904437940868, guid: a3cdb4a5796d8734fbec35d8c37b03aa, type: 3}
    - {fileID: 8834900904437940868, guid: 70450cb42ad356540a5103f30a41894e, type: 3}
    IsFriendly: 0
-    Icon: {fileID: 21300000, guid: 7113c11aec341254daf7144dec1cd2eb, type: 3}
+    Icon: {fileID: 21300000, guid: f8b16f75eac08a14191e168ee8eb1bc3, type: 3}
    DisplayedName: Shield Aura
    Description: Create a protective aura around yourself. Hold to increase damage
      reduction. At maximum charge, grants brief invulnerability.
--- a/Assets/GameData/Avatars/MystoBoy.asset
+++ b/Assets/GameData/Avatars/MystoBoy.asset
@ -13,7 +13,7 @@ MonoBehaviour:
  m_Name: MystoBoy
  m_EditorClassIdentifier: 
  m_Guid: 203d35f8e617fe49afbe698054593db9
-  CharacterClass: {fileID: 11400000, guid: db88eb88b930a224fa45fc4e1f943088, type: 2}
+  CharacterClass: {fileID: 11400000, guid: 358012a7531bbb644bc269602d1ddaed, type: 2}
  Graphics: {fileID: 8385572559299522089, guid: d27be51c72c4bf94aa40b5d1abc3448a, type: 3}
  GraphicsCharacterSelect: {fileID: 2659104054394259377, guid: 83b3c8955cb37d14a9daa025085705f7, type: 3}
  Portrait: {fileID: 0}
--- a/Assets/GameData/Character/Archer/Archer.asset
+++ b/Assets/GameData/Character/Archer/Archer.asset
@ -15,12 +15,12 @@ MonoBehaviour:
  CharacterType: 1
  Skill1: {fileID: 11400000, guid: 6bb7a54035ae54ecdb3659079e2ca02d, type: 2}
  Skill2: {fileID: 11400000, guid: e5337a36159e240d4bc6f7d22e0e285c, type: 2}
-  Skill3: {fileID: 11400000, guid: 04306d18d41f34bd0a0df0bf2520bb10, type: 2}
+  Skill3: {fileID: 0}
  BaseHP: {fileID: 11400000, guid: 80bc32ca239f29b4988ced931d09e65e, type: 2}
  BaseMana: 20
  Speed: 5
  IsNpc: 0
  DetectRange: 0
  DisplayedName: ARCHER
-  ClassBannerLit: {fileID: 21300000, guid: 42531d2bb6967fa4397cb7694a913fdd, type: 3}
-  ClassBannerUnlit: {fileID: 21300000, guid: 7dff3761ce77b954ea946f98d4022c70, type: 3}
+  ClassBannerLit: {fileID: 21300000, guid: da764beb66bc5474e91710e2b3fcd2a1, type: 3}
+  ClassBannerUnlit: {fileID: 21300000, guid: da764beb66bc5474e91710e2b3fcd2a1, type: 3}
--- a/Assets/GameData/Character/Tank/Tank.asset
+++ b/Assets/GameData/Character/Tank/Tank.asset
@ -22,5 +22,5 @@ MonoBehaviour:
  IsNpc: 0
  DetectRange: 0
  DisplayedName: TANK
-  ClassBannerLit: {fileID: 21300000, guid: 276e272d29e17bd49abbcb6deda9c561, type: 3}
-  ClassBannerUnlit: {fileID: 21300000, guid: ef4745fdf5e90984e8a9330d9beadcbc, type: 3}
+  ClassBannerLit: {fileID: 21300000, guid: e607ff9ed4f91e24583f7c463bc10fd0, type: 3}
+  ClassBannerUnlit: {fileID: 21300000, guid: e607ff9ed4f91e24583f7c463bc10fd0, type: 3}
--- a/Assets/Prefabs/PlayerName
+++ b/Assets/Prefabs/PlayerName
@ -34,8 +34,8 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: -7.5}
-  m_SizeDelta: {x: 0, y: -15}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8094484515574096654
 CanvasRenderer:
@ -65,7 +65,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_text: Player2
+  m_text: Player
  m_isRightToLeft: 0
  m_fontAsset: {fileID: 11400000, guid: f50a897396f820e4a85fdbfa9ec1251b, type: 2}
  m_sharedMaterial: {fileID: 924789733308139946, guid: f50a897396f820e4a85fdbfa9ec1251b, type: 2}
@ -74,8 +74,8 @@ MonoBehaviour:
  m_fontMaterials: []
  m_fontColor32:
    serializedVersion: 2
-    rgba: 4294967295
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+    rgba: 4278234871
+  m_fontColor: {r: 0.9686275, g: 0.68235296, b: 0, a: 1}
  m_enableVertexGradient: 0
  m_colorMode: 3
  m_fontColorGradient:
@ -92,12 +92,12 @@ MonoBehaviour:
  m_faceColor:
    serializedVersion: 2
    rgba: 4294967295
-  m_fontSize: 40.7
+  m_fontSize: 30
  m_fontSizeBase: 12
  m_fontWeight: 400
  m_enableAutoSizing: 1
  m_fontSizeMin: 10
-  m_fontSizeMax: 40.7
+  m_fontSizeMax: 30
  m_fontStyle: 0
  m_HorizontalAlignment: 2
  m_VerticalAlignment: 512
--- a/Assets/Scenes/CharSelect.unity
+++ b/Assets/Scenes/CharSelect.unity
@ -151,14 +151,14 @@ 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_ConstrainProportionsScale: 1
+  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 2114354329}
  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: 25.7, y: 54.7}
-  m_SizeDelta: {x: 195, y: 289}
+  m_AnchoredPosition: {x: 22.5, y: 34}
+  m_SizeDelta: {x: 223, y: 288}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &884573
 MonoBehaviour:
@ -576,9 +576,9 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 1}
  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 148, y: -188}
-  m_SizeDelta: {x: 220, y: 40}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -216.6}
+  m_SizeDelta: {x: 436, y: 75}
+  m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &33743619
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -599,7 +599,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: ac1ab0ffbf410094088db89d509a3a4a, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 8ec43c488ef3a87419c74c8ffa25d7f2, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
@ -1192,8 +1192,8 @@ MonoBehaviour:
  m_fontMaterials: []
  m_fontColor32:
    serializedVersion: 2
-    rgba: 4286895095
-  m_fontColor: {r: 0.96862745, g: 0.827451, b: 0.5176471, a: 1}
+    rgba: 4281843967
+  m_fontColor: {r: 1, g: 0.7529412, b: 0.21568628, a: 1}
  m_enableVertexGradient: 0
  m_colorMode: 3
  m_fontColorGradient:
@ -6160,8 +6160,8 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0}
  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 24.7}
-  m_SizeDelta: {x: 247.6371, y: 55}
+  m_AnchoredPosition: {x: 0, y: 2.4001}
+  m_SizeDelta: {x: 247.6371, y: 70}
  m_Pivot: {x: 0.5, y: 0}
 --- !u!114 &146486438
 MonoBehaviour:
@ -6547,7 +6547,7 @@ MonoBehaviour:
  m_Animator: {fileID: 1045795394}
  m_AnimatorTriggerWhenLockedIn: LockedIn
  m_AnimatorTriggerWhenUnlocked: Unlocked
-  m_CharacterClass: 0
+  m_CharacterClass: 1
 --- !u!222 &163643423
 CanvasRenderer:
  m_ObjectHideFlags: 0
@ -6815,6 +6815,7 @@ RectTransform:
  - {fileID: 571901558}
  - {fileID: 450670431}
  - {fileID: 1354427673}
+  - {fileID: 817396987}
  - {fileID: 1709149068}
  m_Father: {fileID: 1299736799}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -7303,7 +7304,7 @@ RectTransform:
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 1, y: 1}
  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: -52, y: 0}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &279595091
 MonoBehaviour:
@ -7329,15 +7330,15 @@ MonoBehaviour:

 '
  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: f50a897396f820e4a85fdbfa9ec1251b, type: 2}
-  m_sharedMaterial: {fileID: 924789733308139946, guid: f50a897396f820e4a85fdbfa9ec1251b, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 9d164d34f5634c546ab5f9897450b32c, type: 2}
+  m_sharedMaterial: {fileID: 5992927229328225322, guid: 9d164d34f5634c546ab5f9897450b32c, type: 2}
  m_fontSharedMaterials: []
  m_fontMaterial: {fileID: 0}
  m_fontMaterials: []
  m_fontColor32:
    serializedVersion: 2
-    rgba: 4286176511
-  m_fontColor: {r: 1, g: 0.8612724, b: 0.4764151, a: 1}
+    rgba: 4281778175
+  m_fontColor: {r: 1, g: 0.7500976, b: 0.21226418, a: 1}
  m_enableVertexGradient: 0
  m_colorMode: 3
  m_fontColorGradient:
@ -7354,14 +7355,14 @@ MonoBehaviour:
  m_faceColor:
    serializedVersion: 2
    rgba: 4294967295
-  m_fontSize: 20
-  m_fontSizeBase: 20
+  m_fontSize: 38
+  m_fontSizeBase: 38
  m_fontWeight: 400
  m_enableAutoSizing: 0
  m_fontSizeMin: 18
  m_fontSizeMax: 72
  m_fontStyle: 0
-  m_HorizontalAlignment: 2
+  m_HorizontalAlignment: 1
  m_VerticalAlignment: 512
  m_textAlignment: 65535
  m_characterSpacing: 0
@ -13040,8 +13041,8 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0}
  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 24.7}
-  m_SizeDelta: {x: 247.6371, y: 55}
+  m_AnchoredPosition: {x: 0, y: 2.4001}
+  m_SizeDelta: {x: 247.6371, y: 70}
  m_Pivot: {x: 0.5, y: 0}
 --- !u!114 &376708975
 MonoBehaviour:
@ -13580,7 +13581,7 @@ MonoBehaviour:
  m_Animator: {fileID: 908722318}
  m_AnimatorTriggerWhenLockedIn: LockedIn
  m_AnimatorTriggerWhenUnlocked: Unlocked
-  m_CharacterClass: 0
+  m_CharacterClass: 1
 --- !u!222 &407924111
 CanvasRenderer:
  m_ObjectHideFlags: 0
@ -13777,8 +13778,8 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0}
  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 24.7}
-  m_SizeDelta: {x: 247.6371, y: 55}
+  m_AnchoredPosition: {x: 0, y: 2.4001}
+  m_SizeDelta: {x: 247.6371, y: 70}
  m_Pivot: {x: 0.5, y: 0}
 --- !u!114 &448811029
 MonoBehaviour:
@ -25730,6 +25731,81 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 664569834}
  m_CullTransparentMesh: 1
+--- !u!1 &666047898
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 666047899}
+  - component: {fileID: 666047901}
+  - component: {fileID: 666047900}
+  m_Layer: 5
+  m_Name: Shield
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &666047899
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 666047898}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1313488843}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: -89.59994, y: 94.69995}
+  m_SizeDelta: {x: 100, y: 40}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!114 &666047900
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 666047898}
+  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: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: da764beb66bc5474e91710e2b3fcd2a1, 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!222 &666047901
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 666047898}
+  m_CullTransparentMesh: 1
 --- !u!1 &685481125
 GameObject:
  m_ObjectHideFlags: 0
@ -26499,11 +26575,11 @@ RectTransform:
  m_ConstrainProportionsScale: 0
  m_Children:
  - {fileID: 1721773004}
-  m_Father: {fileID: 1709149068}
+  m_Father: {fileID: 219125661}
  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: 0, y: 46.3}
+  m_AnchoredPosition: {x: 0, y: -346.7}
  m_SizeDelta: {x: 244, y: 92}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &817396988
@ -34568,6 +34644,7 @@ RectTransform:
  - {fileID: 1948098172}
  - {fileID: 1018808623}
  - {fileID: 1566657311}
+  - {fileID: 475559749611936206}
  - {fileID: 1845783039}
  - {fileID: 1329352650181373817}
  m_Father: {fileID: 0}
@ -34701,6 +34778,7 @@ RectTransform:
  m_ConstrainProportionsScale: 0
  m_Children:
  - {fileID: 7227755882822113485}
+  - {fileID: 666047899}
  - {fileID: 2849120150730929358}
  m_Father: {fileID: 628160980058094011}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -39917,7 +39995,7 @@ MonoBehaviour:
  m_Animator: {fileID: 633645329}
  m_AnimatorTriggerWhenLockedIn: LockedIn
  m_AnimatorTriggerWhenUnlocked: Unlocked
-  m_CharacterClass: 0
+  m_CharacterClass: 1
 --- !u!222 &1368274857
 CanvasRenderer:
  m_ObjectHideFlags: 0
@ -40116,8 +40194,8 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0}
  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 24.7}
-  m_SizeDelta: {x: 247.6371, y: 55}
+  m_AnchoredPosition: {x: 0, y: 2.4001}
+  m_SizeDelta: {x: 247.6371, y: 70}
  m_Pivot: {x: 0.5, y: 0}
 --- !u!114 &1405919680
 MonoBehaviour:
@ -40400,7 +40478,7 @@ RectTransform:
  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: 25.7, y: 54.7}
+  m_AnchoredPosition: {x: 36.2, y: 58.6}
  m_SizeDelta: {x: 195, y: 289}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1453946054
@ -40728,7 +40806,7 @@ MonoBehaviour:
  m_Animator: {fileID: 495899153}
  m_AnimatorTriggerWhenLockedIn: LockedIn
  m_AnimatorTriggerWhenUnlocked: Unlocked
-  m_CharacterClass: 0
+  m_CharacterClass: 1
 --- !u!222 &1491145544
 CanvasRenderer:
  m_ObjectHideFlags: 0
@ -41143,8 +41221,8 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0}
  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 24.7}
-  m_SizeDelta: {x: 247.6371, y: 55}
+  m_AnchoredPosition: {x: 0, y: 2.4001}
+  m_SizeDelta: {x: 247.6371, y: 70}
  m_Pivot: {x: 0.5, y: 0}
 --- !u!114 &1538361077
 MonoBehaviour:
@ -41277,7 +41355,7 @@ RectTransform:
  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: 36.16, y: 85.13}
+  m_AnchoredPosition: {x: 22.5, y: 62}
  m_SizeDelta: {x: 223, y: 288}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1563843544
@ -41896,19 +41974,19 @@ PrefabInstance:
    - target: {fileID: 3565665953789623673, guid: 1a58a2c4657fe6d4890d9ad39f43894e, type: 3}
      propertyPath: AvatarConfiguration.Array.data[0]
      value: 
-      objectReference: {fileID: 11400000, guid: e32151d48a3abe543b4e57d6cd16e1ad, type: 2}
+      objectReference: {fileID: 11400000, guid: fa8428fd367466845902f7366cf13fb4, type: 2}
    - target: {fileID: 3565665953789623673, guid: 1a58a2c4657fe6d4890d9ad39f43894e, type: 3}
      propertyPath: AvatarConfiguration.Array.data[1]
      value: 
-      objectReference: {fileID: 11400000, guid: fa8428fd367466845902f7366cf13fb4, type: 2}
+      objectReference: {fileID: 11400000, guid: e32151d48a3abe543b4e57d6cd16e1ad, type: 2}
    - target: {fileID: 3565665953789623673, guid: 1a58a2c4657fe6d4890d9ad39f43894e, type: 3}
      propertyPath: AvatarConfiguration.Array.data[2]
      value: 
-      objectReference: {fileID: 11400000, guid: 732834deb1e677541bd1c2aef937f608, type: 2}
+      objectReference: {fileID: 11400000, guid: fa8428fd367466845902f7366cf13fb4, type: 2}
    - target: {fileID: 3565665953789623673, guid: 1a58a2c4657fe6d4890d9ad39f43894e, type: 3}
      propertyPath: AvatarConfiguration.Array.data[3]
      value: 
-      objectReference: {fileID: 11400000, guid: f3963f718ed4cea40b8f6e9e4a3dd80e, type: 2}
+      objectReference: {fileID: 11400000, guid: e32151d48a3abe543b4e57d6cd16e1ad, type: 2}
    - target: {fileID: 3565665953789623674, guid: 1a58a2c4657fe6d4890d9ad39f43894e, type: 3}
      propertyPath: m_ClassInfoBox
      value: 
@ -42652,7 +42730,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1709149068
 RectTransform:
  m_ObjectHideFlags: 0
@ -42665,7 +42743,6 @@ RectTransform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
-  - {fileID: 817396987}
  - {fileID: 735073816}
  m_Father: {fileID: 219125661}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -42821,8 +42898,8 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 3.5999985}
-  m_SizeDelta: {x: -19.999996, y: -7.199999}
+  m_AnchoredPosition: {x: 0, y: 5}
+  m_SizeDelta: {x: -20, y: -10.000001}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1721773005
 MonoBehaviour:
@ -42871,12 +42948,12 @@ MonoBehaviour:
  m_faceColor:
    serializedVersion: 2
    rgba: 4294967295
-  m_fontSize: 61.4
+  m_fontSize: 50.4
  m_fontSizeBase: 51.1
  m_fontWeight: 400
  m_enableAutoSizing: 1
  m_fontSizeMin: 18
-  m_fontSizeMax: 72
+  m_fontSizeMax: 50.4
  m_fontStyle: 0
  m_HorizontalAlignment: 2
  m_VerticalAlignment: 512
@ -42983,7 +43060,7 @@ MonoBehaviour:
  m_Animator: {fileID: 1123734736}
  m_AnimatorTriggerWhenLockedIn: LockedIn
  m_AnimatorTriggerWhenUnlocked: Unlocked
-  m_CharacterClass: 0
+  m_CharacterClass: 1
 --- !u!222 &1737986819
 CanvasRenderer:
  m_ObjectHideFlags: 0
@ -43119,7 +43196,7 @@ RectTransform:
  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: 36.16, y: 85.13}
+  m_AnchoredPosition: {x: 22.5, y: 62}
  m_SizeDelta: {x: 223, y: 288}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1749338650
@ -43951,13 +44028,12 @@ RectTransform:
  m_ConstrainProportionsScale: 0
  m_Children:
  - {fileID: 121679850}
-  - {fileID: 475559749611936206}
  m_Father: {fileID: 1299736799}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 1}
  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 8.266113, y: -250.9399}
-  m_SizeDelta: {x: 436.885, y: 75}
+  m_AnchoredPosition: {x: 0, y: -311.22}
+  m_SizeDelta: {x: 436, y: 75}
  m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &1845783040
 MonoBehaviour:
@ -49097,7 +49173,7 @@ MonoBehaviour:
  m_Animator: {fileID: 1516425081}
  m_AnimatorTriggerWhenLockedIn: LockedIn
  m_AnimatorTriggerWhenUnlocked: Unlocked
-  m_CharacterClass: 0
+  m_CharacterClass: 1
 --- !u!222 &1879582777
 CanvasRenderer:
  m_ObjectHideFlags: 0
@ -49587,7 +49663,7 @@ MonoBehaviour:
  m_Animator: {fileID: 1951406557}
  m_AnimatorTriggerWhenLockedIn: LockedIn
  m_AnimatorTriggerWhenUnlocked: Unlocked
-  m_CharacterClass: 0
+  m_CharacterClass: 1
 --- !u!222 &1956077635
 CanvasRenderer:
  m_ObjectHideFlags: 0
@ -50443,8 +50519,8 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0}
  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 24.7}
-  m_SizeDelta: {x: 247.6371, y: 55}
+  m_AnchoredPosition: {x: 0, y: 2.4001}
+  m_SizeDelta: {x: 247.6371, y: 70}
  m_Pivot: {x: 0.5, y: 0}
 --- !u!114 &2070357042
 MonoBehaviour:
@ -50888,14 +50964,14 @@ 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_ConstrainProportionsScale: 1
+  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 2097717846}
  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: 25.7, y: 54.7}
-  m_SizeDelta: {x: 195, y: 289}
+  m_AnchoredPosition: {x: 22.5, y: 34}
+  m_SizeDelta: {x: 223, y: 288}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2119500356
 MonoBehaviour:
@ -51044,8 +51120,8 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0}
  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 24.7}
-  m_SizeDelta: {x: 247.6371, y: 55}
+  m_AnchoredPosition: {x: 0, y: 2.4001}
+  m_SizeDelta: {x: 247.6371, y: 70}
  m_Pivot: {x: 0.5, y: 0}
 --- !u!114 &2133440551
 MonoBehaviour:
@ -51292,8 +51368,8 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0}
  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 24.7}
-  m_SizeDelta: {x: 247.6371, y: 55}
+  m_AnchoredPosition: {x: 0, y: 2.4001}
+  m_SizeDelta: {x: 247.6371, y: 70}
  m_Pivot: {x: 0.5, y: 0}
 --- !u!224 &31381581770529050
 RectTransform:
@ -51629,7 +51705,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &239969298079897802
 GameObject:
  m_ObjectHideFlags: 0
@ -52513,17 +52589,17 @@ RectTransform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 3822911379485683988}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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_ConstrainProportionsScale: 0
  m_Children:
  - {fileID: 5978592701949990100}
-  m_Father: {fileID: 1845783039}
+  m_Father: {fileID: 1299736799}
  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: 179.4, y: -263}
+  m_AnchoredPosition: {x: -873.8915, y: 206.06015}
  m_SizeDelta: {x: 557, y: 129}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &548950177547064291
@ -60346,7 +60422,7 @@ RectTransform:
  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: 25.7, y: 54.7}
+  m_AnchoredPosition: {x: 36.2, y: 58.6}
  m_SizeDelta: {x: 195, y: 289}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &4288405573352873946
@ -63970,7 +64046,7 @@ MonoBehaviour:
  m_Animator: {fileID: 6724969307067823685}
  m_AnimatorTriggerWhenLockedIn: LockedIn
  m_AnimatorTriggerWhenUnlocked: Unlocked
-  m_CharacterClass: 0
+  m_CharacterClass: 1
 --- !u!224 &7773346133400786354
 RectTransform:
  m_ObjectHideFlags: 0
--- a/Assets/Scenes/MainMenu.unity
+++ b/Assets/Scenes/MainMenu.unity
--- a/Assets/Scripts/Gameplay/UI/UICharSelectPlayerSeat.cs
+++ b/Assets/Scripts/Gameplay/UI/UICharSelectPlayerSeat.cs
@ -148,7 +148,7 @@ namespace Unity.BossRoom.Gameplay.UI
                var playerNameObj = Instantiate(m_PlayerNameTemplate, m_PlayerNameHolderParent);
                var playerNameText = playerNameObj.GetComponent<TextMeshProUGUI>();
                playerNameText.text = m_PlayerNames[i];
-                playerNameText.color = ClientCharSelectState.Instance.m_IdentifiersForEachPlayerNumber[m_PlayerNumbers[i]].Color;
+                //playerNameText.color = ClientCharSelectState.Instance.m_IdentifiersForEachPlayerNumber[m_PlayerNumbers[i]].Color;

                // Set position of player name with Y-offset of -20 units.
                RectTransform nameRect = playerNameObj.GetComponent<RectTransform>();
--- a/Assets/Slicing/Create
+++ b/Assets/Slicing/Create
--- a/lobby/Border.png.meta
+++ b/lobby/Border.png.meta
@ -0,0 +1,114 @@
+fileFormatVersion: 2
+guid: 7d7094f095d341e42bc06f23e23801e9
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/lobby/banner-bg-shape.png
+++ b/lobby/banner-bg-shape.png
--- a/lobby/banner-bg-shape.png.meta
+++ b/lobby/banner-bg-shape.png.meta
@ -0,0 +1,114 @@
+fileFormatVersion: 2
+guid: 7e0f343d31d90e64f897a1d92c60e458
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Pro/Fonts/JOSEFINSANS-BOLD
+++ b/Pro/Fonts/JOSEFINSANS-BOLD
@ -2723,7 +2723,7 @@ Material:
    - _OutlineSoftness: 0
    - _OutlineUVSpeedX: 0
    - _OutlineUVSpeedY: 0
-    - _OutlineWidth: 0.3
+    - _OutlineWidth: 0
    - _PerspectiveFilter: 0.875
    - _Reflectivity: 10
    - _ScaleRatioA: 0.8333333
--- a/Materials/LiberationSans
+++ b/Materials/LiberationSans