snxxz_scripts.git

parent: 8506b271 | 补丁 | 提交 | show whitespace

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

client_linchunjie

2018-09-20 0830c45e916adb79f6326e6b1c153b57a05c6749

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

7个文件已修改

	System/KnapSack/Logic/ItemOverdueModel.cs	22 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/MainInterfacePanel/FeatureNoticeWin.cs	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/MainInterfacePanel/FeaturesType2.cs	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/MainInterfacePanel/FlyingShoesTask.cs	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/MainInterfacePanel/PlayerMainDate.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/MainInterfacePanel/PlayerTaskDatas.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/MainInterfacePanel/SkillTaskWin.cs	85 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 System/KnapSack/Logic/ItemOverdueModel.cs

@@ -218,12 +218,19 @@
                                        }

                                    }

                                }

                                models = pairs[idlist[idlist.Count - 1]];

                                if (isOverdue && models != null && models.Count > 0)

                                if (isOverdue)

                                {

                                    for (int i = idlist.Count - 1; i > -1; i--)

                                    {

                                        models = pairs[idlist[i]];

                                        if (models != null && models.Count > 0)

                                {

                                    ItemModel overdueModel = models[0];

                                    guardOverdueIndex = overdueModel.itemInfo.ItemPlace;

                                    OnGetOverdueItem(overdueModel.itemInfo.ItemID, overdueModel.itemInfo.ItemGUID, overdueModel.itemInfo.ItemPlace);

                                            break;

                                        }

                                    }

                                }

                                else

                                {

@@ -280,14 +287,21 @@
                    }

                }



                models = allGuardDict[type][idlist[idlist.Count - 1]];

                if (isOverdue && models != null && models.Count > 0)

                if(isOverdue)

                {

                    for (int i = idlist.Count - 1; i > -1; i--)

                    {

                        models = allGuardDict[type][idlist[i]];

                        if(models != null && models.Count > 0)

                {

                    ItemModel itemModel = models[0];

                    if (!overdueGuardPushlist.Contains(itemModel))

                    {

                        overdueGuardPushlist.Add(itemModel);

                    }

                            break;

                        }

                    }

                }

            }

            for(int i = 0; i < overdueGuardPushlist.Count; i++)


 System/MainInterfacePanel/FeatureNoticeWin.cs

@@ -76,8 +76,9 @@
        }
        protected override void OnActived()

        {

            m_ScrollerController.JumpIndex(JumpIndex());

            m_ScrollerController.JumpIndex(Offset, 0, EnhancedScroller.TweenType.immediate);

            var offset = 0f;

            m_ScrollerController.JumpIndex(JumpIndex(), ref offset);

            m_ScrollerController.JumpIndex(Offset + offset, 0, EnhancedScroller.TweenType.immediate);

        }
        protected override void OnAfterOpen()
        {

 System/MainInterfacePanel/FeaturesType2.cs

@@ -32,7 +32,6 @@
        FeatureNoticeModel featureNoticeModel { get { return ModelCenter.Instance.GetModel<FeatureNoticeModel>(); } }
        public void GetTheFeatureID(int funcId)

        {

            DebugEx.LogError("ID"+ featureNoticeModel.FunctionForecastIndex);

            var functionForecastConfig = Config.Instance.Get<FunctionForecastConfig>(funcId);

            if (functionForecastConfig == null)

            {


 System/MainInterfacePanel/FlyingShoesTask.cs

@@ -154,8 +154,17 @@
                case -5:

                case 0:

                    StateDetermination();

                    if (mainModel.TaskId_Skill.Contains(Task_ID))

                    {

                        mainModel.TaskSkillID = Task_ID;

                        WindowCenter.Instance.Open<SkillTaskWin>();

                    }

                    else

                    {

                    ContentText.ExcuteHref();

                    OpenPanel(Task_ID);

                    }

                   
                    break;

                case 1:




 System/MainInterfacePanel/PlayerMainDate.cs

@@ -118,6 +118,8 @@
    public List<int> TaskId_Skill = new List<int>();//任务ID

    public List<int> SkillIndex = new List<int>();//技能槽索引

    public List<int> NeedFairyJade = new List<int>();//所需解锁仙玉

    public int Skill_Index = 0;

    public int TaskSkillID = 0;

    //-----关于支线翅膀任务的特殊逻辑

    public int WingTask = 0;




 System/MainInterfacePanel/PlayerTaskDatas.cs

@@ -469,7 +469,7 @@
        SideQuestsType17 = 17,//支线17-21新增

        SideQuestsType18 = 18,

        SideQuestsType19 = 19,

        SideQuestsType20 = 20,

        SideQuestsType20 = 20,//(后端特殊处理，暂定不让使用)

        SideQuestsType21 = 21,

    }




 System/MainInterfacePanel/SkillTaskWin.cs

@@ -6,25 +6,58 @@
using System;
using System.Collections;
using System.Collections.Generic;
using TableConfig;

using UnityEngine;
using UnityEngine.UI;

namespace Snxxz.UI {
namespace Snxxz.UI

{

    public class SkillTaskWin : Window
    {

        [SerializeField] RichText m_Text_Condition_1;//条件
        [SerializeField] RichText m_Text_Reward_1;//奖励
        [SerializeField] Text m_NeedMoney_Text;//所需仙玉
        [SerializeField] Button m_GoToSkillBtn;

        [SerializeField] Button m_OpenNowBtn;

        [SerializeField] Button m_GoToBtn;
        [SerializeField] Button m_ClaoseBtn;
        PlayerMainDate m_MainModel;

        PlayerMainDate mainModel { get { return m_MainModel ?? (m_MainModel = ModelCenter.Instance.GetModel<PlayerMainDate>()); } }

        PlayerTaskDatas m_TaskModel;

        PlayerTaskDatas taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>()); } }
        #region Built-in
        protected override void BindController()
        {

        }

        protected override void AddListeners()
        {
            m_ClaoseBtn.AddListener(() => { Close(); });
            m_GoToSkillBtn.AddListener(OnClickGoToSkillBtn);
            m_OpenNowBtn.AddListener(OnClickOpenNowBtn);
            m_GoToBtn.AddListener(OnClickGoToBtn);
        }

        protected override void OnPreOpen()
        {
            if (!taskmodel.allMissionDict.ContainsKey(mainModel.TaskSkillID))

            {

                return;

            }

            string str = taskmodel.allMissionDict[mainModel.TaskSkillID].InforList;

            var taskinfo = Config.Instance.Get<TASKINFOConfig>(str);

            if (taskinfo != null)

            {

                m_Text_Condition_1.text = taskinfo.show_writing;

            }

            if (mainModel.TaskId_Skill.Contains(mainModel.TaskSkillID))

            {

                int Index = mainModel.TaskId_Skill.IndexOf(mainModel.TaskSkillID);

                m_Text_Reward_1.text = string.Format(Language.Get("PassiveSkillTask1"), (mainModel.SkillIndex[Index] + 1));

                m_NeedMoney_Text.text = string.Format(Language.Get("PassiveSkillTask2"), mainModel.NeedFairyJade[Index]);

            }

        }

        protected override void OnAfterOpen()
@@ -37,6 +70,54 @@

        protected override void OnAfterClose()
        {


        }

        private void OnClickGoToSkillBtn()

        {

            if (mainModel.TaskId_Skill.Contains(mainModel.TaskSkillID))

            {

                int Index = mainModel.TaskId_Skill.IndexOf(mainModel.TaskSkillID);

                mainModel.Skill_Index = mainModel.SkillIndex[Index];

            }

            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.SkillFunc2);

        }
        private void OnClickOpenNowBtn()

        {

            int Gold = (int)UIHelper.GetMoneyCnt(1);//仙玉

            if (mainModel.TaskId_Skill.Contains(mainModel.TaskSkillID))

            {

                int Index = mainModel.TaskId_Skill.IndexOf(mainModel.TaskSkillID);

                int NeedMoney = mainModel.NeedFairyJade[Index];

                string strNull = string.Format(Language.Get("PassiveSkillTask3"), NeedMoney);

                ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), strNull, (bool isOk) =>

                {

                    if (isOk)

                    {

                        if (Gold >= NeedMoney)

                        {

                            taskmodel.CompletionOfTask(mainModel.TaskSkillID);

                            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.SkillFunc2);

                        }

                        else

                        {

                            if (VersionConfig.Get().isBanShu)

                            {

                                SysNotifyMgr.Instance.ShowTip("GoldErr");

                                return;

                            }

                            WindowCenter.Instance.Open<RechargeTipWin>();

                        }

                    }

                });

            }

        }
        private void OnClickGoToBtn()

        {



            m_Text_Condition_1.ExcuteHref();



            // Close();

        }
        #endregion

			@@ -218,12 +218,19 @@
			}
			}
			}
			models = pairs[idlist[idlist.Count - 1]];
			if (isOverdue && models != null && models.Count > 0)
			if (isOverdue)
			{
			for (int i = idlist.Count - 1; i > -1; i--)
			{
			models = pairs[idlist[i]];
			if (models != null && models.Count > 0)
			{
			ItemModel overdueModel = models[0];
			guardOverdueIndex = overdueModel.itemInfo.ItemPlace;
			OnGetOverdueItem(overdueModel.itemInfo.ItemID, overdueModel.itemInfo.ItemGUID, overdueModel.itemInfo.ItemPlace);
			break;
			}
			}
			}
			else
			{
			@@ -280,14 +287,21 @@
			}
			}

			models = allGuardDict[type][idlist[idlist.Count - 1]];
			if (isOverdue && models != null && models.Count > 0)
			if(isOverdue)
			{
			for (int i = idlist.Count - 1; i > -1; i--)
			{
			models = allGuardDict[type][idlist[i]];
			if(models != null && models.Count > 0)
			{
			ItemModel itemModel = models[0];
			if (!overdueGuardPushlist.Contains(itemModel))
			{
			overdueGuardPushlist.Add(itemModel);
			}
			break;
			}
			}
			}
			}
			for(int i = 0; i < overdueGuardPushlist.Count; i++)

			@@ -76,8 +76,9 @@
			}
			protected override void OnActived()
			{
			m_ScrollerController.JumpIndex(JumpIndex());
			m_ScrollerController.JumpIndex(Offset, 0, EnhancedScroller.TweenType.immediate);
			var offset = 0f;
			m_ScrollerController.JumpIndex(JumpIndex(), ref offset);
			m_ScrollerController.JumpIndex(Offset + offset, 0, EnhancedScroller.TweenType.immediate);
			}
			protected override void OnAfterOpen()
			{

			@@ -32,7 +32,6 @@
			FeatureNoticeModel featureNoticeModel { get { return ModelCenter.Instance.GetModel<FeatureNoticeModel>(); } }
			public void GetTheFeatureID(int funcId)
			{
			DebugEx.LogError("ID"+ featureNoticeModel.FunctionForecastIndex);
			var functionForecastConfig = Config.Instance.Get<FunctionForecastConfig>(funcId);
			if (functionForecastConfig == null)
			{

			@@ -154,8 +154,17 @@
			case -5:
			case 0:
			StateDetermination();
			if (mainModel.TaskId_Skill.Contains(Task_ID))
			{
			mainModel.TaskSkillID = Task_ID;
			WindowCenter.Instance.Open<SkillTaskWin>();
			}
			else
			{
			ContentText.ExcuteHref();
			OpenPanel(Task_ID);
			}

			break;
			case 1:

			@@ -118,6 +118,8 @@
			public List<int> TaskId_Skill = new List<int>();//任务ID
			public List<int> SkillIndex = new List<int>();//技能槽索引
			public List<int> NeedFairyJade = new List<int>();//所需解锁仙玉
			public int Skill_Index = 0;
			public int TaskSkillID = 0;
			//-----关于支线翅膀任务的特殊逻辑
			public int WingTask = 0;

			@@ -469,7 +469,7 @@
			SideQuestsType17 = 17,//支线17-21新增
			SideQuestsType18 = 18,
			SideQuestsType19 = 19,
			SideQuestsType20 = 20,
			SideQuestsType20 = 20,//(后端特殊处理，暂定不让使用)
			SideQuestsType21 = 21,
			}

			@@ -6,25 +6,58 @@
			using System;
			using System.Collections;
			using System.Collections.Generic;
			using TableConfig;
			using UnityEngine;
			using UnityEngine.UI;

			namespace Snxxz.UI {
			namespace Snxxz.UI
			{

			public class SkillTaskWin : Window
			{

			[SerializeField] RichText m_Text_Condition_1;//条件
			[SerializeField] RichText m_Text_Reward_1;//奖励
			[SerializeField] Text m_NeedMoney_Text;//所需仙玉
			[SerializeField] Button m_GoToSkillBtn;
			[SerializeField] Button m_OpenNowBtn;
			[SerializeField] Button m_GoToBtn;
			[SerializeField] Button m_ClaoseBtn;
			PlayerMainDate m_MainModel;
			PlayerMainDate mainModel { get { return m_MainModel ?? (m_MainModel = ModelCenter.Instance.GetModel<PlayerMainDate>()); } }
			PlayerTaskDatas m_TaskModel;
			PlayerTaskDatas taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>()); } }
			#region Built-in
			protected override void BindController()
			{

			}

			protected override void AddListeners()
			{
			m_ClaoseBtn.AddListener(() => { Close(); });
			m_GoToSkillBtn.AddListener(OnClickGoToSkillBtn);
			m_OpenNowBtn.AddListener(OnClickOpenNowBtn);
			m_GoToBtn.AddListener(OnClickGoToBtn);
			}

			protected override void OnPreOpen()
			{
			if (!taskmodel.allMissionDict.ContainsKey(mainModel.TaskSkillID))
			{
			return;
			}
			string str = taskmodel.allMissionDict[mainModel.TaskSkillID].InforList;
			var taskinfo = Config.Instance.Get<TASKINFOConfig>(str);
			if (taskinfo != null)
			{
			m_Text_Condition_1.text = taskinfo.show_writing;
			}
			if (mainModel.TaskId_Skill.Contains(mainModel.TaskSkillID))
			{
			int Index = mainModel.TaskId_Skill.IndexOf(mainModel.TaskSkillID);
			m_Text_Reward_1.text = string.Format(Language.Get("PassiveSkillTask1"), (mainModel.SkillIndex[Index] + 1));
			m_NeedMoney_Text.text = string.Format(Language.Get("PassiveSkillTask2"), mainModel.NeedFairyJade[Index]);
			}
			}

			protected override void OnAfterOpen()
			@@ -37,6 +70,54 @@

			protected override void OnAfterClose()
			{

			}

			private void OnClickGoToSkillBtn()
			{
			if (mainModel.TaskId_Skill.Contains(mainModel.TaskSkillID))
			{
			int Index = mainModel.TaskId_Skill.IndexOf(mainModel.TaskSkillID);
			mainModel.Skill_Index = mainModel.SkillIndex[Index];
			}
			WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.SkillFunc2);
			}
			private void OnClickOpenNowBtn()
			{
			int Gold = (int)UIHelper.GetMoneyCnt(1);//仙玉
			if (mainModel.TaskId_Skill.Contains(mainModel.TaskSkillID))
			{
			int Index = mainModel.TaskId_Skill.IndexOf(mainModel.TaskSkillID);
			int NeedMoney = mainModel.NeedFairyJade[Index];
			string strNull = string.Format(Language.Get("PassiveSkillTask3"), NeedMoney);
			ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), strNull, (bool isOk) =>
			{
			if (isOk)
			{
			if (Gold >= NeedMoney)
			{
			taskmodel.CompletionOfTask(mainModel.TaskSkillID);
			WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.SkillFunc2);
			}
			else
			{
			if (VersionConfig.Get().isBanShu)
			{
			SysNotifyMgr.Instance.ShowTip("GoldErr");
			return;
			}
			WindowCenter.Instance.Open<RechargeTipWin>();
			}
			}
			});
			}
			}
			private void OnClickGoToBtn()
			{

			m_Text_Condition_1.ExcuteHref();

			// Close();
			}
			#endregion