提交怪物修改

script/module/hero/HeroGrid.lua

@@ -24,6 +24,7 @@ local Util = require("common.Util")
 local UpNeedExcel = require("excel.upNeed")
 local HeroExcel = require("excel.hero")
 local MonsterExcel = require("excel.monster")
+local BattleMonsterExcel = require("excel.battlemonster")
 local ObjHuman = require("core.ObjHuman")
 local RoleDefine = require("role.RoleDefine")
 local HeroDefine = require("hero.HeroDefine")
@@ -385,7 +386,7 @@ end
 function makeHeroSimpleByMonsterID(net, id, others)
 	makeHeroSimpleByID(net, nil, nil, others)
 
-	local mcf = MonsterExcel.monster[id]
+	local mcf = MonsterExcel.monster[id] or BattleMonsterExcel.monster[id]
 	if not mcf then return end
 
 	net.id = id	
@@ -660,7 +661,7 @@ function makeHeroInfo(net, grid)
 end
 
 function makeMonsterSimpleData(net, id, lv)
-	local mcf = MonsterExcel.monster[id]
+	local mcf = MonsterExcel.monster[id] or BattleMonsterExcel.monster[id] 
 	if not mcf then return end
 	net.id = id or 0
 	net.icon = mcf.head
@@ -673,11 +674,11 @@ end
 
 
 function getMonsterOutIDBody(id)
-	local monsterOutConfig = MonsterExcel.monsterOut[id]
+	local monsterOutConfig = MonsterExcel.monsterOut[id]  or BattleMonsterExcel.monsterOut[id] 
 	if not monsterOutConfig then return 0 end
 
 	local monsterID = monsterOutConfig.member[1][1]
-	local monsterConfig = MonsterExcel.monster[monsterID]
+	local monsterConfig = MonsterExcel.monster[monsterID] or BattleMonsterExcel.monster[monsterID]
 	if not monsterConfig then return 0 end
 	return monsterConfig.body
 end

script/module/monster/MonsterGrid.lua

@@ -1,59 +1,59 @@
-local monsterConfig = require("excel.monster")
-local RoleAttr = require("role.RoleAttr")
-local RoleDefine = require("role.RoleDefine")
-
-
--- 创建一个怪物grid
-function createMonsterObj(monsterId, attrId, refreshData, deleteData)
-	local monsterCfg = monsterConfig.monster[monsterId]
-	if not monsterCfg then 
-		--assert(nil, "not monster id "..id)
-		return
-	end
-	local Obj = {}
-
-    --暂时加这些，后续有需要再加
-	Obj.id = monsterId
-	Obj.lv = 1
-    Obj.quality = 0
-    Obj.power = 0
-    Obj.star = monsterCfg.star or 0
-	Obj.icon = monsterCfg.head or 0
-	Obj.camp = monsterCfg.camp or 0
-	Obj.body = monsterCfg.body or 0
-    Obj.head = monsterCfg.head or 0
-
-
-    for k, v in pairs(refreshData or {}) do
-        Obj[k] = v
-    end
-
-    for key in pairs(deleteData or {}) do
-        Obj[key] = nil
-    end
-
-    local attrs = RoleAttr.calcMonsterConf(monsterId, attrId)
-    Obj.power = attrs[RoleDefine.ZHANDOULI]
-
-	return Obj
-end
-
--- 根据monsterOutID创建怪物obj List
-function createMonsterObjListByMonsterOutID(monsterOutID)
-    if not monsterOutID then return end
-
-    local singleCfg = monsterConfig.monsterOut[monsterOutID]
-    local member = singleCfg.member
-    local attrIds = singleCfg.attrID
-
-    local objList = {}
-    for k, v in ipairs(member) do
-        local monsterID = v[1]
-        local monsterLv = v[2]
-        local attrId = attrIds[k]
-        local refreshData = {lv = monsterLv}
-        local obj = createMonsterObj(monsterID, attrId, refreshData)
-        objList[k] = obj
-    end
-    return objList
+local monsterConfig = require("excel.monster")
+local RoleAttr = require("role.RoleAttr")
+local RoleDefine = require("role.RoleDefine")
+local BattleMonsterExcel = require("excel.battlemonster")
+
+-- 创建一个怪物grid
+function createMonsterObj(monsterId, attrId, refreshData, deleteData)
+	local monsterCfg = monsterConfig.monster[monsterId] or BattleMonsterExcel.monster[monsterId] 
+	if not monsterCfg then 
+		--assert(nil, "not monster id "..id)
+		return
+	end
+	local Obj = {}
+
+    --暂时加这些，后续有需要再加
+	Obj.id = monsterId
+	Obj.lv = 1
+    Obj.quality = 0
+    Obj.power = 0
+    Obj.star = monsterCfg.star or 0
+	Obj.icon = monsterCfg.head or 0
+	Obj.camp = monsterCfg.camp or 0
+	Obj.body = monsterCfg.body or 0
+    Obj.head = monsterCfg.head or 0
+
+
+    for k, v in pairs(refreshData or {}) do
+        Obj[k] = v
+    end
+
+    for key in pairs(deleteData or {}) do
+        Obj[key] = nil
+    end
+
+    local attrs = RoleAttr.calcMonsterConf(monsterId, attrId)
+    Obj.power = attrs[RoleDefine.ZHANDOULI]
+
+	return Obj
+end
+
+-- 根据monsterOutID创建怪物obj List
+function createMonsterObjListByMonsterOutID(monsterOutID)
+    if not monsterOutID then return end
+
+    local singleCfg = monsterConfig.monsterOut[monsterOutID] or BattleMonsterExcel.monsterOut[monsterOutID] 
+    local member = singleCfg.member
+    local attrIds = singleCfg.attrID
+
+    local objList = {}
+    for k, v in ipairs(member) do
+        local monsterID = v[1]
+        local monsterLv = v[2]
+        local attrId = attrIds[k]
+        local refreshData = {lv = monsterLv}
+        local obj = createMonsterObj(monsterID, attrId, refreshData)
+        objList[k] = obj
+    end
+    return objList
 end

script/module/role/RoleAttr.lua

@@ -16,6 +16,7 @@ local HeroExcel = require("excel.hero").hero
 -- local skillExcel = require("excel.skill").skill
 local MonsterExcel = require("excel.monster").monster
 local MonsterAttrExcel = require("excel.monster").monsterAttr
+local BattleMonsterExcel = require("excel.battlemonster")
 local Util = require("common.Util")
 local BeSkill = require("combat.BeSkill")
 local RoleHeadLogic = require("role.RoleHeadLogic")
@@ -91,12 +92,17 @@ end
 
 -- 获取怪物属性 用的地方有点多，不一定改
 function calcMonsterConf(monsterID, attrID, attrInput)
-	local monsterConfig = MonsterExcel[monsterID]
+	local monsterConfig = MonsterExcel[monsterID] or BattleMonsterExcel.monster[monsterID]
 	local attrsConfig = attrID and MonsterAttrExcel[attrID]
+	if not attrsConfig then
+		attrsConfig = attrID and BattleMonsterExcel.monsterAttr[attrID]
+	end
+
 	if not attrsConfig then
 		attrID = 1
 		attrsConfig = MonsterAttrExcel[attrID]
 	end
+	
 	local attrs = {}
 	initCombatAttr(attrs)
 	attrs[RoleDefine.INIT_MP] = 50