Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tower Dungeons Handoff between levels #594

Merged
10 commits merged into from
May 6, 2022
Merged

Tower Dungeons Handoff between levels #594

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
32c70cc
Support of Enter Room Scene
Akka0 May 5, 2022
d32d401
Choose Avatar & Enter Tower
Akka0 May 6, 2022
7d51e0d
Merge pull request #1 from Akka0/development
Akka0 May 6, 2022
a79e008
Add @Transient for temporary team
Akka0 May 6, 2022
6144f47
Tower Dungeons Handoff between level and floor
Akka0 May 6, 2022
81ca860
Add some lua functions
Akka0 May 6, 2022
7279842
Merge pull request #2 from Grasscutters/development
Akka0 May 6, 2022
321a2a3
Merge branch 'tower' into development
Akka0 May 6, 2022
6b82a53
Merge pull request #3 from Akka0/development
Akka0 May 6, 2022
22df346
a little fix
Akka0 May 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add @transient for temporary team
  • Loading branch information
@Akka0
Akka0 committed May 6, 2022
commit a79e00896cb99b783cb0bcef48a431a26da4cc24
4 changes: 2 additions & 2 deletions src/main/java/emu/grasscutter/game/player/TeamManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ public class TeamManager {
@Transient private final IntSet teamResonances;
@Transient private final IntSet teamResonancesConfig;

private int useTemporarilyTeamIndex = -1;
@Transient private int useTemporarilyTeamIndex = -1;
/**
* Temporary Team for tower
*/
private List<TeamInfo> temporaryTeam;
@Transient private List<TeamInfo> temporaryTeam;

public TeamManager() {
this.mpTeam = new TeamInfo();
Expand Down