snxxz_scripts.git

parent: 231bed83 | 补丁 | 提交 | ignore whitespace

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

client_linchunjie

2018-09-03 6e6db61a11186d9a616488b761b93fc7f0ccef6c

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

6个文件已修改

	System/BlastFurnace/BlastFurnaceModel.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Dungeon/MultipleDifficultyDungeonWin.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/KnapSack/Logic/RoleElixirTipWin.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/MainInterfacePanel/CombatModeWin.cs	21 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/MainInterfacePanel/HeadPortraitTip.cs	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/MainInterfacePanel/MainInterfaceWin.cs	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 System/BlastFurnace/BlastFurnaceModel.cs

@@ -751,7 +751,7 @@
            blastFurnacePromoteUpdate();

        }

    }



    public bool IsMakeDrugWin { get;set; }

    public void CheckMakeDrugRedPoint(bool isLogin = false,bool isClick = false)

    {

        bool isCheckRed = false;

@@ -761,7 +761,7 @@
            {

                isCheckRed = true;

            }

            else if(PlayerDatas.Instance.baseData.LV > 151 && !isLogin)

            else if(PlayerDatas.Instance.baseData.LV > 151 && !isLogin && !IsMakeDrugWin)

            {

                isCheckRed = true;

            }


 System/Dungeon/MultipleDifficultyDungeonWin.cs

@@ -307,7 +307,7 @@


                if (condition)

                {

                    var guideEffect = AchievementGuideEffectPool.Require(1);

                    var guideEffect = AchievementGuideEffectPool.Require(6);

                    guideEffect.transform.SetParentEx(m_SingleStart.transform, Vector3.zero, Vector3.zero, Vector3.one);

                }

            }


 System/KnapSack/Logic/RoleElixirTipWin.cs

@@ -30,11 +30,13 @@
            presentIndex = 0;

            CreateCell();

            CheckJumpToModel();

            ModelCenter.Instance.GetModel<BlastFurnaceModel>().IsMakeDrugWin = true;

        }



        private void OnDisable()

        {

            ctrl.OnRefreshCell -= RefreshMakeDrugCell;

            ModelCenter.Instance.GetModel<BlastFurnaceModel>().IsMakeDrugWin = false;

        }



        private void CheckJumpToModel()


 System/MainInterfacePanel/CombatModeWin.cs

@@ -50,7 +50,9 @@
        {
            int MapID = PlayerDatas.Instance.baseData.MapID;
            var config = Config.Instance.Get<MapConfig>(MapID);

            if (fairyGrabBossModel.grabBossHintOpen)//再前四章新手地图且在活动区域

            var activityline = 0;

            fairyGrabBossModel.TryGetFairyGrabBossLine(out activityline);

            if (activityline == PlayerDatas.Instance.baseData.FBID)//再前四章新手地图且在活动区域

            {

                AtkTypeList = new int[] { 0, 5 };

            }

@@ -110,18 +112,7 @@
            _PkButton.StateSelection.RemoveAllListeners();

            bool IsBossBool = MapArea.IsInMapArea(PlayerDatas.Instance.hero.CurMapArea, MapArea.E_Type.Boss);//是否在Boss区域
            _PkButton.StateSelection.AddListener(() =>
            {

                if (PlayerDatas.Instance.baseData.MapID == 10040 && IsBossBool)//御剑山庄boss区域特殊处理（可切换状态）

                {

                    DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)cell.index);

                    Close();

                    return;

                }

                if (onMainModel.ActivityList.Contains(PlayerDatas.Instance.baseData.MapID) && !fairyGrabBossModel.grabBossHintOpen)//再前四章新手地图且不在活动区域

                {

                    Close();//不允许切换

                    return;

                }
            {
                DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)cell.index);
                Close();
            });
@@ -166,12 +157,8 @@
                    break;
                default:
                    break;


            }

        }

    }



 System/MainInterfacePanel/HeadPortraitTip.cs

@@ -190,6 +190,7 @@
        private void OnSwitchAttackMode(E_AttackMode obj)//PK状态切换

        {

            TextSwitch((int)obj);

          
        }

        void PatternButton(GameObject obj)

        {

@@ -208,7 +209,9 @@
                    }

                    return;

                }

                if (onMainModel.ActivityList.Contains(PlayerDatas.Instance.baseData.MapID) && !fairyGrabBossModel.grabBossHintOpen)//再前四章新手地图且不在活动区域

                var activityline = 0;

                fairyGrabBossModel.TryGetFairyGrabBossLine(out activityline);

                if (onMainModel.ActivityList.Contains(PlayerDatas.Instance.baseData.MapID) && activityline!=PlayerDatas.Instance.baseData.FBID)//再前四章新手地图且不在活动区域

                {

                    SysNotifyMgr.Instance.ShowTip("Map_AtkType");

                    return;

@@ -224,7 +227,6 @@
            {

                SysNotifyMgr.Instance.ShowTip("Map_AtkType");

            }



        }

        void TextSwitch(int _EnumType)

        {

@@ -270,10 +272,7 @@
                    break;

                default:

                    break;





            }



        }



        void BuffButton(GameObject obj)

@@ -394,10 +393,7 @@
                    break;

                default:

                    break;



            }





        }






 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -1056,22 +1056,6 @@
        private void bossGrabHintEvent()

        {

            IsShowTaskPanel();

            int mapID = PlayerDatas.Instance.baseData.MapID;

            var config = Config.Instance.Get<MapConfig>(mapID);

            if (fairyGrabBossModel.grabBossHintOpen)

            {

                if (Buffmodel.PkType != config.Camp)

                {

                    DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)config.Camp);

                }

            }

            else

            {

                if (Buffmodel.PkType != config.Camp)

                {

                    DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)config.Camp);

                }

            }

        }

    }

			@@ -751,7 +751,7 @@
			blastFurnacePromoteUpdate();
			}
			}

			public bool IsMakeDrugWin { get;set; }
			public void CheckMakeDrugRedPoint(bool isLogin = false,bool isClick = false)
			{
			bool isCheckRed = false;
			@@ -761,7 +761,7 @@
			{
			isCheckRed = true;
			}
			else if(PlayerDatas.Instance.baseData.LV > 151 && !isLogin)
			else if(PlayerDatas.Instance.baseData.LV > 151 && !isLogin && !IsMakeDrugWin)
			{
			isCheckRed = true;
			}

			@@ -307,7 +307,7 @@

			if (condition)
			{
			var guideEffect = AchievementGuideEffectPool.Require(1);
			var guideEffect = AchievementGuideEffectPool.Require(6);
			guideEffect.transform.SetParentEx(m_SingleStart.transform, Vector3.zero, Vector3.zero, Vector3.one);
			}
			}

			@@ -30,11 +30,13 @@
			presentIndex = 0;
			CreateCell();
			CheckJumpToModel();
			ModelCenter.Instance.GetModel<BlastFurnaceModel>().IsMakeDrugWin = true;
			}

			private void OnDisable()
			{
			ctrl.OnRefreshCell -= RefreshMakeDrugCell;
			ModelCenter.Instance.GetModel<BlastFurnaceModel>().IsMakeDrugWin = false;
			}

			private void CheckJumpToModel()

			@@ -50,7 +50,9 @@
			{
			int MapID = PlayerDatas.Instance.baseData.MapID;
			var config = Config.Instance.Get<MapConfig>(MapID);
			if (fairyGrabBossModel.grabBossHintOpen)//再前四章新手地图且在活动区域
			var activityline = 0;
			fairyGrabBossModel.TryGetFairyGrabBossLine(out activityline);
			if (activityline == PlayerDatas.Instance.baseData.FBID)//再前四章新手地图且在活动区域
			{
			AtkTypeList = new int[] { 0, 5 };
			}
			@@ -110,18 +112,7 @@
			_PkButton.StateSelection.RemoveAllListeners();
			bool IsBossBool = MapArea.IsInMapArea(PlayerDatas.Instance.hero.CurMapArea, MapArea.E_Type.Boss);//是否在Boss区域
			_PkButton.StateSelection.AddListener(() =>
			{
			if (PlayerDatas.Instance.baseData.MapID == 10040 && IsBossBool)//御剑山庄boss区域特殊处理（可切换状态）
			{
			DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)cell.index);
			Close();
			return;
			}
			if (onMainModel.ActivityList.Contains(PlayerDatas.Instance.baseData.MapID) && !fairyGrabBossModel.grabBossHintOpen)//再前四章新手地图且不在活动区域
			{
			Close();//不允许切换
			return;
			}
			{
			DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)cell.index);
			Close();
			});
			@@ -166,12 +157,8 @@
			break;
			default:
			break;


			}

			}

			}

			@@ -190,6 +190,7 @@
			private void OnSwitchAttackMode(E_AttackMode obj)//PK状态切换
			{
			TextSwitch((int)obj);

			}
			void PatternButton(GameObject obj)
			{
			@@ -208,7 +209,9 @@
			}
			return;
			}
			if (onMainModel.ActivityList.Contains(PlayerDatas.Instance.baseData.MapID) && !fairyGrabBossModel.grabBossHintOpen)//再前四章新手地图且不在活动区域
			var activityline = 0;
			fairyGrabBossModel.TryGetFairyGrabBossLine(out activityline);
			if (onMainModel.ActivityList.Contains(PlayerDatas.Instance.baseData.MapID) && activityline!=PlayerDatas.Instance.baseData.FBID)//再前四章新手地图且不在活动区域
			{
			SysNotifyMgr.Instance.ShowTip("Map_AtkType");
			return;
			@@ -224,7 +227,6 @@
			{
			SysNotifyMgr.Instance.ShowTip("Map_AtkType");
			}

			}
			void TextSwitch(int _EnumType)
			{
			@@ -270,10 +272,7 @@
			break;
			default:
			break;


			}

			}

			void BuffButton(GameObject obj)
			@@ -394,10 +393,7 @@
			break;
			default:
			break;

			}


			}

			@@ -1056,22 +1056,6 @@
			private void bossGrabHintEvent()
			{
			IsShowTaskPanel();
			int mapID = PlayerDatas.Instance.baseData.MapID;
			var config = Config.Instance.Get<MapConfig>(mapID);
			if (fairyGrabBossModel.grabBossHintOpen)
			{
			if (Buffmodel.PkType != config.Camp)
			{
			DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)config.Camp);
			}
			}
			else
			{
			if (Buffmodel.PkType != config.Camp)
			{
			DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)config.Camp);
			}
			}
			}
			}