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

lua/app/config/const.lua

@@ -28,7 +28,7 @@ local const = {
 		["value"]=200
 	},
 	["crit_dmg"]={
-		["value"]=1500
+		["value"]=15000
 	}
 }
 local config = {

lua/app/config/skill.lua

@@ -562,10 +562,7 @@ local skill = {
 		["link"]=1,
 		["position"]=2,
 		["method"]=2,
-		["skill_type"]=2,
+		["skill_type"]=1,
-		["skill_type_parameter"]={
-			2
-		},
 		["boardrange"]={
 			{
 				["type"]=5,

lua/app/config/skill_rogue.lua

@@ -661,7 +661,7 @@ local skill_rogue = {
 	[200101]={
 		["limit_times"]=1,
 		["weight"]=1000,
-		["qlt"]=4,
+		["qlt"]=3,
 		["type"]=12,
 		["skill_position"]=3,
 		["effect"]={
@@ -870,11 +870,11 @@ local skill_rogue = {
 		["skill_position"]=1,
 		["boardrange"]={
 			{
-				["type"]=3,
+				["type"]=1,
 				["range"]=1
 			},
 			{
-				["type"]=4,
+				["type"]=2,
 				["range"]=1
 			}
 		},

lua/app/config/strings/cn/skill_rogue.lua

@@ -183,7 +183,7 @@ local skill_rogue = {
 		["desc"]="舞步消散：将左右<color=#3cff28>2</color>格元素进行消除"
 	},
 	[200501]={
-		["desc"]="舞步消散左右可多消<color=#3cff28>1</color>格"
+		["desc"]="舞步消散上下可多消<color=#3cff28>1</color>格"
 	},
 	[200502]={
 		["desc"]="跟舞步消散连接线上的元素伤害增加<color=#3cff28>10%</color>"

lua/app/config/tutorial.lua

@@ -26,13 +26,13 @@ local tutorial = {
 		["txt"]="tutorial_txt_1",
 		["txt_offset"]={
 			0,
-			0
+			110
 		},
 		["target_name"]="battle_skill_select_ui(Clone)/skill_node/skill_select_cell_1",
 		["arrow_direction"]=1,
 		["arrow_offset"]={
 			0,
-			0
+			-50
 		},
 		["show_mask"]=1,
 		["square_size"]={
@@ -59,6 +59,7 @@ local tutorial = {
 	},
 	[10060]={
 		["next_id"]=10070,
+		["delay"]=1.0,
 		["type"]=6,
 		["finish"]=4,
 		["target_element"]={
@@ -75,6 +76,7 @@ local tutorial = {
 		["finish"]=3
 	},
 	[10080]={
+		["delay"]=1.0,
 		["type"]=6,
 		["finish"]=4,
 		["target_element"]={
@@ -91,13 +93,13 @@ local tutorial = {
 		["txt"]="tutorial_txt_2",
 		["txt_offset"]={
 			0,
-			0
+			180
 		},
 		["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/chapter/progress_bg/box_1",
 		["arrow_direction"]=1,
 		["arrow_offset"]={
 			0,
-			0
+			-50
 		},
 		["show_mask"]=2,
 		["circle_r"]=100,
@@ -144,7 +146,7 @@ local tutorial = {
 		["arrow_direction"]=1,
 		["arrow_offset"]={
 			0,
-			0
+			-100
 		},
 		["show_mask"]=1,
 		["square_size"]={
@@ -163,7 +165,7 @@ local tutorial = {
 		["arrow_direction"]=1,
 		["arrow_offset"]={
 			0,
-			0
+			-50
 		},
 		["show_mask"]=1,
 		["square_size"]={
@@ -192,7 +194,7 @@ local tutorial = {
 		["arrow_direction"]=1,
 		["arrow_offset"]={
 			0,
-			0
+			-100
 		},
 		["show_mask"]=1,
 		["square_size"]={
@@ -238,13 +240,13 @@ local tutorial = {
 		["txt"]="tutorial_txt_3",
 		["txt_offset"]={
 			0,
-			0
+			180
 		},
 		["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/chapter/progress_bg/box_1",
 		["arrow_direction"]=1,
 		["arrow_offset"]={
 			0,
-			0
+			-50
 		},
 		["show_mask"]=2,
 		["circle_r"]=100,
@@ -272,7 +274,7 @@ local tutorial = {
 		["arrow_direction"]=1,
 		["arrow_offset"]={
 			0,
-			0
+			-100
 		},
 		["show_mask"]=1,
 		["square_size"]={
@@ -290,7 +292,7 @@ local tutorial = {
 		["arrow_direction"]=1,
 		["arrow_offset"]={
 			0,
-			0
+			-50
 		}
 	},
 	[40000]={
@@ -299,13 +301,13 @@ local tutorial = {
 		["txt"]="tutorial_txt_4",
 		["txt_offset"]={
 			0,
-			0
+			180
 		},
 		["target_name"]="main_ui(Clone)/sub_ui_node/main_comp/chapter/progress_bg/box_2",
 		["arrow_direction"]=1,
 		["arrow_offset"]={
 			0,
-			0
+			-50
 		},
 		["show_mask"]=2,
 		["circle_r"]=100,
@@ -352,7 +354,7 @@ local tutorial = {
 		["arrow_direction"]=1,
 		["arrow_offset"]={
 			0,
-			0
+			-100
 		},
 		["show_mask"]=1,
 		["square_size"]={
@@ -371,7 +373,7 @@ local tutorial = {
 		["arrow_direction"]=1,
 		["arrow_offset"]={
 			0,
-			0
+			-50
 		},
 		["show_mask"]=1,
 		["square_size"]={
@@ -400,7 +402,7 @@ local tutorial = {
 		["arrow_direction"]=1,
 		["arrow_offset"]={
 			0,
-			0
+			-100
 		},
 		["show_mask"]=1,
 		["square_size"]={
@@ -418,7 +420,7 @@ local tutorial = {
 		["arrow_direction"]=1,
 		["arrow_offset"]={
 			0,
-			0
+			-50
 		}
 	}
 }

lua/app/module/battle/helper/battle_formula.lua

@@ -24,7 +24,7 @@ BattleFormula.calculateFormula = {
 		local crit = unitComp.unitEntity:getCrit()
 		if crit > 0 then
 			if BattleHelper:random(1, DEFAULT_FACTOR) <= crit then -- 暴击了
-				result = result * (DEFAULT_FACTOR + unitComp.unitEntity:getCrittime()) // DEFAULT_FACTOR
+				result = result * (BattleHelper:getDefaultCrittime() + unitComp.unitEntity:getCrittime()) // DEFAULT_FACTOR
 				hurtState = HURT_STATE_CRIT
 			end
 		end

lua/app/module/battle/helper/battle_helper.lua

@@ -62,6 +62,13 @@ function BattleHelper:getSupportInterval()
     return self.supportInterval
 end
 
+function BattleHelper:getDefaultCrittime()
+    if self.defaultCrittime == nil then
+        self.defaultCrittime = GFunc.getConstIntValue("crit_dmg")
+    end
+    return self.defaultCrittime
+end
+
 function BattleHelper:loadBattleHeroModel(id, parent, callback)
     local pool = self.characterPools[id]
     if pool and #pool > 0 then