Mirror/LunarCore
1
0
Fork 0
mirror of https://github.com/Melledy/LunarCore.git synced 2025-12-12 13:24:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Little thing before 2.6 (#109)

Browse Source 
* Avoid trigger quest

* Update BuyGoodsCsReqOuterClass.java

* Cleanup code

* Update Banners.json

Lingsha and her Lightcone :3

* Update ChallengeInstance.java

Fix a little thing about pts
This commit is contained in:
Haru
2024-10-21 15:59:39 +07:00
committed by GitHub
parent e2925811a2
commit ec315bb1cf
2 changed files with 124 additions and 458 deletions
Download Patch File Download Diff File Expand all files Collapse all files

578
data/Banners.json
View File

@@ -5,762 +5,428 @@
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [
1001, 1001, 1002, 1003, 1004, 1008, 1009, 1013, 1101, 1103, 1104, 1105, 1106,
1002, 1107, 1108, 1109, 1201, 1202, 1206, 1209, 1211, 21000, 21001, 21002,
1003, 21003, 21004, 21005, 21006, 21007, 21008, 21009, 21010, 21011, 21012,
1004, 21013, 21014, 21015, 21016, 21017, 21018, 21019, 21020, 23000, 23002,
1008, 23003, 23004, 23005, 23012, 23013
1009,
1013,
1101,
1103,
1104,
1105,
1106,
1107,
1108,
1109,
1201,
1202,
1206,
1209,
1211,
21000,
21001,
21002,
21003,
21004,
21005,
21006,
21007,
21008,
21009,
21010,
21011,
21012,
21013,
21014,
21015,
21016,
21017,
21018,
21019,
21020,
23000,
23002,
23003,
23004,
23005,
23012,
23013
], ],
"rateUpItems4": [ "rateUpItems4": [23002, 1003, 1101, 1104, 23000, 23003]
23002,
1003,
1101,
1104,
23000,
23003
]
}, },
{ {
"id": 2001, "id": 2001,
"gachaType": "AvatarUp", "gachaType": "AvatarUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [1102],
1102 "rateUpItems4": [1105, 1106, 1109]
],
"rateUpItems4": [
1105,
1106,
1109
]
}, },
{ {
"id": 3001, "id": 3001,
"gachaType": "WeaponUp", "gachaType": "WeaponUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [23001],
23001 "rateUpItems4": [21001, 21005, 21000]
],
"rateUpItems4": [
21001,
21005,
21000
]
}, },
{ {
"id": 2002, "id": 2002,
"gachaType": "AvatarUp", "gachaType": "AvatarUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [1204],
1204 "rateUpItems4": [1206, 1001, 1103]
],
"rateUpItems4": [
1206,
1001,
1103
]
}, },
{ {
"id": 3002, "id": 3002,
"gachaType": "WeaponUp", "gachaType": "WeaponUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [23010],
23010 "rateUpItems4": [21003, 21002, 21013]
],
"rateUpItems4": [
21003,
21002,
21013
]
}, },
{ {
"id": 2005, "id": 2005,
"gachaType": "AvatarUp", "gachaType": "AvatarUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [1006],
1006 "rateUpItems4": [1002, 1009, 1103]
],
"rateUpItems4": [
1002,
1009,
1103
]
}, },
{ {
"id": 3005, "id": 3005,
"gachaType": "WeaponUp", "gachaType": "WeaponUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [23007],
23007 "rateUpItems4": [21017, 21004, 21013]
],
"rateUpItems4": [
21017,
21004,
21013
]
}, },
{ {
"id": 2006, "id": 2006,
"gachaType": "AvatarUp", "gachaType": "AvatarUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [1203],
1203 "rateUpItems4": [1106, 1201, 1207]
],
"rateUpItems4": [
1106,
1201,
1207
]
}, },
{ {
"id": 3006, "id": 3006,
"gachaType": "WeaponUp", "gachaType": "WeaponUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [23008],
23008 "rateUpItems4": [21001, 21018, 21020]
],
"rateUpItems4": [
21001,
21018,
21020
]
}, },
{ {
"id": 2007, "id": 2007,
"gachaType": "AvatarUp", "gachaType": "AvatarUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [1205],
1205 "rateUpItems4": [1008, 1206, 1105]
],
"rateUpItems4": [
1008,
1206,
1105
]
}, },
{ {
"id": 3007, "id": 3007,
"gachaType": "WeaponUp", "gachaType": "WeaponUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [23009],
23009 "rateUpItems4": [21012, 21010, 21007]
],
"rateUpItems4": [
21012,
21010,
21007
]
}, },
{ {
"id": 2008, "id": 2008,
"gachaType": "AvatarUp", "gachaType": "AvatarUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [1005],
1005 "rateUpItems4": [1111, 1108, 1103]
],
"rateUpItems4": [
1111,
1108,
1103
]
}, },
{ {
"id": 3008, "id": 3008,
"gachaType": "WeaponUp", "gachaType": "WeaponUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [23006],
23006 "rateUpItems4": [21015, 21008, 21006]
],
"rateUpItems4": [
21015,
21008,
21006
]
}, },
{ {
"id": 2009, "id": 2009,
"gachaType": "AvatarUp", "gachaType": "AvatarUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [1213],
1213 "rateUpItems4": [1207, 1009, 1001]
],
"rateUpItems4": [
1207,
1009,
1001
]
}, },
{ {
"id": 3009, "id": 3009,
"gachaType": "WeaponUp", "gachaType": "WeaponUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [23015],
23015 "rateUpItems4": [21011, 21018, 21009]
],
"rateUpItems4": [
21011,
21018,
21009
]
}, },
{ {
"id": 2010, "id": 2010,
"gachaType": "AvatarUp", "gachaType": "AvatarUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [1208],
1208 "rateUpItems4": [1110, 1109, 1106]
],
"rateUpItems4": [
1110,
1109,
1106
]
}, },
{ {
"id": 3010, "id": 3010,
"gachaType": "WeaponUp", "gachaType": "WeaponUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [23011],
23011 "rateUpItems4": [21016, 21014, 21019]
],
"rateUpItems4": [
21016,
21014,
21019
]
}, },
{ {
"id": 2011, "id": 2011,
"gachaType": "AvatarUp", "gachaType": "AvatarUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [1212],
1212 "rateUpItems4": [1202, 1201, 1108]
],
"rateUpItems4": [
1202,
1201,
1108
]
}, },
{ {
"id": 3011, "id": 3011,
"gachaType": "WeaponUp", "gachaType": "WeaponUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [23014],
23014 "rateUpItems4": [21008, 21004, 21013]
],
"rateUpItems4": [
21008,
21004,
21013
]
}, },
{ {
"id": 2012, "id": 2012,
"gachaType": "AvatarUp", "gachaType": "AvatarUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [1112],
1112 "rateUpItems4": [1210, 1111, 1206]
],
"rateUpItems4": [
1210,
1111,
1206
]
}, },
{ {
"id": 3012, "id": 3012,
"gachaType": "WeaponUp", "gachaType": "WeaponUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [23016],
23016 "rateUpItems4": [21003, 21018, 21015]
],
"rateUpItems4": [
21003,
21018,
21015
]
}, },
{ {
"id": 2014, "id": 2014,
"gachaType": "AvatarUp", "gachaType": "AvatarUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [1217],
1217 "rateUpItems4": [1002, 1008, 1103]
],
"rateUpItems4": [
1002,
1008,
1103
]
}, },
{ {
"id": 3014, "id": 3014,
"gachaType": "WeaponUp", "gachaType": "WeaponUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [23017],
23017 "rateUpItems4": [21007, 21017, 21016]
],
"rateUpItems4": [
21007,
21017,
21016
]
}, },
{ {
"id": 2015, "id": 2015,
"gachaType": "AvatarUp", "gachaType": "AvatarUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [1302],
1302 "rateUpItems4": [1215, 1110, 1009]
],
"rateUpItems4": [
1215,
1110,
1009
]
}, },
{ {
"id": 3015, "id": 3015,
"gachaType": "WeaponUp", "gachaType": "WeaponUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [23018],
23018 "rateUpItems4": [21019, 21000, 21006]
],
"rateUpItems4": [
21019,
21000,
21006
]
}, },
{ {
"id": 2017, "id": 2017,
"gachaType": "AvatarUp", "gachaType": "AvatarUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [1303],
1303 "rateUpItems4": [1001, 1202, 1214]
],
"rateUpItems4": [
1001,
1202,
1214
]
}, },
{ {
"id": 3017, "id": 3017,
"gachaType": "WeaponUp", "gachaType": "WeaponUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [23019],
23019 "rateUpItems4": [21002, 21011, 21012]
],
"rateUpItems4": [
21002,
21011,
21012
]
}, },
{ {
"id": 2019, "id": 2019,
"gachaType": "AvatarUp", "gachaType": "AvatarUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [1305],
1305 "rateUpItems4": [1105, 1109, 1206]
],
"rateUpItems4": [
1105,
1109,
1206
]
}, },
{ {
"id": 3019, "id": 3019,
"gachaType": "WeaponUp", "gachaType": "WeaponUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [23020],
23020 "rateUpItems4": [21003, 21009, 21014]
],
"rateUpItems4": [
21003,
21009,
21014
]
}, },
{ {
"id": 2021, "id": 2021,
"gachaType": "AvatarUp", "gachaType": "AvatarUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [1307],
1307 "rateUpItems4": [1202, 1210, 1312]
],
"rateUpItems4": [
1202,
1210,
1312
]
}, },
{ {
"id": 3021, "id": 3021,
"gachaType": "WeaponUp", "gachaType": "WeaponUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [23022],
23022 "rateUpItems4": [21015, 21018, 21042]
],
"rateUpItems4": [
21015,
21018,
21042
]
}, },
{ {
"id": 2023, "id": 2023,
"gachaType": "AvatarUp", "gachaType": "AvatarUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [1306],
1306 "rateUpItems4": [1108, 1201, 1215]
],
"rateUpItems4": [
1108,
1201,
1215
]
}, },
{ {
"id": 3023, "id": 3023,
"gachaType": "WeaponUp", "gachaType": "WeaponUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [23021],
23021 "rateUpItems4": [21011, 21019, 21020]
],
"rateUpItems4": [
21011,
21019,
21020
]
}, },
{ {
"id": 2025, "id": 2025,
"gachaType": "AvatarUp", "gachaType": "AvatarUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [1308],
1308 "rateUpItems4": [1301, 1106, 1002]
],
"rateUpItems4": [
1301,
1106,
1002
]
}, },
{ {
"id": 3025, "id": 3025,
"gachaType": "WeaponUp", "gachaType": "WeaponUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [23024],
23024 "rateUpItems4": [21001, 21000, 21017]
],
"rateUpItems4": [
21001,
21000,
21017
]
}, },
{ {
"id": 2027, "id": 2027,
"gachaType": "AvatarUp", "gachaType": "AvatarUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [1304],
1304 "rateUpItems4": [1110, 1111, 1103]
],
"rateUpItems4": [
1110,
1111,
1103
]
}, },
{ {
"id": 3027, "id": 3027,
"gachaType": "WeaponUp", "gachaType": "WeaponUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [23023],
23023 "rateUpItems4": [21043, 21013, 21007]
],
"rateUpItems4": [
21043,
21013,
21007
]
}, },
{ {
"id": 2029, "id": 2029,
"gachaType": "AvatarUp", "gachaType": "AvatarUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [1309],
1309 "rateUpItems4": [1001, 1214, 1215]
],
"rateUpItems4": [
1001,
1214,
1215
]
}, },
{ {
"id": 3029, "id": 3029,
"gachaType": "WeaponUp", "gachaType": "WeaponUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [23026],
23026 "rateUpItems4": [21044, 21010, 21014]
],
"rateUpItems4": [
21044,
21010,
21014
]
}, },
{ {
"id": 2031, "id": 2031,
"gachaType": "AvatarUp", "gachaType": "AvatarUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [1315],
1315 "rateUpItems4": [1106, 1111, 1109]
],
"rateUpItems4": [
1106,
1111,
1109
]
}, },
{ {
"id": 3031, "id": 3031,
"gachaType": "WeaponUp", "gachaType": "WeaponUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [23027],
23027 "rateUpItems4": [21020, 21012, 21009]
],
"rateUpItems4": [
21020,
21012,
21009
]
}, },
{ {
"id": 2033, "id": 2033,
"gachaType": "AvatarUp", "gachaType": "AvatarUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [1310],
1310 "rateUpItems4": [1214, 1301, 1312]
],
"rateUpItems4": [
1214,
1301,
1312
]
}, },
{ {
"id": 3033, "id": 3033,
"gachaType": "WeaponUp", "gachaType": "WeaponUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [23025],
23025 "rateUpItems4": [21002, 21008, 21004]
],
"rateUpItems4": [
21002,
21008,
21004
]
}, },
{ {
"id": 2035, "id": 2035,
"gachaType": "AvatarUp", "gachaType": "AvatarUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [1314],
1314 "rateUpItems4": [1103, 1105, 1009]
],
"rateUpItems4": [
1103,
1105,
1009
]
}, },
{ {
"id": 3035, "id": 3035,
"gachaType": "WeaponUp", "gachaType": "WeaponUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [23028],
23028 "rateUpItems4": [21016, 21045, 21007]
],
"rateUpItems4": [
21016,
21045,
21007
]
}, },
{ {
"id": 2037, "id": 2037,
"gachaType": "AvatarUp", "gachaType": "AvatarUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [1221],
1221 "rateUpItems4": [1110, 1207, 1215]
],
"rateUpItems4": [
1110,
1207,
1215
]
}, },
{ {
"id": 3037, "id": 3037,
"gachaType": "WeaponUp", "gachaType": "WeaponUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [23030],
23030 "rateUpItems4": [21005, 21006, 21014]
],
"rateUpItems4": [
21005,
21006,
21014
]
}, },
{ {
"id": 2039, "id": 2039,
"gachaType": "AvatarUp", "gachaType": "AvatarUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [1218],
1218 "rateUpItems4": [1008, 1109, 1210]
],
"rateUpItems4": [
1008,
1109,
1210
]
}, },
{ {
"id": 3039, "id": 3039,
"gachaType": "WeaponUp", "gachaType": "WeaponUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [23029],
23029 "rateUpItems4": [21008, 21012, 21046]
],
"rateUpItems4": [
21008,
21012,
21046
]
}, },
{ {
"id": 2041, "id": 2041,
"gachaType": "AvatarUp", "gachaType": "AvatarUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [1220],
1220 "rateUpItems4": [1009, 1111, 1223]
],
"rateUpItems4": [
1009,
1111,
1223
]
}, },
{ {
"id": 3041, "id": 3041,
"gachaType": "WeaponUp", "gachaType": "WeaponUp",
"beginTime": 0, "beginTime": 0,
"endTime": 1924992000, "endTime": 1924992000,
"rateUpItems5": [ "rateUpItems5": [23031],
23031 "rateUpItems4": [21015, 21006, 21010]
], },
"rateUpItems4": [ {
21015, "id": 2045,
21006, "gachaType": "AvatarUp",
21010 "beginTime": 0,
] "endTime": 1924992000,
"rateUpItems5": [1222],
"rateUpItems4": [1105, 1210, 1312]
},
{
"id": 3045,
"gachaType": "WeaponUp",
"beginTime": 0,
"endTime": 1924992000,
"rateUpItems5": [23032],
"rateUpItems4": [21047, 21007, 21011]
} }
] ]

2
src/main/java/emu/lunarcore/game/challenge/ChallengeInstance.java
View File

@@ -120,7 +120,7 @@ public class ChallengeInstance {
// Add story battle targets // Add story battle targets
if (this.getExcel().getType() == ChallengeType.STORY) { if (this.getExcel().getType() == ChallengeType.STORY) {
// Add base score counter // Add base score counter
battle.addBattleTarget(1, 10001, this.getTotalScore()); battle.addBattleTarget(1, 10002, this.getTotalScore());
// Add battle targets from story excel // Add battle targets from story excel
for (int id : getExcel().getStoryExcel().getBattleTargetID()) { for (int id : getExcel().getStoryExcel().getBattleTargetID()) {
battle.addBattleTarget(5, id, this.getTotalScore()); battle.addBattleTarget(5, id, this.getTotalScore());