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

client_Wu Xijin

2019-04-28 8d06932ebf186837e048da4822bd837dbf90e212

 Fight/Stage/MapEditor/NewGuideModel.cs

@@ -2,6 +2,7 @@
using UnityEngine.Events;
using Snxxz.UI;

[XLua.LuaCallCSharp]
public class NewGuideModel : Model
{
    public string content;