diff --git a/src/main/java/emu/grasscutter/server/packet/send/PacketGetDailyDungeonEntryInfoRsp.java b/src/main/java/emu/grasscutter/server/packet/send/PacketGetDailyDungeonEntryInfoRsp.java index 55f3bcc13..a756905f2 100644 --- a/src/main/java/emu/grasscutter/server/packet/send/PacketGetDailyDungeonEntryInfoRsp.java +++ b/src/main/java/emu/grasscutter/server/packet/send/PacketGetDailyDungeonEntryInfoRsp.java @@ -28,7 +28,7 @@ public class PacketGetDailyDungeonEntryInfoRsp extends BasePacket { var dungeonEntryId = data.getDungeonEntryId(); var id = data.getId(); - //TODO: 来个爹把这块整活了吧 咚咚咚 + // TODO DungeonEntryInfoOuterClass.DungeonEntryInfo dungeonEntryInfo = DungeonEntryInfoOuterClass.DungeonEntryInfo.newBuilder().setDungeonId(130).build(); diff --git a/src/main/resources/defaults/data/Banners.json b/src/main/resources/defaults/data/Banners.json index 0242cae54..1f723d952 100644 --- a/src/main/resources/defaults/data/Banners.json +++ b/src/main/resources/defaults/data/Banners.json @@ -7,44 +7,25 @@ "previewPrefabPath": "UI_Tab_GachaShowPanel_A022", "titlePath": "UI_GACHA_SHOW_PANEL_A022_TITLE", "costItemId": 224, - "costItemAmount": 1, - "costItemAmount10": 10, "beginTime": 0, "endTime": 1924992000, "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], - "weights4": [[1,510], [8,510], [10,10000]], "weights5": [[1,75], [73,150], [90,10000]] }, { "gachaType": 301, "scheduleId": 903, "bannerType": "EVENT", - "prefabPath": "GachaShowPanel_A081", - "previewPrefabPath": "UI_Tab_GachaShowPanel_A081", - "titlePath": "UI_GACHA_SHOW_PANEL_A081_TITLE", + "prefabPath": "GachaShowPanel_A084", + "previewPrefabPath": "UI_Tab_GachaShowPanel_A084", + "titlePath": "UI_GACHA_SHOW_PANEL_A061_TITLE", "costItemId": 223, "beginTime": 0, "endTime": 1924992000, - "sortId": 9998, - "rateUpItems4": [1034, 1014, 1048], - "rateUpItems5": [1060], - "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], + "sortId": 9999, + "rateUpItems4": [1065, 1036, 1055], + "rateUpItems5": [1057], "fallbackItems5Pool2": [], "weights5": [[1,80], [73,80], [90,10000]] }, @@ -52,20 +33,19 @@ "gachaType": 302, "scheduleId": 913, "bannerType": "WEAPON", - "prefabPath": "GachaShowPanel_A083", - "previewPrefabPath": "UI_Tab_GachaShowPanel_A083", - "titlePath": "UI_GACHA_SHOW_PANEL_A021_TITLE", + "prefabPath": "GachaShowPanel_A085", + "previewPrefabPath": "UI_Tab_GachaShowPanel_A085", + "titlePath": "UI_GACHA_SHOW_PANEL_A013_TITLE", "costItemId": 223, "beginTime": 0, "endTime": 1924992000, - "sortId": 9997, - "eventChance": 75, - "softPity": 80, - "hardPity": 80, - "rateUpItems4": [11403, 12401, 13406, 14409, 15403], - "rateUpItems5": [15508, 13505], + "sortId": 9998, + "rateUpItems4": [12410, 11405, 13401, 14403, 15402], + "rateUpItems5": [12510, 14504], "fallbackItems5Pool1": [], - "weights4": [[1,600], [7,600], [8, 6600], [10,12600]], - "weights5": [[1,100], [62,100], [73, 7800], [80,10000]] + "weights4": [[1,600], [7,600], [8,6600], [10,12600]], + "weights5": [[1,100], [62,100], [73,7800], [80,10000]], + "eventChance4": 75, + "eventChance5": 75 } ]