Akkariin/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-02-27 02:22:54 +08:00
Code Issues Projects Releases Wiki Activity

Fix white screen after logging in

Browse Source
This commit is contained in:
Melledy 2022-04-26 19:20:10 -07:00
parent e3034326c1
commit be307fe5f0
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
proto/AvatarDataNotify.proto
View File

@ -17,7 +17,7 @@ message AvatarDataNotify {
repeated AvatarInfo avatar_list = 1; repeated AvatarInfo avatar_list = 1;
map<uint32, AvatarTeam> avatar_team_map = 2; map<uint32, AvatarTeam> avatar_team_map = 2;
uint32 cur_avatar_team_id = 3; uint32 cur_avatar_team_id = 3;
uint64 choose_avatar_guid = 4; fixed64 choose_avatar_guid = 4;
repeated uint64 temp_avatar_guid_list = 5; repeated uint64 temp_avatar_guid_list = 5;
repeated uint32 owned_flycloak_list = 6; repeated uint32 owned_flycloak_list = 6;
repeated uint32 owned_costume_list = 7; repeated uint32 owned_costume_list = 7;

7
src/main/java/emu/grasscutter/game/GenshinPlayer.java
View File

@ -76,7 +76,6 @@ public class GenshinPlayer {
private TeamManager teamManager; private TeamManager teamManager;
private PlayerGachaInfo gachaInfo; private PlayerGachaInfo gachaInfo;
private PlayerProfile playerProfile; private PlayerProfile playerProfile;
private MpSettingType mpSetting = MpSettingType.MP_SETTING_ENTER_AFTER_APPLY;
private boolean showAvatar; private boolean showAvatar;
private ArrayList<AvatarProfileData> shownAvatars; private ArrayList<AvatarProfileData> shownAvatars;
private Set<Integer> rewardedLevels; private Set<Integer> rewardedLevels;
@ -381,7 +380,7 @@ public class GenshinPlayer {
} }
public MpSettingType getMpSetting() { public MpSettingType getMpSetting() {
return mpSetting; return MpSettingType.MP_SETTING_ENTER_AFTER_APPLY; // TEMP
} }
public synchronized Int2ObjectMap<CoopRequest> getCoopRequests() { public synchronized Int2ObjectMap<CoopRequest> getCoopRequests() {
@ -400,10 +399,6 @@ public class GenshinPlayer {
return clientAbilityInitFinishHandler; return clientAbilityInitFinishHandler;
} }
public void setMpSetting(MpSettingType mpSetting) {
this.mpSetting = mpSetting;
}
public AvatarStorage getAvatars() { public AvatarStorage getAvatars() {
return avatars; return avatars;
} }