diff --git a/lua/app/common/bi_report.lua b/lua/app/common/bi_report.lua index 6efda7e7..8ba3a3df 100644 --- a/lua/app/common/bi_report.lua +++ b/lua/app/common/bi_report.lua @@ -1467,7 +1467,12 @@ function BIReport:postAppLovinAdRevenue(msg) self:postAdjustAdRevenueAppLovinMAX(args.revenue, args.network_name, args.ad_unit_identifier, args.placement) end local args2 = { - applovin_revenue = args.revenue + ad_platform = "applovin", + ad_source = args.network_name, + ad_unit_name = args.ad_unit_identifier, + ad_format = args.ad_format, + currency = "USD", + value = args.revenue, } self:postFirebaseLog("ad_impression", args2) self:logAppsFlyerAdRevenue(3, args.network_name, args.revenue, args) @@ -1486,7 +1491,12 @@ function BIReport:postIronSourceAdRevenue(msg) end if args.revenue then local args2 = { - ironsource_revenue = args.revenue + ad_platform = "ironSource", + ad_source = args.network_name, + ad_unit_name = args.ad_unit_identifier, + ad_format = args.ad_format, + currency = "USD", + value = args.revenue } self:postFirebaseLog("ad_impression", args2) self:logAppsFlyerAdRevenue(2, args.network_name, args.revenue, args) diff --git a/lua/app/config/chapter_board_daily_challenge.lua b/lua/app/config/chapter_board_daily_challenge.lua index b6666eb8..7305b572 100644 --- a/lua/app/config/chapter_board_daily_challenge.lua +++ b/lua/app/config/chapter_board_daily_challenge.lua @@ -4359,7 +4359,7 @@ local chapter_board_daily_challenge = { }, { 34, - 0 + 3 }, { 34, diff --git a/lua/app/config/grid_type.lua b/lua/app/config/grid_type.lua index f085926f..5a6895df 100644 --- a/lua/app/config/grid_type.lua +++ b/lua/app/config/grid_type.lua @@ -5,7 +5,8 @@ local grid_type = { [1]={ ["icon"]="battle_hinder_1", ["cant_link"]=1, - ["element_invalid"]=1 + ["element_invalid"]=1, + ["cant_upset"]=1 }, [2]={ ["icon"]="battle_obstacle_stone_2", @@ -17,6 +18,7 @@ local grid_type = { ["break_count"]=1, ["cant_link"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_za_b01" }, [3]={ @@ -29,6 +31,7 @@ local grid_type = { ["break_count"]=1, ["cant_link"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_za_b01" }, [4]={ @@ -39,6 +42,7 @@ local grid_type = { 3 }, ["break_count"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_za_b03" }, [5]={ @@ -51,6 +55,7 @@ local grid_type = { ["break_count"]=1, ["break_stay_element"]=1, ["cant_link"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_za_b02" }, [6]={ @@ -69,6 +74,7 @@ local grid_type = { ["break_count"]=1, ["cant_link"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_zhuqiantk_b01" }, [8]={ @@ -81,6 +87,7 @@ local grid_type = { ["break_count"]=1, ["cant_link"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["effect"]=1, ["effect_sfx"]="sfx_piece_huojian_b01", ["sfx_flow"]=1, @@ -99,6 +106,7 @@ local grid_type = { ["break_count"]=1, ["cant_link"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["effect"]=1, ["effect_sfx"]="sfx_piece_huojian_b01", ["sfx_flow"]=1, @@ -117,6 +125,7 @@ local grid_type = { ["break_count"]=1, ["cant_link"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["effect"]=1, ["effect_sfx"]="sfx_piece_huojian_b01", ["sfx_flow"]=1, @@ -135,6 +144,7 @@ local grid_type = { ["break_count"]=1, ["cant_link"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["effect"]=1, ["effect_sfx"]="sfx_piece_huojian_b01", ["sfx_flow"]=1, @@ -154,6 +164,7 @@ local grid_type = { ["break_stay_element"]=1, ["can_fall"]=1, ["cant_link"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_kucao_b01" }, [13]={ @@ -168,6 +179,7 @@ local grid_type = { ["can_fall"]=1, ["cant_link"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_guodong_b01", ["effect"]=5, ["effect_sfx"]="sfx_piece_guodong_b02", @@ -186,6 +198,7 @@ local grid_type = { ["bftc_time"]=0.4, ["cant_link"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_shendeng_b01", ["effect"]=3, ["effect_trigger"]=2 @@ -207,6 +220,7 @@ local grid_type = { ["bftc_time"]=0.3, ["cant_link"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_baoxiang_b01", ["effect"]=4, ["effect_trigger"]=2 @@ -224,7 +238,8 @@ local grid_type = { ["spine_change"]="idle1_1", ["break_count"]=1, ["cant_link"]=1, - ["element_invalid"]=1 + ["element_invalid"]=1, + ["cant_upset"]=1 }, [17]={ ["icon"]="battle_obstacle_chest_1", @@ -239,7 +254,8 @@ local grid_type = { ["spine_change"]="idle1", ["break_count"]=1, ["cant_link"]=1, - ["element_invalid"]=1 + ["element_invalid"]=1, + ["cant_upset"]=1 }, [18]={ ["icon"]="battle_obstacle_stump_1", @@ -251,6 +267,7 @@ local grid_type = { ["break_count"]=1, ["cant_link"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_muzhuang_b01" }, [19]={ @@ -263,6 +280,7 @@ local grid_type = { ["break_count"]=1, ["cant_link"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_muzhuang_b01" }, [20]={ @@ -275,6 +293,7 @@ local grid_type = { ["break_count"]=1, ["cant_link"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_muzhuang_b01" }, [21]={ @@ -289,6 +308,7 @@ local grid_type = { ["can_fall"]=1, ["cant_link"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_shuipao_b01", ["effect"]=5, ["effect_sfx"]="sfx_piece_shuipao_b02", @@ -306,6 +326,7 @@ local grid_type = { ["can_fall"]=1, ["cant_link"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_yuni_b01", ["effect"]=5, ["effect_sfx"]="sfx_piece_yuni_b02", @@ -323,6 +344,7 @@ local grid_type = { ["can_fall"]=1, ["cant_link"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_duwu_b01", ["effect"]=5, ["effect_sfx"]="sfx_piece_duwu_b02", @@ -338,6 +360,7 @@ local grid_type = { ["break_count"]=1, ["cant_link"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_jitang_b01" }, [25]={ @@ -350,6 +373,7 @@ local grid_type = { ["break_count"]=1, ["cant_link"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_jitang_b01" }, [26]={ @@ -362,6 +386,7 @@ local grid_type = { ["break_count"]=1, ["cant_link"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_jitang_b01" }, [27]={ @@ -372,6 +397,7 @@ local grid_type = { 3 }, ["break_count"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_fazhen_b01" }, [28]={ @@ -384,6 +410,7 @@ local grid_type = { ["break_count"]=1, ["cant_link"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_zhongrushi_b01" }, [29]={ @@ -396,6 +423,7 @@ local grid_type = { ["break_count"]=1, ["cant_link"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_zhongrushi_b01" }, [30]={ @@ -408,6 +436,7 @@ local grid_type = { ["break_count"]=1, ["cant_link"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_zhongrushi_b01" }, [31]={ @@ -420,6 +449,7 @@ local grid_type = { ["break_count"]=1, ["cant_link"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_tiexie_b01" }, [32]={ @@ -432,6 +462,7 @@ local grid_type = { ["break_count"]=1, ["cant_link"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_tiexie_b01" }, [33]={ @@ -444,6 +475,7 @@ local grid_type = { ["break_count"]=1, ["cant_link"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_tiexie_b01" }, [34]={ @@ -458,6 +490,7 @@ local grid_type = { ["can_fall"]=1, ["cant_link"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_rongyan_b01", ["effect"]=5, ["effect_sfx"]="sfx_piece_rongyan_b02", @@ -474,6 +507,7 @@ local grid_type = { ["break_stay_element"]=1, ["can_fall"]=1, ["cant_link"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_caocong_b01" }, [36]={ @@ -485,6 +519,7 @@ local grid_type = { ["can_fall"]=1, ["cant_link"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_rongyan_b01", ["effect"]=6, ["effect_trigger"]=1 @@ -498,6 +533,7 @@ local grid_type = { ["can_fall"]=1, ["cant_link"]=1, ["element_invalid"]=1, + ["cant_upset"]=1, ["break_sfx"]="sfx_piece_duwu_b01", ["effect"]=6, ["effect_trigger"]=1 diff --git a/lua/app/module/battle/controller/battle_base_controller.lua b/lua/app/module/battle/controller/battle_base_controller.lua index ce1c452a..8b7136c7 100644 --- a/lua/app/module/battle/controller/battle_base_controller.lua +++ b/lua/app/module/battle/controller/battle_base_controller.lua @@ -2264,7 +2264,7 @@ function BattleBaseController:getShuffleBoardInfo() end local anySkillCount = 0 for posId, entity in pairs(self.battleData:getGridEnties()) do - if self:getPosIdInCurActionBoardRowRange(posId) and entity:isCanFallStatus() then + if self:getPosIdInCurActionBoardRowRange(posId) and entity:isCanFallStatus() and not entity:getCantUpset() then if entity:getSkillId() then local skillEntity = self:getSkillEntityBySkillId(entity:getSkillId()) local elementType = skillEntity:getPosition() diff --git a/lua/app/userdata/battle/battle_grid_entity.lua b/lua/app/userdata/battle/battle_grid_entity.lua index ee0cefb8..8a61cb49 100644 --- a/lua/app/userdata/battle/battle_grid_entity.lua +++ b/lua/app/userdata/battle/battle_grid_entity.lua @@ -446,6 +446,10 @@ function BattleGridEntity:getBftcTime() return self:getGridTypeConfig().bftc_time or 0 end +function BattleGridEntity:getCantUpset() + return self:getGridTypeConfig().cant_upset == 1 +end + function BattleGridEntity:getEffectSfx() local sfxName = self:getGridTypeConfig().effect_sfx if not sfxName then