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
a16bc721
Commit
a16bc721
authored
Jun 24, 2022
by
Melledy
Browse files
Implement weekly points for the battle pass
parent
5eb1d34b
Changes
3
Show whitespace changes
Inline
Side-by-side
src/main/java/emu/grasscutter/GameConstants.java
View file @
a16bc721
...
@@ -20,6 +20,7 @@ public final class GameConstants {
...
@@ -20,6 +20,7 @@ public final class GameConstants {
public
static
final
int
BATTLE_PASS_MAX_LEVEL
=
50
;
public
static
final
int
BATTLE_PASS_MAX_LEVEL
=
50
;
public
static
final
int
BATTLE_PASS_POINT_PER_LEVEL
=
1000
;
public
static
final
int
BATTLE_PASS_POINT_PER_LEVEL
=
1000
;
public
static
final
int
BATTLE_PASS_POINT_PER_WEEK
=
10000
;
public
static
final
int
BATTLE_PASS_LEVEL_PRICE
=
150
;
public
static
final
int
BATTLE_PASS_LEVEL_PRICE
=
150
;
// Default entity ability hashes.
// Default entity ability hashes.
...
...
src/main/java/emu/grasscutter/data/excels/BattlePassMissionData.java
View file @
a16bc721
...
@@ -35,6 +35,10 @@ public class BattlePassMissionData extends GameResource {
...
@@ -35,6 +35,10 @@ public class BattlePassMissionData extends GameResource {
return
this
.
getTriggerConfig
().
getTriggerType
();
return
this
.
getTriggerConfig
().
getTriggerType
();
}
}
public
boolean
isCycleRefresh
()
{
return
getRefreshType
()
==
null
||
getRefreshType
()
==
BattlePassMissionRefreshType
.
BATTLE_PASS_MISSION_REFRESH_CYCLE_CROSS_SCHEDULE
;
}
public
boolean
isValidRefreshType
()
{
public
boolean
isValidRefreshType
()
{
return
getRefreshType
()
==
null
||
return
getRefreshType
()
==
null
||
getRefreshType
()
==
BattlePassMissionRefreshType
.
BATTLE_PASS_MISSION_REFRESH_CYCLE_CROSS_SCHEDULE
||
getRefreshType
()
==
BattlePassMissionRefreshType
.
BATTLE_PASS_MISSION_REFRESH_CYCLE_CROSS_SCHEDULE
||
...
...
src/main/java/emu/grasscutter/game/battlepass/BattlePassManager.java
View file @
a16bc721
...
@@ -19,9 +19,11 @@ import emu.grasscutter.data.excels.RewardData;
...
@@ -19,9 +19,11 @@ import emu.grasscutter.data.excels.RewardData;
import
emu.grasscutter.database.DatabaseHelper
;
import
emu.grasscutter.database.DatabaseHelper
;
import
emu.grasscutter.game.player.Player
;
import
emu.grasscutter.game.player.Player
;
import
emu.grasscutter.game.props.ActionReason
;
import
emu.grasscutter.game.props.ActionReason
;
import
emu.grasscutter.game.props.BattlePassMissionRefreshType
;
import
emu.grasscutter.game.props.BattlePassMissionStatus
;
import
emu.grasscutter.game.props.BattlePassMissionStatus
;
import
emu.grasscutter.game.props.WatcherTriggerType
;
import
emu.grasscutter.game.props.WatcherTriggerType
;
import
emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle
;
import
emu.grasscutter.net.proto.BattlePassCycleOuterClass.BattlePassCycle
;
import
emu.grasscutter.net.proto.BattlePassProductOuterClass.BattlePassProduct
;
import
emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag
;
import
emu.grasscutter.net.proto.BattlePassRewardTagOuterClass.BattlePassRewardTag
;
import
emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.BattlePassUnlockStatus
;
import
emu.grasscutter.net.proto.BattlePassUnlockStatusOuterClass.BattlePassUnlockStatus
;
import
emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption
;
import
emu.grasscutter.net.proto.BattlePassRewardTakeOptionOuterClass.BattlePassRewardTakeOption
;
...
@@ -37,6 +39,7 @@ public class BattlePassManager {
...
@@ -37,6 +39,7 @@ public class BattlePassManager {
@Indexed
private
int
ownerUid
;
@Indexed
private
int
ownerUid
;
private
int
point
;
private
int
point
;
private
int
cyclePoints
;
// Weekly maximum cap
private
int
level
;
private
int
level
;
private
boolean
viewed
;
private
boolean
viewed
;
...
@@ -69,6 +72,10 @@ public class BattlePassManager {
...
@@ -69,6 +72,10 @@ public class BattlePassManager {
return
this
.
point
;
return
this
.
point
;
}
}
public
int
getCyclePoints
()
{
return
cyclePoints
;
}
public
int
getLevel
()
{
public
int
getLevel
()
{
return
this
.
level
;
return
this
.
level
;
}
}
...
@@ -86,14 +93,25 @@ public class BattlePassManager {
...
@@ -86,14 +93,25 @@ public class BattlePassManager {
}
}
public
void
addPoints
(
int
point
){
public
void
addPoints
(
int
point
){
this
.
addPointsDirectly
(
point
);
this
.
addPointsDirectly
(
point
,
false
);
player
.
getSession
().
send
(
new
PacketBattlePassCurScheduleUpdateNotify
(
player
.
getSession
().
getPlayer
()));
player
.
getSession
().
send
(
new
PacketBattlePassCurScheduleUpdateNotify
(
player
.
getSession
().
getPlayer
()));
this
.
save
();
this
.
save
();
}
}
public
void
addPointsDirectly
(
int
point
)
{
public
void
addPointsDirectly
(
int
point
,
boolean
isWeekly
)
{
this
.
point
+=
point
;
int
amount
=
point
;
if
(
isWeekly
)
{
amount
=
Math
.
min
(
amount
,
GameConstants
.
BATTLE_PASS_POINT_PER_WEEK
-
this
.
cyclePoints
);
}
if
(
amount
<=
0
)
{
return
;
}
this
.
point
+=
amount
;
this
.
cyclePoints
+=
amount
;
if
(
this
.
point
>=
GameConstants
.
BATTLE_PASS_POINT_PER_LEVEL
&&
this
.
getLevel
()
<
GameConstants
.
BATTLE_PASS_MAX_LEVEL
)
{
if
(
this
.
point
>=
GameConstants
.
BATTLE_PASS_POINT_PER_LEVEL
&&
this
.
getLevel
()
<
GameConstants
.
BATTLE_PASS_MAX_LEVEL
)
{
int
levelups
=
(
int
)
Math
.
floor
((
float
)
this
.
point
/
GameConstants
.
BATTLE_PASS_POINT_PER_LEVEL
);
int
levelups
=
(
int
)
Math
.
floor
((
float
)
this
.
point
/
GameConstants
.
BATTLE_PASS_POINT_PER_LEVEL
);
...
@@ -159,7 +177,7 @@ public class BattlePassManager {
...
@@ -159,7 +177,7 @@ public class BattlePassManager {
// Take reward
// Take reward
if
(
mission
.
getStatus
()
==
BattlePassMissionStatus
.
MISSION_STATUS_FINISHED
)
{
if
(
mission
.
getStatus
()
==
BattlePassMissionStatus
.
MISSION_STATUS_FINISHED
)
{
this
.
addPointsDirectly
(
mission
.
getData
().
getAddPoint
());
this
.
addPointsDirectly
(
mission
.
getData
().
getAddPoint
()
,
mission
.
getData
().
getRefreshType
()
==
BattlePassMissionRefreshType
.
BATTLE_PASS_MISSION_REFRESH_CYCLE_CROSS_SCHEDULE
);
mission
.
setStatus
(
BattlePassMissionStatus
.
MISSION_STATUS_POINT_TAKEN
);
mission
.
setStatus
(
BattlePassMissionStatus
.
MISSION_STATUS_POINT_TAKEN
);
updatedMissions
.
add
(
mission
);
updatedMissions
.
add
(
mission
);
...
@@ -265,7 +283,7 @@ public class BattlePassManager {
...
@@ -265,7 +283,7 @@ public class BattlePassManager {
.
setEndTime
(
2059483200
)
.
setEndTime
(
2059483200
)
.
setIsViewed
(
this
.
isViewed
())
.
setIsViewed
(
this
.
isViewed
())
.
setUnlockStatus
(
this
.
isPaid
()
?
BattlePassUnlockStatus
.
BATTLE_PASS_UNLOCK_STATUS_PAID
:
BattlePassUnlockStatus
.
BATTLE_PASS_UNLOCK_STATUS_FREE
)
.
setUnlockStatus
(
this
.
isPaid
()
?
BattlePassUnlockStatus
.
BATTLE_PASS_UNLOCK_STATUS_PAID
:
BattlePassUnlockStatus
.
BATTLE_PASS_UNLOCK_STATUS_FREE
)
.
setCurCyclePoints
(
0
)
.
setCurCyclePoints
(
this
.
getCyclePoints
()
)
.
setCurCycle
(
BattlePassCycle
.
newBuilder
().
setBeginTime
(
0
).
setEndTime
(
2059483200
).
setCycleIdx
(
3
));
.
setCurCycle
(
BattlePassCycle
.
newBuilder
().
setBeginTime
(
0
).
setEndTime
(
2059483200
).
setCycleIdx
(
3
));
for
(
BattlePassReward
reward
:
getTakenRewards
().
values
())
{
for
(
BattlePassReward
reward
:
getTakenRewards
().
values
())
{
...
...
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