Merge branch 'master' of https://gitee.com/wangwenfan/congkong

script/module/combat/BeSkill.lua

@@ -19,7 +19,7 @@ local HeroDefine = require("hero.HeroDefine")
 
 local tbFuwenSkillGroupID = {}
 local posSortBySpeed = posSortBySpeed or {}
--- beskill 阵法技能和符文相关 @mafei
+
 function initBeSkill(obj)
 	obj.beSkillList = {}
 	obj.beSkillListTemp = {}

script/module/combat/CombatLogic.lua

@@ -432,6 +432,7 @@ function createHeroObjByHeroGrid(human, heroGrid)
     obj.sex = heroConfig.sex
     local attrConfig =  HeroDefine.getAttrConfig(obj.id, obj.star)
     BeSkill.initBeSkill(obj)
+	-- 初始化技能和普攻数据
     if not SkinLogic.setSkill(human,obj.bagIndex,attrConfig,obj) then
 		Skill.setSkill(obj, attrConfig)	
 		BeSkill.setBeSkill(obj, attrConfig)

script/module/combat/Skill.lua

@@ -13,35 +13,33 @@ local ProjectLogic = require("platform.ProjectLogic")
 local BufferExcel = require("excel.buffer")
 
 function setSkill(obj,config,skinConfig)
-	config = skinConfig or config
-	obj.skillList = {}
-	local skillList = obj.skillList
-	local len = 0
+	config = skinConfig or config	
+	local skillList = {}
 	local skillConfig
 	local normalAtkID = config.normalAtkID
+	local temp = {}
 	--普通技能
 	if normalAtkID then
-		len = len + 1
 		skillConfig = SkillExcel[normalAtkID]
-		obj.skillList[len] = {normalAtkID,skillConfig.cd[1] or 0,skillConfig.cd[2] or 0}--skillID,开始使用回合，冷切回合
+		skillList[#skillList + 1] = {normalAtkID,skillConfig.cd[1] or 0,skillConfig.cd[2] or 0}--skillID,开始使用回合，冷切回合
+		temp[normalAtkID] = true
 	end
 
 	--主动技能
-    local temp = {}
 	for _,skillID in ipairs(config.skillList) do
-		len = len + 1
 		skillConfig = SkillExcel[skillID]
         if not temp[skillID] and skillConfig and skillConfig.need <= obj.quality then
-		   obj.skillList[len] = {skillID,skillConfig.cd[1] or 0,skillConfig.cd[2] or 0}--skillID,开始使用回合，冷切回合
-           temp[skillID] = 1
+		   skillList[#skillList + 1] = {skillID,skillConfig.cd[1] or 0,skillConfig.cd[2] or 0}--skillID,开始使用回合，冷切回合
+           temp[skillID] = true
         end
 	end
 
-	if len > 1 then
-		table.sort(obj.skillList,function(a,b)
+	if #skillList > 1 then
+		table.sort(skillList,function(a,b)
 			return a[3] > b[3]
 		end)
 	end
+	obj.skillList = skillList
 end
 
 

script/module/skin/SkinLogic.lua

@@ -6,6 +6,7 @@ local Lang = require("common.Lang")
 local Util = require("common.Util")
 local ItemDefine = require("bag.ItemDefine")
 local BeSkill = require("combat.BeSkill")
+local Skill = require("combat.Skill")
 local HeroLogic = require("hero.HeroLogic")
 local RoleHeadLogic = require("role.RoleHeadLogic")
 local SkinExcel = require("excel.skin").skin
@@ -621,7 +622,7 @@ function setSkill(human,heroInd,heroConf,obj)
 	end
 
 	local skillConf = SkillExcel[skinSkillID]
-	Skill.setSkill(obj, heroConfig,skillConf)	
+	Skill.setSkill(obj, heroConf,skillConf)	
 	BeSkill.setBeSkill(obj,heroConf,skillConf)
 	return true
 end