Merge branch 'master' into Equip

client_Wu Xijin

2019-03-05 efa5f8d07fc3321f6ac5f5d97fb422db28d0886f

 Core/MapEditor/Behavior/Bhv_MonsterData.cs

@@ -16,8 +16,8 @@

        public void Save(BinaryWriter bw)
        {
            bw.Write(npcID);
            bw.Write(resName);
            bw.Write(npcID);
            bw.Write(ai);
            bw.Write((float)System.Math.Round(transform.position.x, 2));
            bw.Write((float)System.Math.Round(transform.position.y, 2));
@@ -27,7 +27,6 @@
        public void Load(BinaryReader br)
        {
            npcID = br.ReadInt32();
            resName = br.ReadString();
            ai = br.ReadByte();
            float _x = br.ReadSingle();
            float _y = br.ReadSingle();