diff --git a/data/bin/Activity.json b/data/bin/Activity.json index 5bbbc9ce7..b9d067b30 100644 --- a/data/bin/Activity.json +++ b/data/bin/Activity.json @@ -329,6 +329,28 @@ "PopUpRes": "2026-11-10T03:59:59+08:00", "TabBgRes": "" }, + "103012": { + "Id": 103012, + "MidGroupId": 0, + "SortId": 5, + "ActivityType": 21, + "Name": "紧急悬赏（短期3天 临时插入）", + "ActivityThemeType": 0, + "PreLimit": 0, + "LimitParam": "", + "StartType": 0, + "StartTime": "", + "StartCondType": 0, + "StartCondParams": [ + 2 + ], + "EndType": 0, + "EndTime": "", + "EndDuration": 0, + "BannerRes": "", + "PopUpRes": "2026-11-13T03:59:59+08:00", + "TabBgRes": "" + }, "301001": { "Id": 301001, "MidGroupId": 0, @@ -637,6 +659,28 @@ "PopUpRes": "2026-11-10T10:59:59+08:00", "TabBgRes": "" }, + "301054": { + "Id": 301054, + "MidGroupId": 0, + "SortId": 6, + "ActivityType": 2, + "Name": "星途一载 · 特别致谢纪念签到活动", + "ActivityThemeType": 0, + "PreLimit": 0, + "LimitParam": "", + "StartType": 0, + "StartTime": "", + "StartCondType": 0, + "StartCondParams": [ + 2 + ], + "EndType": 0, + "EndTime": "", + "EndDuration": 0, + "BannerRes": "", + "PopUpRes": "2026-12-04T10:59:59+08:00", + "TabBgRes": "" + }, "302001": { "Id": 302001, "MidGroupId": 0, @@ -1055,6 +1099,50 @@ "PopUpRes": "2026-11-10T10:59:59+08:00", "TabBgRes": "" }, + "201021": { + "Id": 201021, + "MidGroupId": 0, + "SortId": 14, + "ActivityType": 13, + "Name": "一周年过去篇尘沙主线", + "ActivityThemeType": 0, + "PreLimit": 0, + "LimitParam": "", + "StartType": 0, + "StartTime": "", + "StartCondType": 0, + "StartCondParams": [ + 2 + ], + "EndType": 0, + "EndTime": "", + "EndDuration": 0, + "BannerRes": "", + "PopUpRes": "2026-12-04T10:59:59+08:00", + "TabBgRes": "" + }, + "201022": { + "Id": 201022, + "MidGroupId": 0, + "SortId": 13, + "ActivityType": 13, + "Name": "心危盛典", + "ActivityThemeType": 0, + "PreLimit": 0, + "LimitParam": "", + "StartType": 0, + "StartTime": "", + "StartCondType": 0, + "StartCondParams": [ + 2 + ], + "EndType": 0, + "EndTime": "", + "EndDuration": 0, + "BannerRes": "", + "PopUpRes": "2026-11-13T10:59:59+08:00", + "TabBgRes": "" + }, "400000": { "Id": 400000, "MidGroupId": 10100, @@ -1737,6 +1825,28 @@ "PopUpRes": "2026-11-10T11:00:00+08:00", "TabBgRes": "" }, + "500013": { + "Id": 500013, + "MidGroupId": 0, + "SortId": 6, + "ActivityType": 14, + "Name": "BD兑换活动", + "ActivityThemeType": 0, + "PreLimit": 0, + "LimitParam": "", + "StartType": 0, + "StartTime": "", + "StartCondType": 0, + "StartCondParams": [ + 2 + ], + "EndType": 0, + "EndTime": "", + "EndDuration": 0, + "BannerRes": "", + "PopUpRes": "2026-11-17T11:00:00+08:00", + "TabBgRes": "" + }, "510001": { "Id": 510001, "MidGroupId": 0, diff --git a/data/bin/AdControl.json b/data/bin/AdControl.json index 85b235576..5fb9edd48 100644 --- a/data/bin/AdControl.json +++ b/data/bin/AdControl.json @@ -192,5 +192,27 @@ "StartTime": "2026-10-20T12:00:00+08:00", "JumpTo": [], "RewardsGroup": "" + }, + "201021": { + "Id": 201021, + "DesText": "", + "UIAssets": "_201021/mainLineStory_act_02", + "CtrlName": "MainLineStoryActCtrl", + "StartTime": "2026-11-10T11:00:00+08:00", + "JumpTo": [ + 5006 + ], + "RewardsGroup": "" + }, + "201022": { + "Id": 201022, + "DesText": "", + "UIAssets": "Advertise/infinityTower_act_01", + "CtrlName": "InfinityTowerActCtrl", + "StartTime": "", + "JumpTo": [ + 42 + ], + "RewardsGroup": "" } } \ No newline at end of file diff --git a/data/bin/BdConvert.json b/data/bin/BdConvert.json index 238d9e4e3..3217cbff5 100644 --- a/data/bin/BdConvert.json +++ b/data/bin/BdConvert.json @@ -130,5 +130,16 @@ "RewardGroup": 12, "ScoreItemId": 73201, "ScoreItemLimit": 2400 + }, + "500013": { + "Id": 500013, + "OptionList": [ + 1301, + 1302, + 1303 + ], + "RewardGroup": 13, + "ScoreItemId": 73201, + "ScoreItemLimit": 2400 } } \ No newline at end of file diff --git a/data/bin/BdConvertContent.json b/data/bin/BdConvertContent.json index f240011a0..832f81fa4 100644 --- a/data/bin/BdConvertContent.json +++ b/data/bin/BdConvertContent.json @@ -612,5 +612,57 @@ ], "DoubleCheckMinLevel": 15, "Des": "BdConvertContent.1203.1" + }, + "1301": { + "Id": 1301, + "ConvertConditionList": [ + 103, + 611, + 502 + ], + "MaxSub": 1, + "Icon": "UI_Activity/_500001/SpriteAtlas/icon_collection_hard_s", + "BasicReward": "{\"73201\":600,\"35012\":1,\"35013\":1}", + "BasicRewardPreview": [ + 73201, + 35012, + 35013 + ], + "DoubleCheckMinLevel": 15, + "Des": "BdConvertContent.1301.1" + }, + "1302": { + "Id": 1302, + "ConvertConditionList": [ + 106, + 403, + 501 + ], + "MaxSub": 2, + "Icon": "UI_Activity/_500001/SpriteAtlas/icon_collection_hard_a", + "BasicReward": "{\"73201\":600,\"82004\":90}", + "BasicRewardPreview": [ + 73201, + 82004 + ], + "DoubleCheckMinLevel": 15, + "Des": "BdConvertContent.1302.1" + }, + "1303": { + "Id": 1303, + "ConvertConditionList": [ + 101, + 402, + 506 + ], + "MaxSub": 3, + "Icon": "UI_Activity/_500001/SpriteAtlas/icon_collection_hard_b", + "BasicReward": "{\"73201\":400,\"82001\":80}", + "BasicRewardPreview": [ + 73201, + 82001 + ], + "DoubleCheckMinLevel": 15, + "Des": "BdConvertContent.1303.1" } } \ No newline at end of file diff --git a/data/bin/BdConvertControl.json b/data/bin/BdConvertControl.json index 3ffa8f1ba..cada94026 100644 --- a/data/bin/BdConvertControl.json +++ b/data/bin/BdConvertControl.json @@ -179,5 +179,22 @@ 1 ], "DesText": "BdConvertControl.500012.1" + }, + "500013": { + "Id": 500013, + "UIAssets": "_500001/ActivityBdConvert", + "CtrlName": "BdConvertActCtrl", + "RewardsShow": [ + 503, + 35000, + 35012, + 35013, + 30004, + 50004, + 82001, + 82004, + 1 + ], + "DesText": "BdConvertControl.500013.1" } } \ No newline at end of file diff --git a/data/bin/BdConvertRewardGroup.json b/data/bin/BdConvertRewardGroup.json index 6fdb24d4d..29bcebdc0 100644 --- a/data/bin/BdConvertRewardGroup.json +++ b/data/bin/BdConvertRewardGroup.json @@ -1582,5 +1582,137 @@ ], "Rewards": "{\"72023\":1}", "Des": "BdConvertRewardGroup.1212.1" + }, + "1301": { + "Id": 1301, + "GroupId": 13, + "CompleteCond": 48, + "CompleteCondParams": [ + 73201, + 200 + ], + "Rewards": "{\"1\":750000}", + "Des": "BdConvertRewardGroup.1301.1" + }, + "1302": { + "Id": 1302, + "GroupId": 13, + "CompleteCond": 48, + "CompleteCondParams": [ + 73201, + 400 + ], + "Rewards": "{\"30004\":50}", + "Des": "BdConvertRewardGroup.1302.1" + }, + "1303": { + "Id": 1303, + "GroupId": 13, + "CompleteCond": 48, + "CompleteCondParams": [ + 73201, + 600 + ], + "Rewards": "{\"50004\":80}", + "Des": "BdConvertRewardGroup.1303.1" + }, + "1304": { + "Id": 1304, + "GroupId": 13, + "CompleteCond": 48, + "CompleteCondParams": [ + 73201, + 800 + ], + "Rewards": "{\"1\":800000}", + "Des": "BdConvertRewardGroup.1304.1" + }, + "1305": { + "Id": 1305, + "GroupId": 13, + "CompleteCond": 48, + "CompleteCondParams": [ + 73201, + 1000 + ], + "Rewards": "{\"82001\":60}", + "Des": "BdConvertRewardGroup.1305.1" + }, + "1306": { + "Id": 1306, + "GroupId": 13, + "CompleteCond": 48, + "CompleteCondParams": [ + 73201, + 1200 + ], + "Rewards": "{\"82004\":90}", + "Des": "BdConvertRewardGroup.1306.1" + }, + "1307": { + "Id": 1307, + "GroupId": 13, + "CompleteCond": 48, + "CompleteCondParams": [ + 73201, + 1400 + ], + "Rewards": "{\"35000\":5}", + "Des": "BdConvertRewardGroup.1307.1" + }, + "1308": { + "Id": 1308, + "GroupId": 13, + "CompleteCond": 48, + "CompleteCondParams": [ + 73201, + 1600 + ], + "Rewards": "{\"82001\":60}", + "Des": "BdConvertRewardGroup.1308.1" + }, + "1309": { + "Id": 1309, + "GroupId": 13, + "CompleteCond": 48, + "CompleteCondParams": [ + 73201, + 1800 + ], + "Rewards": "{\"82004\":90}", + "Des": "BdConvertRewardGroup.1309.1" + }, + "1310": { + "Id": 1310, + "GroupId": 13, + "CompleteCond": 48, + "CompleteCondParams": [ + 73201, + 2000 + ], + "Rewards": "{\"503\":4}", + "Des": "BdConvertRewardGroup.1310.1" + }, + "1311": { + "Id": 1311, + "GroupId": 13, + "CompleteCond": 48, + "CompleteCondParams": [ + 73201, + 2200 + ], + "Rewards": "{\"71027\":1}", + "Des": "BdConvertRewardGroup.1311.1" + }, + "1312": { + "Id": 1312, + "GroupId": 13, + "CompleteCond": 48, + "CompleteCondParams": [ + 73201, + 2400 + ], + "Rewards": "{\"72027\":1}", + "Des": "BdConvertRewardGroup.1312.1" } } \ No newline at end of file diff --git a/data/bin/Buff.json b/data/bin/Buff.json index 6f5dc88b5..faa5e3a62 100644 --- a/data/bin/Buff.json +++ b/data/bin/Buff.json @@ -32347,6 +32347,69 @@ "NotRemove": false, "ChangeTeamNotRemove": false }, + "720140110": { + "Id": 720140110, + "Name": "", + "LevelTypeData": 0, + "LevelData": 0, + "MainOrSupport": 0, + "GroupId": 720140110, + "ReduceTime": 0, + "BuffTag1": 0, + "BuffTag2": 0, + "BuffTag3": 0, + "BuffTag4": 0, + "BuffTag5": 0, + "BindEffect": "Actor/Monster/72014RenOu_Shiti/Buff/fx_m72014_buff_give", + "Icon": "", + "IsShow": false, + "TopofHeadEffect": "", + "BuffNumEffectLevel": [], + "NotRemove": false, + "ChangeTeamNotRemove": false + }, + "720140120": { + "Id": 720140120, + "Name": "", + "LevelTypeData": 0, + "LevelData": 0, + "MainOrSupport": 0, + "GroupId": 720140120, + "ReduceTime": 0, + "BuffTag1": 0, + "BuffTag2": 0, + "BuffTag3": 0, + "BuffTag4": 0, + "BuffTag5": 0, + "BindEffect": "Actor/Monster/72014RenOu_Shiti/Buff/fx_m72014_buff_give", + "Icon": "", + "IsShow": false, + "TopofHeadEffect": "", + "BuffNumEffectLevel": [], + "NotRemove": false, + "ChangeTeamNotRemove": false + }, + "720140130": { + "Id": 720140130, + "Name": "", + "LevelTypeData": 0, + "LevelData": 0, + "MainOrSupport": 0, + "GroupId": 720140130, + "ReduceTime": 0, + "BuffTag1": 0, + "BuffTag2": 0, + "BuffTag3": 0, + "BuffTag4": 0, + "BuffTag5": 0, + "BindEffect": "FX/Buff/fx_buff_effect_atk_up", + "Icon": "", + "IsShow": false, + "TopofHeadEffect": "", + "BuffNumEffectLevel": [], + "NotRemove": false, + "ChangeTeamNotRemove": false + }, "720140140": { "Id": 720140140, "Name": "", diff --git a/data/bin/BuffValue.json b/data/bin/BuffValue.json index 75bb608de..b6875c9c0 100644 --- a/data/bin/BuffValue.json +++ b/data/bin/BuffValue.json @@ -33409,6 +33409,62 @@ "IsInherit": false, "IsExitDelete": false }, + "720140110": { + "Id": 720140110, + "Name": "", + "Sort": 0, + "Effects": [], + "BuffEffects": [], + "Time": 200000, + "LaminatedNum": 1, + "Num": 1, + "TimeSuperposition": 2, + "Timing": 2, + "ReplaceType": true, + "ReplaceMode": true, + "AttackClear": false, + "HitClear": false, + "IsInherit": false, + "IsExitDelete": false + }, + "720140120": { + "Id": 720140120, + "Name": "", + "Sort": 0, + "Effects": [], + "BuffEffects": [], + "Time": 150000, + "LaminatedNum": 1, + "Num": 1, + "TimeSuperposition": 2, + "Timing": 2, + "ReplaceType": true, + "ReplaceMode": true, + "AttackClear": false, + "HitClear": false, + "IsInherit": false, + "IsExitDelete": false + }, + "720140130": { + "Id": 720140130, + "Name": "", + "Sort": 0, + "Effects": [ + 720140130 + ], + "BuffEffects": [], + "Time": 100000, + "LaminatedNum": 1, + "Num": 1, + "TimeSuperposition": 2, + "Timing": 1, + "ReplaceType": true, + "ReplaceMode": true, + "AttackClear": false, + "HitClear": false, + "IsInherit": false, + "IsExitDelete": false + }, "720140140": { "Id": 720140140, "Name": "", diff --git a/data/bin/Effect.json b/data/bin/Effect.json index de9c2b486..11b022204 100644 --- a/data/bin/Effect.json +++ b/data/bin/Effect.json @@ -84501,6 +84501,52 @@ "Target2Param4": "", "FilterLogicType": 1 }, + "720140130": { + "Id": 720140130, + "Name": "", + "LevelTypeData": 0, + "LevelData": 0, + "MainOrSupport": 0, + "Trigger": 1, + "TriggerTarget": 1, + "TriggerCondition1": 1, + "TriggerParam1": "", + "TriggerParam2": "", + "TriggerParam3": "", + "TriggerParam4": "", + "TriggerTarget2": 0, + "TriggerCondition2": 0, + "Trigger2Param1": "", + "Trigger2Param2": "", + "Trigger2Param3": "", + "Trigger2Param4": "", + "TriggerLogicType": 1, + "TakeEffectTarget1": 1, + "TakeEffectCondition1": 1, + "TakeEffectParam1": "", + "TakeEffectParam2": "", + "TakeEffectParam3": "", + "TakeEffectParam4": "", + "TakeEffectTarget2": 0, + "TakeEffectCondition2": 0, + "TakeEffect2Param1": "", + "TakeEffect2Param2": "", + "TakeEffect2Param3": "", + "TakeEffect2Param4": "", + "TakeEffectLogicType": 1, + "Target1": 1, + "TargetCondition1": 1, + "TargetParam1": "", + "TargetParam2": "", + "TargetParam3": "", + "TargetParam4": "", + "TargetCondition2": 0, + "Target2Param1": "", + "Target2Param2": "", + "Target2Param3": "", + "Target2Param4": "", + "FilterLogicType": 1 + }, "700619101": { "Id": 700619101, "Name": "", diff --git a/data/bin/EffectValue.json b/data/bin/EffectValue.json index 45adda7aa..2bcecf0d3 100644 --- a/data/bin/EffectValue.json +++ b/data/bin/EffectValue.json @@ -126007,6 +126007,25 @@ "EffectTypeParam6": "", "EffectTypeParam7": "" }, + "720140130": { + "Id": 720140130, + "Name": "", + "Tag": "1", + "TakeEffectLimit": 0, + "Remove": false, + "CD": 0, + "EffectRate": 100, + "EffectType": 12, + "EffectTypeFirstSubtype": 1, + "EffectTypeSecondSubtype": 2, + "EffectTypeParam1": "0.15", + "EffectTypeParam2": "", + "EffectTypeParam3": "", + "EffectTypeParam4": "", + "EffectTypeParam5": "", + "EffectTypeParam6": "", + "EffectTypeParam7": "" + }, "700619101": { "Id": 700619101, "Name": "", diff --git a/data/bin/Item.json b/data/bin/Item.json index e22ee0697..ff14661f6 100644 --- a/data/bin/Item.json +++ b/data/bin/Item.json @@ -36419,13 +36419,13 @@ "Desc": "Item.516.2", "Literary": "Item.516.3", "Type": 2, - "Stype": 2, + "Stype": 32, "Rarity": 1, "Stack": false, "PositionLimit": 0, "ExpireType": 0, "UseMode": 0, - "UseAction": 0, + "UseAction": 1, "UseArgs": "", "Display": false, "DisHaving": true, @@ -39983,6 +39983,27 @@ "Icon": "", "Icon2": "Icon/Item/item_70001" }, + "71027": { + "Id": 71027, + "Title": "Item.71027.1", + "Desc": "Item.71027.2", + "Literary": "Item.71027.3", + "Type": 12, + "Stype": 2, + "Rarity": 2, + "Stack": false, + "PositionLimit": 0, + "ExpireType": 0, + "UseMode": 0, + "UseAction": 0, + "UseArgs": "", + "Display": false, + "DisHaving": false, + "ObtainWays": "", + "JumpTo": [], + "Icon": "", + "Icon2": "Icon/Item/item_70001" + }, "71028": { "Id": 71028, "Title": "Item.71028.1", @@ -40571,6 +40592,27 @@ "Icon": "", "Icon2": "Icon/Item/item_70001" }, + "72027": { + "Id": 72027, + "Title": "Item.72027.1", + "Desc": "Item.72027.2", + "Literary": "Item.72027.3", + "Type": 12, + "Stype": 2, + "Rarity": 2, + "Stack": false, + "PositionLimit": 0, + "ExpireType": 0, + "UseMode": 0, + "UseAction": 0, + "UseArgs": "", + "Display": false, + "DisHaving": false, + "ObtainWays": "", + "JumpTo": [], + "Icon": "", + "Icon2": "Icon/Item/item_70001" + }, "72028": { "Id": 72028, "Title": "Item.72028.1", diff --git a/data/bin/JumpTo.json b/data/bin/JumpTo.json index 5f0e8b5ec..3bb659de2 100644 --- a/data/bin/JumpTo.json +++ b/data/bin/JumpTo.json @@ -725,6 +725,15 @@ "Desc": "JumpTo.5005.1", "Icon": "Icon/JumpTo/btn_main_system_character" }, + "5006": { + "Id": 5006, + "Type": 51, + "Param": [ + 11 + ], + "Desc": "JumpTo.5006.1", + "Icon": "" + }, "6009": { "Id": 6009, "Type": 6, diff --git a/data/bin/LoginRewardControl.json b/data/bin/LoginRewardControl.json index fdd691e6e..efcdc3768 100644 --- a/data/bin/LoginRewardControl.json +++ b/data/bin/LoginRewardControl.json @@ -111,6 +111,14 @@ "CtrlName": "_301053/LoginSkinRewardCtrl_01", "PopUpUIAssets": "_301053/LoginSkinReward_01" }, + "301054": { + "Id": 301054, + "RewardsGroup": 301054, + "DesText": "LoginRewardControl.301054.1", + "UIAssets": "_301054/loginReward_act_01", + "CtrlName": "_301054/LoginRewardCtrl_01", + "PopUpUIAssets": "_301054/LoginReward_01" + }, "302001": { "Id": 302001, "RewardsGroup": 302001, diff --git a/data/bin/LoginRewardGroup.json b/data/bin/LoginRewardGroup.json index bdcb4f01d..97c815004 100644 --- a/data/bin/LoginRewardGroup.json +++ b/data/bin/LoginRewardGroup.json @@ -1394,6 +1394,111 @@ "RewardDesc": "LoginRewardGroup.30105301.1", "DisRare": true }, + "30105401": { + "Id": 30105401, + "RewardGroupId": 301054, + "Order": 1, + "RewardId1": 502, + "Qty1": 1, + "RewardId2": 81009, + "Qty2": 2, + "RewardId3": 0, + "Qty3": 0, + "RewardIcon": "", + "RewardCount": 0, + "RewardDesc": "LoginRewardGroup.30105401.1", + "DisRare": true + }, + "30105402": { + "Id": 30105402, + "RewardGroupId": 301054, + "Order": 2, + "RewardId1": 503, + "Qty1": 1, + "RewardId2": 82008, + "Qty2": 50, + "RewardId3": 0, + "Qty3": 0, + "RewardIcon": "", + "RewardCount": 0, + "RewardDesc": "LoginRewardGroup.30105402.1", + "DisRare": false + }, + "30105403": { + "Id": 30105403, + "RewardGroupId": 301054, + "Order": 3, + "RewardId1": 33913, + "Qty1": 1, + "RewardId2": 81009, + "Qty2": 2, + "RewardId3": 0, + "Qty3": 0, + "RewardIcon": "", + "RewardCount": 0, + "RewardDesc": "LoginRewardGroup.30105403.1", + "DisRare": true + }, + "30105404": { + "Id": 30105404, + "RewardGroupId": 301054, + "Order": 4, + "RewardId1": 602, + "Qty1": 300, + "RewardId2": 82002, + "Qty2": 50, + "RewardId3": 0, + "Qty3": 0, + "RewardIcon": "", + "RewardCount": 0, + "RewardDesc": "LoginRewardGroup.30105404.1", + "DisRare": false + }, + "30105405": { + "Id": 30105405, + "RewardGroupId": 301054, + "Order": 5, + "RewardId1": 603, + "Qty1": 300, + "RewardId2": 81009, + "Qty2": 2, + "RewardId3": 0, + "Qty3": 0, + "RewardIcon": "", + "RewardCount": 0, + "RewardDesc": "LoginRewardGroup.30105405.1", + "DisRare": true + }, + "30105406": { + "Id": 30105406, + "RewardGroupId": 301054, + "Order": 6, + "RewardId1": 33913, + "Qty1": 1, + "RewardId2": 82005, + "Qty2": 50, + "RewardId3": 0, + "Qty3": 0, + "RewardIcon": "", + "RewardCount": 0, + "RewardDesc": "LoginRewardGroup.30105406.1", + "DisRare": false + }, + "30105407": { + "Id": 30105407, + "RewardGroupId": 301054, + "Order": 7, + "RewardId1": 35000, + "Qty1": 10, + "RewardId2": 81009, + "Qty2": 2, + "RewardId3": 0, + "Qty3": 0, + "RewardIcon": "", + "RewardCount": 0, + "RewardDesc": "LoginRewardGroup.30105407.1", + "DisRare": true + }, "30200101": { "Id": 30200101, "RewardGroupId": 302001, diff --git a/data/bin/MailTemplate.json b/data/bin/MailTemplate.json index 3e34acf4a..11348dccd 100644 --- a/data/bin/MailTemplate.json +++ b/data/bin/MailTemplate.json @@ -527,6 +527,17 @@ "Type": 1, "Items": "" }, + "4020": { + "Id": 4020, + "Explanation": "活动结束补偿邮件", + "Icon": "Icon/Head/head_12501", + "Author": "MailTemplate.4020.1", + "LetterPaper": "background2", + "Subject": "MailTemplate.4020.2", + "Desc": "MailTemplate.4020.3", + "Type": 1, + "Items": "" + }, "5001": { "Id": 5001, "Explanation": "问卷调查奖励邮件", diff --git a/data/bin/MainlineFloor.json b/data/bin/MainlineFloor.json index ab568c86d..057d8b322 100644 --- a/data/bin/MainlineFloor.json +++ b/data/bin/MainlineFloor.json @@ -639,6 +639,16 @@ "MonsterLv": 6, "IntroCutscene": "" }, + "1100201": { + "Id": 1100201, + "SceneName": "Levels/Main/Ruin/Ruin_Main_10_2", + "ConfigPrefabName": "Ruin_Main_10_2", + "Theme": 31, + "BGM": "prologue_combatNormal_setState", + "LeaveTriggerEvent": "amb_prologue_all_stop", + "MonsterLv": 6, + "IntroCutscene": "" + }, "1100301": { "Id": 1100301, "SceneName": "Levels/JointDrill/JointDrill_03/JointDrill_03", diff --git a/data/bin/Monster.json b/data/bin/Monster.json index acb9a886b..c5b5ea885 100644 --- a/data/bin/Monster.json +++ b/data/bin/Monster.json @@ -96093,6 +96093,1064 @@ "BlockPriority": 0, "MonsterTeamId": 999 }, + "1900701": { + "Id": 1900701, + "Name": "", + "EpicLv": 4, + "MonsterPosition": 0, + "BloodType": 0, + "Force": "", + "FCId": 0, + "FAId": 3170121, + "MovType": 9990003, + "RunSpd": 2, + "TransSpdScale": 50000, + "WalkSpd": 6000, + "MovAcc": 80000, + "VisionRng": 700000, + "VisionDeg": 3600000, + "HearRng": 3600000, + "RefRng": 3600000, + "ActRng": 900000, + "DisActRng": 900000, + "SearchRng": 990000, + "RotSpd": 990000, + "RotSpdInSkill": 3000000, + "Templete": 0, + "BuffIds": [ + 1900701 + ], + "SubType": 0, + "Faction": 1, + "TrapTagIds": [ + 2 + ], + "SupCharge": 2, + "IsShowRng": false, + "Weight": 0, + "ToughnessBrokenTime": 4, + "IsToughnessRecorver": false, + "Tag1": "", + "Tag2": "", + "Tag3": "", + "Tag4": "", + "Tag5": "", + "AttackHintType": 0, + "BlockPriority": 0, + "MonsterTeamId": 3 + }, + "1900702": { + "Id": 1900702, + "Name": "", + "EpicLv": 4, + "MonsterPosition": 0, + "BloodType": 0, + "Force": "", + "FCId": 0, + "FAId": 3170122, + "MovType": 3170101, + "RunSpd": 2, + "TransSpdScale": 50000, + "WalkSpd": 6000, + "MovAcc": 80000, + "VisionRng": 700000, + "VisionDeg": 3600000, + "HearRng": 3600000, + "RefRng": 3600000, + "ActRng": 900000, + "DisActRng": 900000, + "SearchRng": 990000, + "RotSpd": 990000, + "RotSpdInSkill": 3000000, + "Templete": 0, + "BuffIds": [ + 1900702 + ], + "SubType": 0, + "Faction": 1, + "TrapTagIds": [ + 2 + ], + "SupCharge": 2, + "IsShowRng": false, + "Weight": 0, + "ToughnessBrokenTime": 4, + "IsToughnessRecorver": false, + "Tag1": "", + "Tag2": "", + "Tag3": "", + "Tag4": "", + "Tag5": "", + "AttackHintType": 0, + "BlockPriority": 0, + "MonsterTeamId": 3 + }, + "1900703": { + "Id": 1900703, + "Name": "", + "EpicLv": 4, + "MonsterPosition": 0, + "BloodType": 0, + "Force": "", + "FCId": 0, + "FAId": 7201383, + "MovType": 7201402, + "RunSpd": 2, + "TransSpdScale": 45000, + "WalkSpd": 6000, + "MovAcc": 30000, + "VisionRng": 700000, + "VisionDeg": 3600000, + "HearRng": 3600000, + "RefRng": 3600000, + "ActRng": 900000, + "DisActRng": 900000, + "SearchRng": 990000, + "RotSpd": 990000, + "RotSpdInSkill": 3000000, + "Templete": 0, + "BuffIds": [ + 1900703 + ], + "SubType": 720140150, + "Faction": 1, + "TrapTagIds": [ + 3 + ], + "SupCharge": 0, + "IsShowRng": false, + "Weight": 0, + "ToughnessBrokenTime": 4, + "IsToughnessRecorver": false, + "Tag1": "", + "Tag2": "MiniBoss", + "Tag3": "", + "Tag4": "", + "Tag5": "", + "AttackHintType": 0, + "BlockPriority": 0, + "MonsterTeamId": 4 + }, + "1900704": { + "Id": 1900704, + "Name": "", + "EpicLv": 5, + "MonsterPosition": 0, + "BloodType": 0, + "Force": "", + "FCId": 0, + "FAId": 7201352, + "MovType": 7201301, + "RunSpd": 2, + "TransSpdScale": 30000, + "WalkSpd": 6000, + "MovAcc": 30000, + "VisionRng": 700000, + "VisionDeg": 500000, + "HearRng": 3600000, + "RefRng": 500000, + "ActRng": 900000, + "DisActRng": 980000, + "SearchRng": 990000, + "RotSpd": 990000, + "RotSpdInSkill": 3000000, + "Templete": 0, + "BuffIds": [ + 1900704 + ], + "SubType": 990010030, + "Faction": 1, + "TrapTagIds": [ + 3 + ], + "SupCharge": 2, + "IsShowRng": false, + "Weight": 0, + "ToughnessBrokenTime": 99, + "IsToughnessRecorver": true, + "Tag1": "", + "Tag2": "", + "Tag3": "", + "Tag4": "", + "Tag5": "", + "AttackHintType": 0, + "BlockPriority": 0, + "MonsterTeamId": 4 + }, + "1900705": { + "Id": 1900705, + "Name": "", + "EpicLv": 3, + "MonsterPosition": 0, + "BloodType": 0, + "Force": "", + "FCId": 0, + "FAId": 7201505, + "MovType": 7201505, + "RunSpd": 2, + "TransSpdScale": 50000, + "WalkSpd": 6000, + "MovAcc": 15000, + "VisionRng": 700000, + "VisionDeg": 200000, + "HearRng": 600000, + "RefRng": 200000, + "ActRng": 900000, + "DisActRng": 980000, + "SearchRng": 990000, + "RotSpd": 990000, + "RotSpdInSkill": 3000000, + "Templete": 0, + "BuffIds": [ + 1900705 + ], + "SubType": 720140150, + "Faction": 1, + "TrapTagIds": [ + 3 + ], + "SupCharge": 2, + "IsShowRng": false, + "Weight": 0, + "ToughnessBrokenTime": 3, + "IsToughnessRecorver": false, + "Tag1": "", + "Tag2": "", + "Tag3": "", + "Tag4": "", + "Tag5": "", + "AttackHintType": 0, + "BlockPriority": 0, + "MonsterTeamId": 3 + }, + "1900706": { + "Id": 1900706, + "Name": "", + "EpicLv": 3, + "MonsterPosition": 0, + "BloodType": 0, + "Force": "", + "FCId": 0, + "FAId": 7201606, + "MovType": 7201605, + "RunSpd": 2, + "TransSpdScale": 40000, + "WalkSpd": 6000, + "MovAcc": 15000, + "VisionRng": 700000, + "VisionDeg": 300000, + "HearRng": 1200000, + "RefRng": 300000, + "ActRng": 900000, + "DisActRng": 980000, + "SearchRng": 990000, + "RotSpd": 990000, + "RotSpdInSkill": 3000000, + "Templete": 0, + "BuffIds": [ + 1900706 + ], + "SubType": 720140150, + "Faction": 1, + "TrapTagIds": [ + 3 + ], + "SupCharge": 2, + "IsShowRng": false, + "Weight": 0, + "ToughnessBrokenTime": 3, + "IsToughnessRecorver": false, + "Tag1": "", + "Tag2": "", + "Tag3": "", + "Tag4": "", + "Tag5": "", + "AttackHintType": 0, + "BlockPriority": 0, + "MonsterTeamId": 3 + }, + "1900707": { + "Id": 1900707, + "Name": "", + "EpicLv": 4, + "MonsterPosition": 0, + "BloodType": 0, + "Force": "", + "FCId": 0, + "FAId": 7201382, + "MovType": 1000901, + "RunSpd": 2, + "TransSpdScale": 20000, + "WalkSpd": 6000, + "MovAcc": 80000, + "VisionRng": 700000, + "VisionDeg": 3600000, + "HearRng": 3600000, + "RefRng": 3600000, + "ActRng": 900000, + "DisActRng": 900000, + "SearchRng": 990000, + "RotSpd": 990000, + "RotSpdInSkill": 3000000, + "Templete": 0, + "BuffIds": [ + 1900707 + ], + "SubType": 990010020, + "Faction": 1, + "TrapTagIds": [ + 3 + ], + "SupCharge": 2, + "IsShowRng": false, + "Weight": 0, + "ToughnessBrokenTime": 4, + "IsToughnessRecorver": false, + "Tag1": "", + "Tag2": "", + "Tag3": "", + "Tag4": "", + "Tag5": "", + "AttackHintType": 0, + "BlockPriority": 0, + "MonsterTeamId": 3 + }, + "1900708": { + "Id": 1900708, + "Name": "", + "EpicLv": 4, + "MonsterPosition": 0, + "BloodType": 0, + "Force": "", + "FCId": 0, + "FAId": 7201372, + "MovType": 7201301, + "RunSpd": 2, + "TransSpdScale": 20000, + "WalkSpd": 6000, + "MovAcc": 20000, + "VisionRng": 700000, + "VisionDeg": 500000, + "HearRng": 3600000, + "RefRng": 500000, + "ActRng": 900000, + "DisActRng": 980000, + "SearchRng": 990000, + "RotSpd": 990000, + "RotSpdInSkill": 3000000, + "Templete": 0, + "BuffIds": [ + 1900708 + ], + "SubType": 990010030, + "Faction": 1, + "TrapTagIds": [ + 3 + ], + "SupCharge": 2, + "IsShowRng": false, + "Weight": 0, + "ToughnessBrokenTime": 99, + "IsToughnessRecorver": true, + "Tag1": "", + "Tag2": "", + "Tag3": "", + "Tag4": "", + "Tag5": "", + "AttackHintType": 0, + "BlockPriority": 0, + "MonsterTeamId": 4 + }, + "1900709": { + "Id": 1900709, + "Name": "", + "EpicLv": 4, + "MonsterPosition": 0, + "BloodType": 0, + "Force": "", + "FCId": 0, + "FAId": 7201354, + "MovType": 7201301, + "RunSpd": 2, + "TransSpdScale": 30000, + "WalkSpd": 6000, + "MovAcc": 30000, + "VisionRng": 700000, + "VisionDeg": 500000, + "HearRng": 3600000, + "RefRng": 500000, + "ActRng": 900000, + "DisActRng": 980000, + "SearchRng": 990000, + "RotSpd": 990000, + "RotSpdInSkill": 3000000, + "Templete": 0, + "BuffIds": [ + 1900709 + ], + "SubType": 990010030, + "Faction": 1, + "TrapTagIds": [ + 3 + ], + "SupCharge": 2, + "IsShowRng": false, + "Weight": 0, + "ToughnessBrokenTime": 99, + "IsToughnessRecorver": true, + "Tag1": "", + "Tag2": "", + "Tag3": "", + "Tag4": "", + "Tag5": "", + "AttackHintType": 0, + "BlockPriority": 0, + "MonsterTeamId": 4 + }, + "1900710": { + "Id": 1900710, + "Name": "", + "EpicLv": 4, + "MonsterPosition": 0, + "BloodType": 0, + "Force": "", + "FCId": 0, + "FAId": 7201371, + "MovType": 7201301, + "RunSpd": 2, + "TransSpdScale": 30000, + "WalkSpd": 6000, + "MovAcc": 30000, + "VisionRng": 700000, + "VisionDeg": 500000, + "HearRng": 3600000, + "RefRng": 500000, + "ActRng": 900000, + "DisActRng": 980000, + "SearchRng": 990000, + "RotSpd": 990000, + "RotSpdInSkill": 3000000, + "Templete": 0, + "BuffIds": [ + 1900710 + ], + "SubType": 990010030, + "Faction": 1, + "TrapTagIds": [ + 3 + ], + "SupCharge": 2, + "IsShowRng": false, + "Weight": 0, + "ToughnessBrokenTime": 99, + "IsToughnessRecorver": true, + "Tag1": "", + "Tag2": "", + "Tag3": "", + "Tag4": "", + "Tag5": "", + "AttackHintType": 0, + "BlockPriority": 0, + "MonsterTeamId": 4 + }, + "1900711": { + "Id": 1900711, + "Name": "", + "EpicLv": 4, + "MonsterPosition": 0, + "BloodType": 0, + "Force": "", + "FCId": 0, + "FAId": 7201501, + "MovType": 7201501, + "RunSpd": 2, + "TransSpdScale": 30000, + "WalkSpd": 6000, + "MovAcc": 15000, + "VisionRng": 700000, + "VisionDeg": 200000, + "HearRng": 600000, + "RefRng": 200000, + "ActRng": 900000, + "DisActRng": 980000, + "SearchRng": 990000, + "RotSpd": 990000, + "RotSpdInSkill": 3000000, + "Templete": 0, + "BuffIds": [ + 1900711 + ], + "SubType": 0, + "Faction": 1, + "TrapTagIds": [ + 3 + ], + "SupCharge": 0, + "IsShowRng": false, + "Weight": 0, + "ToughnessBrokenTime": 3, + "IsToughnessRecorver": false, + "Tag1": "", + "Tag2": "", + "Tag3": "", + "Tag4": "", + "Tag5": "", + "AttackHintType": 0, + "BlockPriority": 0, + "MonsterTeamId": 3 + }, + "1900712": { + "Id": 1900712, + "Name": "", + "EpicLv": 4, + "MonsterPosition": 0, + "BloodType": 0, + "Force": "", + "FCId": 0, + "FAId": 7201601, + "MovType": 7201601, + "RunSpd": 2, + "TransSpdScale": 40000, + "WalkSpd": 6000, + "MovAcc": 20000, + "VisionRng": 700000, + "VisionDeg": 300000, + "HearRng": 1200000, + "RefRng": 300000, + "ActRng": 900000, + "DisActRng": 980000, + "SearchRng": 990000, + "RotSpd": 990000, + "RotSpdInSkill": 3000000, + "Templete": 0, + "BuffIds": [ + 1900712 + ], + "SubType": 0, + "Faction": 1, + "TrapTagIds": [ + 3 + ], + "SupCharge": 0, + "IsShowRng": false, + "Weight": 0, + "ToughnessBrokenTime": 3, + "IsToughnessRecorver": false, + "Tag1": "", + "Tag2": "", + "Tag3": "", + "Tag4": "", + "Tag5": "", + "AttackHintType": 0, + "BlockPriority": 0, + "MonsterTeamId": 3 + }, + "1900713": { + "Id": 1900713, + "Name": "", + "EpicLv": 4, + "MonsterPosition": 0, + "BloodType": 0, + "Force": "", + "FCId": 0, + "FAId": 7201504, + "MovType": 7201501, + "RunSpd": 2, + "TransSpdScale": 30000, + "WalkSpd": 6000, + "MovAcc": 15000, + "VisionRng": 700000, + "VisionDeg": 200000, + "HearRng": 600000, + "RefRng": 2000000, + "ActRng": 9000000, + "DisActRng": 9800000, + "SearchRng": 9900000, + "RotSpd": 9900000, + "RotSpdInSkill": 3000000, + "Templete": 0, + "BuffIds": [ + 1900711 + ], + "SubType": 720140160, + "Faction": 1, + "TrapTagIds": [ + 3 + ], + "SupCharge": 0, + "IsShowRng": false, + "Weight": 0, + "ToughnessBrokenTime": 3, + "IsToughnessRecorver": false, + "Tag1": "", + "Tag2": "", + "Tag3": "", + "Tag4": "", + "Tag5": "", + "AttackHintType": 0, + "BlockPriority": 0, + "MonsterTeamId": 3 + }, + "1900714": { + "Id": 1900714, + "Name": "", + "EpicLv": 4, + "MonsterPosition": 0, + "BloodType": 0, + "Force": "", + "FCId": 0, + "FAId": 7201604, + "MovType": 7201601, + "RunSpd": 2, + "TransSpdScale": 40000, + "WalkSpd": 6000, + "MovAcc": 20000, + "VisionRng": 700000, + "VisionDeg": 300000, + "HearRng": 1200000, + "RefRng": 2000000, + "ActRng": 9000000, + "DisActRng": 9800000, + "SearchRng": 9900000, + "RotSpd": 9900000, + "RotSpdInSkill": 3000000, + "Templete": 0, + "BuffIds": [ + 1900712 + ], + "SubType": 720140160, + "Faction": 1, + "TrapTagIds": [ + 3 + ], + "SupCharge": 0, + "IsShowRng": false, + "Weight": 0, + "ToughnessBrokenTime": 3, + "IsToughnessRecorver": false, + "Tag1": "", + "Tag2": "", + "Tag3": "", + "Tag4": "", + "Tag5": "", + "AttackHintType": 0, + "BlockPriority": 0, + "MonsterTeamId": 3 + }, + "1900715": { + "Id": 1900715, + "Name": "", + "EpicLv": 5, + "MonsterPosition": 0, + "BloodType": 0, + "Force": "", + "FCId": 0, + "FAId": 7201503, + "MovType": 7201501, + "RunSpd": 1, + "TransSpdScale": 30000, + "WalkSpd": 6000, + "MovAcc": 15000, + "VisionRng": 700000, + "VisionDeg": 200000, + "HearRng": 600000, + "RefRng": 2000000, + "ActRng": 9000000, + "DisActRng": 9800000, + "SearchRng": 9900000, + "RotSpd": 9900000, + "RotSpdInSkill": 3000000, + "Templete": 0, + "BuffIds": [ + 1900713 + ], + "SubType": 720140150, + "Faction": 1, + "TrapTagIds": [ + 3 + ], + "SupCharge": 0, + "IsShowRng": false, + "Weight": 0, + "ToughnessBrokenTime": 99, + "IsToughnessRecorver": false, + "Tag1": "", + "Tag2": "", + "Tag3": "", + "Tag4": "", + "Tag5": "", + "AttackHintType": 0, + "BlockPriority": 0, + "MonsterTeamId": 999 + }, + "1900716": { + "Id": 1900716, + "Name": "", + "EpicLv": 5, + "MonsterPosition": 0, + "BloodType": 0, + "Force": "", + "FCId": 0, + "FAId": 7201603, + "MovType": 7201601, + "RunSpd": 1, + "TransSpdScale": 40000, + "WalkSpd": 6000, + "MovAcc": 20000, + "VisionRng": 700000, + "VisionDeg": 300000, + "HearRng": 1200000, + "RefRng": 2000000, + "ActRng": 9000000, + "DisActRng": 9800000, + "SearchRng": 9900000, + "RotSpd": 9900000, + "RotSpdInSkill": 3000000, + "Templete": 0, + "BuffIds": [ + 1900713 + ], + "SubType": 720140150, + "Faction": 1, + "TrapTagIds": [ + 3 + ], + "SupCharge": 0, + "IsShowRng": false, + "Weight": 0, + "ToughnessBrokenTime": 99, + "IsToughnessRecorver": false, + "Tag1": "", + "Tag2": "", + "Tag3": "", + "Tag4": "", + "Tag5": "", + "AttackHintType": 0, + "BlockPriority": 0, + "MonsterTeamId": 999 + }, + "1900717": { + "Id": 1900717, + "Name": "", + "EpicLv": 5, + "MonsterPosition": 0, + "BloodType": 0, + "Force": "", + "FCId": 0, + "FAId": 7201452, + "MovType": 7201402, + "RunSpd": 1, + "TransSpdScale": 45000, + "WalkSpd": 6000, + "MovAcc": 30000, + "VisionRng": 700000, + "VisionDeg": 3600000, + "HearRng": 3600000, + "RefRng": 2000000, + "ActRng": 9000000, + "DisActRng": 9800000, + "SearchRng": 9900000, + "RotSpd": 9900000, + "RotSpdInSkill": 3000000, + "Templete": 0, + "BuffIds": [ + 1900713 + ], + "SubType": 720140150, + "Faction": 1, + "TrapTagIds": [ + 3 + ], + "SupCharge": 0, + "IsShowRng": false, + "Weight": 0, + "ToughnessBrokenTime": 99, + "IsToughnessRecorver": false, + "Tag1": "", + "Tag2": "", + "Tag3": "", + "Tag4": "", + "Tag5": "", + "AttackHintType": 0, + "BlockPriority": 0, + "MonsterTeamId": 999 + }, + "1900718": { + "Id": 1900718, + "Name": "", + "EpicLv": 5, + "MonsterPosition": 0, + "BloodType": 0, + "Force": "", + "FCId": 0, + "FAId": 7201363, + "MovType": 7201301, + "RunSpd": 1, + "TransSpdScale": 30000, + "WalkSpd": 6000, + "MovAcc": 30000, + "VisionRng": 700000, + "VisionDeg": 500000, + "HearRng": 3600000, + "RefRng": 2000000, + "ActRng": 9000000, + "DisActRng": 9800000, + "SearchRng": 9900000, + "RotSpd": 9900000, + "RotSpdInSkill": 3000000, + "Templete": 0, + "BuffIds": [ + 1900713 + ], + "SubType": 720140150, + "Faction": 1, + "TrapTagIds": [ + 3 + ], + "SupCharge": 0, + "IsShowRng": false, + "Weight": 0, + "ToughnessBrokenTime": 99, + "IsToughnessRecorver": false, + "Tag1": "", + "Tag2": "", + "Tag3": "", + "Tag4": "", + "Tag5": "", + "AttackHintType": 0, + "BlockPriority": 0, + "MonsterTeamId": 999 + }, + "1900719": { + "Id": 1900719, + "Name": "", + "EpicLv": 5, + "MonsterPosition": 0, + "BloodType": 0, + "Force": "", + "FCId": 0, + "FAId": 7201503, + "MovType": 7201501, + "RunSpd": 2, + "TransSpdScale": 30000, + "WalkSpd": 6000, + "MovAcc": 15000, + "VisionRng": 700000, + "VisionDeg": 200000, + "HearRng": 600000, + "RefRng": 2000000, + "ActRng": 9000000, + "DisActRng": 9800000, + "SearchRng": 9900000, + "RotSpd": 9900000, + "RotSpdInSkill": 3000000, + "Templete": 0, + "BuffIds": [ + 1900713 + ], + "SubType": 720140150, + "Faction": 1, + "TrapTagIds": [ + 3 + ], + "SupCharge": 0, + "IsShowRng": false, + "Weight": 0, + "ToughnessBrokenTime": 99, + "IsToughnessRecorver": false, + "Tag1": "", + "Tag2": "", + "Tag3": "", + "Tag4": "", + "Tag5": "", + "AttackHintType": 0, + "BlockPriority": 0, + "MonsterTeamId": 999 + }, + "1900720": { + "Id": 1900720, + "Name": "", + "EpicLv": 5, + "MonsterPosition": 0, + "BloodType": 0, + "Force": "", + "FCId": 0, + "FAId": 7201603, + "MovType": 7201601, + "RunSpd": 2, + "TransSpdScale": 40000, + "WalkSpd": 6000, + "MovAcc": 20000, + "VisionRng": 700000, + "VisionDeg": 300000, + "HearRng": 1200000, + "RefRng": 2000000, + "ActRng": 9000000, + "DisActRng": 9800000, + "SearchRng": 9900000, + "RotSpd": 9900000, + "RotSpdInSkill": 3000000, + "Templete": 0, + "BuffIds": [ + 1900713 + ], + "SubType": 720140150, + "Faction": 1, + "TrapTagIds": [ + 3 + ], + "SupCharge": 0, + "IsShowRng": false, + "Weight": 0, + "ToughnessBrokenTime": 99, + "IsToughnessRecorver": false, + "Tag1": "", + "Tag2": "", + "Tag3": "", + "Tag4": "", + "Tag5": "", + "AttackHintType": 0, + "BlockPriority": 0, + "MonsterTeamId": 999 + }, + "1900721": { + "Id": 1900721, + "Name": "", + "EpicLv": 5, + "MonsterPosition": 0, + "BloodType": 0, + "Force": "", + "FCId": 0, + "FAId": 7201452, + "MovType": 7201402, + "RunSpd": 2, + "TransSpdScale": 45000, + "WalkSpd": 6000, + "MovAcc": 30000, + "VisionRng": 700000, + "VisionDeg": 3600000, + "HearRng": 3600000, + "RefRng": 2000000, + "ActRng": 9000000, + "DisActRng": 9800000, + "SearchRng": 9900000, + "RotSpd": 9900000, + "RotSpdInSkill": 3000000, + "Templete": 0, + "BuffIds": [ + 1900713 + ], + "SubType": 720140150, + "Faction": 1, + "TrapTagIds": [ + 3 + ], + "SupCharge": 0, + "IsShowRng": false, + "Weight": 0, + "ToughnessBrokenTime": 99, + "IsToughnessRecorver": false, + "Tag1": "", + "Tag2": "", + "Tag3": "", + "Tag4": "", + "Tag5": "", + "AttackHintType": 0, + "BlockPriority": 0, + "MonsterTeamId": 999 + }, + "1900722": { + "Id": 1900722, + "Name": "", + "EpicLv": 5, + "MonsterPosition": 0, + "BloodType": 0, + "Force": "", + "FCId": 0, + "FAId": 7201363, + "MovType": 7201301, + "RunSpd": 2, + "TransSpdScale": 30000, + "WalkSpd": 6000, + "MovAcc": 30000, + "VisionRng": 700000, + "VisionDeg": 500000, + "HearRng": 3600000, + "RefRng": 2000000, + "ActRng": 9000000, + "DisActRng": 9800000, + "SearchRng": 9900000, + "RotSpd": 9900000, + "RotSpdInSkill": 3000000, + "Templete": 0, + "BuffIds": [ + 1900713 + ], + "SubType": 720140150, + "Faction": 1, + "TrapTagIds": [ + 3 + ], + "SupCharge": 0, + "IsShowRng": false, + "Weight": 0, + "ToughnessBrokenTime": 99, + "IsToughnessRecorver": false, + "Tag1": "", + "Tag2": "", + "Tag3": "", + "Tag4": "", + "Tag5": "", + "AttackHintType": 0, + "BlockPriority": 0, + "MonsterTeamId": 999 + }, + "1900723": { + "Id": 1900723, + "Name": "", + "EpicLv": 4, + "MonsterPosition": 0, + "BloodType": 0, + "Force": "", + "FCId": 0, + "FAId": 7201605, + "MovType": 7201601, + "RunSpd": 1, + "TransSpdScale": 40000, + "WalkSpd": 6000, + "MovAcc": 20000, + "VisionRng": 700000, + "VisionDeg": 300000, + "HearRng": 1200000, + "RefRng": 2000000, + "ActRng": 9000000, + "DisActRng": 9800000, + "SearchRng": 9900000, + "RotSpd": 9900000, + "RotSpdInSkill": 3000000, + "Templete": 0, + "BuffIds": [ + 1900712 + ], + "SubType": 0, + "Faction": 1, + "TrapTagIds": [ + 3 + ], + "SupCharge": 0, + "IsShowRng": false, + "Weight": 0, + "ToughnessBrokenTime": 3, + "IsToughnessRecorver": false, + "Tag1": "", + "Tag2": "", + "Tag3": "", + "Tag4": "", + "Tag5": "", + "AttackHintType": 0, + "BlockPriority": 0, + "MonsterTeamId": 3 + }, "1200301": { "Id": 1200301, "Name": "", diff --git a/data/bin/MonsterAI.json b/data/bin/MonsterAI.json index 2ae381735..61dbc0344 100644 --- a/data/bin/MonsterAI.json +++ b/data/bin/MonsterAI.json @@ -21323,6 +21323,57 @@ "WanderInterval": 0, "WanderRate": 0 }, + "7201381": { + "Id": 7201381, + "ComboGroupPath": "Monster/72014RenOu_Shiti/Combo/Maline10_1/ComboGroup", + "SpawnShowSkillId": 7201499, + "IdleShowSkillId": 0, + "DieSkillId": 7201498, + "ActionAIPath": "AIScript.Monster._72014KuiLeiShiTi.Action", + "ActionBranchIds": [], + "ThinkInterval": 0, + "IdleAIPath": "", + "SpawnAIPath": "", + "ParallelAIPath": "", + "CheckAchievement": false, + "WanderRange": 0, + "WanderInterval": 0, + "WanderRate": 0 + }, + "7201382": { + "Id": 7201382, + "ComboGroupPath": "Monster/72014RenOu_Shiti/Combo/Maline10_1/ComboGroup", + "SpawnShowSkillId": 7201609, + "IdleShowSkillId": 0, + "DieSkillId": 9999990, + "ActionAIPath": "", + "ActionBranchIds": [], + "ThinkInterval": 0, + "IdleAIPath": "", + "SpawnAIPath": "", + "ParallelAIPath": "", + "CheckAchievement": false, + "WanderRange": 0, + "WanderInterval": 0, + "WanderRate": 0 + }, + "7201383": { + "Id": 7201383, + "ComboGroupPath": "Monster/72014RenOu_Shiti/Combo/Maline10_1/ComboGroup", + "SpawnShowSkillId": 7201590, + "IdleShowSkillId": 0, + "DieSkillId": 7201498, + "ActionAIPath": "AIScript.Monster._72014KuiLeiShiTi.Action", + "ActionBranchIds": [], + "ThinkInterval": 0, + "IdleAIPath": "", + "SpawnAIPath": "", + "ParallelAIPath": "", + "CheckAchievement": false, + "WanderRange": 0, + "WanderInterval": 0, + "WanderRate": 0 + }, "7006101": { "Id": 7006101, "ComboGroupPath": "Monster/70061WuYu/Combo/WuYu/ComboGroup", @@ -21510,6 +21561,23 @@ "WanderInterval": 0, "WanderRate": 0 }, + "7201502": { + "Id": 7201502, + "ComboGroupPath": "Monster/72015RenOu_BiaoQiang/Combo/ComboGroup", + "SpawnShowSkillId": 9999989, + "IdleShowSkillId": 0, + "DieSkillId": 9999990, + "ActionAIPath": "AIScript.Monster._72015KuiLeiBiaoQiang.Action", + "ActionBranchIds": [], + "ThinkInterval": 2000, + "IdleAIPath": "", + "SpawnAIPath": "", + "ParallelAIPath": "", + "CheckAchievement": false, + "WanderRange": 0, + "WanderInterval": 0, + "WanderRate": 0 + }, "7201503": { "Id": 7201503, "ComboGroupPath": "Monster/72015RenOu_BiaoQiang/Combo/ComboGroup", @@ -21544,6 +21612,23 @@ "WanderInterval": 0, "WanderRate": 0 }, + "7201505": { + "Id": 7201505, + "ComboGroupPath": "Monster/72015RenOu_BiaoQiang/Combo/ComboGroup", + "SpawnShowSkillId": 7201590, + "IdleShowSkillId": 0, + "DieSkillId": 9999990, + "ActionAIPath": "AIScript.Monster._72015KuiLeiBiaoQiang.Action", + "ActionBranchIds": [], + "ThinkInterval": 2000, + "IdleAIPath": "", + "SpawnAIPath": "", + "ParallelAIPath": "", + "CheckAchievement": false, + "WanderRange": 0, + "WanderInterval": 0, + "WanderRate": 0 + }, "7201601": { "Id": 7201601, "ComboGroupPath": "Monster/72016RenOu_JuNu/Combo/ComboGroup", @@ -21561,6 +21646,23 @@ "WanderInterval": 0, "WanderRate": 0 }, + "7201602": { + "Id": 7201602, + "ComboGroupPath": "Monster/72016RenOu_JuNu/Combo/ComboGroup", + "SpawnShowSkillId": 9999989, + "IdleShowSkillId": 0, + "DieSkillId": 9999990, + "ActionAIPath": "AIScript.Monster._72016KuiLeiJuNu.Action", + "ActionBranchIds": [], + "ThinkInterval": 2000, + "IdleAIPath": "", + "SpawnAIPath": "", + "ParallelAIPath": "", + "CheckAchievement": false, + "WanderRange": 0, + "WanderInterval": 0, + "WanderRate": 0 + }, "7201603": { "Id": 7201603, "ComboGroupPath": "Monster/72016RenOu_JuNu/Combo/ComboGroup", @@ -21595,6 +21697,40 @@ "WanderInterval": 0, "WanderRate": 0 }, + "7201605": { + "Id": 7201605, + "ComboGroupPath": "Monster/72016RenOu_JuNu/Combo/ComboGroup", + "SpawnShowSkillId": 9999989, + "IdleShowSkillId": 0, + "DieSkillId": 9999990, + "ActionAIPath": "AIScript.Monster._72016KuiLeiJuNu.Action_10_2KeepShooting", + "ActionBranchIds": [], + "ThinkInterval": 2000, + "IdleAIPath": "", + "SpawnAIPath": "", + "ParallelAIPath": "", + "CheckAchievement": false, + "WanderRange": 0, + "WanderInterval": 0, + "WanderRate": 0 + }, + "7201606": { + "Id": 7201606, + "ComboGroupPath": "Monster/72016RenOu_JuNu/Combo/ComboGroup", + "SpawnShowSkillId": 7201590, + "IdleShowSkillId": 0, + "DieSkillId": 9999990, + "ActionAIPath": "AIScript.Monster._72016KuiLeiJuNu.Action", + "ActionBranchIds": [], + "ThinkInterval": 2000, + "IdleAIPath": "", + "SpawnAIPath": "", + "ParallelAIPath": "", + "CheckAchievement": false, + "WanderRange": 0, + "WanderInterval": 0, + "WanderRate": 0 + }, "9000201": { "Id": 9000201, "ComboGroupPath": "Monster/90002WuRenJi/Combo/ComboGroup_new", diff --git a/data/bin/MonsterValueTempleteAdjust.json b/data/bin/MonsterValueTempleteAdjust.json index 80250238c..2edecb961 100644 --- a/data/bin/MonsterValueTempleteAdjust.json +++ b/data/bin/MonsterValueTempleteAdjust.json @@ -32933,6 +32933,357 @@ "SuppressRatio": 0, "SuppressFix": 0 }, + "1900701": { + "Id": 1900701, + "TemplateId": 10000, + "Name": "", + "EET": 0, + "WeakEET": [], + "HpRatio": 1990000, + "HpFix": 0, + "AtkRatio": 976818, + "AtkFix": 0, + "WERRatio": 0, + "WERFix": 570, + "FERRatio": 0, + "FERFix": 570, + "SERRatio": 0, + "SERFix": 570, + "AERRatio": 0, + "AERFix": 570, + "LERRatio": 0, + "LERFix": 570, + "DERRatio": 0, + "DERFix": 570, + "ToughnessRatio": -10000, + "ToughnessFix": 0, + "SuppressRatio": 0, + "SuppressFix": 0 + }, + "1900702": { + "Id": 1900702, + "TemplateId": 10000, + "Name": "", + "EET": 0, + "WeakEET": [], + "HpRatio": 140000, + "HpFix": 0, + "AtkRatio": -9688, + "AtkFix": 0, + "WERRatio": 0, + "WERFix": 570, + "FERRatio": 0, + "FERFix": 570, + "SERRatio": 0, + "SERFix": 570, + "AERRatio": 0, + "AERFix": 570, + "LERRatio": 0, + "LERFix": 570, + "DERRatio": 0, + "DERFix": 570, + "ToughnessRatio": -10000, + "ToughnessFix": 0, + "SuppressRatio": 0, + "SuppressFix": 0 + }, + "1900703": { + "Id": 1900703, + "TemplateId": 10000, + "Name": "", + "EET": 0, + "WeakEET": [], + "HpRatio": 87490000, + "HpFix": 0, + "AtkRatio": -8872, + "AtkFix": 0, + "WERRatio": 0, + "WERFix": 570, + "FERRatio": 0, + "FERFix": 570, + "SERRatio": 0, + "SERFix": 570, + "AERRatio": 0, + "AERFix": 570, + "LERRatio": 0, + "LERFix": 570, + "DERRatio": 0, + "DERFix": 570, + "ToughnessRatio": -10000, + "ToughnessFix": 0, + "SuppressRatio": 0, + "SuppressFix": 0 + }, + "1900704": { + "Id": 1900704, + "TemplateId": 10000, + "Name": "", + "EET": 0, + "WeakEET": [], + "HpRatio": 140000, + "HpFix": 0, + "AtkRatio": -8026, + "AtkFix": 0, + "WERRatio": 0, + "WERFix": 570, + "FERRatio": 0, + "FERFix": 570, + "SERRatio": 0, + "SERFix": 570, + "AERRatio": 0, + "AERFix": 570, + "LERRatio": 0, + "LERFix": 570, + "DERRatio": 0, + "DERFix": 570, + "ToughnessRatio": -10000, + "ToughnessFix": 0, + "SuppressRatio": 0, + "SuppressFix": 0 + }, + "1900705": { + "Id": 1900705, + "TemplateId": 10000, + "Name": "", + "EET": 0, + "WeakEET": [], + "HpRatio": 58323333, + "HpFix": 0, + "AtkRatio": -8590, + "AtkFix": 0, + "WERRatio": 0, + "WERFix": 570, + "FERRatio": 0, + "FERFix": 570, + "SERRatio": 0, + "SERFix": 570, + "AERRatio": 0, + "AERFix": 570, + "LERRatio": 0, + "LERFix": 570, + "DERRatio": 0, + "DERFix": 570, + "ToughnessRatio": 83323333, + "ToughnessFix": 0, + "SuppressRatio": 0, + "SuppressFix": 0 + }, + "1900706": { + "Id": 1900706, + "TemplateId": 10000, + "Name": "", + "EET": 0, + "WeakEET": [], + "HpRatio": 51656666, + "HpFix": 0, + "AtkRatio": -8308, + "AtkFix": 0, + "WERRatio": 0, + "WERFix": 570, + "FERRatio": 0, + "FERFix": 570, + "SERRatio": 0, + "SERFix": 570, + "AERRatio": 0, + "AERFix": 570, + "LERRatio": 0, + "LERFix": 570, + "DERRatio": 0, + "DERFix": 570, + "ToughnessRatio": 66656666, + "ToughnessFix": 0, + "SuppressRatio": 0, + "SuppressFix": 0 + }, + "1900707": { + "Id": 1900707, + "TemplateId": 10000, + "Name": "", + "EET": 0, + "WeakEET": [], + "HpRatio": 140000, + "HpFix": 0, + "AtkRatio": -8026, + "AtkFix": 0, + "WERRatio": 0, + "WERFix": 570, + "FERRatio": 0, + "FERFix": 570, + "SERRatio": 0, + "SERFix": 570, + "AERRatio": 0, + "AERFix": 570, + "LERRatio": 0, + "LERFix": 570, + "DERRatio": 0, + "DERFix": 570, + "ToughnessRatio": -10000, + "ToughnessFix": 0, + "SuppressRatio": 0, + "SuppressFix": 0 + }, + "1900708": { + "Id": 1900708, + "TemplateId": 10000, + "Name": "", + "EET": 0, + "WeakEET": [], + "HpRatio": 140000, + "HpFix": 0, + "AtkRatio": -8308, + "AtkFix": 0, + "WERRatio": 0, + "WERFix": 570, + "FERRatio": 0, + "FERFix": 570, + "SERRatio": 0, + "SERFix": 570, + "AERRatio": 0, + "AERFix": 570, + "LERRatio": 0, + "LERFix": 570, + "DERRatio": 0, + "DERFix": 570, + "ToughnessRatio": -10000, + "ToughnessFix": 0, + "SuppressRatio": 0, + "SuppressFix": 0 + }, + "1900709": { + "Id": 1900709, + "TemplateId": 10000, + "Name": "", + "EET": 0, + "WeakEET": [], + "HpRatio": 140000, + "HpFix": 0, + "AtkRatio": -8026, + "AtkFix": 0, + "WERRatio": 0, + "WERFix": 570, + "FERRatio": 0, + "FERFix": 570, + "SERRatio": 0, + "SERFix": 570, + "AERRatio": 0, + "AERFix": 570, + "LERRatio": 0, + "LERFix": 570, + "DERRatio": 0, + "DERFix": 570, + "ToughnessRatio": -10000, + "ToughnessFix": 0, + "SuppressRatio": 0, + "SuppressFix": 0 + }, + "1900710": { + "Id": 1900710, + "TemplateId": 10000, + "Name": "", + "EET": 0, + "WeakEET": [], + "HpRatio": 140000, + "HpFix": 0, + "AtkRatio": -7180, + "AtkFix": 0, + "WERRatio": 0, + "WERFix": 570, + "FERRatio": 0, + "FERFix": 570, + "SERRatio": 0, + "SERFix": 570, + "AERRatio": 0, + "AERFix": 570, + "LERRatio": 0, + "LERFix": 570, + "DERRatio": 0, + "DERFix": 570, + "ToughnessRatio": -10000, + "ToughnessFix": 0, + "SuppressRatio": 0, + "SuppressFix": 0 + }, + "1900711": { + "Id": 1900711, + "TemplateId": 10000, + "Name": "", + "EET": 0, + "WeakEET": [], + "HpRatio": 24990000, + "HpFix": 0, + "AtkRatio": -8590, + "AtkFix": 0, + "WERRatio": 0, + "WERFix": 570, + "FERRatio": 0, + "FERFix": 570, + "SERRatio": 0, + "SERFix": 570, + "AERRatio": 0, + "AERFix": 570, + "LERRatio": 0, + "LERFix": 570, + "DERRatio": 0, + "DERFix": 570, + "ToughnessRatio": -10000, + "ToughnessFix": 0, + "SuppressRatio": 0, + "SuppressFix": 0 + }, + "1900712": { + "Id": 1900712, + "TemplateId": 10000, + "Name": "", + "EET": 0, + "WeakEET": [], + "HpRatio": 18740000, + "HpFix": 0, + "AtkRatio": -8308, + "AtkFix": 0, + "WERRatio": 0, + "WERFix": 570, + "FERRatio": 0, + "FERFix": 570, + "SERRatio": 0, + "SERFix": 570, + "AERRatio": 0, + "AERFix": 570, + "LERRatio": 0, + "LERFix": 570, + "DERRatio": 0, + "DERFix": 570, + "ToughnessRatio": -10000, + "ToughnessFix": 0, + "SuppressRatio": 0, + "SuppressFix": 0 + }, + "1900713": { + "Id": 1900713, + "TemplateId": 10000, + "Name": "", + "EET": 0, + "WeakEET": [], + "HpRatio": 927500, + "HpFix": 0, + "AtkRatio": -8026, + "AtkFix": 0, + "WERRatio": 0, + "WERFix": 570, + "FERRatio": 0, + "FERFix": 570, + "SERRatio": 0, + "SERFix": 570, + "AERRatio": 0, + "AERFix": 570, + "LERRatio": 0, + "LERFix": 570, + "DERRatio": 0, + "DERFix": 570, + "ToughnessRatio": -10000, + "ToughnessFix": 0, + "SuppressRatio": 0, + "SuppressFix": 0 + }, "7201101": { "Id": 7201101, "TemplateId": 10002, diff --git a/data/bin/PopUp.json b/data/bin/PopUp.json index 8db930b35..f89ebbb35 100644 --- a/data/bin/PopUp.json +++ b/data/bin/PopUp.json @@ -1144,5 +1144,23 @@ "EndType": 0, "EndTime": "", "EndDuration": 0 + }, + "2031": { + "Id": 2031, + "SortId": 3011, + "PopUpType": 1, + "ActivityId": 103012, + "PopUpRes": "UI_Activity/_103001/PopUp", + "ScriptName": "ActivityPopUp.ActivityDoubleDrop_103001PopUpCtrl", + "PopRefreshType": 0, + "PopJumpType": 2, + "JumpToParams": 2, + "StartCondType": 0, + "StartCondParams": [], + "StartType": 0, + "StartTime": "", + "EndType": 0, + "EndTime": "", + "EndDuration": 0 } } \ No newline at end of file diff --git a/data/bin/Skill.json b/data/bin/Skill.json index b37e346a8..ff058f3ee 100644 --- a/data/bin/Skill.json +++ b/data/bin/Skill.json @@ -69253,6 +69253,130 @@ "IsCleanSkillCD": false, "CheckSkillInterval": false }, + "7201381": { + "Id": 7201381, + "Title": "Skill.7201381.1", + "FCPath": "AIScript.Monster._72014KuiLeiShiTi.Skill_PaiDi", + "Type": 2, + "BriefDesc": "Skill.7201381.13", + "Desc": "Skill.7201381.2", + "Icon": "", + "SkillCD": 0, + "MaxLevel": 1, + "RelatedSkill": "", + "SectionAmount": 0, + "UseInterval": 0, + "UseTimeHint": 0, + "UltraEnergy": 0, + "CheckCDRestore": false, + "ForceRunFinish": false, + "GetEnergyLimit": 0, + "Param1": "", + "Param2": "", + "Param3": "", + "Param4": "", + "Param5": "", + "Param6": "", + "Param7": "", + "Param8": "", + "Param9": "", + "Param10": "", + "IsCleanSkillCD": false, + "CheckSkillInterval": false + }, + "7201382": { + "Id": 7201382, + "Title": "Skill.7201382.1", + "FCPath": "AIScript.Monster._72014KuiLeiShiTi.Skill_QiangHuaBiaoQiang", + "Type": 2, + "BriefDesc": "Skill.7201382.13", + "Desc": "Skill.7201382.2", + "Icon": "", + "SkillCD": 0, + "MaxLevel": 0, + "RelatedSkill": "", + "SectionAmount": 0, + "UseInterval": 0, + "UseTimeHint": 0, + "UltraEnergy": 0, + "CheckCDRestore": false, + "ForceRunFinish": false, + "GetEnergyLimit": 0, + "Param1": "", + "Param2": "", + "Param3": "", + "Param4": "", + "Param5": "", + "Param6": "", + "Param7": "", + "Param8": "", + "Param9": "", + "Param10": "", + "IsCleanSkillCD": false, + "CheckSkillInterval": false + }, + "7201383": { + "Id": 7201383, + "Title": "Skill.7201383.1", + "FCPath": "AIScript.Monster._72014KuiLeiShiTi.Skill_QiangHuaJuNu", + "Type": 2, + "BriefDesc": "Skill.7201383.13", + "Desc": "Skill.7201383.2", + "Icon": "", + "SkillCD": 0, + "MaxLevel": 0, + "RelatedSkill": "", + "SectionAmount": 0, + "UseInterval": 0, + "UseTimeHint": 0, + "UltraEnergy": 0, + "CheckCDRestore": false, + "ForceRunFinish": false, + "GetEnergyLimit": 0, + "Param1": "", + "Param2": "", + "Param3": "", + "Param4": "", + "Param5": "", + "Param6": "", + "Param7": "", + "Param8": "", + "Param9": "", + "Param10": "", + "IsCleanSkillCD": false, + "CheckSkillInterval": false + }, + "7201384": { + "Id": 7201384, + "Title": "Skill.7201384.1", + "FCPath": "AIScript.Monster._72014KuiLeiShiTi.Skill_QuanTiQiangHua", + "Type": 2, + "BriefDesc": "Skill.7201384.13", + "Desc": "Skill.7201384.2", + "Icon": "", + "SkillCD": 0, + "MaxLevel": 0, + "RelatedSkill": "", + "SectionAmount": 0, + "UseInterval": 0, + "UseTimeHint": 0, + "UltraEnergy": 0, + "CheckCDRestore": false, + "ForceRunFinish": false, + "GetEnergyLimit": 0, + "Param1": "", + "Param2": "", + "Param3": "", + "Param4": "", + "Param5": "", + "Param6": "", + "Param7": "", + "Param8": "", + "Param9": "", + "Param10": "", + "IsCleanSkillCD": false, + "CheckSkillInterval": false + }, "7006110": { "Id": 7006110, "Title": "Skill.7006110.1", @@ -70617,6 +70741,68 @@ "IsCleanSkillCD": false, "CheckSkillInterval": false }, + "7201504": { + "Id": 7201504, + "Title": "Skill.7201504.1", + "FCPath": "AIScript.Monster._72015KuiLeiBiaoQiang.Skill_FeiYueLianZhan", + "Type": 2, + "BriefDesc": "Skill.7201504.13", + "Desc": "Skill.7201504.2", + "Icon": "", + "SkillCD": 0, + "MaxLevel": 1, + "RelatedSkill": "", + "SectionAmount": 0, + "UseInterval": 0, + "UseTimeHint": 0, + "UltraEnergy": 0, + "CheckCDRestore": false, + "ForceRunFinish": false, + "GetEnergyLimit": 0, + "Param1": "", + "Param2": "", + "Param3": "", + "Param4": "", + "Param5": "", + "Param6": "", + "Param7": "", + "Param8": "", + "Param9": "", + "Param10": "", + "IsCleanSkillCD": false, + "CheckSkillInterval": false + }, + "7201505": { + "Id": 7201505, + "Title": "Skill.7201505.1", + "FCPath": "AIScript.Monster._72015KuiLeiBiaoQiang.Skill_QiangHua_BiaoQiang", + "Type": 2, + "BriefDesc": "Skill.7201505.13", + "Desc": "Skill.7201505.2", + "Icon": "", + "SkillCD": 0, + "MaxLevel": 1, + "RelatedSkill": "", + "SectionAmount": 0, + "UseInterval": 0, + "UseTimeHint": 0, + "UltraEnergy": 0, + "CheckCDRestore": false, + "ForceRunFinish": false, + "GetEnergyLimit": 0, + "Param1": "", + "Param2": "", + "Param3": "", + "Param4": "", + "Param5": "", + "Param6": "", + "Param7": "", + "Param8": "", + "Param9": "", + "Param10": "", + "IsCleanSkillCD": false, + "CheckSkillInterval": false + }, "7201590": { "Id": 7201590, "Title": "Skill.7201590.1", @@ -70834,6 +71020,161 @@ "IsCleanSkillCD": false, "CheckSkillInterval": false }, + "7201606": { + "Id": 7201606, + "Title": "Skill.7201606.1", + "FCPath": "AIScript.Monster._72016KuiLeiJuNu.Skill_SiXianLianShe", + "Type": 2, + "BriefDesc": "Skill.7201606.13", + "Desc": "Skill.7201606.2", + "Icon": "", + "SkillCD": 0, + "MaxLevel": 1, + "RelatedSkill": "", + "SectionAmount": 0, + "UseInterval": 0, + "UseTimeHint": 0, + "UltraEnergy": 0, + "CheckCDRestore": false, + "ForceRunFinish": false, + "GetEnergyLimit": 0, + "Param1": "", + "Param2": "", + "Param3": "", + "Param4": "", + "Param5": "", + "Param6": "", + "Param7": "", + "Param8": "", + "Param9": "", + "Param10": "", + "IsCleanSkillCD": false, + "CheckSkillInterval": false + }, + "7201607": { + "Id": 7201607, + "Title": "Skill.7201607.1", + "FCPath": "AIScript.Monster._72016KuiLeiJuNu.Skill_QiangHua_JuNu", + "Type": 2, + "BriefDesc": "Skill.7201607.13", + "Desc": "Skill.7201607.2", + "Icon": "", + "SkillCD": 0, + "MaxLevel": 1, + "RelatedSkill": "", + "SectionAmount": 0, + "UseInterval": 0, + "UseTimeHint": 0, + "UltraEnergy": 0, + "CheckCDRestore": false, + "ForceRunFinish": false, + "GetEnergyLimit": 0, + "Param1": "", + "Param2": "", + "Param3": "", + "Param4": "", + "Param5": "", + "Param6": "", + "Param7": "", + "Param8": "", + "Param9": "", + "Param10": "", + "IsCleanSkillCD": false, + "CheckSkillInterval": false + }, + "7201608": { + "Id": 7201608, + "Title": "Skill.7201608.1", + "FCPath": "AIScript.Monster._72016KuiLeiJuNu.Skill_BaoZhaXianJing_MiniBoss", + "Type": 2, + "BriefDesc": "Skill.7201608.13", + "Desc": "Skill.7201608.2", + "Icon": "", + "SkillCD": 0, + "MaxLevel": 1, + "RelatedSkill": "", + "SectionAmount": 0, + "UseInterval": 0, + "UseTimeHint": 0, + "UltraEnergy": 0, + "CheckCDRestore": false, + "ForceRunFinish": false, + "GetEnergyLimit": 0, + "Param1": "", + "Param2": "", + "Param3": "", + "Param4": "", + "Param5": "", + "Param6": "", + "Param7": "", + "Param8": "", + "Param9": "", + "Param10": "", + "IsCleanSkillCD": false, + "CheckSkillInterval": false + }, + "7201609": { + "Id": 7201609, + "Title": "Skill.7201609.1", + "FCPath": "AIScript.Monster._72016KuiLeiJuNu.Skill_Lifecycle_BaoZhaXianJing", + "Type": 2, + "BriefDesc": "Skill.7201609.13", + "Desc": "Skill.7201609.2", + "Icon": "", + "SkillCD": 0, + "MaxLevel": 1, + "RelatedSkill": "", + "SectionAmount": 0, + "UseInterval": 0, + "UseTimeHint": 0, + "UltraEnergy": 0, + "CheckCDRestore": false, + "ForceRunFinish": false, + "GetEnergyLimit": 0, + "Param1": "", + "Param2": "", + "Param3": "", + "Param4": "", + "Param5": "", + "Param6": "", + "Param7": "", + "Param8": "", + "Param9": "", + "Param10": "", + "IsCleanSkillCD": false, + "CheckSkillInterval": false + }, + "7201610": { + "Id": 7201610, + "Title": "Skill.7201610.1", + "FCPath": "AIScript.Monster._72016KuiLeiJuNu.Skill_HouTui", + "Type": 2, + "BriefDesc": "Skill.7201610.13", + "Desc": "Skill.7201610.2", + "Icon": "", + "SkillCD": 0, + "MaxLevel": 1, + "RelatedSkill": "", + "SectionAmount": 0, + "UseInterval": 0, + "UseTimeHint": 0, + "UltraEnergy": 0, + "CheckCDRestore": false, + "ForceRunFinish": false, + "GetEnergyLimit": 0, + "Param1": "", + "Param2": "", + "Param3": "", + "Param4": "", + "Param5": "", + "Param6": "", + "Param7": "", + "Param8": "", + "Param9": "", + "Param10": "", + "IsCleanSkillCD": false, + "CheckSkillInterval": false + }, "9000201": { "Id": 9000201, "Title": "Skill.9000201.1", diff --git a/data/bin/StoryCondition.json b/data/bin/StoryCondition.json index ed8189496..1e3b489bd 100644 --- a/data/bin/StoryCondition.json +++ b/data/bin/StoryCondition.json @@ -2809,7 +2809,7 @@ }, "1121": { "Id": 1121, - "ConditionId": "Cm10001_BT03", + "ConditionId": "Cm10001_19", "Comment": "", "EvIdsA": [], "EvIdsB": [], @@ -2822,12 +2822,12 @@ }, "1122": { "Id": 1122, - "ConditionId": "Cm10001_19", + "ConditionId": "Cm10001_BT03", "Comment": "", "EvIdsA": [], "EvIdsB": [], "StoryIdA": [ - "BAm10001_BT03" + "STm10001_19" ], "StoryIdB": [], "PlayerWorldLevel": 0, @@ -2840,7 +2840,7 @@ "EvIdsA": [], "EvIdsB": [], "StoryIdA": [ - "STm10001_19" + "BAm10001_BT03" ], "StoryIdB": [], "PlayerWorldLevel": 0, diff --git a/data/bin/Title.json b/data/bin/Title.json index dec0d2579..337589a9f 100644 --- a/data/bin/Title.json +++ b/data/bin/Title.json @@ -390,5 +390,19 @@ "TitleType": 2, "Desc": "Title.56.1", "Sort": 28 + }, + "57": { + "Id": 57, + "ItemId": 71027, + "TitleType": 1, + "Desc": "Title.57.1", + "Sort": 29 + }, + "58": { + "Id": 58, + "ItemId": 72027, + "TitleType": 2, + "Desc": "Title.58.1", + "Sort": 29 } } \ No newline at end of file diff --git a/data/bin/UIText.json b/data/bin/UIText.json index 5cccf87af..9ea9a607e 100644 --- a/data/bin/UIText.json +++ b/data/bin/UIText.json @@ -18243,6 +18243,10 @@ "Id": "Guide_Mission_NotOpen", "Text": "UIText.Guide_Mission_NotOpen.1" }, + "MainView_MainStoryPreview": { + "Id": "MainView_MainStoryPreview", + "Text": "UIText.MainView_MainStoryPreview.1" + }, "Dorm_Default_MusicName": { "Id": "Dorm_Default_MusicName", "Text": "UIText.Dorm_Default_MusicName.1" diff --git a/data/bin/activity.bytes b/data/bin/activity.bytes index 616df4c8d..574014dca 100644 Binary files a/data/bin/activity.bytes and b/data/bin/activity.bytes differ diff --git a/data/bin/activitydouble.bytes b/data/bin/activitydouble.bytes index 9e5e08b0c..36724a48a 100644 Binary files a/data/bin/activitydouble.bytes and b/data/bin/activitydouble.bytes differ diff --git a/data/bin/activitydoublequest.bytes b/data/bin/activitydoublequest.bytes index 2653e3cf3..0e84ccfea 100644 Binary files a/data/bin/activitydoublequest.bytes and b/data/bin/activitydoublequest.bytes differ diff --git a/data/bin/adcontrol.bytes b/data/bin/adcontrol.bytes index 72f0f3bee..0ed7164c0 100644 Binary files a/data/bin/adcontrol.bytes and b/data/bin/adcontrol.bytes differ diff --git a/data/bin/bdconvert.bytes b/data/bin/bdconvert.bytes index 70c5eb99e..587516d8a 100644 Binary files a/data/bin/bdconvert.bytes and b/data/bin/bdconvert.bytes differ diff --git a/data/bin/bdconvertcontent.bytes b/data/bin/bdconvertcontent.bytes index 3cbd39e04..4c3286586 100644 Binary files a/data/bin/bdconvertcontent.bytes and b/data/bin/bdconvertcontent.bytes differ diff --git a/data/bin/bdconvertcontrol.bytes b/data/bin/bdconvertcontrol.bytes index 0cec210f3..e580dec49 100644 Binary files a/data/bin/bdconvertcontrol.bytes and b/data/bin/bdconvertcontrol.bytes differ diff --git a/data/bin/bdconvertrewardgroup.bytes b/data/bin/bdconvertrewardgroup.bytes index 1ee4f55c7..016ab3b08 100644 Binary files a/data/bin/bdconvertrewardgroup.bytes and b/data/bin/bdconvertrewardgroup.bytes differ diff --git a/data/bin/buff.bytes b/data/bin/buff.bytes index 05362180d..71f10bb27 100644 Binary files a/data/bin/buff.bytes and b/data/bin/buff.bytes differ diff --git a/data/bin/buffvalue.bytes b/data/bin/buffvalue.bytes index 8987e32d6..45d546ca6 100644 Binary files a/data/bin/buffvalue.bytes and b/data/bin/buffvalue.bytes differ diff --git a/data/bin/effect.bytes b/data/bin/effect.bytes index 8a7ed590e..86aa130a2 100644 Binary files a/data/bin/effect.bytes and b/data/bin/effect.bytes differ diff --git a/data/bin/effectvalue.bytes b/data/bin/effectvalue.bytes index f9f1e90ed..2dc05d0c0 100644 Binary files a/data/bin/effectvalue.bytes and b/data/bin/effectvalue.bytes differ diff --git a/data/bin/item.bytes b/data/bin/item.bytes index 9f61eb2e0..39249562f 100644 Binary files a/data/bin/item.bytes and b/data/bin/item.bytes differ diff --git a/data/bin/jumpto.bytes b/data/bin/jumpto.bytes index 5b8335650..508560e90 100644 Binary files a/data/bin/jumpto.bytes and b/data/bin/jumpto.bytes differ diff --git a/data/bin/loginrewardcontrol.bytes b/data/bin/loginrewardcontrol.bytes index 5796e9754..89ea5612a 100644 Binary files a/data/bin/loginrewardcontrol.bytes and b/data/bin/loginrewardcontrol.bytes differ diff --git a/data/bin/loginrewardgroup.bytes b/data/bin/loginrewardgroup.bytes index e30d070ba..b108ff130 100644 Binary files a/data/bin/loginrewardgroup.bytes and b/data/bin/loginrewardgroup.bytes differ diff --git a/data/bin/mailtemplate.bytes b/data/bin/mailtemplate.bytes index 2bf65bf6c..882c4fe3e 100644 Binary files a/data/bin/mailtemplate.bytes and b/data/bin/mailtemplate.bytes differ diff --git a/data/bin/mainlinefloor.bytes b/data/bin/mainlinefloor.bytes index 47ffe6414..701d9dd77 100644 Binary files a/data/bin/mainlinefloor.bytes and b/data/bin/mainlinefloor.bytes differ diff --git a/data/bin/mallrecommendgroup.bytes b/data/bin/mallrecommendgroup.bytes index 1bdd95acb..b6100e63a 100644 Binary files a/data/bin/mallrecommendgroup.bytes and b/data/bin/mallrecommendgroup.bytes differ diff --git a/data/bin/monster.bytes b/data/bin/monster.bytes index a959ec5ac..3b82e8fc1 100644 Binary files a/data/bin/monster.bytes and b/data/bin/monster.bytes differ diff --git a/data/bin/monsterai.bytes b/data/bin/monsterai.bytes index 1d9b700c0..a4360f94a 100644 Binary files a/data/bin/monsterai.bytes and b/data/bin/monsterai.bytes differ diff --git a/data/bin/monstervaluetempleteadjust.bytes b/data/bin/monstervaluetempleteadjust.bytes index f923364eb..2e1a7f546 100644 Binary files a/data/bin/monstervaluetempleteadjust.bytes and b/data/bin/monstervaluetempleteadjust.bytes differ diff --git a/data/bin/popup.bytes b/data/bin/popup.bytes index 094065bae..d5e36397d 100644 Binary files a/data/bin/popup.bytes and b/data/bin/popup.bytes differ diff --git a/data/bin/skill.bytes b/data/bin/skill.bytes index 924ca4ef0..60920eb48 100644 Binary files a/data/bin/skill.bytes and b/data/bin/skill.bytes differ diff --git a/data/bin/soldiercharacter.bytes b/data/bin/soldiercharacter.bytes index e2e4b98a7..926a02a94 100644 Binary files a/data/bin/soldiercharacter.bytes and b/data/bin/soldiercharacter.bytes differ diff --git a/data/bin/storycondition.bytes b/data/bin/storycondition.bytes index 13864bb43..b8489b85d 100644 Binary files a/data/bin/storycondition.bytes and b/data/bin/storycondition.bytes differ diff --git a/data/bin/title.bytes b/data/bin/title.bytes index b15c54010..a0e1d0776 100644 Binary files a/data/bin/title.bytes and b/data/bin/title.bytes differ diff --git a/data/bin/uitext.bytes b/data/bin/uitext.bytes index 9f5b0ebfa..bdd927c42 100644 Binary files a/data/bin/uitext.bytes and b/data/bin/uitext.bytes differ diff --git a/data/bubble/_jp/bubbledata.json b/data/bubble/_jp/bubbledata.json index a052f3f80..1c1c4ed11 100644 --- a/data/bubble/_jp/bubbledata.json +++ b/data/bubble/_jp/bubbledata.json @@ -14165,7 +14165,7 @@ "anim": {}, "text": { "female_jp": [ - "『過去』のことよりも、==RT==大切なのは==RT==『今』と『未来」』でしょ！", + "『過去』のことよりも、==RT==大切なのは==RT==『今』と『未来』でしょ！", "だから魔王、==RT==一緒に楽しい思い出作ろうね！", "", "" diff --git a/data/language/en_us/activitydouble.json b/data/language/en_us/activitydouble.json index 03f7b288c..2c293b943 100644 --- a/data/language/en_us/activitydouble.json +++ b/data/language/en_us/activitydouble.json @@ -4,5 +4,6 @@ "ActivityDouble.103003.1": "\u000b[Event Period]\u000b21:00, Aug 31, 2026 – 19:59:59, Sep 7, 2026\u000b\u000b[Requirement]\u000bAuthorization Level ≥3\u000b\u000b[Event Details]\u000bUrgent Commissions are now available! Complete specific types of trial stages to earn double rewards!", "ActivityDouble.103004.1": "\u000b[Event Period]\u000b13:00, Sep 21, 2026 – 12:59, Sep 28, 2026\u000b\u000b[Requirement]\u000bAuthorization Level ≥3\u000b\u000b[Event Details]\u000bUrgent Commissions are now available! Complete specific types of trial stages to earn double rewards!", "ActivityDouble.103005.1": "\u000b[Event Period]\u000b13:00, Oct 12, 2026 – 12:59:59, Oct 19, 2026\u000b\u000b[Requirement]\u000bAuthorization Level ≥3\u000b\u000b[Event Details]\u000bUrgent Commissions are now available! Complete specific types of trial stages to earn double rewards!", - "ActivityDouble.103006.1": "\u000b[Event Period]\u000b13:00, 11/02/2026 – 12:59, 11/09/2026\u000b\u000b[Requirement]\u000bAuthorization Level ≥3\u000b\u000b[Event Details]\u000bUrgent Commissions are now available! Complete specific types of trial stages to earn double rewards!" + "ActivityDouble.103006.1": "\u000b[Event Period]\u000b13:00, 11/02/2026 – 12:59, 11/09/2026\u000b\u000b[Requirement]\u000bAuthorization Level ≥3\u000b\u000b[Event Details]\u000bUrgent Commissions are now available! Complete specific types of trial stages to earn double rewards!", + "ActivityDouble.103012.1": "\u000bEvent Period\u000b13:00, Nov 9, 2026 – 12:59:59, Nov 12, 2026\u000b\u000bRequirement\u000bAuthorization Level ≥3\u000b\u000bEvent Details\u000bUrgent Commissions are now available! Complete specific types of trial stages to earn double rewards!" } \ No newline at end of file diff --git a/data/language/en_us/activitydoublequest.json b/data/language/en_us/activitydoublequest.json index 40ab405e7..91a012cd1 100644 --- a/data/language/en_us/activitydoublequest.json +++ b/data/language/en_us/activitydoublequest.json @@ -40,5 +40,8 @@ "ActivityDoubleQuest.106004.1": "Consume a total of 600 Vigor", "ActivityDoubleQuest.106005.1": "Consume a total of 800 Vigor", "ActivityDoubleQuest.106006.1": "Consume a total of 1,000 Vigor", - "ActivityDoubleQuest.106007.1": "Consume a total of 1,200 Vigor" + "ActivityDoubleQuest.106007.1": "Consume a total of 1,200 Vigor", + "ActivityDoubleQuest.112001.1": "Consume a total of 200 Vigor", + "ActivityDoubleQuest.112002.1": "Consume a total of 300 Vigor", + "ActivityDoubleQuest.112003.1": "Consume a total of 400 Vigor" } \ No newline at end of file diff --git a/data/language/en_us/bdconvertcontent.json b/data/language/en_us/bdconvertcontent.json index 243835dd0..ad687fc2f 100644 --- a/data/language/en_us/bdconvertcontent.json +++ b/data/language/en_us/bdconvertcontent.json @@ -11,6 +11,9 @@ "BdConvertContent.1201.1": "Uncharted Heights", "BdConvertContent.1202.1": "Deep Dive", "BdConvertContent.1203.1": "First Steps", + "BdConvertContent.1301.1": "Uncharted Heights", + "BdConvertContent.1302.1": "Deep Dive", + "BdConvertContent.1303.1": "First Steps", "BdConvertContent.201.1": "Uncharted Heights", "BdConvertContent.202.1": "Deep Dive", "BdConvertContent.203.1": "First Steps", diff --git a/data/language/en_us/bdconvertcontrol.json b/data/language/en_us/bdconvertcontrol.json index 5cd7a46dc..a38ac0bc7 100644 --- a/data/language/en_us/bdconvertcontrol.json +++ b/data/language/en_us/bdconvertcontrol.json @@ -10,5 +10,6 @@ "BdConvertControl.500009.1": "\u000b[Event Period]\u000b21:00, Aug 10, 2026 – 19:59, Aug 17, 2026\u000b\u000b[Requirements]\u000bAuthorization Level ≥ 10\u000b\u000b[Details]\u000b1. The Trekker Association is calling for Records of successful Monolith clears in exchange for Clearance Points.\u000b2. Accumulate Clearance Points to earn fantastic rewards!", "BdConvertControl.500010.1": "\u000b[Event Period]\u000b21:00, Aug 31, 2026 – 19:59:59, Sep 07, 2026\u000b\u000b[Requirements]\u000bAuthorization Level ≥ 10\u000b\u000b[Details]\u000b1. The Trekker Association is calling for Records of successful Monolith clears in exchange for Clearance Points.\u000b2. Accumulate Clearance Points to earn fantastic rewards!", "BdConvertControl.500011.1": "\u000b[Event Period]\u000b21:00, Oct 12, 2026 – 19:59:59, Oct 19, 2026\u000b\u000b[Requirements]\u000bAuthorization Level ≥ 10\u000b\u000b[Details]\u000b1. The Trekker Association is calling for Records of successful Monolith clears in exchange for Clearance Points.\u000b2. Accumulate Clearance Points to earn fantastic rewards!", - "BdConvertControl.500012.1": "\u000b[Event Period]\u000b21:00, 11/02/2026 – 19:59, 11/09/2026\u000b\u000b[Requirements]\u000bAuthorization Level ≥ 10\u000b\u000b[Details]\u000b1. The Trekker Association is calling for Records of successful Monolith clears in exchange for Clearance Points.\u000b2. Accumulate Clearance Points to earn fantastic rewards!" + "BdConvertControl.500012.1": "\u000b[Event Period]\u000b21:00, 11/02/2026 – 19:59, 11/09/2026\u000b\u000b[Requirements]\u000bAuthorization Level ≥ 10\u000b\u000b[Details]\u000b1. The Trekker Association is calling for Records of successful Monolith clears in exchange for Clearance Points.\u000b2. Accumulate Clearance Points to earn fantastic rewards!", + "BdConvertControl.500013.1": "\u000bEvent Period\u000b21:00, Nov 9, 2026 – 20:00, Nov 16, 2026\u000b\u000bRequirements\u000bAuthorization Level ≥ 10\u000b\u000bDetails\u000b1. The Trekker Association is calling for Records of successful Monolith clears in exchange for Clearance Points.\u000b2. Accumulate Clearance Points to earn fantastic rewards!" } \ No newline at end of file diff --git a/data/language/en_us/bdconvertrewardgroup.json b/data/language/en_us/bdconvertrewardgroup.json index eff42f3eb..16bff473e 100644 --- a/data/language/en_us/bdconvertrewardgroup.json +++ b/data/language/en_us/bdconvertrewardgroup.json @@ -47,6 +47,18 @@ "BdConvertRewardGroup.1210.1": "Total Clearance Points reach 2,000 in Call for Best Records", "BdConvertRewardGroup.1211.1": "Total Clearance Points reach 2,200 in Call for Best Records", "BdConvertRewardGroup.1212.1": "Total Clearance Points reach 2,400 in Call for Best Records", + "BdConvertRewardGroup.1301.1": "Total Clearance Points reach 200 in Call for Best Records", + "BdConvertRewardGroup.1302.1": "Total Clearance Points reach 400 in Call for Best Records", + "BdConvertRewardGroup.1303.1": "Total Clearance Points reach 600 in Call for Best Records", + "BdConvertRewardGroup.1304.1": "Total Clearance Points reach 800 in Call for Best Records", + "BdConvertRewardGroup.1305.1": "Total Clearance Points reach 1,000 in Call for Best Records", + "BdConvertRewardGroup.1306.1": "Total Clearance Points reach 1,200 in Call for Best Records", + "BdConvertRewardGroup.1307.1": "Total Clearance Points reach 1,400 in Call for Best Records", + "BdConvertRewardGroup.1308.1": "Total Clearance Points reach 1,600 in Call for Best Records", + "BdConvertRewardGroup.1309.1": "Total Clearance Points reach 1,800 in Call for Best Records", + "BdConvertRewardGroup.1310.1": "Total Clearance Points reach 2,000 in Call for Best Records", + "BdConvertRewardGroup.1311.1": "Total Clearance Points reach 2,200 in Call for Best Records", + "BdConvertRewardGroup.1312.1": "Total Clearance Points reach 2,400 in Call for Best Records", "BdConvertRewardGroup.201.1": "Total Clearance Points reach 200 in Call for Best Records", "BdConvertRewardGroup.202.1": "Total Clearance Points reach 400 in Call for Best Records", "BdConvertRewardGroup.203.1": "Total Clearance Points reach 600 in Call for Best Records", diff --git a/data/language/en_us/item.json b/data/language/en_us/item.json index cd3a3fce4..aadfb951d 100644 --- a/data/language/en_us/item.json +++ b/data/language/en_us/item.json @@ -3521,6 +3521,9 @@ "Item.71026.1": "Prefix Title: Nova", "Item.71026.2": "Used to unlock the title: Nova", "Item.71026.3": "A small card inscribed with magical words.", + "Item.71027.1": "Prefix Title: Time", + "Item.71027.2": "Used to unlock the title: Time.", + "Item.71027.3": "A small card inscribed with magical words.", "Item.71028.1": "Prefix Title: Bidder", "Item.71028.2": "Used to unlock the title: Bidder.", "Item.71028.3": "A small card inscribed with magical words.", @@ -3906,6 +3909,9 @@ "Item.72026.1": "Suffix Title: Monster Hunter", "Item.72026.2": "Used to unlock the title: Monster Hunter", "Item.72026.3": "A small card inscribed with magical words.", + "Item.72027.1": "Suffix Title: Traveler", + "Item.72027.2": "Used to unlock the title: Traveler.", + "Item.72027.3": "A small card inscribed with magical words.", "Item.72028.1": "Suffix Title: Expert", "Item.72028.2": "Used to unlock the title: Expert.", "Item.72028.3": "A small card inscribed with magical words.", diff --git a/data/language/en_us/jumpto.json b/data/language/en_us/jumpto.json index 5634a24c1..491ae6ac0 100644 --- a/data/language/en_us/jumpto.json +++ b/data/language/en_us/jumpto.json @@ -118,6 +118,7 @@ "JumpTo.49.1": "Upbeat Party", "JumpTo.50.1": "Skill Trial", "JumpTo.5005.1": "Main Story", + "JumpTo.5006.1": "!PENDING!", "JumpTo.51.1": "Skill Trial: Rhythm Cartridge", "JumpTo.52.1": "Skill Trial: Shooter Game Cartridge", "JumpTo.53.1": "Skill Trial: Combat Cartridge", diff --git a/data/language/en_us/mailtemplate.json b/data/language/en_us/mailtemplate.json index 0e654cdaa..057e9a1b5 100644 --- a/data/language/en_us/mailtemplate.json +++ b/data/language/en_us/mailtemplate.json @@ -296,6 +296,9 @@ "MailTemplate.4019.1": "Trekker Association", "MailTemplate.4019.2": "Reissue Parcel - Event Reward", "MailTemplate.4019.3": "The claim deadline has passed for [One Starlit Year, Wishes Unfold]!\nFortunately, the extremely considerate Association has packaged and mailed the rewards to your guild office. Please take a look.\nRemember to claim your rewards after completing a mission next time!", + "MailTemplate.4020.1": "Trekker Association", + "MailTemplate.4020.2": "Reissue Parcel - Event Reward", + "MailTemplate.4020.3": "The claim deadline has passed for [One Starlit Year: Special Thanks]!\n\nBut don’t worry—the Association has packed up your rewards and delivered them to your guild office. Please check your mail.\n\nDon’t forget to claim your rewards on time next time!", "MailTemplate.5001.1": "Stella Sora Team", "MailTemplate.5001.2": "Thank You for Participating in the Survey!", "MailTemplate.5001.3": "Thank you so much for taking part in the survey! We've prepared a gift for you—please check your inbox.", diff --git a/data/language/en_us/title.json b/data/language/en_us/title.json index 34de5139c..c4545b984 100644 --- a/data/language/en_us/title.json +++ b/data/language/en_us/title.json @@ -51,6 +51,8 @@ "Title.54.1": "Expert", "Title.55.1": "Glory", "Title.56.1": "Chief", + "Title.57.1": "Time", + "Title.58.1": "Traveler", "Title.6.1": "Steward", "Title.7.1": "Calm", "Title.8.1": "Boss", diff --git a/data/language/en_us/uitext.json b/data/language/en_us/uitext.json index bf2e247b3..741fa212b 100644 --- a/data/language/en_us/uitext.json +++ b/data/language/en_us/uitext.json @@ -2434,6 +2434,7 @@ "UIText.MainView_Friend.1": "Friend", "UIText.MainView_Go.1": "Go", "UIText.MainView_Mail.1": "Mail", + "UIText.MainView_MainStoryPreview.1": "Available Now", "UIText.MainView_Mall.1": "Shop", "UIText.MainView_Phone.1": "Heartlink", "UIText.MainView_Preselection.1": "Preset", diff --git a/data/language/ja_jp/activitydouble.json b/data/language/ja_jp/activitydouble.json index 7f82b49d3..a33023681 100644 --- a/data/language/ja_jp/activitydouble.json +++ b/data/language/ja_jp/activitydouble.json @@ -4,5 +4,6 @@ "ActivityDouble.103003.1": "\u000b【イベント期間】\u000b2026/9/1 5:00~2026/9/8 4:59 \u000b\u000b【参加条件】\u000b権限レベル3以上\u000b\u000b【イベント説明】\u000b緊急依頼の懸賞募集中！特定のステージをクリアして、2倍の報酬を勝ち取ろう！", "ActivityDouble.103004.1": "\u000b【イベント期間】\u000b2026/9/22 5:00~2026/9/29 4:59 \u000b\u000b【参加条件】\u000b権限レベル3以上\u000b\u000b【イベント説明】\u000b緊急依頼の懸賞募集中！特定のステージをクリアして、2倍の報酬を勝ち取ろう！", "ActivityDouble.103005.1": "\u000b【イベント期間】\u000b2026/10/13 5:00~2026/10/20 4:59 \u000b\u000b【参加条件】\u000b権限レベル3以上\u000b\u000b【イベント説明】\u000b緊急依頼の懸賞募集中！特定のステージをクリアして、2倍の報酬を勝ち取ろう！", - "ActivityDouble.103006.1": "\u000b【イベント期間】\u000b2026/11/3 5:00~2026/11/10 4:59 \u000b\u000b【参加条件】\u000b権限レベル3以上\u000b\u000b【イベント説明】\u000b緊急依頼の懸賞募集中！特定のステージをクリアして、2倍の報酬を勝ち取ろう！" + "ActivityDouble.103006.1": "\u000b【イベント期間】\u000b2026/11/3 5:00~2026/11/10 4:59 \u000b\u000b【参加条件】\u000b権限レベル3以上\u000b\u000b【イベント説明】\u000b緊急依頼の懸賞募集中！特定のステージをクリアして、2倍の報酬を勝ち取ろう！", + "ActivityDouble.103012.1": "\u000b【イベント期間】\u000b2026/11/10 5:00~2026/11/13 4:59 \u000b\u000b【参加条件】\u000b権限レベル3以上\u000b\u000b【イベント説明】\u000b緊急依頼の懸賞募集中！特定のステージをクリアして、2倍の報酬を勝ち取ろう！" } \ No newline at end of file diff --git a/data/language/ja_jp/activitydoublequest.json b/data/language/ja_jp/activitydoublequest.json index f7e969d10..7a2491992 100644 --- a/data/language/ja_jp/activitydoublequest.json +++ b/data/language/ja_jp/activitydoublequest.json @@ -40,5 +40,8 @@ "ActivityDoubleQuest.106004.1": "やる気を累計600消費する", "ActivityDoubleQuest.106005.1": "やる気を累計800消費する", "ActivityDoubleQuest.106006.1": "やる気を累計1000消費する", - "ActivityDoubleQuest.106007.1": "やる気を累計1200消費する" + "ActivityDoubleQuest.106007.1": "やる気を累計1200消費する", + "ActivityDoubleQuest.112001.1": "やる気を累計200消費する", + "ActivityDoubleQuest.112002.1": "やる気を累計300消費する", + "ActivityDoubleQuest.112003.1": "やる気を累計400消費する" } \ No newline at end of file diff --git a/data/language/ja_jp/bdconvertcontent.json b/data/language/ja_jp/bdconvertcontent.json index bd90a5191..2d220c3e3 100644 --- a/data/language/ja_jp/bdconvertcontent.json +++ b/data/language/ja_jp/bdconvertcontent.json @@ -11,6 +11,9 @@ "BdConvertContent.1201.1": "記録募集中！\n「伝説の巡遊者」級", "BdConvertContent.1202.1": "記録募集中！\n「ベテラン巡遊者」級", "BdConvertContent.1203.1": "記録募集中！\n「駆け出し巡遊者」級", + "BdConvertContent.1301.1": "記録募集中！\n「伝説の巡遊者」級", + "BdConvertContent.1302.1": "記録募集中！\n「ベテラン巡遊者」級", + "BdConvertContent.1303.1": "記録募集中！\n「駆け出し巡遊者」級", "BdConvertContent.201.1": "記録募集中！\n「伝説の巡遊者」級", "BdConvertContent.202.1": "記録募集中！\n「ベテラン巡遊者」級", "BdConvertContent.203.1": "記録募集中！\n「駆け出し巡遊者」級", diff --git a/data/language/ja_jp/bdconvertcontrol.json b/data/language/ja_jp/bdconvertcontrol.json index 5b28e94e3..0d727a76d 100644 --- a/data/language/ja_jp/bdconvertcontrol.json +++ b/data/language/ja_jp/bdconvertcontrol.json @@ -10,5 +10,6 @@ "BdConvertControl.500009.1": "\u000b【イベント期間】\u000b2026/08/11 13:00~2026/8/18 11:59:59 \u000b\u000b【参加条件】\u000b権限レベル10以上、「イベント」機能解放で参加できます。\u000b\u000b【イベント説明】\u000b1、地理協会は、各地の巡遊者たちから「星ノ塔」を攻略した記録を募集しています、提出者には塔覇の証を発行中！\u000b2、塔覇の証を集めると豪華報酬を獲得できます。", "BdConvertControl.500010.1": "\u000b【イベント期間】\u000b2026/9/1 13:00~2026/9/8 11:59:59 \u000b\u000b【参加条件】\u000b権限レベル10以上、「イベント」機能解放で参加できます。\u000b\u000b【イベント説明】\u000b1、地理協会は、各地の巡遊者たちから「星ノ塔」を攻略した記録を募集しています、提出者には塔覇の証を発行中！\u000b2、塔覇の証を集めると豪華報酬を獲得できます。", "BdConvertControl.500011.1": "\u000b【イベント期間】\u000b2026/10/13 13:00~2026/10/20 11:59:59 \u000b\u000b【参加条件】\u000b権限レベル10以上、「イベント」機能解放で参加できます。\u000b\u000b【イベント説明】\u000b1、地理協会は、各地の巡遊者たちから「星ノ塔」を攻略した記録を募集しています、提出者には塔覇の証を発行中！\u000b2、塔覇の証を集めると豪華報酬を獲得できます。", - "BdConvertControl.500012.1": "\u000b【イベント期間】\u000b2026/11/3 13:00~2026/11/10 11:59:59 \u000b\u000b【参加条件】\u000b権限レベル10以上、「イベント」機能解放で参加できます。\u000b\u000b【イベント説明】\u000b1、地理協会は、各地の巡遊者たちから「星ノ塔」を攻略した記録を募集しています、提出者には塔覇の証を発行中！\u000b2、塔覇の証を集めると豪華報酬を獲得できます。" + "BdConvertControl.500012.1": "\u000b【イベント期間】\u000b2026/11/3 13:00~2026/11/10 11:59:59 \u000b\u000b【参加条件】\u000b権限レベル10以上、「イベント」機能解放で参加できます。\u000b\u000b【イベント説明】\u000b1、地理協会は、各地の巡遊者たちから「星ノ塔」を攻略した記録を募集しています、提出者には塔覇の証を発行中！\u000b2、塔覇の証を集めると豪華報酬を獲得できます。", + "BdConvertControl.500013.1": "\u000b【イベント期間】\u000b2026/11/10 13:00~2026/11/17 11:59:59 \u000b\u000b【参加条件】\u000b権限レベル10以上、「イベント」機能解放で参加できます。\u000b\u000b【イベント説明】\u000b1、地理協会は、各地の巡遊者たちから「星ノ塔」を攻略した記録を募集しています、提出者には塔覇の証を発行中！\u000b2、塔覇の証を集めると豪華報酬を獲得できます。" } \ No newline at end of file diff --git a/data/language/ja_jp/bdconvertrewardgroup.json b/data/language/ja_jp/bdconvertrewardgroup.json index 07f116faf..dacd2c5dc 100644 --- a/data/language/ja_jp/bdconvertrewardgroup.json +++ b/data/language/ja_jp/bdconvertrewardgroup.json @@ -47,6 +47,18 @@ "BdConvertRewardGroup.1210.1": "記録大募集で塔覇の証を累計2000獲得", "BdConvertRewardGroup.1211.1": "記録大募集で塔覇の証を累計2200獲得", "BdConvertRewardGroup.1212.1": "記録大募集で塔覇の証を累計2400獲得", + "BdConvertRewardGroup.1301.1": "記録大募集で塔覇の証を累計200獲得", + "BdConvertRewardGroup.1302.1": "記録大募集で塔覇の証を累計400獲得", + "BdConvertRewardGroup.1303.1": "記録大募集で塔覇の証を累計600獲得", + "BdConvertRewardGroup.1304.1": "記録大募集で塔覇の証を累計800獲得", + "BdConvertRewardGroup.1305.1": "記録大募集で塔覇の証を累計1000獲得", + "BdConvertRewardGroup.1306.1": "記録大募集で塔覇の証を累計1200獲得", + "BdConvertRewardGroup.1307.1": "記録大募集で塔覇の証を累計1400獲得", + "BdConvertRewardGroup.1308.1": "記録大募集で塔覇の証を累計1600獲得", + "BdConvertRewardGroup.1309.1": "記録大募集で塔覇の証を累計1800獲得", + "BdConvertRewardGroup.1310.1": "記録大募集で塔覇の証を累計2000獲得", + "BdConvertRewardGroup.1311.1": "記録大募集で塔覇の証を累計2200獲得", + "BdConvertRewardGroup.1312.1": "記録大募集で塔覇の証を累計2400獲得", "BdConvertRewardGroup.201.1": "記録大募集で塔覇の証を累計200獲得", "BdConvertRewardGroup.202.1": "記録大募集で塔覇の証を累計400獲得", "BdConvertRewardGroup.203.1": "記録大募集で塔覇の証を累計600獲得", diff --git a/data/language/ja_jp/datingcharacterevent.json b/data/language/ja_jp/datingcharacterevent.json index 8ab048a67..f4e1770c0 100644 --- a/data/language/ja_jp/datingcharacterevent.json +++ b/data/language/ja_jp/datingcharacterevent.json @@ -720,7 +720,7 @@ "DatingCharacterEvent.1719.2": "まるで夢の世界のようだと、どちらともなく口にする。たまには日常の喧騒から離れて、心身をリフレッシュさせる必要があるのかもしれない。==DATING_CHARACTER==との穏やかな時間に、あなたは心から幸福感を覚えていた。", "DatingCharacterEvent.1719.3": "ふと空を見上げると、ちょうど流れ星が空を走る。あなたは反射的に==DATING_CHARACTER==と再び旅行できることを願った。==DATING_CHARACTER==はなにを願ったのかと尋ねると、彼女は笑ってはぐらかす。あなたは自分と同じ願いだったらいいのにと、ほのかな期待を抱くのだった。", "DatingCharacterEvent.1807.1": "歓声に気を引かれて目を向けると、そこでは人々が集まってチェスをしていた。あなたはエリナを誘い、対戦してみることにした。", - "DatingCharacterEvent.1807.2": "あなたはこっそりケータイのチェスゲームを起動すると、エリナとの対戦をシミュレートする。その甲斐もあり、=エリナとの対戦はあなたの勝利となった。\r\n「あなた、いったい何流？」", + "DatingCharacterEvent.1807.2": "あなたはこっそりケータイのチェスゲームを起動すると、エリナとの対戦をシミュレートする。その甲斐もあり、エリナとの対戦はあなたの勝利となった。\r\n「あなた、いったい何流？」", "DatingCharacterEvent.1807.3": "あなたはケータイをポケットに戻すと、胸を張って得意げに告げる。\r\n「名前をつけるなら……ゲーム流かな」", "DatingCharacterEvent.1907.1": "エリナはあなたにボディクリームを塗ってくれるという。そこで上着を脱いだあなたは、ほんの少し肌寒さを感じた。", "DatingCharacterEvent.1907.2": "エリナは花の香りがするクリームを取ると、あなたの体へと丁寧に塗っていく。彼女は無意識なのか、その距離はとても近く……うっすらと体温感じるほどだった。", diff --git a/data/language/ja_jp/errorcode.json b/data/language/ja_jp/errorcode.json index 6d663f57b..a1cc4fb21 100644 --- a/data/language/ja_jp/errorcode.json +++ b/data/language/ja_jp/errorcode.json @@ -177,7 +177,7 @@ "ErrorCode.119902.1": "配置エラー：%s", "ErrorCode.119903.1": "リソースが不足しています。", "ErrorCode.119904.1": "未解放です。", - "ErrorCode.119905.1": "イベントは終了しました。ページを再読み込みしてください。", + "ErrorCode.119905.1": "イベントは終了しました。\u000b一度画面を閉じてから、再度開いてください。", "ErrorCode.119906.1": "条件を満たしていません。", "ErrorCode.119907.1": "権限レベルが不足しています。", "ErrorCode.119908.1": "受取可能な報酬はありません。", diff --git a/data/language/ja_jp/item.json b/data/language/ja_jp/item.json index a9f22335b..e3e76ced1 100644 --- a/data/language/ja_jp/item.json +++ b/data/language/ja_jp/item.json @@ -3305,7 +3305,7 @@ "Item.515942.1": "医者の真心", "Item.515943.1": "蒼梧城の学び", "Item.516.1": "星明かり旅券", - "Item.516.2": "「星明かりの導き・周年限定おまけ付ガチャ」で使用でき、イベント終了後は「オアシス旅券」に変換できる。", + "Item.516.2": "「星明かりの導き・周年限定おまけ付ガチャ」で使用できる。ガチャの開催は終了しました。使用すると「オアシス旅券」に変換できる。", "Item.516.3": "アクセル全開！奇跡に向かって、いざ発進！", "Item.516001.1": "乱れ飛ぶ水泡", "Item.516002.1": "微震する流光", @@ -3521,6 +3521,9 @@ "Item.71026.1": "称号：ノヴァ", "Item.71026.2": "称号「ノヴァ」の解放に使用する。", "Item.71026.3": "奇妙な言葉が記録された小さなカード。", + "Item.71027.1": "称号：時空の", + "Item.71027.2": "称号「時空の」の解放に使用する。", + "Item.71027.3": "奇妙な言葉が記録された小さなカード。", "Item.71028.1": "称号：入札", "Item.71028.2": "称号「入札」の解放に使用する。", "Item.71028.3": "奇妙な言葉が記録された小さなカード。", @@ -3906,6 +3909,9 @@ "Item.72026.1": "称号：ハンター", "Item.72026.2": "称号「ハンター」の解放に使用する。", "Item.72026.3": "奇妙な言葉が記録された小さなカード。", + "Item.72027.1": "称号：超越者", + "Item.72027.2": "称号「超越者」の解放に使用する。", + "Item.72027.3": "奇妙な言葉が記録された小さなカード。", "Item.72028.1": "称号：達人", "Item.72028.2": "称号「達人」の解放に使用する。", "Item.72028.3": "奇妙な言葉が記録された小さなカード。", diff --git a/data/language/ja_jp/jumpto.json b/data/language/ja_jp/jumpto.json index 124d083f4..ec446896d 100644 --- a/data/language/ja_jp/jumpto.json +++ b/data/language/ja_jp/jumpto.json @@ -118,6 +118,7 @@ "JumpTo.49.1": "閃光の饗宴", "JumpTo.50.1": "技能研修", "JumpTo.5005.1": "メインストーリー", + "JumpTo.5006.1": "*****", "JumpTo.51.1": "技能研修-音楽カセット", "JumpTo.52.1": "技能研修-弾幕カセット", "JumpTo.53.1": "技能研修-格闘カセット", diff --git a/data/language/ja_jp/mailtemplate.json b/data/language/ja_jp/mailtemplate.json index 83470d17a..c349ffbbe 100644 --- a/data/language/ja_jp/mailtemplate.json +++ b/data/language/ja_jp/mailtemplate.json @@ -296,6 +296,9 @@ "MailTemplate.4019.1": "地理協会", "MailTemplate.4019.2": "イベント報酬郵送のお知らせ", "MailTemplate.4019.3": "親愛なるギルド代表様へ\nイベント「星明かりの旅立ち」が終了しました。\n受け取られていない報酬については、地理協会がまとめてオフィスへと郵送しておりますのでご確認ください。", + "MailTemplate.4020.1": "地理協会", + "MailTemplate.4020.2": "イベント報酬郵送のお知らせ", + "MailTemplate.4020.3": "親愛なるギルド代表様へ\nイベント「アニバーサリー特別感謝記念」が終了しました。\n受け取られていない報酬については、地理協会がまとめてオフィスへと郵送しておりますのでご確認ください。", "MailTemplate.5001.1": "『ステラソラ』運営チーム", "MailTemplate.5001.2": "アンケートご協力のお礼", "MailTemplate.5001.3": "この度のアンケートにご協力いただき、誠にありがとうございました。ささやかながらお礼の品をご用意いたしましたので、お受け取りください。", diff --git a/data/language/ja_jp/skill.json b/data/language/ja_jp/skill.json index 7aec14c5c..07f9816b4 100644 --- a/data/language/ja_jp/skill.json +++ b/data/language/ja_jp/skill.json @@ -171,7 +171,7 @@ "Skill.101001502.1": "ポンポンバレット", "Skill.101001502.2": "弾丸を吐き出し、敵に攻撃力の&Param1&のスキルダメージを与える。", "Skill.101001503.1": "ポンポンヒール", - "Skill.101001503.2": "スキル発動後、ボード上の味方ユニットの最大HPが&Param1&増加し、ボード上の味方の「森の仲間たち」ユニットの最大HPがさらに&Param2&増加する。この効果はは&Param3&回まで重複する。", + "Skill.101001503.2": "スキル発動後、ボード上の味方ユニットの最大HPが&Param1&増加し、ボード上の味方の「森の仲間たち」ユニットの最大HPがさらに&Param2&増加する。この効果は&Param3&回まで重複する。", "Skill.101001701.1": "キャットギフト", "Skill.101001701.2": "パッシブ：もふもふ号・ネコ機長は通常攻撃を行わなくなる。\nスキル発動後、賢者コインを1獲得する。", "Skill.101001702.1": "キャットレイズ", diff --git a/data/language/ja_jp/title.json b/data/language/ja_jp/title.json index 74ed1fb9a..9674c358f 100644 --- a/data/language/ja_jp/title.json +++ b/data/language/ja_jp/title.json @@ -51,6 +51,8 @@ "Title.54.1": "達人", "Title.55.1": "栄光", "Title.56.1": "代表", + "Title.57.1": "時空の", + "Title.58.1": "超越者", "Title.6.1": "執事", "Title.7.1": "クール", "Title.8.1": "オーナー", diff --git a/data/language/ja_jp/uitext.json b/data/language/ja_jp/uitext.json index 354d3b974..b7af69ec5 100644 --- a/data/language/ja_jp/uitext.json +++ b/data/language/ja_jp/uitext.json @@ -110,7 +110,7 @@ "UIText.Activity_End_Notice.1": "イベントが終了しました", "UIText.Activity_Fate_Card_20102.1": "シャロカード", "UIText.Activity_Fate_Card_20104.1": "シャロカード", - "UIText.Activity_Invalid_Tip_1.1": "イベントデータが更新されました。もう一度画面を開いてください", + "UIText.Activity_Invalid_Tip_1.1": "イベントデータが更新されました。\n画面を再読み込みします。", "UIText.Activity_Invalid_Tip_2.1": "一部のイベントが終了しました", "UIText.Activity_Invalid_Tip_3.1": "イベントが終了しました", "UIText.Activity_Level.1": "バトル", @@ -141,7 +141,7 @@ "UIText.Activity_Play_Cond_Tip_2.1": "メインストーリー{0}をクリア後に解放", "UIText.Activity_PopUp_Goto.1": "進む", "UIText.Activity_PopUp_Goto_1.1": "進む", - "UIText.Activity_PopUp_Time_Out.1": "イベントが終了しました。報酬はメールボックスからお受け取りください", + "UIText.Activity_PopUp_Time_Out.1": "イベントが終了しました。\n報酬はメールボックスに送付されました。", "UIText.Activity_Remain_Time_Day.1": "{0}日{1}時間", "UIText.Activity_Remain_Time_Hour.1": "{0}時間{1}分", "UIText.Activity_Remain_Time_LessThenHour.1": "1時間以内", @@ -2434,6 +2434,7 @@ "UIText.MainView_Friend.1": "フレンド", "UIText.MainView_Go.1": "出発", "UIText.MainView_Mail.1": "メール", + "UIText.MainView_MainStoryPreview.1": "先行解放", "UIText.MainView_Mall.1": "ショップ", "UIText.MainView_Phone.1": "ココチャ", "UIText.MainView_Preselection.1": "プリセット", @@ -2464,7 +2465,7 @@ "UIText.Mainline_Open_Time_Hour.1": "続きは {0} 時間後に解放されます、お楽しみに！", "UIText.Mainline_Open_Time_Min.1": "続きは {0} 分後に解放されます、お楽しみに！", "UIText.Mainline_Open_Time_Sec.1": "続きは {0} 秒後に解放されます、お楽しみに！", - "UIText.Mainline_Preview_Lock_Read.1": "イベント期間中、未解放の章を期間限定で先行プレイできます。\nストーリーをよりお楽しみいただくため、これまでの章を順番にクリアしてから本章に進むことをおすすめします。\n本章を先行して開始しますか？", + "UIText.Mainline_Preview_Lock_Read.1": "イベント期間中は、未解放の章を先行プレイできます。\nストーリーをよりお楽しみ頂くため、\nこれまでの章を順番にクリアしてから、\n本章に進むことをおすすめします。\n本章を先行プレイしますか？", "UIText.Mainview_BattlePassExpireHint.1": "事業支援の期間が終了しました", "UIText.Mall_Activity_CheckIn_Btn_Done.1": "購入済み", "UIText.Mall_Activity_CheckIn_BuySuc.1": "購入が完了しました。パックの中身を受け取れます", diff --git a/data/language/ko_kr/activitydouble.json b/data/language/ko_kr/activitydouble.json index c82615d0a..0112a9e66 100644 --- a/data/language/ko_kr/activitydouble.json +++ b/data/language/ko_kr/activitydouble.json @@ -4,5 +4,6 @@ "ActivityDouble.103003.1": "\u000b「이벤트 기간」\u000b2026/09/01 05:00~2026/09/08 04:59 \u000b\u000b「참여 조건」\u000b권한 레벨≥3레벨 \u000b\u000b「이벤트 설명」\u000b긴급 수배 중! 지정된 유형의 시련 스테이지를 완료하고 2배 보상을 받아가세요!", "ActivityDouble.103004.1": "\u000b「이벤트 기간」\u000b2026/09/22 05:00~2026/09/29 04:59 \u000b\u000b「참여 조건」\u000b권한 레벨≥3레벨 \u000b\u000b「이벤트 설명」\u000b긴급 수배 중! 지정된 유형의 시련 스테이지를 완료하고 2배 보상을 받아가세요!", "ActivityDouble.103005.1": "\u000b「이벤트 기간」\u000b2026/10/13 05:00~2026/10/20 04:59 \u000b\u000b「참여 조건」\u000b권한 레벨≥3레벨 \u000b\u000b「이벤트 설명」\u000b긴급 수배 중! 지정된 유형의 시련 스테이지를 완료하고 2배 보상을 받아가세요!", - "ActivityDouble.103006.1": "\u000b「이벤트 기간」\u000b2026/11/03 05:00~2026/11/10 04:59 \u000b\u000b「참여 조건」\u000b권한 레벨≥3레벨 \u000b\u000b「이벤트 설명」\u000b긴급 수배 중! 지정된 유형의 시련 스테이지를 완료하고 2배 보상을 받아가세요!" + "ActivityDouble.103006.1": "\u000b「이벤트 기간」\u000b2026/11/03 05:00~2026/11/10 04:59 \u000b\u000b「참여 조건」\u000b권한 레벨≥3레벨 \u000b\u000b「이벤트 설명」\u000b긴급 수배 중! 지정된 유형의 시련 스테이지를 완료하고 2배 보상을 받아가세요!", + "ActivityDouble.103012.1": "\u000b「이벤트 기간」\u000b2026/11/10 05:00~2026/11/13 04:59 \u000b\u000b「참여 조건」\u000b권한 레벨≥3레벨 \u000b\u000b「이벤트 설명」\u000b긴급 수배 중! 지정된 유형의 시련 스테이지를 완료하고 2배 보상을 받아가세요!" } \ No newline at end of file diff --git a/data/language/ko_kr/activitydoublequest.json b/data/language/ko_kr/activitydoublequest.json index 51240e173..13ebecc34 100644 --- a/data/language/ko_kr/activitydoublequest.json +++ b/data/language/ko_kr/activitydoublequest.json @@ -40,5 +40,8 @@ "ActivityDoubleQuest.106004.1": "누적 600 활력 소모", "ActivityDoubleQuest.106005.1": "누적 800 활력 소모", "ActivityDoubleQuest.106006.1": "누적 1000 활력 소모", - "ActivityDoubleQuest.106007.1": "누적 1200 활력 소모" + "ActivityDoubleQuest.106007.1": "누적 1200 활력 소모", + "ActivityDoubleQuest.112001.1": "누적 200 활력 소모", + "ActivityDoubleQuest.112002.1": "누적 300 활력 소모", + "ActivityDoubleQuest.112003.1": "누적 400 활력 소모" } \ No newline at end of file diff --git a/data/language/ko_kr/bdconvertcontent.json b/data/language/ko_kr/bdconvertcontent.json index 0d6a5397b..3260d4e16 100644 --- a/data/language/ko_kr/bdconvertcontent.json +++ b/data/language/ko_kr/bdconvertcontent.json @@ -11,6 +11,9 @@ "BdConvertContent.1201.1": "「극한 등반」 등급 기록 제출", "BdConvertContent.1202.1": "「심연 탐색」 등급 기록 제출", "BdConvertContent.1203.1": "「표면 조사」 등급 기록 제출", + "BdConvertContent.1301.1": "「극한 등반」 등급 기록 제출", + "BdConvertContent.1302.1": "「심연 탐색」 등급 기록 제출", + "BdConvertContent.1303.1": "「표면 조사」 등급 기록 제출", "BdConvertContent.201.1": "「극한 등반」 등급 기록 제출", "BdConvertContent.202.1": "「심연 탐색」 등급 기록 제출", "BdConvertContent.203.1": "「표면 조사」 등급 기록 제출", diff --git a/data/language/ko_kr/bdconvertcontrol.json b/data/language/ko_kr/bdconvertcontrol.json index 3db71e7fe..ea6a3addc 100644 --- a/data/language/ko_kr/bdconvertcontrol.json +++ b/data/language/ko_kr/bdconvertcontrol.json @@ -10,5 +10,6 @@ "BdConvertControl.500009.1": "\u000b「이벤트 기간」\u000b2026/08/11 13:00~2026/08/18 12:00 \u000b\u000b「참여 조건」\u000b권한 레벨 10 이상\u000b\u000b「이벤트 안내」 \u000b1. 지리 협회가 각계 여행가들의 별의 탑 공략 기록을 모집하고, 공략 점수를 지급합니다.\u000b2. 누적된 공략 점수에 따라 풍성한 보상을 받을 수 있습니다.", "BdConvertControl.500010.1": "\u000b「이벤트 기간」\u000b2026/09/01 13:00~2026/09/08 12:00 \u000b\u000b「참여 조건」\u000b권한 레벨 10 이상\u000b\u000b「이벤트 안내」 \u000b1. 지리 협회가 각계 여행가들의 별의 탑 공략 기록을 모집하고, 공략 점수를 지급합니다.\u000b2. 누적된 공략 점수에 따라 풍성한 보상을 받을 수 있습니다.", "BdConvertControl.500011.1": "\u000b「이벤트 기간」\u000b2026/10/13 13:00~2026/10/20 12:00 \u000b\u000b「참여 조건」\u000b권한 레벨 10 이상\u000b\u000b「이벤트 안내」 \u000b1. 지리 협회가 각계 여행가들의 별의 탑 공략 기록을 모집하고, 공략 점수를 지급합니다.\u000b2. 누적된 공략 점수에 따라 풍성한 보상을 받을 수 있습니다.", - "BdConvertControl.500012.1": "\u000b「이벤트 기간」\u000b2026/11/03 13:00~2026/11/10 12:00 \u000b\u000b「참여 조건」\u000b권한 레벨 10 이상\u000b\u000b「이벤트 안내」 \u000b1. 지리 협회가 각계 여행가들의 별의 탑 공략 기록을 모집하고, 공략 점수를 지급합니다.\u000b2. 누적된 공략 점수에 따라 풍성한 보상을 받을 수 있습니다." + "BdConvertControl.500012.1": "\u000b「이벤트 기간」\u000b2026/11/03 13:00~2026/11/10 12:00 \u000b\u000b「참여 조건」\u000b권한 레벨 10 이상\u000b\u000b「이벤트 안내」 \u000b1. 지리 협회가 각계 여행가들의 별의 탑 공략 기록을 모집하고, 공략 점수를 지급합니다.\u000b2. 누적된 공략 점수에 따라 풍성한 보상을 받을 수 있습니다.", + "BdConvertControl.500013.1": "\u000b「이벤트 기간」\u000b2026/11/10 13:00~2026/11/17 12:00 \u000b\u000b「참여 조건」\u000b권한 레벨 10 이상\u000b\u000b「이벤트 안내」 \u000b1. 지리 협회가 각계 여행가들의 별의 탑 공략 기록을 모집하고, 공략 점수를 지급합니다.\u000b2. 누적된 공략 점수에 따라 풍성한 보상을 받을 수 있습니다." } \ No newline at end of file diff --git a/data/language/ko_kr/bdconvertrewardgroup.json b/data/language/ko_kr/bdconvertrewardgroup.json index 8f437be1a..ce19a6454 100644 --- a/data/language/ko_kr/bdconvertrewardgroup.json +++ b/data/language/ko_kr/bdconvertrewardgroup.json @@ -47,6 +47,18 @@ "BdConvertRewardGroup.1210.1": "「공략 기록 대모집」 중 공략 점수 2000 누적", "BdConvertRewardGroup.1211.1": "「공략 기록 대모집」 중 공략 점수 2200 누적", "BdConvertRewardGroup.1212.1": "「공략 기록 대모집」 중 공략 점수 2400 누적", + "BdConvertRewardGroup.1301.1": "「공략 기록 대모집」 중 공략 점수 200 누적", + "BdConvertRewardGroup.1302.1": "「공략 기록 대모집」 중 공략 점수 400 누적", + "BdConvertRewardGroup.1303.1": "「공략 기록 대모집」 중 공략 점수 600 누적", + "BdConvertRewardGroup.1304.1": "「공략 기록 대모집」 중 공략 점수 800 누적", + "BdConvertRewardGroup.1305.1": "「공략 기록 대모집」 중 공략 점수 1000 누적", + "BdConvertRewardGroup.1306.1": "「공략 기록 대모집」 중 공략 점수 1200 누적", + "BdConvertRewardGroup.1307.1": "「공략 기록 대모집」 중 공략 점수 1400 누적", + "BdConvertRewardGroup.1308.1": "「공략 기록 대모집」 중 공략 점수 1600 누적", + "BdConvertRewardGroup.1309.1": "「공략 기록 대모집」 중 공략 점수 1800 누적", + "BdConvertRewardGroup.1310.1": "「공략 기록 대모집」 중 공략 점수 2000 누적", + "BdConvertRewardGroup.1311.1": "「공략 기록 대모집」 중 공략 점수 2200 누적", + "BdConvertRewardGroup.1312.1": "「공략 기록 대모집」 중 공략 점수 2400 누적", "BdConvertRewardGroup.201.1": "「공략 기록 대모집」 중 공략 점수 200 누적", "BdConvertRewardGroup.202.1": "「공략 기록 대모집」 중 공략 점수 400 누적", "BdConvertRewardGroup.203.1": "「공략 기록 대모집」 중 공략 점수 600 누적", diff --git a/data/language/ko_kr/item.json b/data/language/ko_kr/item.json index 403d2f628..e5559fe7b 100644 --- a/data/language/ko_kr/item.json +++ b/data/language/ko_kr/item.json @@ -3305,7 +3305,7 @@ "Item.515942.1": "은총의 잔향", "Item.515943.1": "성화의 횃불", "Item.516.1": "재회의 인연 한정 티켓", - "Item.516.2": "「별의 발자취 인연의 재회」에서 모집을 진행하기 위한 한정 티켓. 이벤트 종료 후 「새싹 티켓」으로 교환 가능.", + "Item.516.2": "「별의 발자취 인연의 재회」에서 모집을 진행하기 위한 한정 티켓. 모집이 종료되어, 사용 시 「새싹 티켓」으로 교환 가능.", "Item.516.3": "여정의 방향을 잘 잡고, 잊을 수 없는 또 한 번의 만남을 시작하자.", "Item.516001.1": "요란한 버블", "Item.516002.1": "빛의 떨림", @@ -3521,6 +3521,9 @@ "Item.71026.1": "접두 칭호: 노바", "Item.71026.2": "칭호: 노바 오픈에 사용된다.", "Item.71026.3": "신비한 단어가 적힌 작은 카드.", + "Item.71027.1": "접두 칭호: 시공간", + "Item.71027.2": "칭호: 시공간 오픈에 사용된다.", + "Item.71027.3": "신비한 단어가 적힌 작은 카드.", "Item.71028.1": "접두 칭호: 낙찰자", "Item.71028.2": "칭호: 낙찰자 오픈에 사용된다.", "Item.71028.3": "신비한 단어가 적힌 작은 카드.", @@ -3906,6 +3909,9 @@ "Item.72026.1": "접미 칭호: 헌터", "Item.72026.2": "칭호: 헌터 오픈에 사용된다.", "Item.72026.3": "신비한 단어가 적힌 작은 카드.", + "Item.72027.1": "접미 칭호: 초월자", + "Item.72027.2": "칭호: 초월자 오픈에 사용된다.", + "Item.72027.3": "신비한 단어가 적힌 작은 카드.", "Item.72028.1": "접미 칭호: 달인", "Item.72028.2": "칭호: 달인 오픈에 사용된다.", "Item.72028.3": "신비한 단어가 적힌 작은 카드.", diff --git a/data/language/ko_kr/jumpto.json b/data/language/ko_kr/jumpto.json index 7099f1ce9..b39e59906 100644 --- a/data/language/ko_kr/jumpto.json +++ b/data/language/ko_kr/jumpto.json @@ -118,6 +118,7 @@ "JumpTo.49.1": "트윙클 파티", "JumpTo.50.1": "기술 시련", "JumpTo.5005.1": "메인 스토리", + "JumpTo.5006.1": "11", "JumpTo.51.1": "기술 시련-리듬 게임 카트리지", "JumpTo.52.1": "기술 시련-사격 게임 카트리지", "JumpTo.53.1": "기술 시련-격투 게임 카트리지", diff --git a/data/language/ko_kr/mailtemplate.json b/data/language/ko_kr/mailtemplate.json index 472aea599..eb04ab99d 100644 --- a/data/language/ko_kr/mailtemplate.json +++ b/data/language/ko_kr/mailtemplate.json @@ -296,6 +296,9 @@ "MailTemplate.4019.1": "지리 협회", "MailTemplate.4019.2": "재배송 - 이벤트 보상", "MailTemplate.4019.3": "「별의 발자취 소원의 여정」 이벤트가 종료되었으며, 보상 수령 기한이 만료되었어요! \n협회에서 특별히 여단 사무실로 보상을 배송해 드렸으니 확인해 보세요.\n다음번 임무 완료 후에는 잊지 말고 꼭 보상을 수령하세요!", + "MailTemplate.4020.1": "지리 협회", + "MailTemplate.4020.2": "재배송 - 이벤트 보상", + "MailTemplate.4020.3": "「별의 발자취 · 감사의 선물」 이벤트가 종료되었으며, 보상 수령 기한이 만료되었어요! \n협회에서 특별히 여단 사무실로 보상을 배송해 드렸으니 확인해 보세요.\n다음번 임무 완료 후에는 잊지 말고 꼭 보상을 수령하세요!", "MailTemplate.5001.1": "「스텔라 소라」 운영팀", "MailTemplate.5001.2": "{0} 특별 보상", "MailTemplate.5001.3": "설문 조사에 참여해 주셔서 감사합니다!\r\n특별 보상을 준비했으니 확인해 보세요.", diff --git a/data/language/ko_kr/potential.json b/data/language/ko_kr/potential.json index e0b564b6a..c34f32731 100644 --- a/data/language/ko_kr/potential.json +++ b/data/language/ko_kr/potential.json @@ -2341,8 +2341,8 @@ "Potential.516208.2": "특수 일반 공격 「단죄의 낙성」 시전 시, 영역을 생성해 최대 HP &Param1&x6의 빛 속성 일반 공격 피해를 입힌다. \u000b세이나(기원)의 대검 공격과 「낙성」이 입히는 &Param2_kr1& &Param3& 증가한다.", "Potential.516209.1": "「낙성」이 흩어질 때 번개를 발사해 목표를 공격한다. 메인 스킬을 시전하면 세이나(기원)의 &Param2_kr1& 증가한다.", "Potential.516209.2": "「낙성」이 흩어질 때 번개를 1개 발사해 목표를 공격해 최대 HP &Param1&의 빛 속성 일반 공격 피해를 입힌다. \u000b메인 스킬을 시전하면 세이나(기원)의 &Param2_kr1& &Param3& 증가한다. &Param4&초간 지속된다.", - "Potential.516210.1": "특수 일반 공격 「단죄의 낙성」시전 시, 세이나(기원)의 필살기가 대검 형태로 변경된다. 세이나의 대검 공격과 「낙성」이 입히는 &Param1_kr1& 증가한다.", - "Potential.516210.2": "특수 일반 공격 「단죄의 낙성」시전 시, 세이나(기원)의 필살기가 대검 형태로 변경된다. \u000b세이나의 대검 공격과 「낙성」이 입히는 &Param1_kr1& &Param2& 증가한다.", + "Potential.516210.1": "특수 일반 공격 「단죄의 낙성」시전 시, 세이나(기원)의 필살기가 대검 형태로 변경된다. 세이나(기원)의 대검 공격과 「낙성」이 입히는 &Param1_kr1& 증가한다.", + "Potential.516210.2": "특수 일반 공격 「단죄의 낙성」시전 시, 세이나(기원)의 필살기가 대검 형태로 변경된다. \u000b세이나(기원)의 대검 공격과 「낙성」이 입히는 &Param1_kr1& &Param2& 증가한다.", "Potential.516211.1": "세이나(기원)가 ##반짝임#4029#을 보유한 목표에게 입히는 &Param1_kr1& 증가한다. 세이나(기원)의 &Param3_kr1& 증가한다.", "Potential.516211.2": "세이나(기원)가 ##반짝임#4029#을 보유한 목표에게 입히는 &Param1_kr1& &Param2& 증가한다. \u000b세이나(기원)의 &Param3_kr1& &Param4& 증가한다.", "Potential.516212.1": "팀 내 빛 속성 캐릭터가 세이나(기원)의 ##빛 속성 관통#2068#을 증가시킨다.", diff --git a/data/language/ko_kr/title.json b/data/language/ko_kr/title.json index 39ed29547..40b6464e4 100644 --- a/data/language/ko_kr/title.json +++ b/data/language/ko_kr/title.json @@ -51,6 +51,8 @@ "Title.54.1": "달인", "Title.55.1": "영광의", "Title.56.1": "수석", + "Title.57.1": "시공간", + "Title.58.1": "초월자", "Title.6.1": "집사", "Title.7.1": "냉정한", "Title.8.1": "사장", diff --git a/data/language/ko_kr/uitext.json b/data/language/ko_kr/uitext.json index 6cb368eba..1706b68cf 100644 --- a/data/language/ko_kr/uitext.json +++ b/data/language/ko_kr/uitext.json @@ -2434,6 +2434,7 @@ "UIText.MainView_Friend.1": "친구", "UIText.MainView_Go.1": "출발", "UIText.MainView_Mail.1": "우편", + "UIText.MainView_MainStoryPreview.1": "미리보기", "UIText.MainView_Mall.1": "상점", "UIText.MainView_Phone.1": "하트챗", "UIText.MainView_Preselection.1": "프리셋", diff --git a/data/language/zh_cn/activitydouble.json b/data/language/zh_cn/activitydouble.json index 15bac2a86..2a37b8754 100644 --- a/data/language/zh_cn/activitydouble.json +++ b/data/language/zh_cn/activitydouble.json @@ -4,5 +4,6 @@ "ActivityDouble.103003.1": "\u000b【活动时间】\u000b2026/9/1 4:00~2026/9/8 3:59 \u000b\u000b【参与条件】\u000b权限等级≥3级\u000b\u000b【活动说明】\u000b紧急委托正悬赏招募中！完成特定种类的试炼关卡，赢取双倍奖励吧！", "ActivityDouble.103004.1": "\u000b【活动时间】\u000b2026/9/22 4:00~2026/9/29 3:59 \u000b\u000b【参与条件】\u000b权限等级≥3级\u000b\u000b【活动说明】\u000b紧急委托正悬赏招募中！完成特定种类的试炼关卡，赢取双倍奖励吧！", "ActivityDouble.103005.1": "\u000b【活动时间】\u000b2026/10/13 4:00~2026/10/20 3:59 \u000b\u000b【参与条件】\u000b权限等级≥3级\u000b\u000b【活动说明】\u000b紧急委托正悬赏招募中！完成特定种类的试炼关卡，赢取双倍奖励吧！", - "ActivityDouble.103006.1": "\u000b【活动时间】\u000b2026/11/3 4:00~2026/11/10 3:59 \u000b\u000b【参与条件】\u000b权限等级≥3级\u000b\u000b【活动说明】\u000b紧急委托正悬赏招募中！完成特定种类的试炼关卡，赢取双倍奖励吧！" + "ActivityDouble.103006.1": "\u000b【活动时间】\u000b2026/11/3 4:00~2026/11/10 3:59 \u000b\u000b【参与条件】\u000b权限等级≥3级\u000b\u000b【活动说明】\u000b紧急委托正悬赏招募中！完成特定种类的试炼关卡，赢取双倍奖励吧！", + "ActivityDouble.103012.1": "\u000b【活动时间】\u000b2026/11/10 4:00~2026/11/13 3:59 \u000b\u000b【参与条件】\u000b权限等级≥3级\u000b\u000b【活动说明】\u000b紧急委托正悬赏招募中！完成特定种类的试炼关卡，赢取双倍奖励吧！" } \ No newline at end of file diff --git a/data/language/zh_cn/activitydoublequest.json b/data/language/zh_cn/activitydoublequest.json index 097e2dfe3..e7b5fdf0e 100644 --- a/data/language/zh_cn/activitydoublequest.json +++ b/data/language/zh_cn/activitydoublequest.json @@ -40,5 +40,8 @@ "ActivityDoubleQuest.106004.1": "累积消耗600干劲", "ActivityDoubleQuest.106005.1": "累积消耗800干劲", "ActivityDoubleQuest.106006.1": "累积消耗1000干劲", - "ActivityDoubleQuest.106007.1": "累积消耗1200干劲" + "ActivityDoubleQuest.106007.1": "累积消耗1200干劲", + "ActivityDoubleQuest.112001.1": "累积消耗200干劲", + "ActivityDoubleQuest.112002.1": "累积消耗300干劲", + "ActivityDoubleQuest.112003.1": "累积消耗400干劲" } \ No newline at end of file diff --git a/data/language/zh_cn/bdconvertcontent.json b/data/language/zh_cn/bdconvertcontent.json index 95aad667e..b204d2149 100644 --- a/data/language/zh_cn/bdconvertcontent.json +++ b/data/language/zh_cn/bdconvertcontent.json @@ -11,6 +11,9 @@ "BdConvertContent.1201.1": "递交「极限登峰」级纪录", "BdConvertContent.1202.1": "递交「深域探索」级纪录", "BdConvertContent.1203.1": "递交「浅层调查」级纪录", + "BdConvertContent.1301.1": "递交「极限登峰」级纪录", + "BdConvertContent.1302.1": "递交「深域探索」级纪录", + "BdConvertContent.1303.1": "递交「浅层调查」级纪录", "BdConvertContent.201.1": "递交「极限登峰」级纪录", "BdConvertContent.202.1": "递交「深域探索」级纪录", "BdConvertContent.203.1": "递交「浅层调查」级纪录", diff --git a/data/language/zh_cn/bdconvertcontrol.json b/data/language/zh_cn/bdconvertcontrol.json index f936df983..716d5c1df 100644 --- a/data/language/zh_cn/bdconvertcontrol.json +++ b/data/language/zh_cn/bdconvertcontrol.json @@ -10,5 +10,6 @@ "BdConvertControl.500009.1": "\u000b【活动时间】\u000b2026/8/11 12:00~2026/8/18 11:00 \u000b\u000b【参与条件】\u000b权限等级≥10级\u000b\u000b【活动说明】\u000b1、地理协会向各界旅人征集成功攻略星塔的纪录档案，发放攻略积分。\u000b2、累计攻略积分可获取丰厚奖励。", "BdConvertControl.500010.1": "\u000b【活动时间】\u000b2026/9/1 12:00~2026/9/8 11:00 \u000b\u000b【参与条件】\u000b权限等级≥10级\u000b\u000b【活动说明】\u000b1、地理协会向各界旅人征集成功攻略星塔的纪录档案，发放攻略积分。\u000b2、累计攻略积分可获取丰厚奖励。", "BdConvertControl.500011.1": "\u000b【活动时间】\u000b2026/10/13 12:00~2026/10/20 11:00 \u000b\u000b【参与条件】\u000b权限等级≥10级\u000b\u000b【活动说明】\u000b1、地理协会向各界旅人征集成功攻略星塔的纪录档案，发放攻略积分。\u000b2、累计攻略积分可获取丰厚奖励。", - "BdConvertControl.500012.1": "\u000b【活动时间】\u000b2026/11/3 12:00~2026/11/10 11:00 \u000b\u000b【参与条件】\u000b权限等级≥10级\u000b\u000b【活动说明】\u000b1、地理协会向各界旅人征集成功攻略星塔的纪录档案，发放攻略积分。\u000b2、累计攻略积分可获取丰厚奖励。" + "BdConvertControl.500012.1": "\u000b【活动时间】\u000b2026/11/3 12:00~2026/11/10 11:00 \u000b\u000b【参与条件】\u000b权限等级≥10级\u000b\u000b【活动说明】\u000b1、地理协会向各界旅人征集成功攻略星塔的纪录档案，发放攻略积分。\u000b2、累计攻略积分可获取丰厚奖励。", + "BdConvertControl.500013.1": "\u000b【活动时间】\u000b2026/11/10 12:00~2026/11/17 11:00 \u000b\u000b【参与条件】\u000b权限等级≥10级\u000b\u000b【活动说明】\u000b1、地理协会向各界旅人征集成功攻略星塔的纪录档案，发放攻略积分。\u000b2、累计攻略积分可获取丰厚奖励。" } \ No newline at end of file diff --git a/data/language/zh_cn/bdconvertrewardgroup.json b/data/language/zh_cn/bdconvertrewardgroup.json index ed9b5d2d4..667f2572c 100644 --- a/data/language/zh_cn/bdconvertrewardgroup.json +++ b/data/language/zh_cn/bdconvertrewardgroup.json @@ -47,6 +47,18 @@ "BdConvertRewardGroup.1210.1": "在「攻略纪录大征集」中累计2000攻略积分", "BdConvertRewardGroup.1211.1": "在「攻略纪录大征集」中累计2200攻略积分", "BdConvertRewardGroup.1212.1": "在「攻略纪录大征集」中累计2400攻略积分", + "BdConvertRewardGroup.1301.1": "在「攻略纪录大征集」中累计200攻略积分", + "BdConvertRewardGroup.1302.1": "在「攻略纪录大征集」中累计400攻略积分", + "BdConvertRewardGroup.1303.1": "在「攻略纪录大征集」中累计600攻略积分", + "BdConvertRewardGroup.1304.1": "在「攻略纪录大征集」中累计800攻略积分", + "BdConvertRewardGroup.1305.1": "在「攻略纪录大征集」中累计1000攻略积分", + "BdConvertRewardGroup.1306.1": "在「攻略纪录大征集」中累计1200攻略积分", + "BdConvertRewardGroup.1307.1": "在「攻略纪录大征集」中累计1400攻略积分", + "BdConvertRewardGroup.1308.1": "在「攻略纪录大征集」中累计1600攻略积分", + "BdConvertRewardGroup.1309.1": "在「攻略纪录大征集」中累计1800攻略积分", + "BdConvertRewardGroup.1310.1": "在「攻略纪录大征集」中累计2000攻略积分", + "BdConvertRewardGroup.1311.1": "在「攻略纪录大征集」中累计2200攻略积分", + "BdConvertRewardGroup.1312.1": "在「攻略纪录大征集」中累计2400攻略积分", "BdConvertRewardGroup.201.1": "在「攻略纪录大征集」中累计200攻略积分", "BdConvertRewardGroup.202.1": "在「攻略纪录大征集」中累计400攻略积分", "BdConvertRewardGroup.203.1": "在「攻略纪录大征集」中累计600攻略积分", diff --git a/data/language/zh_cn/item.json b/data/language/zh_cn/item.json index c5f57e1fc..5d81eb51f 100644 --- a/data/language/zh_cn/item.json +++ b/data/language/zh_cn/item.json @@ -3305,7 +3305,7 @@ "Item.515942.1": "余泽犹在", "Item.515943.1": "星火成炬", "Item.516.1": "重逢之缘限定招募礼券", - "Item.516.2": "特用于「星途一载 · 予缘重聚」招募的凭证。活动结束后将可兑换为「萌芽礼券」。", + "Item.516.2": "特用于「星途一载 · 予缘重聚」招募的凭证。招募已结束，使用后可转化为「萌芽礼券」。", "Item.516.3": "瞄好旅途的方向，开启一段难忘的邂逅。", "Item.516001.1": "纷乱泡泡", "Item.516002.1": "流光微颤", @@ -3521,6 +3521,9 @@ "Item.71026.1": "前缀头衔:诺瓦", "Item.71026.2": "用于解锁头衔：诺瓦", "Item.71026.3": "记录着神奇词语的小卡片。", + "Item.71027.1": "前缀头衔:时空", + "Item.71027.2": "用于解锁头衔：时空", + "Item.71027.3": "记录着神奇词语的小卡片。", "Item.71028.1": "前缀头衔:竞标", "Item.71028.2": "用于解锁头衔：竞标", "Item.71028.3": "记录着神奇词语的小卡片。", @@ -3906,6 +3909,9 @@ "Item.72026.1": "后缀头衔:猎魔人", "Item.72026.2": "用于解锁头衔：猎魔人", "Item.72026.3": "记录着神奇词语的小卡片。", + "Item.72027.1": "后缀头衔:穿越者", + "Item.72027.2": "用于解锁头衔：穿越者", + "Item.72027.3": "记录着神奇词语的小卡片。", "Item.72028.1": "后缀头衔:达人", "Item.72028.2": "用于解锁头衔：达人", "Item.72028.3": "记录着神奇词语的小卡片。", diff --git a/data/language/zh_cn/jumpto.json b/data/language/zh_cn/jumpto.json index 10d7370ab..0bf43ee09 100644 --- a/data/language/zh_cn/jumpto.json +++ b/data/language/zh_cn/jumpto.json @@ -118,6 +118,7 @@ "JumpTo.49.1": "纷闪派对", "JumpTo.50.1": "技巧试炼", "JumpTo.5005.1": "主线故事", + "JumpTo.5006.1": "StoryChapter表Id=11", "JumpTo.51.1": "技巧试炼-节奏卡带", "JumpTo.52.1": "技巧试炼-射击卡带", "JumpTo.53.1": "技巧试炼-格斗卡带", diff --git a/data/language/zh_cn/mailtemplate.json b/data/language/zh_cn/mailtemplate.json index 84307c5a9..d65ae3c38 100644 --- a/data/language/zh_cn/mailtemplate.json +++ b/data/language/zh_cn/mailtemplate.json @@ -296,6 +296,9 @@ "MailTemplate.4019.1": "地理协会", "MailTemplate.4019.2": "补发快件 - 活动奖励", "MailTemplate.4019.3": "「星途一载·梦愿启航」活动已结束，领赏期限已经过啦！\n不过协会已经贴心地打包好奖励寄送到贵团办公室了，请查收。\n下次完成任务后，务必记得领取喔！", + "MailTemplate.4020.1": "地理协会", + "MailTemplate.4020.2": "补发快件 - 活动奖励", + "MailTemplate.4020.3": "「星途一载 · 特别致谢」活动已结束，领赏期限已经过啦！\n不过协会已经贴心地打包好奖励寄送到贵团办公室了，请查收。\n下次完成任务后，务必记得领取喔！", "MailTemplate.5001.1": "《星塔旅人》运营团队", "MailTemplate.5001.2": "感谢您参与{0}调查", "MailTemplate.5001.3": "非常感谢您参与本次调查，特为您准备了些礼品，请查收", diff --git a/data/language/zh_cn/title.json b/data/language/zh_cn/title.json index cbb4e2236..7357bcb54 100644 --- a/data/language/zh_cn/title.json +++ b/data/language/zh_cn/title.json @@ -51,6 +51,8 @@ "Title.54.1": "达人", "Title.55.1": "荣耀", "Title.56.1": "首席", + "Title.57.1": "时空", + "Title.58.1": "穿越者", "Title.6.1": "管家", "Title.7.1": "冷静", "Title.8.1": "老板", diff --git a/data/language/zh_cn/uitext.json b/data/language/zh_cn/uitext.json index 60cfe1ef3..66886f4f0 100644 --- a/data/language/zh_cn/uitext.json +++ b/data/language/zh_cn/uitext.json @@ -2434,6 +2434,7 @@ "UIText.MainView_Friend.1": "好友", "UIText.MainView_Go.1": "出发", "UIText.MainView_Mail.1": "邮件", + "UIText.MainView_MainStoryPreview.1": "提前开放", "UIText.MainView_Mall.1": "商城", "UIText.MainView_Phone.1": "心链", "UIText.MainView_Preselection.1": "预设", diff --git a/lua/game/codegen/game_enum_define.lua b/lua/game/codegen/game_enum_define.lua index 1c7b09aed..999cdd5e3 100644 --- a/lua/game/codegen/game_enum_define.lua +++ b/lua/game/codegen/game_enum_define.lua @@ -400,7 +400,9 @@ GameEnum.jumpType = { ActivityGame1 = 46, ActivityGame2 = 47, Soldier = 48, - Dorm = 49 + Dorm = 49, + ActivityStoryReview = 50, + MainLineStoryPreview = 51 } GameEnum.characterSearchTargetType = {MELEE = 1, RANGED = 2} GameEnum.characterSearchTargetTypeTowerDefense = {NORMAL = 1} diff --git a/lua/game/common/utils/jumputil.lua b/lua/game/common/utils/jumputil.lua index 92fb1bd20..6569fbb5e 100644 --- a/lua/game/common/utils/jumputil.lua +++ b/lua/game/common/utils/jumputil.lua @@ -434,6 +434,36 @@ function JumpUtil.DoJump(jumpId, ...) else EventManager.Hit(EventId.OpenPanel, PanelId.MainlineEx, chapterIndex) end + elseif nType == GameEnum.jumpType.MainLineStoryPreview then + local nChapterId = mapJumpTo.Param[1] + local cfg = ConfigTable.GetData("StoryChapter", nChapterId) + local nPanelId = cfg.StoryPanelId + if nPanelId == 0 then + nPanelId = PanelId.MainlineEx + end + if PlayerData.Avg:IsStoryChapterUnlock(nChapterId) == true then + EventManager.Hit(EventId.OpenPanel, nPanelId, nChapterId) + else + do + local sLockReadTipsKey = "Mainline_Preview_Lock_Read_" .. nChapterId + if LocalData.GetPlayerLocalData(sLockReadTipsKey) then + EventManager.Hit(EventId.OpenPanel, nPanelId, nChapterId) + else + do + local sTip = ConfigTable.GetUIText("Mainline_Preview_Lock_Read") + local msg = { + nType = AllEnum.MessageBox.Confirm, + sContent = sTip, + callbackConfirm = function() + LocalData.SetPlayerLocalData(sLockReadTipsKey, true) + EventManager.Hit(EventId.OpenPanel, nPanelId, nChapterId) + end + } + EventManager.Hit(EventId.OpenMessageBox, msg) + end + end + end + end elseif nType == GameEnum.jumpType.QuestNewbie then local nJumpTab = mapJumpTo.Param[1] if PanelManager.GetCurPanelId() == PanelId.QuestNewbie then @@ -460,6 +490,12 @@ function JumpUtil.DoJump(jumpId, ...) EventManager.Hit(EventId.OpenPanel, PanelId.SoldierMainViewPanel) elseif nType == GameEnum.jumpType.Dorm then EventManager.Hit(EventId.OpenPanel, PanelId.DormPanel) + elseif nType == GameEnum.jumpType.ActivityStoryReview then + local nActivityId = mapJumpTo.Param[1] + local data = ConfigTable.GetData("ActivityStoryChapter", nActivityId) + if data ~= nil then + PlayerData.StoryReview:TryOpenStoryChapter(data.ChapterId) + end end end function JumpUtil.CheckJumpUnLock(jumpId, showTips) @@ -626,29 +662,39 @@ end function JumpUtil.JumpToActivity(tbJumpData) if tbJumpData[1] == GameEnum.jumpType.MainLineStoryChapter then local chapterIndex = tbJumpData[2] - local panelId = PanelId.MainlineEx - if chapterIndex == 11 then - panelId = PanelId.DustDawnStory - end local isUnlock = PlayerData.Avg:IsStoryChapterUnlock(chapterIndex) if isUnlock then - EventManager.Hit(EventId.OpenPanel, panelId, chapterIndex) + EventManager.Hit(EventId.OpenPanel, PanelId.MainlineEx, chapterIndex) + end + return + end + if tbJumpData[1] == GameEnum.jumpType.MainLineStoryPreview then + local nChapterId = tbJumpData[2] + local cfg = ConfigTable.GetData("StoryChapter", nChapterId) + local nPanelId = cfg.StoryPanelId + if nPanelId == 0 then + nPanelId = PanelId.MainlineEx + end + if PlayerData.Avg:IsStoryChapterUnlock(nChapterId) == true then + EventManager.Hit(EventId.OpenPanel, nPanelId, nChapterId) else - local sLockReadTipsKey = "Mainline_Preview_Lock_Read_" .. chapterIndex + local sLockReadTipsKey = "Mainline_Preview_Lock_Read_" .. nChapterId if LocalData.GetPlayerLocalData(sLockReadTipsKey) then - EventManager.Hit(EventId.OpenPanel, panelId, chapterIndex) - return - end - local sTip = ConfigTable.GetUIText("Mainline_Preview_Lock_Read") - local msg = { - nType = AllEnum.MessageBox.Confirm, - sContent = sTip, - callbackConfirm = function() - LocalData.SetPlayerLocalData(sLockReadTipsKey, true) - EventManager.Hit(EventId.OpenPanel, panelId, chapterIndex) + EventManager.Hit(EventId.OpenPanel, nPanelId, nChapterId) + else + do + local sTip = ConfigTable.GetUIText("Mainline_Preview_Lock_Read") + local msg = { + nType = AllEnum.MessageBox.Confirm, + sContent = sTip, + callbackConfirm = function() + LocalData.SetPlayerLocalData(sLockReadTipsKey, true) + EventManager.Hit(EventId.OpenPanel, nPanelId, nChapterId) + end + } + EventManager.Hit(EventId.OpenMessageBox, msg) end - } - EventManager.Hit(EventId.OpenMessageBox, msg) + end end return end diff --git a/lua/game/ui/activity/advertise/mainlinestoryactctrl.lua b/lua/game/ui/activity/advertise/mainlinestoryactctrl.lua index c2b35bed5..33c063a3a 100644 --- a/lua/game/ui/activity/advertise/mainlinestoryactctrl.lua +++ b/lua/game/ui/activity/advertise/mainlinestoryactctrl.lua @@ -16,7 +16,19 @@ function MainLineStoryActCtrl:InitActData(actData) self.actData = actData self.nActId = actData:GetActId() self.AdConfig = ConfigTable.GetData("AdControl", self.nActId) - self:RefreshAct() + local bIsMainlineStoryPreview = false + local jumpToId = self.AdConfig.JumpTo[1] + if type(jumpToId) == "number" then + local cfgData_JumpTo = ConfigTable.GetData("JumpTo", jumpToId) + if cfgData_JumpTo ~= nil and cfgData_JumpTo.Type == GameEnum.jumpType.MainLineStoryPreview then + bIsMainlineStoryPreview = true + end + end + if bIsMainlineStoryPreview == true then + self:RefreshAct_MainlineStoryPreview() + else + self:RefreshAct() + end end function MainLineStoryActCtrl:GetTimeStr(nRemainTime) local sTimeStr = "" @@ -79,6 +91,21 @@ function MainLineStoryActCtrl:RefreshAct() refresh() self.refreshTimer = self:AddTimer(0, 1, refresh, true, true, true) end +function MainLineStoryActCtrl:RefreshAct_MainlineStoryPreview() + if self.timerLoopRefresh ~= nil then + self.timerLoopRefresh:Cancel() + self.timerLoopRefresh = nil + end + local do_refresh = function() + local nEndTime = self.actData:GetActEndTime() + local nCurTime = ClientManager.serverTimeStamp + local nRemainTime = math.max(nEndTime - nCurTime, 0) + local sTime = self:GetTimeStr(nRemainTime) + NovaAPI.SetTMPText(self._mapNode.txtActTime, sTime) + end + do_refresh() + self.timerLoopRefresh = self:AddTimer(0, 1, do_refresh, true, true, true) +end function MainLineStoryActCtrl:OnBtnClick_Go() local nEndTime = self.actData:GetActEndTime() local nCurTime = ClientManager.serverTimeStamp diff --git a/lua/game/ui/activity/loginreward/_301054/loginrewardctrl_01.lua b/lua/game/ui/activity/loginreward/_301054/loginrewardctrl_01.lua new file mode 100644 index 000000000..a4c253c42 --- /dev/null +++ b/lua/game/ui/activity/loginreward/_301054/loginrewardctrl_01.lua @@ -0,0 +1,28 @@ +local LoginRewardCtrl_01 = class("LoginRewardCtrl_01", BaseCtrl) +LoginRewardCtrl_01._mapNodeConfig = { + goCommon = { + sNodeName = "---Common---" + } +} +LoginRewardCtrl_01._mapEventConfig = {} +function LoginRewardCtrl_01:UnbindCtrl() + if self.activityCtrl ~= nil then + self:UnbindCtrlByNode(self.activityCtrl) + self.activityCtrl = nil + end +end +function LoginRewardCtrl_01:InitActData(actData) + if self.activityCtrl == nil then + self.activityCtrl = self:BindCtrlByNode(self._mapNode.goCommon, "Game.UI.Activity.LoginReward.LoginRewardCtrl_List") + end + self.actData = actData + self.nActId = actData:GetActId() + self.activityCtrl:InitActData(actData) +end +function LoginRewardCtrl_01:ClearActivity() + self:UnbindCtrl() +end +function LoginRewardCtrl_01:OnDisable() + self:UnbindCtrl() +end +return LoginRewardCtrl_01 diff --git a/lua/game/ui/activity/loginreward/_301054/loginrewardpopupctrl_01.lua b/lua/game/ui/activity/loginreward/_301054/loginrewardpopupctrl_01.lua new file mode 100644 index 000000000..4b8610d8b --- /dev/null +++ b/lua/game/ui/activity/loginreward/_301054/loginrewardpopupctrl_01.lua @@ -0,0 +1,142 @@ +local LoginRewardPopUpCtrl_01 = class("LoginRewardPopUpCtrl_01", BaseCtrl) +local ClientManager = CS.ClientManager.Instance +LoginRewardPopUpCtrl_01._mapNodeConfig = { + goActTime = {}, + txtActivityTime = {sComponentName = "TMP_Text"}, + btnActivity = { + sComponentName = "Button", + callback = "OnBtnClick_Activity" + }, + txtTips = { + sComponentName = "TMP_Text", + sLanguageId = "LoginReward_PopUp_Tip" + }, + goRewardItem = { + nCount = 7, + sCtrlName = "Game.UI.Activity.LoginReward.LoginRewardItemCtrl_01" + }, + imgActor = {nCount = 2, sComponentName = "Image"} +} +LoginRewardPopUpCtrl_01._mapEventConfig = {} +LoginRewardPopUpCtrl_01._mapRedDotConfig = {} +function LoginRewardPopUpCtrl_01:RefreshRemainTime() + local endTime = self.actData:GetActEndTime() + local curTime = ClientManager.serverTimeStamp + local remainTime = endTime - curTime + if remainTime < 0 then + self._mapNode.goActTime.gameObject:SetActive(false) + return + end + local sTimeStr = "" + if remainTime <= 60 then + local sec = math.floor(remainTime) + sTimeStr = orderedFormat(ConfigTable.GetUIText("Activity_Remain_Time_Sec") or "", sec) + elseif 60 < remainTime and remainTime <= 3600 then + local min = math.floor(remainTime / 60) + local sec = math.floor(remainTime - min * 60) + if sec == 0 then + min = min - 1 + sec = 60 + end + sTimeStr = orderedFormat(ConfigTable.GetUIText("Activity_Remain_Time_Min") or "", min, sec) + elseif 3600 < remainTime and remainTime <= 86400 then + local hour = math.floor(remainTime / 3600) + local min = math.floor((remainTime - hour * 3600) / 60) + if min == 0 then + hour = hour - 1 + min = 60 + end + sTimeStr = orderedFormat(ConfigTable.GetUIText("Activity_Remain_Time_Hour") or "", hour, min) + elseif 86400 < remainTime then + local day = math.floor(remainTime / 86400) + local hour = math.floor((remainTime - day * 86400) / 3600) + if hour == 0 then + day = day - 1 + hour = 24 + end + sTimeStr = orderedFormat(ConfigTable.GetUIText("Activity_Remain_Time_Day") or "", day, hour) + end + NovaAPI.SetTMPText(self._mapNode.txtActivityTime, sTimeStr) +end +function LoginRewardPopUpCtrl_01:RefreshActData() + self.nActId = self._panel.nActId + self.actData = self._panel.actData + self.remainTimer = nil + self:RefreshRewardList() + local actCfg = self.actData:GetActCfgData() + if actCfg.EndType == GameEnum.activityEndType.NoLimit then + self._mapNode.goActTime.gameObject:SetActive(false) + else + self._mapNode.goActTime.gameObject:SetActive(true) + self:RefreshRemainTime() + end +end +function LoginRewardPopUpCtrl_01:RefreshRewardList() + local tbRewardList = self.actData:GetActLoginRewardList() + if nil ~= tbRewardList then + for k, v in ipairs(self._mapNode.goRewardItem) do + local mapReward = tbRewardList[k] + v.gameObject:SetActive(mapReward ~= nil) + if mapReward ~= nil then + v:SetRewardItem(k, mapReward) + end + end + end +end +function LoginRewardPopUpCtrl_01:PlayOutAnim() + local nAnimLength = 0 + if self.animRoot ~= nil then + nAnimLength = NovaAPI.GetAnimClipLength(self.animRoot, { + "LoginReward_01_out" + }) + self.animRoot:Play("LoginReward_01_out") + EventManager.Hit(EventId.TemporaryBlockInput, nAnimLength) + end + return nAnimLength +end +function LoginRewardPopUpCtrl_01:Awake() + self.animRoot = self.gameObject:GetComponent("Animator") +end +function LoginRewardPopUpCtrl_01:OnEnable() + if self.animRoot ~= nil then + local nAnimLength = NovaAPI.GetAnimClipLength(self.animRoot, { + "LoginReward_01_in" + }) + self.animRoot:Play("LoginReward_01_in") + EventManager.Hit(EventId.TemporaryBlockInput, nAnimLength) + end +end +function LoginRewardPopUpCtrl_01:OnDisable() +end +function LoginRewardPopUpCtrl_01:OnDestroy() +end +function LoginRewardPopUpCtrl_01:OnBtnClick_Activity() + local bOpen = self.actData:CheckActivityOpen() + if not bOpen then + local callback = function() + EventManager.Hit("RefreshLoginRewardPanel") + end + EventManager.Hit(EventId.OpenMessageBox, { + nType = AllEnum.MessageBox.Alert, + sContent = ConfigTable.GetUIText("Activity_PopUp_Time_Out"), + callbackConfirm = callback + }) + return + end + local canReceive = self.actData:CheckCanReceive() + if not canReceive then + EventManager.Hit("RefreshLoginRewardPanel") + return + end + local tbRewardList = self.actData:GetActLoginRewardList() + local nReceive = self.actData:GetCanReceive() + local mapNpc = { + nNpcId = tbRewardList[nReceive].NpcId, + nVoiceId = tbRewardList[nReceive].VoiceId + } + local callback = function() + EventManager.Hit("RefreshLoginRewardPanel") + end + PlayerData.Activity:SendReceiveLoginRewardMsg(self.nActId, callback) +end +return LoginRewardPopUpCtrl_01 diff --git a/lua/game/ui/avg/_cn/config/stm10001_02.lua b/lua/game/ui/avg/_cn/config/stm10001_02.lua index 23b18110f..dcd3313b0 100644 --- a/lua/game/ui/avg/_cn/config/stm10001_02.lua +++ b/lua/game/ui/avg/_cn/config/stm10001_02.lua @@ -14964,7 +14964,7 @@ return { param = { 3, "avg3_182", - "（我在星塔里拼命地跑，就在我马上就要跑不动时候，我看到了一个华贵的棺材。）", + "（我在高塔里拼命地跑，就在我马上就要跑不动时候，我看到了一个华贵的棺材。）", 0, "", false, @@ -15421,7 +15421,7 @@ return { param = { 0, "avg3_182", - "（说起来，你到底是什么人？这个棺材又是怎么一回事？为什么会出现在那座星塔的顶层，我住在那里三年，从来没见到有人上去过。）", + "（说起来，你到底是什么人？这个棺材又是怎么一回事？为什么会出现在那座高塔的顶层，我住在那里三年，从来没见到有人上去过。）", 0, "", false, @@ -15510,7 +15510,7 @@ return { param = { 1, "avg3_100", - "（我不是见习司祭，我的家乡在很远很远的地方。至于我为什么会和那个“棺材”一起出现在星塔里，我也说不清。）", + "（我不是见习司祭，我的家乡在很远很远的地方。至于我为什么会和那个“棺材”一起出现在塔里，我也说不清。）", 0, "", false, diff --git a/lua/game/ui/avg/_cn/config/stm10001_03.lua b/lua/game/ui/avg/_cn/config/stm10001_03.lua index 36c8d9c74..b6c1db2bb 100644 --- a/lua/game/ui/avg/_cn/config/stm10001_03.lua +++ b/lua/game/ui/avg/_cn/config/stm10001_03.lua @@ -976,7 +976,7 @@ return { cmd = "CtrlChar", param = { "avg2_978", - "a", + "b", nil, "none", nil, @@ -2237,7 +2237,7 @@ return { 0, "none", "avg2_978", - "a", + "b", "002", "none", nil, @@ -2252,31 +2252,6 @@ return { nil } }, - { - cmd = "CtrlChar", - param = { - "avg2_978", - "b", - "018", - "none", - nil, - 0.55, - nil, - nil, - nil, - nil, - nil, - "none", - "none", - "Linear", - 0, - nil, - false, - 0.0, - true, - nil - } - }, { cmd = "CtrlStage", param = { @@ -2312,6 +2287,31 @@ return { cmd = "Wait", param = {0.3} }, + { + cmd = "CtrlChar", + param = { + "avg2_978", + "b", + "018", + "none", + nil, + 0.55, + nil, + nil, + nil, + nil, + nil, + "none", + "none", + "Linear", + 0, + nil, + false, + 0.0, + true, + nil + } + }, { cmd = "SetTrans", param = { diff --git a/lua/game/ui/avg/_cn/preset/avgcharacter.lua b/lua/game/ui/avg/_cn/preset/avgcharacter.lua index 685e59210..16cd45058 100644 --- a/lua/game/ui/avg/_cn/preset/avgcharacter.lua +++ b/lua/game/ui/avg/_cn/preset/avgcharacter.lua @@ -1328,6 +1328,12 @@ return { name_bg_color = "#0ABEC5", ver = "2.2.0" }, + { + id = "avg3_240", + name = "***", + name_bg_color = "#0ABEC5", + ver = "2.3.0" + }, { id = "avg3_873", name = "克莱儿", @@ -3260,6 +3266,47 @@ return { reuse = "avg3_101", ver = "2.0.0" }, + { + id = "avg3_1343", + name = "黑块A", + name_bg_color = "#0ABEC5", + reuse = "avg4_107" + }, + { + id = "avg3_1344", + name = "***", + name_bg_color = "#0ABEC5", + reuse = "avg3_136", + ver = "2.1.0" + }, + { + id = "avg3_1345", + name = "***", + name_bg_color = "#0ABEC5", + reuse = "avg3_137", + ver = "2.1.0" + }, + { + id = "avg3_1346", + name = "科佩里乌斯A", + name_bg_color = "#0ABEC5", + reuse = "avg2_942", + ver = "2.0.0" + }, + { + id = "avg3_1347", + name = "科佩里乌斯B", + name_bg_color = "#0ABEC5", + reuse = "avg2_942", + ver = "2.0.0" + }, + { + id = "avg3_1348", + name = "科佩里乌斯C", + name_bg_color = "#0ABEC5", + reuse = "avg2_942", + ver = "2.0.0" + }, { id = "avg4_100", name = "菈露发光", @@ -3298,6 +3345,11 @@ return { name_bg_color = "#0ABEC5", ver = "2.0.0" }, + { + id = "avg4_107", + name = "黑块", + name_bg_color = "#0ABEC5" + }, { id = "avg4_999", name = "维塔", diff --git a/lua/game/ui/avg/_en/config/cg_157_03.lua b/lua/game/ui/avg/_en/config/cg_157_03.lua index 4d1e88f6e..776ab3d3b 100644 --- a/lua/game/ui/avg/_en/config/cg_157_03.lua +++ b/lua/game/ui/avg/_en/config/cg_157_03.lua @@ -1262,7 +1262,7 @@ return { "", false, "", - "One Tawny Nightingale ... and one salted salmon, please.", + "One Tawny Nightingale ... and one red-striped fish, please.", "" } }, diff --git a/lua/game/ui/avg/_en/config/stm10001_03.lua b/lua/game/ui/avg/_en/config/stm10001_03.lua index fe2fc3e07..181424a6f 100644 --- a/lua/game/ui/avg/_en/config/stm10001_03.lua +++ b/lua/game/ui/avg/_en/config/stm10001_03.lua @@ -976,7 +976,7 @@ return { cmd = "CtrlChar", param = { "avg2_978", - "a", + "b", nil, "none", nil, @@ -2237,7 +2237,7 @@ return { 0, "none", "avg2_978", - "a", + "b", "002", "none", nil, @@ -2252,31 +2252,6 @@ return { nil } }, - { - cmd = "CtrlChar", - param = { - "avg2_978", - "b", - "018", - "none", - nil, - 0.55, - nil, - nil, - nil, - nil, - nil, - "none", - "none", - "Linear", - 0, - nil, - false, - 0.0, - true, - nil - } - }, { cmd = "CtrlStage", param = { @@ -2312,6 +2287,31 @@ return { cmd = "Wait", param = {0.3} }, + { + cmd = "CtrlChar", + param = { + "avg2_978", + "b", + "018", + "none", + nil, + 0.55, + nil, + nil, + nil, + nil, + nil, + "none", + "none", + "Linear", + 0, + nil, + false, + 0.0, + true, + nil + } + }, { cmd = "SetTrans", param = { diff --git a/lua/game/ui/avg/_jp/config/stm10001_03.lua b/lua/game/ui/avg/_jp/config/stm10001_03.lua index 113983726..1f4ba9d12 100644 --- a/lua/game/ui/avg/_jp/config/stm10001_03.lua +++ b/lua/game/ui/avg/_jp/config/stm10001_03.lua @@ -976,7 +976,7 @@ return { cmd = "CtrlChar", param = { "avg2_978", - "a", + "b", nil, "none", nil, @@ -2237,7 +2237,7 @@ return { 0, "none", "avg2_978", - "a", + "b", "002", "none", nil, @@ -2252,31 +2252,6 @@ return { nil } }, - { - cmd = "CtrlChar", - param = { - "avg2_978", - "b", - "018", - "none", - nil, - 0.55, - nil, - nil, - nil, - nil, - nil, - "none", - "none", - "Linear", - 0, - nil, - false, - 0.0, - true, - nil - } - }, { cmd = "CtrlStage", param = { @@ -2312,6 +2287,31 @@ return { cmd = "Wait", param = {0.3} }, + { + cmd = "CtrlChar", + param = { + "avg2_978", + "b", + "018", + "none", + nil, + 0.55, + nil, + nil, + nil, + nil, + nil, + "none", + "none", + "Linear", + 0, + nil, + false, + 0.0, + true, + nil + } + }, { cmd = "SetTrans", param = { diff --git a/lua/game/ui/avg/_kr/config/cg_157_03.lua b/lua/game/ui/avg/_kr/config/cg_157_03.lua index 3e66583c6..6edfcab86 100644 --- a/lua/game/ui/avg/_kr/config/cg_157_03.lua +++ b/lua/game/ui/avg/_kr/config/cg_157_03.lua @@ -1262,7 +1262,7 @@ return { "", false, "", - "나이팅게일 빵 하나랑…… 절인 연어 한 접시 부탁해.", + "나이팅게일 빵 하나랑…… 절인 생선 한 접시 부탁해.", "" } }, @@ -4738,7 +4738,7 @@ return { param = { 11, "avg1_157", - "그건…… 그…… ==W==맞다, 예요. ==W==네 덕분에 무사히 ==W==언니 생일 선물을 ==W==줄 수 있었고…… ==W==렌즈도 ==W==보충할 수 있었으니까……", + "그건…… ==W==그…… ==W==맞다, 예요. ==W==네 덕분에 무사히 ==W==언니 생일 선물을 ==W==줄 수 있었고…… ==W==렌즈도 ==W==보충할 수 있었으니까……", 0, "", false, @@ -4829,7 +4829,7 @@ return { param = { 11, "avg1_157", - "뭣……?! ==W==너, ==W==알면서 일부러 그랬냐예요?!==W====W==", + "뭣……?! ==W==너, ==W==알면서 일부러 그랬냐예요?!==W====W====W==", 0, "", false, diff --git a/lua/game/ui/avg/_kr/config/stm10001_03.lua b/lua/game/ui/avg/_kr/config/stm10001_03.lua index fd75c92dc..dd8e1cad8 100644 --- a/lua/game/ui/avg/_kr/config/stm10001_03.lua +++ b/lua/game/ui/avg/_kr/config/stm10001_03.lua @@ -976,7 +976,7 @@ return { cmd = "CtrlChar", param = { "avg2_978", - "a", + "b", nil, "none", nil, @@ -2237,7 +2237,7 @@ return { 0, "none", "avg2_978", - "a", + "b", "002", "none", nil, @@ -2252,31 +2252,6 @@ return { nil } }, - { - cmd = "CtrlChar", - param = { - "avg2_978", - "b", - "018", - "none", - nil, - 0.55, - nil, - nil, - nil, - nil, - nil, - "none", - "none", - "Linear", - 0, - nil, - false, - 0.0, - true, - nil - } - }, { cmd = "CtrlStage", param = { @@ -2312,6 +2287,31 @@ return { cmd = "Wait", param = {0.3} }, + { + cmd = "CtrlChar", + param = { + "avg2_978", + "b", + "018", + "none", + nil, + 0.55, + nil, + nil, + nil, + nil, + nil, + "none", + "none", + "Linear", + 0, + nil, + false, + 0.0, + true, + nil + } + }, { cmd = "SetTrans", param = { diff --git a/lua/game/ui/avg/avgpreset.lua b/lua/game/ui/avg/avgpreset.lua index 49c200792..7423e1de8 100644 --- a/lua/game/ui/avg/avgpreset.lua +++ b/lua/game/ui/avg/avgpreset.lua @@ -83,10 +83,14 @@ local AvgPreset = { "flatlands_floralsea_daylight", "flatlands_floralsea_night", "flatlands_night", + "flavio_backstage", "flavio_city_livehouse_a", "flavio_city_livehouse_b", "flavio_city_street", "flavio_city_street_2", + "flavio_fantasystage", + "flavio_fantasystage_auditorium", + "flavio_fantasystage_auditorium_nobody", "forest", "forest_burn", "forest_camp_rain", @@ -197,6 +201,7 @@ local AvgPreset = { "theater_inside_a", "theater_inside_b", "tower_common", + "tower_common_xmas", "tower_elevator_close", "tower_elevator_danger", "tower_elevator_event", @@ -283,6 +288,7 @@ local AvgPreset = { "view_secret_laboratory_b", "view_skeleton_a", "view_skeleton_b", + "view_turtle", "view_wasteland_night", "view_whale_1", "view_whale_2", @@ -382,6 +388,16 @@ local AvgPreset = { "story_event_14_002_a_MP", "story_event_14_002_FP", "story_event_14_002_MP", + "story_event_15_001_01", + "story_event_15_001_02", + "story_event_15_002", + "story_event_15_003", + "story_event_15_003_a", + "story_event_15_004", + "story_event_15_005", + "story_event_15_006", + "story_event_15_007", + "story_event_15_008", "story_main_00_001", "story_main_00_002", "story_main_00_003_FP", @@ -687,6 +703,15 @@ local AvgPreset = { "story_main_10001_010", "story_main_10001_010_a", "story_main_10001_011", + "story_main_10_001_FP", + "story_main_10_001_MP", + "story_main_10_002_a_FP", + "story_main_10_002_a_MP", + "story_main_10_002_FP", + "story_main_10_002_MP", + "story_main_10_003", + "story_main_10_004", + "story_main_10_005", "story_main_be_01_001_FP", "story_main_be_01_001_MP", "story_main_be_01_002", @@ -789,7 +814,19 @@ local AvgPreset = { "4057_B", "4059_B", "4061_B", - "4066_B" + "4066_B", + "4068_B", + "4070_B", + "4072_B", + "4074_B", + "4076_B", + "4078_B", + "4080_B", + "4082_B", + "4084_B", + "4086_B", + "4088_B", + "4090_B" }, BgEffectResName = { "0", @@ -2402,6 +2439,66 @@ local AvgPreset = { }, true } + }, + { + "yunxuan", + { + { + { + 10.0, + 5.0, + 0 + }, + { + 4, + 2.0, + 0 + }, + { + 2.0, + 2.0, + 0 + }, + { + 1, + 1, + 1 + }, + { + 1, + 1, + 1 + } + }, + { + { + 0, + 0, + 1 + }, + { + 0, + 0, + 4 + }, + { + 0, + 0, + 2 + }, + { + 1, + 1, + 1 + }, + { + 1, + 1, + 1 + } + }, + true + } } }, EaseType = { @@ -5597,6 +5694,126 @@ local AvgPreset = { }, false } + }, + { + "yunxuan", + { + { + { + 0, + 0.0, + 0 + }, + { + 4, + 2.0, + 0 + }, + { + 2.0, + 2.0, + 0 + }, + { + 1, + 1, + 1 + }, + { + 1, + 1, + 1 + } + }, + { + { + 0, + 0, + 0.5 + }, + { + 0, + 0, + 4 + }, + { + 0, + 0, + 2 + }, + { + 1, + 1, + 1 + }, + { + 1, + 1, + 1 + } + }, + true + } + }, + { + "yunxuan2", + { + { + { + 5, + 0.0, + 0 + }, + { + 4, + 2.0, + 0 + }, + { + 2.0, + 2.0, + 0 + }, + { + 1, + 1, + 1 + }, + { + 1, + 1, + 1 + } + }, + { + { + 0, + 0, + -1 + }, + { + 0, + 0, + 4 + }, + { + 0, + 0, + 2 + }, + { + 1, + 1, + 1 + }, + { + 1, + 1, + 1 + } + }, + true + } } }, CharEnter = { @@ -6433,6 +6650,70 @@ local AvgPreset = { "fx_avg_story_019", "" }, + { + "fx_avg_magic_cure", + "" + }, + { + "fx_avg_glowworm", + "" + }, + { + "fx_avg_vine_loop", + "" + }, + { + "fx_avg_vine_full_loop", + "" + }, + { + "fx_avg_pollen_2", + "" + }, + { + "fx_fog_3_lp", + "" + }, + { + "fx_avg_petal_transfer", + "" + }, + { + "fx_avg_powder_lp", + "" + }, + { + "fx_avg_powder_blow", + "" + }, + { + "fx_avg_petal", + "" + }, + { + "fx_avg_claw", + "" + }, + { + "fx_avg_cluster_flame_loop", + "" + }, + { + "fx_avg_miss", + "" + }, + { + "fx_avg_tiger_impact", + "" + }, + { + "fx_avg_tiger_claw_strike", + "" + }, + { + "fx_avg_fire_magic_blue", + "" + }, { "--分割线，以下特效含后期效果--", "" diff --git a/lua/game/ui/mainlineex/storychapterctrl.lua b/lua/game/ui/mainlineex/storychapterctrl.lua index f5c505d20..636cae2fc 100644 --- a/lua/game/ui/mainlineex/storychapterctrl.lua +++ b/lua/game/ui/mainlineex/storychapterctrl.lua @@ -26,6 +26,10 @@ StoryChapterCtrl._mapNodeConfig = { txtTitle2_Show = {sComponentName = "TMP_Text"}, imgStoryIcon = {sComponentName = "Image"}, TabRedDot = {}, + rtBtnShowStoryLineList = { + sNodeName = "btnShowStoryLineList", + sComponentName = "RectTransform" + }, btnShowStoryLineList = { sComponentName = "UIButton", callback = "OnBtn_ShowStoryLineList" @@ -543,8 +547,10 @@ function StoryChapterCtrl:PlayRootAnim(bIn) self._mapNode.animBtnShowStoryLineList:Play(sAnimName) end function StoryChapterCtrl:SetBtn_IconTitle(nLineId, bForceVisible) + local v2On = Vector2(55, 332) + local v2Off = Vector2(9999, 9999) if bForceVisible == true then - self._mapNode.btnShowStoryLineList.transform.localScale = Vector3.one + self._mapNode.rtBtnShowStoryLineList.anchoredPosition = v2On else local b = false if #self.tbLine > 1 then @@ -553,7 +559,7 @@ function StoryChapterCtrl:SetBtn_IconTitle(nLineId, bForceVisible) b = false end end - self._mapNode.btnShowStoryLineList.transform.localScale = b == true and Vector3.one or Vector3.zero + self._mapNode.rtBtnShowStoryLineList.anchoredPosition = b == true and v2On or v2Off end local cfg = ConfigTable.GetData("StoryLine", nLineId) local sRemovedMain = string.gsub(cfg.TitleMain, "\n", "") diff --git a/lua/game/ui/mainlineex_dustdawnstory/mainlineex_dustdawnstoryctrl.lua b/lua/game/ui/mainlineex_dustdawnstory/mainlineex_dustdawnstoryctrl.lua index 0655e48fe..fec9c9539 100644 --- a/lua/game/ui/mainlineex_dustdawnstory/mainlineex_dustdawnstoryctrl.lua +++ b/lua/game/ui/mainlineex_dustdawnstory/mainlineex_dustdawnstoryctrl.lua @@ -540,6 +540,20 @@ function MainlineEx_DustDawnStoryCtrl:OnBtn_ClickHome() end function MainlineEx_DustDawnStoryCtrl:SetGridCanvasVisible(bVisible) self.bAvgRootOpen = not bVisible + local canvasUnderBar = self._mapNode.grpUnderBar + if canvasUnderBar ~= nil and not canvasUnderBar:IsNull() then + if bVisible then + canvasUnderBar.enabled = true + else + local wait = function() + coroutine.yield(CS.UnityEngine.WaitForEndOfFrame()) + if self.bAvgRootOpen and not canvasUnderBar:IsNull() then + canvasUnderBar.enabled = false + end + end + cs_coroutine.start(wait) + end + end if self.tbGridCanvas == nil then return end diff --git a/lua/game/ui/mainviewex/mainviewctrl.lua b/lua/game/ui/mainviewex/mainviewctrl.lua index cf2171adc..781a3e8e6 100644 --- a/lua/game/ui/mainviewex/mainviewctrl.lua +++ b/lua/game/ui/mainviewex/mainviewctrl.lua @@ -1291,6 +1291,8 @@ function MainViewCtrl:RefreshLeftActivityList() self:SetPngSprite(imgOpenBg, actGroupCfg.EnterRes) self:SetPngSprite(imgOpenBgMask, actGroupCfg.EnterRes) if bOpened then + OpenRoot:Find("imgActivityTime/imgTime").gameObject:SetActive(true) + OpenRoot:Find("imgActivityTime/goEmptyForLayout").gameObject:SetActive(false) local txtActRemainTime = OpenRoot:Find("imgActivityTime/txtActivityTime"):GetComponent("TMP_Text") if bShowCountDown then do @@ -1349,6 +1351,29 @@ function MainViewCtrl:RefreshLeftActivityList() end end end + self.actAdv = PlayerData.Activity:GetMainviewShowActivityAdv() + if self.actAdv ~= nil then + local nIdx = #self.tbActivityPrepareShowList + 1 + local btnTrans = self._mapNode.btnActivityPrepare[nIdx] + if btnTrans ~= nil then + btnTrans.gameObject:SetActive(true) + local tr = btnTrans.transform:Find("AnimRoot") + tr:Find("End").gameObject:SetActive(false) + tr:Find("Open").gameObject:SetActive(true) + local imgBg = tr:Find("Open/imgBg"):GetComponent("Image") + imgBg.gameObject:SetActive(true) + local sIcon = string.gsub(self.actAdv.actCfg.TabBgRes, "tab", "banner") + local sIcon = string.gsub(sIcon, "lang", "m_lang") + self:SetPngSprite(imgBg, sIcon) + tr:Find("Open/imgBgMask").gameObject:SetActive(false) + tr:Find("Open/imgActivityTime").gameObject:SetActive(true) + tr:Find("Open/imgActivityTime/imgTime").gameObject:SetActive(false) + tr:Find("Open/imgActivityTime/goEmptyForLayout").gameObject:SetActive(true) + local tmpTxt = tr:Find("Open/imgActivityTime/txtActivityTime"):GetComponent("TMP_Text") + tmpTxt.gameObject:SetActive(true) + NovaAPI.SetTMPText(tmpTxt, ConfigTable.GetUIText("MainView_MainStoryPreview")) + end + end end function MainViewCtrl:RefreshActivityFastEntrance() for k, v in ipairs(self._mapNode.btnActivityFast) do @@ -1691,6 +1716,10 @@ end function MainViewCtrl:OnBtnClick_ActivityPrepare(btn, index) local actGroupData = self.tbActivityPrepareShowList[index] if actGroupData == nil then + if self.actAdv ~= nil then + local jumpToId = self.actAdv.adCfg.JumpTo[1] + JumpUtil.JumpTo(jumpToId) + end return end actGroupData = actGroupData.actGroupData @@ -2166,9 +2195,6 @@ function MainViewCtrl:OnBtnClick_GoToStarTower() end PlayerData.StarTower:GetAffinity(AffinityCallback) end -function MainViewCtrl:OnBtnClick_GotoMainlineStory() - EventManager.Hit(EventId.OpenPanel, PanelId.MainlineEx, self.nRecentChapterId, PanelId.MainView) -end function MainViewCtrl:OnDragStart_Actor(mDrag) if mDrag.DragEventType == AllEnum.UIDragType.DragStart then self.nDragStartPosX = mDrag.EventData.position.x diff --git a/lua/gamecore/data/dataclass/activity/playeractivitydata.lua b/lua/gamecore/data/dataclass/activity/playeractivitydata.lua index d6ca8cf57..9960c0cd6 100644 --- a/lua/gamecore/data/dataclass/activity/playeractivitydata.lua +++ b/lua/gamecore/data/dataclass/activity/playeractivitydata.lua @@ -144,7 +144,6 @@ function PlayerActivityData:CacheAllActivityData(mapNetMsg) elseif actCfg.ActivityType == GameEnum.activityType.Shop then self:RefreshActivityShopData(nActId, v.Shop) elseif actCfg.ActivityType == GameEnum.activityType.Advertise then - self:RefreshInfinityTowerActData(nActId, v.Shop) elseif actCfg.ActivityType == GameEnum.activityType.BDConvert then self:RefreshBdConvertData(nActId, v.BdConvert) elseif actCfg.ActivityType == GameEnum.activityType.Breakout then @@ -562,6 +561,31 @@ function PlayerActivityData:GetMainviewShowActivityGroup() end) return tbShowList end +function PlayerActivityData:GetMainviewShowActivityAdv() + local actAdv + local tbShowList_Adv = {} + local curTime = CS.ClientManager.Instance.serverTimeStamp + for _, actData in pairs(self.tbAllActivity) do + if actData.actCfg.SpecialParam == "ShowInMainUI" then + local openTime = actData:GetActOpenTime() + local endTime = actData:GetActEndTime() + if curTime > openTime and curTime < endTime and actData.bPlay == true then + table.insert(tbShowList_Adv, actData) + end + end + end + if 0 < #tbShowList_Adv then + table.sort(tbShowList_Adv, function(a, b) + if a:GetActSortId() == b:GetActSortId() then + return a:GetActId() > b:GetActId() + else + return a:GetActSortId() < b:GetActSortId() + end + end) + actAdv = tbShowList_Adv[1] + end + return actAdv +end function PlayerActivityData:IsActivityInActivityGroup(nActId) local isInGroup, getActId for _, actGroupData in pairs(self.tbAllActivityGroup) do diff --git a/lua/gamecore/data/dataclass/avgdata.lua b/lua/gamecore/data/dataclass/avgdata.lua index ecfb4b07e..42a787ab5 100644 --- a/lua/gamecore/data/dataclass/avgdata.lua +++ b/lua/gamecore/data/dataclass/avgdata.lua @@ -1301,7 +1301,8 @@ function AvgData:CheckNewStory(nChapterId) for k, v in ipairs(map) do local config = ConfigTable.GetData("Story", v) local bUnlock = self:IsUnlock(config.ConditionId, config.StoryId) - if bUnlock then + local bUnlockByTime = self:CheckStoryUnlockTime(config.StoryId) + if bUnlock == true and bUnlockByTime == true then local bReaded = self:IsStoryReaded(v) if not bReaded then tbNewUnlockStorys[v] = true @@ -1313,6 +1314,16 @@ function AvgData:CheckNewStory(nChapterId) end return tbNewUnlockStorys end +function AvgData:CheckStoryUnlockTime(sStoryId) + local s = ConfigTable.GetConfigValue("TimeUnlockStory") + if s == sStoryId then + local curTime = CS.ClientManager.Instance.serverTimeStamp + local time = ConfigTable.GetConfigValue("StoryUnlockTime") + local openTime = CS.ClientManager.Instance:ISO8601StrToTimeStamp(time) + return curTime > openTime + end + return true +end function AvgData:SetNewLockChapterIndex(chapterIndex) self.nNewLockChapterIndex = chapterIndex end diff --git a/versions.txt b/versions.txt index 81a715208..d9d8a9161 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ -EN: 2.0.1.145 -CN: 2.0.1.144 -JP: 2.0.1.147 -KR: 2.0.1.152 +EN: 2.0.2.146 +CN: 2.0.2.146 +JP: 2.0.2.148 +KR: 2.0.2.153