Merge remote-tracking branch 'origin/master' into Cross_Server

client_Wu Xijin

2018-12-21 e5530e1ca1f28ab70c783d2b3ec685bb6569504b

 Core/GameEngine/Model/Player/Character/PlayerExtersionData.cs

@@ -59,4 +59,7 @@
    public int NpcHurtAddPer;//对怪物伤害加成 188

    public int FunalHurtPer;//对怪物伤害加成 189

    public int talentPoint;//天赋点数 190

    public uint soulDust;//聚魂-魂尘 196

    public uint soulSplinters;//聚魂-碎片 197

    public uint soulCore;//聚魂-核心环 198

}