snxxz_scripts.git

parent: 6fcd076e | 补丁 | 提交 | show whitespace

client_linchunjie

2018-09-26 f45f87298a4e8e37e2281719b05555af3595cd7a

Merge branch 'master' into 1871天赋功能

8个文件已修改

	System/BlastFurnace/GetEquipPathTips.cs	22 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/BlastFurnace/GetEquipPathWin.cs	23 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/FindPrecious/FindPreciousModel.cs	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/FindPrecious/KillRecordsWin.cs	13 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/KnapSack/Logic/EquipTip.cs	25 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/KnapSack/Logic/ItemTipsModel.cs	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/OpenServerActivity/InSevenDayWin.cs	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Store/Logic/BuyEquipTip.cs	23 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 System/BlastFurnace/GetEquipPathTips.cs

@@ -454,7 +454,29 @@
            if (itemAttrData.isPreview)

            {

                legendCntPreview.gameObject.SetActive(true);

                switch (itemAttrData.itemConfig.EquipPlace)

                {

                    case 1:

                    case 2:

                    case 3:

                    case 4:

                    case 5:

                    case 6:

                    case 7:

                    case 8:

                    case 9:

                    case 10:

                    case 12:

                legendCntPreview.text = itemTipsModel.GetEquipLegendAttrCntPreview(itemAttrData);

                        break;

                    case 101:

                    case 102:

                    case 103:

                    case 104:

                    case 105:

                        legendCntPreview.text = itemTipsModel.GetDogzLegendAttrCntPreview(itemAttrData);

                        break;

                }

            }

            else

            {


 System/BlastFurnace/GetEquipPathWin.cs

@@ -439,13 +439,28 @@
            if (itemAttrData.isPreview)

            {

                legendCntPreview.gameObject.SetActive(true);

                if (itemAttrData.packType != PackType.rptDogzItem)

                switch (itemAttrData.itemConfig.EquipPlace)

                {

                    case 1:

                    case 2:

                    case 3:

                    case 4:

                    case 5:

                    case 6:

                    case 7:

                    case 8:

                    case 9:

                    case 10:

                    case 12:

                    legendCntPreview.text = itemTipsModel.GetEquipLegendAttrCntPreview(itemAttrData);

                }

                else

                {

                        break;

                    case 101:

                    case 102:

                    case 103:

                    case 104:

                    case 105:

                    legendCntPreview.text = itemTipsModel.GetDogzLegendAttrCntPreview(itemAttrData);

                        break;

                }

            }

            else


 System/FindPrecious/FindPreciousModel.cs

@@ -553,8 +553,15 @@
                        }

                        else

                        {

                            var neutralMap = GeneralConfig.Instance.neutralMaps.Contains(PlayerDatas.Instance.baseData.MapID);

                            if (neutralMap)

                            var currentNeutralMap = false;

                            if (Config.Instance.ContainKey<WorldBossConfig>(bossId))

                            {

                                var worldBossConfig = Config.Instance.Get<WorldBossConfig>(bossId);

                                currentNeutralMap = worldBossConfig.MapID == PlayerDatas.Instance.baseData.MapID;

                                currentNeutralMap = currentNeutralMap && GeneralConfig.Instance.neutralMaps.Contains(worldBossConfig.MapID);

                            }



                            if (currentNeutralMap)

                            {

                                return isLineBossAlive;

                            }


 System/FindPrecious/KillRecordsWin.cs

@@ -18,8 +18,7 @@
        [SerializeField] Text[] m_KillRecordDescriptions;
        [SerializeField] Button m_Close;

        FindPreciousModel m_Model;
        FindPreciousModel model { get { return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<FindPreciousModel>()); } }
        FindPreciousModel model { get { return ModelCenter.Instance.GetModel<FindPreciousModel>(); } }

        #region Built-in
        protected override void BindController()
@@ -54,10 +53,9 @@
            var records = model.GetBossKillRecords(model.ViewKillRecordsBoss);
            if (records == null)
            {
                for (int i = 0; i < m_KillTimes.Length; i++)
                foreach (var item in m_KillTimes)
                {
                    var behaviour = m_KillTimes[i];
                    behaviour.gameObject.SetActive(false);
                    item.gameObject.SetActive(false);
                }
            }
            else
@@ -79,10 +77,9 @@

            if (records == null)
            {
                for (int i = 0; i < m_KillRecordDescriptions.Length; i++)
                foreach (var item in m_KillRecordDescriptions)
                {
                    var behaviour = m_KillRecordDescriptions[i];
                    behaviour.gameObject.SetActive(false);
                    item.gameObject.SetActive(false);
                }
            }
            else

 System/KnapSack/Logic/EquipTip.cs

@@ -536,19 +536,32 @@
            legendAttr.SetActive(true);

            legendTitleText.text = Language.Get("EquipWin_LegendPropObj_Text_1");

            legendAttrDes.text = itemTipsModel.GetLegendAttr(itemAttrData);



            if (itemAttrData.isPreview)

            {

                legendCntPreview.gameObject.SetActive(true);

                if(itemAttrData.packType != PackType.rptDogzItem)

                switch (itemAttrData.itemConfig.EquipPlace)

                {

                    case 1:

                    case 2:

                    case 3:

                    case 4:

                    case 5:

                    case 6:

                    case 7:

                    case 8:

                    case 9:

                    case 10:

                    case 12:

                    legendCntPreview.text = itemTipsModel.GetEquipLegendAttrCntPreview(itemAttrData);

                }

                else

                {

                        break;

                    case 101:

                    case 102:

                    case 103:

                    case 104:

                    case 105:

                    legendCntPreview.text = itemTipsModel.GetDogzLegendAttrCntPreview(itemAttrData);

                        break;

                }

              
            }

            else

            {


 System/KnapSack/Logic/ItemTipsModel.cs

@@ -1948,11 +1948,14 @@
                            SetDogzEquipLegendAttrPreview(out legendIdlist, out legendValuelist);

                            break;

                    }

                    if(legendIdlist != null && legendValuelist != null)

                    {

                    if (legendIdlist.Count == legendValuelist.Count)

                    {

                        SetLegendData(legendIdlist, legendValuelist);

                    }

                }

                }

                else

                {

                    if (GetUseDataModel(20) != null)


 System/OpenServerActivity/InSevenDayWin.cs

@@ -59,6 +59,7 @@
        private void AwardMessageUpdate()
        {
            m_ScrollerController.m_Scorller.RefreshActiveCellViews();//刷新可见
            ContentAssignment();
        }

        protected override void OnAfterClose()

 System/Store/Logic/BuyEquipTip.cs

@@ -503,13 +503,28 @@
            if (itemAttrData.isPreview)

            {

                legendCntPreview.gameObject.SetActive(true);

                if (itemAttrData.packType != PackType.rptDogzItem)

                switch (itemAttrData.itemConfig.EquipPlace)

                {

                    case 1:

                    case 2:

                    case 3:

                    case 4:

                    case 5:

                    case 6:

                    case 7:

                    case 8:

                    case 9:

                    case 10:

                    case 12:

                    legendCntPreview.text = itemTipsModel.GetEquipLegendAttrCntPreview(itemAttrData);

                }

                else

                {

                        break;

                    case 101:

                    case 102:

                    case 103:

                    case 104:

                    case 105:

                    legendCntPreview.text = itemTipsModel.GetDogzLegendAttrCntPreview(itemAttrData);

                        break;

                }

            }

            else

			@@ -454,7 +454,29 @@
			if (itemAttrData.isPreview)
			{
			legendCntPreview.gameObject.SetActive(true);
			switch (itemAttrData.itemConfig.EquipPlace)
			{
			case 1:
			case 2:
			case 3:
			case 4:
			case 5:
			case 6:
			case 7:
			case 8:
			case 9:
			case 10:
			case 12:
			legendCntPreview.text = itemTipsModel.GetEquipLegendAttrCntPreview(itemAttrData);
			break;
			case 101:
			case 102:
			case 103:
			case 104:
			case 105:
			legendCntPreview.text = itemTipsModel.GetDogzLegendAttrCntPreview(itemAttrData);
			break;
			}
			}
			else
			{

			@@ -439,13 +439,28 @@
			if (itemAttrData.isPreview)
			{
			legendCntPreview.gameObject.SetActive(true);
			if (itemAttrData.packType != PackType.rptDogzItem)
			switch (itemAttrData.itemConfig.EquipPlace)
			{
			case 1:
			case 2:
			case 3:
			case 4:
			case 5:
			case 6:
			case 7:
			case 8:
			case 9:
			case 10:
			case 12:
			legendCntPreview.text = itemTipsModel.GetEquipLegendAttrCntPreview(itemAttrData);
			}
			else
			{
			break;
			case 101:
			case 102:
			case 103:
			case 104:
			case 105:
			legendCntPreview.text = itemTipsModel.GetDogzLegendAttrCntPreview(itemAttrData);
			break;
			}
			}
			else

			@@ -553,8 +553,15 @@
			}
			else
			{
			var neutralMap = GeneralConfig.Instance.neutralMaps.Contains(PlayerDatas.Instance.baseData.MapID);
			if (neutralMap)
			var currentNeutralMap = false;
			if (Config.Instance.ContainKey<WorldBossConfig>(bossId))
			{
			var worldBossConfig = Config.Instance.Get<WorldBossConfig>(bossId);
			currentNeutralMap = worldBossConfig.MapID == PlayerDatas.Instance.baseData.MapID;
			currentNeutralMap = currentNeutralMap && GeneralConfig.Instance.neutralMaps.Contains(worldBossConfig.MapID);
			}

			if (currentNeutralMap)
			{
			return isLineBossAlive;
			}

			@@ -18,8 +18,7 @@
			[SerializeField] Text[] m_KillRecordDescriptions;
			[SerializeField] Button m_Close;

			FindPreciousModel m_Model;
			FindPreciousModel model { get { return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<FindPreciousModel>()); } }
			FindPreciousModel model { get { return ModelCenter.Instance.GetModel<FindPreciousModel>(); } }

			#region Built-in
			protected override void BindController()
			@@ -54,10 +53,9 @@
			var records = model.GetBossKillRecords(model.ViewKillRecordsBoss);
			if (records == null)
			{
			for (int i = 0; i < m_KillTimes.Length; i++)
			foreach (var item in m_KillTimes)
			{
			var behaviour = m_KillTimes[i];
			behaviour.gameObject.SetActive(false);
			item.gameObject.SetActive(false);
			}
			}
			else
			@@ -79,10 +77,9 @@

			if (records == null)
			{
			for (int i = 0; i < m_KillRecordDescriptions.Length; i++)
			foreach (var item in m_KillRecordDescriptions)
			{
			var behaviour = m_KillRecordDescriptions[i];
			behaviour.gameObject.SetActive(false);
			item.gameObject.SetActive(false);
			}
			}
			else

			@@ -536,19 +536,32 @@
			legendAttr.SetActive(true);
			legendTitleText.text = Language.Get("EquipWin_LegendPropObj_Text_1");
			legendAttrDes.text = itemTipsModel.GetLegendAttr(itemAttrData);

			if (itemAttrData.isPreview)
			{
			legendCntPreview.gameObject.SetActive(true);
			if(itemAttrData.packType != PackType.rptDogzItem)
			switch (itemAttrData.itemConfig.EquipPlace)
			{
			case 1:
			case 2:
			case 3:
			case 4:
			case 5:
			case 6:
			case 7:
			case 8:
			case 9:
			case 10:
			case 12:
			legendCntPreview.text = itemTipsModel.GetEquipLegendAttrCntPreview(itemAttrData);
			}
			else
			{
			break;
			case 101:
			case 102:
			case 103:
			case 104:
			case 105:
			legendCntPreview.text = itemTipsModel.GetDogzLegendAttrCntPreview(itemAttrData);
			break;
			}

			}
			else
			{

			@@ -1948,11 +1948,14 @@
			SetDogzEquipLegendAttrPreview(out legendIdlist, out legendValuelist);
			break;
			}
			if(legendIdlist != null && legendValuelist != null)
			{
			if (legendIdlist.Count == legendValuelist.Count)
			{
			SetLegendData(legendIdlist, legendValuelist);
			}
			}
			}
			else
			{
			if (GetUseDataModel(20) != null)

			@@ -59,6 +59,7 @@
			private void AwardMessageUpdate()
			{
			m_ScrollerController.m_Scorller.RefreshActiveCellViews();//刷新可见
			ContentAssignment();
			}

			protected override void OnAfterClose()

			@@ -503,13 +503,28 @@
			if (itemAttrData.isPreview)
			{
			legendCntPreview.gameObject.SetActive(true);
			if (itemAttrData.packType != PackType.rptDogzItem)
			switch (itemAttrData.itemConfig.EquipPlace)
			{
			case 1:
			case 2:
			case 3:
			case 4:
			case 5:
			case 6:
			case 7:
			case 8:
			case 9:
			case 10:
			case 12:
			legendCntPreview.text = itemTipsModel.GetEquipLegendAttrCntPreview(itemAttrData);
			}
			else
			{
			break;
			case 101:
			case 102:
			case 103:
			case 104:
			case 105:
			legendCntPreview.text = itemTipsModel.GetDogzLegendAttrCntPreview(itemAttrData);
			break;
			}
			}
			else