From 947cf95b1b1b6edf036b56dcac391d62d8bd3c55 Mon Sep 17 00:00:00 2001 From: mashiyu Date: Tue, 26 Mar 2019 19:25:26 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/util/CBean2Proto.java | 2 +- .../src/main/java/com/ljsd/jieling/util/FightDataUtil.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java index b83575bbf..51f0c2e30 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -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("#"); //冰系伤害加成系数 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java index d10949fa9..53b34c61e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java @@ -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])); From 38dee193ecf4536101c6ddfe0284150285d55821 Mon Sep 17 00:00:00 2001 From: jiahuiwen <1024696487@qq.com> Date: Tue, 26 Mar 2019 19:28:10 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=81=93=E5=85=B7bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java index 8d22a453a..64d75fa26 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -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) ; } From 6c5411b8b6f045b229c9fda4715f03f5c52ca051 Mon Sep 17 00:00:00 2001 From: mashiyu Date: Tue, 26 Mar 2019 20:19:15 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=9B=9E=E8=A1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- luafight/Modules/Battle/Logic/Misc/BattleUtil.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/luafight/Modules/Battle/Logic/Misc/BattleUtil.lua b/luafight/Modules/Battle/Logic/Misc/BattleUtil.lua index c50f56b13..270ef8873 100644 --- a/luafight/Modules/Battle/Logic/Misc/BattleUtil.lua +++ b/luafight/Modules/Battle/Logic/Misc/BattleUtil.lua @@ -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)