支线副本

2023-07-20 21:56:24 +08:00 · 2023-07-20 21:56:24 +08:00 · a4a1574ace
commit a4a1574ace
parent d68d2257fe
8 changed files with 506 additions and 138 deletions
--- a/lua/app/config/buff.lua
+++ b/lua/app/config/buff.lua
@ -696,10 +696,10 @@ local buff = {
 		["decr"]=3,
 		["icon"]="invincible_shield",
 		["fx_continued"]={
-			38
+			26
 		},
 		["fx_disappear"]={
-			39
+			27
 		}
 	}
 }
--- a/lua/app/config/chapter_dungeon_armor.lua
+++ b/lua/app/config/chapter_dungeon_armor.lua
@ -13,7 +13,16 @@ local chapter_dungeon_armor = {
 			2
 		},
 		["monster"]={
-			101,
+			107,
+			207,
+			307,
+			407,
+			507,
+			607,
+			707,
+			807,
+			907,
+			1007
 		},
 		["star_task"]={
 			1,
@ -129,7 +138,16 @@ local chapter_dungeon_armor = {
 			2
 		},
 		["monster"]={
-			101
+			1107,
+			1207,
+			1307,
+			1407,
+			1507,
+			1607,
+			1707,
+			1807,
+			1907,
+			2007
 		},
 		["star_task"]={
 			1,
@ -245,7 +263,16 @@ local chapter_dungeon_armor = {
 			2
 		},
 		["monster"]={
-			101
+			2107,
+			2207,
+			2307,
+			2407,
+			2507,
+			2607,
+			2707,
+			2807,
+			2907,
+			3007
 		},
 		["star_task"]={
 			1,
@ -361,7 +388,16 @@ local chapter_dungeon_armor = {
 			2
 		},
 		["monster"]={
-			101
+			3107,
+			3207,
+			3307,
+			3407,
+			3507,
+			3607,
+			3707,
+			3807,
+			3907,
+			4007
 		},
 		["star_task"]={
 			1,
--- a/lua/app/config/chapter_dungeon_equip.lua
+++ b/lua/app/config/chapter_dungeon_equip.lua
@ -1,7 +1,7 @@
 local chapter_dungeon_equip = {
 	[1]={
 		["level"]=5,
-		["scene"]="bg_13",
+		["scene"]="dungeon_equip",
 		["block_icon"]="battle_hinder_13",
 		["chess_board"]="chessboard_2",
 		["board"]={
@ -94,7 +94,7 @@ local chapter_dungeon_equip = {
 	},
 	[2]={
 		["level"]=10,
-		["scene"]="bg_13",
+		["scene"]="dungeon_equip",
 		["block_icon"]="battle_hinder_13",
 		["chess_board"]="chessboard_2",
 		["board"]={
@ -187,7 +187,7 @@ local chapter_dungeon_equip = {
 	},
 	[3]={
 		["level"]=15,
-		["scene"]="bg_13",
+		["scene"]="dungeon_equip",
 		["block_icon"]="battle_hinder_13",
 		["chess_board"]="chessboard_2",
 		["board"]={
@ -280,7 +280,7 @@ local chapter_dungeon_equip = {
 	},
 	[4]={
 		["level"]=20,
-		["scene"]="bg_13",
+		["scene"]="dungeon_equip",
 		["block_icon"]="battle_hinder_13",
 		["chess_board"]="chessboard_2",
 		["board"]={
@ -373,7 +373,7 @@ local chapter_dungeon_equip = {
 	},
 	[5]={
 		["level"]=25,
-		["scene"]="bg_13",
+		["scene"]="dungeon_equip",
 		["block_icon"]="battle_hinder_13",
 		["chess_board"]="chessboard_2",
 		["board"]={
@ -466,7 +466,7 @@ local chapter_dungeon_equip = {
 	},
 	[6]={
 		["level"]=30,
-		["scene"]="bg_13",
+		["scene"]="dungeon_equip",
 		["block_icon"]="battle_hinder_13",
 		["chess_board"]="chessboard_2",
 		["board"]={
@ -559,7 +559,7 @@ local chapter_dungeon_equip = {
 	},
 	[7]={
 		["level"]=35,
-		["scene"]="bg_13",
+		["scene"]="dungeon_equip",
 		["block_icon"]="battle_hinder_13",
 		["chess_board"]="chessboard_2",
 		["board"]={
@ -652,7 +652,7 @@ local chapter_dungeon_equip = {
 	},
 	[8]={
 		["level"]=40,
-		["scene"]="bg_13",
+		["scene"]="dungeon_equip",
 		["block_icon"]="battle_hinder_13",
 		["chess_board"]="chessboard_2",
 		["board"]={
@ -745,7 +745,7 @@ local chapter_dungeon_equip = {
 	},
 	[9]={
 		["level"]=45,
-		["scene"]="bg_13",
+		["scene"]="dungeon_equip",
 		["block_icon"]="battle_hinder_13",
 		["chess_board"]="chessboard_2",
 		["board"]={
@ -838,7 +838,7 @@ local chapter_dungeon_equip = {
 	},
 	[10]={
 		["level"]=50,
-		["scene"]="bg_13",
+		["scene"]="dungeon_equip",
 		["block_icon"]="battle_hinder_13",
 		["chess_board"]="chessboard_2",
 		["board"]={
@ -931,7 +931,7 @@ local chapter_dungeon_equip = {
 	},
 	[11]={
 		["level"]=55,
-		["scene"]="bg_13",
+		["scene"]="dungeon_equip",
 		["block_icon"]="battle_hinder_13",
 		["chess_board"]="chessboard_2",
 		["board"]={
@ -1024,7 +1024,7 @@ local chapter_dungeon_equip = {
 	},
 	[12]={
 		["level"]=60,
-		["scene"]="bg_13",
+		["scene"]="dungeon_equip",
 		["block_icon"]="battle_hinder_13",
 		["chess_board"]="chessboard_2",
 		["board"]={
@ -1117,7 +1117,7 @@ local chapter_dungeon_equip = {
 	},
 	[13]={
 		["level"]=65,
-		["scene"]="bg_13",
+		["scene"]="dungeon_equip",
 		["block_icon"]="battle_hinder_13",
 		["chess_board"]="chessboard_2",
 		["board"]={
@ -1210,7 +1210,7 @@ local chapter_dungeon_equip = {
 	},
 	[14]={
 		["level"]=70,
-		["scene"]="bg_13",
+		["scene"]="dungeon_equip",
 		["block_icon"]="battle_hinder_13",
 		["chess_board"]="chessboard_2",
 		["board"]={
@ -1303,7 +1303,7 @@ local chapter_dungeon_equip = {
 	},
 	[15]={
 		["level"]=75,
-		["scene"]="bg_13",
+		["scene"]="dungeon_equip",
 		["block_icon"]="battle_hinder_13",
 		["chess_board"]="chessboard_2",
 		["board"]={
@ -1396,7 +1396,7 @@ local chapter_dungeon_equip = {
 	},
 	[16]={
 		["level"]=80,
-		["scene"]="bg_13",
+		["scene"]="dungeon_equip",
 		["block_icon"]="battle_hinder_13",
 		["chess_board"]="chessboard_2",
 		["board"]={
@ -1489,7 +1489,7 @@ local chapter_dungeon_equip = {
 	},
 	[17]={
 		["level"]=85,
-		["scene"]="bg_13",
+		["scene"]="dungeon_equip",
 		["block_icon"]="battle_hinder_13",
 		["chess_board"]="chessboard_2",
 		["board"]={
@ -1582,7 +1582,7 @@ local chapter_dungeon_equip = {
 	},
 	[18]={
 		["level"]=90,
-		["scene"]="bg_13",
+		["scene"]="dungeon_equip",
 		["block_icon"]="battle_hinder_13",
 		["chess_board"]="chessboard_2",
 		["board"]={
@ -1675,7 +1675,7 @@ local chapter_dungeon_equip = {
 	},
 	[19]={
 		["level"]=95,
-		["scene"]="bg_13",
+		["scene"]="dungeon_equip",
 		["block_icon"]="battle_hinder_13",
 		["chess_board"]="chessboard_2",
 		["board"]={
@ -1768,7 +1768,7 @@ local chapter_dungeon_equip = {
 	},
 	[20]={
 		["level"]=100,
-		["scene"]="bg_13",
+		["scene"]="dungeon_equip",
 		["block_icon"]="battle_hinder_13",
 		["chess_board"]="chessboard_2",
 		["board"]={
--- a/lua/app/config/localization/localization_global_const.lua
+++ b/lua/app/config/localization/localization_global_const.lua
@ -410,6 +410,8 @@ local LocalizationGlobalConst =
 	DUNGEON_ARMOR_DESC_9 = "DUNGEON_ARMOR_DESC_9",
 	DUNGEON_ARMOR_DESC_10 = "DUNGEON_ARMOR_DESC_10",
 	DUNGEON_ARMOR_DESC_11 = "DUNGEON_ARMOR_DESC_11",
+	EQUIP_DESC_24 = "EQUIP_DESC_24",
+	EQUIP_DESC_25 = "EQUIP_DESC_25",
 }

 return LocalizationGlobalConst
--- a/lua/app/config/skill.lua
+++ b/lua/app/config/skill.lua
--- a/lua/app/config/strings/cn/global.lua
+++ b/lua/app/config/strings/cn/global.lua
@ -410,8 +410,8 @@ local localization_global =
    ["DUNGEON_ARMOR_DESC_9"] = "当前积攒星星{0}",
    ["DUNGEON_ARMOR_DESC_10"] = "积攒{0}颗星星可获得奖励",
    ["DUNGEON_ARMOR_DESC_11"] = "补星",
-
-    
+    ["EQUIP_DESC_24"] = "超值武器强化包",
+    ["EQUIP_DESC_25"] = "超值防具强化包",
 }

 return localization_global
--- a/lua/app/config/strings/cn/item.lua
+++ b/lua/app/config/strings/cn/item.lua
@ -109,123 +109,123 @@ local item = {
 	},
 	[1001]={
 		["name"]="暗淡陨铁",
-		["desc"]="武器材料1阶"
+		["desc"]="一块暗淡的陨铁，蕴含着神秘的能量。"
 	},
 	[1002]={
 		["name"]="百炼陨铁",
-		["desc"]="武器材料2阶"
+		["desc"]="经过百炼的陨铁，闪烁着金属光芒。"
 	},
 	[1003]={
 		["name"]="月华陨铁",
-		["desc"]="武器材料3阶"
+		["desc"]="在月光照射下，泛着银白色的华光。"
 	},
 	[1004]={
 		["name"]="天光陨铁",
-		["desc"]="武器材料4阶"
+		["desc"]="闪耀着明亮的天光，散发着神秘的气息。"
 	},
 	[1005]={
 		["name"]="金光陨铁",
-		["desc"]="武器材料5阶"
+		["desc"]="闪烁着金色光芒，散发着强大的能量。"
 	},
 	[1006]={
 		["name"]="至臻陨铁",
-		["desc"]="武器材料6阶"
+		["desc"]="极为珍贵的陨铁，蕴含着无与伦比的力量。"
 	},
 	[1007]={
 		["name"]="翠绿晶石",
-		["desc"]="帽子材料1阶"
+		["desc"]="一块翠绿色的晶石，散发出清新的气息。"
 	},
 	[1008]={
 		["name"]="暗红晶石",
-		["desc"]="帽子材料2阶"
+		["desc"]="呈暗红色的晶石，充满神秘的气息。"
 	},
 	[1009]={
 		["name"]="混元晶石",
-		["desc"]="帽子材料3阶"
+		["desc"]="蕴含着混沌能量的晶石，难以捉摸。"
 	},
 	[1010]={
 		["name"]="鸿鑫晶石",
-		["desc"]="帽子材料4阶"
+		["desc"]="充满吉祥气息的晶石，被视为幸运的象征。"
 	},
 	[1011]={
 		["name"]="海洋晶石",
-		["desc"]="帽子材料5阶"
+		["desc"]="宛如碧海般的晶石，散发出清凉的气息。"
 	},
 	[1012]={
 		["name"]="至金晶石",
-		["desc"]="帽子材料6阶"
+		["desc"]="价值连城的晶石，闪耀着金色的光芒。"
 	},
 	[1013]={
 		["name"]="蜥蜴鳞片",
-		["desc"]="衣服材料1阶"
+		["desc"]="坚硬而灵活的鳞片，仿佛寄托着蜥蜴的生命之力。"
 	},
 	[1014]={
 		["name"]="亚龙鳞片",
-		["desc"]="衣服材料2阶"
+		["desc"]="神秘龙息环绕的鳞片，似乎凝聚着龙的力量。"
 	},
 	[1015]={
 		["name"]="海龙鳞片",
-		["desc"]="衣服材料3阶"
+		["desc"]="散发着海洋力量的鳞片，宛如大海中波涛汹涌的奔腾。"
 	},
 	[1016]={
 		["name"]="火龙鳞片",
-		["desc"]="衣服材料4阶"
+		["desc"]="充满炽热能量的鳞片，仿佛蕴含着熊熊烈火的愤怒。"
 	},
 	[1017]={
 		["name"]="雷龙鳞片",
-		["desc"]="衣服材料5阶"
+		["desc"]="带有电光气息的鳞片，宛如雷电交织的神奇图腾。"
 	},
 	[1018]={
 		["name"]="神龙鳞片",
-		["desc"]="衣服材料6阶"
+		["desc"]="被视为神圣存在的鳞片，仿佛承载着神明的庇佑。"
 	},
 	[1019]={
 		["name"]="粗糙皮革",
-		["desc"]="腰带材料1阶"
+		["desc"]="简单的粗糙皮革，适合制作普通装备。"
 	},
 	[1020]={
 		["name"]="土蛇皮革",
-		["desc"]="腰带材料2阶"
+		["desc"]="坚韧且耐用的皮革，仿佛记载着土蛇沧桑岁月的坚韧。"
 	},
 	[1021]={
 		["name"]="巨熊皮革",
-		["desc"]="腰带材料3阶"
+		["desc"]="防御力极强的皮革，散发着浑厚的熊之威仪。"
 	},
 	[1022]={
 		["name"]="猛虎皮革",
-		["desc"]="腰带材料4阶"
+		["desc"]="敏捷威猛的皮革，宛如蕴含着猛虎狩猎本能的神奇皮质。"
 	},
 	[1023]={
 		["name"]="恶魔皮革",
-		["desc"]="腰带材料5阶"
+		["desc"]="散发着邪恶气息的皮革，仿佛带有恶魔的诅咒。"
 	},
 	[1024]={
 		["name"]="天蟒皮革",
-		["desc"]="腰带材料6阶"
+		["desc"]="带有神秘力量的皮革，仿佛能让人联想到神秘的蛇妖。"
 	},
 	[1025]={
 		["name"]="幽深贝壳",
-		["desc"]="护手材料1阶"
+		["desc"]="黑暗中发出微光的贝壳，似乎蕴含着神秘能量。"
 	},
 	[1026]={
 		["name"]="水韵贝壳",
-		["desc"]="护手材料2阶"
+		["desc"]="闪烁着水波纹的贝壳，带有清凉之感。"
 	},
 	[1027]={
 		["name"]="岩石贝壳",
-		["desc"]="护手材料3阶"
+		["desc"]="坚硬的岩石贝壳，具有防御性能。"
 	},
 	[1028]={
 		["name"]="混沌贝壳",
-		["desc"]="护手材料4阶"
+		["desc"]="充满混沌能量的贝壳，神秘而不可测。"
 	},
 	[1029]={
 		["name"]="暗狱贝壳",
-		["desc"]="护手材料5阶"
+		["desc"]="黑暗中若隐若现的贝壳，带有不安的气息。"
 	},
 	[1030]={
 		["name"]="至圣贝壳",
-		["desc"]="护手材料6阶"
+		["desc"]="被尊为圣物的贝壳，散发出神圣的光芒。"
 	},
 	[12001]={
 		["name"]="舞娘碎片",
--- a/lua/app/ui/dungeon_armor/cell/chapter_cell.lua
+++ b/lua/app/ui/dungeon_armor/cell/chapter_cell.lua
@ -40,6 +40,7 @@ function ChapterCell:refresh(id)
    end

    local spineNode = uiMap["chapter_cell.touch_node.spine_node"]
+    local spineObj = uiMap["chapter_cell.touch_node.spine_node.ui_spine_obj"]
    local bgNode = uiMap["chapter_cell.touch_node.bg"]

    local armorData = DataManager.DungeonData:getDungeonDataByType(ModuleManager.MODULE_KEY.DUNGEON_ARMOR)
@ -74,6 +75,14 @@ function ChapterCell:refresh(id)
            starNode:setVisible(false)
            bgNode:setVisible(false)
            spineNode:setVisible(true)
+            spineObj:setVisible(false)
+            local monsterId = config.monster[#config.monster]
+            local monsterConfig = ConfigManager:getConfig("monster")[monsterId]
+            local spineName = monsterConfig.model_id
+            spineObj:loadAssetAsync(spineName, function()
+                spineObj:setVisible(true, monsterConfig.model_ui)
+                spineObj:playAnim("idle", true, false, true)
+            end, true)
        end
        touchNode:addClickListener(function()
            ModuleManager.DungeonArmorManager:showFightUI(id)