diff --git a/lua/app/config/func_open.lua b/lua/app/config/func_open.lua index d90ba3d6..ddef3452 100644 --- a/lua/app/config/func_open.lua +++ b/lua/app/config/func_open.lua @@ -61,10 +61,12 @@ local func_open = { }, ["dungeon_gold_open"]={ ["stage"]=6, + ["pop_ups"]=1, ["icon"]="module_unlock_dungeongold" }, ["dungeon_shards_open"]={ ["stage"]=6, + ["pop_ups"]=1, ["icon"]="module_unlock_dungeonshards" } } diff --git a/lua/app/config/monster_base.lua b/lua/app/config/monster_base.lua index 17cb0e16..0abe7abe 100644 --- a/lua/app/config/monster_base.lua +++ b/lua/app/config/monster_base.lua @@ -319,6 +319,16 @@ local monster_base = { ["body"]=2, ["model_ui"]=1.0 }, + [10066]={ + ["model_id"]="m10066", + ["body"]=2, + ["model_ui"]=1.0 + }, + [10067]={ + ["model_id"]="m10067", + ["body"]=2, + ["model_ui"]=1.0 + }, [20001]={ ["model_id"]="m20001", ["body"]=1, @@ -636,6 +646,6 @@ local monster_base = { } } local config = { -data=monster_base,count=127 +data=monster_base,count=129 } return config \ No newline at end of file diff --git a/lua/app/config/monster_dungeon_shards.lua b/lua/app/config/monster_dungeon_shards.lua index 709814e5..0186c489 100644 --- a/lua/app/config/monster_dungeon_shards.lua +++ b/lua/app/config/monster_dungeon_shards.lua @@ -1,8 +1,8 @@ local monster_dungeon_shards = { [103]={ ["monster_base"]=30002, - ["hp"]=30000000, - ["atk"]=380000, + ["hp"]=25000000, + ["atk"]=260000, ["atk_times"]=4, ["hurt_skill"]={ 50027, @@ -16,12 +16,12 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10010 }, - ["monster_exp"]=45600 + ["monster_exp"]=57000 }, [203]={ ["monster_base"]=30001, - ["hp"]=62400000, - ["atk"]=430000, + ["hp"]=44200000, + ["atk"]=310000, ["atk_times"]=4, ["hurt_skill"]={ 50055, @@ -36,12 +36,12 @@ local monster_dungeon_shards = { 50060, 10010 }, - ["monster_exp"]=48600 + ["monster_exp"]=54000 }, [303]={ ["monster_base"]=30015, - ["hp"]=76680000, - ["atk"]=450000, + ["hp"]=63900000, + ["atk"]=350000, ["atk_times"]=4, ["hurt_skill"]={ 50113, @@ -56,12 +56,12 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10010 }, - ["monster_exp"]=75750 + ["monster_exp"]=65650 }, [403]={ ["monster_base"]=30009, - ["hp"]=95000000, - ["atk"]=550000, + ["hp"]=80750000, + ["atk"]=480000, ["atk_times"]=4, ["hurt_skill"]={ 50012, @@ -79,8 +79,8 @@ local monster_dungeon_shards = { }, [503]={ ["monster_base"]=30008, - ["hp"]=102500000, - ["atk"]=600000, + ["hp"]=90000000, + ["atk"]=550000, ["atk_times"]=4, ["hurt_skill"]={ 50098, @@ -95,12 +95,12 @@ local monster_dungeon_shards = { 10013, 10010 }, - ["monster_exp"]=69750 + ["monster_exp"]=63050 }, [603]={ ["monster_base"]=30003, ["hp"]=30000000, - ["atk"]=380000, + ["atk"]=270000, ["atk_times"]=4, ["hurt_skill"]={ 50082, @@ -114,12 +114,12 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10011 }, - ["monster_exp"]=45600 + ["monster_exp"]=57000 }, [703]={ ["monster_base"]=30002, - ["hp"]=69680000, - ["atk"]=450000, + ["hp"]=56280000, + ["atk"]=330000, ["atk_times"]=4, ["hurt_skill"]={ 50027, @@ -133,12 +133,12 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10011 }, - ["monster_exp"]=48600 + ["monster_exp"]=54000 }, [803]={ ["monster_base"]=30006, - ["hp"]=78950000, - ["atk"]=470000, + ["hp"]=73100000, + ["atk"]=370000, ["atk_times"]=4, ["hurt_skill"]={ 50061, @@ -153,12 +153,12 @@ local monster_dungeon_shards = { 50065, 10011 }, - ["monster_exp"]=75750 + ["monster_exp"]=65650 }, [903]={ ["monster_base"]=30019, - ["hp"]=109400000, - ["atk"]=640000, + ["hp"]=87520000, + ["atk"]=540000, ["atk_times"]=4, ["hurt_skill"]={ 50119, @@ -178,8 +178,8 @@ local monster_dungeon_shards = { }, [1003]={ ["monster_base"]=30011, - ["hp"]=129560000, - ["atk"]=790000, + ["hp"]=110600000, + ["atk"]=600000, ["atk_times"]=4, ["hurt_skill"]={ 50017, @@ -193,7 +193,7 @@ local monster_dungeon_shards = { ["passive_skill"]={ 10011 }, - ["monster_exp"]=69750 + ["monster_exp"]=63050 }, [1103]={ ["monster_base"]=30005, diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua index 3f12e369..034dde4b 100644 --- a/lua/app/config/skill.lua +++ b/lua/app/config/skill.lua @@ -6927,7 +6927,7 @@ local skill = { ["effect"]={ { ["type"]="heal", - ["num"]=60000, + ["num"]=100000, ["ratio"]=10000, ["round"]=1 } @@ -7707,7 +7707,7 @@ local skill = { ["effect"]={ { ["type"]="heal", - ["num"]=500, + ["num"]=10000, ["ratio"]=10000, ["round"]=1 } @@ -7722,7 +7722,7 @@ local skill = { ["effect"]={ { ["type"]="heal", - ["num"]=80000, + ["num"]=100000, ["ratio"]=10000, ["round"]=1 } @@ -8639,7 +8639,7 @@ local skill = { ["effect"]={ { ["type"]="heal", - ["num"]=60000, + ["num"]=100000, ["ratio"]=10000, ["round"]=1 } @@ -9168,7 +9168,7 @@ local skill = { ["effect"]={ { ["type"]="heal", - ["num"]=30000, + ["num"]=200000, ["ratio"]=10000, ["round"]=1 } @@ -9406,7 +9406,7 @@ local skill = { ["effect"]={ { ["type"]="heal", - ["num"]=60000, + ["num"]=200000, ["ratio"]=10000, ["round"]=1 }, @@ -9447,7 +9447,7 @@ local skill = { }, { ["type"]="heal", - ["num"]=30000, + ["num"]=100000, ["ratio"]=10000, ["round"]=1 } @@ -19709,7 +19709,7 @@ local skill = { ["effect"]={ { ["type"]="heal", - ["num"]=500, + ["num"]=10000, ["ratio"]=10000, ["round"]=1 } @@ -19724,7 +19724,7 @@ local skill = { ["effect"]={ { ["type"]="heal", - ["num"]=80000, + ["num"]=200000, ["ratio"]=10000, ["round"]=1 } diff --git a/lua/app/config/strings/cn/monster_base.lua b/lua/app/config/strings/cn/monster_base.lua index e472d165..dfab75f3 100644 --- a/lua/app/config/strings/cn/monster_base.lua +++ b/lua/app/config/strings/cn/monster_base.lua @@ -252,7 +252,7 @@ local monster_base = { ["name"]="异变精英" }, [20027]={ - ["name"]="红龟霍顿" + ["name"]="紫龟霍顿" }, [20028]={ ["name"]="冰巨人" diff --git a/lua/app/config/strings/en/global.lua b/lua/app/config/strings/en/global.lua index acd0f914..5a1a1f80 100644 --- a/lua/app/config/strings/en/global.lua +++ b/lua/app/config/strings/en/global.lua @@ -253,7 +253,7 @@ local localization_global = ["SUPPORT_DESC_1"] = "Customer Service", ["SUPPORT_DESC_2"] = "Support", ["CONF_BE_SURE_QUIT_GAME"] = "Exit Game?", - ["ROUND_LEFT"] = "Remaining:", + ["ROUND_LEFT"] = "Remaining", ["NEW_PLAYER"] = "New player", ["NOTICE_TITLE"] = "Notice", ["MAINTENANCE_NOTICE_DEFAULT"] = "Server network anomaly, please retry later", diff --git a/lua/app/config/strings/en/monster_base.lua b/lua/app/config/strings/en/monster_base.lua index abdc1269..8ec39d29 100644 --- a/lua/app/config/strings/en/monster_base.lua +++ b/lua/app/config/strings/en/monster_base.lua @@ -252,7 +252,7 @@ local monster_base = { ["name"]="Mutant Elite" }, [20027]={ - ["name"]="Horton the Red Turtle" + ["name"]="Horton the Purple Turtle" }, [20028]={ ["name"]="Ice Giant" diff --git a/lua/app/config/strings/en/task.lua b/lua/app/config/strings/en/task.lua index 8b976783..2ec59882 100644 --- a/lua/app/config/strings/en/task.lua +++ b/lua/app/config/strings/en/task.lua @@ -267,7 +267,7 @@ local task = { ["desc"]="8-Links" }, [90]={ - ["desc"]="10 Combos or more in battle" + ["desc"]="10 Hits or more in battle" }, [91]={ ["desc"]="Skills released in battle" diff --git a/lua/app/config/strings/es/global.lua b/lua/app/config/strings/es/global.lua index 10e2daef..184d4851 100644 --- a/lua/app/config/strings/es/global.lua +++ b/lua/app/config/strings/es/global.lua @@ -109,7 +109,7 @@ local localization_global = ["SUPPORT_DESC_1"] = "Atención al cliente", ["SUPPORT_DESC_2"] = "Soporte", ["CONF_BE_SURE_QUIT_GAME"] = "Quieres dejar el juego?", - ["ROUND_LEFT"] = "Queda:", + ["ROUND_LEFT"] = "Queda", ["NEW_PLAYER"] = "Nuevo jugador", ["NOTICE_TITLE"] = "Aviso", ["MAINTENANCE_NOTICE_DEFAULT"] = "Se ha producido un error al conectar con el servidor. Vuelva a intentarlo más tarde.", diff --git a/lua/app/config/strings/es/monster_base.lua b/lua/app/config/strings/es/monster_base.lua index 80fcf5e9..9426c4bd 100644 --- a/lua/app/config/strings/es/monster_base.lua +++ b/lua/app/config/strings/es/monster_base.lua @@ -252,7 +252,7 @@ local monster_base = { }, [20027]={ - ["name"]="Horton la Tortuga Roja" + ["name"]="Horton la Tortuga Púrpura" }, [20028]={ diff --git a/lua/app/config/strings/id/global.lua b/lua/app/config/strings/id/global.lua index 3938333c..4c0f3aaa 100644 --- a/lua/app/config/strings/id/global.lua +++ b/lua/app/config/strings/id/global.lua @@ -253,7 +253,7 @@ local localization_global = ["SUPPORT_DESC_1"] = "Layanan Pelanggan", ["SUPPORT_DESC_2"] = "Mendukung", ["CONF_BE_SURE_QUIT_GAME"] = "Ingin keluar dari permainan?", - ["ROUND_LEFT"] = "Sisa:", + ["ROUND_LEFT"] = "Sisa", ["NEW_PLAYER"] = "Pemain baru", ["NOTICE_TITLE"] = "Pemberitahuan", ["MAINTENANCE_NOTICE_DEFAULT"] = "Kesalahan server, silakan cooa lagi nanti.", diff --git a/lua/app/config/strings/id/monster_base.lua b/lua/app/config/strings/id/monster_base.lua index 82a5ac59..79e9acb5 100644 --- a/lua/app/config/strings/id/monster_base.lua +++ b/lua/app/config/strings/id/monster_base.lua @@ -252,7 +252,7 @@ local monster_base = { ["name"]="Mutan Elit" }, [20027]={ - ["name"]="Horton si Penyu Merah" + ["name"]="Horton si Penyu Ungu" }, [20028]={ ["name"]="Ice Giant" diff --git a/lua/app/config/strings/ja/global.lua b/lua/app/config/strings/ja/global.lua index eb7c8dcc..de7e7545 100644 --- a/lua/app/config/strings/ja/global.lua +++ b/lua/app/config/strings/ja/global.lua @@ -253,7 +253,7 @@ local localization_global = ["SUPPORT_DESC_1"] = "カスタマー・サービス", ["SUPPORT_DESC_2"] = "サポート", ["CONF_BE_SURE_QUIT_GAME"] = "イグジットゲーム?", - ["ROUND_LEFT"] = "残っている:", + ["ROUND_LEFT"] = "残っている", ["NEW_PLAYER"] = "新プレイヤー", ["NOTICE_TITLE"] = "通知", ["MAINTENANCE_NOTICE_DEFAULT"] = "サーバー通信エラー、後程もう一度お試しください", diff --git a/lua/app/config/strings/ja/monster_base.lua b/lua/app/config/strings/ja/monster_base.lua index 2b85b174..c8ed3f72 100644 --- a/lua/app/config/strings/ja/monster_base.lua +++ b/lua/app/config/strings/ja/monster_base.lua @@ -252,7 +252,7 @@ local monster_base = { ["name"]="変異体エリート" }, [20027]={ - ["name"]="赤亀のホートン" + ["name"]="紫亀のホートン" }, [20028]={ ["name"]="氷の巨人" diff --git a/lua/app/config/strings/ko/global.lua b/lua/app/config/strings/ko/global.lua index 4ca7a913..fc81a00b 100644 --- a/lua/app/config/strings/ko/global.lua +++ b/lua/app/config/strings/ko/global.lua @@ -253,7 +253,7 @@ local localization_global = ["SUPPORT_DESC_1"] = "고객 서비스", ["SUPPORT_DESC_2"] = "지원", ["CONF_BE_SURE_QUIT_GAME"] = "게임 종료?", - ["ROUND_LEFT"] = "남아있음:", + ["ROUND_LEFT"] = "남아있음", ["NEW_PLAYER"] = "뉴 플레이어", ["NOTICE_TITLE"] = "공지 사항", ["MAINTENANCE_NOTICE_DEFAULT"] = "서버 통신에 이상이 생겼습니다. 잠시 후 다시 시도해 주세요.", diff --git a/lua/app/config/strings/ko/monster_base.lua b/lua/app/config/strings/ko/monster_base.lua index f52b77e5..8f4bf8e1 100644 --- a/lua/app/config/strings/ko/monster_base.lua +++ b/lua/app/config/strings/ko/monster_base.lua @@ -252,7 +252,7 @@ local monster_base = { ["name"]="돌연변이 엘리트" }, [20027]={ - ["name"]="붉은 거북 호튼" + ["name"]="보라색 거북 호튼" }, [20028]={ ["name"]="얼음 거인" diff --git a/lua/app/config/strings/pt/global.lua b/lua/app/config/strings/pt/global.lua index 8150b363..1013ca11 100644 --- a/lua/app/config/strings/pt/global.lua +++ b/lua/app/config/strings/pt/global.lua @@ -252,7 +252,7 @@ local localization_global = ["SUPPORT_DESC_1"] = "Atendimento ao Cliente", ["SUPPORT_DESC_2"] = "Suporte", ["CONF_BE_SURE_QUIT_GAME"] = "Quer sair do jogo?", - ["ROUND_LEFT"] = "Restante:", + ["ROUND_LEFT"] = "Restante", ["NEW_PLAYER"] = "Novo jogador", ["NOTICE_TITLE"] = "Aviso", ["MAINTENANCE_NOTICE_DEFAULT"] = "Ocorreu um erro na conexão com o servidor. Tente mais tarde.", diff --git a/lua/app/config/strings/pt/monster_base.lua b/lua/app/config/strings/pt/monster_base.lua index 99435ed4..2f95ba83 100644 --- a/lua/app/config/strings/pt/monster_base.lua +++ b/lua/app/config/strings/pt/monster_base.lua @@ -252,7 +252,7 @@ local monster_base = { ["name"]="Elite Mutante" }, [20027]={ - ["name"]="Horton, a Tartaruga Vermelha" + ["name"]="Horton, a Tartaruga Roxa" }, [20028]={ ["name"]="Gigante de Gelo" diff --git a/lua/app/config/strings/th/global.lua b/lua/app/config/strings/th/global.lua index 501ac72d..38979f54 100644 --- a/lua/app/config/strings/th/global.lua +++ b/lua/app/config/strings/th/global.lua @@ -253,7 +253,7 @@ local localization_global = ["SUPPORT_DESC_1"] = "การบริการลูกค้า", ["SUPPORT_DESC_2"] = "สนับสนุน", ["CONF_BE_SURE_QUIT_GAME"] = "ปิดเกมหรือไม่?", - ["ROUND_LEFT"] = "ส่วนที่เหลือ:", + ["ROUND_LEFT"] = "ส่วนที่เหลือ", ["NEW_PLAYER"] = "ผู้เล่นใหม่", ["NOTICE_TITLE"] = "แจ้งให้ทราบ", ["MAINTENANCE_NOTICE_DEFAULT"] = "ความผิดปกติของเครือข่ายเซิร์ฟเวอร์ โปรดลองใหม่ภายหลัง", diff --git a/lua/app/config/strings/th/monster_base.lua b/lua/app/config/strings/th/monster_base.lua index fbb50521..5017e46e 100644 --- a/lua/app/config/strings/th/monster_base.lua +++ b/lua/app/config/strings/th/monster_base.lua @@ -252,7 +252,7 @@ local monster_base = { ["name"]="อีลิทกลายพันธุ์" }, [20027]={ - ["name"]="ฮอร์ตัน เต่าแดง" + ["name"]="ฮอร์ตัน เต่าสีม่วง" }, [20028]={ ["name"]="ยักษ์น้ำแข็ง" diff --git a/lua/app/config/strings/vi/global.lua b/lua/app/config/strings/vi/global.lua index 4c86323d..e9eda05c 100644 --- a/lua/app/config/strings/vi/global.lua +++ b/lua/app/config/strings/vi/global.lua @@ -253,7 +253,7 @@ local localization_global = ["SUPPORT_DESC_1"] = "Dịch vụ khách hàng", ["SUPPORT_DESC_2"] = "Hỗ trợ", ["CONF_BE_SURE_QUIT_GAME"] = "Bạn có muốn kết thúc trò chơi không?", - ["ROUND_LEFT"] = "Phần còn lại:", + ["ROUND_LEFT"] = "Phần còn lại", ["NEW_PLAYER"] = "Người chơi mới", ["NOTICE_TITLE"] = "Thông báo", ["MAINTENANCE_NOTICE_DEFAULT"] = "Lỗi thông tin server, hãy thử lại sau", diff --git a/lua/app/config/strings/vi/monster_base.lua b/lua/app/config/strings/vi/monster_base.lua index 89c9fa05..2e94c4ec 100644 --- a/lua/app/config/strings/vi/monster_base.lua +++ b/lua/app/config/strings/vi/monster_base.lua @@ -252,7 +252,7 @@ local monster_base = { ["name"]="Tinh Anh Dị Biến" }, [20027]={ - ["name"]="Rùa đỏ Horton" + ["name"]="Rùa màu tím Horton" }, [20028]={ ["name"]="Ice Giant" diff --git a/lua/app/config/strings/vi/task.lua b/lua/app/config/strings/vi/task.lua index 61ba0601..1c5118df 100644 --- a/lua/app/config/strings/vi/task.lua +++ b/lua/app/config/strings/vi/task.lua @@ -267,7 +267,7 @@ local task = { ["desc"]="Lượt xua tan x8" }, [90]={ - ["desc"]="Lượt combo hơn 10 lần trong trận" + ["desc"]="Lượt hits hơn 10 lần trong trận" }, [91]={ ["desc"]="Lượt thi triển kỹ năng trong trận" diff --git a/lua/app/config/strings/zh/global.lua b/lua/app/config/strings/zh/global.lua index 42ba7ecc..54e50b74 100644 --- a/lua/app/config/strings/zh/global.lua +++ b/lua/app/config/strings/zh/global.lua @@ -253,7 +253,7 @@ local localization_global = ["SUPPORT_DESC_1"] = "客服", ["SUPPORT_DESC_2"] = "支援", ["CONF_BE_SURE_QUIT_GAME"] = "是否確認退出遊戲?", - ["ROUND_LEFT"] = "剩餘:", + ["ROUND_LEFT"] = "剩餘", ["NEW_PLAYER"] = "新玩家", ["NOTICE_TITLE"] = "公告", ["MAINTENANCE_NOTICE_DEFAULT"] = "服務器正在加緊鏈接中,目前元素較多,請稍後重試進入。", diff --git a/lua/app/config/strings/zh/monster_base.lua b/lua/app/config/strings/zh/monster_base.lua index fa00de91..bc3e5431 100644 --- a/lua/app/config/strings/zh/monster_base.lua +++ b/lua/app/config/strings/zh/monster_base.lua @@ -252,7 +252,7 @@ local monster_base = { ["name"]="異變菁英" }, [20027]={ - ["name"]="紅龜霍頓" + ["name"]="紫龜霍頓" }, [20028]={ ["name"]="冰巨人" diff --git a/lua/app/config/task_daily_challenge.lua b/lua/app/config/task_daily_challenge.lua index 6d297bb4..b2625552 100644 --- a/lua/app/config/task_daily_challenge.lua +++ b/lua/app/config/task_daily_challenge.lua @@ -167,7 +167,10 @@ local task_daily_challenge = { 44001, 53002, 54001, - 53001 + 53001, + 14002, + 24002, + 54002 }, ["param"]=2500, ["reward"]={