Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev

lua/app/common/bi_report.lua

@@ -15,8 +15,8 @@ BIReport.CLICK_BTN_TYPE = {
 
 BIReport.ADS_OPT_TYPE = {
 	CLICK = "Click",
-	SUC = "Scu",
+	SUCCESS = "Success",
-	RETURN = "Return",
+	REWARD_GET = "RewardGet",
 }
 
 BIReport.PAY_OPT_TYPE = {
@@ -574,7 +574,7 @@ end
 function BIReport:postAdPlaySuccess(adsType)
 	local args = {
 		ad_type = adsType,
-		event_type = BIReport.ADS_OPT_TYPE.SUC,
+		event_type = BIReport.ADS_OPT_TYPE.SUCCESS,
 	}
 	self:report(EVENT_NAME_AD_OPT, args)
 end
@@ -583,7 +583,7 @@ end
 function BIReport:postAdRewardGet(adsType)
 	local args = {
 		ad_type = adsType,
-		event_type = BIReport.ADS_OPT_TYPE.RETURN,
+		event_type = BIReport.ADS_OPT_TYPE.REWARD_GET,
 	}
 	self:report(EVENT_NAME_AD_OPT, args)
 end

lua/app/common/event_manager.lua

@@ -29,6 +29,8 @@ EventManager.CUSTOM_EVENT = {
 	SKILL_REFRESH_SUCC = "SKILL_REFRESH_SUCC",
 	GO_SHOP = "GO_SHOP", -- 跳转商店
 	UPDATE_MAIN_MALL_HEIGHT = "UPDATE_MAIN_MALL_HEIGHT", -- 更新主要商品的高度
+	GO_DAILY_CHALLENGE = "GO_DAILY_CHALLENGE", -- 跳转每日挑战
+	GO_CHAPTER = "GO_CHAPTER", -- 跳转主线章节
 	-- BORAD_TOUCH_BEGIN = "BORAD_TOUCH_BEGIN",
 	-- BORAD_TOUCH_OVER = "BORAD_TOUCH_OVER"
 }

lua/app/common/sdk_manager.lua

@@ -278,23 +278,22 @@ function SDKManager:showFullScreenAds(adsClickType, adCallback)
 		end
 		return true
 	end
-
+	if NetManager:isNotReachable() then
-	-- if NetManager:isNotReachable() then
+		-- 没有网
-	-- 	-- 没有网
+		GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.NO_NETWORK))
-	-- 	GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.NO_NETWORK))
+		return false
-	-- 	return false
-	-- end
-	-- if NetManager:getIsBusy() then
-	-- 	GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.NETWORK_ERROE_1))
-	-- 	return false
-	-- end
-	if DataManager.MallActData:skipAd() then
-		self:adRewradAd(true)
-		if adCallback then
-			adCallback()
-		end
-		return true
 	end
+	if NetManager:getIsBusy() then
+		GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.NETWORK_ERROE_1))
+		return false
+	end
+	-- if DataManager.MallActData:skipAd() then
+	-- 	self:adRewradAd(true)
+	-- 	if adCallback then
+	-- 		adCallback()
+	-- 	end
+	-- 	return true
+	-- end
 	if CS.UnityEngine.Application.platform == CS.UnityEngine.RuntimePlatform.Android then
 		if not CS.BF.BFMain.Instance.SDKMgr.BFIronSourceSDKMgr.AdLoaded then
 			GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.NO_ADS))

lua/app/global/global_func.lua

@@ -411,7 +411,20 @@ function GFunc.getPerStr(key, str)
 		key == GConst.BattleConst.BUFF_NAME.HPP_ADD or
 		key == GConst.BattleConst.BUFF_NAME.CRIT_TIME_ADD or
 		key == GConst.BattleConst.BUFF_NAME.EXP_TIME_ADD or
-		key == GConst.BattleConst.BUFF_NAME.CURED_ADD
+		key == GConst.BattleConst.BUFF_NAME.CURED_ADD or
+		key == GConst.BattleConst.BUFF_NAME.POISON or
+		key == GConst.BattleConst.BUFF_NAME.SHIELD or
+		key == GConst.BattleConst.BUFF_NAME.SHIELD_REBOUND_200 or
+		key == GConst.BattleConst.BUFF_NAME.VULNERABLE or
+		key == GConst.BattleConst.BUFF_NAME.CORRUPT or
+		key == GConst.BattleConst.BUFF_NAME.BLEED or
+		key == GConst.BattleConst.BUFF_NAME.WEAKEN or
+		key == GConst.BattleConst.BUFF_NAME.COUNTER_ATTACK or
+		key == GConst.BattleConst.BUFF_NAME.THORNS or
+		key == GConst.BattleConst.BUFF_NAME.SHIELD_REBOUND_400 or
+		key == GConst.BattleConst.BUFF_NAME.SHIELD_ICE_REBOUND_400 or
+		key == GConst.BattleConst.BUFF_NAME.BURN or
+		key == GConst.BattleConst.BUFF_NAME.SHIELD_ICE
 		then
 		str = str // 100 .. "%"
 	end
@@ -1305,8 +1318,7 @@ function GFunc.setAdsSprite(img, isGrey)
 	if not img then
 		return
 	end
-	-- local skip = DataManager.MallActData:skipAd()
+	local skip = false -- DataManager.MallActData:skipAd()
-	local skip = false
 	local icon = nil
 	if isGrey then
 		icon = skip and "common_ad_6" or "common_ad_5"
@@ -1317,7 +1329,7 @@ function GFunc.setAdsSprite(img, isGrey)
 end
 
 function GFunc.getAdSprite()
-	local skip = DataManager.MallActData:skipAd()
+	local skip = false --DataManager.MallActData:skipAd()
 	return skip and "common_ad_4" or "common_ad_3"
 end
 

lua/app/module/battle/battle_const.lua

@@ -263,6 +263,7 @@ local BUFF_NAME = {
     DMG_ADDITION_PURPLE_ADD = "dmg_addition_purple_add",
     DMG_ADDITION_ALL_ADD = "dmg_addition_all_add",
     STUN = "stun",
+    SHIELD = "shield",
     NORMAL_ATTACK_DEC = "normal_attack_dec",
     NORMAL_ATTACK_ADD = "normal_attack_add",
     BLOCK = "block",
@@ -294,6 +295,7 @@ local BUFF_NAME = {
     DEATH_SUMMON = "death_summon",
     LOCK = "lock",
     SHIELD_REBOUND_400 = "shield_rebound_400",
+    SHIELD_ICE = "shield_ice",
     SHIELD_ICE_REBOUND_400 = "shield_ice_rebound_400",
 }
 BattleConst.BUFF_NAME = BUFF_NAME

lua/app/module/daily_challenge/daily_challenge_manager.lua

@@ -56,6 +56,7 @@ end
 
 function DailyChallengeManager:rspStartChallenge(result)
     if result.err_code == GConst.ERROR_STR.SUCCESS then
+        DataManager.DailyChallengeData:onFightCountReduce()
         DataManager.DailyChallengeData:setFixedChapterId(result.today_fixed_chapter_id)
         ModuleManager.BattleManager:playBattle(GConst.BattleConst.BATTLE_TYPE.DAILY_CHALLENGE)
     end

lua/app/ui/activity/seven_day/seven_day_ui.lua

@@ -78,7 +78,7 @@ function SevenDayUI:initTop()
 
         self.stepObjs[i] = {
             btn = self.uiMap["seven_day_ui.slider_bg.btn_" .. i],
-            num = self.uiMap["seven_day_ui.slider_bg.btn_" .. i .. ".num"],
+            num = self.uiMap["seven_day_ui.slider_bg.num_" .. i],
             spine = self.uiMap["seven_day_ui.slider_bg.btn_" .. i .. ".ui_spine"],
         }
         self.stepObjs[i].btn:addClickListener(function()

lua/app/ui/main_city/component/main_comp.lua

@@ -72,8 +72,10 @@ function MainComp:refreshModuleComp()
 	self.dailyChallengeComp:getBaseObject():setActive(false)
 	if self.curModuleType == GConst.MainCityConst.BOTTOM_MODULE_KEY.CHAPTER then
 		self.chapterComp:getBaseObject():setActive(true)
+		EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.GO_CHAPTER)
 	elseif self.curModuleType == GConst.MainCityConst.BOTTOM_MODULE_KEY.DAILY_CHALLENGE then
 		self.dailyChallengeComp:getBaseObject():setActive(true)
+		EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.GO_DAILY_CHALLENGE)
 	end
 end
 
@@ -202,6 +204,10 @@ function MainComp:refresh()
 	self:refreshStageFormaion()
 end
 
+function MainComp:getCurModuleType()
+	return self.curModuleType
+end
+
 function MainComp:refreshChapter(force)
 	self.chapterComp:refreshChapter(force)
 end

lua/app/ui/main_city/main_city_ui.lua

@@ -148,6 +148,20 @@ function MainCityUI:_addListeners()
             end
         end
     end)
+
+    self:addEventListener(EventManager.CUSTOM_EVENT.GO_DAILY_CHALLENGE, function()
+        if self.selectedIndex ~= GConst.MainCityConst.BOTTOM_PAGE.MAIN then
+            return
+        end
+        self:refreshBounty()
+    end)
+
+    self:addEventListener(EventManager.CUSTOM_EVENT.GO_CHAPTER, function()
+        if self.selectedIndex ~= GConst.MainCityConst.BOTTOM_PAGE.MAIN then
+            return
+        end
+        self:refreshBounty()
+    end)
     DataManager.MailData:checkNewMail()
 end
 
@@ -585,7 +599,7 @@ end
 
 function MainCityUI:refreshBounty()
 	local isOpen = DataManager.BountyData:getIsOpen()
-	if not isOpen then
+	if not isOpen or self.mainComp:getCurModuleType() == GConst.MainCityConst.BOTTOM_MODULE_KEY.DAILY_CHALLENGE then
 		self.bountyNode:setVisible(false)
 		return
 	end

lua/app/userdata/daily_challenge/daily_challenge_data.lua

@@ -290,6 +290,11 @@ function DailyChallengeData:getTodayRemainLimitCount()
     return count
 end
 
+-- 处理主动退出的情况
+function DailyChallengeData:onFightCountReduce()
+    self.todayFightCount = self.todayFightCount + 1
+end
+
 function DailyChallengeData:getFixedChapterId()
     return self.fixedChapterId
 end