From 8c1184fced045f133de6cc7fe55deb38e1884812 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期六, 13 四月 2019 11:30:50 +0800
Subject: [PATCH] Merge branch 'master' into HazyRegion

---
 Core/GameEngine/Model/Player/Character/PlayerBaseData.cs |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/Core/GameEngine/Model/Player/Character/PlayerBaseData.cs b/Core/GameEngine/Model/Player/Character/PlayerBaseData.cs
index a303bfc..57788a9 100644
--- a/Core/GameEngine/Model/Player/Character/PlayerBaseData.cs
+++ b/Core/GameEngine/Model/Player/Character/PlayerBaseData.cs
@@ -57,6 +57,11 @@
     public int water;//鐏垫牴灞炴�р�斺�旀按
     public int fire;//鐏垫牴灞炴�р�斺�旂伀
     public int earth;//鐏垫牴灞炴�р�斺�斿湡
+    public int NormalHurt;
+    public int NormalHurtPer;
+    public int FabaoHurt;
+    public int FabaoHurtPer;
+
     public long treasurePotentialSp
     {
         get

--
Gitblit v1.8.0