diff --git a/lua/app/config/act_fourteen_quest.lua b/lua/app/config/act_fourteen_quest.lua index 0c60456e..bbbf6fe1 100644 --- a/lua/app/config/act_fourteen_quest.lua +++ b/lua/app/config/act_fourteen_quest.lua @@ -5,14 +5,6 @@ local act_fourteen_quest = { ["none"]="深渊挑战4", ["num"]=4, ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", @@ -30,14 +22,6 @@ local act_fourteen_quest = { ["none"]="角色升到20级", ["num"]=20, ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", @@ -55,14 +39,6 @@ local act_fourteen_quest = { ["none"]="竞技场达到青铜II", ["num"]=1000, ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", @@ -80,14 +56,6 @@ local act_fourteen_quest = { ["none"]="广告次数累计达8", ["num"]=8, ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", @@ -108,8 +76,8 @@ local act_fourteen_quest = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=4000, - ["num_for_nothing"]="UghcAw==" + ["num"]=8000, + ["num_for_nothing"]="XghcAw==" }, { ["type"]=1, @@ -124,8 +92,8 @@ local act_fourteen_quest = { ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=50, - ["num_for_nothing"]="Uwg=" + ["num"]=100, + ["num_for_nothing"]="Vwhc" } }, ["icon"]=11 @@ -136,14 +104,6 @@ local act_fourteen_quest = { ["none"]="武器升级15次", ["num"]=15, ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", @@ -161,14 +121,6 @@ local act_fourteen_quest = { ["none"]="时空裂隙1-6", ["num"]=6, ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", @@ -186,14 +138,6 @@ local act_fourteen_quest = { ["none"]="开启主线宝箱3个", ["num"]=3, ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", @@ -211,14 +155,6 @@ local act_fourteen_quest = { ["none"]="矿车拦截5", ["num"]=5, ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", @@ -239,8 +175,8 @@ local act_fourteen_quest = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=4000, - ["num_for_nothing"]="UghcAw==" + ["num"]=8000, + ["num_for_nothing"]="XghcAw==" }, { ["type"]=1, @@ -267,14 +203,6 @@ local act_fourteen_quest = { ["none"]="灯神之塔4", ["num"]=4, ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", @@ -292,14 +220,6 @@ local act_fourteen_quest = { ["none"]="角色升到24级", ["num"]=24, ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", @@ -317,14 +237,6 @@ local act_fourteen_quest = { ["none"]="深渊挑战5", ["num"]=5, ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", @@ -342,14 +254,6 @@ local act_fourteen_quest = { ["none"]="广告次数累计达24", ["num"]=24, ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", @@ -370,8 +274,8 @@ local act_fourteen_quest = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=4000, - ["num_for_nothing"]="UghcAw==" + ["num"]=8000, + ["num_for_nothing"]="XghcAw==" }, { ["type"]=1, @@ -386,8 +290,8 @@ local act_fourteen_quest = { ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=50, - ["num_for_nothing"]="Uwg=" + ["num"]=100, + ["num_for_nothing"]="Vwhc" } }, ["icon"]=11 @@ -398,14 +302,6 @@ local act_fourteen_quest = { ["none"]="每日挑战胜利5次", ["num"]=5, ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", @@ -423,14 +319,6 @@ local act_fourteen_quest = { ["none"]="矿车拦截6", ["num"]=6, ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", @@ -448,14 +336,6 @@ local act_fourteen_quest = { ["none"]="时空裂隙2-6", ["num"]=12, ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", @@ -473,14 +353,6 @@ local act_fourteen_quest = { ["none"]="开启商城宝箱5次", ["num"]=5, ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", @@ -501,8 +373,8 @@ local act_fourteen_quest = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=4000, - ["num_for_nothing"]="UghcAw==" + ["num"]=8000, + ["num_for_nothing"]="XghcAw==" }, { ["type"]=1, @@ -529,14 +401,6 @@ local act_fourteen_quest = { ["none"]="广告次数累计达40", ["num"]=40, ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", @@ -554,14 +418,6 @@ local act_fourteen_quest = { ["none"]="通关波次400次", ["num"]=400, ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", @@ -579,14 +435,6 @@ local act_fourteen_quest = { ["none"]="灯神之塔5", ["num"]=5, ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", @@ -604,14 +452,6 @@ local act_fourteen_quest = { ["none"]="竞技场达到白银IV", ["num"]=1200, ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", @@ -632,8 +472,8 @@ local act_fourteen_quest = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=4000, - ["num_for_nothing"]="UghcAw==" + ["num"]=8000, + ["num_for_nothing"]="XghcAw==" }, { ["type"]=1, @@ -648,8 +488,8 @@ local act_fourteen_quest = { ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=50, - ["num_for_nothing"]="Uwg=" + ["num"]=100, + ["num_for_nothing"]="Vwhc" } }, ["icon"]=11 @@ -660,14 +500,6 @@ local act_fourteen_quest = { ["none"]="击杀BOSS80次", ["num"]=80, ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", @@ -685,14 +517,6 @@ local act_fourteen_quest = { ["none"]="深渊挑战7", ["num"]=7, ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", @@ -710,14 +534,6 @@ local act_fourteen_quest = { ["none"]="开启主线宝箱15个", ["num"]=15, ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", @@ -735,14 +551,6 @@ local act_fourteen_quest = { ["none"]="矿车拦截7", ["num"]=7, ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", @@ -763,8 +571,8 @@ local act_fourteen_quest = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=4000, - ["num_for_nothing"]="UghcAw==" + ["num"]=8000, + ["num_for_nothing"]="XghcAw==" }, { ["type"]=1, @@ -791,14 +599,6 @@ local act_fourteen_quest = { ["none"]="时空裂隙3-4", ["num"]=16, ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", @@ -816,14 +616,6 @@ local act_fourteen_quest = { ["none"]="每日挑战胜利10次", ["num"]=10, ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", @@ -841,14 +633,6 @@ local act_fourteen_quest = { ["none"]="开启商城宝箱10次", ["num"]=10, ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", @@ -866,14 +650,6 @@ local act_fourteen_quest = { ["none"]="广告次数累计达56", ["num"]=56, ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", @@ -894,8 +670,8 @@ local act_fourteen_quest = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=4000, - ["num_for_nothing"]="UghcAw==" + ["num"]=8000, + ["num_for_nothing"]="XghcAw==" }, { ["type"]=1, @@ -910,8 +686,8 @@ local act_fourteen_quest = { ["type_for_nothing"]="Vw==", ["id"]=2, ["id_for_nothing"]="VA==", - ["num"]=50, - ["num_for_nothing"]="Uwg=" + ["num"]=100, + ["num_for_nothing"]="Vwhc" } }, ["icon"]=11 @@ -922,14 +698,6 @@ local act_fourteen_quest = { ["none"]="防具升级40次", ["num"]=40, ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", @@ -947,14 +715,6 @@ local act_fourteen_quest = { ["none"]="灯神之塔7", ["num"]=7, ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", @@ -972,14 +732,6 @@ local act_fourteen_quest = { ["none"]="通关波次700次", ["num"]=700, ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", @@ -997,14 +749,6 @@ local act_fourteen_quest = { ["none"]="矿车拦截8", ["num"]=8, ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", @@ -1025,8 +769,8 @@ local act_fourteen_quest = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=4000, - ["num_for_nothing"]="UghcAw==" + ["num"]=8000, + ["num_for_nothing"]="XghcAw==" }, { ["type"]=1, @@ -1053,14 +797,6 @@ local act_fourteen_quest = { ["none"]="竞技场达到白银III", ["num"]=1400, ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", @@ -1078,14 +814,6 @@ local act_fourteen_quest = { ["none"]="广告次数累计达72", ["num"]=72, ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=2, - ["id_for_nothing"]="VA==", - ["num"]=10, - ["num_for_nothing"]="Vwg=" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", @@ -1103,14 +831,6 @@ local act_fourteen_quest = { ["none"]="角色升到32级", ["num"]=32, ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", @@ -1128,14 +848,6 @@ local act_fourteen_quest = { ["none"]="深渊挑战9", ["num"]=9, ["reward"]={ - { - ["type"]=1, - ["type_for_nothing"]="Vw==", - ["id"]=1, - ["id_for_nothing"]="Vw==", - ["num"]=2000, - ["num_for_nothing"]="VAhcAw==" - }, { ["type"]=1, ["type_for_nothing"]="Vw==", @@ -1156,8 +868,8 @@ local act_fourteen_quest = { ["type_for_nothing"]="Vw==", ["id"]=1, ["id_for_nothing"]="Vw==", - ["num"]=4000, - ["num_for_nothing"]="UghcAw==" + ["num"]=8000, + ["num_for_nothing"]="XghcAw==" }, { ["type"]=1, diff --git a/lua/app/config/avatar_frame.lua b/lua/app/config/avatar_frame.lua index bd633098..2e235db8 100644 --- a/lua/app/config/avatar_frame.lua +++ b/lua/app/config/avatar_frame.lua @@ -23,11 +23,13 @@ local avatar_frame = { }, [28]={ ["iconId"]="avatar_frame_6", - ["item"]=53 + ["item"]=53, + ["unlock_show"]=true }, [29]={ ["iconId"]="avatar_frame_7", - ["item"]=54 + ["item"]=54, + ["unlock_show"]=true } } local config = { diff --git a/lua/app/config/localization/localization_global_const.lua b/lua/app/config/localization/localization_global_const.lua index 6df83023..6dd168e3 100644 --- a/lua/app/config/localization/localization_global_const.lua +++ b/lua/app/config/localization/localization_global_const.lua @@ -1,6 +1,5 @@ local LocalizationGlobalConst = { - NOT_POP_TODAY = "NOT_POP_TODAY", MAIN_BTN_1 = "MAIN_BTN_1", QLT_DESC_1 = "QLT_DESC_1", QLT_DESC_2 = "QLT_DESC_2", @@ -512,6 +511,7 @@ local LocalizationGlobalConst = ACT_BOSS_RUSH_DESC_31 = "ACT_BOSS_RUSH_DESC_31", ACT_BOSS_RUSH_DESC_32 = "ACT_BOSS_RUSH_DESC_32", ACT_BOSS_RUSH_DESC_33 = "ACT_BOSS_RUSH_DESC_33", + NOT_POP_TODAY = "NOT_POP_TODAY", } return LocalizationGlobalConst \ No newline at end of file diff --git a/lua/app/config/monster_activity.lua b/lua/app/config/monster_activity.lua index 62ffcb7a..2352c7dc 100644 --- a/lua/app/config/monster_activity.lua +++ b/lua/app/config/monster_activity.lua @@ -12,7 +12,7 @@ local monster_activity = { ["skill"]={ 10020 }, - ["monster_exp"]=10000 + ["monster_exp"]=0 }, [204]={ ["monster_base"]=20002, @@ -27,7 +27,7 @@ local monster_activity = { ["skill"]={ 10019 }, - ["monster_exp"]=10000 + ["monster_exp"]=0 }, [304]={ ["monster_base"]=20004, @@ -42,7 +42,7 @@ local monster_activity = { ["skill"]={ 10015 }, - ["monster_exp"]=10000 + ["monster_exp"]=0 }, [404]={ ["monster_base"]=20006, @@ -60,7 +60,7 @@ local monster_activity = { ["passive_skill"]={ 10010 }, - ["monster_exp"]=10000 + ["monster_exp"]=0 }, [504]={ ["monster_base"]=20007, @@ -78,7 +78,7 @@ local monster_activity = { ["passive_skill"]={ 10061 }, - ["monster_exp"]=10000 + ["monster_exp"]=0 }, [604]={ ["monster_base"]=20008, @@ -96,7 +96,7 @@ local monster_activity = { ["passive_skill"]={ 10009 }, - ["monster_exp"]=10000 + ["monster_exp"]=0 }, [704]={ ["monster_base"]=20012, @@ -111,7 +111,7 @@ local monster_activity = { ["skill"]={ 10017 }, - ["monster_exp"]=10000 + ["monster_exp"]=0 }, [804]={ ["monster_base"]=20014, @@ -126,7 +126,7 @@ local monster_activity = { ["skill"]={ 10016 }, - ["monster_exp"]=10000 + ["monster_exp"]=0 }, [904]={ ["monster_base"]=20015, @@ -144,7 +144,7 @@ local monster_activity = { ["passive_skill"]={ 10008 }, - ["monster_exp"]=10000 + ["monster_exp"]=0 }, [1004]={ ["monster_base"]=20023, @@ -162,7 +162,7 @@ local monster_activity = { ["passive_skill"]={ 10013 }, - ["monster_exp"]=10000 + ["monster_exp"]=0 }, [1104]={ ["monster_base"]=20009, @@ -181,7 +181,7 @@ local monster_activity = { 10010, 10011 }, - ["monster_exp"]=10000 + ["monster_exp"]=0 }, [1204]={ ["monster_base"]=20011, @@ -196,7 +196,7 @@ local monster_activity = { ["skill"]={ 10018 }, - ["monster_exp"]=10000 + ["monster_exp"]=0 }, [1304]={ ["monster_base"]=20017, @@ -211,7 +211,7 @@ local monster_activity = { ["skill"]={ 10027 }, - ["monster_exp"]=10000 + ["monster_exp"]=0 }, [1404]={ ["monster_base"]=20019, @@ -229,7 +229,7 @@ local monster_activity = { ["passive_skill"]={ 10013 }, - ["monster_exp"]=10000 + ["monster_exp"]=0 }, [1504]={ ["monster_base"]=20022, @@ -247,7 +247,7 @@ local monster_activity = { ["passive_skill"]={ 10013 }, - ["monster_exp"]=10000 + ["monster_exp"]=0 }, [1604]={ ["monster_base"]=20026, @@ -265,7 +265,7 @@ local monster_activity = { ["passive_skill"]={ 10013 }, - ["monster_exp"]=10000 + ["monster_exp"]=0 }, [1704]={ ["monster_base"]=20028, @@ -283,7 +283,7 @@ local monster_activity = { ["passive_skill"]={ 10011 }, - ["monster_exp"]=10000 + ["monster_exp"]=0 }, [1804]={ ["monster_base"]=20029, @@ -298,7 +298,7 @@ local monster_activity = { ["skill"]={ 10065 }, - ["monster_exp"]=10000 + ["monster_exp"]=0 }, [1904]={ ["monster_base"]=20010, @@ -319,7 +319,7 @@ local monster_activity = { 10009, 10013 }, - ["monster_exp"]=10000 + ["monster_exp"]=0 }, [2004]={ ["monster_base"]=20016, @@ -338,7 +338,7 @@ local monster_activity = { 10010, 10011 }, - ["monster_exp"]=10000 + ["monster_exp"]=0 }, [2104]={ ["monster_base"]=20018, @@ -357,7 +357,7 @@ local monster_activity = { 10011, 10012 }, - ["monster_exp"]=10000 + ["monster_exp"]=0 }, [2204]={ ["monster_base"]=20021, @@ -376,7 +376,7 @@ local monster_activity = { 10011, 10008 }, - ["monster_exp"]=10000 + ["monster_exp"]=0 }, [2304]={ ["monster_base"]=20025, @@ -394,7 +394,7 @@ local monster_activity = { ["passive_skill"]={ 10013 }, - ["monster_exp"]=10000 + ["monster_exp"]=0 }, [2404]={ ["monster_base"]=20027, @@ -409,7 +409,7 @@ local monster_activity = { ["skill"]={ 10082 }, - ["monster_exp"]=10000 + ["monster_exp"]=0 }, [2504]={ ["monster_base"]=20035, @@ -429,7 +429,7 @@ local monster_activity = { 10011, 10009 }, - ["monster_exp"]=10000 + ["monster_exp"]=0 }, [2604]={ ["monster_base"]=20036, @@ -448,7 +448,7 @@ local monster_activity = { ["passive_skill"]={ 10011 }, - ["monster_exp"]=10000 + ["monster_exp"]=0 }, [2704]={ ["monster_base"]=20044, @@ -469,7 +469,7 @@ local monster_activity = { 10013, 10011 }, - ["monster_exp"]=10000 + ["monster_exp"]=0 }, [2804]={ ["monster_base"]=20003, @@ -487,7 +487,7 @@ local monster_activity = { ["passive_skill"]={ 10013 }, - ["monster_exp"]=10000 + ["monster_exp"]=0 }, [2904]={ ["monster_base"]=20005, @@ -505,7 +505,7 @@ local monster_activity = { ["passive_skill"]={ 10012 }, - ["monster_exp"]=10000 + ["monster_exp"]=0 }, [3004]={ ["monster_base"]=20020, @@ -523,7 +523,7 @@ local monster_activity = { ["passive_skill"]={ 10013 }, - ["monster_exp"]=10000 + ["monster_exp"]=0 }, [3104]={ ["monster_base"]=20030, @@ -542,7 +542,7 @@ local monster_activity = { ["passive_skill"]={ 10014 }, - ["monster_exp"]=10000 + ["monster_exp"]=0 }, [3204]={ ["monster_base"]=20034, @@ -562,7 +562,7 @@ local monster_activity = { 10013, 10012 }, - ["monster_exp"]=10000 + ["monster_exp"]=0 }, [3304]={ ["monster_base"]=20037, @@ -582,7 +582,7 @@ local monster_activity = { 10009, 10084 }, - ["monster_exp"]=10000 + ["monster_exp"]=0 }, [3404]={ ["monster_base"]=20045, @@ -601,7 +601,7 @@ local monster_activity = { ["passive_skill"]={ 10012 }, - ["monster_exp"]=10000 + ["monster_exp"]=0 }, [3504]={ ["monster_base"]=20046, @@ -620,7 +620,7 @@ local monster_activity = { ["passive_skill"]={ 10012 }, - ["monster_exp"]=10000 + ["monster_exp"]=0 }, [3604]={ ["monster_base"]=20013, @@ -637,7 +637,7 @@ local monster_activity = { 10049, 10050 }, - ["monster_exp"]=10000 + ["monster_exp"]=0 }, [3704]={ ["monster_base"]=20024, @@ -657,7 +657,7 @@ local monster_activity = { ["passive_skill"]={ 10012 }, - ["monster_exp"]=10000 + ["monster_exp"]=0 }, [3804]={ ["monster_base"]=20031, @@ -679,7 +679,7 @@ local monster_activity = { 10011, 10013 }, - ["monster_exp"]=10000 + ["monster_exp"]=0 }, [3904]={ ["monster_base"]=20032, @@ -702,7 +702,7 @@ local monster_activity = { 10010, 10013 }, - ["monster_exp"]=10000 + ["monster_exp"]=0 }, [4004]={ ["monster_base"]=20038, @@ -725,7 +725,7 @@ local monster_activity = { 10009, 10011 }, - ["monster_exp"]=10000 + ["monster_exp"]=0 }, [4104]={ ["monster_base"]=20047, @@ -746,7 +746,7 @@ local monster_activity = { 10013, 10010 }, - ["monster_exp"]=10000 + ["monster_exp"]=0 }, [4204]={ ["monster_base"]=20048, @@ -768,7 +768,7 @@ local monster_activity = { 10014, 10009 }, - ["monster_exp"]=10000 + ["monster_exp"]=0 } } local config = { diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index bebfbfb3..78be9c57 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -1714,6 +1714,14 @@ local skill = { ["round"]=1 } }, + ["pvp_effect"]={ + { + ["type"]="rebirth", + ["num"]=5000, + ["ratio"]=10000, + ["round"]=1 + } + }, ["obj"]=1 }, [1400325]={ @@ -1723,8 +1731,16 @@ local skill = { ["effect"]={ { ["type"]="rebirth", - ["num"]=10000, - ["ratio"]=15000, + ["num"]=15000, + ["ratio"]=10000, + ["round"]=2 + } + }, + ["pvp_effect"]={ + { + ["type"]="rebirth", + ["num"]=7500, + ["ratio"]=10000, ["round"]=2 } }, diff --git a/lua/app/config/strings/cn/global.lua b/lua/app/config/strings/cn/global.lua index 7ac1ebc4..a9b1775c 100644 --- a/lua/app/config/strings/cn/global.lua +++ b/lua/app/config/strings/cn/global.lua @@ -483,7 +483,7 @@ local localization_global = ["ACT_BOSS_RUSH_DESC_3"] = "今日高手", ["ACT_BOSS_RUSH_DESC_4"] = "我今日最高：", ["ACT_BOSS_RUSH_DESC_5"] = "我今日挑战：{0}次", - ["ACT_BOSS_RUSH_DESC_6"] = "今日剩余免费挑战次数：{0}", + ["ACT_BOSS_RUSH_DESC_6"] = "今日次数：{0}", ["ACT_BOSS_RUSH_DESC_7"] = "消耗:", ["ACT_BOSS_RUSH_DESC_8"] = "虚位以待", ["ACT_BOSS_RUSH_DESC_9"] = "参赛阵容", @@ -511,8 +511,7 @@ local localization_global = ["ACT_BOSS_RUSH_DESC_31"] = "1.首领出场顺序和地图每日都将进行变化。\n2.战斗开始后，您的英雄技能默认已激活，但强化技能还需要升级获得，战斗内最多提升60级。\n3.每日公开赛的排名都将结算一次，结算可获得大量【首领金币】，可用于活动商店兑换奖励。\n4.首领巡礼将根据您参与公开赛战斗的累计波次给与奖励。\n5.每日可免费挑战1次，后续挑战需要消耗钻石，请节准备好再开始挑战。", ["ACT_BOSS_RUSH_DESC_32"] = "限时礼包，倾情回馈！", ["ACT_BOSS_RUSH_DESC_33"] = "阶段{0}解锁", - - ["NOT_POP_TODAY"] = "今日不在弹出" + ["NOT_POP_TODAY"] = "今日不在弹出", } return localization_global \ No newline at end of file