Merge branch 'master' into 3243Activity

client_Wu Xijin

2018-09-07 ff5a952767a0c98fff6cf53733df93db5aa80b2f

 Core/ResModule/InstanceResourcesLoader.cs

@@ -11,6 +11,7 @@
    public static readonly string horseSuffix = "Prefab_Horse_";

    public static readonly string weaponSuffix = "Prefab_Weapon_";

    public static readonly string secondarySuffix = "Prefab_Secondary_";

    public static readonly string handSuffix = "Prefab_Hand_";

    public static readonly string wingSuffix = "Prefab_Wing_";



    public static GameObject LoadNpc(int id)