Skip to content

Commit 08a7fb0

Browse files
reordering character select screen characters with girl/boy pairs (#160)
1 parent 3cc731b commit 08a7fb0

File tree

2 files changed

+29
-23
lines changed

2 files changed

+29
-23
lines changed

Assets/BossRoom/Prefabs/State/CharSelectState.prefab

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,10 @@ MonoBehaviour:
5959
m_Name:
6060
m_EditorClassIdentifier:
6161
m_InSceneCharacter: {fileID: 0}
62-
m_PlayerStateBoxes:
63-
- {fileID: 0}
64-
- {fileID: 0}
65-
- {fileID: 0}
66-
- {fileID: 0}
67-
- {fileID: 0}
68-
- {fileID: 0}
69-
- {fileID: 0}
70-
- {fileID: 0}
62+
m_InSceneCharacterAnimator: {fileID: 0}
63+
m_AnimationTriggerOnCharSelect: BeginRevive
64+
m_AnimationTriggerOnCharChosen: BeginRevive
65+
m_PlayerSeats: []
7166
m_IdentifiersForEachPlayerNumber:
7267
- Indicator: {fileID: 7073677062034491875, guid: 6e827080c734678449d9b9a2b63ed6bd, type: 3}
7368
Color: {r: 1, g: 0.9607843, b: 0.03529412, a: 1}
@@ -85,19 +80,13 @@ MonoBehaviour:
8580
Color: {r: 0.99607843, g: 0.6745098, b: 0.03137255, a: 1}
8681
- Indicator: {fileID: 8070130267694257472, guid: 6e827080c734678449d9b9a2b63ed6bd, type: 3}
8782
Color: {r: 0.19215687, g: 0.03137255, b: 0.9882353, a: 1}
88-
m_PlayerNumberText: {fileID: 0}
89-
m_ClassNameText: {fileID: 0}
90-
m_HideTheseUIElementsWhenLobbyIsLockedIn:
91-
- {fileID: 0}
92-
m_ShowTheseUIElementsWhenLobbyIsLockedIn:
93-
- {fileID: 0}
94-
m_HideTheseUIElementsOnFatalLobbyError:
95-
- {fileID: 0}
96-
m_ShowTheseUIElementsOnFatalLobbyError:
97-
- {fileID: 0}
83+
m_UIElementsForNoSeatChosen: []
84+
m_UIElementsForSeatChosen: []
85+
m_UIElementsForLobbyEnding: []
86+
m_UIElementsForFatalError: []
87+
m_ClassInfoBox: {fileID: 0}
9888
m_FatalLobbyErrorText: {fileID: 0}
9989
m_FatalErrorLobbyFullMsg: 'Error: lobby is full! You cannot play.'
100-
m_WelcomeMsg: Welcome, P{0}!
10190
--- !u!114 &3565665953789623673
10291
MonoBehaviour:
10392
m_ObjectHideFlags: 0
@@ -110,6 +99,23 @@ MonoBehaviour:
11099
m_Script: {fileID: 11500000, guid: 3b117c7cd3ae70e458a5b755a4096609, type: 3}
111100
m_Name:
112101
m_EditorClassIdentifier:
102+
LobbySeatConfigurations:
103+
- Class: 0
104+
CharacterArtIdx: 1
105+
- Class: 0
106+
CharacterArtIdx: 0
107+
- Class: 1
108+
CharacterArtIdx: 3
109+
- Class: 1
110+
CharacterArtIdx: 2
111+
- Class: 2
112+
CharacterArtIdx: 5
113+
- Class: 2
114+
CharacterArtIdx: 4
115+
- Class: 3
116+
CharacterArtIdx: 7
117+
- Class: 3
118+
CharacterArtIdx: 6
113119
--- !u!114 &1092063945021251778
114120
MonoBehaviour:
115121
m_ObjectHideFlags: 0
@@ -122,7 +128,7 @@ MonoBehaviour:
122128
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
123129
m_Name:
124130
m_EditorClassIdentifier:
125-
NetworkedInstanceId: 0
131+
NetworkInstanceId: 0
126132
PrefabHash: 9664049137678660408
127133
PrefabHashGenerator: CharSelectState
128134
AlwaysReplicateAsRoot: 0
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:7809388324e550b23320d6674038d42c653a29d5e915fcf409607190e1efde48
3-
size 180878
2+
oid sha256:4859fb8299ec9578a1491c13dd65e0469e6c34b5051294ebc7fbf1bb80c2f5e1
3+
size 180843

0 commit comments

Comments
 (0)