diff --git a/AssetStorage.txt b/AssetStorage.txt index bb2df9359..0966b4bed 100644 --- a/AssetStorage.txt +++ b/AssetStorage.txt @@ -1,7 +1,7 @@ -~4246882714 -@FgoDataVersion0066,20160420_1,20230706_12:45 +~1041363432 +@FgoDataVersion0066,20160420_1,20230712_18:04 8ab4915606c268882f496db16b0b25fd7bfcda83,DATA0,5135200,2006872706,ADV/1000000,,1 -7d8939cad11197cea6daa60916bc9df3585d289b,DATA0,368384,50851987,Android,, +3dfa7f973e240cda874ab09caf56e5029dcd9185,DATA0,366240,2668143493,Android,, 7dfd9fe479af4cbb9bd982c9f574d1be8a72c844,SYSTEM,7831688,2824071816,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,, @@ -9346,7 +9346,7 @@ b4d175fa15ca60619ad7a16d68db2d5207440664,DATA0,203840,1762243263,CharaGraph/9306 7bfdf1ed53dd0a4b72c01426aeb0835c33fff626,DATA0,199360,3621105761,CharaGraph/9306050,, 73c439a7061bd1331ff331a81b94e3660eebf9dc,DATA0,188512,1092242722,CharaGraph/9306060,, ccf1c8fd4b59a166a918dd15c372400c6aec4a79,DATA0,198240,3071905053,CharaGraph/9306070,, -c188be9a9c856bab1c07c0604992c64f3b2c55f9,DATA0,112096,3400249083,CharaGraph/9306080,, +b22723639929d649141b787b54524014f3c0ae0d,DATA0,111328,2967324113,CharaGraph/9306080,, 6704808d526c894668e02a970dafb4360f80caa9,DATA0,168256,3830499523,CharaGraph/9306090,, 883aae11b20bf4232b14023afc50c5ef68b71148,DATA0,151168,3697127167,CharaGraph/9306170,, eb9bc18de47bf0df3d06f9ad78a2e646683a1b2e,DATA0,145408,1491429094,CharaGraph/9306180,, @@ -9897,7 +9897,7 @@ a77cdc3c3e7679f238eb44909f05efeb24e0cdb9,DATA0,138368,2871801160,CharaGraph/9405 177887e7b84647aebf8e724ca6af5f37843302f4,DATA0,172064,2549159683,CharaGraph/9405340,, c12185503ca2a6ba456d64c0be2d675dcaf7fd1d,DATA0,170720,1234768828,CharaGraph/9405350,, 406e685e3d607aee46444abff23316dbe0be67a5,DATA0,126560,2292015200,CharaGraph/9405490,, -1ea9a157a267ffdd8dad2a42f43833e13bfd7f11,DATA0,138272,4045471304,CharaGraph/9405500,, +4a4c55e9b6243c83117adf4dee951de77b466fc8,DATA0,138080,255825414,CharaGraph/9405500,, 539a33d9b2199b3517cd92a4a1df0e93ed430fc7,DATA0,195712,3879251605,CharaGraph/9405510,, eaef476f49424c602974949d03897eef5011e5c9,DATA0,164352,2199927340,CharaGraph/9405520,, 4041de4900848e646a0b999d64864f7fb6e5f237,DATA0,149344,2218342973,CharaGraph/9405530,, @@ -16019,7 +16019,7 @@ f3c0c18a846a4cb341b2c92999cf69cf9203f0d1,DATA0,975488,4086562136,ScriptActionEnc bbb5273c10bf92c54659482c0ae5452c8529cfab,DATA0,1869504,3426285479,ScriptActionEncrypt/94/9403,, a868ab92cda79f33d767e68cc8a9ff77abe284c8,DATA0,1426048,2898706100,ScriptActionEncrypt/94/9404,, 826e967504d54c3327a05f23b6c000d263befcb8,DATA0,1363424,328224871,ScriptActionEncrypt/94/9405,, -8ec5d3043870e2e42cf63fb6e8781fc84911f113,DATA0,1220768,3712625636,ScriptActionEncrypt/94/9406,, +13f1c2d0df70b3aea31b297b5893cbe57ec483b3,DATA0,1220736,1242186260,ScriptActionEncrypt/94/9406,, e0bfcdff2a723e4b39af2a0e849b48e325be580e,DATA0,3616,2807296987,ScriptActionEncrypt/94/9499,, f954d7062877fd08158084314c56f19da26bfacf,SYSTEM,106752,1119294668,ScriptActionEncrypt/Common,, dce2d702d875390ff09ec4730361f25c41691ce3,SYSTEM,18048,1023578346,ScriptActionEncrypt/ScriptFileList,, @@ -18878,17 +18878,17 @@ ca4f3f2fdfa2e24cceae6cc06f12d271a68db031,DATA0,25440,1250351817,Servants/Status/ 9779564b7ecba5c444d30d92ac991ffa945fd54c,DATA0,24384,4231702670,Servants/Status/9943410,, a6f0590864fa29abb2e4ccaa22f2aaefee2d0a38,SYSTEM,955584,764940244,ShopBanners/DownloadShopBannerAtlas1,,1 5a353a43a34286e10e6dcb87b58ee28922646995,SYSTEM,1480544,2969944037,ShopBanners/DownloadShopBannerAtlas2,,1 -2639a0b54f3d69bfc56220a0bc1d7b9500949ec6,SYSTEM,1141792,420310314,ShopBanners/DownloadShopBannerAtlas3,,1 +993929dad0915a942851b8d96776889a510dba04,SYSTEM,1172256,434551507,ShopBanners/DownloadShopBannerAtlas3,,1 5cbd43239041d6e304a1b53f0f92806871965670,SYSTEM,88512,3902821639,ShopBanners/DownloadShopBannerAtlas4,, e4cde91efbd033f5c3047869155140397f46b8aa,SYSTEM,629984,1735846397,SkillIcons/DownloadSkillIcon,,1 -c3c0a8fb43cea285b9dea01e6ef34b1a693555ec,SYSTEM,950016,1076432489,SummonBanners/DownloadSummonBannerAtlas1,,1 -5f7a02a777bd9d3573fe49ea8dcea457ca7999d9,SYSTEM,879712,3681863098,SummonBanners/DownloadSummonBannerAtlas2,,1 -5502b8e2fe2fc775adfa1b442c432933a216c5b2,SYSTEM,917536,2609668787,SummonBanners/DownloadSummonBannerAtlas3,,1 -9dfe451c64dca7f03105d659bf23227372567904,SYSTEM,743040,2774282307,SummonBanners/DownloadSummonBannerAtlas4,,1 -eb8896f94ba2e73bdcaf7dab4dd126a7aa052f61,SYSTEM,554080,3317619988,SummonBanners/DownloadSummonBannerAtlas5,,1 -9ee4d0cc5e81cf06e4c50fa13d04ed8928a315b1,SYSTEM,688192,394654358,SummonBanners/DownloadSummonBannerAtlas6,,1 -604e95c672d588224017a63b1dd87e84f06a80e0,SYSTEM,690048,3893508639,SummonBanners/DownloadSummonBannerAtlas7,,1 -055e408a05b5d541ba71a5b271e8edc651690e09,SYSTEM,464800,3402709438,SummonBanners/DownloadSummonBannerAtlas8,,1 +464307863a60eed4430a5e1d58c3e730f08b7bef,SYSTEM,925376,1690896971,SummonBanners/DownloadSummonBannerAtlas1,,1 +439f46c25c22359675ce9873bcf6b8b059896682,SYSTEM,885280,352869299,SummonBanners/DownloadSummonBannerAtlas2,,1 +cf80b5285675da59b095720a4bac95dc2c8af2d0,SYSTEM,930784,1038809991,SummonBanners/DownloadSummonBannerAtlas3,,1 +315ecea4d8f99c0defbed53309391ea094b7c486,SYSTEM,753280,1069030049,SummonBanners/DownloadSummonBannerAtlas4,,1 +793ec2c5b7fab1c0705fcf741ca1b57887a9ea2d,SYSTEM,587104,1533037227,SummonBanners/DownloadSummonBannerAtlas5,,1 +1f18749923178e2b610c90bb3dbe6e1c27b0fee9,SYSTEM,689184,3835196456,SummonBanners/DownloadSummonBannerAtlas6,,1 +1c3e5b0c28263a9d1094ac1cb994f321d4f10b43,SYSTEM,689856,2436451652,SummonBanners/DownloadSummonBannerAtlas7,,1 +49298bcd640ce9b61d551fa850b94b4208ab0df5,SYSTEM,690496,4078901550,SummonBanners/DownloadSummonBannerAtlas8,,1 d238b08348a39d769bb5ca568317fdfda0502f0e,SYSTEM,102240,2024692168,Terminal/EarthCore/01,, 7a29ab187f4bdbf25e123fd54cf73dd5014b34b2,SYSTEM,48064,1224763176,Terminal/EarthCore/02,, 9d39b14fe25cc75843f71312b18b82d5adcfdb76,SYSTEM,234208,3472572782,Terminal/Effect,, diff --git a/ScriptActionEncrypt/94/9406/9406220320.txt b/ScriptActionEncrypt/94/9406/9406220320.txt index 347fd8019..208f8f743 100644 --- a/ScriptActionEncrypt/94/9406/9406220320.txt +++ b/ScriptActionEncrypt/94/9406/9406220320.txt @@ -551,7 +551,7 @@ 嗯,畢竟是原始節奏嘛![r]總之就是要咚咚地響個不停! [k] -?2:缺少[#打擊樂器:Percussion]呢…… +?2:[#打擊樂器:Percussion]不太夠呢…… [charaFace C 7] @伊莉莎白 @@ -567,12 +567,12 @@ [charaFace C 1] @伊莉莎白 -嗯嗯! 還有[#僧侶:Bishop]也不錯呢。[r]能用治癒的力量幫忙回復! +嗯嗯! 還有[#僧侶:Bishop]也不錯呢。[r]能用治癒的力量幫忙恢復! [k] [charaFace A 12] @瑪修 -回復啊…… +恢復啊…… [k] [messageOff] @@ -628,7 +628,7 @@ [charaFadein J 0.4 0,-50] @武僧 -唔,回復? 還不要緊啦,[r]靠腎上腺素分泌的腦內啡,應該就能自行回復! +唔,恢復? 還不要緊啦,[r]靠腎上腺素分泌的腦內啡,應該就能自行恢復! [k] @武僧 @@ -687,7 +687,7 @@ [charaFadein C 0.1 0,-50] @伊莉莎白 -……回復我們還是自己想辦法吧! +……恢復我們還是自己想辦法吧! [k] ?1:說得對! @@ -698,7 +698,7 @@ [charaFadein A 0.1 0,-50] @瑪修 -人選意外地難找呢。[r]其他能回復的人…… +人選意外地難找呢。[r]其他能恢復的人…… [k] ?2:就沒有其他人了嗎? @@ -726,7 +726,7 @@ [charaFadein L 0.4 0,-50] @桑松 -嗯,回復完成了。 +嗯,恢復完成了。 [k] @桑松 diff --git a/ScriptActionEncrypt/94/9406/9406220360.txt b/ScriptActionEncrypt/94/9406/9406220360.txt index 7c65f6d0c..cdc3e7fc4 100644 --- a/ScriptActionEncrypt/94/9406/9406220360.txt +++ b/ScriptActionEncrypt/94/9406/9406220360.txt @@ -113,7 +113,7 @@ [charaFace C 0] @尼托克里絲 -因為我無比的強大![r]因為我可是一直窩在這裡鑽研魔術呢! +因為我無比的強大![r]我可是一直窩在這裡鑽研魔術呢! [k] [charaFadeout C 0.1] diff --git a/ScriptActionEncrypt/94/9406/9406220370.txt b/ScriptActionEncrypt/94/9406/9406220370.txt index 219a873ea..5628e4100 100644 --- a/ScriptActionEncrypt/94/9406/9406220370.txt +++ b/ScriptActionEncrypt/94/9406/9406220370.txt @@ -357,7 +357,7 @@ [charaChange F 98105300 0 normal 0] [wait charaMove F] @茨木童子 -其實沒什麼目的。只是不由自主地跟來了而已。[r](嘴裡塞得滿滿的,而且正在咀嚼著。) +其實沒什麼目的。只是不由自主地跟來了而已。[r](不知道嘴裡塞滿什麼,而且正在咀嚼著。) [k] [charaFadeout F 0.1] @@ -391,7 +391,7 @@ [charaFace F 0] [charaFadein F 0.1 0,-50] @茨木童子 -不知道。吾可不知道這種暗號。[r]不過那個什麼餡餅很好吃。 +不知道。吾可不知道這種暗號。[r]不過那個什麼[#餡餅:tarte]很好吃。 [k] [charaFace F 1] diff --git a/ScriptActionEncrypt/94/9406/9406220430.txt b/ScriptActionEncrypt/94/9406/9406220430.txt index 070f1ac91..9360054d5 100644 --- a/ScriptActionEncrypt/94/9406/9406220430.txt +++ b/ScriptActionEncrypt/94/9406/9406220430.txt @@ -832,7 +832,7 @@ 你剛才猶豫了一下吧…… [k] -?1:小伊莉!? +?1:伊莉醬!? ?! [charaFadeout C 0.1] @@ -956,7 +956,7 @@ [charaFace E 1] @清姬 -但當我看到這位叫小伊莉的女人……[r]似乎……感受到了一種宿命。 +但當我看到這位叫伊莉醬的女人……[r]似乎……感受到了一種宿命。 [k] [charaFadeout E 0.1] diff --git a/ScriptActionEncrypt/94/9406/9406220440.txt b/ScriptActionEncrypt/94/9406/9406220440.txt index b2de18d9e..b5ac57c9e 100644 --- a/ScriptActionEncrypt/94/9406/9406220440.txt +++ b/ScriptActionEncrypt/94/9406/9406220440.txt @@ -97,7 +97,7 @@ [charaFace D 0] @伊莉莎白 -[#勇者:偶像]小伊莉的冒險在打倒女王前絕不會結束! +[#勇者:偶像]伊莉醬的冒險在打倒女王前絕不會結束! [k] [charaFace D 2] @@ -349,7 +349,7 @@ [k] @弗拉德三世 -所謂從者,[r]是抽取一位英雄的某個側面,並進行召喚。 +所謂從者,[r]是抽取一位英雄的某一面,並進行召喚。 [k] @弗拉德三世 @@ -423,7 +423,7 @@ [charaFace I 0] @Dr.羅曼 -啊,不,畢竟是不同的側面,[r]所以憤怒的基準也不一樣吧! +啊,不,畢竟是不同的另一面,[r]所以憤怒的基準也不一樣吧! [k] [charaFace I 2] diff --git a/ScriptActionEncrypt/94/9406/9406220541.txt b/ScriptActionEncrypt/94/9406/9406220541.txt index 88a9bcb46..1117a523f 100644 --- a/ScriptActionEncrypt/94/9406/9406220541.txt +++ b/ScriptActionEncrypt/94/9406/9406220541.txt @@ -299,7 +299,7 @@ [charaFadeout A 0.1] [wt 0.1] -?2:我會追隨小伊莉的! +?2:我會追隨伊莉醬的! [charaFace D 6] @伊莉莎白 diff --git a/ScriptActionEncrypt/94/9406/9406220551.txt b/ScriptActionEncrypt/94/9406/9406220551.txt index cf3ff5546..1dc158569 100644 --- a/ScriptActionEncrypt/94/9406/9406220551.txt +++ b/ScriptActionEncrypt/94/9406/9406220551.txt @@ -752,7 +752,7 @@ [k] @克麗奧佩脫拉 -曾幾何時,[r]我變得只願意將身為法老的側面展現出來…… +曾幾何時,[r]我變得只願意將身為法老的那一面展現出來…… [k] ?! diff --git a/ScriptActionEncrypt/94/9406/9406220620.txt b/ScriptActionEncrypt/94/9406/9406220620.txt index 4fa414fc7..8fa513bc3 100644 --- a/ScriptActionEncrypt/94/9406/9406220620.txt +++ b/ScriptActionEncrypt/94/9406/9406220620.txt @@ -1329,7 +1329,7 @@ HA HA HA HA HA! [k] @瑪修 -就算要用『不同的側面』來解釋,[r]我覺得好像也有點牽強,前輩。 +就算要用『不同的另一面』來解釋,[r]我覺得好像也有點牽強,前輩。 [k] [charaFadeout C 0.1] diff --git a/ScriptActionEncrypt/94/9406/9406220830.txt b/ScriptActionEncrypt/94/9406/9406220830.txt index 20afa6885..4ad9dc39d 100644 --- a/ScriptActionEncrypt/94/9406/9406220830.txt +++ b/ScriptActionEncrypt/94/9406/9406220830.txt @@ -1546,7 +1546,7 @@ [k] @刑部姬 -如果有[#硬核:Hardcore]模式就更理想了! +如果有[#困難:Hardcore]模式就更理想了! [k] [charaFadeout D 0.1] diff --git a/ScriptActionEncrypt/94/9406/9406220930.txt b/ScriptActionEncrypt/94/9406/9406220930.txt index c2d414ec8..75e5a3a81 100644 --- a/ScriptActionEncrypt/94/9406/9406220930.txt +++ b/ScriptActionEncrypt/94/9406/9406220930.txt @@ -911,7 +911,7 @@ Now~ [charaFace B 3] [charaFadein B 0.1 0,-50] @刑部姬 -萬事都有例外嘛! +凡事都有例外嘛! [k] [charaFace B 2] diff --git a/ScriptActionEncrypt/94/9406/9406220940.txt b/ScriptActionEncrypt/94/9406/9406220940.txt index 717091c6f..cf9371ead 100644 --- a/ScriptActionEncrypt/94/9406/9406220940.txt +++ b/ScriptActionEncrypt/94/9406/9406220940.txt @@ -147,7 +147,7 @@ [charaFadeinFSL E 0.1 -256,-50] [charaFadeinFSR A 0.1 256,-50] @不~夜~醬 -……卡米拉,你的另一個側面。[r]該怎麼說呢…… +……卡米拉,你的另一面。[r]該怎麼說呢…… [k] @卡米拉 diff --git a/ScriptActionEncrypt/94/9406/9406220951.txt b/ScriptActionEncrypt/94/9406/9406220951.txt index 6bd590b71..add25bcb0 100644 --- a/ScriptActionEncrypt/94/9406/9406220951.txt +++ b/ScriptActionEncrypt/94/9406/9406220951.txt @@ -389,7 +389,7 @@ [charaFace B 1] [charaFadein B 0.1 0,-50] @伊莉莎白 -……不過,反正都這樣了![r]就算我的側面再多出兩個人也無所謂啦! +……不過,反正都這樣了![r]就算我的另一面再多出兩個人也無所謂啦! [k] @伊莉莎白 diff --git a/gamedatatop.json b/gamedatatop.json index 539fd3140..341f75374 100644 --- a/gamedatatop.json +++ b/gamedatatop.json @@ -2,7 +2,7 @@ "response": [{ "resCode": "00", "success": { - "version": 433, + "version": 435, "master": "", "useProtoBuf": 1, "isCloseSvtGetEffect": "0000", @@ -15,7 +15,7 @@ "FixVersion_iOS": 2023061600, "voiceLabelSet": 1, "npVoiceLabelSet": 1, - "assetStorageVersion": 202307061242 + "assetStorageVersion": 202307121801 }, "fail": {}, "nid": "gamedata" diff --git a/master/mstBanner.json b/master/mstBanner.json index 54bb1b627..291ebba04 100644 --- a/master/mstBanner.json +++ b/master/mstBanner.json @@ -18,7 +18,7 @@ "noticeAt": 1689051600, "finishedAt": 1692075599, "linkType": 1, - "linkBody": "", + "linkBody": "https://line1-patch.fate-go.com.tw/manage/html/Notice/Game/tw/2023-07-10/activityNotice_4023_1688981322.html", "deviceType": 0, "dialogImage": "0", "dialogText": "0" @@ -30,7 +30,7 @@ "noticeAt": 1689051600, "finishedAt": 1691855999, "linkType": 1, - "linkBody": "", + "linkBody": "https://line1-patch.fate-go.com.tw/manage/html/Notice/Game/tw/2023-07-10/activityNotice_4022_1688978660.html", "deviceType": 0, "dialogImage": "0", "dialogText": "0" @@ -42,7 +42,7 @@ "noticeAt": 1689051600, "finishedAt": 1690261199, "linkType": 1, - "linkBody": "", + "linkBody": "https://line1-patch.fate-go.com.tw/manage/html/Notice/Game/tw/2023-07-10/activityNotice_4021_1688978119.html", "deviceType": 0, "dialogImage": "0", "dialogText": "0" @@ -54,6 +54,54 @@ "noticeAt": 1689051600, "finishedAt": 1690261199, "linkType": 1, + "linkBody": "https://line1-patch.fate-go.com.tw/manage/html/Notice/Game/tw/2023-07-10/activityNotice_4020_1688977966.html", + "deviceType": 0, + "dialogImage": "0", + "dialogText": "0" +}, { + "id": 80424, + "bannerId": 80424, + "bannerPriority": 244, + "terminalBannerPriority": 244, + "noticeAt": 1689656400, + "finishedAt": 1692075599, + "linkType": 1, + "linkBody": "", + "deviceType": 0, + "dialogImage": "0", + "dialogText": "0" +}, { + "id": 80425, + "bannerId": 80425, + "bannerPriority": 245, + "terminalBannerPriority": 245, + "noticeAt": 1689656400, + "finishedAt": 1690520399, + "linkType": 1, + "linkBody": "", + "deviceType": 0, + "dialogImage": "0", + "dialogText": "0" +}, { + "id": 80426, + "bannerId": 80426, + "bannerPriority": 246, + "terminalBannerPriority": 246, + "noticeAt": 1689840000, + "finishedAt": 1690693199, + "linkType": 1, + "linkBody": "", + "deviceType": 0, + "dialogImage": "0", + "dialogText": "0" +}, { + "id": 80427, + "bannerId": 80427, + "bannerPriority": 247, + "terminalBannerPriority": 247, + "noticeAt": 1690012800, + "finishedAt": 1690865999, + "linkType": 1, "linkBody": "", "deviceType": 0, "dialogImage": "0", diff --git a/master/mstEvent.json b/master/mstEvent.json index 48a0f8ae2..c3c4e2ae7 100644 --- a/master/mstEvent.json +++ b/master/mstEvent.json @@ -462,6 +462,33 @@ "combineMessageImageId": "2009101" }], "shortName": "" +}, { + "id": 20092, + "baseEventId": 0, + "type": 5, + "openType": 1, + "name": "萬聖節活動限定從者\n獲得經驗值2倍!", + "detail": "萬聖節活動限定從者\n獲得經驗值2倍!", + "noticeBannerId": 0, + "bannerId": 0, + "iconId": 0, + "bannerPriority": 0, + "openHours": 0, + "intervalHours": 0, + "noticeAt": 1689656400, + "startedAt": 1689656400, + "endedAt": 1692075599, + "finishedAt": 1692075599, + "materialOpenedAt": 2145888000, + "linkType": 1, + "linkBody": "/summon/detail_summon_1.html", + "deviceType": 0, + "myroomBgId": 0, + "myroomBgmId": 0, + "script": [{ + "combineMessageImageId": "2009401" + }], + "shortName": "" }, { "id": 20094, "baseEventId": 0, @@ -5301,4 +5328,29 @@ "myroomBgmId": 0, "script": [], "shortName": "" +}, { + "id": 80340, + "baseEventId": 0, + "type": 12, + "openType": 1, + "name": "恰赫季斯.萬聖節.三部曲\n終極豪華總集篇!", + "detail": "恰赫季斯.萬聖節.三部曲\n終極豪華總集篇!", + "noticeBannerId": 80328, + "bannerId": 80329, + "iconId": 80329, + "bannerPriority": 830000, + "openHours": 0, + "intervalHours": 0, + "noticeAt": 1689656400, + "startedAt": 1689656400, + "endedAt": 1692075599, + "finishedAt": 1692680399, + "materialOpenedAt": 2145888000, + "linkType": 1, + "linkBody": "/summon/detail_summon_1.html", + "deviceType": 0, + "myroomBgId": 0, + "myroomBgmId": 0, + "script": [], + "shortName": "" }] \ No newline at end of file diff --git a/master/mstEventCampaign.json b/master/mstEventCampaign.json index 38151b76d..0a57a728e 100644 --- a/master/mstEventCampaign.json +++ b/master/mstEventCampaign.json @@ -1219,7 +1219,7 @@ "eventId": 20092, "idx": 1, "target": 2, - "targetIds": [101000, 502600, 1000400, 1000500, 404600], + "targetIds": [101000, 502600, 1000400, 1000500], "value": 2000, "warIds": [] }, { diff --git a/master/mstEventMission.json b/master/mstEventMission.json index 7860181ef..9e630e5cf 100644 --- a/master/mstEventMission.json +++ b/master/mstEventMission.json @@ -51714,10 +51714,10 @@ "type": 2 }, { "bannerGroup": 0, - "closedAt": 499875200, + "closedAt": 1691337599, "detail": "完成本週所有的御主任務", "dispNo": 1, - "endedAt": 499875200, + "endedAt": 1690732799, "flag": 0, "giftId": 419, "id": 2001883, @@ -51728,14 +51728,14 @@ "priority": 2001226, "rewardRarity": 0, "rewardType": 1, - "startedAt": 499875200, + "startedAt": 1690128000, "type": 2 }, { "bannerGroup": 0, - "closedAt": 499875200, + "closedAt": 1691337599, "detail": "擊敗5騎從者", "dispNo": 2, - "endedAt": 499875200, + "endedAt": 1690732799, "flag": 0, "giftId": 419, "id": 2001884, @@ -51746,14 +51746,14 @@ "priority": 2001227, "rewardRarity": 0, "rewardType": 1, - "startedAt": 499875200, + "startedAt": 1690128000, "type": 2 }, { "bannerGroup": 0, - "closedAt": 499875200, + "closedAt": 1691337599, "detail": "擊敗『Saber』『Caster』職階中任意一種敵人15個(從者以及部分Boss除外)", "dispNo": 3, - "endedAt": 499875200, + "endedAt": 1690732799, "flag": 0, "giftId": 419, "id": 2001885, @@ -51764,14 +51764,14 @@ "priority": 2001228, "rewardRarity": 0, "rewardType": 1, - "startedAt": 499875200, + "startedAt": 1690128000, "type": 2 }, { "bannerGroup": 0, - "closedAt": 499875200, + "closedAt": 1691337599, "detail": "擊敗『Archer』『Lancer』職階中任意一種敵人15個(從者以及部分首領級敵方除外)", "dispNo": 4, - "endedAt": 499875200, + "endedAt": 1690732799, "flag": 0, "giftId": 419, "id": 2001886, @@ -51782,14 +51782,14 @@ "priority": 2001229, "rewardRarity": 0, "rewardType": 1, - "startedAt": 499875200, + "startedAt": 1690128000, "type": 2 }, { "bannerGroup": 0, - "closedAt": 499875200, + "closedAt": 1691337599, "detail": "擊敗『Rider』『Assassin』『Berserker』職階中任意一種敵人15個(從者以及部分首領級敵方除外)", "dispNo": 5, - "endedAt": 499875200, + "endedAt": 1690732799, "flag": 0, "giftId": 419, "id": 2001887, @@ -51800,14 +51800,14 @@ "priority": 2001230, "rewardRarity": 0, "rewardType": 1, - "startedAt": 499875200, + "startedAt": 1690128000, "type": 2 }, { "bannerGroup": 0, - "closedAt": 499875200, + "closedAt": 1691337599, "detail": "獲得戰利品「睿智的業火」「睿智的猛火」「睿智的大火」「睿智的燈火」「睿智的種火」任意一種15個", "dispNo": 6, - "endedAt": 499875200, + "endedAt": 1690732799, "flag": 0, "giftId": 419, "id": 2001888, @@ -51818,14 +51818,14 @@ "priority": 2001231, "rewardRarity": 0, "rewardType": 1, - "startedAt": 499875200, + "startedAt": 1690128000, "type": 2 }, { "bannerGroup": 0, - "closedAt": 499875200, + "closedAt": 1691337599, "detail": "獲得戰利品「睿智的業火」「睿智的猛火」「睿智的大火」「睿智的燈火」「睿智的種火」任意一種30個", "dispNo": 7, - "endedAt": 499875200, + "endedAt": 1690732799, "flag": 0, "giftId": 419, "id": 2001889, @@ -51836,7 +51836,7 @@ "priority": 2001232, "rewardRarity": 0, "rewardType": 1, - "startedAt": 499875200, + "startedAt": 1690128000, "type": 2 }, { "bannerGroup": 0, diff --git a/master/mstEventSvt.json b/master/mstEventSvt.json index 766670782..8af82cf3a 100644 --- a/master/mstEventSvt.json +++ b/master/mstEventSvt.json @@ -1057,12 +1057,12 @@ "script": {}, "commonReleaseId": 0 }, { - "endedAt": 1893427200, + "endedAt": 1692075599, "eventId": 80340, "getMessage": "伊莉莎白.巴托里〔Brave〕\n已正式加入隊伍。\n活動結束後也會作為\n已持有的從者繼續存在。\n\n同時,可以在「萬聖節.復活歸來!\n~砂塵的女王與暗黑的使徒~」的\n活動道具兌換中獲得更多的\n伊莉莎白.巴托里〔Brave〕。", "joinMessage": "伊莉莎白.巴托里〔Brave〕在\n「恰赫季斯.萬聖節.三部曲\n終極豪華總集篇!」\n活動期間限時加入。\n\n在活動中通關特定任務後\n即可正式加入。", "leaveMessage": "~關於臨時加入從者的離隊~\n\n因未能在活動期間內\n達成正式加入條件,\n伊莉莎白.巴托里〔Brave〕\n已離開隊伍。\n\n同時已自動卸除其裝備的概念禮裝。", - "startedAt": 1893427200, + "startedAt": 1689656400, "svtId": 101000, "type": 1, "name": "", diff --git a/master/mstGacha.json b/master/mstGacha.json index 241513024..ff9a2e07d 100644 --- a/master/mstGacha.json +++ b/master/mstGacha.json @@ -1515,4 +1515,115 @@ "type": 1, "warId": 100, "flag": 2 +}, { + "adjustId": 50007491, + "bannerQuestId": 1000002, + "bannerQuestPhase": 1, + "baseId": 10016, + "beforeDrawNum": 1, + "beforeGachaId": 101, + "closedAt": 1690520399, + "condQuestId": 1000002, + "condQuestPhase": 0, + "detailUrl": "", + "drawNum1": 1, + "drawNum2": 11, + "extraAddCount1": 1, + "extraAddCount2": 0, + "extraGroupId1": 139, + "extraGroupId2": 0, + "freeDrawFlag": 0, + "gachaGroupId": 0, + "gachaProbabilityId": 5002211, + "gachaSlot": 139, + "id": 5002211, + "imageId": 81713, + "maxDrawNum": 0, + "name": "恰赫季斯‧萬聖節‧三部曲PICK UP召喚1", + "openedAt": 1689656400, + "pickupClosedAt": 1690520399, + "pickupId": 50009582, + "pickupOpenedAt": 1689656400, + "priority": 5002211, + "rarityId": 3, + "shopId1": 4, + "shopId2": 5, + "ticketItemId": 4001, + "type": 1, + "warId": 100, + "flag": 2 +}, { + "adjustId": 50007501, + "bannerQuestId": 1000002, + "bannerQuestPhase": 1, + "baseId": 10016, + "beforeDrawNum": 1, + "beforeGachaId": 101, + "closedAt": 1690693199, + "condQuestId": 1000002, + "condQuestPhase": 0, + "detailUrl": "", + "drawNum1": 1, + "drawNum2": 11, + "extraAddCount1": 1, + "extraAddCount2": 0, + "extraGroupId1": 140, + "extraGroupId2": 0, + "freeDrawFlag": 0, + "gachaGroupId": 0, + "gachaProbabilityId": 5002218, + "gachaSlot": 140, + "id": 5002218, + "imageId": 81720, + "maxDrawNum": 0, + "name": "恰赫季斯‧萬聖節‧三部曲PICK UP召喚2", + "openedAt": 1689840000, + "pickupClosedAt": 1690693199, + "pickupId": 50009652, + "pickupOpenedAt": 1689840000, + "priority": 5002218, + "rarityId": 3, + "shopId1": 4, + "shopId2": 5, + "ticketItemId": 4001, + "type": 1, + "warId": 100, + "flag": 2 +}, { + "adjustId": 50007511, + "bannerQuestId": 1000002, + "bannerQuestPhase": 1, + "baseId": 10016, + "beforeDrawNum": 1, + "beforeGachaId": 101, + "closedAt": 1690865999, + "condQuestId": 1000002, + "condQuestPhase": 0, + "detailUrl": "", + "drawNum1": 1, + "drawNum2": 11, + "extraAddCount1": 1, + "extraAddCount2": 0, + "extraGroupId1": 141, + "extraGroupId2": 0, + "freeDrawFlag": 0, + "gachaGroupId": 0, + "gachaProbabilityId": 5002219, + "gachaSlot": 141, + "id": 5002219, + "imageId": 81721, + "maxDrawNum": 0, + "name": "恰赫季斯‧萬聖節‧三部曲PICK UP召喚3", + "openedAt": 1690012800, + "pickupClosedAt": 1690865999, + "pickupId": 50009662, + "pickupOpenedAt": 1690012800, + "priority": 5002219, + "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 f6a8c589f..d3f24fdd3 100644 --- a/master/mstGachaAppend.json +++ b/master/mstGachaAppend.json @@ -251,4 +251,37 @@ "extraAddCount": 0, "maxDrawNum": 0, "flag": 1 +}, { + "gachaId": 5002211, + "idx": 3, + "type": 7, + "shopId": 8, + "gachaGroupId": 33, + "drawNum": 1, + "extraGroupId": 0, + "extraAddCount": 0, + "maxDrawNum": 0, + "flag": 1 +}, { + "gachaId": 5002218, + "idx": 3, + "type": 7, + "shopId": 8, + "gachaGroupId": 34, + "drawNum": 1, + "extraGroupId": 0, + "extraAddCount": 0, + "maxDrawNum": 0, + "flag": 1 +}, { + "gachaId": 5002219, + "idx": 3, + "type": 7, + "shopId": 8, + "gachaGroupId": 35, + "drawNum": 1, + "extraGroupId": 0, + "extraAddCount": 0, + "maxDrawNum": 0, + "flag": 1 }] \ No newline at end of file diff --git a/master/mstGachaGroup.json b/master/mstGachaGroup.json index 7baa3239d..f4602b3bc 100644 --- a/master/mstGachaGroup.json +++ b/master/mstGachaGroup.json @@ -196,4 +196,40 @@ "maxDrawNum": 1, "tutorialImageIds": ["Tutorial/tutorial_2007", "tutorial_2007"], "flag": 1 +}, { + "id": 35, + "name": "用1個付費聖晶石進行每日1次聖晶石召喚", + "maxDrawNum": 1, + "tutorialImageIds": ["Tutorial/tutorial_2007", "tutorial_2007"], + "flag": 1 +}, { + "id": 36, + "name": "用1個付費聖晶石進行每日1次聖晶石召喚", + "maxDrawNum": 1, + "tutorialImageIds": ["Tutorial/tutorial_2007", "tutorial_2007"], + "flag": 1 +}, { + "id": 37, + "name": "用1個付費聖晶石進行每日1次聖晶石召喚", + "maxDrawNum": 1, + "tutorialImageIds": ["Tutorial/tutorial_2007", "tutorial_2007"], + "flag": 1 +}, { + "id": 38, + "name": "用1個付費聖晶石進行每日1次聖晶石召喚", + "maxDrawNum": 1, + "tutorialImageIds": ["Tutorial/tutorial_2007", "tutorial_2007"], + "flag": 1 +}, { + "id": 39, + "name": "用1個付費聖晶石進行每日1次聖晶石召喚", + "maxDrawNum": 1, + "tutorialImageIds": ["Tutorial/tutorial_2007", "tutorial_2007"], + "flag": 1 +}, { + "id": 40, + "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 6c82092e1..84be59823 100644 --- a/master/mstGachaPickupCollateral.json +++ b/master/mstGachaPickupCollateral.json @@ -238,4 +238,22 @@ "rarity": 5, "tiggerDrawNum": 0, "maxGetNum": 1 +}, { + "gachaPickupCollateralGroupId": 2023051224, + "type": 1, + "rarity": 5, + "tiggerDrawNum": 0, + "maxGetNum": 1 +}, { + "gachaPickupCollateralGroupId": 2023051225, + "type": 1, + "rarity": 5, + "tiggerDrawNum": 0, + "maxGetNum": 1 +}, { + "gachaPickupCollateralGroupId": 2023051226, + "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 15e030600..87ee179a3 100644 --- a/master/mstGachaPickupCollateralGroup.json +++ b/master/mstGachaPickupCollateralGroup.json @@ -118,4 +118,13 @@ }, { "id": 2023051223, "gachaId": 5002203 +}, { + "id": 2023051224, + "gachaId": 5002211 +}, { + "id": 2023051225, + "gachaId": 5002218 +}, { + "id": 2023051226, + "gachaId": 5002219 }] \ No newline at end of file diff --git a/master/mstGachaSub.json b/master/mstGachaSub.json index f43cf781b..385ea188c 100644 --- a/master/mstGachaSub.json +++ b/master/mstGachaSub.json @@ -88,6 +88,96 @@ "openedAt": 1688446800, "closedAt": 1689051599, "commonReleaseId": 20060301 +}, { + "gachaId": 1, + "id": 123, + "priority": 1, + "imageId": 123, + "adjustAddId": 123, + "openedAt": 1689656400, + "closedAt": 1689839999, + "commonReleaseId": 0 +}, { + "gachaId": 1, + "id": 124, + "priority": 2, + "imageId": 123, + "adjustAddId": 124, + "openedAt": 1689656400, + "closedAt": 1689839999, + "commonReleaseId": 20060301 +}, { + "gachaId": 1, + "id": 125, + "priority": 1, + "imageId": 125, + "adjustAddId": 125, + "openedAt": 1689840000, + "closedAt": 1690012799, + "commonReleaseId": 0 +}, { + "gachaId": 1, + "id": 126, + "priority": 2, + "imageId": 125, + "adjustAddId": 126, + "openedAt": 1689840000, + "closedAt": 1690012799, + "commonReleaseId": 20060301 +}, { + "gachaId": 1, + "id": 127, + "priority": 1, + "imageId": 127, + "adjustAddId": 127, + "openedAt": 1690012800, + "closedAt": 1690520399, + "commonReleaseId": 0 +}, { + "gachaId": 1, + "id": 128, + "priority": 2, + "imageId": 127, + "adjustAddId": 128, + "openedAt": 1690012800, + "closedAt": 1690520399, + "commonReleaseId": 20060301 +}, { + "gachaId": 1, + "id": 129, + "priority": 1, + "imageId": 129, + "adjustAddId": 129, + "openedAt": 1690520400, + "closedAt": 1690693199, + "commonReleaseId": 0 +}, { + "gachaId": 1, + "id": 130, + "priority": 2, + "imageId": 129, + "adjustAddId": 130, + "openedAt": 1690520400, + "closedAt": 1690693199, + "commonReleaseId": 20060301 +}, { + "gachaId": 1, + "id": 131, + "priority": 1, + "imageId": 131, + "adjustAddId": 131, + "openedAt": 1690693200, + "closedAt": 1690865999, + "commonReleaseId": 0 +}, { + "gachaId": 1, + "id": 132, + "priority": 2, + "imageId": 131, + "adjustAddId": 132, + "openedAt": 1690693200, + "closedAt": 1690865999, + "commonReleaseId": 20060301 }, { "gachaId": 1, "id": 10000, diff --git a/master/mstMasterMission.json b/master/mstMasterMission.json index 59993a6df..12c8ce221 100644 --- a/master/mstMasterMission.json +++ b/master/mstMasterMission.json @@ -2215,13 +2215,13 @@ "priority": 0, "startedAt": 1689523200 }, { - "closedAt": 4294967295, - "endedAt": 4294967295, + "closedAt": 1691337599, + "endedAt": 1690732799, "id": 100272, "imageId": 0, "name": "0", "priority": 0, - "startedAt": 4294967295 + "startedAt": 1690128000 }, { "closedAt": 4294967295, "endedAt": 4294967295, diff --git a/master/mstMyroomAdd.json b/master/mstMyroomAdd.json index 7650d5939..bbd97a5ae 100644 --- a/master/mstMyroomAdd.json +++ b/master/mstMyroomAdd.json @@ -1356,8 +1356,8 @@ "condType": 1, "condValue": 94062201, "condValue2": 0, - "startedAt": 1893427200, - "endedAt": 1893427200 + "startedAt": 1689656400, + "endedAt": 1692075599 }, { "id": 80340, "type": 2, @@ -1366,8 +1366,8 @@ "condType": 1, "condValue": 94062201, "condValue2": 0, - "startedAt": 1893427200, - "endedAt": 1893427200 + "startedAt": 1689656400, + "endedAt": 1692075599 }, { "id": 80341, "type": 1, diff --git a/master/mstQuest.json b/master/mstQuest.json index 2f4c6d8b0..16057b1ce 100644 --- a/master/mstQuest.json +++ b/master/mstQuest.json @@ -337662,6 +337662,582 @@ "scriptQuestId": 0, "spotId": 99001, "type": 5 +}, { + "actConsume": 0, + "afterActionVals": [], + "afterClear": 1, + "bannerId": 94062201, + "bannerType": 0, + "beforeActionVals": [], + "chaldeaGateCategory": 1, + "chapterId": 0, + "chapterSubId": 0, + "chapterSubStr": "", + "charaIconId": 0, + "closedAt": 1692075599, + "consumeType": 1, + "displayHours": 0, + "flag": 0, + "forceOperation": 0, + "giftIconId": 0, + "giftId": 101, + "hasStartAction": 0, + "iconId": 94062201, + "id": 94062201, + "intervalHours": 0, + "name": "序幕 一切始於恰赫季斯", + "nameRuby": "", + "noticeAt": 1689656400, + "openedAt": 1689656400, + "priority": 94062298, + "recommendLv": "1", + "scriptQuestId": 0, + "spotId": 912099, + "type": 1 +}, { + "actConsume": 5, + "afterActionVals": [], + "afterClear": 1, + "bannerId": 94062201, + "bannerType": 0, + "beforeActionVals": [], + "chaldeaGateCategory": 1, + "chapterId": 0, + "chapterSubId": 0, + "chapterSubStr": "", + "charaIconId": 0, + "closedAt": 1692075599, + "consumeType": 1, + "displayHours": 0, + "flag": 0, + "forceOperation": 0, + "giftIconId": 3, + "giftId": 94062201, + "hasStartAction": 1, + "iconId": 94062201, + "id": 94062202, + "intervalHours": 0, + "name": "第一節 萬聖節開始", + "nameRuby": "", + "noticeAt": 1689656400, + "openedAt": 1689656400, + "priority": 94062297, + "recommendLv": "20", + "scriptQuestId": 0, + "spotId": 912001, + "type": 1 +}, { + "actConsume": 5, + "afterActionVals": [], + "afterClear": 1, + "bannerId": 94062201, + "bannerType": 0, + "beforeActionVals": [], + "chaldeaGateCategory": 1, + "chapterId": 0, + "chapterSubId": 0, + "chapterSubStr": "", + "charaIconId": 0, + "closedAt": 1692075599, + "consumeType": 1, + "displayHours": 0, + "flag": 0, + "forceOperation": 0, + "giftIconId": 3, + "giftId": 94062202, + "hasStartAction": 1, + "iconId": 94062201, + "id": 94062203, + "intervalHours": 0, + "name": "第二節 幻想冒險萬聖節", + "nameRuby": "", + "noticeAt": 1689656400, + "openedAt": 1689656400, + "priority": 94062296, + "recommendLv": "25", + "scriptQuestId": 0, + "spotId": 912099, + "type": 1 +}, { + "actConsume": 5, + "afterActionVals": [], + "afterClear": 1, + "bannerId": 94062201, + "bannerType": 0, + "beforeActionVals": [], + "chaldeaGateCategory": 1, + "chapterId": 0, + "chapterSubId": 0, + "chapterSubStr": "", + "charaIconId": 0, + "closedAt": 1692075599, + "consumeType": 1, + "displayHours": 0, + "flag": 0, + "forceOperation": 0, + "giftIconId": 3, + "giftId": 94062203, + "hasStartAction": 1, + "iconId": 94062201, + "id": 94062204, + "intervalHours": 0, + "name": "第三節 穿過去吧冒險者們然後回來吧", + "nameRuby": "", + "noticeAt": 1689656400, + "openedAt": 1689656400, + "priority": 94062295, + "recommendLv": "30", + "scriptQuestId": 0, + "spotId": 912009, + "type": 1 +}, { + "actConsume": 5, + "afterActionVals": [], + "afterClear": 1, + "bannerId": 94062201, + "bannerType": 0, + "beforeActionVals": [], + "chaldeaGateCategory": 1, + "chapterId": 0, + "chapterSubId": 0, + "chapterSubStr": "", + "charaIconId": 0, + "closedAt": 1692075599, + "consumeType": 1, + "displayHours": 0, + "flag": 0, + "forceOperation": 0, + "giftIconId": 3, + "giftId": 94062204, + "hasStartAction": 1, + "iconId": 94062201, + "id": 94062205, + "intervalHours": 0, + "name": "第四節 重整旗鼓萬聖節", + "nameRuby": "", + "noticeAt": 1689656400, + "openedAt": 1689656400, + "priority": 94062294, + "recommendLv": "40", + "scriptQuestId": 0, + "spotId": 912010, + "type": 1 +}, { + "actConsume": 5, + "afterActionVals": [], + "afterClear": 1, + "bannerId": 94062201, + "bannerType": 0, + "beforeActionVals": [], + "chaldeaGateCategory": 1, + "chapterId": 0, + "chapterSubId": 0, + "chapterSubStr": "", + "charaIconId": 0, + "closedAt": 1692075599, + "consumeType": 1, + "displayHours": 0, + "flag": 0, + "forceOperation": 0, + "giftIconId": 0, + "giftId": 101, + "hasStartAction": 1, + "iconId": 94062201, + "id": 94062206, + "intervalHours": 0, + "name": "第五節 恰赫季斯.金字塔.姬路.機械伊莉醬", + "nameRuby": "", + "noticeAt": 1689656400, + "openedAt": 1689656400, + "priority": 94062293, + "recommendLv": "15", + "scriptQuestId": 0, + "spotId": 912099, + "type": 1 +}, { + "actConsume": 5, + "afterActionVals": [], + "afterClear": 1, + "bannerId": 94062201, + "bannerType": 0, + "beforeActionVals": [], + "chaldeaGateCategory": 1, + "chapterId": 0, + "chapterSubId": 0, + "chapterSubStr": "", + "charaIconId": 0, + "closedAt": 1692075599, + "consumeType": 1, + "displayHours": 0, + "flag": 0, + "forceOperation": 0, + "giftIconId": 0, + "giftId": 101, + "hasStartAction": 1, + "iconId": 94062201, + "id": 94062207, + "intervalHours": 0, + "name": "第六節 伊莉莎VS機械伊莉莎", + "nameRuby": "", + "noticeAt": 1689656400, + "openedAt": 1689656400, + "priority": 94062292, + "recommendLv": "25", + "scriptQuestId": 0, + "spotId": 912013, + "type": 1 +}, { + "actConsume": 5, + "afterActionVals": [], + "afterClear": 1, + "bannerId": 94062201, + "bannerType": 0, + "beforeActionVals": [], + "chaldeaGateCategory": 1, + "chapterId": 0, + "chapterSubId": 0, + "chapterSubStr": "", + "charaIconId": 0, + "closedAt": 1692075599, + "consumeType": 1, + "displayHours": 0, + "flag": 0, + "forceOperation": 0, + "giftIconId": 0, + "giftId": 101, + "hasStartAction": 1, + "iconId": 94062201, + "id": 94062208, + "intervalHours": 0, + "name": "第七節 已經回歸的機械伊莉醬", + "nameRuby": "", + "noticeAt": 1689656400, + "openedAt": 1689656400, + "priority": 94062291, + "recommendLv": "35", + "scriptQuestId": 0, + "spotId": 912014, + "type": 1 +}, { + "actConsume": 5, + "afterActionVals": [], + "afterClear": 1, + "bannerId": 94062201, + "bannerType": 0, + "beforeActionVals": [], + "chaldeaGateCategory": 1, + "chapterId": 0, + "chapterSubId": 0, + "chapterSubStr": "", + "charaIconId": 0, + "closedAt": 1692075599, + "consumeType": 1, + "displayHours": 0, + "flag": 0, + "forceOperation": 0, + "giftIconId": 3, + "giftId": 20058, + "hasStartAction": 1, + "iconId": 94062201, + "id": 94062209, + "intervalHours": 0, + "name": "第八節 最後之夜.萬聖節", + "nameRuby": "", + "noticeAt": 1689656400, + "openedAt": 1689656400, + "priority": 94062290, + "recommendLv": "50", + "scriptQuestId": 0, + "spotId": 912015, + "type": 1 +}, { + "actConsume": 0, + "afterActionVals": [], + "afterClear": 1, + "bannerId": 94062201, + "bannerType": 0, + "beforeActionVals": [], + "chaldeaGateCategory": 1, + "chapterId": 0, + "chapterSubId": 0, + "chapterSubStr": "", + "charaIconId": 0, + "closedAt": 1692075599, + "consumeType": 1, + "displayHours": 0, + "flag": 0, + "forceOperation": 0, + "giftIconId": 0, + "giftId": 101, + "hasStartAction": 1, + "iconId": 94062201, + "id": 94062210, + "intervalHours": 0, + "name": "尾聲", + "nameRuby": "", + "noticeAt": 1689656400, + "openedAt": 1689656400, + "priority": 94062289, + "recommendLv": "1", + "scriptQuestId": 0, + "spotId": 912099, + "type": 1 +}, { + "actConsume": 0, + "afterActionVals": [], + "afterClear": 1, + "bannerId": 94062202, + "bannerType": 0, + "beforeActionVals": [], + "chaldeaGateCategory": 1, + "chapterId": 0, + "chapterSubId": 0, + "chapterSubStr": "", + "charaIconId": 10004000, + "closedAt": 1692075599, + "consumeType": 1, + "displayHours": 0, + "flag": 0, + "forceOperation": 0, + "giftIconId": 3, + "giftId": 94062205, + "hasStartAction": 1, + "iconId": 94062202, + "id": 94062251, + "intervalHours": 0, + "name": "【只能二選其一!】「機械伊莉醬」獲得任務", + "nameRuby": "", + "noticeAt": 1689656400, + "openedAt": 1689656400, + "priority": 94062249, + "recommendLv": "1", + "scriptQuestId": 0, + "spotId": 912099, + "type": 5 +}, { + "actConsume": 0, + "afterActionVals": [], + "afterClear": 1, + "bannerId": 94062202, + "bannerType": 0, + "beforeActionVals": [], + "chaldeaGateCategory": 1, + "chapterId": 0, + "chapterSubId": 0, + "chapterSubStr": "", + "charaIconId": 10005000, + "closedAt": 1692075599, + "consumeType": 1, + "displayHours": 0, + "flag": 0, + "forceOperation": 0, + "giftIconId": 3, + "giftId": 94062206, + "hasStartAction": 1, + "iconId": 94062202, + "id": 94062252, + "intervalHours": 0, + "name": "【只能二選其一!】「機械伊莉醬Ⅱ號機」獲得任務", + "nameRuby": "", + "noticeAt": 1689656400, + "openedAt": 1689656400, + "priority": 94062248, + "recommendLv": "1", + "scriptQuestId": 0, + "spotId": 912099, + "type": 5 +}, { + "actConsume": 5, + "afterActionVals": [], + "afterClear": 1, + "bannerId": 94062201, + "bannerType": 0, + "beforeActionVals": [], + "chaldeaGateCategory": 1, + "chapterId": 0, + "chapterSubId": 0, + "chapterSubStr": "", + "charaIconId": 0, + "closedAt": 1692075599, + "consumeType": 1, + "displayHours": 0, + "flag": 8388608, + "forceOperation": 0, + "giftIconId": 0, + "giftId": 101, + "hasStartAction": 1, + "iconId": 94062201, + "id": 94062291, + "intervalHours": 0, + "name": "第六節 伊莉莎VS機械伊莉莎", + "nameRuby": "", + "noticeAt": 1689656400, + "openedAt": 1689656400, + "priority": 94062292, + "recommendLv": "25", + "scriptQuestId": 94062207, + "spotId": 912013, + "type": 1 +}, { + "actConsume": 21, + "afterActionVals": [], + "afterClear": 1, + "bannerId": 94002501, + "bannerType": 0, + "beforeActionVals": [], + "chaldeaGateCategory": 1, + "chapterId": 0, + "chapterSubId": 0, + "chapterSubStr": "", + "charaIconId": 3005000, + "closedAt": 2145888000, + "consumeType": 1, + "displayHours": 0, + "flag": 32, + "forceOperation": 0, + "giftIconId": 0, + "giftId": 94012504, + "hasStartAction": 1, + "iconId": 0, + "id": 94063601, + "intervalHours": 0, + "name": "強化任務 伊莉莎白 3", + "nameRuby": "", + "noticeAt": 1689656400, + "openedAt": 1689656400, + "priority": 94063604, + "recommendLv": "80", + "scriptQuestId": 0, + "spotId": 99001, + "type": 5 +}, { + "actConsume": 21, + "afterActionVals": [], + "afterClear": 1, + "bannerId": 94002501, + "bannerType": 0, + "beforeActionVals": [], + "chaldeaGateCategory": 1, + "chapterId": 0, + "chapterSubId": 0, + "chapterSubStr": "", + "charaIconId": 5026000, + "closedAt": 2145888000, + "consumeType": 1, + "displayHours": 0, + "flag": 32, + "forceOperation": 0, + "giftIconId": 0, + "giftId": 94012504, + "hasStartAction": 1, + "iconId": 0, + "id": 94063602, + "intervalHours": 0, + "name": "強化任務 伊莉莎白.巴托里〔萬聖節〕", + "nameRuby": "", + "noticeAt": 1689656400, + "openedAt": 1689656400, + "priority": 94063603, + "recommendLv": "80", + "scriptQuestId": 0, + "spotId": 99001, + "type": 5 +}, { + "actConsume": 21, + "afterActionVals": [], + "afterClear": 1, + "bannerId": 94002501, + "bannerType": 0, + "beforeActionVals": [], + "chaldeaGateCategory": 1, + "chapterId": 0, + "chapterSubId": 0, + "chapterSubStr": "", + "charaIconId": 1010000, + "closedAt": 2145888000, + "consumeType": 1, + "displayHours": 0, + "flag": 32, + "forceOperation": 0, + "giftIconId": 0, + "giftId": 94012504, + "hasStartAction": 1, + "iconId": 0, + "id": 94063603, + "intervalHours": 0, + "name": "強化任務 伊莉莎白.巴托里〔Brave〕", + "nameRuby": "", + "noticeAt": 1689656400, + "openedAt": 1689656400, + "priority": 94063605, + "recommendLv": "80", + "scriptQuestId": 0, + "spotId": 99001, + "type": 5 +}, { + "actConsume": 21, + "afterActionVals": [], + "afterClear": 1, + "bannerId": 94002501, + "bannerType": 0, + "beforeActionVals": [], + "chaldeaGateCategory": 1, + "chapterId": 0, + "chapterSubId": 0, + "chapterSubStr": "", + "charaIconId": 10004000, + "closedAt": 2145888000, + "consumeType": 1, + "displayHours": 0, + "flag": 32, + "forceOperation": 0, + "giftIconId": 0, + "giftId": 94012504, + "hasStartAction": 1, + "iconId": 0, + "id": 94063604, + "intervalHours": 0, + "name": "強化任務 機械伊莉醬", + "nameRuby": "", + "noticeAt": 1689656400, + "openedAt": 1689656400, + "priority": 94063602, + "recommendLv": "80", + "scriptQuestId": 0, + "spotId": 99001, + "type": 5 +}, { + "actConsume": 21, + "afterActionVals": [], + "afterClear": 1, + "bannerId": 94002501, + "bannerType": 0, + "beforeActionVals": [], + "chaldeaGateCategory": 1, + "chapterId": 0, + "chapterSubId": 0, + "chapterSubStr": "", + "charaIconId": 10005000, + "closedAt": 2145888000, + "consumeType": 1, + "displayHours": 0, + "flag": 32, + "forceOperation": 0, + "giftIconId": 0, + "giftId": 94012504, + "hasStartAction": 1, + "iconId": 0, + "id": 94063605, + "intervalHours": 0, + "name": "強化任務 機械伊莉醬Ⅱ號機", + "nameRuby": "", + "noticeAt": 1689656400, + "openedAt": 1689656400, + "priority": 94063601, + "recommendLv": "80", + "scriptQuestId": 0, + "spotId": 99001, + "type": 5 }, { "actConsume": 21, "afterActionVals": [], diff --git a/master/mstQuestMessage.json b/master/mstQuestMessage.json index f1f98e608..dd0b06b7c 100644 --- a/master/mstQuestMessage.json +++ b/master/mstQuestMessage.json @@ -19242,7 +19242,7 @@ "questId": 94062251, "phase": 1, "idx": 0, - "message": "『【只能任選其一!】「機械伊莉醬」獲得任務』\n『【只能任選其一!】「機械伊莉醬Ⅱ號機」獲得任務』\n這兩個任務中通關任意任務後,\n「機械伊莉醬」或「機械伊莉醬Ⅱ號機」就會正式加入。\n\n由於本活動中[FFFF00]正式加入的從者只能任選其一,[-]\n因此在選擇任務時需要務必注意。", + "message": "『【只能二選其一!】「機械伊莉醬」獲得任務』\n『【只能二選其一!】「機械伊莉醬Ⅱ號機」獲得任務』\n這兩個任務中通關任意任務後,\n「機械伊莉醬」或「機械伊莉醬Ⅱ號機」就會正式加入。\n\n由於本活動中[FFFF00]正式加入的從者只能二選其一,[-]\n因此在選擇任務時需要務必注意。", "condType": 0, "targetId": 0, "targetNum": 0, @@ -19252,7 +19252,7 @@ "questId": 94062252, "phase": 1, "idx": 0, - "message": "『【只能任選其一!】「機械伊莉醬」獲得任務』\n『【只能任選其一!】「機械伊莉醬Ⅱ號機」獲得任務』\n這兩個任務中通關任意任務後,\n「機械伊莉醬」或「機械伊莉醬Ⅱ號機」就會正式加入。\n\n由於本活動中[FFFF00]正式加入的從者只能任選其一,[-]\n因此在選擇任務時需要務必注意。", + "message": "『【只能二選其一!】「機械伊莉醬」獲得任務』\n『【只能二選其一!】「機械伊莉醬Ⅱ號機」獲得任務』\n這兩個任務中通關任意任務後,\n「機械伊莉醬」或「機械伊莉醬Ⅱ號機」就會正式加入。\n\n由於本活動中[FFFF00]正式加入的從者只能二選其一,[-]\n因此在選擇任務時需要務必注意。", "condType": 0, "targetId": 0, "targetNum": 0, diff --git a/master/mstQuestRelease.json b/master/mstQuestRelease.json index d0aae4e23..62f960cf9 100644 --- a/master/mstQuestRelease.json +++ b/master/mstQuestRelease.json @@ -212654,6 +212654,126 @@ "openLimit": 0, "closedMessageId": 0, "imagePriority": 10000 +}, { + "questId": 94063601, + "type": 1, + "targetId": 94022004, + "value": 4, + "openLimit": 0, + "closedMessageId": 0, + "imagePriority": 3000 +}, { + "questId": 94063601, + "type": 8, + "targetId": 300500, + "value": 0, + "openLimit": 0, + "closedMessageId": 0, + "imagePriority": 10000 +}, { + "questId": 94063601, + "type": 12, + "targetId": 0, + "value": 0, + "openLimit": 0, + "closedMessageId": 0, + "imagePriority": 12000 +}, { + "questId": 94063602, + "type": 7, + "targetId": 502600, + "value": 4, + "openLimit": 0, + "closedMessageId": 2, + "imagePriority": 3000 +}, { + "questId": 94063602, + "type": 8, + "targetId": 502600, + "value": 0, + "openLimit": 0, + "closedMessageId": 0, + "imagePriority": 10000 +}, { + "questId": 94063602, + "type": 12, + "targetId": 0, + "value": 0, + "openLimit": 0, + "closedMessageId": 0, + "imagePriority": 12000 +}, { + "questId": 94063603, + "type": 7, + "targetId": 101000, + "value": 4, + "openLimit": 0, + "closedMessageId": 2, + "imagePriority": 3000 +}, { + "questId": 94063603, + "type": 8, + "targetId": 101000, + "value": 0, + "openLimit": 0, + "closedMessageId": 0, + "imagePriority": 10000 +}, { + "questId": 94063603, + "type": 12, + "targetId": 0, + "value": 0, + "openLimit": 0, + "closedMessageId": 0, + "imagePriority": 12000 +}, { + "questId": 94063604, + "type": 7, + "targetId": 1000400, + "value": 4, + "openLimit": 0, + "closedMessageId": 2, + "imagePriority": 3000 +}, { + "questId": 94063604, + "type": 8, + "targetId": 1000400, + "value": 0, + "openLimit": 0, + "closedMessageId": 0, + "imagePriority": 10000 +}, { + "questId": 94063604, + "type": 12, + "targetId": 0, + "value": 0, + "openLimit": 0, + "closedMessageId": 0, + "imagePriority": 12000 +}, { + "questId": 94063605, + "type": 7, + "targetId": 1000500, + "value": 4, + "openLimit": 0, + "closedMessageId": 2, + "imagePriority": 3000 +}, { + "questId": 94063605, + "type": 8, + "targetId": 1000500, + "value": 0, + "openLimit": 0, + "closedMessageId": 0, + "imagePriority": 10000 +}, { + "questId": 94063605, + "type": 12, + "targetId": 0, + "value": 0, + "openLimit": 0, + "closedMessageId": 0, + "imagePriority": 12000 }, { "questId": 94063701, "type": 1, diff --git a/master/mstShop.json b/master/mstShop.json index a55f9bc0d..32a8f3016 100644 --- a/master/mstShop.json +++ b/master/mstShop.json @@ -25214,6 +25214,32 @@ "slot": 0, "targetIds": [2500600], "warningMessage": "" +}, { + "baseShopId": 4000329, + "bgImageId": 0, + "closedAt": 1690693199, + "defaultLimitCount": 0, + "defaultLv": 1, + "detail": "限時兌換★5從者", + "eventId": 0, + "flag": 0, + "id": 4000329, + "imageId": 0, + "infoMessage": "", + "itemIds": [17], + "limitNum": 1, + "name": "克麗奧佩脫拉", + "openedAt": 1689840000, + "payType": 9, + "prices": [10], + "priority": 1, + "purchaseType": 4, + "script": {}, + "setNum": 1, + "shopType": 7, + "slot": 0, + "targetIds": [600800], + "warningMessage": "" }, { "baseShopId": 5000001, "bgImageId": 0, @@ -37720,6 +37746,58 @@ "slot": 0, "targetIds": [2000], "warningMessage": "" +}, { + "baseShopId": 6000653, + "bgImageId": 0, + "closedAt": 2145888000, + "defaultLimitCount": 0, + "defaultLv": 0, + "detail": "兌換「從者.夏日.慶典!」限定羅賓漢靈衣「夏日獵手」的開放權", + "eventId": 0, + "flag": 0, + "id": 6000653, + "imageId": 80352, + "infoMessage": "可獲得靈衣「夏日獵手」開放權。", + "itemIds": [18], + "limitNum": 1, + "name": "靈衣「夏日獵手」開放權", + "openedAt": 1689656400, + "payType": 10, + "prices": [5], + "priority": 840, + "purchaseType": 14, + "script": {}, + "setNum": 1, + "shopType": 11, + "slot": 0, + "targetIds": [20030011], + "warningMessage": "" +}, { + "baseShopId": 6000654, + "bgImageId": 0, + "closedAt": 2145888000, + "defaultLimitCount": 0, + "defaultLv": 0, + "detail": "兌換「救援! Amazones.com」限定彭忒西勒亞簡易靈衣的開放權", + "eventId": 0, + "flag": 0, + "id": 6000654, + "imageId": 80353, + "infoMessage": "可獲得簡易靈衣「Amazones CEO套裝」開放權。", + "itemIds": [18], + "limitNum": 1, + "name": "簡易靈衣「Amazones CEO套裝」開放權", + "openedAt": 1689656400, + "payType": 10, + "prices": [2], + "priority": 850, + "purchaseType": 14, + "script": {}, + "setNum": 1, + "shopType": 11, + "slot": 0, + "targetIds": [70270011], + "warningMessage": "" }, { "baseShopId": 6800385, "bgImageId": 0, diff --git a/master/mstShopDetail.json b/master/mstShopDetail.json index 1f18e32cb..4005397d1 100644 --- a/master/mstShopDetail.json +++ b/master/mstShopDetail.json @@ -586,6 +586,20 @@ "presentMessageId": 0, "afterMessage": "", "okTextImageId": 0 +}, { + "shopId": 6000653, + "message": "可以兌換1次靈衣\n「夏日獵手」開放權。\n\n兌換後,可從強化選項的\n「靈衣開放」進行靈衣的開放。\n\n[FFFF00]成功召喚羅賓漢[-]\n[FFFF00]並滿足開放條件後[-]\n[FFFF00]可透過使用素材道具與QP[-]\n[FFFF00]進行靈衣開放。[-]\n\n是否進行兌換?", + "frequencyType": 1, + "presentMessageId": 0, + "afterMessage": "", + "okTextImageId": 0 +}, { + "shopId": 6000654, + "message": "可以兌換1次簡易靈衣\n「Amazones CEO套裝」開放權。\n\n兌換後,可從強化選項的\n「靈衣開放」進行靈衣的開放。\n\n[FFFF00]成功召喚彭忒西勒亞[-]\n[FFFF00]並滿足開放條件後[-]\n[FFFF00]可透過使用素材道具與QP[-]\n[FFFF00]進行靈衣開放。[-]\n\n是否進行兌換?", + "frequencyType": 1, + "presentMessageId": 0, + "afterMessage": "", + "okTextImageId": 0 }, { "shopId": 6800385, "message": "可以兌換1次\n『迦勒底男性精選2020』\n限定概念禮裝商店的開放權。\n\n兌換之後,達.文西工房的活動道具兌換內\n會出現迦勒底男性精選2020的兌換選項,\n且迦勒底男性精選2020兌換中使用的\nCBC2020特別邀請函將會被發送到禮物箱。\n\n[FFFF00]※無法進行神秘酒杯的發送、兌換。\n※無法兌換靈衣「老練灰領」。\n※無法播放CBC2020的專用語音。[-]\n\n是否進行兌換?", diff --git a/master/mstShopRelease.json b/master/mstShopRelease.json index 3fb755a78..c094fe66e 100644 --- a/master/mstShopRelease.json +++ b/master/mstShopRelease.json @@ -979,6 +979,42 @@ "isClosedDisp": true, "priority": 100, "shopId": 6000645 +}, { + "closedItemName": "", + "closedMessage": "※只有在沒有任何取得靈衣「夏日獵手」開放權記錄的情況下,通關特異點F後才可兌換", + "condNum": 1, + "condType": 1, + "condValues": [1000011], + "isClosedDisp": true, + "priority": 100, + "shopId": 6000653 +}, { + "closedItemName": "", + "closedMessage": "※只有在沒有任何取得靈衣「夏日獵手」開放權記錄的情況下,通關特異點F後才可兌換", + "condNum": 11, + "condType": 79, + "condValues": [200300], + "isClosedDisp": true, + "priority": 0, + "shopId": 6000653 +}, { + "closedItemName": "", + "closedMessage": "※只有在沒有任何取得簡易靈衣「Amazones CEO套裝」開放權記錄的情況下,通關特異點F後才可兌換", + "condNum": 1, + "condType": 1, + "condValues": [1000011], + "isClosedDisp": true, + "priority": 100, + "shopId": 6000654 +}, { + "closedItemName": "", + "closedMessage": "※只有在沒有任何取得簡易靈衣「Amazones CEO套裝」開放權記錄的情況下,通關特異點F後才可兌換", + "condNum": 11, + "condType": 79, + "condValues": [702700], + "isClosedDisp": true, + "priority": 0, + "shopId": 6000654 }, { "closedItemName": "", "closedMessage": "※在沒有「CBC2020」限定概念禮裝\n兌換紀錄的情況下,才能夠進行交換", diff --git a/master/mstSkill.json b/master/mstSkill.json index 68df6dd7b..fb1b8f811 100644 --- a/master/mstSkill.json +++ b/master/mstSkill.json @@ -8324,7 +8324,7 @@ "id": 427350, "maxLv": 10, "motion": 101, - "name": "終極伊麗醬 C", + "name": "終極伊莉醬 C", "ruby": "-", "script": {}, "type": 1 diff --git a/master/mstSkillDetail.json b/master/mstSkillDetail.json index 45bc7f682..ed4311676 100644 --- a/master/mstSkillDetail.json +++ b/master/mstSkillDetail.json @@ -5839,8 +5839,8 @@ "detailShort": "賦予自身毅力狀態(1次.5回合)[{0}]&NP增加[{0}][g][o]▲[/o][/g]+獲得爆擊星+賦予敵方全體延燒狀態(灼傷效果量提升的狀態)[{0}](5回合)[g][o]▲[/o][/g]", "id": 944550 }, { - "detail": "【僅限NP在50%[g][o]▲[/o][/g]以上時能使用】減少自身NP50%[g][o]▲[/o][/g]【負面效果】+自身Buster指令卡性能提升[{0}](3回合)或賦予我方全體無敵狀態(1回合)或為我方全體回復HP[{0}]或我方全體的攻擊力提升[{0}](1回合)或獲得大量爆擊星[{0}]", - "detailShort": "【僅限NP在50%[g][o]▲[/o][/g]以上時能使用】減少自身NP50%[g][o]▲[/o][/g]【負面效果】+自身Buster指令卡性能提升[{0}](3回合)或賦予我方全體無敵狀態(1回合)或為我方全體回復HP[{0}]或我方全體的攻擊力提升[{0}](1回合)或獲得大量爆擊星[{0}]", + "detail": "【僅限NP在50%[g][o]▲[/o][/g]以上時能使用】減少自身NP50%[g][o]▲[/o][/g]【負面效果】+自身Buster指令卡性能提升[{0}](3回合)或賦予我方全體無敵狀態(1回合)或為我方全體恢復HP[{0}]或我方全體的攻擊力提升[{0}](1回合)或獲得大量爆擊星[{0}]", + "detailShort": "【僅限NP在50%[g][o]▲[/o][/g]以上時能使用】減少自身NP50%[g][o]▲[/o][/g]【負面效果】+自身Buster指令卡性能提升[{0}](3回合)或賦予我方全體無敵狀態(1回合)或為我方全體恢復HP[{0}]或我方全體的攻擊力提升[{0}](1回合)或獲得大量爆擊星[{0}]", "id": 945650 }, { "detail": "我方全體的攻擊力提升[{0}](3回合)&爆擊威力提升[{0}](3回合)&NP增加[{0}]+賦予除自身以外的我方全體〔惡〕特性(3回合)", diff --git a/master/mstSpot.json b/master/mstSpot.json index e89e8468d..7878b2d64 100644 --- a/master/mstSpot.json +++ b/master/mstSpot.json @@ -91436,7 +91436,7 @@ "imageOfsY": 0, "joinSpotIds": [], "mapId": 9120, - "name": "刺穿公的玉座", + "name": "穿刺公的玉座", "nameOfsX": 0, "nameOfsY": -10, "nextOfsX": 0, @@ -91604,7 +91604,7 @@ "imageOfsY": 0, "joinSpotIds": [], "mapId": 9121, - "name": "溶巖洞", + "name": "熔岩洞", "nameOfsX": 0, "nameOfsY": 0, "nextOfsX": 0, @@ -91744,7 +91744,7 @@ "imageOfsY": 0, "joinSpotIds": [], "mapId": 9122, - "name": "城樓", + "name": "天守閣", "nameOfsX": 0, "nameOfsY": -24, "nextOfsX": 0, diff --git a/master/mstWarAdd.json b/master/mstWarAdd.json index 4a03a2901..7150299c2 100644 --- a/master/mstWarAdd.json +++ b/master/mstWarAdd.json @@ -3783,144 +3783,144 @@ "warId": 9119 }, { "condType": 1, - "endedAt": 1692683999, + "endedAt": 1692075599, "overwriteId": 2082, "overwriteStr": "", "priority": 1, "script": {}, - "startedAt": 1690264800, + "startedAt": 1689656400, "targetId": 94062201, "type": 6, "value": 0, "warId": 9120 }, { "condType": 1, - "endedAt": 1692683999, + "endedAt": 1692075599, "overwriteId": 2080, "overwriteStr": "", "priority": 3, "script": {}, - "startedAt": 1690264800, + "startedAt": 1689656400, "targetId": 94062202, "type": 6, "value": 0, "warId": 9120 }, { "condType": 46, - "endedAt": 1692683999, + "endedAt": 1692075599, "overwriteId": 2082, "overwriteStr": "", "priority": 5, "script": {}, - "startedAt": 1690264800, + "startedAt": 1689656400, "targetId": 94062203, "type": 6, "value": 1, "warId": 9120 }, { "condType": 1, - "endedAt": 1692683999, + "endedAt": 1692075599, "overwriteId": 2080, "overwriteStr": "", "priority": 7, "script": {}, - "startedAt": 1690264800, + "startedAt": 1689656400, "targetId": 94062205, "type": 6, "value": 0, "warId": 9120 }, { "condType": 46, - "endedAt": 1692683999, + "endedAt": 1692075599, "overwriteId": 2082, "overwriteStr": "", "priority": 9, "script": {}, - "startedAt": 1690264800, + "startedAt": 1689656400, "targetId": 94062206, "type": 6, "value": 1, "warId": 9120 }, { "condType": 1, - "endedAt": 1692683999, + "endedAt": 1692075599, "overwriteId": 2080, "overwriteStr": "", "priority": 11, "script": {}, - "startedAt": 1690264800, + "startedAt": 1689656400, "targetId": 94062209, "type": 6, "value": 0, "warId": 9120 }, { "condType": 1, - "endedAt": 1692683999, + "endedAt": 1692075599, "overwriteId": 9120, "overwriteStr": "", "priority": 2, "script": {}, - "startedAt": 1690264800, + "startedAt": 1689656400, "targetId": 94062201, "type": 7, "value": 0, "warId": 9120 }, { "condType": 1, - "endedAt": 1692683999, + "endedAt": 1692075599, "overwriteId": 0, "overwriteStr": "", "priority": 4, "script": {}, - "startedAt": 1690264800, + "startedAt": 1689656400, "targetId": 94062202, "type": 7, "value": 0, "warId": 9120 }, { "condType": 46, - "endedAt": 1692683999, + "endedAt": 1692075599, "overwriteId": 9121, "overwriteStr": "", "priority": 6, "script": {}, - "startedAt": 1690264800, + "startedAt": 1689656400, "targetId": 94062203, "type": 7, "value": 1, "warId": 9120 }, { "condType": 1, - "endedAt": 1692683999, + "endedAt": 1692075599, "overwriteId": 0, "overwriteStr": "", "priority": 8, "script": {}, - "startedAt": 1690264800, + "startedAt": 1689656400, "targetId": 94062205, "type": 7, "value": 0, "warId": 9120 }, { "condType": 46, - "endedAt": 1692683999, + "endedAt": 1692075599, "overwriteId": 9122, "overwriteStr": "", "priority": 10, "script": {}, - "startedAt": 1690264800, + "startedAt": 1689656400, "targetId": 94062206, "type": 7, "value": 1, "warId": 9120 }, { "condType": 1, - "endedAt": 1692683999, + "endedAt": 1692075599, "overwriteId": 0, "overwriteStr": "", "priority": 12, "script": {}, - "startedAt": 1690264800, + "startedAt": 1689656400, "targetId": 94062209, "type": 7, "value": 0, diff --git a/master/npcServant.json b/master/npcServant.json index 783427b86..1716f4715 100644 --- a/master/npcServant.json +++ b/master/npcServant.json @@ -258476,7 +258476,7 @@ }, { "id": 94000506, "svtId": 9932500, - "name": "驚怖飛龍", + "name": "恐怖飛龍", "lv": 1, "limitCount": 5, "hp": -1, @@ -350141,7 +350141,7 @@ }, { "id": 94007406, "svtId": 9932500, - "name": "驚怖飛龍", + "name": "恐怖飛龍", "lv": 1, "limitCount": 5, "hp": -1, @@ -909721,7 +909721,7 @@ }, { "id": 94062203, "svtId": 9932500, - "name": "驚怖飛龍", + "name": "恐怖飛龍", "lv": 1, "limitCount": 5, "hp": -1, @@ -909756,7 +909756,7 @@ }, { "id": 94062204, "svtId": 9932500, - "name": "驚怖飛龍", + "name": "恐怖飛龍", "lv": 1, "limitCount": 5, "hp": -1,