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

# Conflicts:
#	lua/app/common/audio_manager.lua

lua/app/common/audio_manager.lua

@@ -33,6 +33,8 @@ AudioManager.EFFECT_ID = {
     REWARD = "assets/arts/sounds/sfx/ui/reward.wav", 
     HERO_UP = "assets/arts/sounds/sfx/ui/hero_up.wav", 
     PLAYER_UP = "assets/arts/sounds/sfx/ui/player_up.wav", 
+    BOSS_WARNING = "assets/arts/sounds/sfx/battle/warning_boss.wav",
+    LINK_CANCEL = "assets/arts/sounds/sfx/battle/link_cancel.wav",
 }
 
 AudioManager.BO_EFFECT_ID = {

lua/app/common/white_res_manager.lua

@@ -7,9 +7,11 @@ local GAME_RES_WHITE_LIST = {
     GConst.ATLAS_PATH.COMMON,
     -- icon
     GConst.ATLAS_PATH.ICON_SKILL,
+    GConst.ATLAS_PATH.ICON_SKILL_BIG,
     GConst.ATLAS_PATH.ICON_SKILL_ROGUE,
     GConst.ATLAS_PATH.ICON_ITEM,
     GConst.ATLAS_PATH.ICON_HERO,
+    GConst.ATLAS_PATH.ICON_HERO_2,
     GConst.ATLAS_PATH.ICON_BUFF,
     GConst.ATLAS_PATH.ICON_TASK,
 }

lua/app/config/chapter_board.lua

@@ -17450,41 +17450,41 @@ local chapter_board = {
 				18,
 				0
 			},
+			{
+				22,
+				1
+			},
+			{
+				22,
+				3
+			},
+			{
+				18,
+				0
+			},
+			{
+				18,
+				0
+			},
+			{
+				18,
+				0
+			},
+			{
+				18,
+				0
+			},
+			{
+				18,
+				0
+			},
 			{
 				22,
 				2
 			},
 			{
-				0,
+				22,
-				0
+				4
-			},
-			{
-				18,
-				0
-			},
-			{
-				18,
-				0
-			},
-			{
-				18,
-				0
-			},
-			{
-				18,
-				0
-			},
-			{
-				18,
-				0
-			},
-			{
-				0,
-				0
-			},
-			{
-				0,
-				0
 			},
 			{
 				18,
@@ -17511,8 +17511,8 @@ local chapter_board = {
 				0
 			},
 			{
-				0,
+				22,
-				0
+				5
 			},
 			{
 				18,
@@ -17546,21 +17546,21 @@ local chapter_board = {
 				1,
 				0
 			},
-			{
-				22,
-				2
-			},
-			{
-				22,
-				2
-			},
 			{
 				22,
 				1
 			},
+			{
+				22,
+				2
+			},
 			{
 				22,
 				3
+			},
+			{
+				22,
+				4
 			}
 		},
 		["mystery_box_board"]={
@@ -17648,41 +17648,41 @@ local chapter_board = {
 				18,
 				0
 			},
+			{
+				22,
+				1
+			},
+			{
+				22,
+				3
+			},
+			{
+				18,
+				0
+			},
+			{
+				18,
+				0
+			},
+			{
+				18,
+				0
+			},
+			{
+				18,
+				0
+			},
+			{
+				18,
+				0
+			},
 			{
 				22,
 				2
 			},
 			{
-				0,
+				22,
-				0
+				4
-			},
-			{
-				18,
-				0
-			},
-			{
-				18,
-				0
-			},
-			{
-				18,
-				0
-			},
-			{
-				18,
-				0
-			},
-			{
-				18,
-				0
-			},
-			{
-				0,
-				0
-			},
-			{
-				0,
-				0
 			},
 			{
 				18,
@@ -17705,12 +17705,12 @@ local chapter_board = {
 				4
 			},
 			{
-				14,
+				17,
 				0
 			},
 			{
-				0,
+				22,
-				0
+				5
 			},
 			{
 				18,
@@ -17744,21 +17744,21 @@ local chapter_board = {
 				1,
 				0
 			},
-			{
-				22,
-				2
-			},
-			{
-				17,
-				0
-			},
 			{
 				22,
 				1
 			},
+			{
+				22,
+				2
+			},
 			{
 				22,
 				3
+			},
+			{
+				22,
+				4
 			}
 		}
 	},

lua/app/config/chapter_board_daily_challenge.lua

@@ -3071,7 +3071,7 @@ local chapter_board_daily_challenge = {
 			},
 			{
 				0,
-				0
+				4
 			},
 			{
 				0,
@@ -3430,8 +3430,8 @@ local chapter_board_daily_challenge = {
 				0
 			},
 			{
-				0,
+				1,
-				2
+				0
 			},
 			{
 				0,
@@ -3450,7 +3450,7 @@ local chapter_board_daily_challenge = {
 				4
 			},
 			{
-				31,
+				1,
 				0
 			},
 			{
@@ -3658,7 +3658,7 @@ local chapter_board_daily_challenge = {
 				2
 			},
 			{
-				31,
+				1,
 				0
 			},
 			{
@@ -4654,8 +4654,8 @@ local chapter_board_daily_challenge = {
 				0
 			},
 			{
-				34,
+				1,
-				1
+				0
 			},
 			{
 				32,
@@ -4682,8 +4682,8 @@ local chapter_board_daily_challenge = {
 				0
 			},
 			{
-				34,
+				1,
-				2
+				0
 			},
 			{
 				32,

lua/app/config/localization/localization_global_const.lua

@@ -213,6 +213,8 @@ local LocalizationGlobalConst =
 	SETTING_DESC_23 = "SETTING_DESC_23",
 	SETTING_DESC_25 = "SETTING_DESC_25",
 	BIND_TIPS_DESC = "BIND_TIPS_DESC",
+	GET_SEVER_ERROR = "GET_SEVER_ERROR",
+	PAY_FAILED_DESC_1 = "PAY_FAILED_DESC_1",
 }
 
 return LocalizationGlobalConst

lua/app/config/skill.lua

@@ -5212,6 +5212,9 @@ local skill = {
 		["skill_position"]=2,
 		["cd"]=2,
 		["cd_start"]=0,
+		["sound_hit"]={
+			3300120
+		},
 		["name_act"]="skill01"
 	},
 	[10016]={

lua/app/config/strings/cn/global.lua

@@ -213,6 +213,8 @@ local localization_global =
     ["SETTING_DESC_23"] = "当前有订单正在处理中，请稍后再试",
     ["SETTING_DESC_25"] = "支付取消",
     ["BIND_TIPS_DESC"] = "为了您的帐户安全，请绑定账号",
+    ["GET_SEVER_ERROR"] = "请求服务器失败，请重试",
+    ["PAY_FAILED_DESC_1"] = "订单异常，请联系客服处理",
 }
 
 return localization_global

lua/app/config/strings/en/global.lua

@@ -42,13 +42,13 @@ local localization_global =
     ["BATTLE_DESC_8"] = "Additional heroes available for deploying",
     ["MAIN_BTN_2"] = "Hero",
     ["MAIN_DESC_1"] = "Chapter {0}",
-    ["TIME_STR_DHM"] = "{0} d {1} h {2} min",
+    ["TIME_STR_DHM"] = "{0} d {1} h {2} m",
     ["TIME_STR_M"] = "{0} min",
-    ["TIME_STR_MS"] = "{0} min {1} sec",
+    ["TIME_STR_MS"] = "{0} m {1} s",
     ["TIME_STR_S"] = "{0} sec",
     ["TIME_STR_DH"] = "{0} d {1} h",
-    ["TIME_STR_HMS"] = "{0} h {1} min {2} sec",
+    ["TIME_STR_HMS"] = "{0} h {1} m {2} s",
-    ["TIME_STR_HM"] = "{0} h {1} min",
+    ["TIME_STR_HM"] = "{0} h {1} m",
     ["TIME_STR_D"] = "{0} d",
     ["TIME_MS"] = "{0}:{1}",
     ["TIME_HMS"] = "{0}:{1}:{2}",
@@ -213,6 +213,8 @@ local localization_global =
     ["SETTING_DESC_23"] = "An order is currently being processed, please try again later",
     ["SETTING_DESC_25"] = "Payment Cancellation",
     ["BIND_TIPS_DESC"] = "For the security of your account, please bind your accounts",
+    ["GET_SEVER_ERROR"] = "Request to server failed, please try again",
+    ["PAY_FAILED_DESC_1"] = "Order abnormal, please contact customer support",
 }
 
 return localization_global

lua/app/config/strings/zh/global.lua

@@ -213,6 +213,8 @@ local localization_global =
     ["SETTING_DESC_23"] = "當前有訂單正在處理中，請稍後再試",
     ["SETTING_DESC_25"] = "支付取消",
     ["BIND_TIPS_DESC"] = "爲了您的帳戶安全，請綁定賬號",
+    ["GET_SEVER_ERROR"] = "請求服務器失敗，請重試",
+    ["PAY_FAILED_DESC_1"] = "訂單異常，請聯繫客服處理",
 }
 
 return localization_global

lua/app/config/task.lua

@@ -117,7 +117,6 @@ local task = {
  				["num_for_nothing"]="Uwg="
 			}
 		},
-		["lock"]=3,
 		["icon"]="1"
 	},
 	[9]={
@@ -133,7 +132,6 @@ local task = {
  				["num_for_nothing"]="UQ0="
 			}
 		},
-		["lock"]=3,
 		["icon"]="1"
 	},
 	[10]={
@@ -149,7 +147,6 @@ local task = {
  				["num_for_nothing"]="Vwhc"
 			}
 		},
-		["lock"]=3,
 		["icon"]="1"
 	},
 	[11]={
@@ -165,7 +162,6 @@ local task = {
  				["num_for_nothing"]="Vw1c"
 			}
 		},
-		["lock"]=3,
 		["icon"]="1"
 	},
 	[12]={
@@ -241,7 +237,6 @@ local task = {
  				["num_for_nothing"]="Uwg="
 			}
 		},
-		["lock"]=3,
 		["icon"]="2"
 	},
 	[17]={
@@ -257,7 +252,6 @@ local task = {
  				["num_for_nothing"]="UQ0="
 			}
 		},
-		["lock"]=3,
 		["icon"]="2"
 	},
 	[18]={
@@ -273,7 +267,6 @@ local task = {
  				["num_for_nothing"]="Vwhc"
 			}
 		},
-		["lock"]=3,
 		["icon"]="2"
 	},
 	[19]={
@@ -289,7 +282,6 @@ local task = {
  				["num_for_nothing"]="Vw1c"
 			}
 		},
-		["lock"]=3,
 		["icon"]="2"
 	},
 	[20]={
@@ -429,7 +421,6 @@ local task = {
  				["num_for_nothing"]="Uwg="
 			}
 		},
-		["lock"]=5,
 		["icon"]="5"
 	},
 	[29]={
@@ -445,7 +436,6 @@ local task = {
  				["num_for_nothing"]="UQ0="
 			}
 		},
-		["lock"]=5,
 		["icon"]="5"
 	},
 	[30]={
@@ -461,7 +451,6 @@ local task = {
  				["num_for_nothing"]="Vwhc"
 			}
 		},
-		["lock"]=5,
 		["icon"]="5"
 	},
 	[31]={
@@ -477,7 +466,6 @@ local task = {
  				["num_for_nothing"]="Vw1c"
 			}
 		},
-		["lock"]=5,
 		["icon"]="5"
 	},
 	[32]={
@@ -1168,7 +1156,6 @@ local task = {
  				["num_for_nothing"]="Vw1c"
 			}
 		},
-		["lock"]=3,
 		["icon"]="1"
 	},
 	[78]={
@@ -1184,7 +1171,6 @@ local task = {
  				["num_for_nothing"]="Vw1c"
 			}
 		},
-		["lock"]=3,
 		["icon"]="2"
 	},
 	[79]={
@@ -1231,7 +1217,6 @@ local task = {
  				["num_for_nothing"]="Vw1c"
 			}
 		},
-		["lock"]=5,
 		["icon"]="5"
 	},
 	[82]={

lua/app/config/tutorial.lua

@@ -121,7 +121,7 @@ local tutorial = {
 		["arrow_direction"]=2,
 		["arrow_offset"]={
 			0,
-			0
+			50
 		},
 		["show_mask"]=1,
 		["square_size"]={
@@ -329,7 +329,7 @@ local tutorial = {
 		["arrow_direction"]=2,
 		["arrow_offset"]={
 			0,
-			0
+			50
 		},
 		["show_mask"]=1,
 		["square_size"]={
@@ -431,7 +431,7 @@ local tutorial = {
 		["arrow_direction"]=2,
 		["arrow_offset"]={
 			0,
-			0
+			50
 		},
 		["show_mask"]=1,
 		["square_size"]={
@@ -459,7 +459,7 @@ local tutorial = {
 		["arrow_direction"]=2,
 		["arrow_offset"]={
 			0,
-			0
+			50
 		}
 	},
 	[50010]={

lua/app/module/battle/controller/battle_controller.lua

@@ -934,8 +934,6 @@ function BattleController:onLinkCancelOrUp(entity, posId, isVirtual)
         return
     end
 
-    AudioManager:playEffect(AudioManager.EFFECT_ID.LINK_OVER)
-
     local tutorialElementList
     if DataManager.TutorialData:getIsInTutorial() then
         tutorialElementList = DataManager.TutorialData:getTargetElement()
@@ -947,12 +945,15 @@ function BattleController:onLinkCancelOrUp(entity, posId, isVirtual)
     if count < self:getMinEliminationCount() then
         self:clearGridSequence()
 
+        AudioManager:playEffect(AudioManager.EFFECT_ID.LINK_CANCEL)
         if tutorialElementList then
             self.battleUI:showTutorialFinger(tutorialElementList)
         end
         return
     end
 
+    AudioManager:playEffect(AudioManager.EFFECT_ID.LINK_OVER)
+
     if tutorialElementList then
         local posIdmap = {}
         for _, info in ipairs(sequence) do

lua/app/ui/battle/battle_result_ui.lua

@@ -33,7 +33,9 @@ function BattleResultUI:onClose()
     end
     if self.animRewards then
         for idx, anim in pairs(self.animRewards) do
-            anim:Kill()
+            if anim then
+                anim:Kill()
+            end
         end
     end
 end

lua/app/ui/battle/battle_ui.lua

@@ -2203,6 +2203,7 @@ function BattleUI:showBossEnterAni(bornTime, bossName, monsterComp, callback)
         self.battleController:showBuffTips(GConst.BattleConst.SIDE_DEF, true)
         return
     end
+    AudioManager:playEffect(AudioManager.EFFECT_ID.BOSS_WARNING)
     self.bossEnterNode:setVisible(true)
     self.bossEnterImg:setVisible(false)
     self.bossName:setText(bossName)

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

@@ -35,7 +35,7 @@ function MainComp:refreshModule(selectModule)
 		elseif self.curModuleType == GConst.MainCityConst.MAIN_MODULE.DAILY_CHALLENGE then
 			-- 切换到每日挑战
 			EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.GO_DAILY_CHALLENGE)
-			if DataManager.DailyChallengeData:getIsPopTask() then
+			if not DataManager.TutorialData:getIsInTutorial() and DataManager.DailyChallengeData:getIsPopTask() then
 				ModuleManager.DailyChallengeManager:showBattleTaskUI()
 			end
 		end

lua/app/ui/main_city/main_city_ui.lua

@@ -954,6 +954,10 @@ function MainCityUI:checkGift()
     if DataManager.TutorialData:getIsHaveTutorial() then
         return
     end
+    -- 非主线章节界面不处理（只在主线章节也就是主界面弹）
+    if self.selectedIndex ~= GConst.MainCityConst.BOTTOM_PAGE.MAIN or self.subComps[self.selectedIndex]:getCurModuleType() ~= GConst.MainCityConst.MAIN_MODULE.CHAPTER then
+        return
+    end
     -- 章节礼包
     local chapterPopUpGifts = DataManager.ShopData:getPopUpGiftByType(PayManager.PURCHARSE_TYPE.CHAPTER_GIFT)
     -- 通用礼包