Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
ziqian zhang
Grasscutter
Commits
100d08ec
Commit
100d08ec
authored
Nov 26, 2022
by
AnimeGitB
Browse files
Fix up pity tallies for new BannerTypes
Also fixes Beginner banner using Standard pity.
parent
83b84408
Changes
1
Show whitespace changes
Inline
Side-by-side
src/main/java/emu/grasscutter/game/gacha/PlayerGachaInfo.java
View file @
100d08ec
...
@@ -5,6 +5,7 @@ import dev.morphia.annotations.Entity;
...
@@ -5,6 +5,7 @@ import dev.morphia.annotations.Entity;
@Entity
@Entity
public
class
PlayerGachaInfo
{
public
class
PlayerGachaInfo
{
private
PlayerGachaBannerInfo
standardBanner
;
private
PlayerGachaBannerInfo
standardBanner
;
private
PlayerGachaBannerInfo
beginnerBanner
;
private
PlayerGachaBannerInfo
eventCharacterBanner
;
private
PlayerGachaBannerInfo
eventCharacterBanner
;
private
PlayerGachaBannerInfo
eventWeaponBanner
;
private
PlayerGachaBannerInfo
eventWeaponBanner
;
...
@@ -15,26 +16,31 @@ public class PlayerGachaInfo {
...
@@ -15,26 +16,31 @@ public class PlayerGachaInfo {
}
}
public
PlayerGachaBannerInfo
getStandardBanner
()
{
public
PlayerGachaBannerInfo
getStandardBanner
()
{
return
standardBanner
;
if
(
this
.
standardBanner
==
null
)
this
.
standardBanner
=
new
PlayerGachaBannerInfo
();
return
this
.
standardBanner
;
}
public
PlayerGachaBannerInfo
getBeginnerBanner
()
{
if
(
this
.
beginnerBanner
==
null
)
this
.
beginnerBanner
=
new
PlayerGachaBannerInfo
();
return
this
.
beginnerBanner
;
}
}
public
PlayerGachaBannerInfo
getEventCharacterBanner
()
{
public
PlayerGachaBannerInfo
getEventCharacterBanner
()
{
return
eventCharacterBanner
;
if
(
this
.
eventCharacterBanner
==
null
)
this
.
eventCharacterBanner
=
new
PlayerGachaBannerInfo
();
return
this
.
eventCharacterBanner
;
}
}
public
PlayerGachaBannerInfo
getEventWeaponBanner
()
{
public
PlayerGachaBannerInfo
getEventWeaponBanner
()
{
return
eventWeaponBanner
;
if
(
this
.
eventWeaponBanner
==
null
)
this
.
eventWeaponBanner
=
new
PlayerGachaBannerInfo
();
return
this
.
eventWeaponBanner
;
}
}
public
PlayerGachaBannerInfo
getBannerInfo
(
GachaBanner
banner
)
{
public
PlayerGachaBannerInfo
getBannerInfo
(
GachaBanner
banner
)
{
switch
(
banner
.
getBannerType
())
{
return
switch
(
banner
.
getBannerType
())
{
case
EVENT:
case
STANDARD
->
this
.
getStandardBanner
();
return
this
.
eventCharacterBanner
;
case
BEGINNER
->
this
.
getBeginnerBanner
();
case
WEAPON:
case
EVENT
,
CHARACTER
,
CHARACTER2
->
this
.
getEventCharacterBanner
();
return
this
.
eventWeaponBanner
;
case
WEAPON
->
this
.
getEventWeaponBanner
();
case
STANDARD:
};
default
:
return
this
.
standardBanner
;
}
}
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment