瀏覽代碼

王者争霸战斗阵容增加羁绊

gitxsm 4 月之前
父節點
當前提交
c20a94e75f
共有 2 個文件被更改,包括 3 次插入2 次删除
  1. 1 1
      script/module/jjcGodWar/JjcGodWarCombat.lua
  2. 2 1
      script/module/jjcGodWar/JjcGodWarDB.lua

+ 1 - 1
script/module/jjcGodWar/JjcGodWarCombat.lua

@@ -63,7 +63,7 @@ function getCombatObjList(human, side, args)
 	local data = JjcGodWarDB.getGodWarDataByUuid(uuid)
 	if JjcDB.isNpc(data) then return end
 	--require("common.Util").printTable(data.rolebase)
-	return data.objList, data.helpList, data.rolebase, data.formation, nil, data.elfList
+	return data.objList, data.helpList, data.rolebase, data.formation, data.jiban, data.elfList
  end 
 
 function getCombatMonsterOutID(human, side, args)

+ 2 - 1
script/module/jjcGodWar/JjcGodWarDB.lua

@@ -117,11 +117,12 @@ function initGodWar()
 				CombatPosLogic.copyCombatHeros(fakeHuman, CombatDefine.COMBAT_TYPE1, CombatDefine.COMBAT_TYPE4)
 				ObjHuman.save(fakeHuman)
 			end
-			local objList, helpList, rolebase, formation, _, elfList = CombatLogic.getHumanObjList(fakeHuman, CombatDefine.COMBAT_TYPE4)
+			local objList, helpList, rolebase, formation, jiban, elfList = CombatLogic.getHumanObjList(fakeHuman, CombatDefine.COMBAT_TYPE4)
 
 			roleData = {}
 			roleData.objList = Util.copyTable(objList)
 			roleData.helpList = Util.copyTable(helpList)
+			roleData.jiban = Util.copyTable(jiban)
 			roleData.elfList = Util.copyTable(elfList)
 			roleData.rolebase = Util.copyTable(rolebase)
 			roleData.formation = formation