diff --git a/ExcelBinOutput/BattlePassMissionExcelConfigData.json b/ExcelBinOutput/BattlePassMissionExcelConfigData.json index e48f42279..9da0a85a5 100644 --- a/ExcelBinOutput/BattlePassMissionExcelConfigData.json +++ b/ExcelBinOutput/BattlePassMissionExcelConfigData.json @@ -51,7 +51,7 @@ "TriggerConfig": { "TriggerType": "TRIGGER_OBTAIN_MATERIAL_NUM", "ParamList": [ - "101001;101002;101003;101004;100058;100054;100028;101006", + "101001;101002;101003;101004;100058;100054;100028;101006;101008", "", "", "" diff --git a/ExcelBinOutput/CombineExcelConfigData.json b/ExcelBinOutput/CombineExcelConfigData.json index 6022ba39c..3861b9327 100644 --- a/ExcelBinOutput/CombineExcelConfigData.json +++ b/ExcelBinOutput/CombineExcelConfigData.json @@ -351,13 +351,13 @@ }, { "CombineId": 11029, - "PlayerLevel": 10, + "PlayerLevel": 5, "IsDefaultShow": true, "CombineType": 1, "SubCombineType": 150070, "ResultItemId": 112045, "ResultItemCount": 1, - "ScoinCost": 50, + "ScoinCost": 25, "RandomItems": [ { "Count": 1 @@ -376,13 +376,13 @@ }, { "CombineId": 11030, - "PlayerLevel": 5, + "PlayerLevel": 10, "IsDefaultShow": true, "CombineType": 1, "SubCombineType": 150070, "ResultItemId": 112046, "ResultItemCount": 1, - "ScoinCost": 25, + "ScoinCost": 50, "RandomItems": [ { "Count": 1 diff --git a/ExcelBinOutput/QuestExcelConfigData.json b/ExcelBinOutput/QuestExcelConfigData.json index 9b0f8e94e..a03d348dc 100644 --- a/ExcelBinOutput/QuestExcelConfigData.json +++ b/ExcelBinOutput/QuestExcelConfigData.json @@ -201272,9 +201272,10 @@ ], "BeginExec": [ { + "Type": "QUEST_EXEC_REFRESH_GROUP_SUITE", "Param": [ - "", - "" + "3", + "133002311,1" ] }, { @@ -339984,11 +339985,11 @@ } ], "Guide": { - "Type": "QUEST_GUIDE_NPC", + "Type": "QUEST_GUIDE_LOCATION", "AutoGuide": "QUEST_GUIDE_AUTO_ENABLE", "Param": [ - "12064", - "", + "Q200913paimon", + "10", "", "", "" @@ -535934,9 +535935,10 @@ ] }, { + "Type": "QUEST_EXEC_NOTIFY_GROUP_LUA", "Param": [ - "", - "", + "3", + "133220126", "", "", "" @@ -536594,8 +536596,9 @@ ] }, { + "Type": "QUEST_EXEC_UNREGISTER_DYNAMIC_GROUP", "Param": [ - "", + "133209002", "", "", "", @@ -536809,7 +536812,6 @@ "GuideStyle": "QUEST_GUIDE_STYLE_TARGET", "GuideLayer": "QUEST_GUIDE_LAYER_SCENE" }, - "IsRewind": true, "FinishExec": [ { "Type": "QUEST_EXEC_UNREGISTER_DYNAMIC_GROUP", @@ -537576,8 +537578,9 @@ ] }, { + "Type": "QUEST_EXEC_UNREGISTER_DYNAMIC_GROUP", "Param": [ - "", + "133209003", "", "", "", @@ -537788,7 +537791,6 @@ "GuideStyle": "QUEST_GUIDE_STYLE_TARGET", "GuideLayer": "QUEST_GUIDE_LAYER_SCENE" }, - "IsRewind": true, "FinishExec": [ { "Type": "QUEST_EXEC_UNREGISTER_DYNAMIC_GROUP", @@ -1559447,6 +1559449,7 @@ ] } ], + "FinishCondComb": "LOGIC_A_OR_ETCAND", "FinishCond": [ { "Type": "QUEST_CONTENT_COMPLETE_TALK", @@ -1559457,13 +1559460,15 @@ "Count": "" }, { + "Type": "QUEST_CONTENT_QUEST_STATE_EQUAL", "Param": [ - 0, - 0 + 7210007, + 3 ], "Count": "" }, { + "Type": "QUEST_CONTENT_ANY_MANUAL_TRANSPORT", "Param": [ 0, 0 @@ -1567276,6 +1567281,7 @@ ] } ], + "FinishCondComb": "LOGIC_A_OR_ETCAND", "FinishCond": [ { "Type": "QUEST_CONTENT_COMPLETE_TALK", @@ -1567286,13 +1567292,15 @@ "Count": "" }, { + "Type": "QUEST_CONTENT_QUEST_STATE_EQUAL", "Param": [ - 0, - 0 + 7210008, + 3 ], "Count": "" }, { + "Type": "QUEST_CONTENT_ANY_MANUAL_TRANSPORT", "Param": [ 0, 0 @@ -1648261,10 +1648269,9 @@ ] }, { - "Type": "QUEST_EXEC_REFRESH_GROUP_SUITE", "Param": [ - "3", - "133213141,1", + "", + "", "", "", "" @@ -1650175,10 +1650182,9 @@ ] }, { - "Type": "QUEST_EXEC_REFRESH_GROUP_SUITE", "Param": [ - "3", - "133213142,1", + "", + "", "", "", "" @@ -1652091,10 +1652097,9 @@ ] }, { - "Type": "QUEST_EXEC_REFRESH_GROUP_SUITE", "Param": [ - "3", - "133213143,1", + "", + "", "", "", "" @@ -1653719,9 +1653724,10 @@ ], "BeginExec": [ { + "Type": "QUEST_EXEC_REFRESH_GROUP_SUITE", "Param": [ - "", - "", + "3", + "133213144,1", "", "", "" @@ -1654003,10 +1654009,9 @@ ] }, { - "Type": "QUEST_EXEC_REFRESH_GROUP_SUITE", "Param": [ - "3", - "133213144,1", + "", + "", "", "", "" @@ -1654678,9 +1654683,10 @@ ], "BeginExec": [ { + "Type": "QUEST_EXEC_REFRESH_GROUP_SUITE", "Param": [ - "", - "", + "3", + "133213141,1", "", "", "" @@ -1655312,9 +1655318,10 @@ ], "BeginExec": [ { + "Type": "QUEST_EXEC_REFRESH_GROUP_SUITE", "Param": [ - "", - "", + "3", + "133213142,1", "", "", "" @@ -1655629,9 +1655636,10 @@ ], "BeginExec": [ { + "Type": "QUEST_EXEC_REFRESH_GROUP_SUITE", "Param": [ - "", - "", + "3", + "133213143,1", "", "", "" @@ -1730093,49 +1730101,44 @@ "FinishCondComb": "LOGIC_AND", "FinishCond": [ { - "Type": "QUEST_CONTENT_FINISH_ITEM_GIVING", - "Param": [ - 7217906, - 0 - ], - "Count": "" - }, - { - "Type": "QUEST_CONTENT_FINISH_ITEM_GIVING", - "Param": [ - 7217905, - 0 - ], - "Count": "" - }, - { - "Type": "QUEST_CONTENT_FINISH_ITEM_GIVING", - "Param": [ - 7217904, - 0 - ], - "Count": "" - }, - { - "Type": "QUEST_CONTENT_FINISH_ITEM_GIVING", - "Param": [ - 7217903, - 0 - ], - "Count": "" - }, - { - "Type": "QUEST_CONTENT_FINISH_ITEM_GIVING", - "Param": [ - 7217902, - 0 - ], - "Count": "" - }, - { - "Type": "QUEST_CONTENT_FINISH_ITEM_GIVING", + "Type": "QUEST_CONTENT_QUEST_STATE_EQUAL", "Param": [ 7217901, + 3 + ], + "Count": "" + }, + { + "Param": [ + 0, + 0 + ], + "Count": "" + }, + { + "Param": [ + 0, + 0 + ], + "Count": "" + }, + { + "Param": [ + 0, + 0 + ], + "Count": "" + }, + { + "Param": [ + 0, + 0 + ], + "Count": "" + }, + { + "Param": [ + 0, 0 ], "Count": "" diff --git a/ExcelBinOutput/RandTaskExcelConfigData.json b/ExcelBinOutput/RandTaskExcelConfigData.json index 1ed02fee0..27c22909b 100644 --- a/ExcelBinOutput/RandTaskExcelConfigData.json +++ b/ExcelBinOutput/RandTaskExcelConfigData.json @@ -171,7 +171,6 @@ { "ID": 18, "TitleTextMapHash": 4283958408, - "ContentType": "RAND_TASK_CONTENT_RESCUE", "NeedUI": 1, "NeedUI": true, "TargetTextMapHash": 1353024407, @@ -181,7 +180,6 @@ { "ID": 19, "TitleTextMapHash": 2501795280, - "ContentType": "RAND_TASK_CONTENT_TALL", "NeedUI": 1, "TargetTextMapHash": 532913599, "EnterDistance": 60, @@ -190,7 +188,6 @@ { "ID": 20, "TitleTextMapHash": 2047782552, - "ContentType": "RAND_TASK_CONTENT_CLEANUP", "NeedUI": 1, "NeedUI": true, "TargetTextMapHash": 1024447295, @@ -200,7 +197,6 @@ { "ID": 21, "TitleTextMapHash": 2339513920, - "ContentType": "RAND_TASK_CONTENT_CLEANUP", "NeedUI": 1, "NeedUI": true, "TargetTextMapHash": 2994813255, @@ -210,7 +206,6 @@ { "ID": 22, "TitleTextMapHash": 16421488, - "ContentType": "RAND_TASK_CONTENT_CLEANUP", "NeedUI": 1, "NeedUI": true, "TargetTextMapHash": 1656679423, @@ -220,7 +215,6 @@ { "ID": 23, "TitleTextMapHash": 718530112, - "ContentType": "RAND_TASK_CONTENT_TALL", "NeedUI": 1, "TargetTextMapHash": 2177459839, "EnterDistance": 60, diff --git a/ExcelBinOutput/RewardExcelConfigData.json b/ExcelBinOutput/RewardExcelConfigData.json index ce8413250..385997a8e 100644 --- a/ExcelBinOutput/RewardExcelConfigData.json +++ b/ExcelBinOutput/RewardExcelConfigData.json @@ -7488,7 +7488,10 @@ "ItemId": 104003, "ItemCount": 3 }, - {}, + { + "ItemId": 109455, + "ItemCount": 1 + }, {}, {}, {}, diff --git a/ExcelBinOutput/TalkExcelConfigData.json b/ExcelBinOutput/TalkExcelConfigData.json index 609df1225..00800572d 100644 --- a/ExcelBinOutput/TalkExcelConfigData.json +++ b/ExcelBinOutput/TalkExcelConfigData.json @@ -559523,6 +559523,7 @@ "Id": 6316301, "BeginWay": "TALK_BEGIN_MANUAL", "ActiveMode": "PLAY_MODE_SINGLE", + "BeginCondComb": "LOGIC_AND", "BeginCond": [ { "Type": "QUEST_COND_QUEST_GLOBAL_VAR_EQUAL", @@ -559535,9 +559536,10 @@ ] }, { + "Type": "QUEST_COND_QUEST_GLOBAL_VAR_EQUAL", "Param": [ - "", - "", + "72122", + "1", "", "", "" @@ -559645,6 +559647,7 @@ { "Id": 6316302, "ActiveMode": "PLAY_MODE_SINGLE", + "BeginCondComb": "LOGIC_AND", "BeginCond": [ { "Type": "QUEST_COND_QUEST_GLOBAL_VAR_EQUAL", @@ -559657,9 +559660,10 @@ ] }, { + "Type": "QUEST_COND_QUEST_GLOBAL_VAR_EQUAL", "Param": [ - "", - "", + "72122", + "1", "", "", "" @@ -559765,6 +559769,7 @@ { "Id": 6316303, "ActiveMode": "PLAY_MODE_SINGLE", + "BeginCondComb": "LOGIC_AND", "BeginCond": [ { "Type": "QUEST_COND_QUEST_GLOBAL_VAR_EQUAL", @@ -559777,9 +559782,10 @@ ] }, { + "Type": "QUEST_COND_QUEST_GLOBAL_VAR_EQUAL", "Param": [ - "", - "", + "72122", + "1", "", "", "" @@ -559883,6 +559889,7 @@ { "Id": 6316304, "ActiveMode": "PLAY_MODE_SINGLE", + "BeginCondComb": "LOGIC_AND", "BeginCond": [ { "Type": "QUEST_COND_QUEST_GLOBAL_VAR_EQUAL", @@ -559895,9 +559902,10 @@ ] }, { + "Type": "QUEST_COND_QUEST_GLOBAL_VAR_EQUAL", "Param": [ - "", - "", + "72122", + "1", "", "", "" @@ -560001,6 +560009,7 @@ { "Id": 6316305, "ActiveMode": "PLAY_MODE_SINGLE", + "BeginCondComb": "LOGIC_AND", "BeginCond": [ { "Type": "QUEST_COND_QUEST_GLOBAL_VAR_EQUAL", @@ -560013,9 +560022,10 @@ ] }, { + "Type": "QUEST_COND_QUEST_GLOBAL_VAR_EQUAL", "Param": [ - "", - "", + "72122", + "1", "", "", "" @@ -807368,6 +807378,7 @@ "Id": 7212506, "BeginWay": "TALK_BEGIN_MANUAL", "ActiveMode": "PLAY_MODE_HOST", + "BeginCondComb": "LOGIC_OR", "BeginCond": [ { "Type": "QUEST_COND_STATE_EQUAL", @@ -807380,9 +807391,10 @@ ] }, { + "Type": "QUEST_COND_STATE_EQUAL", "Param": [ - "", - "", + "7212505", + "2", "", "", "" @@ -861249,11 +861261,11 @@ "BeginCondComb": "LOGIC_AND", "BeginCond": [ { - "Type": "QUEST_COND_DAILY_TASK_VAR_EQ", + "Type": "QUEST_COND_QUEST_SERVER_COND_VALID", "Param": [ - "41140", - "2", - "4", + "7280401", + "", + "", "", "" ] diff --git a/ExcelBinOutput/TowerLevelExcelConfigData.json b/ExcelBinOutput/TowerLevelExcelConfigData.json index 515ef38f0..cb0d0a3be 100644 --- a/ExcelBinOutput/TowerLevelExcelConfigData.json +++ b/ExcelBinOutput/TowerLevelExcelConfigData.json @@ -3241,7 +3241,7 @@ "MonsterLevel": 71, "FirstMonsterList": [ 10201, - 10302, + 10303, 10301, 10110, 10109, diff --git a/TextMap/TextMapJP.json b/TextMap/TextMapJP.json index 2b0546733..b2493ffd3 100644 --- a/TextMap/TextMapJP.json +++ b/TextMap/TextMapJP.json @@ -73814,7 +73814,7 @@ "1404429853": "おお！前の扉が開いたぞ！正しかったみたいだ！", "1407856157": "あ…あなたはメイドでは？西風騎士団の人だったんですか？", "1415042589": "", - "1424931357": "協会からもらえる良質な材料。中には無限の潜在力を秘めている。\\n\\n使用すると以下から1つ獲得できる。\\n·高塔の王の残壁\\n·凛風奔狼の砕牙\\n·獅牙戦士の鎖\\n·孤雲寒林の輝岩\\n·霧海雲間の水銀\\n·漆黒の隕鉄の一片\\n·遠海夷地の瑚枝\\n·鳴神御霊の恩恵\\n·今昔劇画の悪尉", + "1424931357": "協会からもらえる良質な材料。中には無限の潜在力を秘めている。\\n\\n使用すると以下から1つ獲得できる。\\n·高塔の王の瓦\\n·凛風奔狼の乳歯\\n·獅牙戦士の枷\\n·孤雲寒林の光砂\\n·霧海雲間の鉛丹\\n·漆黒の隕鉄の一粒\\n·遠海夷地の瑚枝\\n·鳴神御霊の恩恵\\n·今昔劇画の悪尉", "1427682845": "綺命", "144579101": "", "1466635805": "",