Merge branch 'master' of https://github.com/Geigerkind/dpsmate

tdymel · Mar 17, 2017 · 02cff66 · 02cff66
2 parents 6304e59 + 975c40f
commit 02cff66
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/DPSMate_!zhCN/DPSMate_ParserZHCN.lua b/DPSMate_!zhCN/DPSMate_ParserZHCN.lua
@@ -289,7 +289,7 @@ if (GetLocale() == "zhCN") then
 			if self.TargetParty[a] and self.TargetParty[b] then DB:BuildFail(1, b, a, DPSMate.L["AutoAttack"], t[5]);DB:DeathHistory(b, a, DPSMate.L["AutoAttack"], t[5], 0, 1, 0, 0) end
 			return
 		end
-		for a,b,c,f,d in strgfind(msg, "(.+)击中(.+)造成(%d+)点(.*)伤害。") do
+		for a,b,c,f,d in strgfind(msg, "(.+)击中(.+)造成(%d+)点(.*)伤害。%s?(.*)") do
 			t = {false, false, false, false, tnbr(c)}
 			if d=="(偏斜)" then t[1]=1;t[3]=0 elseif d~="" then t[2]=1;t[3]=0 end
 			if b=="你" then b=self.player end
@@ -987,7 +987,7 @@ if (GetLocale() == "zhCN") then
 			if self.TargetParty[a] and self.TargetParty[b] then DB:BuildFail(1, b, a, DPSMate.L["AutoAttack"], t[5]);DB:DeathHistory(b, a, DPSMate.L["AutoAttack"], t[5], 0, 1, 0, 0) end
 			return
 		end
-		for a,b,c,f,d in strgfind(msg, "(.+)击中(.+)造成(%d+)点(.*)伤害。") do
+		for a,b,c,f,d in strgfind(msg, "(.+)击中(.+)造成(%d+)点(.*)伤害。%s?(.*)") do
 			t = {false, false, false, false, tnbr(c)}
 			if d=="(偏斜)" then t[1]=1;t[3]=0 elseif d~="" then t[2]=1;t[3]=0 end
 			if b=="你" then b=self.player end