From 60f1dd0aff3bdd8e027572cfb4f7374b0e7fdd44 Mon Sep 17 00:00:00 2001 From: mashiyu Date: Thu, 21 Mar 2019 17:48:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Battle/Logic/Base/RoleData.lua | 32 +------------------ .../com/ljsd/jieling/util/CBean2Proto.java | 7 ++-- 2 files changed, 5 insertions(+), 34 deletions(-) diff --git a/luafight/Modules/Battle/Logic/Base/RoleData.lua b/luafight/Modules/Battle/Logic/Base/RoleData.lua index 2df5bd2b6..978f9e4fd 100644 --- a/luafight/Modules/Battle/Logic/Base/RoleData.lua +++ b/luafight/Modules/Battle/Logic/Base/RoleData.lua @@ -1,36 +1,6 @@ RoleData = {} RoleData.__index = RoleData local max = math.max - -local dataOrder = { - RoleDataName.Level, - RoleDataName.Hp, - RoleDataName.MaxHp, - RoleDataName.Attack, - RoleDataName.PhysicalDefence, - RoleDataName.MagicDefence, - RoleDataName.Speed, - RoleDataName.DamageBocusFactor, - RoleDataName.DamageReduceFactor, - RoleDataName.Hit, - RoleDataName.Dodge, - RoleDataName.Crit, - RoleDataName.CritDamageFactor, - RoleDataName.TreatFacter, - RoleDataName.FireDamageBocusFactor, - RoleDataName.IceDamageBocusFactor, - RoleDataName.LightDamageBocusFactor, - RoleDataName.WindDamageBocusFactor, - RoleDataName.LandDamageBocusFactor, - RoleDataName.DarkDamageBocusFactor, - RoleDataName.FireDamageReduceFactor, - RoleDataName.IceDamageReduceFactor, - RoleDataName.LightDamageReduceFactor, - RoleDataName.WindDamageReduceFactor, - RoleDataName.LandDamageReduceFactor, - RoleDataName.DarkDamageReduceFactor, -} - function RoleData.New() local instance = {role=0, data={0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}} setmetatable(instance, RoleData) @@ -40,7 +10,7 @@ end function RoleData:Init(role, data) self.role = role for i=1, #data do - self.data[dataOrder[i]] = data[i] + self.data[i] = data[i] end end 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 dfd3c5da3..d2cc4a991 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -154,9 +154,10 @@ public class CBean2Proto { monsterPropertyList.append(sMonsterConfig.getSpeed()).append("#"); //速度 monsterPropertyList.append(0).append("#"); //伤害加成系数 monsterPropertyList.append(0).append("#"); //伤害减免系数 - monsterPropertyList.append((int)(sMonsterConfig.getHit() * 10000)).append("#"); //命中率 - monsterPropertyList.append((int)(sMonsterConfig.getDodge() * 10000)).append("#"); //闪避率 - monsterPropertyList.append((int)(sMonsterConfig.getCritDamageFactor() * 10000)).append("#"); //暴击伤害系数 + monsterPropertyList.append(sMonsterConfig.getHit()).append("#"); //命中率 + monsterPropertyList.append(sMonsterConfig.getDodge()).append("#"); //闪避率 + monsterPropertyList.append(sMonsterConfig.getCritFactor()).append("#"); //暴击率 + monsterPropertyList.append(sMonsterConfig.getCritDamageFactor()).append("#"); //暴击伤害系数 monsterPropertyList.append(1).append("#"); //治疗加成系数 monsterPropertyList.append(damageBonusFactor[0]).append("#"); //火系伤害加成系数 monsterPropertyList.append(damageReduceFactor[0]).append("#"); //火系伤害减免系数