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
18df5213
Commit
18df5213
authored
May 29, 2022
by
linebear
Committed by
Melledy
May 30, 2022
Browse files
Fix enter tower dungeons
parent
0ba13ef7
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/main/java/emu/grasscutter/data/excels/TowerFloorData.java
View file @
18df5213
...
...
@@ -8,7 +8,7 @@ public class TowerFloorData extends GameResource {
private
int
floorId
;
private
int
floorIndex
;
private
int
levelId
;
private
int
level
Group
Id
;
private
int
overrideMonsterLevel
;
private
int
teamNum
;
private
int
floorLevelConfigId
;
...
...
@@ -31,8 +31,8 @@ public class TowerFloorData extends GameResource {
return
floorIndex
;
}
public
int
getLevelId
()
{
return
levelId
;
public
int
getLevel
Group
Id
()
{
return
level
Group
Id
;
}
public
int
getOverrideMonsterLevel
()
{
...
...
src/main/java/emu/grasscutter/data/excels/TowerLevelData.java
View file @
18df5213
...
...
@@ -8,6 +8,7 @@ public class TowerLevelData extends GameResource {
private
int
levelId
;
private
int
levelIndex
;
private
int
levelGroupId
;
private
int
dungeonId
;
@Override
...
...
@@ -19,6 +20,10 @@ public class TowerLevelData extends GameResource {
return
levelId
;
}
public
int
getLevelGroupId
()
{
return
levelGroupId
;
}
public
int
getLevelIndex
()
{
return
levelIndex
;
}
...
...
src/main/java/emu/grasscutter/game/tower/TowerManager.java
View file @
18df5213
...
...
@@ -71,7 +71,7 @@ public class TowerManager {
this
.
currentFloorId
=
floorData
.
getFloorId
();
this
.
currentLevel
=
0
;
this
.
currentLevelId
=
GameData
.
getTowerLevelDataMap
().
values
().
stream
()
.
filter
(
x
->
x
.
getLevelId
()
==
floorData
.
getLevelId
()
&&
x
.
getLevelIndex
()
==
1
)
.
filter
(
x
->
x
.
getLevel
Group
Id
()
==
floorData
.
getLevel
Group
Id
()
&&
x
.
getLevelIndex
()
==
1
)
.
findFirst
()
.
map
(
TowerLevelData:
:
getId
)
.
orElse
(
0
);
...
...
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