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
d3c0d2e5
Commit
d3c0d2e5
authored
Jun 21, 2022
by
Tesutarin
Committed by
Melledy
Jun 21, 2022
Browse files
Update 2.7 second half banners
parent
8a1df19e
Changes
2
Show whitespace changes
Inline
Side-by-side
src/main/java/emu/grasscutter/server/packet/send/PacketGetDailyDungeonEntryInfoRsp.java
View file @
d3c0d2e5
...
@@ -28,7 +28,7 @@ public class PacketGetDailyDungeonEntryInfoRsp extends BasePacket {
...
@@ -28,7 +28,7 @@ public class PacketGetDailyDungeonEntryInfoRsp extends BasePacket {
var
dungeonEntryId
=
data
.
getDungeonEntryId
();
var
dungeonEntryId
=
data
.
getDungeonEntryId
();
var
id
=
data
.
getId
();
var
id
=
data
.
getId
();
//TODO
: 来个爹把这块整活了吧 咚咚咚
//
TODO
DungeonEntryInfoOuterClass
.
DungeonEntryInfo
dungeonEntryInfo
DungeonEntryInfoOuterClass
.
DungeonEntryInfo
dungeonEntryInfo
=
DungeonEntryInfoOuterClass
.
DungeonEntryInfo
.
newBuilder
().
setDungeonId
(
130
).
build
();
=
DungeonEntryInfoOuterClass
.
DungeonEntryInfo
.
newBuilder
().
setDungeonId
(
130
).
build
();
...
...
src/main/resources/defaults/data/Banners.json
View file @
d3c0d2e5
...
@@ -7,44 +7,25 @@
...
@@ -7,44 +7,25 @@
"previewPrefabPath"
:
"UI_Tab_GachaShowPanel_A022"
,
"previewPrefabPath"
:
"UI_Tab_GachaShowPanel_A022"
,
"titlePath"
:
"UI_GACHA_SHOW_PANEL_A022_TITLE"
,
"titlePath"
:
"UI_GACHA_SHOW_PANEL_A022_TITLE"
,
"costItemId"
:
224
,
"costItemId"
:
224
,
"costItemAmount"
:
1
,
"costItemAmount10"
:
10
,
"beginTime"
:
0
,
"beginTime"
:
0
,
"endTime"
:
1924992000
,
"endTime"
:
1924992000
,
"sortId"
:
1000
,
"sortId"
:
1000
,
"fallbackItems4Pool1"
:
[
1006
,
1014
,
1015
,
1020
,
1021
,
1023
,
1024
,
1025
,
1027
,
1031
,
1032
,
1034
,
1036
,
1039
,
1043
,
1044
,
1045
,
1048
,
1053
,
1055
,
1056
,
1064
],
"fallbackItems4Pool1"
:
[
1006
,
1014
,
1015
,
1020
,
1021
,
1023
,
1024
,
1025
,
1027
,
1031
,
1032
,
1034
,
1036
,
1039
,
1043
,
1044
,
1045
,
1048
,
1053
,
1055
,
1056
,
1064
],
"weights4"
:
[[
1
,
510
],
[
8
,
510
],
[
10
,
10000
]],
"weights5"
:
[[
1
,
75
],
[
73
,
150
],
[
90
,
10000
]]
"weights5"
:
[[
1
,
75
],
[
73
,
150
],
[
90
,
10000
]]
},
},
{
{
"gachaType"
:
301
,
"gachaType"
:
301
,
"scheduleId"
:
903
,
"scheduleId"
:
903
,
"bannerType"
:
"EVENT"
,
"bannerType"
:
"EVENT"
,
"prefabPath"
:
"GachaShowPanel_A08
1
"
,
"prefabPath"
:
"GachaShowPanel_A08
4
"
,
"previewPrefabPath"
:
"UI_Tab_GachaShowPanel_A08
1
"
,
"previewPrefabPath"
:
"UI_Tab_GachaShowPanel_A08
4
"
,
"titlePath"
:
"UI_GACHA_SHOW_PANEL_A0
8
1_TITLE"
,
"titlePath"
:
"UI_GACHA_SHOW_PANEL_A0
6
1_TITLE"
,
"costItemId"
:
223
,
"costItemId"
:
223
,
"beginTime"
:
0
,
"beginTime"
:
0
,
"endTime"
:
1924992000
,
"endTime"
:
1924992000
,
"sortId"
:
9998
,
"sortId"
:
9999
,
"rateUpItems4"
:
[
1034
,
1014
,
1048
],
"rateUpItems4"
:
[
1065
,
1036
,
1055
],
"rateUpItems5"
:
[
1060
],
"rateUpItems5"
:
[
1057
],
"fallbackItems5Pool2"
:
[],
"weights5"
:
[[
1
,
80
],
[
73
,
80
],
[
90
,
10000
]]
},
{
"gachaType"
:
400
,
"scheduleId"
:
923
,
"bannerType"
:
"EVENT"
,
"prefabPath"
:
"GachaShowPanel_A082"
,
"previewPrefabPath"
:
"UI_Tab_GachaShowPanel_A082"
,
"titlePath"
:
"UI_GACHA_SHOW_PANEL_A031_TITLE"
,
"costItemId"
:
223
,
"beginTime"
:
0
,
"endTime"
:
1924992000
,
"sortId"
:
9998
,
"rateUpItems4"
:
[
1034
,
1014
,
1048
],
"rateUpItems5"
:
[
1026
],
"fallbackItems5Pool2"
:
[],
"fallbackItems5Pool2"
:
[],
"weights5"
:
[[
1
,
80
],
[
73
,
80
],
[
90
,
10000
]]
"weights5"
:
[[
1
,
80
],
[
73
,
80
],
[
90
,
10000
]]
},
},
...
@@ -52,20 +33,19 @@
...
@@ -52,20 +33,19 @@
"gachaType"
:
302
,
"gachaType"
:
302
,
"scheduleId"
:
913
,
"scheduleId"
:
913
,
"bannerType"
:
"WEAPON"
,
"bannerType"
:
"WEAPON"
,
"prefabPath"
:
"GachaShowPanel_A08
3
"
,
"prefabPath"
:
"GachaShowPanel_A08
5
"
,
"previewPrefabPath"
:
"UI_Tab_GachaShowPanel_A08
3
"
,
"previewPrefabPath"
:
"UI_Tab_GachaShowPanel_A08
5
"
,
"titlePath"
:
"UI_GACHA_SHOW_PANEL_A0
2
1_TITLE"
,
"titlePath"
:
"UI_GACHA_SHOW_PANEL_A01
3
_TITLE"
,
"costItemId"
:
223
,
"costItemId"
:
223
,
"beginTime"
:
0
,
"beginTime"
:
0
,
"endTime"
:
1924992000
,
"endTime"
:
1924992000
,
"sortId"
:
9997
,
"sortId"
:
9998
,
"eventChance"
:
75
,
"rateUpItems4"
:
[
12410
,
11405
,
13401
,
14403
,
15402
],
"softPity"
:
80
,
"rateUpItems5"
:
[
12510
,
14504
],
"hardPity"
:
80
,
"rateUpItems4"
:
[
11403
,
12401
,
13406
,
14409
,
15403
],
"rateUpItems5"
:
[
15508
,
13505
],
"fallbackItems5Pool1"
:
[],
"fallbackItems5Pool1"
:
[],
"weights4"
:
[[
1
,
600
],
[
7
,
600
],
[
8
,
6600
],
[
10
,
12600
]],
"weights4"
:
[[
1
,
600
],
[
7
,
600
],
[
8
,
6600
],
[
10
,
12600
]],
"weights5"
:
[[
1
,
100
],
[
62
,
100
],
[
73
,
7800
],
[
80
,
10000
]]
"weights5"
:
[[
1
,
100
],
[
62
,
100
],
[
73
,
7800
],
[
80
,
10000
]],
"eventChance4"
:
75
,
"eventChance5"
:
75
}
}
]
]
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