snxxz_scripts.git

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

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

client_Hale

2018-08-23 35578d649a7aa913c6914d6c97e6dbc80e9c9ca0

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

5个文件已修改

	System/MainInterfacePanel/FlyingShoesTask.cs	47 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/MainInterfacePanel/PlayerMainDate.cs	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/MainInterfacePanel/TaskListTip.cs	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Vip/LimitedTimePackageModel.cs	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Vip/LimitedTimePackageWin.cs	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 System/MainInterfacePanel/FlyingShoesTask.cs

@@ -123,19 +123,27 @@


            if (mainModel.TaskId_Skill1.Contains(Task_ID))

            {

                int itemNumber = playerPack.GetItemCountByID(PackType.rptItem, mainModel.ItemID);//获取特殊物品

                if (itemNumber >= mainModel.ItemNumber)

                if (PlayerDatas.Instance.baseData.LV >= mainModel.TaskLv)

                {

                    taskmodel.CompletionOfTask(Task_ID);

                    WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.SkillFunc2);



                    int itemNumber = playerPack.GetItemCountByID(PackType.rptItem, mainModel.ItemID);//获取特殊物品

                    if (itemNumber >= mainModel.ItemNumber)

                    {

                        taskmodel.CompletionOfTask(Task_ID);

                        WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.SkillFunc2);

                    }

                    else

                    {

                        StateDetermination();

                        var mapModel = ModelCenter.Instance.GetModel<MapModel>();

                        var point = mapModel.GetRecommendHangPoint();

                        var config = Config.Instance.Get<MapEventPointConfig>(point);

                        MapTransferUtility.Instance.MoveToNPC(config.NPCID);

                    }

                }

                else

                {

                    StateDetermination();

                    var mapModel = ModelCenter.Instance.GetModel<MapModel>();

                    var point = mapModel.GetRecommendHangPoint();

                    var config = Config.Instance.Get<MapEventPointConfig>(point);

                    MapTransferUtility.Instance.MoveToNPC(config.NPCID);

                    WindowCenter.Instance.Open<HoistingWin>();

                }

                return;

            }

@@ -338,17 +346,24 @@
            var taskinfo = Config.Instance.Get<TASKINFOConfig>(str);

            if (mainModel.TaskId_Skill1.Contains(TaskID))//特殊任务

            {

               
                string Str_A = string.Format(Language.Get("PassiveSkillTask1"), mainModel.ItemID, itemNumber);

                string Str_B = Language.Get("PassiveSkillTask2");

                if (itemNumber >= mainModel.ItemNumber)

                if (PlayerDatas.Instance.baseData.LV >= mainModel.TaskLv)

                {

                    m_ContentText.text = Str_B;

                    string Str_A = string.Format(Language.Get("PassiveSkillTask1"), mainModel.ItemID, itemNumber);

                    string Str_B = Language.Get("PassiveSkillTask2");

                    if (itemNumber >= mainModel.ItemNumber)

                    {

                        m_ContentText.text = Str_B;

                    }

                    else

                    {

                        m_ContentText.text = Str_A;

                    }

                }

                else

                {

                    m_ContentText.text = Str_A;

                }

                    string Str_C = string.Format(Language.Get("PassiveSkillTask5"), mainModel.TaskLv);

                    m_ContentText.text = Str_C;

                }          
            }

            else

            {


 System/MainInterfacePanel/PlayerMainDate.cs

@@ -138,7 +138,7 @@
    public int ItemID = 0;

    public int UnitPrice = 0;

    public int ItemNumber = 0;



    public int TaskLv = 0;//任务等级



    private void GetPassiveSkillTask()//获取任务数据

    {

@@ -156,11 +156,14 @@
            TaskId_Skill1.Add(TaskId_SkillInt1[i]);

        }

        int[] PassiveSkillTask = ConfigParse.GetMultipleStr<int>(PassiveSkillTaskconfig.Numerical3);

        string str4 =PassiveSkillTaskconfig.Numerical4;

        TaskLv = int.Parse(str4);

        if (PassiveSkillTask.Length >= 3)

        {

            ItemID = PassiveSkillTask[0];

            UnitPrice = PassiveSkillTask[1];

            ItemNumber = PassiveSkillTask[2];

           
        }     

    }




 System/MainInterfacePanel/TaskListTip.cs

@@ -114,6 +114,7 @@
            TreasureNewGotWin.CloseTreasureNewGotWinEvent += CloseTreasureNewGotWinEvent;

            playerPack.RefreshItemCountAct += RefreshItemCountAct;

            playerPack.ItemCntReduceAct += ItemCntReduceAct;

            PlayerDatas.Instance.PlayerDataRefreshInfoEvent += Updatefighting;//数据的刷新(h0418)

            OnCollectingTreasureChangeEvent(TreasureCategory.Human);

            TaskScheduling();//任务排序  1

            TheTaskToGenerate();//任务生成

@@ -145,6 +146,21 @@
            PlayerTaskDatas.MainCardLevelChange -= MainCardLevelChange;//卡级任务修改

            playerPack.RefreshItemCountAct -= RefreshItemCountAct;

            playerPack.ItemCntReduceAct -= ItemCntReduceAct;

            PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= Updatefighting;//数据的刷新(h0418)

        }



        private void Updatefighting(PlayerDataRefresh obj)//等级刷新

        {

            if (obj == PlayerDataRefresh.LV)

            {

                foreach (var key in taskmodel.SideQuestsDic.Keys)

                {

                    if (mainModel.TaskId_Skill1.Contains(key))

                    {

                        TaskIdUpdate(key);

                    }

                }

            }

        }



        private void ItemCntReduceAct(PackType arg1, int arg2, int arg3)


 System/Vip/LimitedTimePackageModel.cs

@@ -15,7 +15,6 @@
    public Dictionary<int, int> DicBuyPackage = new Dictionary<int, int>();

    public event Action UpdateLimitedTimePackageItem;

    public event Action<int> onStateUpate;



    public override void Init()

    {

        OpenServerActivityCenter.Instance.Register(7, this);

@@ -25,7 +24,8 @@
    



    public bool IsShowPanel = false;



    private const int Redpoint_key1 = 20907;

    public Redpoint redPointStre1 = new Redpoint(209, Redpoint_key1);//限时礼包红点

    public bool IsOpen

    {

        get

@@ -82,7 +82,7 @@
        }

    }



    private void IsShowTip()

    public void IsShowTip()

    {

        int GetDayOfYear = DateTime.Now.DayOfYear;

        int day = LocalSave.GetInt("IsOpenLimitedTime");

@@ -91,6 +91,11 @@
        {

            LocalSave.SetInt("IsOpenLimitedTime", GetDayOfYear);

            IsShowPanel = true;

            redPointStre1.state = RedPointState.Simple;

        }

        else

        {

            redPointStre1.state = RedPointState.None;

        }



    }


 System/Vip/LimitedTimePackageWin.cs

@@ -57,6 +57,11 @@


        protected override void OnAfterOpen()

        {

            if (limitedTimePackageItemModel.IsShowPanel)

            {

                limitedTimePackageItemModel.IsShowPanel = false;

                limitedTimePackageItemModel.IsShowTip();

            }

           

        }

			@@ -123,19 +123,27 @@

			if (mainModel.TaskId_Skill1.Contains(Task_ID))
			{
			int itemNumber = playerPack.GetItemCountByID(PackType.rptItem, mainModel.ItemID);//获取特殊物品
			if (itemNumber >= mainModel.ItemNumber)
			if (PlayerDatas.Instance.baseData.LV >= mainModel.TaskLv)
			{
			taskmodel.CompletionOfTask(Task_ID);
			WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.SkillFunc2);

			int itemNumber = playerPack.GetItemCountByID(PackType.rptItem, mainModel.ItemID);//获取特殊物品
			if (itemNumber >= mainModel.ItemNumber)
			{
			taskmodel.CompletionOfTask(Task_ID);
			WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.SkillFunc2);
			}
			else
			{
			StateDetermination();
			var mapModel = ModelCenter.Instance.GetModel<MapModel>();
			var point = mapModel.GetRecommendHangPoint();
			var config = Config.Instance.Get<MapEventPointConfig>(point);
			MapTransferUtility.Instance.MoveToNPC(config.NPCID);
			}
			}
			else
			{
			StateDetermination();
			var mapModel = ModelCenter.Instance.GetModel<MapModel>();
			var point = mapModel.GetRecommendHangPoint();
			var config = Config.Instance.Get<MapEventPointConfig>(point);
			MapTransferUtility.Instance.MoveToNPC(config.NPCID);
			WindowCenter.Instance.Open<HoistingWin>();
			}
			return;
			}
			@@ -338,17 +346,24 @@
			var taskinfo = Config.Instance.Get<TASKINFOConfig>(str);
			if (mainModel.TaskId_Skill1.Contains(TaskID))//特殊任务
			{

			string Str_A = string.Format(Language.Get("PassiveSkillTask1"), mainModel.ItemID, itemNumber);
			string Str_B = Language.Get("PassiveSkillTask2");
			if (itemNumber >= mainModel.ItemNumber)
			if (PlayerDatas.Instance.baseData.LV >= mainModel.TaskLv)
			{
			m_ContentText.text = Str_B;
			string Str_A = string.Format(Language.Get("PassiveSkillTask1"), mainModel.ItemID, itemNumber);
			string Str_B = Language.Get("PassiveSkillTask2");
			if (itemNumber >= mainModel.ItemNumber)
			{
			m_ContentText.text = Str_B;
			}
			else
			{
			m_ContentText.text = Str_A;
			}
			}
			else
			{
			m_ContentText.text = Str_A;
			}
			string Str_C = string.Format(Language.Get("PassiveSkillTask5"), mainModel.TaskLv);
			m_ContentText.text = Str_C;
			}
			}
			else
			{

			@@ -138,7 +138,7 @@
			public int ItemID = 0;
			public int UnitPrice = 0;
			public int ItemNumber = 0;

			public int TaskLv = 0;//任务等级

			private void GetPassiveSkillTask()//获取任务数据
			{
			@@ -156,11 +156,14 @@
			TaskId_Skill1.Add(TaskId_SkillInt1[i]);
			}
			int[] PassiveSkillTask = ConfigParse.GetMultipleStr<int>(PassiveSkillTaskconfig.Numerical3);
			string str4 =PassiveSkillTaskconfig.Numerical4;
			TaskLv = int.Parse(str4);
			if (PassiveSkillTask.Length >= 3)
			{
			ItemID = PassiveSkillTask[0];
			UnitPrice = PassiveSkillTask[1];
			ItemNumber = PassiveSkillTask[2];

			}
			}

			@@ -114,6 +114,7 @@
			TreasureNewGotWin.CloseTreasureNewGotWinEvent += CloseTreasureNewGotWinEvent;
			playerPack.RefreshItemCountAct += RefreshItemCountAct;
			playerPack.ItemCntReduceAct += ItemCntReduceAct;
			PlayerDatas.Instance.PlayerDataRefreshInfoEvent += Updatefighting;//数据的刷新(h0418)
			OnCollectingTreasureChangeEvent(TreasureCategory.Human);
			TaskScheduling();//任务排序 1
			TheTaskToGenerate();//任务生成
			@@ -145,6 +146,21 @@
			PlayerTaskDatas.MainCardLevelChange -= MainCardLevelChange;//卡级任务修改
			playerPack.RefreshItemCountAct -= RefreshItemCountAct;
			playerPack.ItemCntReduceAct -= ItemCntReduceAct;
			PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= Updatefighting;//数据的刷新(h0418)
			}

			private void Updatefighting(PlayerDataRefresh obj)//等级刷新
			{
			if (obj == PlayerDataRefresh.LV)
			{
			foreach (var key in taskmodel.SideQuestsDic.Keys)
			{
			if (mainModel.TaskId_Skill1.Contains(key))
			{
			TaskIdUpdate(key);
			}
			}
			}
			}

			private void ItemCntReduceAct(PackType arg1, int arg2, int arg3)

			@@ -15,7 +15,6 @@
			public Dictionary<int, int> DicBuyPackage = new Dictionary<int, int>();
			public event Action UpdateLimitedTimePackageItem;
			public event Action<int> onStateUpate;

			public override void Init()
			{
			OpenServerActivityCenter.Instance.Register(7, this);
			@@ -25,7 +24,8 @@


			public bool IsShowPanel = false;

			private const int Redpoint_key1 = 20907;
			public Redpoint redPointStre1 = new Redpoint(209, Redpoint_key1);//限时礼包红点
			public bool IsOpen
			{
			get
			@@ -82,7 +82,7 @@
			}
			}

			private void IsShowTip()
			public void IsShowTip()
			{
			int GetDayOfYear = DateTime.Now.DayOfYear;
			int day = LocalSave.GetInt("IsOpenLimitedTime");
			@@ -91,6 +91,11 @@
			{
			LocalSave.SetInt("IsOpenLimitedTime", GetDayOfYear);
			IsShowPanel = true;
			redPointStre1.state = RedPointState.Simple;
			}
			else
			{
			redPointStre1.state = RedPointState.None;
			}

			}

			@@ -57,6 +57,11 @@

			protected override void OnAfterOpen()
			{
			if (limitedTimePackageItemModel.IsShowPanel)
			{
			limitedTimePackageItemModel.IsShowPanel = false;
			limitedTimePackageItemModel.IsShowTip();
			}

			}