From 0701fabd203b46244fa781b63ba5a13d7a0ebfad Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期六, 27 四月 2019 14:34:48 +0800
Subject: [PATCH] Merge branch 'master' into ViewOtherPlayer

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

diff --git a/Core/GameEngine/Model/Player/Character/PlayerBaseData.cs b/Core/GameEngine/Model/Player/Character/PlayerBaseData.cs
index 689fea9..ad0e082 100644
--- a/Core/GameEngine/Model/Player/Character/PlayerBaseData.cs
+++ b/Core/GameEngine/Model/Player/Character/PlayerBaseData.cs
@@ -65,6 +65,9 @@
     public int reduceHeartHurt;//浼氬績涓�鍑讳激瀹冲浐瀹氬�煎噺鍏�
     public int reduceFinalHurt;//鏈�缁堜激瀹崇櫨鍒嗘瘮鍑忓厤
 
+    public int yinjiCount;//褰撳墠鍗拌鏁伴噺
+    public int yinjiTime;//鍗拌杞湀鏃堕棿
+
     public long treasurePotentialSp
     {
         get

--
Gitblit v1.8.0