wasteland / server

Commit acfc2f02def859c86e6b60dc2881c5854b123e45

Authored by zhouhaihai
1 parent 565b0ad0

零件套装增加冒险战斗被动

Showing 2 changed files with 14 additions and 11 deletions   Show diff stats
Inline Side-by-side
1 -Subproject commit 0f883beaf731c166deb8b7169108c1014d504e64 1 +Subproject commit d1b10c53dcd4e448396a8fbbe10fcfb595ec79f5
src/models/HeroPlugin.lua
  Show/Hide comments   View file @acfc2f0
@@ -94,7 +94,7 @@ function HeroPlugin.bind(Hero) @@ -94,7 +94,7 @@ function HeroPlugin.bind(Hero)
94 local equipAttrs = self:getRuneEquipAttrs() 94 local equipAttrs = self:getRuneEquipAttrs()
95 95
96 for _, attName in pairs(AttsEnumEx) do 96 for _, attName in pairs(AttsEnumEx) do
97 - attrs[attName] = ((attrs[attName] or 0) + equipAttrs.value[attName]) * (1 + equipAttrs.precent[attName] / 100) 97 + attrs[attName] = ((attrs[attName] or 0) + equipAttrs.value[attName]) * (1 + equipAttrs.percent[attName] / 100)
98 end 98 end
99 99
100 -- 羁绊加成 100 -- 羁绊加成
@@ -108,10 +108,10 @@ function HeroPlugin.bind(Hero) @@ -108,10 +108,10 @@ function HeroPlugin.bind(Hero)
108 108
109 -- 当前零件和装备增加属性 109 -- 当前零件和装备增加属性
110 function Hero:getRuneEquipAttrs() 110 function Hero:getRuneEquipAttrs()
111 - local attrs = {value = {}, precent = {}} 111 + local attrs = {value = {}, percent = {}}
112 for _, attName in pairs(AttsEnumEx) do 112 for _, attName in pairs(AttsEnumEx) do
113 attrs.value[attName] = 0 113 attrs.value[attName] = 0
114 - attrs.precent[attName] = 0 114 + attrs.percent[attName] = 0
115 end 115 end
116 local equipSuits = {} 116 local equipSuits = {}
117 -- 装备效果 117 -- 装备效果
@@ -137,13 +137,13 @@ function HeroPlugin.bind(Hero) @@ -137,13 +137,13 @@ function HeroPlugin.bind(Hero)
137 local effects = suitCsv.effect:toTableArray(true) 137 local effects = suitCsv.effect:toTableArray(true)
138 local count = #eDatas 138 local count = #eDatas
139 if count >= 2 then 139 if count >= 2 then
140 - attrs.precent[AttsEnumEx[effects[1][1]]] = attrs.precent[AttsEnumEx[effects[1][1]]] + effects[1][2] 140 + attrs.percent[AttsEnumEx[effects[1][1]]] = attrs.percent[AttsEnumEx[effects[1][1]]] + effects[1][2]
141 end 141 end
142 if count >= 3 then 142 if count >= 3 then
143 - attrs.precent[AttsEnumEx[effects[2][1]]] = attrs.precent[AttsEnumEx[effects[2][1]]] + effects[1][2] 143 + attrs.percent[AttsEnumEx[effects[2][1]]] = attrs.percent[AttsEnumEx[effects[2][1]]] + effects[1][2]
144 end 144 end
145 if count >= 4 then 145 if count >= 4 then
146 - attrs.precent[AttsEnumEx[effects[3][1]]] = attrs.precent[AttsEnumEx[effects[3][1]]] + effects[3][2] 146 + attrs.percent[AttsEnumEx[effects[3][1]]] = attrs.percent[AttsEnumEx[effects[3][1]]] + effects[3][2]
147 end 147 end
148 end 148 end
149 end 149 end
@@ -168,11 +168,14 @@ function HeroPlugin.bind(Hero) @@ -168,11 +168,14 @@ function HeroPlugin.bind(Hero)
168 if suitCsv then 168 if suitCsv then
169 local effects = suitCsv.effect:toTableArray(true) 169 local effects = suitCsv.effect:toTableArray(true)
170 local count = #runeDatas 170 local count = #runeDatas
171 - if count >= 2 then  
172 - attrs.precent[AttsEnumEx[effects[1][1]]] = attrs.precent[AttsEnumEx[effects[1][1]]] + effects[1][2] 171 + if count >= 2 and AttsEnumEx[effects[1][1]]then
  172 + attrs.percent[AttsEnumEx[effects[1][1]]] = attrs.percent[AttsEnumEx[effects[1][1]]] + effects[1][2]
  173 + end
  174 + if count >= 4 and AttsEnumEx[effects[2][1]] then
  175 + attrs.percent[AttsEnumEx[effects[2][1]]] = attrs.percent[AttsEnumEx[effects[2][1]]] + effects[2][2]
173 end 176 end
174 - if count == 6 then  
175 - attrs.precent[AttsEnumEx[effects[3][1]]] = attrs.precent[AttsEnumEx[effects[3][1]]] + effects[3][2] 177 + if count >= 6 and AttsEnumEx[effects[3][1]] then
  178 + attrs.percent[AttsEnumEx[effects[3][1]]] = attrs.percent[AttsEnumEx[effects[3][1]]] + effects[3][2]
176 end 179 end
177 end 180 end
178 end 181 end