From 052bb69a8b50948052165847ea44312b8d4f6607 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 20 九月 2018 16:13:14 +0800
Subject: [PATCH] Merge branch 'master' into 1871天赋功能

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

diff --git a/Core/GameEngine/Model/Player/Character/PlayerExtersionData.cs b/Core/GameEngine/Model/Player/Character/PlayerExtersionData.cs
index 3913617..c9324aa 100644
--- a/Core/GameEngine/Model/Player/Character/PlayerExtersionData.cs
+++ b/Core/GameEngine/Model/Player/Character/PlayerExtersionData.cs
@@ -54,6 +54,7 @@
     public int pkState;//鏄惁鍦╬k涓� 175 1--杩涘叆鐘舵�� 2--閫�鍑虹姸鎬�
     public int bossState;//Boss鐘舵��  176 1--杩涘叆鐘舵�� 2--閫�鍑虹姸鎬�
     public int OnlyFinalHurt;
+    public int forbidenTalk;
     public int NpcHurtAddPer;//瀵规�墿浼ゅ鍔犳垚 188
     public int FunalHurtPer;//瀵规�墿浼ゅ鍔犳垚 189
 }

--
Gitblit v1.8.0