snxxz_scripts.git

parent: f54a037a | 补丁 | 提交 | ignore whitespace

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

client_Hale

2019-03-14 3d7ba11042edfe1d10d07dea1cfb6881a8523379

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

2个文件已删除

6个文件已修改

	System/BlastFurnace/LingDanTips.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Compose/New/ComposeMatCell.cs	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/KnapSack/Logic/UnionWarehouseEquipTip.cs	665 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/KnapSack/Logic/UnionWarehouseEquipTip.cs.meta	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/KnapSack/New/CommonItemBaisc.cs	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/KnapSack/New/EquipWin.cs	23 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/KnapSack/New/ItemCell.cs	21 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/MainInterfacePanel/BuffListWin.cs	50 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 System/BlastFurnace/LingDanTips.cs

@@ -422,9 +422,7 @@
                }



                _addSpecMatItemCell.reducebtn.gameObject.SetActive(true);

                _addSpecMatItemCell.reducebtn.RemoveAllListeners();



                _addSpecMatItemCell.reducebtn.AddListener(() => { OnClickReduceBtn(); });

                _addSpecMatItemCell.reducebtn.SetListener(() => { OnClickReduceBtn(); });



                _addSpecMatBtn.onClick.AddListener(() => { ChooseWin.gameObject.SetActive(true); });

                CreateRandomLineCell();


 System/Compose/New/ComposeMatCell.cs

@@ -63,21 +63,19 @@
        {

            bool isShowMat = itemId != 0 || itemModel != null ? true : false;

            itemCell.gameObject.SetActive(isShowMat);

            itemCell.button.RemoveAllListeners();

            itemCell.reducebtn.RemoveAllListeners();

            if (isShowMat)

            {

                if (itemModel != null)

                {

                    itemCell.Init(itemModel);

                    itemCell.button.AddListener(ClickItemCell);

                    itemCell.button.SetListener(ClickItemCell);

                }

                else

                {



                    ItemCellModel cellModel = new ItemCellModel(itemId);

                    itemCell.Init(cellModel);

                    itemCell.button.AddListener(ClickItemCell);

                    itemCell.button.SetListener(ClickItemCell);

                }



                switch(matType)

@@ -85,7 +83,7 @@
                    case NeedMatType.unfixedItem:

                    case NeedMatType.addItem:

                        itemCell.reducebtn.gameObject.SetActive(true);

                        itemCell.reducebtn.AddListener(ClickReduce);

                        itemCell.reducebtn.SetListener(ClickReduce);

                        break;

                }

            }


 System/KnapSack/Logic/UnionWarehouseEquipTip.cs

File was deleted

 System/KnapSack/Logic/UnionWarehouseEquipTip.cs.meta

File was deleted

 System/KnapSack/New/CommonItemBaisc.cs

@@ -61,18 +61,6 @@
            }

        }



        GameObject _starlist;

        public GameObject starlist {

            get {

                if (_starlist == null)

                {

                    var _trans = transform.Find("StarList");

                    _starlist = _trans != null ? _trans.gameObject : null;

                }

                return _starlist;

            }

        }



        Button m_Button;

        public Button button {

            get {

@@ -118,13 +106,6 @@
            bgIcon.gameObject.SetActive(true);

            itemIcon.SetSprite(itemConfig.IconKey);

            bgIcon.SetItemBackGround(ItemLogicUtility.Instance.GetItemQuality(itemId, useDataDic));



            for (var i = 0; i < starlist.transform.childCount; i++)

            {

                Image starIcon = starlist.transform.GetChild(i).GetComponent<Image>();

                starIcon.SetSprite("Stars_a");

                starIcon.gameObject.SetActive(false);

            }



            auctionIcon.gameObject.SetActive(isAuction);




 System/KnapSack/New/EquipWin.cs

@@ -19,8 +19,6 @@
        EquipTip equipTip;
        [SerializeField]
        BuyEquipTip buyTip;
        [SerializeField]
        UnionWarehouseEquipTip unionTip;
        [SerializeField] GetEquipPathTips getEquipPathTip;
        [SerializeField]
        CanvasGroup equipTipAlpha;
@@ -78,7 +76,6 @@
            }
            equipTip.gameObject.SetActive(false);
            buyTip.gameObject.SetActive(false);
            unionTip.gameObject.SetActive(false);
            getEquipPathTip.gameObject.SetActive(false);
            TempCreatelist.Clear();
        }
@@ -103,14 +100,6 @@
                        case ItemTipChildType.Buy:
                            buyTip.InitModel(itemTipsModel.curAttrData);
                            buyTip.gameObject.SetActive(true);
                            break;
                        case ItemTipChildType.UnionWarehouseDonation:
                            unionTip.InitModel(itemTipsModel.curAttrData);
                            unionTip.gameObject.SetActive(true);
                            break;
                        case ItemTipChildType.UnionWarehouseExchange:
                            unionTip.InitModel(itemTipsModel.curAttrData);
                            unionTip.gameObject.SetActive(true);
                            break;
                        case ItemTipChildType.GetEquipPath:
                            getEquipPathTip.InitModel(itemTipsModel.curAttrData);
@@ -139,18 +128,6 @@
                            buyTip.InitModel(itemTipsModel.curAttrData);
                            equipTip.InitModel(itemTipsModel.compareAttrData);
                            buyTip.gameObject.SetActive(true);
                            equipTip.gameObject.SetActive(true);
                            break;
                        case ItemTipChildType.UnionWarehouseDonation:
                            unionTip.InitModel(itemTipsModel.curAttrData);
                            equipTip.InitModel(itemTipsModel.compareAttrData);
                            unionTip.gameObject.SetActive(true);
                            equipTip.gameObject.SetActive(true);
                            break;
                        case ItemTipChildType.UnionWarehouseExchange:
                            unionTip.InitModel(itemTipsModel.curAttrData);
                            equipTip.InitModel(itemTipsModel.compareAttrData);
                            unionTip.gameObject.SetActive(true);
                            equipTip.gameObject.SetActive(true);
                            break;
                        case ItemTipChildType.GetEquipPath:

 System/KnapSack/New/ItemCell.cs

@@ -9,29 +9,26 @@
{
    public class ItemCell : CommonItemBaisc
    {
        private Button _reducebtn;
        public Button reducebtn
        {
            get
            {
                if (_reducebtn == null)
        private Button m_Reducebtn;
        public Button reducebtn {
            get {
                if (m_Reducebtn == null)
                {
                    var _trans = transform.Find("Reducebtn");
                    _reducebtn = _trans != null ? _trans.GetComponent<Button>() : null;
                    m_Reducebtn = this.transform.GetComponent<Button>("Reducebtn");
                }
                return _reducebtn;
                return m_Reducebtn;
            }
        }

        public override void Init(ItemModel model,bool isCompare = false, int compareScore = 0)
        public override void Init(ItemModel model, bool isCompare = false, int compareScore = 0)
        {
            base.Init(model, isCompare,compareScore);
            base.Init(model, isCompare, compareScore);
            reducebtn.gameObject.SetActive(false);
        }

        public override void Init(ItemCellModel model, int compareScore = 0)
        {
            base.Init(model,compareScore);
            base.Init(model, compareScore);
            reducebtn.gameObject.SetActive(false);
        }
    }

 System/MainInterfacePanel/BuffListWin.cs

@@ -7,7 +7,6 @@
using System.Collections;

using System.Collections.Generic;

using UnityEngine;



using UnityEngine.UI;

//关于Buff面板的设置

namespace Snxxz.UI

@@ -23,14 +22,9 @@
        private ScrollRect _ScrollRect;

        private Dictionary<int, ObjBuff> objBuffic;

        private List<int> _SortList = new List<int>();//排序列表

        BuffModel m_BuffModel;

        BuffModel Buffmodel

        {

            get

            {

                return m_BuffModel ?? (m_BuffModel = ModelCenter.Instance.GetModel<BuffModel>());

            }

        }



        BuffModel Buffmodel {  get {    return   ModelCenter.Instance.GetModel<BuffModel>();   } }



        #region Built-in

        protected override void BindController()

        {

@@ -67,7 +61,6 @@
            BuffModel.Even_ObjDelBuff -= DelBuff;

        }

        #endregion







        void UpdateControllerPosition()

@@ -189,35 +182,6 @@
        {

            int Type = 0;

            return Type;

            int Use_TheSecond = Mathf.FloorToInt((float)(DateTime.Now - objBuffic[BuffID]._dattTime).TotalSeconds);

            if (objBuffic[BuffID].LastTime - Use_TheSecond > 0)

            {

                float time = objBuffic[BuffID].LastTime - Use_TheSecond;

                if (time >= 86400)//天

                {

                    return 4;

                }

                else if (time < 86400 && time >= 3600)//时

                {

                    return 3;

                }

                else if (time < 3600 && time >= 60)//分

                {

                    return 2;

                }

                else if (time < 60 && time > 0)//秒

                {

                    return 1;

                }

                else

                {

                    return 0;

                }

            }

            else

            {

                return 0;

            }

        }



        List<int> Priority()

@@ -232,25 +196,21 @@
            return _List;

        }



        void AddBuff()//buff的增加

        void AddBuff()

        {



            objBuffic = Buffmodel._BuffDic;

            BuffScheduling();

            UpdateControllerPosition();

            OnCreateGridLineCell(m_ScrollerController);

        }



        void DelBuff()//buff的删除

        void DelBuff()

        {



            objBuffic = Buffmodel._BuffDic;

            BuffScheduling();

            UpdateControllerPosition();

            OnCreateGridLineCell(m_ScrollerController);

        }







    }

			@@ -422,9 +422,7 @@
			}

			_addSpecMatItemCell.reducebtn.gameObject.SetActive(true);
			_addSpecMatItemCell.reducebtn.RemoveAllListeners();

			_addSpecMatItemCell.reducebtn.AddListener(() => { OnClickReduceBtn(); });
			_addSpecMatItemCell.reducebtn.SetListener(() => { OnClickReduceBtn(); });

			_addSpecMatBtn.onClick.AddListener(() => { ChooseWin.gameObject.SetActive(true); });
			CreateRandomLineCell();

			@@ -63,21 +63,19 @@
			{
			bool isShowMat = itemId != 0 \|\| itemModel != null ? true : false;
			itemCell.gameObject.SetActive(isShowMat);
			itemCell.button.RemoveAllListeners();
			itemCell.reducebtn.RemoveAllListeners();
			if (isShowMat)
			{
			if (itemModel != null)
			{
			itemCell.Init(itemModel);
			itemCell.button.AddListener(ClickItemCell);
			itemCell.button.SetListener(ClickItemCell);
			}
			else
			{

			ItemCellModel cellModel = new ItemCellModel(itemId);
			itemCell.Init(cellModel);
			itemCell.button.AddListener(ClickItemCell);
			itemCell.button.SetListener(ClickItemCell);
			}

			switch(matType)
			@@ -85,7 +83,7 @@
			case NeedMatType.unfixedItem:
			case NeedMatType.addItem:
			itemCell.reducebtn.gameObject.SetActive(true);
			itemCell.reducebtn.AddListener(ClickReduce);
			itemCell.reducebtn.SetListener(ClickReduce);
			break;
			}
			}

			@@ -61,18 +61,6 @@
			}
			}

			GameObject _starlist;
			public GameObject starlist {
			get {
			if (_starlist == null)
			{
			var _trans = transform.Find("StarList");
			_starlist = _trans != null ? _trans.gameObject : null;
			}
			return _starlist;
			}
			}

			Button m_Button;
			public Button button {
			get {
			@@ -118,13 +106,6 @@
			bgIcon.gameObject.SetActive(true);
			itemIcon.SetSprite(itemConfig.IconKey);
			bgIcon.SetItemBackGround(ItemLogicUtility.Instance.GetItemQuality(itemId, useDataDic));

			for (var i = 0; i < starlist.transform.childCount; i++)
			{
			Image starIcon = starlist.transform.GetChild(i).GetComponent<Image>();
			starIcon.SetSprite("Stars_a");
			starIcon.gameObject.SetActive(false);
			}

			auctionIcon.gameObject.SetActive(isAuction);

			@@ -19,8 +19,6 @@
			EquipTip equipTip;
			[SerializeField]
			BuyEquipTip buyTip;
			[SerializeField]
			UnionWarehouseEquipTip unionTip;
			[SerializeField] GetEquipPathTips getEquipPathTip;
			[SerializeField]
			CanvasGroup equipTipAlpha;
			@@ -78,7 +76,6 @@
			}
			equipTip.gameObject.SetActive(false);
			buyTip.gameObject.SetActive(false);
			unionTip.gameObject.SetActive(false);
			getEquipPathTip.gameObject.SetActive(false);
			TempCreatelist.Clear();
			}
			@@ -103,14 +100,6 @@
			case ItemTipChildType.Buy:
			buyTip.InitModel(itemTipsModel.curAttrData);
			buyTip.gameObject.SetActive(true);
			break;
			case ItemTipChildType.UnionWarehouseDonation:
			unionTip.InitModel(itemTipsModel.curAttrData);
			unionTip.gameObject.SetActive(true);
			break;
			case ItemTipChildType.UnionWarehouseExchange:
			unionTip.InitModel(itemTipsModel.curAttrData);
			unionTip.gameObject.SetActive(true);
			break;
			case ItemTipChildType.GetEquipPath:
			getEquipPathTip.InitModel(itemTipsModel.curAttrData);
			@@ -139,18 +128,6 @@
			buyTip.InitModel(itemTipsModel.curAttrData);
			equipTip.InitModel(itemTipsModel.compareAttrData);
			buyTip.gameObject.SetActive(true);
			equipTip.gameObject.SetActive(true);
			break;
			case ItemTipChildType.UnionWarehouseDonation:
			unionTip.InitModel(itemTipsModel.curAttrData);
			equipTip.InitModel(itemTipsModel.compareAttrData);
			unionTip.gameObject.SetActive(true);
			equipTip.gameObject.SetActive(true);
			break;
			case ItemTipChildType.UnionWarehouseExchange:
			unionTip.InitModel(itemTipsModel.curAttrData);
			equipTip.InitModel(itemTipsModel.compareAttrData);
			unionTip.gameObject.SetActive(true);
			equipTip.gameObject.SetActive(true);
			break;
			case ItemTipChildType.GetEquipPath:

			@@ -9,29 +9,26 @@
			{
			public class ItemCell : CommonItemBaisc
			{
			private Button _reducebtn;
			public Button reducebtn
			{
			get
			{
			if (_reducebtn == null)
			private Button m_Reducebtn;
			public Button reducebtn {
			get {
			if (m_Reducebtn == null)
			{
			var _trans = transform.Find("Reducebtn");
			_reducebtn = _trans != null ? _trans.GetComponent<Button>() : null;
			m_Reducebtn = this.transform.GetComponent<Button>("Reducebtn");
			}
			return _reducebtn;
			return m_Reducebtn;
			}
			}

			public override void Init(ItemModel model,bool isCompare = false, int compareScore = 0)
			public override void Init(ItemModel model, bool isCompare = false, int compareScore = 0)
			{
			base.Init(model, isCompare,compareScore);
			base.Init(model, isCompare, compareScore);
			reducebtn.gameObject.SetActive(false);
			}

			public override void Init(ItemCellModel model, int compareScore = 0)
			{
			base.Init(model,compareScore);
			base.Init(model, compareScore);
			reducebtn.gameObject.SetActive(false);
			}
			}

			@@ -7,7 +7,6 @@
			using System.Collections;
			using System.Collections.Generic;
			using UnityEngine;

			using UnityEngine.UI;
			//关于Buff面板的设置
			namespace Snxxz.UI
			@@ -23,14 +22,9 @@
			private ScrollRect _ScrollRect;
			private Dictionary<int, ObjBuff> objBuffic;
			private List<int> _SortList = new List<int>();//排序列表
			BuffModel m_BuffModel;
			BuffModel Buffmodel
			{
			get
			{
			return m_BuffModel ?? (m_BuffModel = ModelCenter.Instance.GetModel<BuffModel>());
			}
			}

			BuffModel Buffmodel { get { return ModelCenter.Instance.GetModel<BuffModel>(); } }

			#region Built-in
			protected override void BindController()
			{
			@@ -67,7 +61,6 @@
			BuffModel.Even_ObjDelBuff -= DelBuff;
			}
			#endregion



			void UpdateControllerPosition()
			@@ -189,35 +182,6 @@
			{
			int Type = 0;
			return Type;
			int Use_TheSecond = Mathf.FloorToInt((float)(DateTime.Now - objBuffic[BuffID]._dattTime).TotalSeconds);
			if (objBuffic[BuffID].LastTime - Use_TheSecond > 0)
			{
			float time = objBuffic[BuffID].LastTime - Use_TheSecond;
			if (time >= 86400)//天
			{
			return 4;
			}
			else if (time < 86400 && time >= 3600)//时
			{
			return 3;
			}
			else if (time < 3600 && time >= 60)//分
			{
			return 2;
			}
			else if (time < 60 && time > 0)//秒
			{
			return 1;
			}
			else
			{
			return 0;
			}
			}
			else
			{
			return 0;
			}
			}

			List<int> Priority()
			@@ -232,25 +196,21 @@
			return _List;
			}

			void AddBuff()//buff的增加
			void AddBuff()
			{

			objBuffic = Buffmodel._BuffDic;
			BuffScheduling();
			UpdateControllerPosition();
			OnCreateGridLineCell(m_ScrollerController);
			}

			void DelBuff()//buff的删除
			void DelBuff()
			{

			objBuffic = Buffmodel._BuffDic;
			BuffScheduling();
			UpdateControllerPosition();
			OnCreateGridLineCell(m_ScrollerController);
			}



			}