Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Hale

2019-04-13 2fd6694945445d106587858c6fe98880b07181b0

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 System/CreateRole/CreateRoleManager.cs

@@ -47,6 +47,11 @@
        {
            AssetBundleUtility.Instance.UnloadAssetBundle("mob/createrole", true, false);
        }

        if (!AssetSource.effectFromEditor)
        {
            AssetBundleUtility.Instance.UnloadAssetBundle("effect/cj", true, false);
        }
    }

    public void LoadModel(int job, Action<bool, UnityEngine.Object> _callBack)

 System/MainInterfacePanel/BuffInfoWin.cs

File was renamed from System/MainInterfacePanel/BuffListWin.cs
@@ -12,7 +12,7 @@
namespace Snxxz.UI

{



    public class BuffListWin : Window

    public class BuffInfoWin : Window
    {

        public float UpperAndLower = 50f;

        public float ItemHeight = 50f;


 System/MainInterfacePanel/BuffInfoWin.cs.meta

 System/MainInterfacePanel/HeadPortraitTip.cs

@@ -275,7 +275,7 @@
        void BuffButton()

        {

            CloseEmperorBufEffect();

            WindowCenter.Instance.Open<BuffListWin>();

            WindowCenter.Instance.Open<BuffInfoWin>();

        }



        void VIPButton()