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

client_linchunjie

2019-04-24 1e69f3af735c41c12c2cc1e91eda6f194337c34b

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

 Fight/ClientCollectUtility.cs

@@ -110,11 +110,19 @@
                if (_list != null)
                {
                    _list.Sort((a1, a2) =>
                                    {
                                        var _d1 = MathUtility.DistanceSqrtXZ(a1.Pos, _hero.Pos);
                                        var _d2 = MathUtility.DistanceSqrtXZ(a2.Pos, _hero.Pos);
                                        return _d2 < _d1 ? 1 : -1;
                                    });
                    {
                        var _d1 = MathUtility.DistanceSqrtXZ(a1.Pos, _hero.Pos);
                        var _d2 = MathUtility.DistanceSqrtXZ(a2.Pos, _hero.Pos);
                        if (_d1 > _d2)
                        {
                            return 1;
                        }
                        else if (_d1 < _d2)
                        {
                            return -1;
                        }
                        return 0;
                    });

                    foreach (var _a in _list)
                    {
@@ -123,8 +131,10 @@
                            continue;
                        }

                        _npc = _a as GA_NpcClientCollect;
                        break;
                        if (_npc == null)
                        {
                            _npc = _a as GA_NpcClientCollect;
                        }
                    }
                }
            }

 System/FairyAu/FairyAuTaskWin.cs

@@ -284,13 +284,13 @@


        void FairyAuTask(int _taskID)//仙盟任务

        {

            if (TaskAllocation.Instance.FairyAuNumber() >= 10)

            if (TaskAllocation.Instance.FairyAuNumber() >= taskmodel.FairyAuTaskCount_Round)

            {

                Btn_Leave.gameObject.SetActive(false);

                int total = TaskAllocation.Instance.FairyAuAllNumber();

                total = Mathf.CeilToInt((float)total / 10);

                RoundText_L.text = Language.Get("FairyAuTaskWin_Text3", SetNumberOfRounds(total));

                RoundText_R.text = Language.Get("FairyAuTaskWin_Text4", 10);

                RoundText_R.text = Language.Get("FairyAuTaskWin_Text4", taskmodel.FairyAuTaskCount_Round);

                Btn_Finish.gameObject.SetActive(false);

            }

            else

@@ -298,13 +298,13 @@
                Btn_Leave.gameObject.SetActive(true);

                Btn_Finish.gameObject.SetActive(true);

                int total = TaskAllocation.Instance.FairyAuAllNumber();

                total = Mathf.CeilToInt((float)total / 10);

                total = Mathf.CeilToInt((float)total / taskmodel.FairyAuTaskCount_Round);

                RoundText_L.text = Language.Get("FairyAuTaskWin_Text3", SetNumberOfRounds(total));

                RoundText_R.text = Language.Get("FairyAuTaskWin_Text4", (TaskAllocation.Instance.FairyAuNumber() + 1));

            }

            Text_FinishRound.text = TaskAllocation.Instance.FairyAuAllNumber() + "/70";

            Text_FinishRound.text = string.Format("{0}/{1}", TaskAllocation.Instance.FairyAuAllNumber(), taskmodel.FairyAuTaskCount_Day);



            m_Slider.value = (((float)TaskAllocation.Instance.FairyAuAllNumber()) / 70);

            m_Slider.value = (((float)TaskAllocation.Instance.FairyAuAllNumber()) / taskmodel.FairyAuTaskCount_Day);



            string strINfor = taskmodel.FairyAuDic[_taskID].InforList;

            TaskID = _taskID;

@@ -324,7 +324,7 @@
            Btn_Leave.gameObject.SetActive(true);

            RoundText_L.text = Language.Get("FairyAuTaskWin_Text3", SetNumberOfRounds(0));

            RoundText_R.text = Language.Get("FairyAuTaskWin_Text4", 0);

            Text_FinishRound.text = "0/70";

            Text_FinishRound.text = string.Format("0/{0}", taskmodel.FairyAuTaskCount_Day);

            m_Slider.value = 0f;

            string strINfor = taskmodel.SpecialTask[_taskID].InforList;

            TaskID = _taskID;

@@ -343,8 +343,8 @@
            Btn_Finish.gameObject.SetActive(false);

            Btn_Leave.gameObject.SetActive(false);

            RoundText_L.text = Language.Get("FairyAuTaskWin_Text3", SetNumberOfRounds(7));

            RoundText_R.text = Language.Get("FairyAuTaskWin_Text4", 10);

            Text_FinishRound.text = "70/70";

            RoundText_R.text = Language.Get("FairyAuTaskWin_Text4", taskmodel.FairyAuTaskCount_Round);

            Text_FinishRound.text = string.Format("{0}/{0}",taskmodel.FairyAuTaskCount_Day);

            m_Slider.value = 1f;

            ObjectiveText.text = Language.Get("CompleteTheXianmengMission_Z");

            ObjectiveText.color = UIHelper.GetUIColor(TextColType.NavyBrown);


 System/MainInterfacePanel/TaskModel.cs

@@ -62,6 +62,8 @@
    public Dictionary<int, MissionDetailDates> SideQuestsDic = new Dictionary<int, MissionDetailDates>();//支线任务字典
    public Dictionary<int, MissionDetailDates> BountyDic = new Dictionary<int, MissionDetailDates>();//赏金任务
    public Dictionary<int, MissionDetailDates> FairyAuDic = new Dictionary<int, MissionDetailDates>();//仙盟任务
    public int FairyAuTaskCount_Day { get; private set; }
    public int FairyAuTaskCount_Round { get; private set; }
    public Dictionary<int, MissionDetailDates> SpecialTask = new Dictionary<int, MissionDetailDates>();//特殊任务类型
    public Dictionary<int, Dictionary<string, string>> _DicTaskInformation = new Dictionary<int, Dictionary<string, string>>();//任务字典的信息
    public Dictionary<int, Dictionary<string, int>> ReplaceDic = new Dictionary<int, Dictionary<string, int>>();//key值替换字典
@@ -157,6 +159,8 @@
        var Task_Auto = FuncConfigConfig.Get("TaskAuto");
        TaskAutoLv = int.Parse(Task_Auto.Numerical1);
        TaskAutoTime = int.Parse(Task_Auto.Numerical2);
        FairyAuTaskCount_Day = int.Parse(FuncConfigConfig.Get("RunTaskCnt").Numerical1.Split('|')[1].Split('_')[1]);
        FairyAuTaskCount_Round = int.Parse(FuncConfigConfig.Get("RunTaskCnt").Numerical2.Split('|')[1].Split('_')[1]);
    }

    public override void UnInit()
@@ -232,6 +236,12 @@
                currentMission = MissionID;
                currentMissionState = MissionState;
            }
            //仙盟任务完成
            if ((pytaskM.type == 12||pytaskM.type == 14) && TaskAllocation.Instance.FairyAuAllNumber() >= FairyAuTaskCount_Day)

            {

                Event_FairyAuTask();

                return;

            }


            if (allMissionDict.ContainsKey(MissionID))