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

client_linchunjie

2019-04-26 239a47c141904abeedac145f5dd6c291273ea330

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

 System/ItemTip/TipEquipBaseInfoWidget.cs

@@ -61,7 +61,14 @@

            if (baseInfo.score != 0)
            {
                m_ScoreOrType.text = Language.Get("EquipWin_EquipPointText_1") + baseInfo.score;
                if (baseInfo.isEquiped)
                {
                    m_ScoreOrType.text = Language.Get("EquipWin_EquipPointText_1") + baseInfo.score;
                }
                else
                {
                    m_ScoreOrType.text = Language.Get("EquipWin_EquipPointText_2") + baseInfo.score;
                }
            }
            else
            {

 UI/Common/UIPrefabLoader.cs

@@ -5,49 +5,46 @@
using UnityEngine;
using System.Collections;

namespace Snxxz.UI
[ExecuteInEditMode]
[RequireComponent(typeof(RectTransform))]
public class UIPrefabLoader : MonoBehaviour
{
    [SerializeField] string m_PrefabName;
    public string prefabName { get { return m_PrefabName; } }

    GameObject instance;

    [ExecuteInEditMode]
    [RequireComponent(typeof(RectTransform))]
    public class UIPrefabLoader : MonoBehaviour
    private void Awake()
    {
        [SerializeField] string m_PrefabName;
        public string prefabName { get { return m_PrefabName; } }
        Create();
    }

        GameObject instance;

        [ExecuteInEditMode]
        private void Awake()
    [ContextMenu("Create")]
    public void Create()
    {
        if (instance != null)
        {
            Create();
            return;
        }

        [ContextMenu("Create")]
        public void Create()
        if (string.IsNullOrEmpty(m_PrefabName))
        {
            if (instance != null)
            {
                return;
            }

            if (string.IsNullOrEmpty(m_PrefabName))
            {
                return;
            }

            var find = this.transform.Find(m_PrefabName);
            if (find)
            {
                return;
            }

            instance = UIUtility.CreateWidget(m_PrefabName, m_PrefabName);
            instance.transform.SetParentEx(this.transform, Vector3.zero, Quaternion.identity, Vector3.one);
            return;
        }

        var find = this.transform.Find(m_PrefabName);
        if (find)
        {
            return;
        }

        instance = UIUtility.CreateWidget(m_PrefabName, m_PrefabName);
        instance.transform.SetParentEx(this.transform, Vector3.zero, Quaternion.identity, Vector3.one);
    }

}