Merge branch 'master' of 60.1.1.230:backend/jieling_server
commit
e8893ce66b
|
@ -145,11 +145,11 @@ function BattleUtil.CalDamage(atkRole, defRole, damageType, baseFactor, ignoreDe
|
|||
end
|
||||
|
||||
function BattleUtil.ApplyTreat(castRole, targetRole, value, baseFactor)
|
||||
if not baseFactor then baseFactor = 1 end
|
||||
baseFactor = baseFactor or 1
|
||||
local maxHp = targetRole:GetRoleData(RoleDataName.MaxHp)
|
||||
local hp = targetRole:GetRoleData(RoleDataName.Hp)
|
||||
local factor = castRole:GetRoleData(RoleDataName.TreatFacter)
|
||||
local treat = min(floor(value * baseFactor * factor + 0.5), maxHp - hp)
|
||||
local treat = min(floor(value * baseFactor * (factor + 1) + 0.5), maxHp - hp)
|
||||
targetRole.data:AddValue(RoleDataName.Hp, treat)
|
||||
castRole.Event:DispatchEvent(BattleEventName.RoleTreat, targetRole, treat)
|
||||
targetRole.Event:DispatchEvent(BattleEventName.RoleBeTreated, castRole, treat)
|
||||
|
|
|
@ -165,7 +165,7 @@ public class CBean2Proto {
|
|||
monsterPropertyList.append(sMonsterConfig.getDodge()).append("#"); //闪避率
|
||||
monsterPropertyList.append(sMonsterConfig.getCritFactor()).append("#"); //暴击率
|
||||
monsterPropertyList.append(sMonsterConfig.getCritDamageFactor()).append("#"); //暴击伤害系数
|
||||
monsterPropertyList.append(1).append("#"); //治疗加成系数
|
||||
monsterPropertyList.append(0).append("#"); //治疗加成系数
|
||||
monsterPropertyList.append(damageBonusFactor[0]).append("#"); //火系伤害加成系数
|
||||
monsterPropertyList.append(damageReduceFactor[0]).append("#"); //火系伤害减免系数
|
||||
monsterPropertyList.append(damageBonusFactor[1]).append("#"); //冰系伤害加成系数
|
||||
|
|
|
@ -115,7 +115,7 @@ public class FightDataUtil {
|
|||
property.rawset(11, LuaValue.valueOf(sMonster.getDodge()));
|
||||
property.rawset(12, LuaValue.valueOf(sMonster.getCritFactor()));
|
||||
property.rawset(13, LuaValue.valueOf(sMonster.getCritDamageFactor()));
|
||||
property.rawset(14, LuaValue.valueOf(1));
|
||||
property.rawset(14, LuaValue.valueOf(0));
|
||||
property.rawset(15, LuaValue.valueOf(sMonster.getDamageBonusFactor()[0]));
|
||||
property.rawset(16, LuaValue.valueOf(sMonster.getDamageReduceFactor()[0]));
|
||||
property.rawset(17, LuaValue.valueOf(sMonster.getDamageBonusFactor()[1]));
|
||||
|
|
|
@ -8,6 +8,7 @@ import com.ljsd.jieling.handler.map.MapManager;
|
|||
import com.ljsd.jieling.handler.map.TemporaryItems;
|
||||
import com.ljsd.jieling.logic.dao.*;
|
||||
import com.ljsd.jieling.logic.dao.root.User;
|
||||
import com.ljsd.jieling.logic.item.ItemLogic;
|
||||
import com.ljsd.jieling.protocols.CommonProto;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
@ -320,6 +321,8 @@ public class ItemUtil {
|
|||
if (item != null) {
|
||||
Item temporaryItem = entry.getValue();
|
||||
item.setItemNum(item.getItemNum() + temporaryItem.getItemNum());
|
||||
} else {
|
||||
item = entry.getValue();
|
||||
}
|
||||
itemMap.put(entry.getKey(), item) ;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue