snxxz_scripts.git

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

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

client_Zxw

2019-01-17 c0a68d49f835493f5c49d19c1b192c7a8a08cf2a

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

6个文件已修改

	Core/GameEngine/Login/LoginStage.cs	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Activity/ActivityNotifyBehaviour.cs	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/DailyQuest/DailyQuestWin.cs	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/FairyAu/FairyLeagueWin.cs	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/FindPrecious/DemonJarModel.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/FindPrecious/FindPreciousModel.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 Core/GameEngine/Login/LoginStage.cs

@@ -46,12 +46,7 @@
                {

                    if (!loginModel.sdkLogined)

                    {

                        if (SDKUtility.Instance.ChannelPlatform != SDKUtility.E_ChannelPlatform.Yj

                         || SDKUtility.Yj_AppID.Equals("yybgame"))

                        {

                            SDKUtility.Instance.FreePlatformLogin();

                        }



                        SDKUtility.Instance.FreePlatformLogin();

                        OperationLogCollect.Instance.RecordLauchEvent(4);

                        OperationLogCollect.Instance.RecordEvent(4);

                    }


 System/Activity/ActivityNotifyBehaviour.cs

@@ -112,6 +112,11 @@
                        }

                        break;

                    case DailyQuestType.FairyFeast:

                        if (CrossServerUtility.IsCrossServer())

                        {

                            SysNotifyMgr.Instance.ShowTip("CrossMap10");

                            break;

                        }

                        dungeonModel.SingleChallenge(config.RelatedID);

                        break;

                    case DailyQuestType.Trial:


 System/DailyQuest/DailyQuestWin.cs

@@ -258,6 +258,11 @@
                    WindowCenter.Instance.Open<UnionPanel>(false, 4);

                    break;

                case DailyQuestType.FairyFeast:

                    if (CrossServerUtility.IsCrossServer())

                    {

                        SysNotifyMgr.Instance.ShowTip("CrossMap10");

                        break;

                    }

                    var config = Config.Instance.Get<DailyQuestConfig>(_id);

                    dungeonModel.SingleChallenge(config.RelatedID);

                    break;


 System/FairyAu/FairyLeagueWin.cs

@@ -464,6 +464,11 @@
                model.DisplayErrorTip(_error);

                return;

            }

            if (CrossServerUtility.IsCrossServer())

            {

                SysNotifyMgr.Instance.ShowTip("CrossMap10");

                return;

            }

            ModelCenter.Instance.GetModel<DungeonModel>().SingleChallenge(FairyLeagueModel.FAIRY_LEAGUE_DUNGEON);

        }




 System/FindPrecious/DemonJarModel.cs

@@ -202,7 +202,7 @@
        {

            if (FuncOpen.Instance.IsFuncOpen(76))

            {

                var latestBossId = 0;

                var latestBossId = sortedBossIds[0];

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

                {

                    var bossId = sortedBossIds[i];

@@ -217,7 +217,7 @@
            }

            else

            {

                return 0;

                return sortedBossIds[0];

            }

        }




 System/FindPrecious/FindPreciousModel.cs

@@ -468,6 +468,10 @@
            {

                return FindPreciousType.DogzDungeon;

            }

            else if (Config.Instance.ContainKey<CrossServerBossConfig>(_bossId))

            {

                return FindPreciousType.CrossServerBoss;

            }



            return FindPreciousType.None;

        }

			@@ -46,12 +46,7 @@
			{
			if (!loginModel.sdkLogined)
			{
			if (SDKUtility.Instance.ChannelPlatform != SDKUtility.E_ChannelPlatform.Yj
			\|\| SDKUtility.Yj_AppID.Equals("yybgame"))
			{
			SDKUtility.Instance.FreePlatformLogin();
			}

			SDKUtility.Instance.FreePlatformLogin();
			OperationLogCollect.Instance.RecordLauchEvent(4);
			OperationLogCollect.Instance.RecordEvent(4);
			}

			@@ -112,6 +112,11 @@
			}
			break;
			case DailyQuestType.FairyFeast:
			if (CrossServerUtility.IsCrossServer())
			{
			SysNotifyMgr.Instance.ShowTip("CrossMap10");
			break;
			}
			dungeonModel.SingleChallenge(config.RelatedID);
			break;
			case DailyQuestType.Trial:

			@@ -258,6 +258,11 @@
			WindowCenter.Instance.Open<UnionPanel>(false, 4);
			break;
			case DailyQuestType.FairyFeast:
			if (CrossServerUtility.IsCrossServer())
			{
			SysNotifyMgr.Instance.ShowTip("CrossMap10");
			break;
			}
			var config = Config.Instance.Get<DailyQuestConfig>(_id);
			dungeonModel.SingleChallenge(config.RelatedID);
			break;

			@@ -464,6 +464,11 @@
			model.DisplayErrorTip(_error);
			return;
			}
			if (CrossServerUtility.IsCrossServer())
			{
			SysNotifyMgr.Instance.ShowTip("CrossMap10");
			return;
			}
			ModelCenter.Instance.GetModel<DungeonModel>().SingleChallenge(FairyLeagueModel.FAIRY_LEAGUE_DUNGEON);
			}

			@@ -202,7 +202,7 @@
			{
			if (FuncOpen.Instance.IsFuncOpen(76))
			{
			var latestBossId = 0;
			var latestBossId = sortedBossIds[0];
			for (int i = sortedBossIds.Count - 1; i >= 0; i--)
			{
			var bossId = sortedBossIds[i];
			@@ -217,7 +217,7 @@
			}
			else
			{
			return 0;
			return sortedBossIds[0];
			}
			}

			@@ -468,6 +468,10 @@
			{
			return FindPreciousType.DogzDungeon;
			}
			else if (Config.Instance.ContainKey<CrossServerBossConfig>(_bossId))
			{
			return FindPreciousType.CrossServerBoss;
			}

			return FindPreciousType.None;
			}