snxxz_scripts.git

parent: 421661fc | 补丁 | 提交 | ignore whitespace

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

client_linchunjie

2019-01-31 6ca8bd994ec18d8eb828b1ca825ea7800d809b41

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

5个文件已修改

	System/Compose/New/ComposeWinModel.cs	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/JadeDynastyKnapSack/JadeDynastyEquipModel.cs	43 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/JadeDynastyKnapSack/JadeDynastyEquipWin.cs	41 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Strengthening/GodBeastModel.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/WindowJump/WindowJumpMgr.cs	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 System/Compose/New/ComposeWinModel.cs

@@ -488,7 +488,10 @@
        int[] fixedCounts = config.itemCount;

        for ( int i = 0; i < fixedCounts.Length; i++)

        {

            int haveCount = playerPack.GetItemCountByID(PackType.rptItem,fixedIds[i]);

            var fixedId = fixedIds[i];

            var itemConfig = Config.Instance.Get<ItemConfig>(fixedId);

            var packType = GeneralDefine.GetPackTypeByItemType(itemConfig.Type);

            int haveCount = playerPack.GetItemCountByID(packType,fixedIds[i]);

            if (haveCount < fixedCounts[i])

            {

                return false;


 System/JadeDynastyKnapSack/JadeDynastyEquipModel.cs

@@ -840,5 +840,48 @@


            return activeSuit != null || nextSuit != null;

        }



        public bool IsPlayStoneSuitEffect()

        {

            List<int> suitTypes = null;

            List<int> suitLvs = null;

            bool isActiveSuit = TryGetIsActiveStoneSuit(out suitTypes, out suitLvs);

            if (isActiveSuit)

            {

                for (int i = 0; i < suitTypes.Count; i++)

                {

                    int suitType = suitTypes[i];

                    int suitLv = suitLvs[i];

                    bool isLocalSaveActiveSuit = IsLocalSaveActiveStoneSuit(suitType, suitLv);

                    if (!isLocalSaveActiveSuit)

                    {

                        return true;

                    }

                }

            }

            return false;

        }



        public void StopPlayStoneSuitEffect(UIEffect effect,bool isSave = false)

        {

            if(!isSave)

            {

                if (effect.IsPlaying)

                {

                    effect.Stop();

                }

            }

            else

            {

                if (effect.IsPlaying)

                {

                    List<int> suitTypes = null;

                    List<int> suitLvs = null;

                    bool isActiveSuit = TryGetIsActiveStoneSuit(out suitTypes, out suitLvs);

                    SetLockLocalSaveActiveStoneSuit(suitTypes, suitLvs);

                }

            }

        }



    }

}


 System/JadeDynastyKnapSack/JadeDynastyEquipWin.cs

@@ -86,7 +86,6 @@
            UpdatePlayerUI3DModel();

            UpdateFightPower();

            UpdateSuitBtnPlayerEffect();

            UpdateStoneSuitBtnPlayerEffect();

            TimeDownMgr.CoolTimeData data;

            if (TimeDownMgr.Instance.Get(TimeDownMgr.CoolTimeType.BagSort, out data))

            {

@@ -163,7 +162,6 @@
                    UpdatePlayerUI3DModel();

                    UpdateFightPower();

                    UpdateSuitBtnPlayerEffect();

                    UpdateStoneSuitBtnPlayerEffect();

                    if (config != null)

                    {

                        UpdateSuitPlayerEffect(equipModel.GetJadeDynastyEquipPlace(index));

@@ -218,45 +216,17 @@


        private void UpdateStoneSuitBtnPlayerEffect(bool isSave = false)

        {

            List<int> suitTypes = null;

            List<int> suitLvs = null;

            bool isActiveSuit = equipModel.TryGetIsActiveStoneSuit(out suitTypes, out suitLvs);

            if (isActiveSuit)

            bool isPlay = equipModel.IsPlayStoneSuitEffect();

            if(isPlay && !isSave)

            {

                for (int i = 0; i < suitTypes.Count; i++)

                if (!stoneBtnEffect.IsPlaying)

                {

                    int suitType = suitTypes[i];

                    int suitLv = suitLvs[i];

                    bool isLocalSaveActiveSuit = equipModel.IsLocalSaveActiveStoneSuit(suitType, suitLv);

                    if (!isLocalSaveActiveSuit)

                    {

                        if (!stoneBtnEffect.IsPlaying)

                        {

                            stoneBtnEffect.Play();

                        }

                        break;

                    }

                    else

                    {

                        if (stoneBtnEffect.IsPlaying)

                        {

                            stoneBtnEffect.Stop();

                        }

                    }

                    stoneBtnEffect.Play();

                }

            }

            else

            {

                if (stoneBtnEffect.IsPlaying)

                {

                    stoneBtnEffect.Stop();

                }

            }



            if (isSave && stoneBtnEffect.IsPlaying)

            {

                stoneBtnEffect.Stop();

                equipModel.SetLockLocalSaveActiveStoneSuit(suitTypes, suitLvs);

                equipModel.StopPlayStoneSuitEffect(stoneBtnEffect, isSave);

            }

        }



@@ -363,7 +333,6 @@


        private void ClickStoneAttr()

        {

            UpdateStoneSuitBtnPlayerEffect(true);

            WindowCenter.Instance.Open<JadeDynastyStoneSuitAttrWin>();

        }




 System/Strengthening/GodBeastModel.cs

@@ -264,6 +264,10 @@
            if (DogzEquipDict[key] == 1)

            {

                List<ItemModel> itemModel = dogz_model.GetDogzEquips(key);

                if (itemModel == null)

                {

                    continue;

                }

                for (int i = 0; i < itemModel.Count; i++)

                {

                    int IndexId = itemModel[i].itemInfo.ItemPlace;


 System/WindowJump/WindowJumpMgr.cs

@@ -200,6 +200,7 @@
            case JumpUIType.EquipCompose296:

            case JumpUIType.EquipCompose297:

            case JumpUIType.EquipCompose298:

            case JumpUIType.ToolCompose305:

                int[] types = GetSearchData(_tagWinSearchModel.ID).conditions;     

                if(types.Length > 2)

                {

@@ -1052,6 +1053,7 @@
            case JumpUIType.EquipCompose269:

            case JumpUIType.EquipCompose270:

            case JumpUIType.EquipCompose291:

            case JumpUIType.ToolCompose305:

                int[] types = GetSearchData(_tagWinSearchModel.ID).conditions;

                if (types.Length > 0)

                {

@@ -1667,6 +1669,7 @@
    NewYearTour302 = 302, //2019春节巡礼

    FestivalRedBag303 = 303, //节日红包界面

    JadeDynastyGem304 = 304, //诛仙宝石

    ToolCompose305 = 305, //诛仙附伤宝石合成



    DhszTs = 1001,//定海神针功法提升界面

    HyqTs = 1002,//皓月枪功法提升界面

			@@ -488,7 +488,10 @@
			int[] fixedCounts = config.itemCount;
			for ( int i = 0; i < fixedCounts.Length; i++)
			{
			int haveCount = playerPack.GetItemCountByID(PackType.rptItem,fixedIds[i]);
			var fixedId = fixedIds[i];
			var itemConfig = Config.Instance.Get<ItemConfig>(fixedId);
			var packType = GeneralDefine.GetPackTypeByItemType(itemConfig.Type);
			int haveCount = playerPack.GetItemCountByID(packType,fixedIds[i]);
			if (haveCount < fixedCounts[i])
			{
			return false;

			@@ -840,5 +840,48 @@

			return activeSuit != null \|\| nextSuit != null;
			}

			public bool IsPlayStoneSuitEffect()
			{
			List<int> suitTypes = null;
			List<int> suitLvs = null;
			bool isActiveSuit = TryGetIsActiveStoneSuit(out suitTypes, out suitLvs);
			if (isActiveSuit)
			{
			for (int i = 0; i < suitTypes.Count; i++)
			{
			int suitType = suitTypes[i];
			int suitLv = suitLvs[i];
			bool isLocalSaveActiveSuit = IsLocalSaveActiveStoneSuit(suitType, suitLv);
			if (!isLocalSaveActiveSuit)
			{
			return true;
			}
			}
			}
			return false;
			}

			public void StopPlayStoneSuitEffect(UIEffect effect,bool isSave = false)
			{
			if(!isSave)
			{
			if (effect.IsPlaying)
			{
			effect.Stop();
			}
			}
			else
			{
			if (effect.IsPlaying)
			{
			List<int> suitTypes = null;
			List<int> suitLvs = null;
			bool isActiveSuit = TryGetIsActiveStoneSuit(out suitTypes, out suitLvs);
			SetLockLocalSaveActiveStoneSuit(suitTypes, suitLvs);
			}
			}
			}

			}
			}

			@@ -86,7 +86,6 @@
			UpdatePlayerUI3DModel();
			UpdateFightPower();
			UpdateSuitBtnPlayerEffect();
			UpdateStoneSuitBtnPlayerEffect();
			TimeDownMgr.CoolTimeData data;
			if (TimeDownMgr.Instance.Get(TimeDownMgr.CoolTimeType.BagSort, out data))
			{
			@@ -163,7 +162,6 @@
			UpdatePlayerUI3DModel();
			UpdateFightPower();
			UpdateSuitBtnPlayerEffect();
			UpdateStoneSuitBtnPlayerEffect();
			if (config != null)
			{
			UpdateSuitPlayerEffect(equipModel.GetJadeDynastyEquipPlace(index));
			@@ -218,45 +216,17 @@

			private void UpdateStoneSuitBtnPlayerEffect(bool isSave = false)
			{
			List<int> suitTypes = null;
			List<int> suitLvs = null;
			bool isActiveSuit = equipModel.TryGetIsActiveStoneSuit(out suitTypes, out suitLvs);
			if (isActiveSuit)
			bool isPlay = equipModel.IsPlayStoneSuitEffect();
			if(isPlay && !isSave)
			{
			for (int i = 0; i < suitTypes.Count; i++)
			if (!stoneBtnEffect.IsPlaying)
			{
			int suitType = suitTypes[i];
			int suitLv = suitLvs[i];
			bool isLocalSaveActiveSuit = equipModel.IsLocalSaveActiveStoneSuit(suitType, suitLv);
			if (!isLocalSaveActiveSuit)
			{
			if (!stoneBtnEffect.IsPlaying)
			{
			stoneBtnEffect.Play();
			}
			break;
			}
			else
			{
			if (stoneBtnEffect.IsPlaying)
			{
			stoneBtnEffect.Stop();
			}
			}
			stoneBtnEffect.Play();
			}
			}
			else
			{
			if (stoneBtnEffect.IsPlaying)
			{
			stoneBtnEffect.Stop();
			}
			}

			if (isSave && stoneBtnEffect.IsPlaying)
			{
			stoneBtnEffect.Stop();
			equipModel.SetLockLocalSaveActiveStoneSuit(suitTypes, suitLvs);
			equipModel.StopPlayStoneSuitEffect(stoneBtnEffect, isSave);
			}
			}

			@@ -363,7 +333,6 @@

			private void ClickStoneAttr()
			{
			UpdateStoneSuitBtnPlayerEffect(true);
			WindowCenter.Instance.Open<JadeDynastyStoneSuitAttrWin>();
			}

			@@ -264,6 +264,10 @@
			if (DogzEquipDict[key] == 1)
			{
			List<ItemModel> itemModel = dogz_model.GetDogzEquips(key);
			if (itemModel == null)
			{
			continue;
			}
			for (int i = 0; i < itemModel.Count; i++)
			{
			int IndexId = itemModel[i].itemInfo.ItemPlace;

			@@ -200,6 +200,7 @@
			case JumpUIType.EquipCompose296:
			case JumpUIType.EquipCompose297:
			case JumpUIType.EquipCompose298:
			case JumpUIType.ToolCompose305:
			int[] types = GetSearchData(_tagWinSearchModel.ID).conditions;
			if(types.Length > 2)
			{
			@@ -1052,6 +1053,7 @@
			case JumpUIType.EquipCompose269:
			case JumpUIType.EquipCompose270:
			case JumpUIType.EquipCompose291:
			case JumpUIType.ToolCompose305:
			int[] types = GetSearchData(_tagWinSearchModel.ID).conditions;
			if (types.Length > 0)
			{
			@@ -1667,6 +1669,7 @@
			NewYearTour302 = 302, //2019春节巡礼
			FestivalRedBag303 = 303, //节日红包界面
			JadeDynastyGem304 = 304, //诛仙宝石
			ToolCompose305 = 305, //诛仙附伤宝石合成

			DhszTs = 1001,//定海神针功法提升界面
			HyqTs = 1002,//皓月枪功法提升界面