snxxz_scripts.git

parent: 38afc6f2 | 补丁 | 提交 | show whitespace

client_Wu Xijin

2018-11-15 a08989bee578f43a2a9b1724366fdea969e9405e

Merge branch 'master' into builtinmove

7个文件已修改

	Fight/GameActor/GA_Guard.cs	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	Fight/MapTransferUtility.cs	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Compose/New/ComposeDogzEquipWin.cs	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Compose/New/ComposeEquipWin.cs	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Compose/New/ComposeTicketWin.cs	22 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Compose/New/ComposeToolsWin.cs	23 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Compose/New/ComposeWingsWin.cs	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 Fight/GameActor/GA_Guard.cs

@@ -505,11 +505,8 @@
                {
                    NextAction = GuardAction_Run;
                }
                else
                {
                    GuardRun guardRun = m_Animator.GetBehaviour<GuardRun>();
                    guardRun.OnPickUpEnter();
                }
            }
            return true;
        }

 Fight/MapTransferUtility.cs

@@ -919,7 +919,8 @@
                Clear();

            }

        }

        else if (_npcConfig.NPCType == (int)E_NpcType.Collect)

        else if (_npcConfig.NPCType == (int)E_NpcType.Collect

              || _npcConfig.NPCType == (int)E_NpcType.Flag)

        {

            float _chkDist = GeneralDefine.CloseNpcDist + _npcConfig.ModelRadius + 0.3f;

            if (_chkDistSqrt <= Mathf.Pow(_chkDist, 2))


 System/Compose/New/ComposeDogzEquipWin.cs

@@ -297,15 +297,6 @@
        private void UpdateThirdType(int thirdType)

        {

            composeWinModel.TryGetThirdTypeData((int)ComposeFuncType.MountDogz, curSecondType, thirdType, out thirdTypeData);

            if (thirdTypeData != null)

            {

                bool isTrailer = composeWinModel.IsTrailerByLevel(thirdTypeData.itemCompound);

                if (isTrailer)

                {

                    MessageWin.Inst.ShowFixedTip(Language.Get("FuncOpenLv", thirdTypeData.itemCompound.levelNeed));

                    return;

                }

            }

            curThirdType = thirdType;

            OnClickThirdType();

            CreateTypeCell();

@@ -480,6 +471,14 @@


        private void OnClickComposeBtn()

        {

            if (compoundModel == null) return;



            bool isTrailer = composeWinModel.IsTrailerByLevel(compoundModel);

            if (isTrailer)

            {

                MessageWin.Inst.ShowFixedTip(Language.Get("FuncOpenLv", compoundModel.levelNeed));

                return;

            }

            composeWinModel.SendComposeRequest(compoundModel,fixedItemIndexDict,composeEffect,1);

        }




 System/Compose/New/ComposeEquipWin.cs

@@ -333,15 +333,6 @@
        private void UpdateThirdType(int thirdType)

        {

            composeWinModel.TryGetThirdTypeData((int)ComposeFuncType.Equip, curSecondType,thirdType, out thirdTypeData);

            if(thirdTypeData != null)

            {

                bool isTrailer = composeWinModel.IsTrailerByLevel(thirdTypeData.itemCompound);

                if (isTrailer)

                {

                    MessageWin.Inst.ShowFixedTip(Language.Get("FuncOpenLv", thirdTypeData.itemCompound.levelNeed));

                    return;

                }

            }

            curThirdType = thirdType;

            OnClickThirdType();

            CreateTypeCell();

@@ -641,6 +632,15 @@


        private void OnClickComposeBtn()

        {

            if (compoundModel != null)

            {

                bool isTrailer = composeWinModel.IsTrailerByLevel(compoundModel);

                if (isTrailer)

                {

                    MessageWin.Inst.ShowFixedTip(Language.Get("FuncOpenLv", compoundModel.levelNeed));

                    return;

                }

            }

            composeWinModel.SendComposeRequest(compoundModel,fixedItemIndexDict,composeEffect,1,10000,isIncreaseRate);

        }




 System/Compose/New/ComposeTicketWin.cs

@@ -326,15 +326,6 @@
        private void UpdateThirdType(int thirdType)

        {

            composeWinModel.TryGetThirdTypeData((int)ComposeFuncType.Ticket, curSecondType, thirdType, out thirdTypeData);

            if (thirdTypeData != null)

            {

                bool isTrailer = composeWinModel.IsTrailerByLevel(thirdTypeData.itemCompound);

                if (isTrailer)

                {

                    MessageWin.Inst.ShowFixedTip(Language.Get("FuncOpenLv", thirdTypeData.itemCompound.levelNeed));

                    return;

                }

            }

            curThirdType = thirdType;

            CreateTypeCell();

        }

@@ -469,6 +460,13 @@
            fixedItemIndexDict.Clear();

            if (compoundModel == null) return;



            bool isTrailer = composeWinModel.IsTrailerByLevel(compoundModel);

            if (isTrailer)

            {

                MessageWin.Inst.ShowFixedTip(Language.Get("FuncOpenLv", compoundModel.levelNeed));

                return;

            }



            List<int> composeCountlist = new List<int>();

            SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptItem);

            int[] fixedIds = compoundModel.itemID;

@@ -504,6 +502,12 @@
        {

            if (compoundModel == null) return;



            bool isTrailer = composeWinModel.IsTrailerByLevel(compoundModel);

            if (isTrailer)

            {

                MessageWin.Inst.ShowFixedTip(Language.Get("FuncOpenLv", compoundModel.levelNeed));

                return;

            }

            SetFixedItemIndexDic();

            composeWinModel.SendComposeRequest(compoundModel, fixedItemIndexDict,GetPlayMatEffect(),1);

        }


 System/Compose/New/ComposeToolsWin.cs

@@ -343,15 +343,6 @@
        private void UpdateThirdType(int thirdType)

        {

            composeWinModel.TryGetThirdTypeData((int)ComposeFuncType.Item, curSecondType, thirdType, out thirdTypeData);

            if (thirdTypeData != null)

            {

                bool isTrailer = composeWinModel.IsTrailerByLevel(thirdTypeData.itemCompound);

                if (isTrailer)

                {

                    MessageWin.Inst.ShowFixedTip(Language.Get("FuncOpenLv", thirdTypeData.itemCompound.levelNeed));

                    return;

                }

            }

            curThirdType = thirdType;

            OnClickThirdType();

            CreateTypeCell();

@@ -443,6 +434,13 @@
        {

            if (compoundModel == null) return;



            bool isTrailer = composeWinModel.IsTrailerByLevel(compoundModel);

            if (isTrailer)

            {

                MessageWin.Inst.ShowFixedTip(Language.Get("FuncOpenLv", compoundModel.levelNeed));

                return;

            }



            SetFixedItemIndexDic();

            composeWinModel.SendComposeRequest(compoundModel, fixedItemIndexDict,composeEffect,1);

        }

@@ -486,6 +484,13 @@
        {

            if (compoundModel == null) return;



            bool isTrailer = composeWinModel.IsTrailerByLevel(compoundModel);

            if (isTrailer)

            {

                MessageWin.Inst.ShowFixedTip(Language.Get("FuncOpenLv", compoundModel.levelNeed));

                return;

            }



            List<int> composeCountlist = new List<int>();

            fixedItemIndexDict.Clear();

            SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptItem);


 System/Compose/New/ComposeWingsWin.cs

@@ -332,15 +332,6 @@
        private void UpdateThirdType(int thirdType)

        {

            composeWinModel.TryGetThirdTypeData((int)ComposeFuncType.Wings, curSecondType, thirdType, out thirdTypeData);

            if (thirdTypeData != null)

            {

                bool isTrailer = composeWinModel.IsTrailerByLevel(thirdTypeData.itemCompound);

                if (isTrailer)

                {

                    MessageWin.Inst.ShowFixedTip(Language.Get("FuncOpenLv", thirdTypeData.itemCompound.levelNeed));

                    return;

                }

            }

            curThirdType = thirdType;

            OnClickThirdType();

            CreateTypeCell();

@@ -595,6 +586,14 @@


        private void OnClickComposeBtn()

        {

            if (compoundModel == null) return;



            bool isTrailer = composeWinModel.IsTrailerByLevel(compoundModel);

            if (isTrailer)

            {

                MessageWin.Inst.ShowFixedTip(Language.Get("FuncOpenLv", compoundModel.levelNeed));

                return;

            }

            SetFixedMatIndex();

            composeWinModel.SendComposeRequest(compoundModel, fixedItemIndexDict, GetPlayMatEffect(), 1, successRate);

        }

			@@ -505,11 +505,8 @@
			{
			NextAction = GuardAction_Run;
			}
			else
			{
			GuardRun guardRun = m_Animator.GetBehaviour<GuardRun>();
			guardRun.OnPickUpEnter();
			}
			}
			return true;
			}

			@@ -919,7 +919,8 @@
			Clear();
			}
			}
			else if (_npcConfig.NPCType == (int)E_NpcType.Collect)
			else if (_npcConfig.NPCType == (int)E_NpcType.Collect
			\|\| _npcConfig.NPCType == (int)E_NpcType.Flag)
			{
			float _chkDist = GeneralDefine.CloseNpcDist + _npcConfig.ModelRadius + 0.3f;
			if (_chkDistSqrt <= Mathf.Pow(_chkDist, 2))

			@@ -297,15 +297,6 @@
			private void UpdateThirdType(int thirdType)
			{
			composeWinModel.TryGetThirdTypeData((int)ComposeFuncType.MountDogz, curSecondType, thirdType, out thirdTypeData);
			if (thirdTypeData != null)
			{
			bool isTrailer = composeWinModel.IsTrailerByLevel(thirdTypeData.itemCompound);
			if (isTrailer)
			{
			MessageWin.Inst.ShowFixedTip(Language.Get("FuncOpenLv", thirdTypeData.itemCompound.levelNeed));
			return;
			}
			}
			curThirdType = thirdType;
			OnClickThirdType();
			CreateTypeCell();
			@@ -480,6 +471,14 @@

			private void OnClickComposeBtn()
			{
			if (compoundModel == null) return;

			bool isTrailer = composeWinModel.IsTrailerByLevel(compoundModel);
			if (isTrailer)
			{
			MessageWin.Inst.ShowFixedTip(Language.Get("FuncOpenLv", compoundModel.levelNeed));
			return;
			}
			composeWinModel.SendComposeRequest(compoundModel,fixedItemIndexDict,composeEffect,1);
			}

			@@ -333,15 +333,6 @@
			private void UpdateThirdType(int thirdType)
			{
			composeWinModel.TryGetThirdTypeData((int)ComposeFuncType.Equip, curSecondType,thirdType, out thirdTypeData);
			if(thirdTypeData != null)
			{
			bool isTrailer = composeWinModel.IsTrailerByLevel(thirdTypeData.itemCompound);
			if (isTrailer)
			{
			MessageWin.Inst.ShowFixedTip(Language.Get("FuncOpenLv", thirdTypeData.itemCompound.levelNeed));
			return;
			}
			}
			curThirdType = thirdType;
			OnClickThirdType();
			CreateTypeCell();
			@@ -641,6 +632,15 @@

			private void OnClickComposeBtn()
			{
			if (compoundModel != null)
			{
			bool isTrailer = composeWinModel.IsTrailerByLevel(compoundModel);
			if (isTrailer)
			{
			MessageWin.Inst.ShowFixedTip(Language.Get("FuncOpenLv", compoundModel.levelNeed));
			return;
			}
			}
			composeWinModel.SendComposeRequest(compoundModel,fixedItemIndexDict,composeEffect,1,10000,isIncreaseRate);
			}

			@@ -326,15 +326,6 @@
			private void UpdateThirdType(int thirdType)
			{
			composeWinModel.TryGetThirdTypeData((int)ComposeFuncType.Ticket, curSecondType, thirdType, out thirdTypeData);
			if (thirdTypeData != null)
			{
			bool isTrailer = composeWinModel.IsTrailerByLevel(thirdTypeData.itemCompound);
			if (isTrailer)
			{
			MessageWin.Inst.ShowFixedTip(Language.Get("FuncOpenLv", thirdTypeData.itemCompound.levelNeed));
			return;
			}
			}
			curThirdType = thirdType;
			CreateTypeCell();
			}
			@@ -469,6 +460,13 @@
			fixedItemIndexDict.Clear();
			if (compoundModel == null) return;

			bool isTrailer = composeWinModel.IsTrailerByLevel(compoundModel);
			if (isTrailer)
			{
			MessageWin.Inst.ShowFixedTip(Language.Get("FuncOpenLv", compoundModel.levelNeed));
			return;
			}

			List<int> composeCountlist = new List<int>();
			SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptItem);
			int[] fixedIds = compoundModel.itemID;
			@@ -504,6 +502,12 @@
			{
			if (compoundModel == null) return;

			bool isTrailer = composeWinModel.IsTrailerByLevel(compoundModel);
			if (isTrailer)
			{
			MessageWin.Inst.ShowFixedTip(Language.Get("FuncOpenLv", compoundModel.levelNeed));
			return;
			}
			SetFixedItemIndexDic();
			composeWinModel.SendComposeRequest(compoundModel, fixedItemIndexDict,GetPlayMatEffect(),1);
			}

			@@ -343,15 +343,6 @@
			private void UpdateThirdType(int thirdType)
			{
			composeWinModel.TryGetThirdTypeData((int)ComposeFuncType.Item, curSecondType, thirdType, out thirdTypeData);
			if (thirdTypeData != null)
			{
			bool isTrailer = composeWinModel.IsTrailerByLevel(thirdTypeData.itemCompound);
			if (isTrailer)
			{
			MessageWin.Inst.ShowFixedTip(Language.Get("FuncOpenLv", thirdTypeData.itemCompound.levelNeed));
			return;
			}
			}
			curThirdType = thirdType;
			OnClickThirdType();
			CreateTypeCell();
			@@ -443,6 +434,13 @@
			{
			if (compoundModel == null) return;

			bool isTrailer = composeWinModel.IsTrailerByLevel(compoundModel);
			if (isTrailer)
			{
			MessageWin.Inst.ShowFixedTip(Language.Get("FuncOpenLv", compoundModel.levelNeed));
			return;
			}

			SetFixedItemIndexDic();
			composeWinModel.SendComposeRequest(compoundModel, fixedItemIndexDict,composeEffect,1);
			}
			@@ -486,6 +484,13 @@
			{
			if (compoundModel == null) return;

			bool isTrailer = composeWinModel.IsTrailerByLevel(compoundModel);
			if (isTrailer)
			{
			MessageWin.Inst.ShowFixedTip(Language.Get("FuncOpenLv", compoundModel.levelNeed));
			return;
			}

			List<int> composeCountlist = new List<int>();
			fixedItemIndexDict.Clear();
			SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptItem);

			@@ -332,15 +332,6 @@
			private void UpdateThirdType(int thirdType)
			{
			composeWinModel.TryGetThirdTypeData((int)ComposeFuncType.Wings, curSecondType, thirdType, out thirdTypeData);
			if (thirdTypeData != null)
			{
			bool isTrailer = composeWinModel.IsTrailerByLevel(thirdTypeData.itemCompound);
			if (isTrailer)
			{
			MessageWin.Inst.ShowFixedTip(Language.Get("FuncOpenLv", thirdTypeData.itemCompound.levelNeed));
			return;
			}
			}
			curThirdType = thirdType;
			OnClickThirdType();
			CreateTypeCell();
			@@ -595,6 +586,14 @@

			private void OnClickComposeBtn()
			{
			if (compoundModel == null) return;

			bool isTrailer = composeWinModel.IsTrailerByLevel(compoundModel);
			if (isTrailer)
			{
			MessageWin.Inst.ShowFixedTip(Language.Get("FuncOpenLv", compoundModel.levelNeed));
			return;
			}
			SetFixedMatIndex();
			composeWinModel.SendComposeRequest(compoundModel, fixedItemIndexDict, GetPlayMatEffect(), 1, successRate);
			}