少年修仙传客户端代码仓库
hch
2020-10-29 559b64222b1eba34ab36d011d24888291805fdbe
0312 优化打boss传送弹框处理
5个文件已修改
133 ■■■■■ 已修改文件
Fight/MapTransferUtility.cs 66 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/ChatFrame.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/FlyingShoesTask.cs 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/TaskFeedbackFuncWin.cs 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/TaskFeedbackModel.cs 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/MapTransferUtility.cs
@@ -559,11 +559,6 @@
                return;
            }
            //if (PlayerDatas.Instance.extersion.bossState == 1)
            //{
            //    SysNotifyMgr.Instance.ShowTip("Task_Transfer1");
            //    return;
            //}
        }
        _hero.Behaviour.StopHandupAI(true);
@@ -650,12 +645,6 @@
                        SysNotifyMgr.Instance.ShowTip("PK_Leave");
                        return;
                    }
                    //if (PlayerDatas.Instance.extersion.bossState == 1)
                    //{
                    //    SysNotifyMgr.Instance.ShowTip("Task_Transfer1");
                    //    return;
                    //}
                    //Debug.LogFormat(" |-- 不在本地图");
                    var mapId = _npcLocation.mapId;
@@ -767,12 +756,6 @@
                    return;
                }
            }
            //if (PlayerDatas.Instance.extersion.bossState == 1)
            //{
            //    SysNotifyMgr.Instance.ShowTip("Task_Transfer1");
            //    return;
            //}
            if (PlayerDatas.Instance.extersion.pkState == 1)
            {
@@ -1125,15 +1108,32 @@
                return;
            }
            if (PlayerDatas.Instance.extersion.bossState == 1)
            {
                SysNotifyMgr.Instance.ShowTip("Task_Transfer1");
                return;
            }
            if (PlayerDatas.Instance.extersion.pkState == 1)
            {
                SysNotifyMgr.Instance.ShowTip("PK_Leave");
                return;
            }
            if (PlayerDatas.Instance.extersion.bossState == 1)
            {
                ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"),
                Language.Get("ZLMapQuit"), (bool isOk) =>
                {
                    //不传送
                    if (!isOk)
                    {
                        return;
                    }
                    else
                    {
                        _hero.Behaviour.StopHandupAI(true);
                        _hero.Behaviour.StopKillUntilDieAI();
                        _position += _rot * Vector3.forward * 1;
                        Send_WorldTransfer(mapId, _position * 2, mapTransferType);
                    }
                });
                return;
            }
        }
@@ -1258,10 +1258,28 @@
        if (PlayerDatas.Instance.extersion.bossState == 1)
        {
            SysNotifyMgr.Instance.ShowTip("Task_Transfer1");
            ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"),
            Language.Get("ZLMapQuit"), (bool isOk) =>
            {
                //不传送
                if (!isOk)
                {
                    return;
                }
                else
                {
                    _FlyTo(mapID, pos, lineID);
                }
            });
            return;
        }
        _FlyTo(mapID, pos, lineID);
    }
    private void _FlyTo(int mapID, Vector3 pos, byte lineID = 255)
    {
        GA_Hero _hero = PlayerDatas.Instance.hero;
        // 如果处于相同地图且距离小于一定的值, 则不传送
        if (mapID == PlayerDatas.Instance.baseData.MapID && lineID == PlayerDatas.Instance.baseData.FBID)
System/MainInterfacePanel/ChatFrame.cs
@@ -303,11 +303,6 @@
        void GoToOneKeyButton()
        {
            if (PlayerDatas.Instance.extersion.bossState == 1)
            {
                SysNotifyMgr.Instance.ShowTip("Task_Transfer1");
                return;
            }
            var mapModel = ModelCenter.Instance.GetModel<MapModel>();
            var point = mapModel.GetRecommendHangPoint();
@@ -315,6 +310,7 @@
            var mapId = MapUtility.GetMapId(config.DataMapID, config.LineId);
            MapTransferUtility.Instance.MissionFlyTo(mapId, config.NPCID, MapTransferType.WorldTransport);
        }
        void AutoButton()//原地挂机按钮
System/MainInterfacePanel/FlyingShoesTask.cs
@@ -166,6 +166,34 @@
                        bool Bool = StateDetermination();
                        if (Bool)
                        {
                            ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"),
                            Language.Get("ZLMapQuit"), (bool isOk) =>
                            {
                                //不传送
                                if (!isOk)
                                {
                                    return;
                                }
                                else
                                {
                                    if (mainModel.TaskId_Skill.Contains(Task_ID))
                                    {
                                        mainModel.TaskSkillID = Task_ID;
                                        WindowCenter.Instance.Open<SkillTaskWin>();
                                    }
                                    else
                                    {
                                        HeroAIRecorder.ClearRecord();
                                        var rect = transform as RectTransform;
                                        var worldpos = rect.TransformPoint(Vector3.zero + Vector3.up * rect.rect.height / 2);
                                        TaskFeedbackModel.s_ClickPosition = worldpos;
                                        ContentText.ExcuteHref();
                                        TaskAllocation.Instance.TaskTime = TimeUtility.ServerNow;
                                        OpenPanel(Task_ID);
                                    }
                                }
                            });
                            return;
                        }
                    }
@@ -267,7 +295,6 @@
                    {
                        if (value.NPCID == npcId && value.MapID != mapID)
                        {
                            SysNotifyMgr.Instance.ShowTip("Task_Transfer1");
                            _bool = true;
                            return _bool;
                        }
@@ -275,7 +302,6 @@
                    var MonsterConfig = MonsterRefreshPointConfig.Get(npcId);
                    if (MonsterConfig != null && MonsterConfig.MapId != mapID)
                    {
                        SysNotifyMgr.Instance.ShowTip("Task_Transfer1");
                        _bool = true;
                        return _bool;
                    }
System/MainInterfacePanel/TaskFeedbackFuncWin.cs
@@ -101,10 +101,20 @@
                        case 9:
                            if (PlayerDatas.Instance.extersion.bossState == 1)
                            {
                                SysNotifyMgr.Instance.ShowTip("Task_Transfer1");
                                return;
                                ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"),
                                Language.Get("ZLMapQuit"), (bool isOk) =>
                                {
                                    //不传送
                                    if (!isOk)
                                    {
                                        return;
                                    }
                                    else
                                    {
                                        taskModel.AutomaticTripToTask(taskModel.GetLatestMainTaskId());
                                    }
                                });
                            }
                            taskModel.AutomaticTripToTask(taskModel.GetLatestMainTaskId());
                            return;
                    }
System/MainInterfacePanel/TaskFeedbackModel.cs
@@ -1,6 +1,6 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
namespace Snxxz.UI
{
    public class TaskFeedbackModel : Model
@@ -299,11 +299,6 @@
        public void OnekeyHangUp()
        {
            if (PlayerDatas.Instance.extersion.bossState == 1)
            {
                SysNotifyMgr.Instance.ShowTip("Task_Transfer1");
                return;
            }
            var mapModel = ModelCenter.Instance.GetModel<MapModel>();
            var point = mapModel.GetRecommendHangPoint();
@@ -664,5 +659,5 @@
        HasFairy = 12,
        OnekeyHangUp = 13,
    }
}
}