From 6661b353de5051272b027725bac228d54d16be70 Mon Sep 17 00:00:00 2001
From: Fernando Cortez <fernando.cortez@unity3d.com>
Date: Thu, 11 Mar 2021 18:26:54 -0500
Subject: [PATCH 1/3] reordering character select screen characters with
 girl/boy pairs

---
 .../Prefabs/State/CharSelectState.prefab      | 48 +++++++++++--------
 Assets/BossRoom/Scenes/CharSelect.unity       |  4 +-
 2 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/Assets/BossRoom/Prefabs/State/CharSelectState.prefab b/Assets/BossRoom/Prefabs/State/CharSelectState.prefab
index 65549139d..74a34eca3 100644
--- a/Assets/BossRoom/Prefabs/State/CharSelectState.prefab
+++ b/Assets/BossRoom/Prefabs/State/CharSelectState.prefab
@@ -59,15 +59,10 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_InSceneCharacter: {fileID: 0}
-  m_PlayerStateBoxes:
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
+  m_InSceneCharacterAnimator: {fileID: 0}
+  m_AnimationTriggerOnCharSelect: BeginRevive
+  m_AnimationTriggerOnCharChosen: BeginRevive
+  m_PlayerSeats: []
   m_IdentifiersForEachPlayerNumber:
   - Indicator: {fileID: 7073677062034491875, guid: 6e827080c734678449d9b9a2b63ed6bd, type: 3}
     Color: {r: 1, g: 0.9607843, b: 0.03529412, a: 1}
@@ -85,19 +80,13 @@ MonoBehaviour:
     Color: {r: 0.99607843, g: 0.6745098, b: 0.03137255, a: 1}
   - Indicator: {fileID: 8070130267694257472, guid: 6e827080c734678449d9b9a2b63ed6bd, type: 3}
     Color: {r: 0.19215687, g: 0.03137255, b: 0.9882353, a: 1}
-  m_PlayerNumberText: {fileID: 0}
-  m_ClassNameText: {fileID: 0}
-  m_HideTheseUIElementsWhenLobbyIsLockedIn:
-  - {fileID: 0}
-  m_ShowTheseUIElementsWhenLobbyIsLockedIn:
-  - {fileID: 0}
-  m_HideTheseUIElementsOnFatalLobbyError:
-  - {fileID: 0}
-  m_ShowTheseUIElementsOnFatalLobbyError:
-  - {fileID: 0}
+  m_UIElementsForNoSeatChosen: []
+  m_UIElementsForSeatChosen: []
+  m_UIElementsForLobbyEnding: []
+  m_UIElementsForFatalError: []
+  m_ClassInfoBox: {fileID: 0}
   m_FatalLobbyErrorText: {fileID: 0}
   m_FatalErrorLobbyFullMsg: 'Error: lobby is full! You cannot play.'
-  m_WelcomeMsg: Welcome, P{0}!
 --- !u!114 &3565665953789623673
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -110,6 +99,23 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3b117c7cd3ae70e458a5b755a4096609, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  LobbySeatConfigurations:
+  - Class: 0
+    CharacterArtIdx: 1
+  - Class: 0
+    CharacterArtIdx: 0
+  - Class: 1
+    CharacterArtIdx: 3
+  - Class: 1
+    CharacterArtIdx: 2
+  - Class: 2
+    CharacterArtIdx: 5
+  - Class: 2
+    CharacterArtIdx: 4
+  - Class: 3
+    CharacterArtIdx: 7
+  - Class: 3
+    CharacterArtIdx: 6
 --- !u!114 &1092063945021251778
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -122,7 +128,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  NetworkedInstanceId: 0
+  NetworkInstanceId: 0
   PrefabHash: 9664049137678660408
   PrefabHashGenerator: CharSelectState
   AlwaysReplicateAsRoot: 0
diff --git a/Assets/BossRoom/Scenes/CharSelect.unity b/Assets/BossRoom/Scenes/CharSelect.unity
index d884c5847..333b48e80 100644
--- a/Assets/BossRoom/Scenes/CharSelect.unity
+++ b/Assets/BossRoom/Scenes/CharSelect.unity
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fe2cf3e0618b7b8e685581f4a65153bd9543f54bdcc3979ae8546923722a24e8
-size 168701
+oid sha256:5e8cf15ed242ed0da813407da7b7e3e50dc148f7ee99a2fb44c182642ba68372
+size 168671

From b427de46be2b382d2ba5cffb50020b826e70d2a8 Mon Sep 17 00:00:00 2001
From: Fernando Cortez <fernando.cortez@unity3d.com>
Date: Fri, 12 Mar 2021 11:19:37 -0500
Subject: [PATCH 2/3] re-added character reordering

---
 Assets/BossRoom/Scenes/CharSelect.unity | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Assets/BossRoom/Scenes/CharSelect.unity b/Assets/BossRoom/Scenes/CharSelect.unity
index 9c0099c11..806cb22db 100644
--- a/Assets/BossRoom/Scenes/CharSelect.unity
+++ b/Assets/BossRoom/Scenes/CharSelect.unity
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6aedfc3cf0d9b4ddf01bdaf769f6b41e1d57eab0d81453006c7ae16b0708fb14
-size 174845
+oid sha256:ede3aa84e4a6a692e63fe0cac7310df2df4281b704c3e1f6095551287b4a2375
+size 174807

From c14c6390f0b065a16941c383350e5f6953a1a058 Mon Sep 17 00:00:00 2001
From: Fernando Cortez <fernando.cortez@unity3d.com>
Date: Mon, 15 Mar 2021 11:01:53 -0400
Subject: [PATCH 3/3] reordered characters

---
 Assets/BossRoom/Scenes/CharSelect.unity | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Assets/BossRoom/Scenes/CharSelect.unity b/Assets/BossRoom/Scenes/CharSelect.unity
index fe0b4796c..16fdfafab 100644
--- a/Assets/BossRoom/Scenes/CharSelect.unity
+++ b/Assets/BossRoom/Scenes/CharSelect.unity
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7809388324e550b23320d6674038d42c653a29d5e915fcf409607190e1efde48
-size 180878
+oid sha256:4859fb8299ec9578a1491c13dd65e0469e6c34b5051294ebc7fbf1bb80c2f5e1
+size 180843