From 17ec7acec76f421e333fd40ea88a2343bc9494cd Mon Sep 17 00:00:00 2001 From: atlasacademy-sion Date: Thu, 19 Jun 2025 10:41:51 +0000 Subject: [PATCH] Version: 2.95.2 DataVer: 870 --- AssetStorage.txt | 11 +- .../ScriptFileList/ScriptFileList.txt | 6 + gamedatatop.json | 6 +- master/mstBanner.json | 100 ++-- master/mstBoardMessage.json | 30 +- master/mstEvent.json | 432 +++++++++++++++--- master/mstEventCampaign.json | 8 +- master/mstEventMission.json | 42 +- master/mstGacha.json | 37 ++ master/mstGachaAppend.json | 11 + master/mstGachaExtraGift.json | 21 + master/mstGachaGroup.json | 6 + master/mstGachaPickupCollateral.json | 6 + master/mstGachaPickupCollateralGroup.json | 3 + master/mstMasterMission.json | 6 +- master/mstQuest.json | 64 +++ master/mstQuestPickup.json | 226 ++++++++- master/mstQuestRelease.json | 64 +++ master/mstQuestReleaseOverwrite.json | 112 ++--- master/mstQuestRestriction.json | 32 +- master/mstRestriction.json | 10 +- master/mstShop.json | 93 ++++ master/mstShopRelease.json | 378 +++++++++++++++ master/mstSubtitle.json | 2 +- master/mstSvtCostume.json | 6 +- master/mstSvtFilter.json | 4 +- master/mstSvtTreasureDevice.json | 20 +- master/mstSvtVoice.json | 8 +- master/mstWarAdd.json | 4 +- 29 files changed, 1474 insertions(+), 274 deletions(-) diff --git a/AssetStorage.txt b/AssetStorage.txt index c34e88bf3..3a30e1156 100644 --- a/AssetStorage.txt +++ b/AssetStorage.txt @@ -1,5 +1,5 @@ -~605238940 -@FgoDataVersion0066,20160420_1,20250612_16:41 +~3046667048 +@FgoDataVersion0066,20160420_1,20250618_18:31 d2d3d2b66bee5c8191304d16b21e05050575c178,DATA0,5460736,3297577398,ADV/1000000,,1 bf1eca16e0c14a54919187478a19b04989bf8d8e,SYSTEM,10373256,4252777760,Audio/Battle.cpk.bytes,, c19557cba621d2b96ea32fc309a2168a1c4ecf26,DATA0,1896584,1822905443,Audio/Bgm/BGM_AMAZONES.cpk.bytes,, @@ -6992,7 +6992,7 @@ d8df91fa50f5c7db0d7a119c1a03c6f407221f44,DATA0,111488,499157295,Back/back99805,, ae5f53a2b684af05755c6bef881fd057e9b11f5a,DATA0,156704,1968364854,Back/back99900,,1 9037f4045605ee063098b09a974c99e63856d7eb,DATA0,152896,204613595,Back/back99901,,1 1114da68a39b5dcaa9a420f3340991f441a0be26,DATA0,147712,3154658386,Back/back99902,,1 -a45cfffd377a0fca0f51ba338497cf902b23b500,SYSTEM,1694176,531458458,Banner/DownloadBannerAtlas1,, +3e7ba8fa727dc251cbdf33da0741f3438da1778e,SYSTEM,1694240,1103523074,Banner/DownloadBannerAtlas1,, bf66ad203f13aa46c1f5840d5ed80334d2a9eb8b,SYSTEM,1431008,409903094,Banner/DownloadBannerAtlas2,, 22015d0119b1b0cefffde6eefea0d5d166381e58,SYSTEM,865376,1384848614,Banner/DownloadBannerAtlas3,, 7a8803a5b655f38081ce64bba06c65cc88b60343,SYSTEM,3514336,2375439869,Battle/BattleResult,, @@ -20728,7 +20728,7 @@ f04d634ef5dcaf3023aa9e9de3b39655a1f0e41e,DATA0,5056,2303629465,Image/slash_right d4fa6e2d699adbc0940837988a15688d760e8425,DATA0,3392,4052566400,Image/slashright,,1 060457ef9fbf3b6bdeab50902751ea580dc2e989,DATA0,142656,685088712,Image/talk_img_black_gradation,,1 20cc837d1abb1b50facfa04996c97f2e6a27e533,DATA0,198976,424829010,Image/talk_img_sandstorm,,1 -8529176e45b8047fdc4beb61c0874993451492c6,DATA0,1504,1230367207,iPhone,, +bd73aba1fda6194a17b2d21e43329855792fa6ab,DATA0,537440,2614626630,iPhone,, f90627366ae319827aefd9c3bb55768e91d0ae29,SYSTEM,5789792,3751589484,Items/DownloadItem,, 978bea4e614d6edff1d1eb4486b12d25172c1dfd,SYSTEM,133888,2033667358,Localization,,1 f2b1331f0f4614d5053202a59ac725313bcfb226,SYSTEM,11968,1271678757,MapShortcut/DownloadMapShortcut,42a167, @@ -23852,7 +23852,7 @@ c5218fe85429efe68922a89628a1a9dc25d9ac9a,DATA0,1104416,1282395822,ScriptActionEn bbeaa94eea2328ffe0417f2fe69aa4035cf90165,DATA0,1313408,449902548,ScriptActionEncrypt/94/9409,cb7471, fba24ebd650eadf2f53a932c143bbc3e5e2dedfd,DATA0,10208,1563146013,ScriptActionEncrypt/94/9499,, 1617387c7e8b62fdecedca0764fc01955f16f955,SYSTEM,129888,3932848302,ScriptActionEncrypt/Common,, -e65eb1a16fe4e0e008dc38eb05f0e005ac0ecbdc,SYSTEM,22656,1637918800,ScriptActionEncrypt/ScriptFileList,, +cb198ae3c72796953e0941deedce8eb824558ecb,SYSTEM,22688,1178081163,ScriptActionEncrypt/ScriptFileList,, bf4ecf4655ed05f49eb4db7a8db1a8d0921e1c32,SYSTEM,4576,2182348111,ScriptUI/MessageWindow/cinema,3e6c40, a14fc80722fed0f7b0ffff8f3d22e526e2e5f914,DATA0,268768,647154952,Servants/0,, a1f4ef754635f0be3d9633af43ffb5bc4affaeae,DATA0,2687520,1015655924,Servants/1000100,, @@ -27817,7 +27817,6 @@ dad5e319d2dc1dd733000a9623ffc4cfc7022ad3,SYSTEM,929408,267207069,ShopBanners/Dow 58e2b3fbba76167f2a6793ff896aab36c770729c,SYSTEM,758560,3148657383,SkillIcons/DownloadSkillIcon,,1 439f8ce6265a12db6d5793ea0362cc14263890b2,SYSTEM,897248,1657861479,SummonBanners/DownloadSummonBannerAtlas1,,1 022cbc68c5969fcaead68a145cbbc534febb4c65,SYSTEM,315136,1613453138,SummonBanners/DownloadSummonBannerAtlas10,, -e49da04bc0a7d983e495e8c474b2ccc5d6afcaa8,SYSTEM,1039744,217908636,SummonBanners/DownloadSummonBannerAtlas11,, a228bbb728f67a80e314d0afeb610222625c15ae,SYSTEM,814816,2990961239,SummonBanners/DownloadSummonBannerAtlas2,,1 65b7b14df0873f383540ad0008c32eb2e502b63d,SYSTEM,887136,1240781820,SummonBanners/DownloadSummonBannerAtlas3,,1 a1d7960debd4d7b0f370595f67b734343ca1d132,SYSTEM,815200,2705937626,SummonBanners/DownloadSummonBannerAtlas4,,1 diff --git a/ScriptActionEncrypt/ScriptFileList/ScriptFileList.txt b/ScriptActionEncrypt/ScriptFileList/ScriptFileList.txt index 21642bd18..5e95ef4c5 100644 --- a/ScriptActionEncrypt/ScriptFileList/ScriptFileList.txt +++ b/ScriptActionEncrypt/ScriptFileList/ScriptFileList.txt @@ -8959,3 +8959,9 @@ WarEpilogue108.txt 9409870811.txt 9409870820.txt 9409870910.txt +9409950010.txt +9409950020.txt +9409950110.txt +9409950120.txt +9409950130.txt +9409950131.txt diff --git a/gamedatatop.json b/gamedatatop.json index 6bf19100b..d9cce559c 100644 --- a/gamedatatop.json +++ b/gamedatatop.json @@ -2,7 +2,7 @@ "response": [{ "resCode": "00", "success": { - "version": 869, + "version": 870, "master": "", "useProtoBuf": 1, "isCloseSvtGetEffect": "0000", @@ -11,11 +11,11 @@ "mapTalkShow": 0, "eventRaceBoostEffectBugSwitch": 0, "closeAttackHaveMoreBUff": "9935510", - "FixVersion_Android": 45, + "FixVersion_Android": 46, "FixVersion_iOS": 0, "voiceLabelSet": 1, "npVoiceLabelSet": 1, - "assetStorageVersion": 202506121631, + "assetStorageVersion": 202506181803, "paramsExtension": { "checkOrderNum": 10, "checkOrderTime": 30 diff --git a/master/mstBanner.json b/master/mstBanner.json index 08ae1de1e..7148829b6 100644 --- a/master/mstBanner.json +++ b/master/mstBanner.json @@ -1,16 +1,4 @@ [{ - "id": 81069, - "bannerId": 81069, - "bannerPriority": 90, - "terminalBannerPriority": 90, - "noticeAt": 1749103200, - "finishedAt": 1749725999, - "linkType": 1, - "linkBody": "https://line3-patch-fate.bilibiligame.net/manage/html/Notice/Game/ios/2025-05-08/activityNotice_7368_1747032006.html", - "deviceType": 0, - "dialogImage": "", - "dialogText": "" -}, { "id": 81070, "bannerId": 81070, "bannerPriority": 89, @@ -25,8 +13,8 @@ }, { "id": 81078, "bannerId": 81078, - "bannerPriority": 99, - "terminalBannerPriority": 99, + "bannerPriority": 96, + "terminalBannerPriority": 96, "noticeAt": 1749103200, "finishedAt": 1750917599, "linkType": 1, @@ -37,8 +25,8 @@ }, { "id": 81079, "bannerId": 81079, - "bannerPriority": 98, - "terminalBannerPriority": 98, + "bannerPriority": 95, + "terminalBannerPriority": 95, "noticeAt": 1749103200, "finishedAt": 1750917599, "linkType": 2, @@ -46,35 +34,11 @@ "deviceType": 0, "dialogImage": "", "dialogText": "" -}, { - "id": 81080, - "bannerId": 81080, - "bannerPriority": 97, - "terminalBannerPriority": 97, - "noticeAt": 1749294000, - "finishedAt": 1749880799, - "linkType": 2, - "linkBody": "SummonScene/5002888", - "deviceType": 0, - "dialogImage": "", - "dialogText": "" -}, { - "id": 81081, - "bannerId": 81081, - "bannerPriority": 96, - "terminalBannerPriority": 96, - "noticeAt": 1749459600, - "finishedAt": 1750053599, - "linkType": 2, - "linkBody": "SummonScene/5002889", - "deviceType": 0, - "dialogImage": "", - "dialogText": "" }, { "id": 81082, "bannerId": 81082, - "bannerPriority": 95, - "terminalBannerPriority": 95, + "bannerPriority": 94, + "terminalBannerPriority": 94, "noticeAt": 1749639600, "finishedAt": 1750917599, "linkType": 2, @@ -85,8 +49,8 @@ }, { "id": 81083, "bannerId": 81083, - "bannerPriority": 94, - "terminalBannerPriority": 94, + "bannerPriority": 93, + "terminalBannerPriority": 93, "noticeAt": 1749812400, "finishedAt": 1750399199, "linkType": 2, @@ -97,8 +61,8 @@ }, { "id": 81084, "bannerId": 81084, - "bannerPriority": 93, - "terminalBannerPriority": 93, + "bannerPriority": 92, + "terminalBannerPriority": 92, "noticeAt": 1749978000, "finishedAt": 1750571999, "linkType": 2, @@ -109,8 +73,8 @@ }, { "id": 81085, "bannerId": 81085, - "bannerPriority": 92, - "terminalBannerPriority": 92, + "bannerPriority": 91, + "terminalBannerPriority": 91, "noticeAt": 1750150800, "finishedAt": 1750744799, "linkType": 2, @@ -121,8 +85,8 @@ }, { "id": 81086, "bannerId": 81086, - "bannerPriority": 91, - "terminalBannerPriority": 91, + "bannerPriority": 90, + "terminalBannerPriority": 90, "noticeAt": 1750323600, "finishedAt": 1750917599, "linkType": 2, @@ -130,6 +94,42 @@ "deviceType": 0, "dialogImage": "", "dialogText": "" +}, { + "id": 81106, + "bannerId": 81106, + "bannerPriority": 99, + "terminalBannerPriority": 99, + "noticeAt": 1750312800, + "finishedAt": 1751522399, + "linkType": 1, + "linkBody": "https://line3-patch-fate.bilibiligame.net/manage/html/Notice/Game/ios/2025-06-10/activityNotice_7524_1749719451.html", + "deviceType": 0, + "dialogImage": "", + "dialogText": "" +}, { + "id": 81107, + "bannerId": 81107, + "bannerPriority": 98, + "terminalBannerPriority": 98, + "noticeAt": 1750312800, + "finishedAt": 1750917599, + "linkType": 1, + "linkBody": "https://line3-patch-fate.bilibiligame.net/manage/html/Notice/Game/ios/2025-06-10/activityNotice_7522_1749719334.html", + "deviceType": 0, + "dialogImage": "", + "dialogText": "" +}, { + "id": 81108, + "bannerId": 81108, + "bannerPriority": 97, + "terminalBannerPriority": 97, + "noticeAt": 1750312800, + "finishedAt": 1750917599, + "linkType": 2, + "linkBody": "SummonScene/5002895", + "deviceType": 0, + "dialogImage": "", + "dialogText": "" }, { "id": 99998, "bannerId": 99998, diff --git a/master/mstBoardMessage.json b/master/mstBoardMessage.json index 09ca6d0c5..fae618691 100644 --- a/master/mstBoardMessage.json +++ b/master/mstBoardMessage.json @@ -2723,7 +2723,7 @@ }, "isFrameBg": true }, { - "startTime": 1719460800, + "startTime": 1750831199, "color": "#FFEB04FF", "frameOffset": { "x": 0, @@ -2732,8 +2732,8 @@ }, "isFrameBg": true }], - "openedAt": 2145888000, - "closedAt": 2145888000 + "openedAt": 1750312800, + "closedAt": 1750917599 }, { "id": 71449001, "warId": 1001, @@ -2751,7 +2751,7 @@ }, "isFrameBg": true }, { - "startTime": 1719892800, + "startTime": 1751435999, "color": "#FFEB04FF", "frameOffset": { "x": 0, @@ -2760,8 +2760,8 @@ }, "isFrameBg": true }], - "openedAt": 2145888000, - "closedAt": 2145888000 + "openedAt": 1750312800, + "closedAt": 1751522399 }, { "id": 71450001, "warId": 1003, @@ -2779,7 +2779,7 @@ }, "isFrameBg": true }, { - "startTime": 1719892800, + "startTime": 1751435999, "color": "#FFEB04FF", "frameOffset": { "x": 0, @@ -2788,8 +2788,8 @@ }, "isFrameBg": true }], - "openedAt": 2145888000, - "closedAt": 2145888000 + "openedAt": 1750312800, + "closedAt": 1751522399 }, { "id": 80084001, "warId": 8188, @@ -14626,7 +14626,7 @@ }, "isFrameBg": true }, { - "startTime": 1719460800, + "startTime": 1750831199, "color": "#FFEB04FF", "frameOffset": { "x": 0, @@ -14635,8 +14635,8 @@ }, "isFrameBg": true }], - "openedAt": 2145888000, - "closedAt": 2145888000 + "openedAt": 1750312800, + "closedAt": 1750917599 }, { "id": 80480001, "warId": 9170, @@ -14787,7 +14787,7 @@ }, "isFrameBg": true }, { - "startTime": 1719892800, + "startTime": 1751435999, "color": "#FFEB04FF", "frameOffset": { "x": 0, @@ -14796,6 +14796,6 @@ }, "isFrameBg": true }], - "openedAt": 2145888000, - "closedAt": 2145888000 + "openedAt": 1750312800, + "closedAt": 1751522399 }] \ No newline at end of file diff --git a/master/mstEvent.json b/master/mstEvent.json index fa0b243c2..b84f4816d 100644 --- a/master/mstEvent.json +++ b/master/mstEvent.json @@ -2911,10 +2911,10 @@ "bannerPriority": 0, "openHours": 0, "intervalHours": 0, - "noticeAt": 1751299200, - "startedAt": 1751299200, - "endedAt": 1751299200, - "finishedAt": 1751299200, + "noticeAt": 2145888000, + "startedAt": 2145888000, + "endedAt": 2145888000, + "finishedAt": 2145888000, "materialOpenedAt": 2145888000, "linkType": 1, "linkBody": "/summon/detail_summon_1.html", @@ -2961,10 +2961,10 @@ "bannerPriority": 0, "openHours": 0, "intervalHours": 0, - "noticeAt": 1751299200, - "startedAt": 1751299200, - "endedAt": 1751299200, - "finishedAt": 1751299200, + "noticeAt": 2145888000, + "startedAt": 2145888000, + "endedAt": 2145888000, + "finishedAt": 2145888000, "materialOpenedAt": 2145888000, "linkType": 1, "linkBody": "/summon/detail_summon_1.html", @@ -3236,10 +3236,10 @@ "bannerPriority": 0, "openHours": 0, "intervalHours": 0, - "noticeAt": 1751299200, - "startedAt": 1751299200, - "endedAt": 1751299200, - "finishedAt": 1751299200, + "noticeAt": 2145888000, + "startedAt": 2145888000, + "endedAt": 2145888000, + "finishedAt": 2145888000, "materialOpenedAt": 2145888000, "linkType": 1, "linkBody": "/summon/detail_summon_1.html", @@ -3261,10 +3261,10 @@ "bannerPriority": 0, "openHours": 0, "intervalHours": 0, - "noticeAt": 1751299200, - "startedAt": 1751299200, - "endedAt": 1751299200, - "finishedAt": 1751299200, + "noticeAt": 2145888000, + "startedAt": 2145888000, + "endedAt": 2145888000, + "finishedAt": 2145888000, "materialOpenedAt": 2145888000, "linkType": 1, "linkBody": "/summon/detail_summon_1.html", @@ -3286,10 +3286,10 @@ "bannerPriority": 0, "openHours": 0, "intervalHours": 0, - "noticeAt": 1751299200, - "startedAt": 1751299200, - "endedAt": 1751299200, - "finishedAt": 1751299200, + "noticeAt": 2145888000, + "startedAt": 2145888000, + "endedAt": 2145888000, + "finishedAt": 2145888000, "materialOpenedAt": 2145888000, "linkType": 1, "linkBody": "/summon/detail_summon_1.html", @@ -3311,10 +3311,10 @@ "bannerPriority": 0, "openHours": 0, "intervalHours": 0, - "noticeAt": 1751299200, - "startedAt": 1751299200, - "endedAt": 1751299200, - "finishedAt": 1751299200, + "noticeAt": 2145888000, + "startedAt": 2145888000, + "endedAt": 2145888000, + "finishedAt": 2145888000, "materialOpenedAt": 2145888000, "linkType": 1, "linkBody": "/summon/detail_summon_1.html", @@ -3361,10 +3361,10 @@ "bannerPriority": 0, "openHours": 0, "intervalHours": 0, - "noticeAt": 1751299200, - "startedAt": 1751299200, - "endedAt": 1751299200, - "finishedAt": 1751299200, + "noticeAt": 2145888000, + "startedAt": 2145888000, + "endedAt": 2145888000, + "finishedAt": 2145888000, "materialOpenedAt": 2145888000, "linkType": 1, "linkBody": "/summon/detail_summon_1.html", @@ -3561,10 +3561,10 @@ "bannerPriority": 0, "openHours": 0, "intervalHours": 0, - "noticeAt": 1751299200, - "startedAt": 1751299200, - "endedAt": 1751299200, - "finishedAt": 1751299200, + "noticeAt": 2145888000, + "startedAt": 2145888000, + "endedAt": 2145888000, + "finishedAt": 2145888000, "materialOpenedAt": 2145888000, "linkType": 1, "linkBody": "/summon/detail_summon_1.html", @@ -3611,10 +3611,10 @@ "bannerPriority": 0, "openHours": 0, "intervalHours": 0, - "noticeAt": 1751299200, - "startedAt": 1751299200, - "endedAt": 1751299200, - "finishedAt": 1751299200, + "noticeAt": 2145888000, + "startedAt": 2145888000, + "endedAt": 2145888000, + "finishedAt": 2145888000, "materialOpenedAt": 2145888000, "linkType": 1, "linkBody": "/summon/detail_summon_1.html", @@ -3636,10 +3636,10 @@ "bannerPriority": 0, "openHours": 0, "intervalHours": 0, - "noticeAt": 1751299200, - "startedAt": 1751299200, - "endedAt": 1751299200, - "finishedAt": 1751299200, + "noticeAt": 2145888000, + "startedAt": 2145888000, + "endedAt": 2145888000, + "finishedAt": 2145888000, "materialOpenedAt": 2145888000, "linkType": 1, "linkBody": "/summon/detail_summon_1.html", @@ -3711,10 +3711,10 @@ "bannerPriority": 0, "openHours": 0, "intervalHours": 0, - "noticeAt": 1751299200, - "startedAt": 1751299200, - "endedAt": 1751299200, - "finishedAt": 1751299200, + "noticeAt": 2145888000, + "startedAt": 2145888000, + "endedAt": 2145888000, + "finishedAt": 2145888000, "materialOpenedAt": 2145888000, "linkType": 1, "linkBody": "/summon/detail_summon_1.html", @@ -14448,6 +14448,56 @@ "myroomBgmId": 0, "script": [], "shortName": "" +}, { + "id": 10742, + "baseEventId": 0, + "type": 10, + "openType": 1, + "name": "幕间物语第20弹 特别次数登录奖励", + "detail": "開催期間中、1日1回 最大5回 特別ログインボーナスをプレゼント！", + "noticeBannerId": 0, + "bannerId": 0, + "iconId": 0, + "bannerPriority": 0, + "openHours": 0, + "intervalHours": 0, + "noticeAt": 1750363200, + "startedAt": 1750363200, + "endedAt": 1750967999, + "finishedAt": 1750967999, + "materialOpenedAt": 2145888000, + "linkType": 1, + "linkBody": "/summon/detail_summon_1.html", + "deviceType": 0, + "myroomBgId": 0, + "myroomBgmId": 0, + "script": [], + "shortName": "" +}, { + "id": 10746, + "baseEventId": 0, + "type": 10, + "openType": 1, + "name": "「舞动龙宫！ ～深海公主与两枚宝玉～」开幕前夕纪念活动 开幕纪念登录奖励", + "detail": "開催期間中、1日1回 最大7回 ログインボーナスをプレゼント！", + "noticeBannerId": 0, + "bannerId": 0, + "iconId": 0, + "bannerPriority": 0, + "openHours": 0, + "intervalHours": 0, + "noticeAt": 1750363200, + "startedAt": 1750363200, + "endedAt": 1751659199, + "finishedAt": 1751659199, + "materialOpenedAt": 2145888000, + "linkType": 1, + "linkBody": "/summon/detail_summon_1.html", + "deviceType": 0, + "myroomBgId": 0, + "myroomBgmId": 0, + "script": [], + "shortName": "" }, { "id": 10810, "baseEventId": 0, @@ -14711,10 +14761,10 @@ "bannerPriority": 0, "openHours": 0, "intervalHours": 0, - "noticeAt": 1751299200, - "startedAt": 1751299200, - "endedAt": 1751299200, - "finishedAt": 1751299200, + "noticeAt": 2145888000, + "startedAt": 2145888000, + "endedAt": 2145888000, + "finishedAt": 2145888000, "materialOpenedAt": 2145888000, "linkType": 1, "linkBody": "/summon/detail_summon_1.html", @@ -14736,10 +14786,10 @@ "bannerPriority": 0, "openHours": 0, "intervalHours": 0, - "noticeAt": 1751299200, - "startedAt": 1751299200, - "endedAt": 1751299200, - "finishedAt": 1751299200, + "noticeAt": 2145888000, + "startedAt": 2145888000, + "endedAt": 2145888000, + "finishedAt": 2145888000, "materialOpenedAt": 2145888000, "linkType": 1, "linkBody": "/summon/detail_summon_1.html", @@ -15011,10 +15061,10 @@ "bannerPriority": 0, "openHours": 0, "intervalHours": 0, - "noticeAt": 1751299200, - "startedAt": 1751299200, - "endedAt": 1751299200, - "finishedAt": 1751299200, + "noticeAt": 2145888000, + "startedAt": 2145888000, + "endedAt": 2145888000, + "finishedAt": 2145888000, "materialOpenedAt": 2145888000, "linkType": 1, "linkBody": "/summon/detail_summon_1.html", @@ -19149,6 +19199,33 @@ "combineMessageImageId": "2018601" }], "shortName": "" +}, { + "id": 20187, + "baseEventId": 0, + "type": 5, + "openType": 1, + "name": "「舞动龙宫！」关联从者强化『大成功＆极大成功』2倍！", + "detail": "「舞动龙宫！」关联从者强化『大成功＆极大成功』2倍！", + "noticeBannerId": 0, + "bannerId": 0, + "iconId": 0, + "bannerPriority": 0, + "openHours": 0, + "intervalHours": 0, + "noticeAt": 1750312800, + "startedAt": 1750312800, + "endedAt": 1751522399, + "finishedAt": 1751522399, + "materialOpenedAt": 2145888000, + "linkType": 1, + "linkBody": "/summon/detail_summon_1.html", + "deviceType": 0, + "myroomBgId": 0, + "myroomBgmId": 0, + "script": [{ + "combineMessageImageId": "2018701" + }], + "shortName": "" }, { "id": 20188, "baseEventId": 0, @@ -19289,10 +19366,10 @@ "bannerPriority": 0, "openHours": 0, "intervalHours": 0, - "noticeAt": 1751299200, - "startedAt": 1751299200, - "endedAt": 1751299200, - "finishedAt": 1751299200, + "noticeAt": 2145888000, + "startedAt": 2145888000, + "endedAt": 2145888000, + "finishedAt": 2145888000, "materialOpenedAt": 2145888000, "linkType": 1, "linkBody": "/summon/detail_summon_1.html", @@ -19314,10 +19391,10 @@ "bannerPriority": 0, "openHours": 0, "intervalHours": 0, - "noticeAt": 1751299200, - "startedAt": 1751299200, - "endedAt": 1751299200, - "finishedAt": 1751299200, + "noticeAt": 2145888000, + "startedAt": 2145888000, + "endedAt": 2145888000, + "finishedAt": 2145888000, "materialOpenedAt": 2145888000, "linkType": 1, "linkBody": "/summon/detail_summon_1.html", @@ -27644,6 +27721,134 @@ "myroomBgmId": 0, "script": [], "shortName": "" +}, { + "id": 71448, + "baseEventId": 0, + "type": 7, + "openType": 1, + "name": "消耗AP减半", + "detail": "消耗AP减半纪念活动", + "noticeBannerId": 0, + "bannerId": 0, + "iconId": 0, + "bannerPriority": 0, + "openHours": 0, + "intervalHours": 0, + "noticeAt": 1750312800, + "startedAt": 1750312800, + "endedAt": 1750917599, + "finishedAt": 1750917599, + "materialOpenedAt": 2145888000, + "linkType": 1, + "linkBody": "/summon/detail_summon_1.html", + "deviceType": 0, + "myroomBgId": 0, + "myroomBgmId": 0, + "script": [], + "shortName": "" +}, { + "id": 71449, + "baseEventId": 0, + "type": 7, + "openType": 1, + "name": "消耗AP减半", + "detail": "消耗AP减半纪念活动", + "noticeBannerId": 0, + "bannerId": 0, + "iconId": 0, + "bannerPriority": 0, + "openHours": 0, + "intervalHours": 0, + "noticeAt": 1750312800, + "startedAt": 1750312800, + "endedAt": 1751522399, + "finishedAt": 1751522399, + "materialOpenedAt": 2145888000, + "linkType": 1, + "linkBody": "/summon/detail_summon_1.html", + "deviceType": 0, + "myroomBgId": 0, + "myroomBgmId": 0, + "script": [], + "shortName": "" +}, { + "id": 71450, + "baseEventId": 0, + "type": 7, + "openType": 1, + "name": "消耗AP减半", + "detail": "消耗AP减半纪念活动", + "noticeBannerId": 0, + "bannerId": 0, + "iconId": 0, + "bannerPriority": 0, + "openHours": 0, + "intervalHours": 0, + "noticeAt": 1750312800, + "startedAt": 1750312800, + "endedAt": 1751522399, + "finishedAt": 1751522399, + "materialOpenedAt": 2145888000, + "linkType": 1, + "linkBody": "/summon/detail_summon_1.html", + "deviceType": 0, + "myroomBgId": 0, + "myroomBgmId": 0, + "script": [], + "shortName": "" +}, { + "id": 71451, + "baseEventId": 0, + "type": 7, + "openType": 1, + "name": "「舞动龙宫！」关联从者 获得牵绊点数提升20%", + "detail": "「舞动龙宫！」关联从者 获得牵绊点数提升20%", + "noticeBannerId": 0, + "bannerId": 0, + "iconId": 0, + "bannerPriority": 0, + "openHours": 0, + "intervalHours": 0, + "noticeAt": 1750312800, + "startedAt": 1750312800, + "endedAt": 1750917599, + "finishedAt": 1750917599, + "materialOpenedAt": 2145888000, + "linkType": 1, + "linkBody": "/summon/detail_summon_1.html", + "deviceType": 0, + "myroomBgId": 0, + "myroomBgmId": 0, + "script": [{ + "eventCampaignBonusDetailName": "可获得的自身牵绊提升", + "eventCampaignBonusDetailNameTotal": "可获得的自身牵绊提升" + }], + "shortName": "" +}, { + "id": 71452, + "baseEventId": 0, + "type": 7, + "openType": 1, + "name": "「舞动龙宫！」关联从者助战时 友情点获得量2倍！", + "detail": "「舞动龙宫！」关联从者助战时 友情点获得量2倍！", + "noticeBannerId": 0, + "bannerId": 0, + "iconId": 0, + "bannerPriority": 0, + "openHours": 0, + "intervalHours": 0, + "noticeAt": 1750312800, + "startedAt": 1750312800, + "endedAt": 1750917599, + "finishedAt": 1750917599, + "materialOpenedAt": 2145888000, + "linkType": 1, + "linkBody": "/summon/detail_summon_1.html", + "deviceType": 0, + "myroomBgId": 0, + "myroomBgmId": 0, + "script": [], + "shortName": "" }, { "id": 71453, "baseEventId": 0, @@ -29307,10 +29512,10 @@ "bannerPriority": 0, "openHours": 0, "intervalHours": 0, - "noticeAt": 1751299200, - "startedAt": 1751299200, - "endedAt": 1751299200, - "finishedAt": 1751299200, + "noticeAt": 2145888000, + "startedAt": 2145888000, + "endedAt": 2145888000, + "finishedAt": 2145888000, "materialOpenedAt": 2145888000, "linkType": 1, "linkBody": "/summon/detail_summon_1.html", @@ -29782,10 +29987,10 @@ "bannerPriority": 0, "openHours": 0, "intervalHours": 0, - "noticeAt": 1751299200, - "startedAt": 1751299200, - "endedAt": 1751299200, - "finishedAt": 1751299200, + "noticeAt": 2145888000, + "startedAt": 2145888000, + "endedAt": 2145888000, + "finishedAt": 2145888000, "materialOpenedAt": 2145888000, "linkType": 1, "linkBody": "/summon/detail_summon_1.html", @@ -29932,10 +30137,10 @@ "bannerPriority": 0, "openHours": 0, "intervalHours": 0, - "noticeAt": 1751299200, - "startedAt": 1751299200, - "endedAt": 1751299200, - "finishedAt": 1751299200, + "noticeAt": 2145888000, + "startedAt": 2145888000, + "endedAt": 2145888000, + "finishedAt": 2145888000, "materialOpenedAt": 2145888000, "linkType": 1, "linkBody": "/summon/detail_summon_1.html", @@ -35073,6 +35278,31 @@ "myroomBgmId": 0, "script": [], "shortName": "" +}, { + "id": 80479, + "baseEventId": 0, + "type": 25, + "openType": 1, + "name": "[FFFF00]开放条件缓和中！[-]", + "detail": "开放条件缓和中！", + "noticeBannerId": 0, + "bannerId": 0, + "iconId": 0, + "bannerPriority": 0, + "openHours": 0, + "intervalHours": 0, + "noticeAt": 1750312800, + "startedAt": 1750312800, + "endedAt": 1750917599, + "finishedAt": 1750917599, + "materialOpenedAt": 2145888000, + "linkType": 1, + "linkBody": "/summon/detail_summon_1.html", + "deviceType": 0, + "myroomBgId": 0, + "myroomBgmId": 0, + "script": [], + "shortName": "" }, { "id": 80481, "baseEventId": 0, @@ -35098,6 +35328,31 @@ "myroomBgmId": 0, "script": [], "shortName": "" +}, { + "id": 80482, + "baseEventId": 0, + "type": 25, + "openType": 1, + "name": "[FFFF00]开放条件缓和中！[-]", + "detail": "开放条件缓和中！", + "noticeBannerId": 0, + "bannerId": 0, + "iconId": 0, + "bannerPriority": 0, + "openHours": 0, + "intervalHours": 0, + "noticeAt": 1750312800, + "startedAt": 1750312800, + "endedAt": 1751522399, + "finishedAt": 1751522399, + "materialOpenedAt": 2145888000, + "linkType": 1, + "linkBody": "/summon/detail_summon_1.html", + "deviceType": 0, + "myroomBgId": 0, + "myroomBgmId": 0, + "script": [], + "shortName": "" }, { "id": 80487, "baseEventId": 0, @@ -35323,6 +35578,31 @@ "myroomBgmId": 0, "script": [], "shortName": "" +}, { + "id": 100008, + "baseEventId": 0, + "type": 17, + "openType": 1, + "name": "哔哩哔哩十六周年庆连续登录奖励", + "detail": "纪念活动期间，每日1次\n最多可获得5次特别登录奖励！\n请注意，倘若连续登录中断，\n将无法领取之后的特殊奖励。", + "noticeBannerId": 0, + "bannerId": 0, + "iconId": 0, + "bannerPriority": 0, + "openHours": 0, + "intervalHours": 0, + "noticeAt": 1750881600, + "startedAt": 1750881600, + "endedAt": 1751486399, + "finishedAt": 1751486399, + "materialOpenedAt": 2145888000, + "linkType": 1, + "linkBody": "/summon/detail_summon_1.html", + "deviceType": 0, + "myroomBgId": 0, + "myroomBgmId": 0, + "script": [], + "shortName": "" }, { "id": 860001, "baseEventId": 0, diff --git a/master/mstEventCampaign.json b/master/mstEventCampaign.json index fd885e305..fd41cf24f 100644 --- a/master/mstEventCampaign.json +++ b/master/mstEventCampaign.json @@ -3018,7 +3018,7 @@ "eventId": 20187, "idx": 1, "target": 4, - "targetIds": [204000, 501900, 500900, 504200, 403500, 700600, 103000, 200100, 502500, 603900, 604800, 701600, 800100, 701300, 1001700], + "targetIds": [204000, 501900, 500900, 504200, 403500, 700600, 103000, 200100, 502500, 603900, 604800, 701600, 800100, 701300], "value": 2000, "warIds": [], "groupId": 0, @@ -3029,7 +3029,7 @@ "eventId": 20187, "idx": 1, "target": 5, - "targetIds": [204000, 501900, 500900, 504200, 403500, 700600, 103000, 200100, 502500, 603900, 604800, 701600, 800100, 701300, 1001700], + "targetIds": [204000, 501900, 500900, 504200, 403500, 700600, 103000, 200100, 502500, 603900, 604800, 701600, 800100, 701300], "value": 2000, "warIds": [], "groupId": 0, @@ -3040,7 +3040,7 @@ "eventId": 20188, "idx": 1, "target": 4, - "targetIds": [100100, 102700, 104100, 101800, 102800, 100600, 100900, 102900, 101700, 104900, 201500, 202000, 200200, 202600, 203200, 204000, 202300, 301300, 300400, 303200, 302000, 302400, 300800, 303600, 400300, 403500, 401200, 403200, 400200, 402700, 501900, 500300, 500900, 502800, 500800, 503900, 600500, 602100, 602500, 603100, 604200, 702000, 703600, 700600, 700700, 701400, 702400, 704000, 900100, 900200, 900500, 900900, 1000200, 1001600, 1100300, 1100200, 2300200, 2500200, 2500700, 2501000, 2800300, 3300100, 102600, 104000, 103400, 100500, 100800, 100200, 105700, 200100, 200500, 202400, 202900, 202700, 300500, 301900, 302900, 304400, 401700, 401900, 501700, 504100, 501800, 602800, 601700, 602300, 603900, 604800, 703100, 700100, 700200, 702200, 900800, 1000100, 2300100, 2500300, 101300, 102200, 400100, 401100, 502100, 500200, 603300, 701300, 800100, 300900, 300600, 400800, 400600, 601300, 600200, 701000, 501500, 601400, 702800], + "targetIds": [100100, 102700, 104100, 101800, 102800, 100600, 100900, 102900, 101700, 104900, 201500, 202000, 200200, 202600, 203200, 204000, 202300, 301300, 300400, 303200, 302000, 302400, 300800, 303600, 400300, 403500, 401200, 403200, 400200, 402700, 501900, 500300, 500900, 502800, 500800, 503900, 600500, 602100, 602500, 603100, 604200, 702000, 703600, 700600, 700700, 701400, 702400, 704000, 900100, 900200, 900500, 900900, 1000200, 1001600, 1100300, 1100200, 2300200, 2500200, 2500700, 2501000, 2800300, 3300100, 102600, 104000, 103400, 100500, 100800, 100200, 105700, 200100, 200500, 202400, 202900, 202700, 300500, 301900, 302900, 304400, 401700, 401900, 501700, 504100, 501800, 602800, 601700, 602300, 603900, 604800, 703100, 700100, 700200, 702200, 900800, 1000100, 2300100, 2500300, 101300, 102200, 400100, 401100, 502100, 500200, 603300, 701300, 800100, 300900, 300600, 400800, 400600, 601300, 600200, 701000, 501500, 601400, 702800, 404300, 404400], "value": 2000, "warIds": [], "groupId": 0, @@ -3051,7 +3051,7 @@ "eventId": 20188, "idx": 1, "target": 5, - "targetIds": [100100, 102700, 104100, 101800, 102800, 100600, 100900, 102900, 101700, 104900, 201500, 202000, 200200, 202600, 203200, 204000, 202300, 301300, 300400, 303200, 302000, 302400, 300800, 303600, 400300, 403500, 401200, 403200, 400200, 402700, 501900, 500300, 500900, 502800, 500800, 503900, 600500, 602100, 602500, 603100, 604200, 702000, 703600, 700600, 700700, 701400, 702400, 704000, 900100, 900200, 900500, 900900, 1000200, 1001600, 1100300, 1100200, 2300200, 2500200, 2500700, 2501000, 2800300, 3300100, 102600, 104000, 103400, 100500, 100800, 100200, 105700, 200100, 200500, 202400, 202900, 202700, 300500, 301900, 302900, 304400, 401700, 401900, 501700, 504100, 501800, 602800, 601700, 602300, 603900, 604800, 703100, 700100, 700200, 702200, 900800, 1000100, 2300100, 2500300, 101300, 102200, 400100, 401100, 502100, 500200, 603300, 701300, 800100, 300900, 300600, 400800, 400600, 601300, 600200, 701000, 501500, 601400, 702800], + "targetIds": [100100, 102700, 104100, 101800, 102800, 100600, 100900, 102900, 101700, 104900, 201500, 202000, 200200, 202600, 203200, 204000, 202300, 301300, 300400, 303200, 302000, 302400, 300800, 303600, 400300, 403500, 401200, 403200, 400200, 402700, 501900, 500300, 500900, 502800, 500800, 503900, 600500, 602100, 602500, 603100, 604200, 702000, 703600, 700600, 700700, 701400, 702400, 704000, 900100, 900200, 900500, 900900, 1000200, 1001600, 1100300, 1100200, 2300200, 2500200, 2500700, 2501000, 2800300, 3300100, 102600, 104000, 103400, 100500, 100800, 100200, 105700, 200100, 200500, 202400, 202900, 202700, 300500, 301900, 302900, 304400, 401700, 401900, 501700, 504100, 501800, 602800, 601700, 602300, 603900, 604800, 703100, 700100, 700200, 702200, 900800, 1000100, 2300100, 2500300, 101300, 102200, 400100, 401100, 502100, 500200, 603300, 701300, 800100, 300900, 300600, 400800, 400600, 601300, 600200, 701000, 501500, 601400, 702800, 404300, 404400], "value": 2000, "warIds": [], "groupId": 0, diff --git a/master/mstEventMission.json b/master/mstEventMission.json index 959f895e6..6e9ccc399 100644 --- a/master/mstEventMission.json +++ b/master/mstEventMission.json @@ -103580,10 +103580,10 @@ "eventId": 100413 }, { "bannerGroup": 0, - "closedAt": 2145888000, + "closedAt": 1751817599, "detail": "完成本周所有的御主任务", "dispNo": 1, - "endedAt": 2145888000, + "endedAt": 1751212799, "flag": 0, "giftId": 419, "id": 2002877, @@ -103594,16 +103594,16 @@ "priority": 2002220, "rewardRarity": 0, "rewardType": 1, - "startedAt": 2145888000, + "startedAt": 1750608000, "type": 2, "giftIconId": -1, "eventId": 100414 }, { "bannerGroup": 0, - "closedAt": 2145888000, + "closedAt": 1751817599, "detail": "完成30次友情点召唤", "dispNo": 2, - "endedAt": 2145888000, + "endedAt": 1751212799, "flag": 0, "giftId": 419, "id": 2002878, @@ -103614,16 +103614,16 @@ "priority": 2002221, "rewardRarity": 0, "rewardType": 1, - "startedAt": 2145888000, + "startedAt": 1750608000, "type": 2, "giftIconId": -1, "eventId": 100414 }, { "bannerGroup": 0, - "closedAt": 2145888000, + "closedAt": 1751817599, "detail": "击败『剑士』『暗匿者』职阶中任意一种从者3骑(战斗中被召唤出来的敌人除外)", "dispNo": 3, - "endedAt": 2145888000, + "endedAt": 1751212799, "flag": 0, "giftId": 419, "id": 2002879, @@ -103634,16 +103634,16 @@ "priority": 2002222, "rewardRarity": 0, "rewardType": 1, - "startedAt": 2145888000, + "startedAt": 1750608000, "type": 2, "giftIconId": -1, "eventId": 100414 }, { "bannerGroup": 0, - "closedAt": 2145888000, + "closedAt": 1751817599, "detail": "击败『弓兵』『骑兵』职阶中任意一种从者3骑(战斗中被召唤出来的敌人除外)", "dispNo": 4, - "endedAt": 2145888000, + "endedAt": 1751212799, "flag": 0, "giftId": 419, "id": 2002880, @@ -103654,16 +103654,16 @@ "priority": 2002223, "rewardRarity": 0, "rewardType": 1, - "startedAt": 2145888000, + "startedAt": 1750608000, "type": 2, "giftIconId": -1, "eventId": 100414 }, { "bannerGroup": 0, - "closedAt": 2145888000, + "closedAt": 1751817599, "detail": "击败『枪兵』『魔术师』『狂战士』职阶中任意一种从者3骑(战斗中被召唤出来的敌人除外)", "dispNo": 5, - "endedAt": 2145888000, + "endedAt": 1751212799, "flag": 0, "giftId": 419, "id": 2002881, @@ -103674,16 +103674,16 @@ "priority": 2002224, "rewardRarity": 0, "rewardType": 1, - "startedAt": 2145888000, + "startedAt": 1750608000, "type": 2, "giftIconId": -1, "eventId": 100414 }, { "bannerGroup": 0, - "closedAt": 2145888000, + "closedAt": 1751817599, "detail": "通关5次任意关卡", "dispNo": 6, - "endedAt": 2145888000, + "endedAt": 1751212799, "flag": 0, "giftId": 419, "id": 2002882, @@ -103694,16 +103694,16 @@ "priority": 2002225, "rewardRarity": 0, "rewardType": 1, - "startedAt": 2145888000, + "startedAt": 1750608000, "type": 2, "giftIconId": -1, "eventId": 100414 }, { "bannerGroup": 0, - "closedAt": 2145888000, + "closedAt": 1751817599, "detail": "通关10次任意关卡", "dispNo": 7, - "endedAt": 2145888000, + "endedAt": 1751212799, "flag": 0, "giftId": 419, "id": 2002883, @@ -103714,7 +103714,7 @@ "priority": 2002226, "rewardRarity": 0, "rewardType": 1, - "startedAt": 2145888000, + "startedAt": 1750608000, "type": 2, "giftIconId": -1, "eventId": 100414 diff --git a/master/mstGacha.json b/master/mstGacha.json index d9756eaf2..de26b1b19 100644 --- a/master/mstGacha.json +++ b/master/mstGacha.json @@ -86615,6 +86615,43 @@ "type": 1, "warId": 100, "flag": 2 +}, { + "adjustId": 0, + "bannerQuestId": 1000002, + "bannerQuestPhase": 1, + "baseId": 10035, + "beforeDrawNum": 1, + "beforeGachaId": 101, + "closedAt": 1750917599, + "condQuestId": 1000002, + "condQuestPhase": 1, + "detailUrl": "", + "drawNum1": 1, + "drawNum2": 11, + "extraAddCount1": 1, + "extraAddCount2": 0, + "extraGroupId1": 654, + "extraGroupId2": 0, + "freeDrawFlag": 0, + "gachaGroupId": 0, + "gachaProbabilityId": 5002895, + "gachaSlot": 18, + "id": 5002895, + "imageId": 82427, + "maxDrawNum": 0, + "name": "幕间物语纪念活动第20弹 太公望推荐召唤", + "openedAt": 1750312800, + "pickupClosedAt": 1750917599, + "pickupId": 50015012, + "pickupOpenedAt": 1750312800, + "priority": 5002895, + "rarityId": 3, + "shopId1": 4, + "shopId2": 5, + "ticketItemId": 4001, + "type": 1, + "warId": 100, + "flag": 2 }, { "adjustId": 0, "bannerQuestId": 1000002, diff --git a/master/mstGachaAppend.json b/master/mstGachaAppend.json index 04c8dd3a1..6f1c5dd95 100644 --- a/master/mstGachaAppend.json +++ b/master/mstGachaAppend.json @@ -7302,4 +7302,15 @@ "extraAddCount": 0, "maxDrawNum": 0, "flag": 1 +}, { + "gachaId": 5002895, + "idx": 3, + "type": 7, + "shopId": 8, + "gachaGroupId": 546, + "drawNum": 1, + "extraGroupId": 0, + "extraAddCount": 0, + "maxDrawNum": 0, + "flag": 1 }] \ No newline at end of file diff --git a/master/mstGachaExtraGift.json b/master/mstGachaExtraGift.json index bef6687d7..341b3dbc5 100644 --- a/master/mstGachaExtraGift.json +++ b/master/mstGachaExtraGift.json @@ -4555,6 +4555,27 @@ "presentMessageId": 0, "flag": 1, "bonusType": 1 +}, { + "gachaId": 5002895, + "idx": 1, + "giftId": 304, + "presentMessageId": 0, + "flag": 1, + "bonusType": 1 +}, { + "gachaId": 5002895, + "idx": 2, + "giftId": 322, + "presentMessageId": 0, + "flag": 1, + "bonusType": 1 +}, { + "gachaId": 5002895, + "idx": 3, + "giftId": 304, + "presentMessageId": 0, + "flag": 1, + "bonusType": 1 }, { "gachaId": 59000002, "idx": 1, diff --git a/master/mstGachaGroup.json b/master/mstGachaGroup.json index 6c9593eb2..38b016806 100644 --- a/master/mstGachaGroup.json +++ b/master/mstGachaGroup.json @@ -3262,6 +3262,12 @@ "maxDrawNum": 1, "tutorialImageIds": ["Tutorial/tutorial_2007", "tutorial_2007"], "flag": 1 +}, { + "id": 546, + "name": "用1个付费圣晶石进行每日1次圣晶石召唤", + "maxDrawNum": 1, + "tutorialImageIds": ["Tutorial/tutorial_2007", "tutorial_2007"], + "flag": 1 }, { "id": 90000, "name": "新人御主冲刺福袋召唤", diff --git a/master/mstGachaPickupCollateral.json b/master/mstGachaPickupCollateral.json index 3c722a0f3..c2a5af354 100644 --- a/master/mstGachaPickupCollateral.json +++ b/master/mstGachaPickupCollateral.json @@ -3028,4 +3028,10 @@ "rarity": 5, "tiggerDrawNum": 0, "maxGetNum": 1 +}, { + "gachaPickupCollateralGroupId": 507, + "type": 1, + "rarity": 5, + "tiggerDrawNum": 0, + "maxGetNum": 1 }] \ No newline at end of file diff --git a/master/mstGachaPickupCollateralGroup.json b/master/mstGachaPickupCollateralGroup.json index abff93a3c..bbb406ac3 100644 --- a/master/mstGachaPickupCollateralGroup.json +++ b/master/mstGachaPickupCollateralGroup.json @@ -1513,4 +1513,7 @@ }, { "id": 506, "gachaId": 5002894 +}, { + "id": 507, + "gachaId": 5002895 }] \ No newline at end of file diff --git a/master/mstMasterMission.json b/master/mstMasterMission.json index 95f85ced3..3c2b299be 100644 --- a/master/mstMasterMission.json +++ b/master/mstMasterMission.json @@ -3752,13 +3752,13 @@ "startedAt": 1750003200, "script": {} }, { - "closedAt": 2145888000, - "endedAt": 2145888000, + "closedAt": 1751817599, + "endedAt": 1751212799, "id": 100414, "imageId": 0, "name": "", "priority": 0, - "startedAt": 2145888000, + "startedAt": 1750608000, "script": {} }, { "closedAt": 2145888000, diff --git a/master/mstQuest.json b/master/mstQuest.json index 4079f070a..0ebfaba17 100644 --- a/master/mstQuest.json +++ b/master/mstQuest.json @@ -26878,6 +26878,70 @@ "scriptQuestId": 91403901, "spotId": 99003, "type": 3 +}, { + "actConsume": 21, + "afterActionVals": [], + "afterClear": 1, + "bannerId": 0, + "bannerType": 0, + "beforeActionVals": [], + "chaldeaGateCategory": 4, + "chapterId": 1, + "chapterSubId": 1, + "chapterSubStr": "", + "charaIconId": 4043000, + "closedAt": 2145888000, + "consumeType": 1, + "displayHours": 0, + "flag": 0, + "forceOperation": 0, + "giftIconId": 0, + "giftId": 201, + "hasStartAction": 1, + "iconId": 0, + "id": 91404301, + "intervalHours": 0, + "name": "太公望，于异乡封神", + "nameRuby": "", + "noticeAt": 1750312800, + "openedAt": 1750312800, + "priority": 659569, + "recommendLv": "80", + "scriptQuestId": 0, + "spotId": 99003, + "type": 3 +}, { + "actConsume": 20, + "afterActionVals": [], + "afterClear": 1, + "bannerId": 0, + "bannerType": 0, + "beforeActionVals": [], + "chaldeaGateCategory": 4, + "chapterId": 1, + "chapterSubId": 1, + "chapterSubStr": "", + "charaIconId": 4044000, + "closedAt": 2145888000, + "consumeType": 1, + "displayHours": 0, + "flag": 0, + "forceOperation": 0, + "giftIconId": 8, + "giftId": 0, + "hasStartAction": 1, + "iconId": 0, + "id": 91404401, + "intervalHours": 0, + "name": "烹饪·尼基季奇！", + "nameRuby": "", + "noticeAt": 1750312800, + "openedAt": 1750312800, + "priority": 659559, + "recommendLv": "70", + "scriptQuestId": 0, + "spotId": 99003, + "type": 3 }, { "actConsume": 20, "afterActionVals": [], diff --git a/master/mstQuestPickup.json b/master/mstQuestPickup.json index 998110bd8..56200ed2a 100644 --- a/master/mstQuestPickup.json +++ b/master/mstQuestPickup.json @@ -3,35 +3,251 @@ "questId": 94098401, "startedAt": 1749459600, "endedAt": 1750053599, - "priority": 2 + "priority": 15 }, { "id": 10001114, "questId": 94098402, "startedAt": 1750150800, "endedAt": 1750744799, + "priority": 16 +}, { + "id": 10001115, + "questId": 91404401, + "startedAt": 1750312800, + "endedAt": 1750917599, + "priority": 10 +}, { + "id": 10001116, + "questId": 91404301, + "startedAt": 1750312800, + "endedAt": 1750917599, + "priority": 11 +}, { + "id": 10001117, + "questId": 94094201, + "startedAt": 1750312800, + "endedAt": 1751522399, + "priority": 13 +}, { + "id": 10001118, + "questId": 94094202, + "startedAt": 1750312800, + "endedAt": 1751522399, + "priority": 12 +}, { + "id": 10001119, + "questId": 94056771, + "startedAt": 1750312800, + "endedAt": 1751522399, + "priority": 11 +}, { + "id": 10001120, + "questId": 94084501, + "startedAt": 1750312800, + "endedAt": 1751522399, + "priority": 11 +}, { + "id": 10001121, + "questId": 94054487, + "startedAt": 1750312800, + "endedAt": 1751522399, + "priority": 10 +}, { + "id": 10001122, + "questId": 94051272, + "startedAt": 1750312800, + "endedAt": 1751522399, + "priority": 9 +}, { + "id": 10001123, + "questId": 94005014, + "startedAt": 1750312800, + "endedAt": 1751522399, + "priority": 8 +}, { + "id": 10001124, + "questId": 94008005, + "startedAt": 1750312800, + "endedAt": 1751522399, + "priority": 8 +}, { + "id": 10001125, + "questId": 94052298, + "startedAt": 1750312800, + "endedAt": 1751522399, + "priority": 8 +}, { + "id": 10001126, + "questId": 94014406, + "startedAt": 1750312800, + "endedAt": 1751522399, + "priority": 7 +}, { + "id": 10001127, + "questId": 94035603, + "startedAt": 1750312800, + "endedAt": 1751522399, + "priority": 7 +}, { + "id": 10001128, + "questId": 94068001, + "startedAt": 1750312800, + "endedAt": 1751522399, + "priority": 7 +}, { + "id": 10001129, + "questId": 94065802, + "startedAt": 1750312800, + "endedAt": 1751522399, + "priority": 6 +}, { + "id": 10001130, + "questId": 94026511, + "startedAt": 1750312800, + "endedAt": 1751522399, + "priority": 5 +}, { + "id": 10001131, + "questId": 94032702, + "startedAt": 1750312800, + "endedAt": 1751522399, + "priority": 5 +}, { + "id": 10001132, + "questId": 94004107, + "startedAt": 1750312800, + "endedAt": 1751522399, + "priority": 4 +}, { + "id": 10001133, + "questId": 94032704, + "startedAt": 1750312800, + "endedAt": 1751522399, + "priority": 4 +}, { + "id": 10001134, + "questId": 91204001, + "startedAt": 1750312800, + "endedAt": 1751522399, + "priority": 9 +}, { + "id": 10001135, + "questId": 91204002, + "startedAt": 1750312800, + "endedAt": 1751522399, + "priority": 9 +}, { + "id": 10001136, + "questId": 91500901, + "startedAt": 1750312800, + "endedAt": 1751522399, + "priority": 7 +}, { + "id": 10001137, + "questId": 91500902, + "startedAt": 1750312800, + "endedAt": 1751522399, + "priority": 7 +}, { + "id": 10001138, + "questId": 91501901, + "startedAt": 1750312800, + "endedAt": 1751522399, + "priority": 8 +}, { + "id": 10001139, + "questId": 91501902, + "startedAt": 1750312800, + "endedAt": 1751522399, + "priority": 8 +}, { + "id": 10001140, + "questId": 91501903, + "startedAt": 1750312800, + "endedAt": 1751522399, + "priority": 8 +}, { + "id": 10001141, + "questId": 91700601, + "startedAt": 1750312800, + "endedAt": 1751522399, + "priority": 6 +}, { + "id": 10001142, + "questId": 91700602, + "startedAt": 1750312800, + "endedAt": 1751522399, + "priority": 6 +}, { + "id": 10001143, + "questId": 91103001, + "startedAt": 1750312800, + "endedAt": 1751522399, + "priority": 5 +}, { + "id": 10001144, + "questId": 91103002, + "startedAt": 1750312800, + "endedAt": 1751522399, + "priority": 5 +}, { + "id": 10001145, + "questId": 91200101, + "startedAt": 1750312800, + "endedAt": 1751522399, + "priority": 4 +}, { + "id": 10001146, + "questId": 91200102, + "startedAt": 1750312800, + "endedAt": 1751522399, + "priority": 4 +}, { + "id": 10001147, + "questId": 91502501, + "startedAt": 1750312800, + "endedAt": 1751522399, "priority": 3 +}, { + "id": 10001148, + "questId": 91701601, + "startedAt": 1750312800, + "endedAt": 1751522399, + "priority": 2 +}, { + "id": 10001149, + "questId": 91701602, + "startedAt": 1750312800, + "endedAt": 1751522399, + "priority": 2 +}, { + "id": 10001150, + "questId": 91701301, + "startedAt": 1750312800, + "endedAt": 1751522399, + "priority": 1 }, { "id": 10001152, "questId": 94098403, "startedAt": 1749103200, "endedAt": 1750917599, - "priority": 1 + "priority": 14 }, { "id": 10001153, "questId": 94052690, "startedAt": 1749459600, "endedAt": 1750053599, - "priority": 2 + "priority": 15 }, { "id": 10001154, "questId": 94035608, "startedAt": 1750150800, "endedAt": 1750744799, - "priority": 3 + "priority": 16 }, { "id": 10001155, "questId": 94084705, "startedAt": 1750150800, "endedAt": 1750744799, - "priority": 3 + "priority": 16 }] \ No newline at end of file diff --git a/master/mstQuestRelease.json b/master/mstQuestRelease.json index 586954cdc..fd6d6ad33 100644 --- a/master/mstQuestRelease.json +++ b/master/mstQuestRelease.json @@ -10518,6 +10518,70 @@ "openLimit": 0, "closedMessageId": 80246, "imagePriority": 2000 +}, { + "questId": 91404301, + "type": 7, + "targetId": 404300, + "value": 3, + "openLimit": 0, + "closedMessageId": 80284, + "imagePriority": 3000 +}, { + "questId": 91404301, + "type": 8, + "targetId": 404300, + "value": 0, + "openLimit": 0, + "closedMessageId": 0, + "imagePriority": 10000 +}, { + "questId": 91404301, + "type": 9, + "targetId": 404300, + "value": 5, + "openLimit": 0, + "closedMessageId": 80284, + "imagePriority": 2000 +}, { + "questId": 91404301, + "type": 46, + "targetId": 4000100, + "value": 1, + "openLimit": 0, + "closedMessageId": 80284, + "imagePriority": 5000 +}, { + "questId": 91404401, + "type": 7, + "targetId": 404400, + "value": 3, + "openLimit": 0, + "closedMessageId": 80283, + "imagePriority": 3000 +}, { + "questId": 91404401, + "type": 8, + "targetId": 404400, + "value": 0, + "openLimit": 0, + "closedMessageId": 0, + "imagePriority": 10000 +}, { + "questId": 91404401, + "type": 9, + "targetId": 404400, + "value": 5, + "openLimit": 0, + "closedMessageId": 80283, + "imagePriority": 2000 +}, { + "questId": 91404401, + "type": 46, + "targetId": 4000100, + "value": 1, + "openLimit": 0, + "closedMessageId": 80283, + "imagePriority": 5000 }, { "questId": 91404701, "type": 1, diff --git a/master/mstQuestReleaseOverwrite.json b/master/mstQuestReleaseOverwrite.json index 1caaa8f9e..0d641b6e5 100644 --- a/master/mstQuestReleaseOverwrite.json +++ b/master/mstQuestReleaseOverwrite.json @@ -73,8 +73,8 @@ "closedMessageId": 80186, "overlayClosedMessage": "通关终局特异点后开放", "eventId": 80482, - "startedAt": 2145888000, - "endedAt": 2145888000, + "startedAt": 1750312800, + "endedAt": 1751522399, "leftIndent": 0 }, { "questId": 91103002, @@ -86,8 +86,8 @@ "closedMessageId": 80187, "overlayClosedMessage": "通关前一幕间物语", "eventId": 80482, - "startedAt": 2145888000, - "endedAt": 2145888000, + "startedAt": 1750312800, + "endedAt": 1751522399, "leftIndent": 0 }, { "questId": 91103002, @@ -99,8 +99,8 @@ "closedMessageId": 0, "overlayClosedMessage": "通关前一幕间物语", "eventId": 80482, - "startedAt": 2145888000, - "endedAt": 2145888000, + "startedAt": 1750312800, + "endedAt": 1751522399, "leftIndent": 0 }, { "questId": 91103301, @@ -216,8 +216,8 @@ "closedMessageId": 80022, "overlayClosedMessage": "通关特异点F后开放", "eventId": 80482, - "startedAt": 2145888000, - "endedAt": 2145888000, + "startedAt": 1750312800, + "endedAt": 1751522399, "leftIndent": 0 }, { "questId": 91200102, @@ -229,8 +229,8 @@ "closedMessageId": 80023, "overlayClosedMessage": "通关前一幕间物语＆通关特异点F后开放", "eventId": 80482, - "startedAt": 2145888000, - "endedAt": 2145888000, + "startedAt": 1750312800, + "endedAt": 1751522399, "leftIndent": 0 }, { "questId": 91200102, @@ -242,8 +242,8 @@ "closedMessageId": 0, "overlayClosedMessage": "通关前一幕间物语＆通关特异点F后开放", "eventId": 80482, - "startedAt": 2145888000, - "endedAt": 2145888000, + "startedAt": 1750312800, + "endedAt": 1751522399, "leftIndent": 0 }, { "questId": 91200201, @@ -567,8 +567,8 @@ "closedMessageId": 80237, "overlayClosedMessage": "通关特异点F后开放", "eventId": 80482, - "startedAt": 2145888000, - "endedAt": 2145888000, + "startedAt": 1750312800, + "endedAt": 1751522399, "leftIndent": 0 }, { "questId": 91204002, @@ -578,10 +578,10 @@ "condId": 3000716, "condNum": 0, "closedMessageId": 80257, - "overlayClosedMessage": "通关前一幕间物语＆通关地狱曼荼罗 平安京后开放", + "overlayClosedMessage": "通关前一幕间物语＆通关地狱界曼荼罗 平安京后开放", "eventId": 80482, - "startedAt": 2145888000, - "endedAt": 2145888000, + "startedAt": 1750312800, + "endedAt": 1751522399, "leftIndent": 0 }, { "questId": 91204002, @@ -591,10 +591,10 @@ "condId": 91204001, "condNum": 0, "closedMessageId": 0, - "overlayClosedMessage": "通关前一幕间物语＆通关地狱曼荼罗 平安京后开放", + "overlayClosedMessage": "通关前一幕间物语＆通关地狱界曼荼罗 平安京后开放", "eventId": 80482, - "startedAt": 2145888000, - "endedAt": 2145888000, + "startedAt": 1750312800, + "endedAt": 1751522399, "leftIndent": 0 }, { "questId": 91300101, @@ -957,8 +957,8 @@ "closedMessageId": 80284, "overlayClosedMessage": "通关「Ordeal Call　０」后开放", "eventId": 80479, - "startedAt": 2145888000, - "endedAt": 2145888000, + "startedAt": 1750312800, + "endedAt": 1750917599, "leftIndent": 0 }, { "questId": 91404401, @@ -970,8 +970,8 @@ "closedMessageId": 80283, "overlayClosedMessage": "通关「Ordeal Call　０」后开放", "eventId": 80479, - "startedAt": 2145888000, - "endedAt": 2145888000, + "startedAt": 1750312800, + "endedAt": 1750917599, "leftIndent": 0 }, { "questId": 91404701, @@ -996,8 +996,8 @@ "closedMessageId": 1, "overlayClosedMessage": "通关终局特异点后开放", "eventId": 80482, - "startedAt": 2145888000, - "endedAt": 2145888000, + "startedAt": 1750312800, + "endedAt": 1751522399, "leftIndent": 0 }, { "questId": 91500902, @@ -1009,8 +1009,8 @@ "closedMessageId": 80140, "overlayClosedMessage": "通关前一幕间物语＆通关第２部序幕「序」后开放", "eventId": 80482, - "startedAt": 2145888000, - "endedAt": 2145888000, + "startedAt": 1750312800, + "endedAt": 1751522399, "leftIndent": 0 }, { "questId": 91500902, @@ -1022,8 +1022,8 @@ "closedMessageId": 0, "overlayClosedMessage": "通关前一幕间物语＆通关第２部序幕「序」后开放", "eventId": 80482, - "startedAt": 2145888000, - "endedAt": 2145888000, + "startedAt": 1750312800, + "endedAt": 1751522399, "leftIndent": 0 }, { "questId": 91501201, @@ -1048,8 +1048,8 @@ "closedMessageId": 80052, "overlayClosedMessage": "通关第二特异点后开放", "eventId": 80482, - "startedAt": 2145888000, - "endedAt": 2145888000, + "startedAt": 1750312800, + "endedAt": 1751522399, "leftIndent": 0 }, { "questId": 91501902, @@ -1061,8 +1061,8 @@ "closedMessageId": 80053, "overlayClosedMessage": "通关前一幕间物语＆通关第三特异点后开放", "eventId": 80482, - "startedAt": 2145888000, - "endedAt": 2145888000, + "startedAt": 1750312800, + "endedAt": 1751522399, "leftIndent": 0 }, { "questId": 91501902, @@ -1074,8 +1074,8 @@ "closedMessageId": 0, "overlayClosedMessage": "通关前一幕间物语＆通关第三特异点后开放", "eventId": 80482, - "startedAt": 2145888000, - "endedAt": 2145888000, + "startedAt": 1750312800, + "endedAt": 1751522399, "leftIndent": 0 }, { "questId": 91501903, @@ -1087,8 +1087,8 @@ "closedMessageId": 80054, "overlayClosedMessage": "通关前一幕间物语＆通关第三特异点后开放", "eventId": 80482, - "startedAt": 2145888000, - "endedAt": 2145888000, + "startedAt": 1750312800, + "endedAt": 1751522399, "leftIndent": 0 }, { "questId": 91501903, @@ -1100,8 +1100,8 @@ "closedMessageId": 0, "overlayClosedMessage": "通关前一幕间物语＆通关第三特异点后开放", "eventId": 80482, - "startedAt": 2145888000, - "endedAt": 2145888000, + "startedAt": 1750312800, + "endedAt": 1751522399, "leftIndent": 0 }, { "questId": 91502101, @@ -1126,8 +1126,8 @@ "closedMessageId": 80122, "overlayClosedMessage": "通关第五特异点后开放", "eventId": 80482, - "startedAt": 2145888000, - "endedAt": 2145888000, + "startedAt": 1750312800, + "endedAt": 1751522399, "leftIndent": 0 }, { "questId": 91503001, @@ -1464,8 +1464,8 @@ "closedMessageId": 80124, "overlayClosedMessage": "通关第四特异点后开放", "eventId": 80482, - "startedAt": 2145888000, - "endedAt": 2145888000, + "startedAt": 1750312800, + "endedAt": 1751522399, "leftIndent": 0 }, { "questId": 91700602, @@ -1477,8 +1477,8 @@ "closedMessageId": 80125, "overlayClosedMessage": "通关前一幕间物语＆通关终局特异点后开放", "eventId": 80482, - "startedAt": 2145888000, - "endedAt": 2145888000, + "startedAt": 1750312800, + "endedAt": 1751522399, "leftIndent": 0 }, { "questId": 91700602, @@ -1490,8 +1490,8 @@ "closedMessageId": 0, "overlayClosedMessage": "通关前一幕间物语＆通关终局特异点后开放", "eventId": 80482, - "startedAt": 2145888000, - "endedAt": 2145888000, + "startedAt": 1750312800, + "endedAt": 1751522399, "leftIndent": 0 }, { "questId": 91700701, @@ -1568,8 +1568,8 @@ "closedMessageId": 80077, "overlayClosedMessage": "通关第一特异点后开放", "eventId": 80482, - "startedAt": 2145888000, - "endedAt": 2145888000, + "startedAt": 1750312800, + "endedAt": 1751522399, "leftIndent": 0 }, { "questId": 91701601, @@ -1581,8 +1581,8 @@ "closedMessageId": 80079, "overlayClosedMessage": "通关第三特异点后开放", "eventId": 80482, - "startedAt": 2145888000, - "endedAt": 2145888000, + "startedAt": 1750312800, + "endedAt": 1751522399, "leftIndent": 0 }, { "questId": 91701602, @@ -1594,8 +1594,8 @@ "closedMessageId": 80080, "overlayClosedMessage": "通关前一幕间物语＆通关第四特异点后开放", "eventId": 80482, - "startedAt": 2145888000, - "endedAt": 2145888000, + "startedAt": 1750312800, + "endedAt": 1751522399, "leftIndent": 0 }, { "questId": 91701602, @@ -1607,8 +1607,8 @@ "closedMessageId": 0, "overlayClosedMessage": "通关前一幕间物语＆通关第四特异点后开放", "eventId": 80482, - "startedAt": 2145888000, - "endedAt": 2145888000, + "startedAt": 1750312800, + "endedAt": 1751522399, "leftIndent": 0 }, { "questId": 91703001, diff --git a/master/mstQuestRestriction.json b/master/mstQuestRestriction.json index 6a7fa08be..7db19275c 100644 --- a/master/mstQuestRestriction.json +++ b/master/mstQuestRestriction.json @@ -5891,8 +5891,8 @@ "phase": 1, "restrictionId": 91000144, "frequencyType": 3, - "dialogMessage": "太公望を\nスターティングメンバーに設定してください。", - "noticeMessage": "太公望をスターティングメンバーに設定してください", + "dialogMessage": "请将太公望设置为首发队员", + "noticeMessage": "请将太公望设置为首发队员", "title": "太公望" }, { "questId": 91404301, @@ -5907,41 +5907,41 @@ "phase": 4, "restrictionId": 91000144, "frequencyType": 3, - "dialogMessage": "太公望を\nスターティングメンバーに設定してください。", - "noticeMessage": "太公望をスターティングメンバーに設定してください", + "dialogMessage": "请将太公望设置为首发队员", + "noticeMessage": "请将太公望设置为首发队员", "title": "太公望" }, { "questId": 91404401, "phase": 1, "restrictionId": 91000143, "frequencyType": 3, - "dialogMessage": "ニキチッチを\nスターティングメンバーに設定してください。", - "noticeMessage": "ニキチッチをスターティングメンバーに設定してください", - "title": "ニキチッチ" + "dialogMessage": "请将尼基季奇设置为首发队员", + "noticeMessage": "请将尼基季奇设置为首发队员", + "title": "尼基季奇" }, { "questId": 91404401, "phase": 2, "restrictionId": 91000143, "frequencyType": 3, - "dialogMessage": "ニキチッチを\nスターティングメンバーに設定してください。", - "noticeMessage": "ニキチッチをスターティングメンバーに設定してください", - "title": "ニキチッチ" + "dialogMessage": "请将尼基季奇设置为首发队员", + "noticeMessage": "请将尼基季奇设置为首发队员", + "title": "尼基季奇" }, { "questId": 91404401, "phase": 3, "restrictionId": 91000143, "frequencyType": 3, - "dialogMessage": "ニキチッチを\nスターティングメンバーに設定してください。", - "noticeMessage": "ニキチッチをスターティングメンバーに設定してください", - "title": "ニキチッチ" + "dialogMessage": "请将尼基季奇设置为首发队员", + "noticeMessage": "请将尼基季奇设置为首发队员", + "title": "尼基季奇" }, { "questId": 91404401, "phase": 4, "restrictionId": 91000143, "frequencyType": 3, - "dialogMessage": "ニキチッチを\nスターティングメンバーに設定してください。", - "noticeMessage": "ニキチッチをスターティングメンバーに設定してください", - "title": "ニキチッチ" + "dialogMessage": "请将尼基季奇设置为首发队员", + "noticeMessage": "请将尼基季奇设置为首发队员", + "title": "尼基季奇" }, { "questId": 91503002, "phase": 1, diff --git a/master/mstRestriction.json b/master/mstRestriction.json index 63d8ae069..104a23329 100644 --- a/master/mstRestriction.json +++ b/master/mstRestriction.json @@ -3052,21 +3052,21 @@ "targetVals2": [] }, { "id": 94082501, - "name": "1骑NPC固定出击", + "name": "", "type": 10, "targetVals": [6], "rangeType": 4, "targetVals2": [] }, { "id": 94082502, - "name": "2骑NPC固定出击", + "name": "", "type": 10, "targetVals": [6], "rangeType": 4, "targetVals2": [] }, { "id": 94082503, - "name": "3骑固定出击", + "name": "", "type": 10, "targetVals": [3], "rangeType": 1, @@ -3080,14 +3080,14 @@ "targetVals2": [] }, { "id": 94082505, - "name": "首发队员存在编队限制", + "name": "阿瓦隆女士\n必须设定为首发队员", "type": 12, "targetVals": [2800300], "rangeType": 1, "targetVals2": [1] }, { "id": 94082506, - "name": "可从持有从者中\n最多编入3骑", + "name": "", "type": 11, "targetVals": [3], "rangeType": 4, diff --git a/master/mstShop.json b/master/mstShop.json index 2d4d7bec4..cbdb7b9cb 100644 --- a/master/mstShop.json +++ b/master/mstShop.json @@ -41202,6 +41202,99 @@ "slot": 0, "targetIds": [30380011], "warningMessage": "" +}, { + "baseShopId": 6000914, + "bgImageId": 0, + "closedAt": 2145888000, + "defaultLimitCount": 0, + "defaultLv": 0, + "detail": "兑换「迦勒底·夏日冒险！」限定阿喀琉斯灵衣开放权", + "eventId": 0, + "flag": 0, + "id": 6000914, + "imageId": 6000914, + "infoMessage": "可获得灵衣「无畏潜水员」的开放权。", + "itemIds": [18], + "limitNum": 1, + "name": "灵衣「无畏潜水员」开放权", + "openedAt": 1750313100, + "payType": 10, + "prices": [5], + "priority": 405, + "purchaseType": 14, + "script": { + "freeShopCondId": 20096704, + "freeShopCondMessage": "『通关「Lostbelt No.5」亚特兰蒂斯』", + "hideWarningMessageCondId": 20096704, + "freeShopReleaseDate": 1750313100 + }, + "setNum": 1, + "shopType": 11, + "slot": 0, + "targetIds": [40290011], + "warningMessage": "『灵衣「无畏潜水员」开放权』\n可以在达成免费化条件之后，\n不消耗稀有魔力棱镜进行兑换。\n \n免费化条件\n达成『通关「Lostbelt No.5 亚特兰蒂斯」』\n \n[ffff00]在未达成免费化条件之前进行了兑换的情况下，\n一旦完成了免费化条件，\n将返还消耗的稀有魔力棱镜。[-]\n\n是否确认兑换？" +}, { + "baseShopId": 6000915, + "bgImageId": 0, + "closedAt": 2145888000, + "defaultLimitCount": 0, + "defaultLv": 0, + "detail": "兑换「迦勒底·夏日冒险！」限定曼迪卡尔多灵衣开放权", + "eventId": 0, + "flag": 0, + "id": 6000915, + "imageId": 6000915, + "infoMessage": "可获得灵衣「夏日运动服」的开放权。", + "itemIds": [18], + "limitNum": 1, + "name": "灵衣「夏日运动服」开放权", + "openedAt": 1750313100, + "payType": 10, + "prices": [5], + "priority": 410, + "purchaseType": 14, + "script": { + "freeShopCondId": 20096705, + "freeShopCondMessage": "『通关「Lostbelt No.5」亚特兰蒂斯』", + "hideWarningMessageCondId": 20096705, + "freeShopReleaseDate": 1750313100 + }, + "setNum": 1, + "shopType": 11, + "slot": 0, + "targetIds": [40390011], + "warningMessage": "『灵衣「夏日运动服」开放权』\n可以在达成免费化条件之后，\n不消耗稀有魔力棱镜进行兑换。\n \n免费化条件\n达成『通关「Lostbelt No.5 亚特兰蒂斯」』\n \n[ffff00]在未达成免费化条件之前进行了兑换的情况下，\n一旦完成了免费化条件，\n将返还消耗的稀有魔力棱镜。[-]\n\n是否确认兑换？" +}, { + "baseShopId": 6000916, + "bgImageId": 0, + "closedAt": 2145888000, + "defaultLimitCount": 0, + "defaultLv": 0, + "detail": "兑换「迦勒底·夏日冒险！」限定爱迪·萨奇灵衣开放权", + "eventId": 0, + "flag": 0, + "id": 6000916, + "imageId": 6000916, + "infoMessage": "可获得灵衣「盛夏的绅士」的开放权。", + "itemIds": [18], + "limitNum": 1, + "name": "灵衣「盛夏的绅士」开放权", + "openedAt": 1750313100, + "payType": 10, + "prices": [5], + "priority": 415, + "purchaseType": 14, + "script": { + "freeShopCondId": 20096706, + "freeShopCondMessage": "『通关「第三特异点」』", + "hideWarningMessageCondId": 20096706, + "freeShopReleaseDate": 1750313100 + }, + "setNum": 1, + "shopType": 11, + "slot": 0, + "targetIds": [40080011], + "warningMessage": "『灵衣「盛夏的绅士」开放权』\n可以在达成免费化条件之后，\n不消耗稀有魔力棱镜进行兑换。\n \n免费化条件\n达成『通关「第三特异点」』\n \n[ffff00]在未达成免费化条件之前进行了兑换的情况下，\n一旦完成了免费化条件，\n将返还消耗的稀有魔力棱镜。[-]\n\n是否确认兑换？" }, { "baseShopId": 6000924, "bgImageId": 0, diff --git a/master/mstShopRelease.json b/master/mstShopRelease.json index 24b75fbbe..11e4189b0 100644 --- a/master/mstShopRelease.json +++ b/master/mstShopRelease.json @@ -3220,6 +3220,60 @@ "isClosedDisp": true, "priority": 0, "shopId": 6000906 +}, { + "closedItemName": "", + "closedMessage": "※只有在没有取得任何灵衣「无畏潜水员」开放权记录的情况下，通关特异点F之后才可以兑换", + "condNum": 1, + "condType": 1, + "condValues": [1000011], + "isClosedDisp": true, + "priority": 100, + "shopId": 6000914 +}, { + "closedItemName": "", + "closedMessage": "※只有在没有取得任何灵衣「无畏潜水员」开放权记录的情况下，通关特异点F之后才可以兑换", + "condNum": 11, + "condType": 79, + "condValues": [402900], + "isClosedDisp": true, + "priority": 0, + "shopId": 6000914 +}, { + "closedItemName": "", + "closedMessage": "※只有在没有取得任何灵衣「夏日运动服」开放权记录的情况下，通关特异点F之后才可以兑换", + "condNum": 1, + "condType": 1, + "condValues": [1000011], + "isClosedDisp": true, + "priority": 100, + "shopId": 6000915 +}, { + "closedItemName": "", + "closedMessage": "※只有在没有取得任何灵衣「夏日运动服」开放权记录的情况下，通关特异点F之后才可以兑换", + "condNum": 11, + "condType": 79, + "condValues": [403900], + "isClosedDisp": true, + "priority": 0, + "shopId": 6000915 +}, { + "closedItemName": "", + "closedMessage": "※只有在没有取得任何灵衣「盛夏的绅士」开放权记录的情况下，通关特异点F之后才可以兑换", + "condNum": 1, + "condType": 1, + "condValues": [1000011], + "isClosedDisp": true, + "priority": 100, + "shopId": 6000916 +}, { + "closedItemName": "", + "closedMessage": "※只有在没有取得任何灵衣「盛夏的绅士」开放权记录的情况下，通关特异点F之后才可以兑换", + "condNum": 11, + "condType": 79, + "condValues": [400800], + "isClosedDisp": true, + "priority": 0, + "shopId": 6000916 }, { "closedItemName": "", "closedMessage": "※只有在没有取得任何「U FOU 娃娃机」记录的情况下，才可以兑换", @@ -50452,4 +50506,328 @@ "isClosedDisp": true, "priority": 0, "shopId": 99918313 +}, { + "closedItemName": "", + "closedMessage": "※奏章序幕通关后才可以兑换", + "condNum": 1, + "condType": 1, + "condValues": [4000000], + "isClosedDisp": true, + "priority": 0, + "shopId": 99918408 +}, { + "closedItemName": "", + "closedMessage": "※奏章序幕通关后才可以兑换", + "condNum": 1, + "condType": 1, + "condValues": [4000000], + "isClosedDisp": true, + "priority": 0, + "shopId": 99918409 +}, { + "closedItemName": "", + "closedMessage": "※奏章序幕通关后才可以兑换", + "condNum": 1, + "condType": 1, + "condValues": [4000000], + "isClosedDisp": true, + "priority": 0, + "shopId": 99918410 +}, { + "closedItemName": "", + "closedMessage": "※奏章序幕通关后才可以兑换", + "condNum": 1, + "condType": 1, + "condValues": [4000000], + "isClosedDisp": true, + "priority": 0, + "shopId": 99918419 +}, { + "closedItemName": "", + "closedMessage": "※奏章序幕通关后才可以兑换", + "condNum": 1, + "condType": 1, + "condValues": [4000000], + "isClosedDisp": true, + "priority": 0, + "shopId": 99918420 +}, { + "closedItemName": "", + "closedMessage": "※奏章序幕通关后才可以兑换", + "condNum": 1, + "condType": 1, + "condValues": [4000000], + "isClosedDisp": true, + "priority": 0, + "shopId": 99918421 +}, { + "closedItemName": "", + "closedMessage": "※奏章序幕通关后才可以兑换", + "condNum": 1, + "condType": 1, + "condValues": [4000000], + "isClosedDisp": true, + "priority": 0, + "shopId": 99918430 +}, { + "closedItemName": "", + "closedMessage": "※奏章序幕通关后才可以兑换", + "condNum": 1, + "condType": 1, + "condValues": [4000000], + "isClosedDisp": true, + "priority": 0, + "shopId": 99918431 +}, { + "closedItemName": "", + "closedMessage": "※奏章序幕通关后才可以兑换", + "condNum": 1, + "condType": 1, + "condValues": [4000000], + "isClosedDisp": true, + "priority": 0, + "shopId": 99918432 +}, { + "closedItemName": "", + "closedMessage": "※奏章序幕通关后才可以兑换", + "condNum": 1, + "condType": 1, + "condValues": [4000000], + "isClosedDisp": true, + "priority": 0, + "shopId": 99918441 +}, { + "closedItemName": "", + "closedMessage": "※奏章序幕通关后才可以兑换", + "condNum": 1, + "condType": 1, + "condValues": [4000000], + "isClosedDisp": true, + "priority": 0, + "shopId": 99918442 +}, { + "closedItemName": "", + "closedMessage": "※奏章序幕通关后才可以兑换", + "condNum": 1, + "condType": 1, + "condValues": [4000000], + "isClosedDisp": true, + "priority": 0, + "shopId": 99918443 +}, { + "closedItemName": "", + "closedMessage": "※奏章序幕通关后才可以兑换", + "condNum": 1, + "condType": 1, + "condValues": [4000000], + "isClosedDisp": true, + "priority": 0, + "shopId": 99918452 +}, { + "closedItemName": "", + "closedMessage": "※奏章序幕通关后才可以兑换", + "condNum": 1, + "condType": 1, + "condValues": [4000000], + "isClosedDisp": true, + "priority": 0, + "shopId": 99918453 +}, { + "closedItemName": "", + "closedMessage": "※奏章序幕通关后才可以兑换", + "condNum": 1, + "condType": 1, + "condValues": [4000000], + "isClosedDisp": true, + "priority": 0, + "shopId": 99918454 +}, { + "closedItemName": "", + "closedMessage": "※奏章序幕通关后才可以兑换", + "condNum": 1, + "condType": 1, + "condValues": [4000000], + "isClosedDisp": true, + "priority": 0, + "shopId": 99918463 +}, { + "closedItemName": "", + "closedMessage": "※奏章序幕通关后才可以兑换", + "condNum": 1, + "condType": 1, + "condValues": [4000000], + "isClosedDisp": true, + "priority": 0, + "shopId": 99918464 +}, { + "closedItemName": "", + "closedMessage": "※奏章序幕通关后才可以兑换", + "condNum": 1, + "condType": 1, + "condValues": [4000000], + "isClosedDisp": true, + "priority": 0, + "shopId": 99918465 +}, { + "closedItemName": "", + "closedMessage": "※奏章序幕通关后才可以兑换", + "condNum": 1, + "condType": 1, + "condValues": [4000000], + "isClosedDisp": true, + "priority": 0, + "shopId": 99918474 +}, { + "closedItemName": "", + "closedMessage": "※奏章序幕通关后才可以兑换", + "condNum": 1, + "condType": 1, + "condValues": [4000000], + "isClosedDisp": true, + "priority": 0, + "shopId": 99918475 +}, { + "closedItemName": "", + "closedMessage": "※奏章序幕通关后才可以兑换", + "condNum": 1, + "condType": 1, + "condValues": [4000000], + "isClosedDisp": true, + "priority": 0, + "shopId": 99918476 +}, { + "closedItemName": "", + "closedMessage": "※奏章序幕通关后才可以兑换", + "condNum": 1, + "condType": 1, + "condValues": [4000000], + "isClosedDisp": true, + "priority": 0, + "shopId": 99918485 +}, { + "closedItemName": "", + "closedMessage": "※奏章序幕通关后才可以兑换", + "condNum": 1, + "condType": 1, + "condValues": [4000000], + "isClosedDisp": true, + "priority": 0, + "shopId": 99918486 +}, { + "closedItemName": "", + "closedMessage": "※奏章序幕通关后才可以兑换", + "condNum": 1, + "condType": 1, + "condValues": [4000000], + "isClosedDisp": true, + "priority": 0, + "shopId": 99918487 +}, { + "closedItemName": "", + "closedMessage": "※奏章序幕通关后才可以兑换", + "condNum": 1, + "condType": 1, + "condValues": [4000000], + "isClosedDisp": true, + "priority": 0, + "shopId": 99918496 +}, { + "closedItemName": "", + "closedMessage": "※奏章序幕通关后才可以兑换", + "condNum": 1, + "condType": 1, + "condValues": [4000000], + "isClosedDisp": true, + "priority": 0, + "shopId": 99918497 +}, { + "closedItemName": "", + "closedMessage": "※奏章序幕通关后才可以兑换", + "condNum": 1, + "condType": 1, + "condValues": [4000000], + "isClosedDisp": true, + "priority": 0, + "shopId": 99918498 +}, { + "closedItemName": "", + "closedMessage": "※奏章序幕通关后才可以兑换", + "condNum": 1, + "condType": 1, + "condValues": [4000000], + "isClosedDisp": true, + "priority": 0, + "shopId": 99918507 +}, { + "closedItemName": "", + "closedMessage": "※奏章序幕通关后才可以兑换", + "condNum": 1, + "condType": 1, + "condValues": [4000000], + "isClosedDisp": true, + "priority": 0, + "shopId": 99918508 +}, { + "closedItemName": "", + "closedMessage": "※奏章序幕通关后才可以兑换", + "condNum": 1, + "condType": 1, + "condValues": [4000000], + "isClosedDisp": true, + "priority": 0, + "shopId": 99918509 +}, { + "closedItemName": "", + "closedMessage": "※奏章序幕通关后才可以兑换", + "condNum": 1, + "condType": 1, + "condValues": [4000000], + "isClosedDisp": true, + "priority": 0, + "shopId": 99918518 +}, { + "closedItemName": "", + "closedMessage": "※奏章序幕通关后才可以兑换", + "condNum": 1, + "condType": 1, + "condValues": [4000000], + "isClosedDisp": true, + "priority": 0, + "shopId": 99918519 +}, { + "closedItemName": "", + "closedMessage": "※奏章序幕通关后才可以兑换", + "condNum": 1, + "condType": 1, + "condValues": [4000000], + "isClosedDisp": true, + "priority": 0, + "shopId": 99918520 +}, { + "closedItemName": "", + "closedMessage": "※奏章序幕通关后才可以兑换", + "condNum": 1, + "condType": 1, + "condValues": [4000000], + "isClosedDisp": true, + "priority": 0, + "shopId": 99918529 +}, { + "closedItemName": "", + "closedMessage": "※奏章序幕通关后才可以兑换", + "condNum": 1, + "condType": 1, + "condValues": [4000000], + "isClosedDisp": true, + "priority": 0, + "shopId": 99918530 +}, { + "closedItemName": "", + "closedMessage": "※奏章序幕通关后才可以兑换", + "condNum": 1, + "condType": 1, + "condValues": [4000000], + "isClosedDisp": true, + "priority": 0, + "shopId": 99918531 }] \ No newline at end of file diff --git a/master/mstSubtitle.json b/master/mstSubtitle.json index 03f241c75..016be60a2 100644 --- a/master/mstSubtitle.json +++ b/master/mstSubtitle.json @@ -3807,7 +3807,7 @@ "id": 200800, "voicePrefix": 0, "voiceId": "0_B190", - "text": "请多指教。" + "text": "好吧。" }, { "id": 200800, "voicePrefix": 0, diff --git a/master/mstSvtCostume.json b/master/mstSvtCostume.json index 03ff15775..190aafa60 100644 --- a/master/mstSvtCostume.json +++ b/master/mstSvtCostume.json @@ -736,7 +736,7 @@ "endedAt": 2145888000, "flag": 0, "id": 11, - "itemGetInfo": "获得灵衣开放权后开放", + "itemGetInfo": "在达·芬奇工房的「灵衣缝制」中开放", "name": "盛夏的绅士", "openedAt": 946656000, "priority": 1, @@ -804,7 +804,7 @@ "endedAt": 2145888000, "flag": 0, "id": 11, - "itemGetInfo": "获得灵衣开放权后开放", + "itemGetInfo": "在达·芬奇工房的「灵衣缝制」中开放", "name": "无畏潜水员", "openedAt": 946656000, "priority": 1, @@ -889,7 +889,7 @@ "endedAt": 2145888000, "flag": 0, "id": 11, - "itemGetInfo": "获得灵衣开放权后开放", + "itemGetInfo": "在达·芬奇工房的「灵衣缝制」中开放", "name": "夏日运动服", "openedAt": 946656000, "priority": 1, diff --git a/master/mstSvtFilter.json b/master/mstSvtFilter.json index 8ea106836..8feab3586 100644 --- a/master/mstSvtFilter.json +++ b/master/mstSvtFilter.json @@ -493,6 +493,6 @@ "svtIds": [204000, 501900, 701300, 103000, 504200, 502500, 403500, 700600, 603900, 500900, 200100, 604800, 701600, 800100], "name": "下次活动对象", "priority": 80480, - "startedAt": 2145888000, - "endedAt": 2145888000 + "startedAt": 1750312800, + "endedAt": 1750917599 }] \ No newline at end of file diff --git a/master/mstSvtTreasureDevice.json b/master/mstSvtTreasureDevice.json index bc43150ea..c7da93e36 100644 --- a/master/mstSvtTreasureDevice.json +++ b/master/mstSvtTreasureDevice.json @@ -7580,8 +7580,24 @@ "motion": 50, "damage": [10, 20, 30, 40], "cardId": 2, - "strengthStatus": 0, - "treasureDeviceNum": 1 + "strengthStatus": 1, + "treasureDeviceNum": 2 +}, { + "svtId": 404400, + "flag": 0, + "num": 1, + "priority": 102, + "imageIndex": 0, + "treasureDeviceId": 404402, + "condQuestId": 91404401, + "condQuestPhase": 4, + "condLv": 0, + "condFriendshipRank": 0, + "motion": 50, + "damage": [10, 20, 30, 40], + "cardId": 2, + "strengthStatus": 99, + "treasureDeviceNum": 2 }, { "svtId": 404500, "flag": 0, diff --git a/master/mstSvtVoice.json b/master/mstSvtVoice.json index cd743a941..d62210c4c 100644 --- a/master/mstSvtVoice.json +++ b/master/mstSvtVoice.json @@ -87154,7 +87154,7 @@ "id": "0_H212", "face": 1, "delay": 0.3, - "text": "[r]\n你能来真是你帮大忙了。", + "text": "[r]\n你能来真是帮大忙了。", "form": 0 }, { "id": "0_H213", @@ -87520,7 +87520,7 @@ "id": "0_B190", "face": 0, "delay": 0.0, - "text": "请多指教。", + "text": "好吧。", "form": 0 }], "conds": [] @@ -347852,7 +347852,7 @@ "id": "0_H082", "face": 9, "delay": 0.1, - "text": "[r]\n【罗宾】说得对。因为一点小小的失败就把东西扔进深山里假装无事发生这种 行为，作为人，不，作为魔女实在不值得称赞呢。", + "text": "[r]\n【罗宾】说得对。因为一点小小的失败就把东西扔进深山里假装无事发生这种行为，作为人，不，作为魔女实在不值得称赞呢。", "form": 1, "changeEffect": 0 }, { @@ -349399,7 +349399,7 @@ "id": "2_H082", "face": 9, "delay": 0.1, - "text": "[r]\n【罗宾】说得对。因为一点小小的失败就把东西扔进深山里假装无事发生这种 行为，作为人，不，作为魔女实在不值得称赞呢。", + "text": "[r]\n【罗宾】说得对。因为一点小小的失败就把东西扔进深山里假装无事发生这种行为，作为人，不，作为魔女实在不值得称赞呢。", "form": 1, "changeEffect": 0 }, { diff --git a/master/mstWarAdd.json b/master/mstWarAdd.json index eef43f678..f07ee2a57 100644 --- a/master/mstWarAdd.json +++ b/master/mstWarAdd.json @@ -7781,12 +7781,12 @@ "warId": 9999 }, { "condType": 0, - "endedAt": 2145888000, + "endedAt": 1751522399, "overwriteId": 80465, "overwriteStr": "", "priority": 80465, "script": {}, - "startedAt": 2145888000, + "startedAt": 1750312800, "targetId": 0, "type": 3, "value": 0,