This commit is contained in:
puxuan 2025-10-10 19:45:52 +08:00
parent 4ecf8a87dd
commit 800c9ab533
10 changed files with 104 additions and 99 deletions

View File

@ -1,5 +1,5 @@
local board_dungeon = {
[1]={
[1001]={
["board"]={
{
7,
@ -199,7 +199,7 @@ local board_dungeon = {
}
}
},
[2]={
[1002]={
["board"]={
{
7,
@ -399,7 +399,7 @@ local board_dungeon = {
}
}
},
[3]={
[1003]={
["board"]={
{
0,
@ -599,7 +599,7 @@ local board_dungeon = {
}
}
},
[4]={
[1004]={
["board"]={
{
7,
@ -799,7 +799,7 @@ local board_dungeon = {
}
}
},
[5]={
[1005]={
["board"]={
{
7,
@ -999,7 +999,7 @@ local board_dungeon = {
}
}
},
[6]={
[1006]={
["board"]={
{
7,
@ -1199,7 +1199,7 @@ local board_dungeon = {
}
}
},
[7]={
[1007]={
["board"]={
{
0,
@ -1399,7 +1399,7 @@ local board_dungeon = {
}
}
},
[8]={
[1008]={
["board"]={
{
0,
@ -1599,7 +1599,7 @@ local board_dungeon = {
}
}
},
[9]={
[1009]={
["board"]={
{
7,
@ -1799,7 +1799,7 @@ local board_dungeon = {
}
}
},
[10]={
[1010]={
["board"]={
{
7,
@ -1999,7 +1999,7 @@ local board_dungeon = {
}
}
},
[11]={
[2001]={
["board"]={
{
7,
@ -2199,7 +2199,7 @@ local board_dungeon = {
}
}
},
[12]={
[2002]={
["board"]={
{
7,
@ -2399,7 +2399,7 @@ local board_dungeon = {
}
}
},
[13]={
[2003]={
["board"]={
{
7,
@ -2599,7 +2599,7 @@ local board_dungeon = {
}
}
},
[14]={
[2004]={
["board"]={
{
0,
@ -2799,7 +2799,7 @@ local board_dungeon = {
}
}
},
[15]={
[2005]={
["board"]={
{
7,
@ -2999,7 +2999,7 @@ local board_dungeon = {
}
}
},
[16]={
[2006]={
["board"]={
{
7,
@ -3199,7 +3199,7 @@ local board_dungeon = {
}
}
},
[17]={
[2007]={
["board"]={
{
7,
@ -3399,7 +3399,7 @@ local board_dungeon = {
}
}
},
[18]={
[2008]={
["board"]={
{
0,
@ -3599,7 +3599,7 @@ local board_dungeon = {
}
}
},
[19]={
[2009]={
["board"]={
{
7,
@ -3799,7 +3799,7 @@ local board_dungeon = {
}
}
},
[20]={
[2010]={
["board"]={
{
7,

View File

@ -6,7 +6,7 @@ local chapter_dungeon = {
["block_icon"]="battle_hinder_gold",
["chess_board"]="chessboard_1",
["board"]={
103
1001
},
["monster"]={
103
@ -38,7 +38,8 @@ local chapter_dungeon = {
["num"]=5000,
["num_for_nothing"]="UwhcAw=="
}
}
},
["wave_limit"]=30
},
[1002]={
["before_chapter"]=1001,
@ -48,7 +49,7 @@ local chapter_dungeon = {
["block_icon"]="battle_hinder_gold",
["chess_board"]="chessboard_1",
["board"]={
203
1002
},
["monster"]={
203
@ -80,7 +81,8 @@ local chapter_dungeon = {
["num"]=10000,
["num_for_nothing"]="VwhcA2U="
}
}
},
["wave_limit"]=30
},
[1003]={
["before_chapter"]=1002,
@ -90,7 +92,7 @@ local chapter_dungeon = {
["block_icon"]="battle_hinder_gold",
["chess_board"]="chessboard_1",
["board"]={
303
1003
},
["monster"]={
303
@ -122,7 +124,8 @@ local chapter_dungeon = {
["num"]=15000,
["num_for_nothing"]="Vw1cA2U="
}
}
},
["wave_limit"]=30
},
[1004]={
["before_chapter"]=1003,
@ -132,7 +135,7 @@ local chapter_dungeon = {
["block_icon"]="battle_hinder_gold",
["chess_board"]="chessboard_1",
["board"]={
403
1004
},
["monster"]={
403
@ -164,7 +167,8 @@ local chapter_dungeon = {
["num"]=20000,
["num_for_nothing"]="VAhcA2U="
}
}
},
["wave_limit"]=30
},
[1005]={
["before_chapter"]=1004,
@ -174,7 +178,7 @@ local chapter_dungeon = {
["block_icon"]="battle_hinder_gold",
["chess_board"]="chessboard_1",
["board"]={
503
1005
},
["monster"]={
503
@ -206,7 +210,8 @@ local chapter_dungeon = {
["num"]=25000,
["num_for_nothing"]="VA1cA2U="
}
}
},
["wave_limit"]=30
},
[1006]={
["before_chapter"]=1005,
@ -216,7 +221,7 @@ local chapter_dungeon = {
["block_icon"]="battle_hinder_gold",
["chess_board"]="chessboard_1",
["board"]={
603
1006
},
["monster"]={
603
@ -248,7 +253,8 @@ local chapter_dungeon = {
["num"]=30000,
["num_for_nothing"]="VQhcA2U="
}
}
},
["wave_limit"]=30
},
[1007]={
["before_chapter"]=1006,
@ -258,7 +264,7 @@ local chapter_dungeon = {
["block_icon"]="battle_hinder_gold",
["chess_board"]="chessboard_1",
["board"]={
703
1007
},
["monster"]={
703
@ -290,7 +296,8 @@ local chapter_dungeon = {
["num"]=35000,
["num_for_nothing"]="VQ1cA2U="
}
}
},
["wave_limit"]=30
},
[1008]={
["before_chapter"]=1007,
@ -300,7 +307,7 @@ local chapter_dungeon = {
["block_icon"]="battle_hinder_gold",
["chess_board"]="chessboard_1",
["board"]={
803
1008
},
["monster"]={
803
@ -332,7 +339,8 @@ local chapter_dungeon = {
["num"]=40000,
["num_for_nothing"]="UghcA2U="
}
}
},
["wave_limit"]=30
},
[1009]={
["before_chapter"]=1008,
@ -342,7 +350,7 @@ local chapter_dungeon = {
["block_icon"]="battle_hinder_gold",
["chess_board"]="chessboard_1",
["board"]={
903
1009
},
["monster"]={
903
@ -374,7 +382,8 @@ local chapter_dungeon = {
["num"]=45000,
["num_for_nothing"]="Ug1cA2U="
}
}
},
["wave_limit"]=30
},
[1010]={
["before_chapter"]=1009,
@ -383,7 +392,7 @@ local chapter_dungeon = {
["block_icon"]="battle_hinder_gold",
["chess_board"]="chessboard_1",
["board"]={
1003
1010
},
["monster"]={
1003
@ -415,7 +424,8 @@ local chapter_dungeon = {
["num"]=50000,
["num_for_nothing"]="UwhcA2U="
}
}
},
["wave_limit"]=30
},
[2001]={
["next_chapter"]=2002,
@ -424,7 +434,7 @@ local chapter_dungeon = {
["block_icon"]="battle_hinder_gold",
["chess_board"]="chessboard_1",
["board"]={
10103
2001
},
["monster"]={
10103
@ -456,7 +466,8 @@ local chapter_dungeon = {
["num"]=500,
["num_for_nothing"]="Uwhc"
}
}
},
["wave_limit"]=30
},
[2002]={
["before_chapter"]=2001,
@ -466,7 +477,7 @@ local chapter_dungeon = {
["block_icon"]="battle_hinder_gold",
["chess_board"]="chessboard_1",
["board"]={
10203
2002
},
["monster"]={
10203
@ -498,7 +509,8 @@ local chapter_dungeon = {
["num"]=1000,
["num_for_nothing"]="VwhcAw=="
}
}
},
["wave_limit"]=30
},
[2003]={
["before_chapter"]=2002,
@ -508,7 +520,7 @@ local chapter_dungeon = {
["block_icon"]="battle_hinder_gold",
["chess_board"]="chessboard_1",
["board"]={
10303
2003
},
["monster"]={
10303
@ -540,7 +552,8 @@ local chapter_dungeon = {
["num"]=1500,
["num_for_nothing"]="Vw1cAw=="
}
}
},
["wave_limit"]=30
},
[2004]={
["before_chapter"]=2003,
@ -550,7 +563,7 @@ local chapter_dungeon = {
["block_icon"]="battle_hinder_gold",
["chess_board"]="chessboard_1",
["board"]={
10403
2004
},
["monster"]={
10403
@ -582,7 +595,8 @@ local chapter_dungeon = {
["num"]=2000,
["num_for_nothing"]="VAhcAw=="
}
}
},
["wave_limit"]=30
},
[2005]={
["before_chapter"]=2004,
@ -592,7 +606,7 @@ local chapter_dungeon = {
["block_icon"]="battle_hinder_gold",
["chess_board"]="chessboard_1",
["board"]={
10503
2005
},
["monster"]={
10503
@ -624,7 +638,8 @@ local chapter_dungeon = {
["num"]=2500,
["num_for_nothing"]="VA1cAw=="
}
}
},
["wave_limit"]=30
},
[2006]={
["before_chapter"]=2005,
@ -634,7 +649,7 @@ local chapter_dungeon = {
["block_icon"]="battle_hinder_gold",
["chess_board"]="chessboard_1",
["board"]={
10603
2006
},
["monster"]={
10603
@ -666,7 +681,8 @@ local chapter_dungeon = {
["num"]=3000,
["num_for_nothing"]="VQhcAw=="
}
}
},
["wave_limit"]=30
},
[2007]={
["before_chapter"]=2006,
@ -676,7 +692,7 @@ local chapter_dungeon = {
["block_icon"]="battle_hinder_gold",
["chess_board"]="chessboard_1",
["board"]={
10703
2007
},
["monster"]={
10703
@ -708,7 +724,8 @@ local chapter_dungeon = {
["num"]=3500,
["num_for_nothing"]="VQ1cAw=="
}
}
},
["wave_limit"]=30
},
[2008]={
["before_chapter"]=2007,
@ -718,7 +735,7 @@ local chapter_dungeon = {
["block_icon"]="battle_hinder_gold",
["chess_board"]="chessboard_1",
["board"]={
10803
2008
},
["monster"]={
10803
@ -750,7 +767,8 @@ local chapter_dungeon = {
["num"]=4000,
["num_for_nothing"]="UghcAw=="
}
}
},
["wave_limit"]=30
},
[2009]={
["before_chapter"]=2008,
@ -760,7 +778,7 @@ local chapter_dungeon = {
["block_icon"]="battle_hinder_gold",
["chess_board"]="chessboard_1",
["board"]={
10903
2009
},
["monster"]={
10903
@ -792,7 +810,8 @@ local chapter_dungeon = {
["num"]=4500,
["num_for_nothing"]="Ug1cAw=="
}
}
},
["wave_limit"]=30
},
[2010]={
["before_chapter"]=2009,
@ -801,7 +820,7 @@ local chapter_dungeon = {
["block_icon"]="battle_hinder_gold",
["chess_board"]="chessboard_1",
["board"]={
11003
2010
},
["monster"]={
11003
@ -833,7 +852,8 @@ local chapter_dungeon = {
["num"]=5000,
["num_for_nothing"]="UwhcAw=="
}
}
},
["wave_limit"]=30
}
}
local config = {

View File

@ -351,8 +351,8 @@ local const = {
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=44,
["id_for_nothing"]="Ugw=",
["id"]=47,
["id_for_nothing"]="Ug8=",
["num"]=1,
["num_for_nothing"]="Vw=="
}
@ -363,8 +363,8 @@ local const = {
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=45,
["id_for_nothing"]="Ug0=",
["id"]=48,
["id_for_nothing"]="UgA=",
["num"]=1,
["num_for_nothing"]="Vw=="
}
@ -484,34 +484,6 @@ local const = {
}
}
},
["dungeon_show_reward"]={
["reward"]={
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=1,
["id_for_nothing"]="Vw==",
["num"]=2,
["num_for_nothing"]="VA=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=2,
["id_for_nothing"]="VA==",
["num"]=1,
["num_for_nothing"]="Vw=="
},
{
["type"]=1,
["type_for_nothing"]="Vw==",
["id"]=12,
["id_for_nothing"]="Vwo=",
["num"]=1,
["num_for_nothing"]="Vw=="
}
}
},
["daily_challenge_ads_double_rewards_limit"]={
["value"]=2
}

View File

@ -1153,6 +1153,16 @@ local item = {
["qlt"]=5,
["icon"]="46"
},
[47]={
["type"]=1,
["qlt"]=4,
["icon"]="47"
},
[48]={
["type"]=1,
["qlt"]=4,
["icon"]="48"
},
[13001]={
["type"]=5,
["inbag"]=1,
@ -1309,6 +1319,6 @@ local item = {
}
}
local config = {
data=item,count=68
data=item,count=70
}
return config

View File

@ -2793,6 +2793,9 @@ function BattleBaseController:findAttention()
for c = 1, GConst.BattleConst.COLUMN_COUNT do
local posId = ModuleManager.BattleManager:getPosId(r, c)
local gridEntity = self.battleData:getGridEntity(posId)
if not gridEntity then
print("=====")
end
local mainElementType = gridEntity:getElementType()
if gridEntity:canChangeInfo() then
self.findAttentionPathList = table.clearOrCreate(self.findAttentionPathList)

View File

@ -2,7 +2,7 @@ local BattleController = require "app/module/battle/controller/battle_controller
local BattleControllerDungeonGold = class("BattleControllerDungeonGold", BattleController)
function BattleControllerDungeonGold:getBoardConfig()
return ConfigManager:getConfig("chapter_board_dungeon_gold")
return ConfigManager:getConfig("board_dungeon")
end
function BattleControllerDungeonGold:getChapterConfig()

View File

@ -26,8 +26,8 @@ ItemConst.ITEM_ID_GLOD_WING = 49
ItemConst.ITEM_ID_SLIVER_WING = 50
ItemConst.ITEM_ID_RUNES = 55
ItemConst.ITEM_ID_FULL_MOON = 56
ItemConst.ITEM_ID_DUNGEON_TICKET_1 = 1
ItemConst.ITEM_ID_DUNGEON_TICKET_2 = 1
ItemConst.ITEM_ID_DUNGEON_TICKET_1 = 47
ItemConst.ITEM_ID_DUNGEON_TICKET_2 = 48
ItemConst.ITEM_TYPE = {
RES = 1,

View File

@ -15,7 +15,7 @@ function DungeonGoldComp:onRefresh(isFirstEnter)
local todayMaxTimes = DataManager.DungeonDailyData.GoldData:getTodayMaxTimes()
local timesStr = DataManager.DungeonDailyData.GoldData:getTodayRemainTimes() .. "/" .. todayMaxTimes
self.descTx:setText(I18N:getGlobalText(I18N.GlobalConst.BUY_VIT_DESC_2, timesStr))
self.descTx:setText(I18N:getGlobalText(I18N.GlobalConst.TODAY_REMAIN_TIMES, timesStr))
-- local curPower = DataManager.PlayerData:getSelfEntity():getShowPower(ModuleManager.BattleManager.BATTLE_TYPE.DUNGEON)
-- self.powerTx:setText(GFunc.getPowerShow(curPower))
local curPower = DataManager.HeroData:getShowPower()

View File

@ -14,7 +14,7 @@ function DungeonMaterialComp:onRefresh(isFirstEnter)
self.titleTx:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_TITLE_7))
local todayMaxTimes = DataManager.DungeonDailyData.MaterialData:getTodayMaxTimes()
local timesStr = DataManager.DungeonDailyData.MaterialData:getTodayRemainTimes() .. "/" .. todayMaxTimes
self.descTx:setText(I18N:getGlobalText(I18N.GlobalConst.BUY_VIT_DESC_2, timesStr))
self.descTx:setText(I18N:getGlobalText(I18N.GlobalConst.TODAY_REMAIN_TIMES, timesStr))
-- local curPower = DataManager.PlayerData:getSelfEntity():getShowPower(ModuleManager.BattleManager.BATTLE_TYPE.DUNGEON)
-- self.powerTx:setText(GFunc.getPowerShow(curPower))
local curPower = DataManager.HeroData:getShowPower()

View File

@ -83,7 +83,7 @@ function BuyVitUI:onRefresh()
node:setSprite(GConst.ATLAS_PATH.UI_SHOP, self:getBuyBg(buyType))
self.txRewards[buyType]:setText("x" .. GFunc.getRewardNum(reward))
if remain < 9999 then
self.txLimits[buyType]:setText(I18N:getGlobalText(I18N.GlobalConst.BUY_VIT_DESC_2, remain))
self.txLimits[buyType]:setText(I18N:getGlobalText(I18N.GlobalConst.TODAY_REMAIN_TIMES, remain))
else
self.txLimits[buyType]:setText("")
end