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

client_linchunjie

2019-04-23 a093efb51f33534a9ea853deed5ed74a6ff6d0e7

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

 Lua/Gen/SnxxzUIItemTipsModelWrap.cs

@@ -372,10 +372,6 @@
                {
                    Snxxz.UI.ItemModel _itemModel = (Snxxz.UI.ItemModel)translator.GetObject(L, 2, typeof(Snxxz.UI.ItemModel));
                    
                    gen_to_be_invoked.SetCompareAttrData( _itemModel );
                    
                    
                    
                    return 0;
                }
                

 System/ItemTip/EquipTipUtility.cs

@@ -53,6 +53,7 @@
            public int overdueSurplusTime;
            public int levelLimit;
            public int realmLimit;
            public int moneyLimit;
        }

        public struct BaseProperty
@@ -119,6 +120,11 @@
        public struct GetWay
        {
            public List<int> ways;
        }

        public struct BuyInfo
        {

        }

        static PackModel packModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } }
@@ -420,6 +426,13 @@
        private static BaseInfo GetBaseInfo(int itemId)
        {
            var config = ItemConfig.Get(itemId);
            var money = 0;
            if (config.Type == 81)
            {
                var chestConfig = ChestsConfig.Get(itemId);
                money = chestConfig.OpenMoney;
            }

            var baseInfo = new BaseInfo()
            {
                itemId = itemId,
@@ -429,6 +442,7 @@
                auctionSurplusTime = 0,
                levelLimit = config.UseLV,
                realmLimit = config.RealmLimit,
                moneyLimit = money,
            };

            return baseInfo;
@@ -449,6 +463,13 @@
            var maxStrengthenLevel = strengthenModel.GetEquipLevelMax(type, Mathf.Min(star, maxStar));
            var placeStrengthenLevel = strengthenModel.GetStrengthLevel(level, place);

            var money = 0;
            if (item.config.Type == 81)
            {
                var chestConfig = ChestsConfig.Get(item.itemId);
                money = chestConfig.OpenMoney;
            }

            var baseInfo = new BaseInfo()
            {
                itemId = item.itemId,
@@ -461,7 +482,8 @@
                levelLimit = item.isAuction ? 0 : item.config.UseLV,
                realmLimit = item.isAuction ? 0 : item.config.RealmLimit,
                star = isEquiped ? star : -1,
                strengthenLevel = isEquiped ? Mathf.Min(placeStrengthenLevel, maxStrengthenLevel) : 0
                strengthenLevel = isEquiped ? Mathf.Min(placeStrengthenLevel, maxStrengthenLevel) : 0,
                moneyLimit = money,
            };

            return baseInfo;

 System/ItemTip/ItemTipWin.cs

@@ -38,6 +38,7 @@

        protected override void OnPreOpen()
        {
            this.transform.localScale = Vector3.zero;
        }

        protected override void OnAfterOpen()
@@ -59,6 +60,14 @@
        {
            base.OnActived();

            StartCoroutine(Co_DelayOneFrame());
        }

        #endregion

        IEnumerator Co_DelayOneFrame()
        {
            this.transform.localScale = Vector3.zero;
            DisplayBaseInfo();
            DisplayItemDescription();
            DisplayItemUseState();
@@ -66,9 +75,11 @@
            DisplayGetWays();
            DisplayOperateButton();
            DisplayModel();
        }

        #endregion
            yield return null;
            yield return null;
            this.transform.localScale = Vector3.one;
        }

        private void DisplayBaseInfo()
        {

 System/ItemTip/TipBuyItemWidget.cs

New file
@@ -0,0 +1,31 @@
//--------------------------------------------------------
//    [Author]:           第二世界
//    [  Date ]:           Monday, April 22, 2019
//--------------------------------------------------------
using UnityEngine;
using System.Collections;
using UnityEngine.UI;

namespace Snxxz.UI
{

    public class TipBuyItemWidget : MonoBehaviour
    {
        [SerializeField] Text m_VipInfo;
        [SerializeField] Text m_Count;
        [SerializeField] Button m_Reduce;
        [SerializeField] Button m_Add;

        [SerializeField] Image m_MoneyIcon;
        [SerializeField] Text m_Money;

        [SerializeField] NumKeyBoard m_KeyBoard;



    }

}




 System/ItemTip/TipBuyItemWidget.cs.meta

File was renamed from System/Loading/CrossServerOneVsOneLoadingWin.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 9f6d4548d3219fb48aaaff757fbb747f
timeCreated: 1545204249
guid: 2ed165aea3b7cb946a23c8e29ed7482f
timeCreated: 1555936336
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 System/ItemTip/TipItemBaseInfoWidget.cs

@@ -16,11 +16,7 @@
        [SerializeField] ItemBehaviour m_Item;
        [SerializeField] Text m_Type;

        [SerializeField] RectTransform m_LevelConditionContainer;
        [SerializeField] Text m_LevelCondition;

        [SerializeField] RectTransform m_RealmConditionContainer;
        [SerializeField] Text m_RealmCondition;
        [SerializeField] Text m_Condition;

        [SerializeField] RectTransform m_SurplusTimeContainer;
        [SerializeField] Text m_SurplusTime;
@@ -45,32 +41,24 @@
            m_Item.SetItem(baseInfo.itemId, 1);
            m_Type.text = itemConfig.ItemTypeName;

            if (baseInfo.realmLimit > 0)
            if (baseInfo.moneyLimit > 0)
            {
                m_LevelConditionContainer.gameObject.SetActive(false);
                m_RealmConditionContainer.gameObject.SetActive(true);
                var myMoney = UIHelper.GetMoneyCnt(1);
                m_Condition.text = Language.Get("OpenBoxCostMoney", baseInfo.moneyLimit);
                m_Condition.color = UIHelper.GetUIColor(myMoney <(ulong) baseInfo.moneyLimit ? TextColType.Red : TextColType.Green);
            }
            else if (baseInfo.realmLimit > 0)
            {
                var realmConfig = RealmConfig.Get(baseInfo.realmLimit);
                m_RealmCondition.text = StringUtility.Contact(Language.Get("RealmLimit1"), " ", realmConfig.Name);

                m_Condition.text = StringUtility.Contact(Language.Get("RealmLimit1"), " ", realmConfig.Name);
                var realmLevel = PlayerDatas.Instance.baseData.realmLevel;
                m_LevelCondition.color = UIHelper.GetUIColor(realmLevel < itemConfig.UseLV ? TextColType.Red : TextColType.Green);
                m_Condition.color = UIHelper.GetUIColor(realmLevel < itemConfig.UseLV ? TextColType.Red : TextColType.Green);
            }
            else
            {
                m_RealmConditionContainer.gameObject.SetActive(false);

                if (baseInfo.levelLimit > 0)
                {
                    m_LevelConditionContainer.gameObject.SetActive(true);
                    m_LevelCondition.text = StringUtility.Contact(Language.Get("KnapS110"), " ", baseInfo.levelLimit);

                    var playerLevel = PlayerDatas.Instance.baseData.LV;
                    m_LevelCondition.color = UIHelper.GetUIColor(playerLevel < itemConfig.UseLV ? TextColType.Red : TextColType.Green);
                }
                else
                {
                    m_LevelConditionContainer.gameObject.SetActive(false);
                }
                m_Condition.text = StringUtility.Contact(Language.Get("KnapS110"), " ", baseInfo.levelLimit);
                var playerLevel = PlayerDatas.Instance.baseData.LV;
                m_Condition.color = UIHelper.GetUIColor(playerLevel < itemConfig.UseLV ? TextColType.Red : TextColType.Green);
            }

            if (baseInfo.isAuction)

 System/KnapSack/Logic/BoxInfoWin.cs

File was deleted

 System/KnapSack/Logic/BoxInfoWin.cs.meta

File was deleted

 System/KnapSack/Logic/ItemTipsModel.cs

@@ -305,13 +305,6 @@
            }

        }



        public void SetCompareAttrData(ItemModel itemModel)

        {

            compareAttrData = new ItemAttrData(itemModel.itemId, false, (ulong)itemModel.count

                  , itemModel.gridIndex, true

                  , itemModel.packType, itemModel.guid, ConfigParse.Analysis(itemModel.itemInfo.userData));

        }



        private void SetCompareAttrData(PackType type, int equipPlace)

        {

            compareAttrData = null;

@@ -348,6 +341,7 @@
                case ItemWinType.wingsWin:

                case ItemWinType.guardWin:

                case ItemWinType.itemWin:

                case ItemWinType.boxWin:

                    if (curAttrData.isPreview)

                    {

                        EquipTipUtility.Show(curAttrData.itemId, TipType.Normal);

@@ -356,9 +350,6 @@
                    {

                        EquipTipUtility.Show(curAttrData.guid);

                    }

                    break;

                case ItemWinType.boxWin:

                    WindowCenter.Instance.Open<BoxInfoWin>();

                    break;

                case ItemWinType.equipWin:

                    if (ItemLogicUtility.Instance.IsEquip(curAttrData.itemId))


 System/Loading/CrossServerOneVsOneLoadingWin.cs

File was deleted