snxxz_scripts.git

parent: 9a607e82 | 补丁 | 提交 | ignore whitespace

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

hch

2019-11-11 e18d4fa87704299dfecfb5dda784775d5158f9bf

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

5个文件已修改

	System/FindPrecious/DemonJarWin.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/FindPrecious/ElderGodAreaWin.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/FindPrecious/FindPreciousBossRebornBehaviour.cs	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/FindPrecious/PersonalBossWin.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/FindPrecious/WorldBossWin.cs	29 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 System/FindPrecious/DemonJarWin.cs

@@ -340,7 +340,7 @@
            }



            var mapConfig = MapConfig.Get(PlayerDatas.Instance.baseData.MapID);

            if (mapConfig.MapFBType != (int)MapType.OpenCountry)

            if (mapConfig.MapFBType != (int)MapType.OpenCountry && PlayerDatas.Instance.baseData.MapID != 31020)

            {

                _error = 7;

                return false;


 System/FindPrecious/ElderGodAreaWin.cs

@@ -150,7 +150,7 @@
            }



            var mapConfig = MapConfig.Get(PlayerDatas.Instance.baseData.MapID);

            if (mapConfig.MapFBType != (int)MapType.OpenCountry)

            if (mapConfig.MapFBType != (int)MapType.OpenCountry && PlayerDatas.Instance.baseData.MapID != 31020)

            {

                _error = 3;

                return false;


 System/FindPrecious/FindPreciousBossRebornBehaviour.cs

@@ -153,7 +153,7 @@


            var mapId = PlayerDatas.Instance.baseData.MapID;

            var mapConfig = MapConfig.Get(mapId);

            if (mapConfig.MapFBType == (int)MapType.OpenCountry)

            if (mapConfig.MapFBType == (int)MapType.OpenCountry || PlayerDatas.Instance.baseData.MapID == 31020)

            {

                WindowCenter.Instance.Close<MainInterfaceWin>();

                demonJarModel.selectedBoss = _bossId;

@@ -176,7 +176,7 @@


            var mapId = PlayerDatas.Instance.baseData.MapID;

            var mapConfig = MapConfig.Get(mapId);

            if (mapConfig.MapFBType != (int)MapType.OpenCountry)

            if (mapConfig.MapFBType != (int)MapType.OpenCountry && PlayerDatas.Instance.baseData.MapID != 31020)

            {

                SysNotifyMgr.Instance.ShowTip("InDungeon_CantGo");

                return;

@@ -270,7 +270,7 @@
                var mapId = PlayerDatas.Instance.baseData.MapID;

                var mapConfig = MapConfig.Get(mapId);



                if (mapConfig.MapFBType == (int)MapType.OpenCountry)

                if (mapConfig.MapFBType == (int)MapType.OpenCountry || PlayerDatas.Instance.baseData.MapID == 31020)

                {

                    var error = 0;

                    if (TestEnterElderGodAreaDungeon(out error))


 System/FindPrecious/PersonalBossWin.cs

@@ -129,7 +129,7 @@
            }



            var mapConfig = MapConfig.Get(PlayerDatas.Instance.baseData.MapID);

            if (mapConfig.MapFBType != (int)MapType.OpenCountry)

            if (mapConfig.MapFBType != (int)MapType.OpenCountry && PlayerDatas.Instance.baseData.MapID != 31020)

            {

                _error = 4;

                return false;


 System/FindPrecious/WorldBossWin.cs

@@ -236,7 +236,7 @@
                        }

                        else

                        {

                            tip = Language.Get(config.ExitDescription);

                            //tip = Language.Get(config.ExitDescription);

                        }

                    }

                    else

@@ -244,18 +244,25 @@
                        tip = Language.Get(config.ExitDescription);

                    }



                    ConfirmCancel.ShowPopConfirm(

                        Language.Get("Mail101"),

                        tip,

                        (bool _ok) =>

                        {

                            if (_ok)

                    if (tip == string.Empty)

                    {

                        WindowCenter.Instance.Close<FindPreciousFrameWin>();

                        MapTransferUtility.Instance.MoveToNPC(model.selectedBoss);

                    }

                    else {

                        ConfirmCancel.ShowPopConfirm(

                            Language.Get("Mail101"),

                            tip,

                            (bool _ok) =>

                            {

                                WindowCenter.Instance.Close<FindPreciousFrameWin>();

                                MapTransferUtility.Instance.MoveToNPC(model.selectedBoss);

                                if (_ok)

                                {

                                    WindowCenter.Instance.Close<FindPreciousFrameWin>();

                                    MapTransferUtility.Instance.MoveToNPC(model.selectedBoss);

                                }

                            }

                        }

                        );

                            );

                    }

                    break;

                case 2:

                    SysNotifyMgr.Instance.ShowTip("InDungeon_CantGo");

			@@ -340,7 +340,7 @@
			}

			var mapConfig = MapConfig.Get(PlayerDatas.Instance.baseData.MapID);
			if (mapConfig.MapFBType != (int)MapType.OpenCountry)
			if (mapConfig.MapFBType != (int)MapType.OpenCountry && PlayerDatas.Instance.baseData.MapID != 31020)
			{
			_error = 7;
			return false;

			@@ -150,7 +150,7 @@
			}

			var mapConfig = MapConfig.Get(PlayerDatas.Instance.baseData.MapID);
			if (mapConfig.MapFBType != (int)MapType.OpenCountry)
			if (mapConfig.MapFBType != (int)MapType.OpenCountry && PlayerDatas.Instance.baseData.MapID != 31020)
			{
			_error = 3;
			return false;

			@@ -153,7 +153,7 @@

			var mapId = PlayerDatas.Instance.baseData.MapID;
			var mapConfig = MapConfig.Get(mapId);
			if (mapConfig.MapFBType == (int)MapType.OpenCountry)
			if (mapConfig.MapFBType == (int)MapType.OpenCountry \|\| PlayerDatas.Instance.baseData.MapID == 31020)
			{
			WindowCenter.Instance.Close<MainInterfaceWin>();
			demonJarModel.selectedBoss = _bossId;
			@@ -176,7 +176,7 @@

			var mapId = PlayerDatas.Instance.baseData.MapID;
			var mapConfig = MapConfig.Get(mapId);
			if (mapConfig.MapFBType != (int)MapType.OpenCountry)
			if (mapConfig.MapFBType != (int)MapType.OpenCountry && PlayerDatas.Instance.baseData.MapID != 31020)
			{
			SysNotifyMgr.Instance.ShowTip("InDungeon_CantGo");
			return;
			@@ -270,7 +270,7 @@
			var mapId = PlayerDatas.Instance.baseData.MapID;
			var mapConfig = MapConfig.Get(mapId);

			if (mapConfig.MapFBType == (int)MapType.OpenCountry)
			if (mapConfig.MapFBType == (int)MapType.OpenCountry \|\| PlayerDatas.Instance.baseData.MapID == 31020)
			{
			var error = 0;
			if (TestEnterElderGodAreaDungeon(out error))

			@@ -129,7 +129,7 @@
			}

			var mapConfig = MapConfig.Get(PlayerDatas.Instance.baseData.MapID);
			if (mapConfig.MapFBType != (int)MapType.OpenCountry)
			if (mapConfig.MapFBType != (int)MapType.OpenCountry && PlayerDatas.Instance.baseData.MapID != 31020)
			{
			_error = 4;
			return false;

			@@ -236,7 +236,7 @@
			}
			else
			{
			tip = Language.Get(config.ExitDescription);
			//tip = Language.Get(config.ExitDescription);
			}
			}
			else
			@@ -244,18 +244,25 @@
			tip = Language.Get(config.ExitDescription);
			}

			ConfirmCancel.ShowPopConfirm(
			Language.Get("Mail101"),
			tip,
			(bool _ok) =>
			{
			if (_ok)
			if (tip == string.Empty)
			{
			WindowCenter.Instance.Close<FindPreciousFrameWin>();
			MapTransferUtility.Instance.MoveToNPC(model.selectedBoss);
			}
			else {
			ConfirmCancel.ShowPopConfirm(
			Language.Get("Mail101"),
			tip,
			(bool _ok) =>
			{
			WindowCenter.Instance.Close<FindPreciousFrameWin>();
			MapTransferUtility.Instance.MoveToNPC(model.selectedBoss);
			if (_ok)
			{
			WindowCenter.Instance.Close<FindPreciousFrameWin>();
			MapTransferUtility.Instance.MoveToNPC(model.selectedBoss);
			}
			}
			}
			);
			);
			}
			break;
			case 2:
			SysNotifyMgr.Instance.ShowTip("InDungeon_CantGo");