Merge branch 'master' into Equip

client_Wu Xijin

2019-03-05 efa5f8d07fc3321f6ac5f5d97fb422db28d0886f

 Fight/GameActor/GA_NpcClientFightNorm.cs

@@ -3,6 +3,7 @@

public class GA_NpcClientFightNorm : GActorNpcFight
{
    public int belongEventID;
    private HeadUpName m_HeadUpName;
    private LifeBar m_LifeBar;

@@ -135,6 +136,8 @@
            m_Obstacle = null;
        }

        belongEventID = -1;

        base.OnUnit();
    }