diff --git a/AssetStorage.txt b/AssetStorage.txt
index 7468f1e3e..d4a3fe6e7 100644
--- a/AssetStorage.txt
+++ b/AssetStorage.txt
@@ -1,5 +1,5 @@
-~2811392432
-@FgoDataVersion0066,20160420_1,20230707_17:54
+~2959887967
+@FgoDataVersion0066,20160420_1,20230718_19:27
697128dda5d2a624427615fc556934412692b4fa,DATA0,6312128,2586705791,ADV/1000000,,1
41e60b6194624b9813f523a114091ddf36e6e023,SYSTEM,7886984,4110565029,Audio/Battle.cpk.bytes,,
c19557cba621d2b96ea32fc309a2168a1c4ecf26,DATA0,1896584,1822905443,Audio/Bgm/BGM_AMAZONES.cpk.bytes,,
@@ -1008,7 +1008,7 @@ faf56bc5bd74ab912b1c69d90a23c4209aea9809,DATA0,172168,1096471266,Audio/ChrVoice_
ec3401c00edfd3d9dc304288e498dd43a7e44ee8,DATA0,440456,3328000718,Audio/ChrVoice_7100400.cpk.bytes,,
a8e06abf31c5832a9e84eecce9bee4045a7bfa04,DATA0,213128,3793455630,Audio/ChrVoice_7100600.cpk.bytes,,
4012e4e8c04bbedfce5d36f7e041a4039f5f9c51,DATA0,8335496,2547775045,Audio/ChrVoice_800100.cpk.bytes,,
-114ccbe03787d6ed3c6e763b026a4bf82ae0fd95,DATA0,14495880,2956296628,Audio/ChrVoice_9000001.cpk.bytes,,
+92fc88093e13b173e845d3154ee43725c9001c27,DATA0,8235144,740588313,Audio/ChrVoice_9000001.cpk.bytes,,
f259b8bca2cec658659e49feb0a0a5cfb23c2ee7,DATA0,17424520,575886626,Audio/ChrVoice_9000002.cpk.bytes,,
5bf8a619ffcc53e70f94d266bae67b4940253b4a,DATA0,15065224,2953255506,Audio/ChrVoice_9000003.cpk.bytes,,
f2453aa81175dd885d1714dc280fe0bb1e990d21,DATA0,4323464,3917876986,Audio/ChrVoice_900100.cpk.bytes,,
@@ -5273,8 +5273,8 @@ e20a9edbb031863a8ae0e37367edefbb60ac8c21,DATA0,130688,2118113393,Back/back99805,
841a6e118690b69950cef5ad5c95ae0814dfbe9d,DATA0,237408,1209597700,Back/back99901,,1
b287420b4d9b376d1d5bfb0b60e18fc338eac561,DATA0,197728,1190199600,Back/back99902,,1
04b5768bf80334058ef7621df939f234452fd258,SYSTEM,1435520,3437435563,Banner/DownloadBannerAtlas1,,
-42a39ccc16b597584ad9807ecdccf5c35e5f9123,SYSTEM,1318784,2914689213,Banner/DownloadBannerAtlas2,,
-62aa51db38df860c529a54ae6b3a1d7faef23eb7,SYSTEM,667488,874273585,Banner/DownloadBannerAtlas3,,
+5fb53cf1a6d39d4db74088e81982efd09dcbff56,SYSTEM,1319936,4132475204,Banner/DownloadBannerAtlas2,,
+809bb96889a1baa550fac98ab9fa451f2c4492a2,SYSTEM,662944,2531592600,Banner/DownloadBannerAtlas3,,
d8875d2dfff59f2cca592df19828b939f09e3545,DATA0,201952,3418021456,Battle/20220731/McEffect,8b453e,
10207e0ff1c67a4162bb21249a74365aa8414c11,SYSTEM,4026944,1473332296,Battle/BattleResult,,
7b39871735772a05f221a9656acf348aa72c022f,SYSTEM,3631392,1654403666,Battle/Common,,
@@ -15452,7 +15452,7 @@ bbb478a0374ca7af73821355be5c23d031dd6891,DATA0,441280,3723755106,Image/scene8810
5f1e49df45b78c92ca192360e0a0ce8e6f243caf,DATA0,4096,2690863378,Image/slashright,,1
aae2ae32b43631acc1abe0527be65c01edc990d8,DATA0,102912,2719762637,Image/talk_img_black_gradation,,1
8221d15a6e039aae9247b4f055980e900167699c,DATA0,178272,2025873016,Image/talk_img_sandstorm,,1
-11734e859f23ee458b460f1fd44ccca183ea7773,DATA0,1312,1330244766,iPhone,,
+903bbedd76a79e32436f8e05f33fa5ee20e10b78,DATA0,1344,808017081,iPhone,,
de490ed5d967a8d07402e1676aa4d475ce9c2620,SYSTEM,3781760,4012725261,Items/DownloadItem,,
b84d51cafeac799325265972c9bf38b16dbef123,SYSTEM,105056,2436017809,Localization,,1
9a9eb58761adb3b928d4fff4ae313de8f98aa782,SYSTEM,92160,267598065,Marks/DownloadMark,,
@@ -20811,16 +20811,16 @@ a728fe0041fa0aaa75c35964f76d800651040f55,DATA0,27744,1749045394,Servants/Status/
6424d9df42a72aa21dadd1b455b48104bf3ac986,SYSTEM,995008,2204372105,ShopBanners/DownloadShopBannerAtlas1,,1
a2b34fc44a04b548f5542927f3f0ccd882e0c493,SYSTEM,1433344,1713620543,ShopBanners/DownloadShopBannerAtlas2,,1
9ade734c80f248d4ffed2ecf36b6fa2fdf00003d,SYSTEM,1452992,3889867805,ShopBanners/DownloadShopBannerAtlas3,,1
-882bb326cdd9aecb0f17816dc6f5d047fe4b02b6,SYSTEM,741504,1928084914,ShopBanners/DownloadShopBannerAtlas4,,
+b23f2e0f1cdbe8e991b38e0661d0fc169e5be081,SYSTEM,500032,818065495,ShopBanners/DownloadShopBannerAtlas4,,
523d6693f33945b8b98f17e546d629f78a6ba900,SYSTEM,637824,987772596,SkillIcons/DownloadSkillIcon,,1
-1a5a0f23efe0f33c7c5fa773e6c6f68e5286628c,SYSTEM,1203776,1821476244,SummonBanners/DownloadSummonBannerAtlas1,,1
-7f1b6cc36042ed9deb88b522dee41bbbd8a2ef17,SYSTEM,535360,3087382131,SummonBanners/DownloadSummonBannerAtlas2,,1
-707177e774b20b9530a30749d05f9feb6b40bdbf,SYSTEM,755968,2882762515,SummonBanners/DownloadSummonBannerAtlas3,,1
-40dbd883475c36c4096509a7b512565b1e6bfe87,SYSTEM,577824,2696814244,SummonBanners/DownloadSummonBannerAtlas4,,1
-7b8702706a1304756d712051894ce06f984173b5,SYSTEM,608896,4271197262,SummonBanners/DownloadSummonBannerAtlas5,,1
-f5cd4f3d50849dfe88c094b52df6f5a68f197755,SYSTEM,594752,1785163857,SummonBanners/DownloadSummonBannerAtlas6,,1
-0f1e461de4570e621d512d2d3efd8cc955f7e136,SYSTEM,735520,1424137944,SummonBanners/DownloadSummonBannerAtlas7,,1
-e627e618c2aa263e883312c6df8cb77fa77ca4e2,SYSTEM,729024,2682603710,SummonBanners/DownloadSummonBannerAtlas8,,1
+e2541185aeecf23ff7b4cc48af0e873abc58544b,SYSTEM,1202688,3013870518,SummonBanners/DownloadSummonBannerAtlas1,,1
+bb73660d3d5bda633f0785681db2a79f0a01a609,SYSTEM,968832,1799926840,SummonBanners/DownloadSummonBannerAtlas2,,1
+1253a902d0dd01224cbc07bef55fb549f9bc92e3,SYSTEM,517888,2373971394,SummonBanners/DownloadSummonBannerAtlas3,,1
+2ed2a54ffaf933631287f8a08a56e859b5046bd2,SYSTEM,859712,4189676882,SummonBanners/DownloadSummonBannerAtlas4,,1
+5ec036c0508cddd7d71799b1c0b595676afc4b87,SYSTEM,723488,3683068036,SummonBanners/DownloadSummonBannerAtlas5,,1
+e677b7f9054fd40cde515834b401995712b6d279,SYSTEM,729600,2790609235,SummonBanners/DownloadSummonBannerAtlas6,,1
+ca38b785673bcee5b0cb3dc31ccea87c95637a66,SYSTEM,729056,1364538474,SummonBanners/DownloadSummonBannerAtlas7,,1
+f2598ec67072470094790953efff97e434fcd8da,SYSTEM,484224,423430361,SummonBanners/DownloadSummonBannerAtlas8,,1
be76635feabefee6fd446a0115f602848c119a1c,SYSTEM,484512,2351023037,SummonBanners/DownloadSummonBannerAtlas9,,1
ef1f4c33138334e9b4f10a20af70550baea27d22,SYSTEM,179872,3445497508,Terminal/EarthCore/01,,
cfbe57bcd7e22ddb8f6bc92bf8717cc54eeb916f,SYSTEM,98048,4019650252,Terminal/EarthCore/02,,
diff --git a/gamedatatop.json b/gamedatatop.json
index 88d090749..fb6bdc310 100644
--- a/gamedatatop.json
+++ b/gamedatatop.json
@@ -2,7 +2,7 @@
"response": [{
"resCode": "00",
"success": {
- "version": 735,
+ "version": 737,
"master": "",
"useProtoBuf": 1,
"isCloseSvtGetEffect": "0000",
@@ -15,7 +15,7 @@
"FixVersion_iOS": 0,
"voiceLabelSet": 1,
"npVoiceLabelSet": 1,
- "assetStorageVersion": 202307071736
+ "assetStorageVersion": 202307181910
},
"fail": {},
"nid": "gamedata"
diff --git a/master/mstBanner.json b/master/mstBanner.json
index 5c2d3abd2..67512ac33 100644
--- a/master/mstBanner.json
+++ b/master/mstBanner.json
@@ -94,4 +94,76 @@
"deviceType": 0,
"dialogImage": "0",
"dialogText": "0"
+}, {
+ "id": 80573,
+ "bannerId": 80573,
+ "bannerPriority": 9,
+ "terminalBannerPriority": 9,
+ "noticeAt": 1689832800,
+ "finishedAt": 1690901999,
+ "linkType": 1,
+ "linkBody": "https://line3-patch-fate.bilibiligame.net/manage/html/Notice/Game/ios/2023-07-10/activityNotice_5021_1689315462.html",
+ "deviceType": 0,
+ "dialogImage": "0",
+ "dialogText": "0"
+}, {
+ "id": 80574,
+ "bannerId": 80574,
+ "bannerPriority": 10,
+ "terminalBannerPriority": 10,
+ "noticeAt": 1689832800,
+ "finishedAt": 1690178399,
+ "linkType": 1,
+ "linkBody": "https://line3-patch-fate.bilibiligame.net/manage/html/Notice/Game/ios/2023-07-10/activityNotice_5022_1689583276.html",
+ "deviceType": 0,
+ "dialogImage": "0",
+ "dialogText": "0"
+}, {
+ "id": 80575,
+ "bannerId": 80575,
+ "bannerPriority": 11,
+ "terminalBannerPriority": 11,
+ "noticeAt": 1690016400,
+ "finishedAt": 1690351199,
+ "linkType": 1,
+ "linkBody": "https://line3-patch-fate.bilibiligame.net/manage/html/Notice/Game/ios/2023-07-10/activityNotice_5022_1689583276.html",
+ "deviceType": 0,
+ "dialogImage": "0",
+ "dialogText": "0"
+}, {
+ "id": 80576,
+ "bannerId": 80576,
+ "bannerPriority": 12,
+ "terminalBannerPriority": 12,
+ "noticeAt": 1690189200,
+ "finishedAt": 1690523999,
+ "linkType": 1,
+ "linkBody": "https://line3-patch-fate.bilibiligame.net/manage/html/Notice/Game/ios/2023-07-10/activityNotice_5022_1689583276.html",
+ "deviceType": 0,
+ "dialogImage": "0",
+ "dialogText": "0"
+}, {
+ "id": 80577,
+ "bannerId": 80577,
+ "bannerPriority": 13,
+ "terminalBannerPriority": 13,
+ "noticeAt": 1690362000,
+ "finishedAt": 1690610399,
+ "linkType": 1,
+ "linkBody": "https://line3-patch-fate.bilibiligame.net/manage/html/Notice/Game/ios/2023-07-10/activityNotice_5022_1689583276.html",
+ "deviceType": 0,
+ "dialogImage": "0",
+ "dialogText": "0"
+}, {
+ "id": 80578,
+ "bannerId": 80578,
+ "bannerPriority": 14,
+ "terminalBannerPriority": 14,
+ "noticeAt": 1690448400,
+ "finishedAt": 1690901999,
+ "linkType": 1,
+ "linkBody": "https://line3-patch-fate.bilibiligame.net/manage/html/Notice/Game/ios/2023-07-10/activityNotice_5022_1689583276.html",
+ "deviceType": 0,
+ "dialogImage": "0",
+ "dialogText": "0"
}]
\ No newline at end of file
diff --git a/master/mstConstant.json b/master/mstConstant.json
index af4a31a40..6a820c53b 100644
--- a/master/mstConstant.json
+++ b/master/mstConstant.json
@@ -111,7 +111,7 @@
"value": 100
}, {
"name": "COMEBACK_TARGET_DAY",
- "value": 1669838400
+ "value": 1687464000
}, {
"name": "COMMAND_ARTS",
"value": 4001
diff --git a/master/mstEvent.json b/master/mstEvent.json
index 0c7b5752a..39debc25d 100644
--- a/master/mstEvent.json
+++ b/master/mstEvent.json
@@ -1413,8 +1413,33 @@
"intervalHours": 0,
"noticeAt": 1688155200,
"startedAt": 1688155200,
- "endedAt": 1690747199,
- "finishedAt": 1690747199,
+ "endedAt": 1690833599,
+ "finishedAt": 1690833599,
+ "materialOpenedAt": 2145888000,
+ "linkType": 1,
+ "linkBody": "/summon/detail_summon_1.html",
+ "deviceType": 0,
+ "myroomBgId": 0,
+ "myroomBgmId": 0,
+ "script": [],
+ "shortName": ""
+}, {
+ "id": 65,
+ "baseEventId": 0,
+ "type": 4,
+ "openType": 1,
+ "name": "登录奖励",
+ "detail": "2023年8月登录奖励",
+ "noticeBannerId": 0,
+ "bannerId": 0,
+ "iconId": 0,
+ "bannerPriority": 19,
+ "openHours": 0,
+ "intervalHours": 0,
+ "noticeAt": 1690833600,
+ "startedAt": 1690833600,
+ "endedAt": 1693511999,
+ "finishedAt": 1693511999,
"materialOpenedAt": 2145888000,
"linkType": 1,
"linkBody": "/summon/detail_summon_1.html",
@@ -7473,6 +7498,56 @@
"myroomBgmId": 0,
"script": [],
"shortName": ""
+}, {
+ "id": 10398,
+ "baseEventId": 0,
+ "type": 21,
+ "openType": 1,
+ "name": "7周年倒计时纪念活动\n回归连续登录奖励",
+ "detail": "举办期间，可获得每日1次，最多7次的回归连续登录奖励作为礼物！",
+ "noticeBannerId": 0,
+ "bannerId": 0,
+ "iconId": 0,
+ "bannerPriority": 0,
+ "openHours": 0,
+ "intervalHours": 0,
+ "noticeAt": 1689883200,
+ "startedAt": 1689883200,
+ "endedAt": 1693425599,
+ "finishedAt": 1693425599,
+ "materialOpenedAt": 2145888000,
+ "linkType": 1,
+ "linkBody": "/summon/detail_summon_1.html",
+ "deviceType": 0,
+ "myroomBgId": 0,
+ "myroomBgmId": 0,
+ "script": [],
+ "shortName": ""
+}, {
+ "id": 10399,
+ "baseEventId": 0,
+ "type": 10,
+ "openType": 1,
+ "name": "7周年倒计时纪念活动\n特别登录奖励",
+ "detail": "举办期间，可获得每日1次，最多7次的登录奖励作为礼物！",
+ "noticeBannerId": 0,
+ "bannerId": 0,
+ "iconId": 0,
+ "bannerPriority": 0,
+ "openHours": 0,
+ "intervalHours": 0,
+ "noticeAt": 1689883200,
+ "startedAt": 1689883200,
+ "endedAt": 1690487999,
+ "finishedAt": 1690487999,
+ "materialOpenedAt": 2145888000,
+ "linkType": 1,
+ "linkBody": "/summon/detail_summon_1.html",
+ "deviceType": 0,
+ "myroomBgId": 0,
+ "myroomBgmId": 0,
+ "script": [],
+ "shortName": ""
}, {
"id": 10400,
"baseEventId": 0,
@@ -11983,6 +12058,56 @@
"intervalHours": 0,
"noticeAt": 1682798400,
"startedAt": 1682798400,
+ "endedAt": 1689883199,
+ "finishedAt": 1689883199,
+ "materialOpenedAt": 2145888000,
+ "linkType": 1,
+ "linkBody": "/summon/detail_summon_1.html",
+ "deviceType": 0,
+ "myroomBgId": 0,
+ "myroomBgmId": 0,
+ "script": [],
+ "shortName": ""
+}, {
+ "id": 40024,
+ "baseEventId": 0,
+ "type": 18,
+ "openType": 1,
+ "name": "7周年倒计时纪念活动\n限时第7日报酬2倍 累计登录奖励",
+ "detail": "举办期间，累计登录第7日全部报酬为平日2倍！",
+ "noticeBannerId": 0,
+ "bannerId": 0,
+ "iconId": 0,
+ "bannerPriority": 0,
+ "openHours": 0,
+ "intervalHours": 0,
+ "noticeAt": 1689883200,
+ "startedAt": 1689883200,
+ "endedAt": 1693425599,
+ "finishedAt": 1693425599,
+ "materialOpenedAt": 2145888000,
+ "linkType": 1,
+ "linkBody": "/summon/detail_summon_1.html",
+ "deviceType": 0,
+ "myroomBgId": 0,
+ "myroomBgmId": 0,
+ "script": [],
+ "shortName": ""
+}, {
+ "id": 40025,
+ "baseEventId": 0,
+ "type": 18,
+ "openType": 1,
+ "name": "累计登录奖励",
+ "detail": "累计登录奖励",
+ "noticeBannerId": 0,
+ "bannerId": 0,
+ "iconId": 0,
+ "bannerPriority": 0,
+ "openHours": 0,
+ "intervalHours": 0,
+ "noticeAt": 1693425600,
+ "startedAt": 1693425600,
"endedAt": 2145888000,
"finishedAt": 2145888000,
"materialOpenedAt": 2145888000,
@@ -20057,6 +20182,31 @@
"myroomBgmId": 0,
"script": [],
"shortName": ""
+}, {
+ "id": 80390,
+ "baseEventId": 0,
+ "type": 12,
+ "openType": 1,
+ "name": "狩猎关卡 第12弹 ～7周年倒计时狩猎～",
+ "detail": "狩猎关卡 第12弹 ～7周年倒计时狩猎～",
+ "noticeBannerId": 0,
+ "bannerId": 80380,
+ "iconId": 80380,
+ "bannerPriority": 905000,
+ "openHours": 0,
+ "intervalHours": 0,
+ "noticeAt": 1689832800,
+ "startedAt": 1689832800,
+ "endedAt": 1690901999,
+ "finishedAt": 1690901999,
+ "materialOpenedAt": 2145888000,
+ "linkType": 1,
+ "linkBody": "/summon/detail_summon_1.html",
+ "deviceType": 0,
+ "myroomBgId": 0,
+ "myroomBgmId": 0,
+ "script": [],
+ "shortName": ""
}, {
"id": 80392,
"baseEventId": 0,
diff --git a/master/mstEventMission.json b/master/mstEventMission.json
index ec004c040..b07ce5127 100644
--- a/master/mstEventMission.json
+++ b/master/mstEventMission.json
@@ -19440,129 +19440,129 @@
"type": 5
}, {
"bannerGroup": 0,
- "closedAt": 2145888000,
- "detail": "通关7/21(周五)17:00～7/22(周六)16:59\n出现的任意狩猎任务1次",
+ "closedAt": 1691819999,
+ "detail": "通关7/20(周四)17:00～7/21(周五)16:59\n出现的任意狩猎任务1次",
"dispNo": 1,
- "endedAt": 2145888000,
+ "endedAt": 1689929999,
"flag": 64,
"giftId": 41134,
"id": 1033027,
"missionTargetId": 200112,
- "name": "通关7/21(周五)17:00～7/22(周六)16:59\n出现的任意狩猎任务1次",
+ "name": "通关7/20(周四)17:00～7/21(周五)16:59\n出现的任意狩猎任务1次",
"notfyPriority": 8,
"presentMessageId": 1319,
"priority": 1000341,
"rewardRarity": 0,
"rewardType": 1,
- "startedAt": 2145888000,
+ "startedAt": 1689832800,
"type": 5
}, {
"bannerGroup": 0,
- "closedAt": 2145888000,
- "detail": "通关7/22(周六)17:00～7/23(周日)16:59\n出现的任意狩猎任务1次",
+ "closedAt": 1691819999,
+ "detail": "通关7/21(周五)17:00～7/22(周六)16:59\n出现的任意狩猎任务1次",
"dispNo": 2,
- "endedAt": 2145888000,
+ "endedAt": 1690016399,
"flag": 64,
"giftId": 41134,
"id": 1033028,
"missionTargetId": 200112,
- "name": "通关7/22(周六)17:00～7/23(周日)16:59\n出现的任意狩猎任务1次",
+ "name": "通关7/21(周五)17:00～7/22(周六)16:59\n出现的任意狩猎任务1次",
"notfyPriority": 9,
"presentMessageId": 1319,
"priority": 1000342,
"rewardRarity": 0,
"rewardType": 1,
- "startedAt": 2145888000,
+ "startedAt": 1689832800,
"type": 5
}, {
"bannerGroup": 0,
- "closedAt": 2145888000,
- "detail": "通关7/23(周日)17:00～7/24(周一)16:59\n出现的任意狩猎任务1次",
+ "closedAt": 1691819999,
+ "detail": "通关7/22(周六)17:00～7/23(周日)16:59\n出现的任意狩猎任务1次",
"dispNo": 3,
- "endedAt": 2145888000,
+ "endedAt": 1690102799,
"flag": 64,
"giftId": 41134,
"id": 1033029,
"missionTargetId": 200112,
- "name": "通关7/23(周日)17:00～7/24(周一)16:59\n出现的任意狩猎任务1次",
+ "name": "通关7/22(周六)17:00～7/23(周日)16:59\n出现的任意狩猎任务1次",
"notfyPriority": 10,
"presentMessageId": 1319,
"priority": 1000343,
"rewardRarity": 0,
"rewardType": 1,
- "startedAt": 2145888000,
+ "startedAt": 1689832800,
"type": 5
}, {
"bannerGroup": 0,
- "closedAt": 2145888000,
- "detail": "通关7/24(周一)17:00～7/25(周二)16:59\n出现的任意狩猎任务1次",
+ "closedAt": 1691819999,
+ "detail": "通关7/23(周日)17:00～7/24(周一)16:59\n出现的任意狩猎任务1次",
"dispNo": 4,
- "endedAt": 2145888000,
+ "endedAt": 1690189199,
"flag": 64,
"giftId": 41134,
"id": 1033030,
"missionTargetId": 200112,
- "name": "通关7/24(周一)17:00～7/25(周二)16:59\n出现的任意狩猎任务1次",
+ "name": "通关7/23(周日)17:00～7/24(周一)16:59\n出现的任意狩猎任务1次",
"notfyPriority": 11,
"presentMessageId": 1319,
"priority": 1000344,
"rewardRarity": 0,
"rewardType": 1,
- "startedAt": 2145888000,
+ "startedAt": 1689832800,
"type": 5
}, {
"bannerGroup": 0,
- "closedAt": 2145888000,
- "detail": "通关7/25(周二)17:00～7/26(周三)16:59\n出现的任意狩猎任务1次",
+ "closedAt": 1691819999,
+ "detail": "通关7/24(周一)17:00～7/25(周二)16:59\n出现的任意狩猎任务1次",
"dispNo": 5,
- "endedAt": 2145888000,
+ "endedAt": 1690275599,
"flag": 64,
"giftId": 41134,
"id": 1033031,
"missionTargetId": 200112,
- "name": "通关7/25(周二)17:00～7/26(周三)16:59\n出现的任意狩猎任务1次",
+ "name": "通关7/24(周一)17:00～7/25(周二)16:59\n出现的任意狩猎任务1次",
"notfyPriority": 12,
"presentMessageId": 1319,
"priority": 1000345,
"rewardRarity": 0,
"rewardType": 1,
- "startedAt": 2145888000,
+ "startedAt": 1689832800,
"type": 5
}, {
"bannerGroup": 0,
- "closedAt": 2145888000,
- "detail": "通关7/26(周三)17:00～7/27(周四)16:59\n出现的任意狩猎任务1次",
+ "closedAt": 1691819999,
+ "detail": "通关7/25(周二)17:00～7/26(周三)16:59\n出现的任意狩猎任务1次",
"dispNo": 6,
- "endedAt": 2145888000,
+ "endedAt": 1690361999,
"flag": 64,
"giftId": 41134,
"id": 1033032,
"missionTargetId": 200112,
- "name": "通关7/26(周三)17:00～7/27(周四)16:59\n出现的任意狩猎任务1次",
+ "name": "通关7/25(周二)17:00～7/26(周三)16:59\n出现的任意狩猎任务1次",
"notfyPriority": 13,
"presentMessageId": 1319,
"priority": 1000346,
"rewardRarity": 0,
"rewardType": 1,
- "startedAt": 2145888000,
+ "startedAt": 1689832800,
"type": 5
}, {
"bannerGroup": 0,
- "closedAt": 2145888000,
- "detail": "通关7/27(周四)17:00～7/28(周五)16:59\n出现的任意狩猎任务1次",
+ "closedAt": 1691819999,
+ "detail": "通关7/26(周三)17:00～8/1(周二)22:59\n出现的任意狩猎任务1次",
"dispNo": 7,
- "endedAt": 2145888000,
+ "endedAt": 1690901999,
"flag": 64,
"giftId": 41134,
"id": 1033033,
"missionTargetId": 200112,
- "name": "通关7/27(周四)17:00～7/28(周五)16:59\n出现的任意狩猎任务1次",
+ "name": "通关7/26(周三)17:00～8/1(周二)22:59\n出现的任意狩猎任务1次",
"notfyPriority": 14,
"presentMessageId": 1319,
"priority": 1000347,
"rewardRarity": 0,
"rewardType": 1,
- "startedAt": 2145888000,
+ "startedAt": 1689832800,
"type": 5
}, {
"bannerGroup": 8038601,
@@ -58896,10 +58896,10 @@
"type": 2
}, {
"bannerGroup": 0,
- "closedAt": 2145888000,
+ "closedAt": 1691337599,
"detail": "完成本周所有的御主任务",
"dispNo": 1,
- "endedAt": 2145888000,
+ "endedAt": 1690732799,
"flag": 0,
"giftId": 419,
"id": 2002177,
@@ -58910,14 +58910,14 @@
"priority": 2001520,
"rewardRarity": 0,
"rewardType": 1,
- "startedAt": 2145888000,
+ "startedAt": 1690128000,
"type": 2
}, {
"bannerGroup": 0,
- "closedAt": 2145888000,
+ "closedAt": 1691337599,
"detail": "击败3骑持有『秩序』属性的从者(战斗中被召唤出来的敌人除外)",
"dispNo": 2,
- "endedAt": 2145888000,
+ "endedAt": 1690732799,
"flag": 0,
"giftId": 419,
"id": 2002178,
@@ -58928,14 +58928,14 @@
"priority": 2001521,
"rewardRarity": 0,
"rewardType": 1,
- "startedAt": 2145888000,
+ "startedAt": 1690128000,
"type": 2
}, {
"bannerGroup": 0,
- "closedAt": 2145888000,
+ "closedAt": 1691337599,
"detail": "击败15个持有『人型』特性的敌人(战斗中被召唤出来的敌人除外)",
"dispNo": 3,
- "endedAt": 2145888000,
+ "endedAt": 1690732799,
"flag": 0,
"giftId": 419,
"id": 2002179,
@@ -58946,14 +58946,14 @@
"priority": 2001522,
"rewardRarity": 0,
"rewardType": 1,
- "startedAt": 2145888000,
+ "startedAt": 1690128000,
"type": 2
}, {
"bannerGroup": 0,
- "closedAt": 2145888000,
+ "closedAt": 1691337599,
"detail": "击败15个持有『猛兽』特性的敌人(战斗中被召唤出来的敌人除外)",
"dispNo": 4,
- "endedAt": 2145888000,
+ "endedAt": 1690732799,
"flag": 0,
"giftId": 419,
"id": 2002180,
@@ -58964,14 +58964,14 @@
"priority": 2001523,
"rewardRarity": 0,
"rewardType": 1,
- "startedAt": 2145888000,
+ "startedAt": 1690128000,
"type": 2
}, {
"bannerGroup": 0,
- "closedAt": 2145888000,
+ "closedAt": 1691337599,
"detail": "击败15个持有『魔性』特性的敌人(战斗中被召唤出来的敌人除外)",
"dispNo": 5,
- "endedAt": 2145888000,
+ "endedAt": 1690732799,
"flag": 0,
"giftId": 419,
"id": 2002181,
@@ -58982,14 +58982,14 @@
"priority": 2001524,
"rewardRarity": 0,
"rewardType": 1,
- "startedAt": 2145888000,
+ "startedAt": 1690128000,
"type": 2
}, {
"bannerGroup": 0,
- "closedAt": 2145888000,
+ "closedAt": 1691337599,
"detail": "完成任意关卡5次",
"dispNo": 6,
- "endedAt": 2145888000,
+ "endedAt": 1690732799,
"flag": 0,
"giftId": 419,
"id": 2002182,
@@ -59000,14 +59000,14 @@
"priority": 2001525,
"rewardRarity": 0,
"rewardType": 1,
- "startedAt": 2145888000,
+ "startedAt": 1690128000,
"type": 2
}, {
"bannerGroup": 0,
- "closedAt": 2145888000,
+ "closedAt": 1691337599,
"detail": "完成任意关卡10次",
"dispNo": 7,
- "endedAt": 2145888000,
+ "endedAt": 1690732799,
"flag": 0,
"giftId": 419,
"id": 2002183,
@@ -59018,14 +59018,14 @@
"priority": 2001526,
"rewardRarity": 0,
"rewardType": 1,
- "startedAt": 2145888000,
+ "startedAt": 1690128000,
"type": 2
}, {
"bannerGroup": 0,
- "closedAt": 2145888000,
+ "closedAt": 1691942399,
"detail": "完成本周所有的御主任务",
"dispNo": 1,
- "endedAt": 2145888000,
+ "endedAt": 1691337599,
"flag": 0,
"giftId": 419,
"id": 2002184,
@@ -59036,14 +59036,14 @@
"priority": 2001527,
"rewardRarity": 0,
"rewardType": 1,
- "startedAt": 2145888000,
+ "startedAt": 1690732800,
"type": 2
}, {
"bannerGroup": 0,
- "closedAt": 2145888000,
+ "closedAt": 1691942399,
"detail": "击败5骑从者(战斗中被召唤出来的敌人除外)",
"dispNo": 2,
- "endedAt": 2145888000,
+ "endedAt": 1691337599,
"flag": 0,
"giftId": 419,
"id": 2002185,
@@ -59054,14 +59054,14 @@
"priority": 2001528,
"rewardRarity": 0,
"rewardType": 1,
- "startedAt": 2145888000,
+ "startedAt": 1690732800,
"type": 2
}, {
"bannerGroup": 0,
- "closedAt": 2145888000,
+ "closedAt": 1691942399,
"detail": "击败10骑从者(战斗中被召唤出来的敌人除外)",
"dispNo": 3,
- "endedAt": 2145888000,
+ "endedAt": 1691337599,
"flag": 0,
"giftId": 419,
"id": 2002186,
@@ -59072,14 +59072,14 @@
"priority": 2001529,
"rewardRarity": 0,
"rewardType": 1,
- "startedAt": 2145888000,
+ "startedAt": 1690732800,
"type": 2
}, {
"bannerGroup": 0,
- "closedAt": 2145888000,
+ "closedAt": 1691942399,
"detail": "击败『剑士』『魔术师』职阶中任意一种敌人15个(战斗中被召唤出来的敌人除外)",
"dispNo": 4,
- "endedAt": 2145888000,
+ "endedAt": 1691337599,
"flag": 0,
"giftId": 419,
"id": 2002187,
@@ -59090,14 +59090,14 @@
"priority": 2001530,
"rewardRarity": 0,
"rewardType": 1,
- "startedAt": 2145888000,
+ "startedAt": 1690732800,
"type": 2
}, {
"bannerGroup": 0,
- "closedAt": 2145888000,
+ "closedAt": 1691942399,
"detail": "击败『弓兵』『暗匿者』职阶中任意一种敌人15个(战斗中被召唤出来的敌人除外)",
"dispNo": 5,
- "endedAt": 2145888000,
+ "endedAt": 1691337599,
"flag": 0,
"giftId": 419,
"id": 2002188,
@@ -59108,14 +59108,14 @@
"priority": 2001531,
"rewardRarity": 0,
"rewardType": 1,
- "startedAt": 2145888000,
+ "startedAt": 1690732800,
"type": 2
}, {
"bannerGroup": 0,
- "closedAt": 2145888000,
+ "closedAt": 1691942399,
"detail": "击败『枪兵』『骑兵』『狂战士』职阶中任意一种敌人15个(战斗中被召唤出来的敌人除外)",
"dispNo": 6,
- "endedAt": 2145888000,
+ "endedAt": 1691337599,
"flag": 0,
"giftId": 419,
"id": 2002189,
@@ -59126,14 +59126,14 @@
"priority": 2001532,
"rewardRarity": 0,
"rewardType": 1,
- "startedAt": 2145888000,
+ "startedAt": 1690732800,
"type": 2
}, {
"bannerGroup": 0,
- "closedAt": 2145888000,
+ "closedAt": 1691942399,
"detail": "击败15个持有『天』之力的敌人(战斗中被召唤出来的敌人除外)",
"dispNo": 7,
- "endedAt": 2145888000,
+ "endedAt": 1691337599,
"flag": 0,
"giftId": 419,
"id": 2002190,
@@ -59144,7 +59144,7 @@
"priority": 2001533,
"rewardRarity": 0,
"rewardType": 1,
- "startedAt": 2145888000,
+ "startedAt": 1690732800,
"type": 2
}, {
"bannerGroup": 0,
diff --git a/master/mstEventMissionCondition.json b/master/mstEventMissionCondition.json
index 9548a708f..291b897fe 100644
--- a/master/mstEventMissionCondition.json
+++ b/master/mstEventMissionCondition.json
@@ -25144,7 +25144,7 @@
"closedMessage": "",
"condGroup": 1,
"condType": 12,
- "conditionMessage": "通关7/21(周五)17:00～7/22(周六)16:59\n出现的任意狩猎任务1次",
+ "conditionMessage": "通关7/20(周四)17:00～7/21(周五)16:59\n出现的任意狩猎任务1次",
"flag": 64,
"id": 10926,
"missionId": 1033027,
@@ -25152,12 +25152,12 @@
"missionTargetId": 200112,
"priority": 0,
"targetIds": [0],
- "targetNum": 1658394000
+ "targetNum": 1689843600
}, {
"closedMessage": "",
"condGroup": 1,
"condType": 1,
- "conditionMessage": "通关7/21(周五)17:00～7/22(周六)16:59\n出现的任意狩猎任务1次",
+ "conditionMessage": "通关7/20(周四)17:00～7/21(周五)16:59\n出现的任意狩猎任务1次",
"flag": 0,
"id": 10927,
"missionId": 1033027,
@@ -25170,7 +25170,7 @@
"closedMessage": "",
"condGroup": 1,
"condType": 12,
- "conditionMessage": "通关7/22(周六)17:00～7/23(周日)16:59\n出现的任意狩猎任务1次",
+ "conditionMessage": "通关7/21(周五)17:00～7/22(周六)16:59\n出现的任意狩猎任务1次",
"flag": 64,
"id": 10928,
"missionId": 1033028,
@@ -25178,12 +25178,12 @@
"missionTargetId": 200112,
"priority": 0,
"targetIds": [0],
- "targetNum": 1658480400
+ "targetNum": 1689930000
}, {
"closedMessage": "",
"condGroup": 1,
"condType": 1,
- "conditionMessage": "通关7/22(周六)17:00～7/23(周日)16:59\n出现的任意狩猎任务1次",
+ "conditionMessage": "通关7/21(周五)17:00～7/22(周六)16:59\n出现的任意狩猎任务1次",
"flag": 0,
"id": 10929,
"missionId": 1033028,
@@ -25196,7 +25196,7 @@
"closedMessage": "",
"condGroup": 1,
"condType": 12,
- "conditionMessage": "通关7/23(周日)17:00～7/24(周一)16:59\n出现的任意狩猎任务1次",
+ "conditionMessage": "通关7/22(周六)17:00～7/23(周日)16:59\n出现的任意狩猎任务1次",
"flag": 64,
"id": 10930,
"missionId": 1033029,
@@ -25204,12 +25204,12 @@
"missionTargetId": 200112,
"priority": 0,
"targetIds": [0],
- "targetNum": 1658566800
+ "targetNum": 1690016400
}, {
"closedMessage": "",
"condGroup": 1,
"condType": 1,
- "conditionMessage": "通关7/23(周日)17:00～7/24(周一)16:59\n出现的任意狩猎任务1次",
+ "conditionMessage": "通关7/22(周六)17:00～7/23(周日)16:59\n出现的任意狩猎任务1次",
"flag": 0,
"id": 10931,
"missionId": 1033029,
@@ -25222,7 +25222,7 @@
"closedMessage": "",
"condGroup": 1,
"condType": 12,
- "conditionMessage": "通关7/24(周一)17:00～7/25(周二)16:59\n出现的任意狩猎任务1次",
+ "conditionMessage": "通关7/23(周日)17:00～7/24(周一)16:59\n出现的任意狩猎任务1次",
"flag": 64,
"id": 10932,
"missionId": 1033030,
@@ -25230,12 +25230,12 @@
"missionTargetId": 200112,
"priority": 0,
"targetIds": [0],
- "targetNum": 1658653200
+ "targetNum": 1690102800
}, {
"closedMessage": "",
"condGroup": 1,
"condType": 1,
- "conditionMessage": "通关7/24(周一)17:00～7/25(周二)16:59\n出现的任意狩猎任务1次",
+ "conditionMessage": "通关7/23(周日)17:00～7/24(周一)16:59\n出现的任意狩猎任务1次",
"flag": 0,
"id": 10933,
"missionId": 1033030,
@@ -25248,7 +25248,7 @@
"closedMessage": "",
"condGroup": 1,
"condType": 12,
- "conditionMessage": "通关7/25(周二)17:00～7/26(周三)16:59\n出现的任意狩猎任务1次",
+ "conditionMessage": "通关7/24(周一)17:00～7/25(周二)16:59\n出现的任意狩猎任务1次",
"flag": 64,
"id": 10934,
"missionId": 1033031,
@@ -25256,12 +25256,12 @@
"missionTargetId": 200112,
"priority": 0,
"targetIds": [0],
- "targetNum": 1658739600
+ "targetNum": 1690189200
}, {
"closedMessage": "",
"condGroup": 1,
"condType": 1,
- "conditionMessage": "通关7/25(周二)17:00～7/26(周三)16:59\n出现的任意狩猎任务1次",
+ "conditionMessage": "通关7/24(周一)17:00～7/25(周二)16:59\n出现的任意狩猎任务1次",
"flag": 0,
"id": 10935,
"missionId": 1033031,
@@ -25274,7 +25274,7 @@
"closedMessage": "",
"condGroup": 1,
"condType": 12,
- "conditionMessage": "通关7/26(周三)17:00～7/27(周四)16:59\n出现的任意狩猎任务1次",
+ "conditionMessage": "通关7/25(周二)17:00～7/26(周三)16:59\n出现的任意狩猎任务1次",
"flag": 64,
"id": 10936,
"missionId": 1033032,
@@ -25282,12 +25282,12 @@
"missionTargetId": 200112,
"priority": 0,
"targetIds": [0],
- "targetNum": 1658826000
+ "targetNum": 1690275600
}, {
"closedMessage": "",
"condGroup": 1,
"condType": 1,
- "conditionMessage": "通关7/26(周三)17:00～7/27(周四)16:59\n出现的任意狩猎任务1次",
+ "conditionMessage": "通关7/25(周二)17:00～7/26(周三)16:59\n出现的任意狩猎任务1次",
"flag": 0,
"id": 10937,
"missionId": 1033032,
@@ -25300,7 +25300,7 @@
"closedMessage": "",
"condGroup": 1,
"condType": 12,
- "conditionMessage": "通关7/27(周四)17:00～7/28(周五)16:59\n出现的任意狩猎任务1次",
+ "conditionMessage": "通关7/26(周三)17:00～8/1(周二)22:59\n出现的任意狩猎任务1次",
"flag": 64,
"id": 10938,
"missionId": 1033033,
@@ -25308,12 +25308,12 @@
"missionTargetId": 200112,
"priority": 0,
"targetIds": [0],
- "targetNum": 1658912400
+ "targetNum": 1690362000
}, {
"closedMessage": "",
"condGroup": 1,
"condType": 1,
- "conditionMessage": "通关7/27(周四)17:00～7/28(周五)16:59\n出现的任意狩猎任务1次",
+ "conditionMessage": "通关7/26(周三)17:00～8/1(周二)22:59\n出现的任意狩猎任务1次",
"flag": 0,
"id": 10939,
"missionId": 1033033,
diff --git a/master/mstGacha.json b/master/mstGacha.json
index 55de5c8dd..d5617ee51 100644
--- a/master/mstGacha.json
+++ b/master/mstGacha.json
@@ -1408,7 +1408,7 @@
"adjustId": 0,
"bannerQuestId": 1000002,
"bannerQuestPhase": 1,
- "baseId": 10022,
+ "baseId": 10023,
"beforeDrawNum": 1,
"beforeGachaId": 101,
"closedAt": 2145888000,
@@ -68670,4 +68670,189 @@
"type": 1,
"warId": 100,
"flag": 2
+}, {
+ "adjustId": 50008631,
+ "bannerQuestId": 1000002,
+ "bannerQuestPhase": 1,
+ "baseId": 10023,
+ "beforeDrawNum": 1,
+ "beforeGachaId": 101,
+ "closedAt": 1690178399,
+ "condQuestId": 1000002,
+ "condQuestPhase": 1,
+ "detailUrl": "",
+ "drawNum1": 1,
+ "drawNum2": 11,
+ "extraAddCount1": 1,
+ "extraAddCount2": 0,
+ "extraGroupId1": 245,
+ "extraGroupId2": 0,
+ "freeDrawFlag": 0,
+ "gachaGroupId": 0,
+ "gachaProbabilityId": 5002417,
+ "gachaSlot": 36,
+ "id": 5002417,
+ "imageId": 81929,
+ "maxDrawNum": 0,
+ "name": "7周年倒计时推荐召唤",
+ "openedAt": 1689832800,
+ "pickupClosedAt": 1690178399,
+ "pickupId": 50011112,
+ "pickupOpenedAt": 1689832800,
+ "priority": 5002417,
+ "rarityId": 3,
+ "shopId1": 4,
+ "shopId2": 5,
+ "ticketItemId": 4001,
+ "type": 1,
+ "warId": 100,
+ "flag": 2
+}, {
+ "adjustId": 50008641,
+ "bannerQuestId": 1000002,
+ "bannerQuestPhase": 1,
+ "baseId": 10023,
+ "beforeDrawNum": 1,
+ "beforeGachaId": 101,
+ "closedAt": 1690351199,
+ "condQuestId": 1000002,
+ "condQuestPhase": 1,
+ "detailUrl": "",
+ "drawNum1": 1,
+ "drawNum2": 11,
+ "extraAddCount1": 1,
+ "extraAddCount2": 0,
+ "extraGroupId1": 246,
+ "extraGroupId2": 0,
+ "freeDrawFlag": 0,
+ "gachaGroupId": 0,
+ "gachaProbabilityId": 5002418,
+ "gachaSlot": 37,
+ "id": 5002418,
+ "imageId": 81930,
+ "maxDrawNum": 0,
+ "name": "7周年倒计时推荐召唤",
+ "openedAt": 1690016400,
+ "pickupClosedAt": 1690351199,
+ "pickupId": 50011122,
+ "pickupOpenedAt": 1690016400,
+ "priority": 5002418,
+ "rarityId": 3,
+ "shopId1": 4,
+ "shopId2": 5,
+ "ticketItemId": 4001,
+ "type": 1,
+ "warId": 100,
+ "flag": 2
+}, {
+ "adjustId": 50008651,
+ "bannerQuestId": 1000002,
+ "bannerQuestPhase": 1,
+ "baseId": 10023,
+ "beforeDrawNum": 1,
+ "beforeGachaId": 101,
+ "closedAt": 1690523999,
+ "condQuestId": 1000002,
+ "condQuestPhase": 1,
+ "detailUrl": "",
+ "drawNum1": 1,
+ "drawNum2": 11,
+ "extraAddCount1": 1,
+ "extraAddCount2": 0,
+ "extraGroupId1": 247,
+ "extraGroupId2": 0,
+ "freeDrawFlag": 0,
+ "gachaGroupId": 0,
+ "gachaProbabilityId": 5002419,
+ "gachaSlot": 38,
+ "id": 5002419,
+ "imageId": 81931,
+ "maxDrawNum": 0,
+ "name": "7周年倒计时推荐召唤",
+ "openedAt": 1690189200,
+ "pickupClosedAt": 1690523999,
+ "pickupId": 50011132,
+ "pickupOpenedAt": 1690189200,
+ "priority": 5002419,
+ "rarityId": 3,
+ "shopId1": 4,
+ "shopId2": 5,
+ "ticketItemId": 4001,
+ "type": 1,
+ "warId": 100,
+ "flag": 2
+}, {
+ "adjustId": 50008661,
+ "bannerQuestId": 1000002,
+ "bannerQuestPhase": 1,
+ "baseId": 10023,
+ "beforeDrawNum": 1,
+ "beforeGachaId": 101,
+ "closedAt": 1690696799,
+ "condQuestId": 1000002,
+ "condQuestPhase": 1,
+ "detailUrl": "",
+ "drawNum1": 1,
+ "drawNum2": 11,
+ "extraAddCount1": 1,
+ "extraAddCount2": 0,
+ "extraGroupId1": 248,
+ "extraGroupId2": 0,
+ "freeDrawFlag": 0,
+ "gachaGroupId": 0,
+ "gachaProbabilityId": 5002420,
+ "gachaSlot": 39,
+ "id": 5002420,
+ "imageId": 81932,
+ "maxDrawNum": 0,
+ "name": "7周年倒计时推荐召唤",
+ "openedAt": 1690362000,
+ "pickupClosedAt": 1690696799,
+ "pickupId": 50011142,
+ "pickupOpenedAt": 1690362000,
+ "priority": 5002420,
+ "rarityId": 3,
+ "shopId1": 4,
+ "shopId2": 5,
+ "ticketItemId": 4001,
+ "type": 1,
+ "warId": 100,
+ "flag": 2
+}, {
+ "adjustId": 50008671,
+ "bannerQuestId": 1000002,
+ "bannerQuestPhase": 1,
+ "baseId": 10023,
+ "beforeDrawNum": 1,
+ "beforeGachaId": 101,
+ "closedAt": 1690901999,
+ "condQuestId": 1000002,
+ "condQuestPhase": 1,
+ "detailUrl": "",
+ "drawNum1": 1,
+ "drawNum2": 11,
+ "extraAddCount1": 1,
+ "extraAddCount2": 0,
+ "extraGroupId1": 249,
+ "extraGroupId2": 0,
+ "freeDrawFlag": 0,
+ "gachaGroupId": 0,
+ "gachaProbabilityId": 5002421,
+ "gachaSlot": 40,
+ "id": 5002421,
+ "imageId": 81933,
+ "maxDrawNum": 0,
+ "name": "7周年倒计时推荐召唤",
+ "openedAt": 1690448400,
+ "pickupClosedAt": 1690901999,
+ "pickupId": 50011152,
+ "pickupOpenedAt": 1690448400,
+ "priority": 5002421,
+ "rarityId": 3,
+ "shopId1": 4,
+ "shopId2": 5,
+ "ticketItemId": 4001,
+ "type": 1,
+ "warId": 100,
+ "flag": 2
}]
\ No newline at end of file
diff --git a/master/mstGachaAppend.json b/master/mstGachaAppend.json
index 1a584eda3..24ffda0ca 100644
--- a/master/mstGachaAppend.json
+++ b/master/mstGachaAppend.json
@@ -2946,4 +2946,59 @@
"extraAddCount": 0,
"maxDrawNum": 0,
"flag": 1
+}, {
+ "gachaId": 5002417,
+ "idx": 3,
+ "type": 7,
+ "shopId": 8,
+ "gachaGroupId": 146,
+ "drawNum": 1,
+ "extraGroupId": 0,
+ "extraAddCount": 0,
+ "maxDrawNum": 0,
+ "flag": 1
+}, {
+ "gachaId": 5002418,
+ "idx": 3,
+ "type": 7,
+ "shopId": 8,
+ "gachaGroupId": 147,
+ "drawNum": 1,
+ "extraGroupId": 0,
+ "extraAddCount": 0,
+ "maxDrawNum": 0,
+ "flag": 1
+}, {
+ "gachaId": 5002419,
+ "idx": 3,
+ "type": 7,
+ "shopId": 8,
+ "gachaGroupId": 148,
+ "drawNum": 1,
+ "extraGroupId": 0,
+ "extraAddCount": 0,
+ "maxDrawNum": 0,
+ "flag": 1
+}, {
+ "gachaId": 5002420,
+ "idx": 3,
+ "type": 7,
+ "shopId": 8,
+ "gachaGroupId": 149,
+ "drawNum": 1,
+ "extraGroupId": 0,
+ "extraAddCount": 0,
+ "maxDrawNum": 0,
+ "flag": 1
+}, {
+ "gachaId": 5002421,
+ "idx": 3,
+ "type": 7,
+ "shopId": 8,
+ "gachaGroupId": 150,
+ "drawNum": 1,
+ "extraGroupId": 0,
+ "extraAddCount": 0,
+ "maxDrawNum": 0,
+ "flag": 1
}]
\ No newline at end of file
diff --git a/master/mstGachaBehavior.json b/master/mstGachaBehavior.json
index da68000c2..fbb3bde94 100644
--- a/master/mstGachaBehavior.json
+++ b/master/mstGachaBehavior.json
@@ -58,4 +58,8 @@
"gachaId": 5002305,
"svtId": 2300400,
"script": "{\"RankupAnimation\": \"summon_up_05\", \"RankupBeforeClassImageId\": 23, \"RankupBeforeRarity\": 5, \"RankupAfterClassImageId\": 123, \"RankupAfterRarity\": 5}"
+}, {
+ "gachaId": 5002421,
+ "svtId": 2300400,
+ "script": "{\"RankupAnimation\": \"summon_up_05\", \"RankupBeforeClassImageId\": 23, \"RankupBeforeRarity\": 5, \"RankupAfterClassImageId\": 123, \"RankupAfterRarity\": 5}"
}]
\ No newline at end of file
diff --git a/master/mstGachaGroup.json b/master/mstGachaGroup.json
index 2cb330130..eff823764 100644
--- a/master/mstGachaGroup.json
+++ b/master/mstGachaGroup.json
@@ -862,4 +862,34 @@
"maxDrawNum": 1,
"tutorialImageIds": ["Tutorial/tutorial_2007", "tutorial_2007"],
"flag": 1
+}, {
+ "id": 146,
+ "name": "用1个付费圣晶石进行每日1次圣晶石召唤",
+ "maxDrawNum": 1,
+ "tutorialImageIds": ["Tutorial/tutorial_2007", "tutorial_2007"],
+ "flag": 1
+}, {
+ "id": 147,
+ "name": "用1个付费圣晶石进行每日1次圣晶石召唤",
+ "maxDrawNum": 1,
+ "tutorialImageIds": ["Tutorial/tutorial_2007", "tutorial_2007"],
+ "flag": 1
+}, {
+ "id": 148,
+ "name": "用1个付费圣晶石进行每日1次圣晶石召唤",
+ "maxDrawNum": 1,
+ "tutorialImageIds": ["Tutorial/tutorial_2007", "tutorial_2007"],
+ "flag": 1
+}, {
+ "id": 149,
+ "name": "用1个付费圣晶石进行每日1次圣晶石召唤",
+ "maxDrawNum": 1,
+ "tutorialImageIds": ["Tutorial/tutorial_2007", "tutorial_2007"],
+ "flag": 1
+}, {
+ "id": 150,
+ "name": "用1个付费圣晶石进行每日1次圣晶石召唤",
+ "maxDrawNum": 1,
+ "tutorialImageIds": ["Tutorial/tutorial_2007", "tutorial_2007"],
+ "flag": 1
}]
\ No newline at end of file
diff --git a/master/mstGachaPickupCollateral.json b/master/mstGachaPickupCollateral.json
index 0f6c7c97b..8e0cc6184 100644
--- a/master/mstGachaPickupCollateral.json
+++ b/master/mstGachaPickupCollateral.json
@@ -658,4 +658,34 @@
"rarity": 5,
"tiggerDrawNum": 0,
"maxGetNum": 1
+}, {
+ "gachaPickupCollateralGroupId": 111,
+ "type": 1,
+ "rarity": 5,
+ "tiggerDrawNum": 0,
+ "maxGetNum": 1
+}, {
+ "gachaPickupCollateralGroupId": 112,
+ "type": 1,
+ "rarity": 5,
+ "tiggerDrawNum": 0,
+ "maxGetNum": 1
+}, {
+ "gachaPickupCollateralGroupId": 113,
+ "type": 1,
+ "rarity": 5,
+ "tiggerDrawNum": 0,
+ "maxGetNum": 1
+}, {
+ "gachaPickupCollateralGroupId": 114,
+ "type": 1,
+ "rarity": 5,
+ "tiggerDrawNum": 0,
+ "maxGetNum": 1
+}, {
+ "gachaPickupCollateralGroupId": 115,
+ "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 368565048..2346eeab2 100644
--- a/master/mstGachaPickupCollateralGroup.json
+++ b/master/mstGachaPickupCollateralGroup.json
@@ -328,4 +328,19 @@
}, {
"id": 110,
"gachaId": 5002416
+}, {
+ "id": 111,
+ "gachaId": 5002417
+}, {
+ "id": 112,
+ "gachaId": 5002418
+}, {
+ "id": 113,
+ "gachaId": 5002419
+}, {
+ "id": 114,
+ "gachaId": 5002420
+}, {
+ "id": 115,
+ "gachaId": 5002421
}]
\ No newline at end of file
diff --git a/master/mstMasterMission.json b/master/mstMasterMission.json
index 7b7fa911c..9b028afb6 100644
--- a/master/mstMasterMission.json
+++ b/master/mstMasterMission.json
@@ -2519,21 +2519,21 @@
"priority": 0,
"startedAt": 1689523200
}, {
- "closedAt": 2145888000,
- "endedAt": 2145888000,
+ "closedAt": 1691337599,
+ "endedAt": 1690732799,
"id": 100314,
"imageId": 0,
"name": "0",
"priority": 0,
- "startedAt": 2145888000
+ "startedAt": 1690128000
}, {
- "closedAt": 2145888000,
- "endedAt": 2145888000,
+ "closedAt": 1691942399,
+ "endedAt": 1691337599,
"id": 100315,
"imageId": 0,
"name": "0",
"priority": 0,
- "startedAt": 2145888000
+ "startedAt": 1690732800
}, {
"closedAt": 2145888000,
"endedAt": 2145888000,
@@ -2943,13 +2943,13 @@
"priority": 0,
"startedAt": 1684994400
}, {
- "closedAt": 2145888000,
- "endedAt": 2145888000,
+ "closedAt": 1691819999,
+ "endedAt": 1690901999,
"id": 200112,
"imageId": 0,
"name": "0",
"priority": 0,
- "startedAt": 2145888000
+ "startedAt": 1689832800
}, {
"closedAt": 2145888000,
"endedAt": 2145888000,
diff --git a/master/mstMasterMissionDisplayInfo.json b/master/mstMasterMissionDisplayInfo.json
index 67e3a7efa..9b04168bc 100644
--- a/master/mstMasterMissionDisplayInfo.json
+++ b/master/mstMasterMissionDisplayInfo.json
@@ -550,12 +550,12 @@
"talkIds": ["0_A2550", "0_A2560", "0_A2570"],
"guideLimitCount": 0,
"startedAt": 1688140800,
- "endedAt": 2145888000
+ "endedAt": 1690819199
}, {
"id": 82,
"guideImageId": 9000001,
"talkIds": ["0_A2580", "0_A2590", "0_A2600"],
"guideLimitCount": 0,
- "startedAt": 2145888000,
+ "startedAt": 1690819200,
"endedAt": 2145888000
}]
\ No newline at end of file
diff --git a/master/mstQuest.json b/master/mstQuest.json
index b7fc1d210..084626422 100644
--- a/master/mstQuest.json
+++ b/master/mstQuest.json
@@ -388362,7 +388362,7 @@
"chapterSubId": 0,
"chapterSubStr": "",
"charaIconId": 0,
- "closedAt": 2145888000,
+ "closedAt": 1689929999,
"consumeType": 1,
"displayHours": 0,
"flag": 0,
@@ -388373,10 +388373,10 @@
"iconId": 94074401,
"id": 94074401,
"intervalHours": 0,
- "name": "スケルトン・ハント 開位級",
+ "name": "骷髅·狩猎 开位级",
"nameRuby": "",
- "noticeAt": 2145888000,
- "openedAt": 2145888000,
+ "noticeAt": 1689832800,
+ "openedAt": 1689832800,
"priority": 94074499,
"recommendLv": "50",
"scriptQuestId": 0,
@@ -388394,7 +388394,7 @@
"chapterSubId": 0,
"chapterSubStr": "",
"charaIconId": 0,
- "closedAt": 2145888000,
+ "closedAt": 1689929999,
"consumeType": 1,
"displayHours": 0,
"flag": 0,
@@ -388405,10 +388405,10 @@
"iconId": 94074401,
"id": 94074402,
"intervalHours": 0,
- "name": "スケルトン・ハント 祭位級",
+ "name": "骷髅·狩猎 祭位级",
"nameRuby": "",
- "noticeAt": 2145888000,
- "openedAt": 2145888000,
+ "noticeAt": 1689832800,
+ "openedAt": 1689832800,
"priority": 94074498,
"recommendLv": "75",
"scriptQuestId": 0,
@@ -388426,7 +388426,7 @@
"chapterSubId": 0,
"chapterSubStr": "",
"charaIconId": 0,
- "closedAt": 2145888000,
+ "closedAt": 1689929999,
"consumeType": 1,
"displayHours": 0,
"flag": 0,
@@ -388437,10 +388437,10 @@
"iconId": 94074401,
"id": 94074403,
"intervalHours": 0,
- "name": "スケルトン・ハント 典位級",
+ "name": "骷髅·狩猎 典位级",
"nameRuby": "",
- "noticeAt": 2145888000,
- "openedAt": 2145888000,
+ "noticeAt": 1689832800,
+ "openedAt": 1689832800,
"priority": 94074497,
"recommendLv": "90",
"scriptQuestId": 0,
@@ -388458,7 +388458,7 @@
"chapterSubId": 0,
"chapterSubStr": "",
"charaIconId": 0,
- "closedAt": 2145888000,
+ "closedAt": 1689929999,
"consumeType": 1,
"displayHours": 0,
"flag": 0,
@@ -388469,10 +388469,10 @@
"iconId": 94074401,
"id": 94074404,
"intervalHours": 0,
- "name": "スケルトン・ハント 典位+級",
+ "name": "骷髅·狩猎 典位+级",
"nameRuby": "",
- "noticeAt": 2145888000,
- "openedAt": 2145888000,
+ "noticeAt": 1689832800,
+ "openedAt": 1689832800,
"priority": 94074496,
"recommendLv": "90+",
"scriptQuestId": 0,
@@ -388490,7 +388490,7 @@
"chapterSubId": 0,
"chapterSubStr": "",
"charaIconId": 0,
- "closedAt": 2145888000,
+ "closedAt": 1690016399,
"consumeType": 1,
"displayHours": 0,
"flag": 0,
@@ -388501,10 +388501,10 @@
"iconId": 94074402,
"id": 94074405,
"intervalHours": 0,
- "name": "ワイバーン・ハント 開位級",
+ "name": "双足飞龙·狩猎 开位级",
"nameRuby": "",
- "noticeAt": 2145888000,
- "openedAt": 2145888000,
+ "noticeAt": 1689930000,
+ "openedAt": 1689930000,
"priority": 94074495,
"recommendLv": "50",
"scriptQuestId": 0,
@@ -388522,7 +388522,7 @@
"chapterSubId": 0,
"chapterSubStr": "",
"charaIconId": 0,
- "closedAt": 2145888000,
+ "closedAt": 1690016399,
"consumeType": 1,
"displayHours": 0,
"flag": 0,
@@ -388533,10 +388533,10 @@
"iconId": 94074402,
"id": 94074406,
"intervalHours": 0,
- "name": "ワイバーン・ハント 祭位級",
+ "name": "双足飞龙·狩猎 祭位级",
"nameRuby": "",
- "noticeAt": 2145888000,
- "openedAt": 2145888000,
+ "noticeAt": 1689930000,
+ "openedAt": 1689930000,
"priority": 94074494,
"recommendLv": "75",
"scriptQuestId": 0,
@@ -388554,7 +388554,7 @@
"chapterSubId": 0,
"chapterSubStr": "",
"charaIconId": 0,
- "closedAt": 2145888000,
+ "closedAt": 1690016399,
"consumeType": 1,
"displayHours": 0,
"flag": 0,
@@ -388565,10 +388565,10 @@
"iconId": 94074402,
"id": 94074407,
"intervalHours": 0,
- "name": "ワイバーン・ハント 典位級",
+ "name": "双足飞龙·狩猎 典位级",
"nameRuby": "",
- "noticeAt": 2145888000,
- "openedAt": 2145888000,
+ "noticeAt": 1689930000,
+ "openedAt": 1689930000,
"priority": 94074493,
"recommendLv": "90",
"scriptQuestId": 0,
@@ -388586,7 +388586,7 @@
"chapterSubId": 0,
"chapterSubStr": "",
"charaIconId": 0,
- "closedAt": 2145888000,
+ "closedAt": 1690016399,
"consumeType": 1,
"displayHours": 0,
"flag": 0,
@@ -388597,10 +388597,10 @@
"iconId": 94074402,
"id": 94074408,
"intervalHours": 0,
- "name": "ワイバーン・ハント 典位+級",
+ "name": "双足飞龙·狩猎 典位+级",
"nameRuby": "",
- "noticeAt": 2145888000,
- "openedAt": 2145888000,
+ "noticeAt": 1689930000,
+ "openedAt": 1689930000,
"priority": 94074492,
"recommendLv": "90+",
"scriptQuestId": 0,
@@ -388618,7 +388618,7 @@
"chapterSubId": 0,
"chapterSubStr": "",
"charaIconId": 0,
- "closedAt": 2145888000,
+ "closedAt": 1690102799,
"consumeType": 1,
"displayHours": 0,
"flag": 0,
@@ -388629,10 +388629,10 @@
"iconId": 94074403,
"id": 94074409,
"intervalHours": 0,
- "name": "マーマン・ハント 開位級",
+ "name": "男人鱼·狩猎 开位级",
"nameRuby": "",
- "noticeAt": 2145888000,
- "openedAt": 2145888000,
+ "noticeAt": 1690016400,
+ "openedAt": 1690016400,
"priority": 94074491,
"recommendLv": "50",
"scriptQuestId": 0,
@@ -388650,7 +388650,7 @@
"chapterSubId": 0,
"chapterSubStr": "",
"charaIconId": 0,
- "closedAt": 2145888000,
+ "closedAt": 1690102799,
"consumeType": 1,
"displayHours": 0,
"flag": 0,
@@ -388661,10 +388661,10 @@
"iconId": 94074403,
"id": 94074410,
"intervalHours": 0,
- "name": "マーマン・ハント 祭位級",
+ "name": "男人鱼·狩猎 祭位级",
"nameRuby": "",
- "noticeAt": 2145888000,
- "openedAt": 2145888000,
+ "noticeAt": 1690016400,
+ "openedAt": 1690016400,
"priority": 94074490,
"recommendLv": "75",
"scriptQuestId": 0,
@@ -388682,7 +388682,7 @@
"chapterSubId": 0,
"chapterSubStr": "",
"charaIconId": 0,
- "closedAt": 2145888000,
+ "closedAt": 1690102799,
"consumeType": 1,
"displayHours": 0,
"flag": 0,
@@ -388693,10 +388693,10 @@
"iconId": 94074403,
"id": 94074411,
"intervalHours": 0,
- "name": "マーマン・ハント 典位級",
+ "name": "男人鱼·狩猎 典位级",
"nameRuby": "",
- "noticeAt": 2145888000,
- "openedAt": 2145888000,
+ "noticeAt": 1690016400,
+ "openedAt": 1690016400,
"priority": 94074489,
"recommendLv": "90",
"scriptQuestId": 0,
@@ -388714,7 +388714,7 @@
"chapterSubId": 0,
"chapterSubStr": "",
"charaIconId": 0,
- "closedAt": 2145888000,
+ "closedAt": 1690102799,
"consumeType": 1,
"displayHours": 0,
"flag": 0,
@@ -388725,10 +388725,10 @@
"iconId": 94074403,
"id": 94074412,
"intervalHours": 0,
- "name": "マーマン・ハント 典位+級",
+ "name": "男人鱼·狩猎 典位+级",
"nameRuby": "",
- "noticeAt": 2145888000,
- "openedAt": 2145888000,
+ "noticeAt": 1690016400,
+ "openedAt": 1690016400,
"priority": 94074488,
"recommendLv": "90+",
"scriptQuestId": 0,
@@ -388746,7 +388746,7 @@
"chapterSubId": 0,
"chapterSubStr": "",
"charaIconId": 0,
- "closedAt": 2145888000,
+ "closedAt": 1690189199,
"consumeType": 1,
"displayHours": 0,
"flag": 0,
@@ -388757,10 +388757,10 @@
"iconId": 94074404,
"id": 94074413,
"intervalHours": 0,
- "name": "ガルダ・ハント 開位級",
+ "name": "迦楼罗·狩猎 开位级",
"nameRuby": "",
- "noticeAt": 2145888000,
- "openedAt": 2145888000,
+ "noticeAt": 1690102800,
+ "openedAt": 1690102800,
"priority": 94074487,
"recommendLv": "50",
"scriptQuestId": 0,
@@ -388778,7 +388778,7 @@
"chapterSubId": 0,
"chapterSubStr": "",
"charaIconId": 0,
- "closedAt": 2145888000,
+ "closedAt": 1690189199,
"consumeType": 1,
"displayHours": 0,
"flag": 0,
@@ -388789,10 +388789,10 @@
"iconId": 94074404,
"id": 94074414,
"intervalHours": 0,
- "name": "ガルダ・ハント 祭位級",
+ "name": "迦楼罗·狩猎 祭位级",
"nameRuby": "",
- "noticeAt": 2145888000,
- "openedAt": 2145888000,
+ "noticeAt": 1690102800,
+ "openedAt": 1690102800,
"priority": 94074486,
"recommendLv": "75",
"scriptQuestId": 0,
@@ -388810,7 +388810,7 @@
"chapterSubId": 0,
"chapterSubStr": "",
"charaIconId": 0,
- "closedAt": 2145888000,
+ "closedAt": 1690189199,
"consumeType": 1,
"displayHours": 0,
"flag": 0,
@@ -388821,10 +388821,10 @@
"iconId": 94074404,
"id": 94074415,
"intervalHours": 0,
- "name": "ガルダ・ハント 典位級",
+ "name": "迦楼罗·狩猎 典位级",
"nameRuby": "",
- "noticeAt": 2145888000,
- "openedAt": 2145888000,
+ "noticeAt": 1690102800,
+ "openedAt": 1690102800,
"priority": 94074485,
"recommendLv": "90",
"scriptQuestId": 0,
@@ -388842,7 +388842,7 @@
"chapterSubId": 0,
"chapterSubStr": "",
"charaIconId": 0,
- "closedAt": 2145888000,
+ "closedAt": 1690189199,
"consumeType": 1,
"displayHours": 0,
"flag": 0,
@@ -388853,10 +388853,10 @@
"iconId": 94074404,
"id": 94074416,
"intervalHours": 0,
- "name": "ガルダ・ハント 典位+級",
+ "name": "迦楼罗·狩猎 典位+级",
"nameRuby": "",
- "noticeAt": 2145888000,
- "openedAt": 2145888000,
+ "noticeAt": 1690102800,
+ "openedAt": 1690102800,
"priority": 94074484,
"recommendLv": "90+",
"scriptQuestId": 0,
@@ -388874,7 +388874,7 @@
"chapterSubId": 0,
"chapterSubStr": "",
"charaIconId": 0,
- "closedAt": 2145888000,
+ "closedAt": 1690275599,
"consumeType": 1,
"displayHours": 0,
"flag": 0,
@@ -388885,10 +388885,10 @@
"iconId": 94074405,
"id": 94074417,
"intervalHours": 0,
- "name": "ケルピー・ハント 開位級",
+ "name": "凯尔派·狩猎 开位级",
"nameRuby": "",
- "noticeAt": 2145888000,
- "openedAt": 2145888000,
+ "noticeAt": 1690189200,
+ "openedAt": 1690189200,
"priority": 94074483,
"recommendLv": "50",
"scriptQuestId": 0,
@@ -388906,7 +388906,7 @@
"chapterSubId": 0,
"chapterSubStr": "",
"charaIconId": 0,
- "closedAt": 2145888000,
+ "closedAt": 1690275599,
"consumeType": 1,
"displayHours": 0,
"flag": 0,
@@ -388917,10 +388917,10 @@
"iconId": 94074405,
"id": 94074418,
"intervalHours": 0,
- "name": "ケルピー・ハント 祭位級",
+ "name": "凯尔派·狩猎 祭位级",
"nameRuby": "",
- "noticeAt": 2145888000,
- "openedAt": 2145888000,
+ "noticeAt": 1690189200,
+ "openedAt": 1690189200,
"priority": 94074482,
"recommendLv": "75",
"scriptQuestId": 0,
@@ -388938,7 +388938,7 @@
"chapterSubId": 0,
"chapterSubStr": "",
"charaIconId": 0,
- "closedAt": 2145888000,
+ "closedAt": 1690275599,
"consumeType": 1,
"displayHours": 0,
"flag": 0,
@@ -388949,10 +388949,10 @@
"iconId": 94074405,
"id": 94074419,
"intervalHours": 0,
- "name": "ケルピー・ハント 典位級",
+ "name": "凯尔派·狩猎 典位级",
"nameRuby": "",
- "noticeAt": 2145888000,
- "openedAt": 2145888000,
+ "noticeAt": 1690189200,
+ "openedAt": 1690189200,
"priority": 94074481,
"recommendLv": "90",
"scriptQuestId": 0,
@@ -388970,7 +388970,7 @@
"chapterSubId": 0,
"chapterSubStr": "",
"charaIconId": 0,
- "closedAt": 2145888000,
+ "closedAt": 1690275599,
"consumeType": 1,
"displayHours": 0,
"flag": 0,
@@ -388981,10 +388981,10 @@
"iconId": 94074405,
"id": 94074420,
"intervalHours": 0,
- "name": "ケルピー・ハント 典位+級",
+ "name": "凯尔派·狩猎 典位+级",
"nameRuby": "",
- "noticeAt": 2145888000,
- "openedAt": 2145888000,
+ "noticeAt": 1690189200,
+ "openedAt": 1690189200,
"priority": 94074480,
"recommendLv": "90+",
"scriptQuestId": 0,
@@ -389002,7 +389002,7 @@
"chapterSubId": 0,
"chapterSubStr": "",
"charaIconId": 0,
- "closedAt": 2145888000,
+ "closedAt": 1690361999,
"consumeType": 1,
"displayHours": 0,
"flag": 0,
@@ -389013,10 +389013,10 @@
"iconId": 94074406,
"id": 94074421,
"intervalHours": 0,
- "name": "ソウルイーター・ハント 開位級",
+ "name": "噬魂者·狩猎 开位级",
"nameRuby": "",
- "noticeAt": 2145888000,
- "openedAt": 2145888000,
+ "noticeAt": 1690275600,
+ "openedAt": 1690275600,
"priority": 94074479,
"recommendLv": "50",
"scriptQuestId": 0,
@@ -389034,7 +389034,7 @@
"chapterSubId": 0,
"chapterSubStr": "",
"charaIconId": 0,
- "closedAt": 2145888000,
+ "closedAt": 1690361999,
"consumeType": 1,
"displayHours": 0,
"flag": 0,
@@ -389045,10 +389045,10 @@
"iconId": 94074406,
"id": 94074422,
"intervalHours": 0,
- "name": "ソウルイーター・ハント 祭位級",
+ "name": "噬魂者·狩猎 祭位级",
"nameRuby": "",
- "noticeAt": 2145888000,
- "openedAt": 2145888000,
+ "noticeAt": 1690275600,
+ "openedAt": 1690275600,
"priority": 94074478,
"recommendLv": "75",
"scriptQuestId": 0,
@@ -389066,7 +389066,7 @@
"chapterSubId": 0,
"chapterSubStr": "",
"charaIconId": 0,
- "closedAt": 2145888000,
+ "closedAt": 1690361999,
"consumeType": 1,
"displayHours": 0,
"flag": 0,
@@ -389077,10 +389077,10 @@
"iconId": 94074408,
"id": 94074423,
"intervalHours": 0,
- "name": "ソウルイーター・ハント 典位級",
+ "name": "噬魂者·狩猎 典位级",
"nameRuby": "",
- "noticeAt": 2145888000,
- "openedAt": 2145888000,
+ "noticeAt": 1690275600,
+ "openedAt": 1690275600,
"priority": 94074477,
"recommendLv": "90",
"scriptQuestId": 0,
@@ -389098,7 +389098,7 @@
"chapterSubId": 0,
"chapterSubStr": "",
"charaIconId": 0,
- "closedAt": 2145888000,
+ "closedAt": 1690361999,
"consumeType": 1,
"displayHours": 0,
"flag": 0,
@@ -389109,10 +389109,10 @@
"iconId": 94074408,
"id": 94074424,
"intervalHours": 0,
- "name": "ソウルイーター・ハント 典位+級",
+ "name": "噬魂者·狩猎 典位+级",
"nameRuby": "",
- "noticeAt": 2145888000,
- "openedAt": 2145888000,
+ "noticeAt": 1690275600,
+ "openedAt": 1690275600,
"priority": 94074476,
"recommendLv": "90+",
"scriptQuestId": 0,
@@ -389130,7 +389130,7 @@
"chapterSubId": 0,
"chapterSubStr": "",
"charaIconId": 0,
- "closedAt": 2145888000,
+ "closedAt": 1690901999,
"consumeType": 1,
"displayHours": 0,
"flag": 0,
@@ -389141,10 +389141,10 @@
"iconId": 94074407,
"id": 94074425,
"intervalHours": 0,
- "name": "ケルベロス・ハント 開位級",
+ "name": "刻耳柏洛斯·狩猎 开位级",
"nameRuby": "",
- "noticeAt": 2145888000,
- "openedAt": 2145888000,
+ "noticeAt": 1690362000,
+ "openedAt": 1690362000,
"priority": 94074475,
"recommendLv": "50",
"scriptQuestId": 0,
@@ -389162,7 +389162,7 @@
"chapterSubId": 0,
"chapterSubStr": "",
"charaIconId": 0,
- "closedAt": 2145888000,
+ "closedAt": 1690901999,
"consumeType": 1,
"displayHours": 0,
"flag": 0,
@@ -389173,10 +389173,10 @@
"iconId": 94074407,
"id": 94074426,
"intervalHours": 0,
- "name": "ケルベロス・ハント 祭位級",
+ "name": "刻耳柏洛斯·狩猎 祭位级",
"nameRuby": "",
- "noticeAt": 2145888000,
- "openedAt": 2145888000,
+ "noticeAt": 1690362000,
+ "openedAt": 1690362000,
"priority": 94074474,
"recommendLv": "75",
"scriptQuestId": 0,
@@ -389194,7 +389194,7 @@
"chapterSubId": 0,
"chapterSubStr": "",
"charaIconId": 0,
- "closedAt": 2145888000,
+ "closedAt": 1690901999,
"consumeType": 1,
"displayHours": 0,
"flag": 0,
@@ -389205,10 +389205,10 @@
"iconId": 94074407,
"id": 94074427,
"intervalHours": 0,
- "name": "ケルベロス・ハント 典位級",
+ "name": "刻耳柏洛斯·狩猎 典位级",
"nameRuby": "",
- "noticeAt": 2145888000,
- "openedAt": 2145888000,
+ "noticeAt": 1690362000,
+ "openedAt": 1690362000,
"priority": 94074473,
"recommendLv": "90",
"scriptQuestId": 0,
@@ -389226,7 +389226,7 @@
"chapterSubId": 0,
"chapterSubStr": "",
"charaIconId": 0,
- "closedAt": 2145888000,
+ "closedAt": 1690901999,
"consumeType": 1,
"displayHours": 0,
"flag": 0,
@@ -389237,10 +389237,10 @@
"iconId": 94074407,
"id": 94074428,
"intervalHours": 0,
- "name": "ケルベロス・ハント 典位+級",
+ "name": "刻耳柏洛斯·狩猎 典位+级",
"nameRuby": "",
- "noticeAt": 2145888000,
- "openedAt": 2145888000,
+ "noticeAt": 1690362000,
+ "openedAt": 1690362000,
"priority": 94074472,
"recommendLv": "90+",
"scriptQuestId": 0,
diff --git a/master/mstShop.json b/master/mstShop.json
index ace3a1efb..c1aa5c023 100644
--- a/master/mstShop.json
+++ b/master/mstShop.json
@@ -18586,6 +18586,136 @@
"slot": 0,
"targetIds": [1000300],
"warningMessage": ""
+}, {
+ "baseShopId": 4000405,
+ "bgImageId": 0,
+ "closedAt": 1690178399,
+ "defaultLimitCount": 0,
+ "defaultLv": 1,
+ "detail": "限时兑换★5从者",
+ "eventId": 0,
+ "flag": 0,
+ "id": 4000405,
+ "imageId": 0,
+ "infoMessage": "",
+ "itemIds": [17],
+ "limitNum": 1,
+ "name": "阿尔托莉雅·潘德拉贡",
+ "openedAt": 1689832800,
+ "payType": 9,
+ "prices": [10],
+ "priority": 3,
+ "purchaseType": 4,
+ "script": {},
+ "setNum": 1,
+ "shopType": 7,
+ "slot": 0,
+ "targetIds": [202600],
+ "warningMessage": ""
+}, {
+ "baseShopId": 4000406,
+ "bgImageId": 0,
+ "closedAt": 1690351199,
+ "defaultLimitCount": 0,
+ "defaultLv": 1,
+ "detail": "限时兑换★5从者",
+ "eventId": 0,
+ "flag": 0,
+ "id": 4000406,
+ "imageId": 0,
+ "infoMessage": "",
+ "itemIds": [17],
+ "limitNum": 1,
+ "name": "阿尔托莉雅·潘德拉贡〔Alter〕",
+ "openedAt": 1690016400,
+ "payType": 9,
+ "prices": [10],
+ "priority": 3,
+ "purchaseType": 4,
+ "script": {},
+ "setNum": 1,
+ "shopType": 7,
+ "slot": 0,
+ "targetIds": [402700],
+ "warningMessage": ""
+}, {
+ "baseShopId": 4000407,
+ "bgImageId": 0,
+ "closedAt": 1690523999,
+ "defaultLimitCount": 0,
+ "defaultLv": 1,
+ "detail": "限时兑换★5从者",
+ "eventId": 0,
+ "flag": 0,
+ "id": 4000407,
+ "imageId": 0,
+ "infoMessage": "",
+ "itemIds": [17],
+ "limitNum": 1,
+ "name": "贞德",
+ "openedAt": 1690189200,
+ "payType": 9,
+ "prices": [10],
+ "priority": 3,
+ "purchaseType": 4,
+ "script": {},
+ "setNum": 1,
+ "shopType": 7,
+ "slot": 0,
+ "targetIds": [203200],
+ "warningMessage": ""
+}, {
+ "baseShopId": 4000408,
+ "bgImageId": 0,
+ "closedAt": 1690696799,
+ "defaultLimitCount": 0,
+ "defaultLv": 1,
+ "detail": "限时兑换★5从者",
+ "eventId": 0,
+ "flag": 0,
+ "id": 4000408,
+ "imageId": 0,
+ "infoMessage": "",
+ "itemIds": [17],
+ "limitNum": 1,
+ "name": "阿尔托莉雅·潘德拉贡",
+ "openedAt": 1690362000,
+ "payType": 9,
+ "prices": [10],
+ "priority": 3,
+ "purchaseType": 4,
+ "script": {},
+ "setNum": 1,
+ "shopType": 7,
+ "slot": 0,
+ "targetIds": [900900],
+ "warningMessage": ""
+}, {
+ "baseShopId": 4000409,
+ "bgImageId": 0,
+ "closedAt": 1690901999,
+ "defaultLimitCount": 0,
+ "defaultLv": 1,
+ "detail": "限时兑换★5从者",
+ "eventId": 0,
+ "flag": 0,
+ "id": 4000409,
+ "imageId": 0,
+ "infoMessage": "",
+ "itemIds": [17],
+ "limitNum": 1,
+ "name": "瞑生院祈荒",
+ "openedAt": 1690448400,
+ "payType": 9,
+ "prices": [10],
+ "priority": 3,
+ "purchaseType": 4,
+ "script": {},
+ "setNum": 1,
+ "shopType": 7,
+ "slot": 0,
+ "targetIds": [2300400],
+ "warningMessage": ""
}, {
"baseShopId": 4000721,
"bgImageId": 0,
diff --git a/master/mstSkill.json b/master/mstSkill.json
index c9c677804..dc91dc0a5 100644
--- a/master/mstSkill.json
+++ b/master/mstSkill.json
@@ -104882,7 +104882,7 @@
"id": 968090,
"maxLv": 1,
"motion": 102,
- "name": "「距离珍贵的庆典还剩９天！ 好期待呀！」",
+ "name": "「距离珍贵的庆典还剩12天！ 好期待呀！」",
"ruby": "-",
"script": {},
"type": 1
@@ -104906,7 +104906,7 @@
"id": 968092,
"maxLv": 1,
"motion": 102,
- "name": "「我也要送上祝福。还剩8天。」",
+ "name": "「我也要送上祝福。还剩11天。」",
"ruby": "-",
"script": {},
"type": 1
@@ -104930,7 +104930,7 @@
"id": 968094,
"maxLv": 1,
"motion": 102,
- "name": "「为了7天后的庆典，让我们热闹起来吧～！」",
+ "name": "「为了10天后的庆典，让我们热闹起来吧～！」",
"ruby": "-",
"script": {},
"type": 1
@@ -104954,7 +104954,7 @@
"id": 968096,
"maxLv": 1,
"motion": 103,
- "name": "「6天后就到了吧。有点激动……！」",
+ "name": "「9天后就到了吧。有点激动……！」",
"ruby": "-",
"script": {},
"type": 1
@@ -104978,7 +104978,7 @@
"id": 968098,
"maxLv": 1,
"motion": 103,
- "name": "「还剩５天！ 让我们嗨起来吧，亲御！」",
+ "name": "「还剩8天！ 让我们嗨起来吧，亲御！」",
"ruby": "-",
"script": {},
"type": 1
@@ -105002,7 +105002,7 @@
"id": 968100,
"maxLv": 1,
"motion": 103,
- "name": "「做好准备了吗？ 庆典就在4天后哦。」",
+ "name": "「做好准备了吗？ 庆典就在7天后哦。」",
"ruby": "-",
"script": {},
"type": 1
@@ -105026,7 +105026,7 @@
"id": 968102,
"maxLv": 1,
"motion": 103,
- "name": "「终于要到了。好了，还剩3天。做好觉悟吧！」",
+ "name": "「终于要到了。好了，还剩6天。做好觉悟吧！」",
"ruby": "-",
"script": {},
"type": 1
diff --git a/master/mstSkillAdd.json b/master/mstSkillAdd.json
index ecad08cf4..e2f7e6769 100644
--- a/master/mstSkillAdd.json
+++ b/master/mstSkillAdd.json
@@ -26,49 +26,49 @@
"skillId": 968090,
"priority": 0,
"commonReleaseId": 10074401,
- "name": "「とっておきのお祭りまで、あと８日！ 楽しみね！」",
+ "name": "「距离珍贵的庆典还剩12天！ 好期待呀！」",
"ruby": ""
}, {
"skillId": 968092,
"priority": 0,
"commonReleaseId": 10074402,
- "name": "「私からも祝福を。残り７日です」",
+ "name": "「我也要送上祝福。还剩11天。」",
"ruby": ""
}, {
"skillId": 968094,
"priority": 0,
"commonReleaseId": 10074403,
- "name": "「６日後のお祝いに向け、盛り上げていきますよー！」",
+ "name": "「为了10天后的庆典，让我们热闹起来吧～！」",
"ruby": ""
}, {
"skillId": 968096,
"priority": 0,
"commonReleaseId": 10074404,
- "name": "「もう５日後っすね。ドキドキするっす…！」",
+ "name": "「9天后就到了吧。有点激动……！」",
"ruby": ""
}, {
"skillId": 968098,
"priority": 0,
"commonReleaseId": 10074405,
- "name": "「あと４日！ アゲていこうぜ、ちゃんマス！」",
+ "name": "「还剩8天！ 让我们嗨起来吧，亲御！」",
"ruby": ""
}, {
"skillId": 968100,
"priority": 0,
"commonReleaseId": 10074406,
- "name": "「準備はできてるかい？ お祭りは３日後だよ」",
+ "name": "「做好准备了吗？ 庆典就在7天后哦。」",
"ruby": ""
}, {
"skillId": 968102,
"priority": 0,
"commonReleaseId": 10074407,
- "name": "「いよいよね。さあ、あと２日よ。覚悟なさい」",
+ "name": "「终于要到了。好了，还剩6天。做好觉悟吧！」",
"ruby": ""
}, {
"skillId": 968102,
"priority": 1,
"commonReleaseId": 10074408,
- "name": "「いよいよね。さあ、あと１日よ。覚悟なさい」",
+ "name": "「终于要到了。好了，还剩6天。做好觉悟吧！」",
"ruby": ""
}, {
"skillId": 2027000,
diff --git a/master/mstSvtVoice.json b/master/mstSvtVoice.json
index 7a9935e47..f7ed56348 100644
--- a/master/mstSvtVoice.json
+++ b/master/mstSvtVoice.json
@@ -464893,90 +464893,6 @@
"condType": 16,
"value": 0
}]
- }, {
- "overwriteName": "御主任务 2023年6月 1",
- "infos": [{
- "id": "0_A2520",
- "face": 13,
- "delay": 0.0,
- "text": "有些人会因为阴雨连绵而感到心情郁闷，但我并不怎么讨厌。",
- "form": 0,
- "changeEffect": 0
- }, {
- "id": "0_A2521",
- "face": 22,
- "delay": 0.1,
- "text": "[r]\n窗外的雨声令人心情平静。",
- "form": 0,
- "changeEffect": 0
- }, {
- "id": "0_A2522",
- "face": 1,
- "delay": 0.3,
- "text": "[r]\n啊，这音色是……崔斯坦先生的竖琴吧。",
- "form": 0,
- "changeEffect": 0
- }, {
- "id": "0_A2523",
- "face": 26,
- "delay": 0.1,
- "text": "[r]\n两种声音融合在一起，交织成了非常美妙的背景音乐呢。",
- "form": 0,
- "changeEffect": 0
- }],
- "conds": [{
- "condType": 16,
- "value": 80
- }]
- }, {
- "overwriteName": "御主任务 2023年6月 2",
- "infos": [{
- "id": "0_A2530",
- "face": 0,
- "delay": 0.0,
- "text": "和以前比起来，额外任务的数量增加了不少。",
- "form": 0,
- "changeEffect": 0
- }, {
- "id": "0_A2531",
- "face": 1,
- "delay": 0.1,
- "text": "[r]\n完成奖励当然也增加了，努力获得吧！",
- "form": 0,
- "changeEffect": 0
- }],
- "conds": [{
- "condType": 16,
- "value": 80
- }]
- }, {
- "overwriteName": "御主任务 2023年6月 3",
- "infos": [{
- "id": "0_A2540",
- "face": 12,
- "delay": 0.0,
- "text": "刚才，塞弥拉弥斯小姐双手捧着一大把绣球花，看上去十分美丽……",
- "form": 0,
- "changeEffect": 0
- }, {
- "id": "0_A2541",
- "face": 8,
- "delay": 0.1,
- "text": "[r]\n但她好像只是为了调查绣球花的毒性。",
- "form": 0,
- "changeEffect": 0
- }, {
- "id": "0_A2542",
- "face": 28,
- "delay": 0.1,
- "text": "[r]\n不想舍华求实，而是舍花求毒……也是可以的呢。",
- "form": 0,
- "changeEffect": 0
- }],
- "conds": [{
- "condType": 16,
- "value": 80
- }]
}, {
"overwriteName": "御主任务 2023年7月 1",
"infos": [{
@@ -465068,6 +464984,125 @@
"condType": 16,
"value": 81
}]
+ }, {
+ "overwriteName": "御主任务 2023年8月 1",
+ "infos": [{
+ "id": "0_A2580",
+ "face": 0,
+ "delay": 0.0,
+ "text": "今年迦勒底的暑假也到来了呢。",
+ "form": 0,
+ "changeEffect": 0
+ }, {
+ "id": "0_A2581",
+ "face": 7,
+ "delay": 0.3,
+ "text": "[r]\n让我们绷紧神经，确保无论撞上什么都能冷静应对。",
+ "form": 0,
+ "changeEffect": 0
+ }, {
+ "id": "0_A2582",
+ "face": 13,
+ "delay": 0.1,
+ "text": "[r]\n但前辈，希望您还能在内心的角落保留一丝享受夏日的心情。",
+ "form": 0,
+ "changeEffect": 0
+ }, {
+ "id": "0_A2583",
+ "face": 1,
+ "delay": 0.1,
+ "text": "[r]\n因为现在，正是盛夏哦！",
+ "form": 0,
+ "changeEffect": 0
+ }],
+ "conds": [{
+ "condType": 16,
+ "value": 82
+ }]
+ }, {
+ "overwriteName": "御主任务 2023年8月 2",
+ "infos": [{
+ "id": "0_A2590",
+ "face": 1,
+ "delay": 0.0,
+ "text": "在阿纳斯塔西娅小姐的安排下，我们办了一次小小的刨冰派对。",
+ "form": 0,
+ "changeEffect": 0
+ }, {
+ "id": "0_A2591",
+ "face": 0,
+ "delay": 0.1,
+ "text": "[r]\n看似色彩缤纷的糖浆其实只有些许的香料变化，味道几乎一样。",
+ "form": 0,
+ "changeEffect": 0
+ }, {
+ "id": "0_A2592",
+ "face": 13,
+ "delay": 0.1,
+ "text": "[r]\n即便如此，不同的选择也表现出了大家不同的个性，看着非常有趣哦。",
+ "form": 0,
+ "changeEffect": 0
+ }, {
+ "id": "0_A2593",
+ "face": 1,
+ "delay": 0.1,
+ "text": "[r]\n您觉得我选了什么？",
+ "form": 0,
+ "changeEffect": 0
+ }, {
+ "id": "0_A2594",
+ "face": 6,
+ "delay": 0.1,
+ "text": "[r]\n哎，一目了然？ 舌头上染上颜色了！？",
+ "form": 0,
+ "changeEffect": 0
+ }, {
+ "id": "0_A2595",
+ "face": 3,
+ "delay": 0.3,
+ "text": "[r]\n不，不要看啦！",
+ "form": 0,
+ "changeEffect": 0
+ }],
+ "conds": [{
+ "condType": 16,
+ "value": 82
+ }]
+ }, {
+ "overwriteName": "御主任务 2023年8月 3",
+ "infos": [{
+ "id": "0_A2600",
+ "face": 1,
+ "delay": 0.0,
+ "text": "即便在如此酷暑中，诸葛孔明先生也能将西装穿得完美笔挺。",
+ "form": 0,
+ "changeEffect": 0
+ }, {
+ "id": "0_A2601",
+ "face": 0,
+ "delay": 0.1,
+ "text": "[r]\n当我问他为何看上去如此凉爽时，他表示自己始终维持着调整体温的魔术什么的。",
+ "form": 0,
+ "changeEffect": 0
+ }, {
+ "id": "0_A2602",
+ "face": 1,
+ "delay": 0.1,
+ "text": "[r]\n然后我说，不愧是一流魔术师，毫无破绽呢！的时候，身旁的莱妮丝小姐突然爆笑了起来。",
+ "form": 0,
+ "changeEffect": 0
+ }, {
+ "id": "0_A2603",
+ "face": 12,
+ "delay": 0.3,
+ "text": "[r]\n究竟是为什么呢……",
+ "form": 0,
+ "changeEffect": 0
+ }],
+ "conds": [{
+ "condType": 16,
+ "value": 82
+ }]
}],
"scriptJsonAdditory": []
}, {
@@ -471036,6 +471071,97 @@
"condType": 16,
"value": 80
}]
+ }, {
+ "overwriteName": "御主任务 2023年7月 1",
+ "infos": [{
+ "id": "0_A2550",
+ "face": 13,
+ "delay": 0.0,
+ "text": "最近，在运用了模拟技术的椭圆机上锻炼成了我最喜欢的一种方式。",
+ "form": 0,
+ "changeEffect": 0
+ }, {
+ "id": "0_A2551",
+ "face": 13,
+ "delay": 0.1,
+ "text": "[r]\n我今天想在勃艮第的葡萄田里跑跑看。",
+ "form": 0,
+ "changeEffect": 0
+ }, {
+ "id": "0_A2552",
+ "face": 1,
+ "delay": 0.3,
+ "text": "[r]\n如果可以的话，前辈要不要一起来？",
+ "form": 0,
+ "changeEffect": 0
+ }],
+ "conds": [{
+ "condType": 16,
+ "value": 81
+ }]
+ }, {
+ "overwriteName": "御主任务 2023年7月 2",
+ "infos": [{
+ "id": "0_A2560",
+ "face": 13,
+ "delay": 0.0,
+ "text": "差不多该到向日葵开花的季节了吧。",
+ "form": 0,
+ "changeEffect": 0
+ }, {
+ "id": "0_A2561",
+ "face": 22,
+ "delay": 0.1,
+ "text": "[r]\n不知是不是心理作用，总觉得梵高小姐也精神起来了。",
+ "form": 0,
+ "changeEffect": 0
+ }, {
+ "id": "0_A2562",
+ "face": 3,
+ "delay": 0.3,
+ "text": "[r]\n又好像没有……",
+ "form": 0,
+ "changeEffect": 0
+ }],
+ "conds": [{
+ "condType": 16,
+ "value": 81
+ }]
+ }, {
+ "overwriteName": "御主任务 2023年7月 3",
+ "infos": [{
+ "id": "0_A2570",
+ "face": 1,
+ "delay": 0.0,
+ "text": "夏日的气息越来越浓厚了呢，前辈。",
+ "form": 0,
+ "changeEffect": 0
+ }, {
+ "id": "0_A2571",
+ "face": 13,
+ "delay": 0.1,
+ "text": "[r]\n最近，我似乎终于明白了。",
+ "form": 0,
+ "changeEffect": 0
+ }, {
+ "id": "0_A2572",
+ "face": 22,
+ "delay": 0.1,
+ "text": "[r]\n夏天真正需要准备的，既不是确认夏装或泳装。",
+ "form": 0,
+ "changeEffect": 0
+ }, {
+ "id": "0_A2573",
+ "face": 2,
+ "delay": 0.3,
+ "text": "[r]\n而是无论发生什么都不惊讶的心理准备吧！",
+ "form": 0,
+ "changeEffect": 0
+ }],
+ "conds": [{
+ "condType": 16,
+ "value": 81
+ }]
}],
"scriptJsonAdditory": []
}, {
diff --git a/master/mstTotalLogin.json b/master/mstTotalLogin.json
index 73efc2be9..3bd62bce2 100644
--- a/master/mstTotalLogin.json
+++ b/master/mstTotalLogin.json
@@ -11914,7 +11914,7 @@
"messageOffset": [-50000, 0],
"buttonOffset": [0, 0],
"banners": [{
- "bannerUrl": "https://line3-patch-fate.bilibiligame.net/260/RewardPic/TotalBonus/1800wdl/c42ddy_k_00001_kai.png",
+ "bannerUrl": "https://line3-patch-fate.bilibiligame.net/2570/RewardPic/EventBonus/20230711/t4axde_k_01.png",
"offset": [2, 0],
"size": [748, 448],
"urlOpenType": 0
@@ -11930,7 +11930,7 @@
"messageOffset": [-50000, 0],
"buttonOffset": [0, 0],
"banners": [{
- "bannerUrl": "https://line3-patch-fate.bilibiligame.net/260/RewardPic/TotalBonus/1800wdl/c42ddy_k_00002_kai.png",
+ "bannerUrl": "https://line3-patch-fate.bilibiligame.net/2570/RewardPic/EventBonus/20230711/t4axde_k_02.png",
"offset": [2, 0],
"size": [748, 448],
"urlOpenType": 0
@@ -11946,7 +11946,7 @@
"messageOffset": [-50000, 0],
"buttonOffset": [0, 0],
"banners": [{
- "bannerUrl": "https://line3-patch-fate.bilibiligame.net/260/RewardPic/TotalBonus/1800wdl/c42ddy_k_00003_kai.png",
+ "bannerUrl": "https://line3-patch-fate.bilibiligame.net/2570/RewardPic/EventBonus/20230711/t4axde_k_03.png",
"offset": [2, 0],
"size": [748, 448],
"urlOpenType": 0
@@ -11962,7 +11962,7 @@
"messageOffset": [-50000, 0],
"buttonOffset": [0, 0],
"banners": [{
- "bannerUrl": "https://line3-patch-fate.bilibiligame.net/260/RewardPic/TotalBonus/1800wdl/c42ddy_k_00004_kai.png",
+ "bannerUrl": "https://line3-patch-fate.bilibiligame.net/2570/RewardPic/EventBonus/20230711/t4axde_k_04.png",
"offset": [2, 0],
"size": [748, 448],
"urlOpenType": 0
@@ -11978,7 +11978,7 @@
"messageOffset": [-50000, 0],
"buttonOffset": [0, 0],
"banners": [{
- "bannerUrl": "https://line3-patch-fate.bilibiligame.net/260/RewardPic/TotalBonus/1800wdl/c42ddy_k_00005_kai.png",
+ "bannerUrl": "https://line3-patch-fate.bilibiligame.net/2570/RewardPic/EventBonus/20230711/t4axde_k_05.png",
"offset": [2, 0],
"size": [748, 448],
"urlOpenType": 0
@@ -11994,7 +11994,7 @@
"messageOffset": [-50000, 0],
"buttonOffset": [0, 0],
"banners": [{
- "bannerUrl": "https://line3-patch-fate.bilibiligame.net/260/RewardPic/TotalBonus/1800wdl/c42ddy_k_00006_kai.png",
+ "bannerUrl": "https://line3-patch-fate.bilibiligame.net/2570/RewardPic/EventBonus/20230711/t4axde_k_06.png",
"offset": [2, 0],
"size": [748, 448],
"urlOpenType": 0
@@ -12010,7 +12010,7 @@
"messageOffset": [-50000, 0],
"buttonOffset": [0, 0],
"banners": [{
- "bannerUrl": "https://line3-patch-fate.bilibiligame.net/260/RewardPic/TotalBonus/1800wdl/c42ddy_k_00007_kai.png",
+ "bannerUrl": "https://line3-patch-fate.bilibiligame.net/2570/RewardPic/EventBonus/20230711/t4axde_k_07.png",
"offset": [2, 0],
"size": [748, 448],
"urlOpenType": 0
diff --git a/master/mstWarAdd.json b/master/mstWarAdd.json
index aec71f018..b4c1dff9b 100644
--- a/master/mstWarAdd.json
+++ b/master/mstWarAdd.json
@@ -5643,12 +5643,12 @@
"warId": 9999
}, {
"condType": 0,
- "endedAt": 2145888000,
+ "endedAt": 1690901999,
"overwriteId": 80380,
"overwriteStr": "",
"priority": 80380,
"script": {},
- "startedAt": 2145888000,
+ "startedAt": 1689832800,
"targetId": 0,
"type": 3,
"value": 0,