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

Fix enter tower dungeons

Browse Source
This commit is contained in:
linebear 2022-05-29 20:14:37 +08:00 committed by Melledy
parent 0ba13ef7ff
commit 18df521347
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/emu/grasscutter/data/excels/TowerFloorData.java
View File

@ -8,7 +8,7 @@ public class TowerFloorData extends GameResource {
private int floorId; private int floorId;
private int floorIndex; private int floorIndex;
private int levelId; private int levelGroupId;
private int overrideMonsterLevel; private int overrideMonsterLevel;
private int teamNum; private int teamNum;
private int floorLevelConfigId; private int floorLevelConfigId;
@ -31,8 +31,8 @@ public class TowerFloorData extends GameResource {
return floorIndex; return floorIndex;
} }
public int getLevelId() { public int getLevelGroupId() {
return levelId; return levelGroupId;
} }
public int getOverrideMonsterLevel() { public int getOverrideMonsterLevel() {

5
src/main/java/emu/grasscutter/data/excels/TowerLevelData.java
View File

@ -8,6 +8,7 @@ public class TowerLevelData extends GameResource {
private int levelId; private int levelId;
private int levelIndex; private int levelIndex;
private int levelGroupId;
private int dungeonId; private int dungeonId;
@Override @Override
@ -19,6 +20,10 @@ public class TowerLevelData extends GameResource {
return levelId; return levelId;
} }
public int getLevelGroupId() {
return levelGroupId;
}
public int getLevelIndex() { public int getLevelIndex() {
return levelIndex; return levelIndex;
} }

2
src/main/java/emu/grasscutter/game/tower/TowerManager.java
View File

@ -71,7 +71,7 @@ public class TowerManager {
this.currentFloorId = floorData.getFloorId(); this.currentFloorId = floorData.getFloorId();
this.currentLevel = 0; this.currentLevel = 0;
this.currentLevelId = GameData.getTowerLevelDataMap().values().stream() this.currentLevelId = GameData.getTowerLevelDataMap().values().stream()
.filter(x -> x.getLevelId() == floorData.getLevelId() && x.getLevelIndex() == 1) .filter(x -> x.getLevelGroupId() == floorData.getLevelGroupId() && x.getLevelIndex() == 1)
.findFirst() .findFirst()
.map(TowerLevelData::getId) .map(TowerLevelData::getId)
.orElse(0); .orElse(0);