diff --git a/AssetStorage.txt b/AssetStorage.txt index 40c4b4ed1..d716a1463 100644 --- a/AssetStorage.txt +++ b/AssetStorage.txt @@ -1,7 +1,7 @@ -~1502485287 -@FgoDataVersion0066,20160420_1,20240530_17:41 +~3636011569 +@FgoDataVersion0066,20160420_1,20240607_12:34 b1dabca81d51b487dc13d8c5f03984557a519ab3,DATA0,5031648,1359257835,ADV/1000000,,1 -4c25513f5a6b104651d0467c3bf63c1dd3ab8301,DATA0,432320,1188153853,Android,, +f69d50a2dd4e3bcf7f802cf503a89a047622fd3f,DATA0,432000,1310409234,Android,, 00c4406b2de02e7097d5c9a8d9d85091e0ff17fc,SYSTEM,8138888,265540648,Audio/Battle.cpk.bytes,, c19557cba621d2b96ea32fc309a2168a1c4ecf26,DATA0,1896584,1822905443,Audio/Bgm/BGM_AMAZONES.cpk.bytes,, 2d8fffa13cfb05357521bef4f8b9f14e1f826a6a,SYSTEM,3133576,2361780594,Audio/Bgm/BGM_APO_1.cpk.bytes,, @@ -5606,7 +5606,7 @@ b55fd20c0a1ebf7f900da907b48a7ef3f0c9f6c5,DATA0,116640,20697814,Back/back99804,,1 56aca4dff6e64175bbbcaf2ce9ec26813890fdd9,DATA0,228832,1721204660,Back/back99901,,1 5dd5855fa6db133438efb3b622fdfca2dd98fd50,DATA0,163360,759614105,Back/back99902,,1 871c1a35b1de2bbe3a653b9a4b4f9a56a0cbc4b6,SYSTEM,1077568,3230565151,Banner/DownloadBannerAtlas1,, -10c9d54421766e2a29f24f57124c25dcc0cbf76d,SYSTEM,1063456,2282803516,Banner/DownloadBannerAtlas2,, +213c4595e46080f5a75a204e91bdc1a550a3cbd2,SYSTEM,1064896,1724508027,Banner/DownloadBannerAtlas2,, 3daee515881bafb7bf8bf08ca36ec20537a33614,SYSTEM,906272,4003932119,Banner/DownloadBannerAtlas3,, a94a65bc65a928a9b827c21c1740dc2fc8cbe325,SYSTEM,5955936,4077117531,Battle/BattleResult,, bb0ce725b4479738ac8416a71106ad597eaa5873,SYSTEM,5407680,2833317746,Battle/Common,, @@ -11045,7 +11045,7 @@ db2b0c5ea0fb9c7fbadf514adf159247653ced8a,DATA0,109184,1105944762,CharaGraph/9306 7d4ce0d72dc5540a01489a44d7dd30cbe4c4ca7b,DATA0,161664,492182464,CharaGraph/9306980,13687c, bf2931dddde24f03384a3fd321e3e4c60ebfb2d4,DATA0,95232,2334601362,CharaGraph/9306990,13687c, 0180f39a9a6d435d8da9239698533e7df7537b2e,DATA0,109344,4251379917,CharaGraph/9307000,13687c, -40ea51973ae174c415401ab410887ec4694bff73,DATA0,118656,2590320490,CharaGraph/9307010,136ff3, +5b0a235a79650954b7eed01f7dc93000ce4f6ef5,DATA0,116512,3907244223,CharaGraph/9307010,136ff3, 318364a4c82bb84d2d2c49a642ba5184973a69a5,DATA0,148000,414138477,CharaGraph/9307020,187cb8, b05df669c98ecf1e2e526a08c3898befd371d443,DATA0,132736,2433078454,CharaGraph/9307030,187cb8, ea3f790b4b3c826fd5b07837867f68aa9e3f460a,DATA0,153280,2596499025,CharaGraph/9307040,187cb8, @@ -14964,11 +14964,11 @@ a71c02e695b7297f65e4683d95109777ac4e5017,SYSTEM,256416,112750377,Event/DownloadE 1aee7856f649bb53fbd1176957194f552d64b864,SYSTEM,5207360,47119841,Event/Info,, a47db439da33edc4fa7d6abe8ba2cf1912cab6bf,DATA0,1428864,1737199342,Event/Submarine,, c6250ab6960ad0ffb2f807e42f7151d760e49d59,SYSTEM,944768,3152776408,EventReward/EventRewardAtlas1,, -71921fbc4a29b2dcad0a2a6374eb922935bc039d,SYSTEM,385024,1394263706,EventReward/EventRewardAtlas2,, +8256db1aa8165130040f134eee8ad218cbb51900,SYSTEM,385088,1349349585,EventReward/EventRewardAtlas2,, 1818975e86f0f4f827959db9724ee3e34d7e7013,DATA0,882880,3054511681,EventServantFatigue/1,, 24ac37f0af1d86f216e09e8c6fd8aa242825e212,DATA0,2764480,832832539,EventServantFatigue/2,, 7ff54f9090fc6dc7ca6a1f450c309cb339445feb,DATA0,6061056,1009407381,EventServantFatigue/3,, -91ab066dadbc96e3862c50fe01a173f2e12ffe3c,SYSTEM,5124864,3890226184,EventUI/DownloadEventUI,, +6940725e3c9a78435b4415e79c9a0866199a5a6c,SYSTEM,5117056,2004440675,EventUI/DownloadEventUI,, f280613c57bea12947acea33bb8b5f331cbcaf99,SYSTEM,3520,2340185806,EventUI/Prefabs/0/308,, 2ae525e0207bb05cdeffac27db040fe03651fa1c,SYSTEM,5536,3483669670,EventUI/Prefabs/80250,, 9191065ed8e4b2ba461017019609f11ba64b6b31,SYSTEM,5472,52582851,EventUI/Prefabs/80254,, @@ -22384,18 +22384,18 @@ b3e55bb538144ba550923e131a940d86098eb39c,DATA0,32832,522634953,Servants/Status/9 5764407c79836b8946f7f50a1b376cc448489f44,SYSTEM,595104,1705405386,ShopBanners/DownloadShopBannerAtlas1,,1 f9e41710a5772c0274642ac4cf18f4105ee126cd,SYSTEM,1462176,1606619654,ShopBanners/DownloadShopBannerAtlas2,,1 f0a939124dd76b64e2945262be60298092101126,SYSTEM,1495200,3033646243,ShopBanners/DownloadShopBannerAtlas3,,1 -1ec0bc5a2f3b7ab0f5e85b20079b0a713a59397f,SYSTEM,413248,3307149454,ShopBanners/DownloadShopBannerAtlas4,, +650aa8ed70d2a5a4bee6f9f9510b042c44a6b21c,SYSTEM,446656,3389260215,ShopBanners/DownloadShopBannerAtlas4,, ca9ebad0a65633477cbfd2e25ea1b7bde244057e,SYSTEM,638400,588226511,SkillIcons/DownloadSkillIcon,,1 -fa8a066df93ccf95cfe81a8f3bd30fafcb5d6f94,SYSTEM,1049408,3416501673,SummonBanners/DownloadSummonBannerAtlas1,,1 +c79d44927b2644743589504952bdc6cb1607b1b5,SYSTEM,1051840,3374195011,SummonBanners/DownloadSummonBannerAtlas1,,1 cbfb00d9c2af20349e7fb57246a387e16a271421,SYSTEM,895584,1648091307,SummonBanners/DownloadSummonBannerAtlas10,, 2b910e88096c192121e44ce31bf6ef6fd8fdfbac,SYSTEM,879680,198746264,SummonBanners/DownloadSummonBannerAtlas11,, 8ca8059e751568905265be60e531e40e624f3456,SYSTEM,876576,1603392510,SummonBanners/DownloadSummonBannerAtlas12,, 96ad31766acfcd796cb7dc28db466eae023b3de0,SYSTEM,841440,4205782549,SummonBanners/DownloadSummonBannerAtlas13,, -2855e85e27f05291ba52fd6b8553d68e793ca77b,SYSTEM,583136,2200162042,SummonBanners/DownloadSummonBannerAtlas14,, -de79eb176cd22418ed7d63aee243384f940e8c74,SYSTEM,691232,454901284,SummonBanners/DownloadSummonBannerAtlas15,, -710f4e446b425f08b009bd46d8a797e560f5c586,SYSTEM,693056,1365815390,SummonBanners/DownloadSummonBannerAtlas16,, -67bbcff377839989889dc12ec60d35172e6aebfc,SYSTEM,692960,1831818685,SummonBanners/DownloadSummonBannerAtlas17,, -fbf45b2e4ac6c23804e8e22355883731ef857038,SYSTEM,467136,1912820452,SummonBanners/DownloadSummonBannerAtlas18,, +6872036f09d6f45daa0922fcfe702c7347592883,SYSTEM,582784,458124810,SummonBanners/DownloadSummonBannerAtlas14,, +58725502915d91d1b0f2b5ce26c4da5511d0d9b4,SYSTEM,692416,939767298,SummonBanners/DownloadSummonBannerAtlas15,, +6a3529e41634278fd0c822775038308364915706,SYSTEM,690816,1582724563,SummonBanners/DownloadSummonBannerAtlas16,, +49cff8f80bdf42a3b41ecf537b6dba7e90f2d4dc,SYSTEM,695328,16012352,SummonBanners/DownloadSummonBannerAtlas17,, +63c05669782685f1d8d700132553fe3c3f472df3,SYSTEM,692448,286902903,SummonBanners/DownloadSummonBannerAtlas18,, 5b0c375e7871bec9074bd96a13652253f3dbd667,SYSTEM,855360,1847793478,SummonBanners/DownloadSummonBannerAtlas2,,1 b08e62dc11c288a65a7c5e63cdb494abc39e71ba,SYSTEM,934112,434204135,SummonBanners/DownloadSummonBannerAtlas3,,1 97fe17a34647eacb3a0e74e9313cc0660a7a4cb9,SYSTEM,906496,1296812999,SummonBanners/DownloadSummonBannerAtlas4,,1 diff --git a/gamedatatop.json b/gamedatatop.json index 57bec0495..2023b2600 100644 --- a/gamedatatop.json +++ b/gamedatatop.json @@ -2,7 +2,7 @@ "response": [{ "resCode": "00", "success": { - "version": 537, + "version": 538, "master": "", "useProtoBuf": 1, "isCloseSvtGetEffect": "0000", @@ -15,7 +15,7 @@ "FixVersion_iOS": 2024051600, "voiceLabelSet": 1, "npVoiceLabelSet": 1, - "assetStorageVersion": 202405301738 + "assetStorageVersion": 202406071231 }, "fail": {}, "nid": "gamedata" diff --git a/master/mstBanner.json b/master/mstBanner.json index 5955255f1..1dfb7b8bb 100644 --- a/master/mstBanner.json +++ b/master/mstBanner.json @@ -1,28 +1,4 @@ [{ - "id": 80610, - "bannerId": 80610, - "bannerPriority": 427, - "terminalBannerPriority": 427, - "noticeAt": 1715587200, - "finishedAt": 1715921999, - "linkType": 1, - "linkBody": "https://line1-patch.fate-go.com.tw/manage/html/Notice/Game/tw/2024-04-29/activityNotice_4371_1714361730.html", - "deviceType": 0, - "dialogImage": "0", - "dialogText": "0" -}, { - "id": 80611, - "bannerId": 80611, - "bannerPriority": 428, - "terminalBannerPriority": 428, - "noticeAt": 1715673600, - "finishedAt": 1716008399, - "linkType": 1, - "linkBody": "https://line1-patch.fate-go.com.tw/manage/html/Notice/Game/tw/2024-04-29/activityNotice_4371_1714361730.html", - "deviceType": 0, - "dialogImage": "0", - "dialogText": "0" -}, { "id": 80613, "bannerId": 80613, "bannerPriority": 400, @@ -34,162 +10,6 @@ "deviceType": 0, "dialogImage": "https://line1-patch.fate-go.com.tw/2570/RewardPic/EventBonus/2024050800/TikTok.png", "dialogText": "除了遊戲情報外，\n將會有更多各式各樣的精彩內容在官方TikTok帳號中釋出！\n\n是否開啟並跳轉至TikTok？" -}, { - "id": 80614, - "bannerId": 80614, - "bannerPriority": 431, - "terminalBannerPriority": 431, - "noticeAt": 1715788800, - "finishedAt": 1716872399, - "linkType": 1, - "linkBody": "https://line1-patch.fate-go.com.tw/manage/html/Notice/Game/tw/2024-05-06/activityNotice_4376_1715344400.html", - "deviceType": 0, - "dialogImage": "0", - "dialogText": "0" -}, { - "id": 80615, - "bannerId": 80615, - "bannerPriority": 443, - "terminalBannerPriority": 443, - "noticeAt": 1715788800, - "finishedAt": 1717045199, - "linkType": 1, - "linkBody": "https://line1-patch.fate-go.com.tw/manage/html/Notice/Game/tw/2024-05-06/activityNotice_4378_1715857997.html", - "deviceType": 0, - "dialogImage": "0", - "dialogText": "0" -}, { - "id": 80616, - "bannerId": 80616, - "bannerPriority": 430, - "terminalBannerPriority": 430, - "noticeAt": 1716177600, - "finishedAt": 1716782399, - "linkType": 3, - "linkBody": "https://lihi2.com/nf1uV", - "deviceType": 0, - "dialogImage": "https://line1-patch.fate-go.com.tw/2570/RewardPic/EventBonus/2024051402/1.png", - "dialogText": "於參與時間內填寫完本問卷，\n即可在活動截止後獲得4枚呼符！\n\n是否開啟瀏覽器並跳轉至問卷頁面？" -}, { - "id": 80617, - "bannerId": 80617, - "bannerPriority": 433, - "terminalBannerPriority": 433, - "noticeAt": 1716008400, - "finishedAt": 1717045199, - "linkType": 1, - "linkBody": "https://line1-patch.fate-go.com.tw/manage/html/Notice/Game/tw/2024-05-06/activityNotice_4379_1715344376.html", - "deviceType": 0, - "dialogImage": "0", - "dialogText": "0" -}, { - "id": 80618, - "bannerId": 80618, - "bannerPriority": 434, - "terminalBannerPriority": 434, - "noticeAt": 1716192000, - "finishedAt": 1716364799, - "linkType": 1, - "linkBody": "https://line1-patch.fate-go.com.tw/manage/html/Notice/Game/tw/2024-05-06/activityNotice_4383_1715344351.html", - "deviceType": 0, - "dialogImage": "0", - "dialogText": "0" -}, { - "id": 80619, - "bannerId": 80619, - "bannerPriority": 435, - "terminalBannerPriority": 435, - "noticeAt": 1716278400, - "finishedAt": 1716451199, - "linkType": 1, - "linkBody": "https://line1-patch.fate-go.com.tw/manage/html/Notice/Game/tw/2024-05-06/activityNotice_4383_1715344351.html", - "deviceType": 0, - "dialogImage": "0", - "dialogText": "0" -}, { - "id": 80620, - "bannerId": 80620, - "bannerPriority": 436, - "terminalBannerPriority": 436, - "noticeAt": 1716364800, - "finishedAt": 1716537599, - "linkType": 1, - "linkBody": "https://line1-patch.fate-go.com.tw/manage/html/Notice/Game/tw/2024-05-06/activityNotice_4383_1715344351.html", - "deviceType": 0, - "dialogImage": "0", - "dialogText": "0" -}, { - "id": 80621, - "bannerId": 80621, - "bannerPriority": 437, - "terminalBannerPriority": 437, - "noticeAt": 1716451200, - "finishedAt": 1716623999, - "linkType": 1, - "linkBody": "https://line1-patch.fate-go.com.tw/manage/html/Notice/Game/tw/2024-05-06/activityNotice_4383_1715344351.html", - "deviceType": 0, - "dialogImage": "0", - "dialogText": "0" -}, { - "id": 80622, - "bannerId": 80622, - "bannerPriority": 438, - "terminalBannerPriority": 438, - "noticeAt": 1716537600, - "finishedAt": 1716710399, - "linkType": 1, - "linkBody": "https://line1-patch.fate-go.com.tw/manage/html/Notice/Game/tw/2024-05-06/activityNotice_4383_1715344351.html", - "deviceType": 0, - "dialogImage": "0", - "dialogText": "0" -}, { - "id": 80623, - "bannerId": 80623, - "bannerPriority": 439, - "terminalBannerPriority": 439, - "noticeAt": 1716624000, - "finishedAt": 1716796799, - "linkType": 1, - "linkBody": "https://line1-patch.fate-go.com.tw/manage/html/Notice/Game/tw/2024-05-06/activityNotice_4383_1715344351.html", - "deviceType": 0, - "dialogImage": "0", - "dialogText": "0" -}, { - "id": 80624, - "bannerId": 80624, - "bannerPriority": 440, - "terminalBannerPriority": 440, - "noticeAt": 1716710400, - "finishedAt": 1716883199, - "linkType": 1, - "linkBody": "https://line1-patch.fate-go.com.tw/manage/html/Notice/Game/tw/2024-05-06/activityNotice_4383_1715344351.html", - "deviceType": 0, - "dialogImage": "0", - "dialogText": "0" -}, { - "id": 80625, - "bannerId": 80625, - "bannerPriority": 441, - "terminalBannerPriority": 441, - "noticeAt": 1716008400, - "finishedAt": 1717045199, - "linkType": 1, - "linkBody": "https://line1-patch.fate-go.com.tw/manage/html/Notice/Game/tw/2024-05-06/activityNotice_4380_1715344285.html", - "deviceType": 0, - "dialogImage": "0", - "dialogText": "0" -}, { - "id": 80626, - "bannerId": 80626, - "bannerPriority": 442, - "terminalBannerPriority": 442, - "noticeAt": 1716008400, - "finishedAt": 1717045199, - "linkType": 1, - "linkBody": "https://line1-patch.fate-go.com.tw/manage/html/Notice/Game/tw/2024-05-06/activityNotice_4381_1715345474.html", - "deviceType": 0, - "dialogImage": "0", - "dialogText": "0" }, { "id": 80627, "bannerId": 80627, @@ -241,8 +61,8 @@ }, { "id": 80631, "bannerId": 80631, - "bannerPriority": 447, - "terminalBannerPriority": 447, + "bannerPriority": 449, + "terminalBannerPriority": 449, "noticeAt": 1718006400, "finishedAt": 1718600399, "linkType": 1, @@ -253,8 +73,8 @@ }, { "id": 80632, "bannerId": 80632, - "bannerPriority": 448, - "terminalBannerPriority": 448, + "bannerPriority": 450, + "terminalBannerPriority": 450, "noticeAt": 1718265600, "finishedAt": 1718859599, "linkType": 1, @@ -265,8 +85,8 @@ }, { "id": 80633, "bannerId": 80633, - "bannerPriority": 449, - "terminalBannerPriority": 449, + "bannerPriority": 451, + "terminalBannerPriority": 451, "noticeAt": 1717045200, "finishedAt": 1718859599, "linkType": 1, @@ -274,6 +94,30 @@ "deviceType": 0, "dialogImage": "0", "dialogText": "0" +}, { + "id": 80634, + "bannerId": 80634, + "bannerPriority": 447, + "terminalBannerPriority": 447, + "noticeAt": 1717736400, + "finishedAt": 1718341199, + "linkType": 1, + "linkBody": "https://line1-patch.fate-go.com.tw/manage/html/Notice/Game/tw/2024-05-31/activityNotice_4431_1717149490.html", + "deviceType": 0, + "dialogImage": "0", + "dialogText": "0" +}, { + "id": 80635, + "bannerId": 80635, + "bannerPriority": 448, + "terminalBannerPriority": 448, + "noticeAt": 1717736400, + "finishedAt": 1718341199, + "linkType": 1, + "linkBody": "https://line1-patch.fate-go.com.tw/manage/html/Notice/Game/tw/2024-05-31/activityNotice_4432_1717149460.html", + "deviceType": 0, + "dialogImage": "0", + "dialogText": "0" }, { "id": 59000001, "bannerId": 59000001, diff --git a/master/mstEvent.json b/master/mstEvent.json index c6d3561b5..c1212994e 100644 --- a/master/mstEvent.json +++ b/master/mstEvent.json @@ -152,6 +152,33 @@ "combineMessageImageId": "2011001" }], "shortName": "" +}, { + "id": 20117, + "baseEventId": 0, + "type": 5, + "openType": 1, + "name": "瑪修強化『大成功&極大成功』機率2倍！", + "detail": "瑪修強化『大成功&極大成功』機率2倍！", + "noticeBannerId": 0, + "bannerId": 0, + "iconId": 0, + "bannerPriority": 0, + "openHours": 0, + "intervalHours": 0, + "noticeAt": 1717736400, + "startedAt": 1717736400, + "endedAt": 1718341199, + "finishedAt": 1718341199, + "materialOpenedAt": 2145888000, + "linkType": 1, + "linkBody": "/summon/detail_summon_1.html", + "deviceType": 0, + "myroomBgId": 0, + "myroomBgmId": 0, + "script": [{ + "combineMessageImageId": "2011101" + }], + "shortName": "" }, { "id": 30045, "baseEventId": 0, @@ -5879,6 +5906,31 @@ "myroomBgmId": 0, "script": [], "shortName": "" +}, { + "id": 80394, + "baseEventId": 0, + "type": 12, + "openType": 1, + "name": "處暑紀念任務", + "detail": "處暑紀念任務", + "noticeBannerId": 80383, + "bannerId": 80383, + "iconId": 80383, + "bannerPriority": 921000, + "openHours": 0, + "intervalHours": 0, + "noticeAt": 1717736400, + "startedAt": 1717736400, + "endedAt": 1718341199, + "finishedAt": 1718341199, + "materialOpenedAt": 2145888000, + "linkType": 1, + "linkBody": "/summon/detail_summon_1.html", + "deviceType": 0, + "myroomBgId": 0, + "myroomBgmId": 0, + "script": [], + "shortName": "" }, { "id": 10398999, "baseEventId": 0, diff --git a/master/mstEventMission.json b/master/mstEventMission.json index f4c0731cf..09d29691d 100644 --- a/master/mstEventMission.json +++ b/master/mstEventMission.json @@ -60624,10 +60624,10 @@ "type": 2 }, { "bannerGroup": 0, - "closedAt": 499875200, + "closedAt": 1719158399, "detail": "完成本週所有的御主任務", "dispNo": 1, - "endedAt": 499875200, + "endedAt": 1718553599, "flag": 0, "giftId": 419, "id": 2002212, @@ -60638,14 +60638,14 @@ "priority": 2001555, "rewardRarity": 0, "rewardType": 1, - "startedAt": 499875200, + "startedAt": 1717948800, "type": 2 }, { "bannerGroup": 0, - "closedAt": 499875200, + "closedAt": 1719158399, "detail": "擊敗5騎從者(戰鬥中被召喚出來的敵人除外)", "dispNo": 2, - "endedAt": 499875200, + "endedAt": 1718553599, "flag": 0, "giftId": 419, "id": 2002213, @@ -60656,14 +60656,14 @@ "priority": 2001556, "rewardRarity": 0, "rewardType": 1, - "startedAt": 499875200, + "startedAt": 1717948800, "type": 2 }, { "bannerGroup": 0, - "closedAt": 499875200, + "closedAt": 1719158399, "detail": "擊敗10騎從者(戰鬥中被召喚出來的敵人除外)", "dispNo": 3, - "endedAt": 499875200, + "endedAt": 1718553599, "flag": 0, "giftId": 419, "id": 2002214, @@ -60674,14 +60674,14 @@ "priority": 2001557, "rewardRarity": 0, "rewardType": 1, - "startedAt": 499875200, + "startedAt": 1717948800, "type": 2 }, { "bannerGroup": 0, - "closedAt": 499875200, + "closedAt": 1719158399, "detail": "擊敗15個持有『天』之力的敵人(戰鬥中被召喚出來的敵人除外)", "dispNo": 4, - "endedAt": 499875200, + "endedAt": 1718553599, "flag": 0, "giftId": 419, "id": 2002215, @@ -60692,14 +60692,14 @@ "priority": 2001558, "rewardRarity": 0, "rewardType": 1, - "startedAt": 499875200, + "startedAt": 1717948800, "type": 2 }, { "bannerGroup": 0, - "closedAt": 499875200, + "closedAt": 1719158399, "detail": "擊敗15個持有『人型』特性的敵人(戰鬥中被召喚出來的敵人除外)", "dispNo": 5, - "endedAt": 499875200, + "endedAt": 1718553599, "flag": 0, "giftId": 419, "id": 2002216, @@ -60710,14 +60710,14 @@ "priority": 2001559, "rewardRarity": 0, "rewardType": 1, - "startedAt": 499875200, + "startedAt": 1717948800, "type": 2 }, { "bannerGroup": 0, - "closedAt": 499875200, + "closedAt": 1719158399, "detail": "獲得戰利品「睿智的業火」「睿智的猛火」「睿智的大火」「睿智的燈火」「睿智的種火」任意一種15個", "dispNo": 6, - "endedAt": 499875200, + "endedAt": 1718553599, "flag": 0, "giftId": 419, "id": 2002217, @@ -60728,14 +60728,14 @@ "priority": 2001560, "rewardRarity": 0, "rewardType": 1, - "startedAt": 499875200, + "startedAt": 1717948800, "type": 2 }, { "bannerGroup": 0, - "closedAt": 499875200, + "closedAt": 1719158399, "detail": "獲得戰利品「睿智的業火」「睿智的猛火」「睿智的大火」「睿智的燈火」「睿智的種火」任意一種30個", "dispNo": 7, - "endedAt": 499875200, + "endedAt": 1718553599, "flag": 0, "giftId": 419, "id": 2002218, @@ -60746,14 +60746,14 @@ "priority": 2001561, "rewardRarity": 0, "rewardType": 1, - "startedAt": 499875200, + "startedAt": 1717948800, "type": 2 }, { "bannerGroup": 0, - "closedAt": 499875200, + "closedAt": 1719763199, "detail": "完成本週所有的御主任務", "dispNo": 1, - "endedAt": 499875200, + "endedAt": 1719158399, "flag": 0, "giftId": 419, "id": 2002219, @@ -60764,14 +60764,14 @@ "priority": 2001562, "rewardRarity": 0, "rewardType": 1, - "startedAt": 499875200, + "startedAt": 1718553600, "type": 2 }, { "bannerGroup": 0, - "closedAt": 499875200, + "closedAt": 1719763199, "detail": "擊敗『Saber』『Assassin』職階中任意一種敵人15個(戰鬥中被召喚出來的敵人除外)", "dispNo": 2, - "endedAt": 499875200, + "endedAt": 1719158399, "flag": 0, "giftId": 419, "id": 2002220, @@ -60782,14 +60782,14 @@ "priority": 2001563, "rewardRarity": 0, "rewardType": 1, - "startedAt": 499875200, + "startedAt": 1718553600, "type": 2 }, { "bannerGroup": 0, - "closedAt": 499875200, + "closedAt": 1719763199, "detail": "擊敗『Archer』『Rider』職階中任意一種敵人15個(戰鬥中被召喚出來的敵人除外)", "dispNo": 3, - "endedAt": 499875200, + "endedAt": 1719158399, "flag": 0, "giftId": 419, "id": 2002221, @@ -60800,14 +60800,14 @@ "priority": 2001564, "rewardRarity": 0, "rewardType": 1, - "startedAt": 499875200, + "startedAt": 1718553600, "type": 2 }, { "bannerGroup": 0, - "closedAt": 499875200, + "closedAt": 1719763199, "detail": "擊敗『Lancer』『Caster』『Berserker』職階中任意一種敵人15個(戰鬥中被召喚出來的敵人除外)", "dispNo": 4, - "endedAt": 499875200, + "endedAt": 1719158399, "flag": 0, "giftId": 419, "id": 2002222, @@ -60818,14 +60818,14 @@ "priority": 2001565, "rewardRarity": 0, "rewardType": 1, - "startedAt": 499875200, + "startedAt": 1718553600, "type": 2 }, { "bannerGroup": 0, - "closedAt": 499875200, + "closedAt": 1719763199, "detail": "擊敗15個持有『猛獸』特性的敵人(戰鬥中被召喚出來的敵人除外)", "dispNo": 5, - "endedAt": 499875200, + "endedAt": 1719158399, "flag": 0, "giftId": 419, "id": 2002223, @@ -60836,14 +60836,14 @@ "priority": 2001566, "rewardRarity": 0, "rewardType": 1, - "startedAt": 499875200, + "startedAt": 1718553600, "type": 2 }, { "bannerGroup": 0, - "closedAt": 499875200, + "closedAt": 1719763199, "detail": "完成任意任務5次", "dispNo": 6, - "endedAt": 499875200, + "endedAt": 1719158399, "flag": 0, "giftId": 419, "id": 2002224, @@ -60854,14 +60854,14 @@ "priority": 2001567, "rewardRarity": 0, "rewardType": 1, - "startedAt": 499875200, + "startedAt": 1718553600, "type": 2 }, { "bannerGroup": 0, - "closedAt": 499875200, + "closedAt": 1719763199, "detail": "完成任意任務10次", "dispNo": 7, - "endedAt": 499875200, + "endedAt": 1719158399, "flag": 0, "giftId": 419, "id": 2002225, @@ -60872,7 +60872,7 @@ "priority": 2001568, "rewardRarity": 0, "rewardType": 1, - "startedAt": 499875200, + "startedAt": 1718553600, "type": 2 }, { "bannerGroup": 0, diff --git a/master/mstGacha.json b/master/mstGacha.json index c895018f1..e5f857f01 100644 --- a/master/mstGacha.json +++ b/master/mstGacha.json @@ -1552,6 +1552,43 @@ "type": 1, "warId": 100, "flag": 2 +}, { + "adjustId": 50009021, + "bannerQuestId": 1000002, + "bannerQuestPhase": 1, + "baseId": 10024, + "beforeDrawNum": 1, + "beforeGachaId": 101, + "closedAt": 1718341199, + "condQuestId": 1000002, + "condQuestPhase": 1, + "detailUrl": "", + "drawNum1": 1, + "drawNum2": 11, + "extraAddCount1": 1, + "extraAddCount2": 0, + "extraGroupId1": 294, + "extraGroupId2": 0, + "freeDrawFlag": 0, + "gachaGroupId": 0, + "gachaProbabilityId": 5002454, + "gachaSlot": 294, + "id": 5002454, + "imageId": 81968, + "maxDrawNum": 0, + "name": "「MELTY BLOOD: TYPE LUMINA」端午特別紀念PICK UP召喚", + "openedAt": 1717736400, + "pickupClosedAt": 1718341199, + "pickupId": 50011302, + "pickupOpenedAt": 1717736400, + "priority": 5002454, + "rarityId": 3, + "shopId1": 4, + "shopId2": 5, + "ticketItemId": 4001, + "type": 1, + "warId": 100, + "flag": 0 }, { "adjustId": 50009001, "bannerQuestId": 1000002, diff --git a/master/mstGachaAppend.json b/master/mstGachaAppend.json index d1c45d4ca..9fe7272ea 100644 --- a/master/mstGachaAppend.json +++ b/master/mstGachaAppend.json @@ -1912,6 +1912,17 @@ "extraAddCount": 0, "maxDrawNum": 0, "flag": 1 +}, { + "gachaId": 5002454, + "idx": 3, + "type": 7, + "shopId": 8, + "gachaGroupId": 192, + "drawNum": 1, + "extraGroupId": 0, + "extraAddCount": 0, + "maxDrawNum": 0, + "flag": 1 }, { "gachaId": 5002455, "idx": 3, diff --git a/master/mstMasterMission.json b/master/mstMasterMission.json index 790541297..1de44a673 100644 --- a/master/mstMasterMission.json +++ b/master/mstMasterMission.json @@ -2567,21 +2567,21 @@ "priority": 0, "startedAt": 1716739200 }, { - "closedAt": 4294967295, - "endedAt": 4294967295, + "closedAt": 1719158399, + "endedAt": 1718553599, "id": 100319, "imageId": 0, "name": "", "priority": 0, - "startedAt": 4294967295 + "startedAt": 1717948800 }, { - "closedAt": 4294967295, - "endedAt": 4294967295, + "closedAt": 1719763199, + "endedAt": 1719158399, "id": 100320, "imageId": 0, "name": "", "priority": 0, - "startedAt": 4294967295 + "startedAt": 1718553600 }, { "closedAt": 4294967295, "endedAt": 4294967295, diff --git a/master/mstMasterMissionDisplayInfo.json b/master/mstMasterMissionDisplayInfo.json index 269a05407..8b37e65e9 100644 --- a/master/mstMasterMissionDisplayInfo.json +++ b/master/mstMasterMissionDisplayInfo.json @@ -564,20 +564,20 @@ "talkIds": ["0_A2610", "0_A2620", "0_A2630"], "guideLimitCount": 0, "startedAt": 1717171200, - "endedAt": 4294967295 + "endedAt": 1719763199 }, { "id": 84, "guideImageId": 9000001, "talkIds": ["0_A2640", "0_A2650", "0_A2660", "0_A2670"], "guideLimitCount": 0, - "startedAt": 4294967295, - "endedAt": 4294967295 + "startedAt": 1719763200, + "endedAt": 1722441599 }, { "id": 85, "guideImageId": 9000001, "talkIds": ["0_A2680", "0_A2690", "0_A2700"], "guideLimitCount": 0, - "startedAt": 4294967295, + "startedAt": 1722441600, "endedAt": 4294967295 }, { "id": 86, diff --git a/master/mstQuest.json b/master/mstQuest.json index 13e1836fc..38cd2b9cc 100644 --- a/master/mstQuest.json +++ b/master/mstQuest.json @@ -387038,6 +387038,38 @@ "scriptQuestId": 0, "spotId": 999999, "type": 5 +}, { + "actConsume": 5, + "afterActionVals": [], + "afterClear": 1, + "bannerId": 94075401, + "bannerType": 0, + "beforeActionVals": [], + "chaldeaGateCategory": 1, + "chapterId": 0, + "chapterSubId": 0, + "chapterSubStr": "", + "charaIconId": 0, + "closedAt": 1718341199, + "consumeType": 1, + "displayHours": 0, + "flag": 32, + "forceOperation": 0, + "giftIconId": 0, + "giftId": 41833, + "hasStartAction": 1, + "iconId": 94075401, + "id": 94075401, + "intervalHours": 0, + "name": "「MELTY BLOOD」端午紀念任務", + "nameRuby": "", + "noticeAt": 1717736400, + "openedAt": 1717736400, + "priority": 94075401, + "recommendLv": "15", + "scriptQuestId": 0, + "spotId": 999999, + "type": 5 }, { "actConsume": 21, "afterActionVals": [], diff --git a/master/mstQuestPhaseDetail.json b/master/mstQuestPhaseDetail.json index e0a478f1f..c78f67d44 100644 --- a/master/mstQuestPhaseDetail.json +++ b/master/mstQuestPhaseDetail.json @@ -70751,7 +70751,7 @@ } }, "consumeType": 1, - "flag": 32, + "flag": 0, "phase": 1, "questId": 94075401, "spotId": 999999, diff --git a/master/mstQuestRelease.json b/master/mstQuestRelease.json index 29d76d21a..636eb4ce9 100644 --- a/master/mstQuestRelease.json +++ b/master/mstQuestRelease.json @@ -247126,14 +247126,6 @@ "openLimit": 0, "closedMessageId": 0, "imagePriority": 10000 -}, { - "questId": 94075401, - "type": 35, - "targetId": 6000730, - "value": 0, - "openLimit": 0, - "closedMessageId": 0, - "imagePriority": 9500 }, { "questId": 94075801, "type": 1, diff --git a/master/mstShop.json b/master/mstShop.json index 95991d419..f3e1b4099 100644 --- a/master/mstShop.json +++ b/master/mstShop.json @@ -39722,21 +39722,26 @@ "flag": 256, "id": 6000523, "imageId": 80300, - "infoMessage": "可開放靈衣「常夏的泳裝」的開放權獲得任務。", + "infoMessage": "可開放靈衣「常夏的泳裝」的開放權獲得關卡。", "itemIds": [18], "limitNum": 1, "name": "靈衣「常夏的泳裝」開放權獲得任務", "openedAt": 1652418000, "payType": 10, "prices": [5], - "priority": 930, + "priority": 740, "purchaseType": 6, - "script": {}, + "script": { + "freeShopCondId": 20075401, + "freeShopCondMessage": "『通關「終局特異點」』", + "hideWarningMessageCondId": 20075401, + "freeShopReleaseDate": 1717736700 + }, "setNum": 0, "shopType": 11, "slot": 0, "targetIds": [94014310], - "warningMessage": "" + "warningMessage": "『靈衣「常夏的泳裝」開放權獲得任務』可以在\n達成免費化條件之後，\n不消耗稀有魔力稜鏡進行兌換。\n \n免費化條件\n達成『通關「終局特異點」』\n \n[ffff00]在未達成免費化條件之前進行了兌換的情況下，\n一旦完成了免費化條件，\n將歸還消耗的稀有魔力稜鏡。[-]\n \n是否確認兌換？" }, { "baseShopId": 6000524, "bgImageId": 0, @@ -40587,14 +40592,19 @@ "openedAt": 1660798800, "payType": 10, "prices": [5], - "priority": 920, + "priority": 739, "purchaseType": 14, - "script": {}, + "script": { + "freeShopCondId": 20075402, + "freeShopCondMessage": "『通關「終局特異點」』", + "hideWarningMessageCondId": 20075402, + "freeShopReleaseDate": 1717736700 + }, "setNum": 1, "shopType": 11, "slot": 0, "targetIds": [80010014], - "warningMessage": "" + "warningMessage": "『靈衣「常夏的泳裝Ver.02」開放權』可以在\n達成免費化條件之後，\n不消耗稀有魔力稜鏡進行兌換。\n \n免費化條件\n達成『通關「終局特異點」』\n \n[ffff00]在未達成免費化條件之前進行了兌換的情況下，\n一旦完成了免費化條件，\n將歸還消耗的稀有魔力稜鏡。[-]\n \n是否確認兌換？" }, { "baseShopId": 6000557, "bgImageId": 0, @@ -46137,7 +46147,7 @@ "openedAt": 1716008400, "payType": 10, "prices": [2], - "priority": 471, + "priority": 741, "purchaseType": 14, "script": { "freeShopCondId": 20072802, diff --git a/master/mstShopDetail.json b/master/mstShopDetail.json index 9c35b0b1c..9147ede90 100644 --- a/master/mstShopDetail.json +++ b/master/mstShopDetail.json @@ -511,7 +511,7 @@ "okTextImageId": 0 }, { "shopId": 6000523, - "message": "可兌換1次靈衣「常夏的泳裝」\n開放權獲得關卡。\n\n兌換後，靈衣開放權獲得關卡\n將會出現在迦勒底之門中。\n獲得靈衣開放權後，可從強化選項的\n「靈衣開放」進行靈衣的開放。\n\n[FF0000]滿足開放條件後[-]\n[FF0000]可透過使用素材道具與QP[-]\n[FF0000]進行靈衣開放。[-]\n\n是否進行兌換？", + "message": "可以兌換1次靈衣「常夏的泳裝」\n開放權獲得任務。\n\n兌換後，靈衣開放權獲得任務\n將會出現在迦勒底之門中。\n獲得靈衣開放權後，可從強化選項的\n「靈衣開放」進行靈衣的開放。\n\n[FF0000]滿足開放條件後[-]\n[FF0000]可透過使用素材道具與QP[-]\n[FF0000]進行靈衣開放。[-]\n\n是否進行兌換？", "frequencyType": 3, "presentMessageId": 0, "afterMessage": "", @@ -525,7 +525,7 @@ "okTextImageId": 0 }, { "shopId": 6000556, - "message": "可兌換1次靈衣「常夏的泳裝Ver.02」\n開放權獲得任務。\n\n兌換後，可從強化選項的\n「靈衣開放」進行靈衣的開放。\n\n[FF0000]滿足開放條件後[-]\n[FF0000]可透過使用素材道具與QP[-]\n[FF0000]進行靈衣開放。[-]\n\n是否進行兌換？", + "message": "可以兌換1次靈衣「常夏的泳裝Ver.02」\n開放權。\n\n兌換後，可從強化選項的\n「靈衣開放」進行靈衣的開放。\n\n[FF0000]滿足開放條件後[-]\n[FF0000]可透過使用素材道具與QP[-]\n[FF0000]進行靈衣開放。[-]\n\n是否進行兌換？", "frequencyType": 3, "presentMessageId": 0, "afterMessage": "", diff --git a/master/mstSvt.json b/master/mstSvt.json index 27b610a27..da7ea1937 100644 --- a/master/mstSvt.json +++ b/master/mstSvt.json @@ -44397,6 +44397,43 @@ "sellRarePri": 0, "starRate": 0, "type": 6 +}, { + "attackAttri": 1, + "attri": 2, + "baseSvtId": 9307010, + "battleName": "-", + "battleSize": 2, + "cardIds": [3, 3, 3, 3, 3], + "classId": 1001, + "classPassive": [], + "collectionNo": 1690, + "combineLimitId": 0, + "combineMaterialId": 39, + "combineSkillId": 0, + "cost": 9, + "cvId": 0, + "deathRate": 0, + "expType": 19, + "flag": 0, + "friendshipId": 1000, + "genderType": 3, + "hpGaugeY": 0, + "id": 9307010, + "illustratorId": 2, + "individuality": [], + "limitMax": 4, + "materialStoryPriority": 1000, + "maxFriendshipRank": 0, + "name": "TYPE LUMINA", + "relateQuestIds": [], + "rewardLv": 0, + "ruby": "-", + "script": {}, + "sellMana": 3, + "sellQp": 1000, + "sellRarePri": 0, + "starRate": 0, + "type": 6 }, { "attackAttri": 1, "attri": 2, diff --git a/master/mstSvtComment.json b/master/mstSvtComment.json index 621b16eb6..54c23db54 100644 --- a/master/mstSvtComment.json +++ b/master/mstSvtComment.json @@ -36055,7 +36055,7 @@ "id": 1, "priority": 0, "condMessage": "", - "comment": "『假如缺少了任何一件事、任何一個人的情況下』\n以可能性為前提展開的前日談與後日談。\n\n是至今仍在延續的，少年與吸血鬼的故事。", + "comment": "『假如缺少了任何一件事、任何一個人的情況下』\n以可能性為前提展開的前傳與後日談。\n\n是至今仍在延續的，少年與吸血鬼的故事。", "condType": 0, "condValues": [0], "condValue2": 0, diff --git a/master/mstWarAdd.json b/master/mstWarAdd.json index d03862c29..20b466d94 100644 --- a/master/mstWarAdd.json +++ b/master/mstWarAdd.json @@ -5847,12 +5847,12 @@ "warId": 9999 }, { "condType": 0, - "endedAt": 1692856799, + "endedAt": 1718341199, "overwriteId": 80383, "overwriteStr": "", "priority": 80383, "script": {}, - "startedAt": 1692252000, + "startedAt": 1717736400, "targetId": 0, "type": 3, "value": 0,