diff --git a/ExcelBinOutput/AvatarSkillExcelConfigData.json b/ExcelBinOutput/AvatarSkillExcelConfigData.json index 486837867..3d625bf8c 100644 --- a/ExcelBinOutput/AvatarSkillExcelConfigData.json +++ b/ExcelBinOutput/AvatarSkillExcelConfigData.json @@ -4595,7 +4595,7 @@ "AbilityName": "ActivityAbility_LudiHarpastum_Serve", "DescTextMapHash": 1957207568, "SkillIcon": "Btn_BounceConjuring_Serve_S_01", - "CdTime": 0.5, + "CdTime": 1.5, "IgnoreCDMinusRatio": true, "MaxChargeNum": 1, "LockShape": "CircleLockEnemyR10", diff --git a/ExcelBinOutput/QuestExcelConfigData.json b/ExcelBinOutput/QuestExcelConfigData.json index 23212bb77..fb7ed1c33 100644 --- a/ExcelBinOutput/QuestExcelConfigData.json +++ b/ExcelBinOutput/QuestExcelConfigData.json @@ -294244,8 +294244,9 @@ ] }, { + "Type": "QUEST_COND_ACTIVITY_END", "Param": [ - 0, + 2005001, 0, 0, 0, @@ -734098,7 +734099,6 @@ "GuideStyle": "QUEST_GUIDE_STYLE_TARGET", "GuideLayer": "QUEST_GUIDE_LAYER_SCENE" }, - "IsRewind": true, "FinishExec": [ { "Type": "QUEST_EXEC_DEL_ALL_SPECIFIC_PACK_ITEM", @@ -735806,9 +735806,10 @@ ], "BeginExec": [ { + "Type": "QUEST_EXEC_REFRESH_GROUP_SUITE", "Param": [ - "", - "", + "4", + "144003013,1", "", "", "" @@ -1387113,9 +1387114,10 @@ ] }, { + "Type": "QUEST_COND_STATE_EQUAL", "Param": [ - 0, - 0, + 7900506, + 3, 0, 0, 0 @@ -1387177,15 +1387179,17 @@ "Count": "" }, { + "Type": "QUEST_CONTENT_COMPLETE_TALK", "Param": [ - 0, + 7900425, 0 ], "Count": "" }, { + "Type": "QUEST_CONTENT_COMPLETE_TALK", "Param": [ - 0, + 7900426, 0 ], "Count": "" diff --git a/ExcelBinOutput/ShopmallRecommendConfigData.json b/ExcelBinOutput/ShopmallRecommendConfigData.json index d6dd36d4d..0e7f845f4 100644 --- a/ExcelBinOutput/ShopmallRecommendConfigData.json +++ b/ExcelBinOutput/ShopmallRecommendConfigData.json @@ -4,19 +4,19 @@ "NameTextMapHash": 1731946084, "SubTabId": 4, "ShopType": "SHOP_TYPE_PACKAGE", - "ConfigIdVec": [], + "GoodsIdVec": [], "ConfigIdVec": [ 101 ], "CondVec": [ { "Type": "SHOPMALL_RECOMMEND_COND_PLAYER_LEVEL_GE", - "Type": "1", - "Param1": "" + "ShopType": "1", + "Type": "" }, { - "Type": "", - "Param1": "" + "ShopType": "", + "Type": "" } ], "Order": 3, @@ -27,26 +27,26 @@ "Id": 3, "NameTextMapHash": 1849127228, "SubTabId": 6, - "MMCKOPCKBHC": "RECOMMEND_JUMP", + "Id": "RECOMMEND_JUMP", "ShopType": "SHOP_TYPE_COSTUME", - "ConfigIdVec": [ + "GoodsIdVec": [ 106001 ], "ConfigIdVec": [], "CondVec": [ { - "Type": "", - "Param1": "" + "ShopType": "", + "Type": "" }, { - "Type": "", - "Param1": "" + "ShopType": "", + "Type": "" } ], "Order": 4, "OneCardIconName": "MallPackage_SkinDisplay", "CondVec": [], - "DABHKGHEDKC": 5, + "OneCardIconName": 5, "FGKLLCOLAHI": true } ] \ No newline at end of file diff --git a/TextMap/TextMapDE.json b/TextMap/TextMapDE.json index 3a8b85e75..7b0a767b9 100644 --- a/TextMap/TextMapDE.json +++ b/TextMap/TextMapDE.json @@ -175286,7 +175286,7 @@ "693528234": "An den meisten Stellen ist es in Ordnung, aber es sind überall diese Heuhaufen.", "700062378": "Keine Ursache.", "707579562": "Hab vielen Dank, Herr Krosl, dann wollen wir dich auch nicht weiter stören.", - "707834538": "Egal, ob es nun die Mama ist, die das Eingangstor von Mondstadt in die Luft sprengt, oder die Mama, die Klee Hausarrest gibt, oder die Mama, die komische Briefe schreibt. Klee hat sie alle sehr lieb.", + "707834538": "Egal, ob es nun die Mama ist, die das Eingangtor von Mondstadt in die Luft sprengt, oder die Mama, die Hausarrest bekommt, oder die Mama, die komische Briefe schreibt. Klee hat sie wirklich sehr lieb.", "716426922": "Vielleicht gibt es keine offenen Stellen für Seefahrer ...", "721087146": "Das war er.", "748822186": "", diff --git a/TextMap/TextMapEN.json b/TextMap/TextMapEN.json index 4a6da2453..48b836c23 100644 --- a/TextMap/TextMapEN.json +++ b/TextMap/TextMapEN.json @@ -269926,7 +269926,7 @@ "693528234": "Most places were fine, but there are all these haystacks lying around.", "700062378": "It's nothing.", "707579562": "Thanks a lot, Mr. Krosl. We'll be off now.", - "707834538": "It doesn't matter if it's Mom blowing up Mondstadt's main gate, or Mom grounding Klee, or Mom writing weird letters. Klee loves her very much.", + "707834538": "It doesn't matter if it's Mom blowing up Mondstadt's main gate, or Mom getting grounded, or Mom writing weird letters. Klee loves her very much.", "716426922": "There might not be openings for sailors...", "721087146": "He was.", "748822186": "", diff --git a/TextMap/TextMapES.json b/TextMap/TextMapES.json index 5381292fd..fc0ca9186 100644 --- a/TextMap/TextMapES.json +++ b/TextMap/TextMapES.json @@ -219615,7 +219615,7 @@ "693528234": "El resto de lugares están bien, pero en los alrededores hay muchos montones de paja.", "700062378": "No es nada.", "707579562": "Muchas gracias, señor Krosl. Ya nos vamos.", - "707834538": "Ya sea la que vuela las puertas de Mondstadt en pedazos, la que me castiga, o la que escribe cartas extrañas, amo todas las versiones de mamá.", + "707834538": "Ya sea la que vuela las puertas de Mondstadt en pedazos, a la que castigan, o la que escribe cartas extrañas, amo todas las versiones de mamá.", "716426922": "Puede que no haya trabajo de marinera...", "721087146": "Lo era.", "748822186": "", diff --git a/TextMap/TextMapFR.json b/TextMap/TextMapFR.json index fedb43962..a291f8c94 100644 --- a/TextMap/TextMapFR.json +++ b/TextMap/TextMapFR.json @@ -24749,7 +24749,7 @@ "693528234": "Il y a plein de bottes de foin dans le coin...", "700062378": "Ce n'est rien.", "707579562": "Merci beaucoup, sieur Krosl. Nous allons de ce pas la chercher.", - "707834538": "Peu importe que ma maman fasse sauter la porte de Mondstadt ou qu'elle me gronde, ou encore qu'elle écrive des lettres bizarres. Je l'aime toujours.", + "707834538": "Peu importe que ma maman fasse sauter la porte de Mondstadt ou qu'elle se fasse punir, ou encore qu'elle écrive des lettres bizarres. Je l'aime toujours.", "716426922": "#Je ne suis pas {M#sûr}{F#sûre} que les navires embauchent des marins en ce moment...", "721087146": "En effet.", "748822186": "", diff --git a/TextMap/TextMapID.json b/TextMap/TextMapID.json index fa3d5fa4d..67b872833 100644 --- a/TextMap/TextMapID.json +++ b/TextMap/TextMapID.json @@ -251423,7 +251423,7 @@ "693528234": "Sebagian besar tempatnya cukup bersih, tetapi masih ada banyak tumpukan jerami di sekitar.", "700062378": "Tidak apa-apa.", "707579562": "Terima kasih banyak, Tuan Krosl. Kami pergi dulu ya.", - "707834538": "Tidak masalah jika Mama meledakkan gerbang utama Mondstadt, atau Mama yang mengurung Klee, atau Mama yang menulis surat aneh. Klee sayang sekali sama Mama.", + "707834538": "Tidak masalah jika Mama yang meledakkan gerbang utama Mondstadt, atau Mama yang dikurung, atau Mama yang menulis surat aneh untuk Klee. Klee sayang sekali sama Mama.", "716426922": "Mungkin tidak ada peluang kerja untuk menjadi seorang pelaut...", "721087146": "Ya.", "748822186": "", diff --git a/TextMap/TextMapPT.json b/TextMap/TextMapPT.json index 38ad09f09..af5ed8c77 100644 --- a/TextMap/TextMapPT.json +++ b/TextMap/TextMapPT.json @@ -122329,7 +122329,7 @@ "693528234": "A maioria dos lugares estava tudo bem, mas há todos esses palheiros espalhados por aí.", "700062378": "Não tem problema.", "707579562": "Muito obrigado, senhor Krosl. Vamos ir procurar a senhorita Zhiqiao.", - "707834538": "Não importa se é a mamãe que explode o portão principal de Mondstadt, ou a mamãe que castiga a Klee, ou a mamãe que escreve cartas esquisitas. Klee gosta muito de todas elas.", + "707834538": "Não importa se é a mamãe que explode o portão principal de Mondstadt, a mamãe que é colocada de castigo, ou a mamãe que escreve cartas esquisitas. Klee gosta muito de todas elas.", "716426922": "Talvez não tenha uma vaga para marinheiras...", "721087146": "Claro.", "748822186": "", @@ -179715,7 +179715,7 @@ "41954975": "Ei, obrigada! Você tem um gosto maravilhoso em poesia. Apenas um pequeno número de gênios raros vê a verdadeira razão, e parece que você é um deles - assim como eu!", "4200749727": "A Signora está ao nosso lado, até o Barbatos não é o rival dela.", "4202352287": "", - "4203447967": "Folhas no Vento", + "4203447967": "Folhas ao Vento", "420474527": "", "4209835679": "", "4220907167": "Desculpe, estava imaginando a cena em que a minha mulher fica furiosa...", diff --git a/TextMap/TextMapTH.json b/TextMap/TextMapTH.json index ba35f62dc..9718ec82f 100644 --- a/TextMap/TextMapTH.json +++ b/TextMap/TextMapTH.json @@ -190511,7 +190511,7 @@ "693528234": "ที่อื่น ๆ ก็ยังโอเค แต่ว่ารอบ ๆ นี้มีกองหญ้ากองไว้อยู่เพียบเลย", "700062378": "ไม่เป็นไรเลย", "707579562": "ขอบคุณมากเลย คุณ Krosl เราไปหาคุณ Zhiqiao กันเถอะ", - "707834538": "ไม่ว่าจะเป็นแม่ขาที่ระเบิดประตูเมือง Mondstadt, แม่ขาที่กักบริเวณ Klee หรือจะเป็นแม่ขาที่เขียนจดหมายประหลาด... Klee ก็รักทั้งหมดเลย", + "707834538": "ไม่ว่าจะเป็นแม่ขาที่ระเบิดประตูเมือง Mondstadt, แม่ขาที่ถูกกักบริเวณ หรือจะเป็นแม่ขาที่เขียนจดหมายประหลาดมาให้... Klee ก็รักทั้งหมดเลย", "716426922": "ถ้าไม่ใช่งานกะลาสีล่ะ...", "721087146": "อื้อ", "748822186": "",