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

client_Zxw

2019-01-04 f5ee24c62593c67dedb8fb1f29df788650ecd069

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

 System/CrossServerOneVsOne/CrossServerOneVsOneArenaWin.cs

@@ -222,6 +222,12 @@


        private void ClickBuyTimes()

        {

            if(!CrossServerOneVsOnePKSeason.Instance.isSatisfyMatch)

            {

                SysNotifyMgr.Instance.ShowTip("CrossMatching21");

                return;

            }



            int remainNum = CrossServerOneVsOnePlayerInfo.Instance.GetDayRemainNum();

            if (remainNum >= crossServerModel.freeMaxMatchNum)

            {


 System/GatheringSoul/GatherSoulEquipListWin.cs

@@ -136,7 +136,15 @@
            if (cell.index < equipList.Count)

            {

                var item = equipList[cell.index];

                model.ExecuteEquipSoul(item, selectHole);

                GatherSoulItem holeItem;

                if(model.TryGetItem(selectHole,out holeItem))

                {

                    model.TryExecuteReplaceSoul(selectHole, item);

                }

                else

                {

                    model.ExecuteEquipSoul(item, selectHole);

                }

                CloseImmediately();

            }

        }


 System/GatheringSoul/GatheringSoulModel.cs

@@ -604,11 +604,22 @@


        public bool SatisfyReplace(int hole, GatherSoulItem item)

        {

            if (item.itemType == GATHERSOUL_ESSENCE_TYPE)

            {

                return false;

            }

            GatherSoulItem holeItem;

            if (TryGetItem(hole, out holeItem))

            {

                var sameHole = IsSamePropertyCompareHoles(hole, item);

                var multiProperty = false;

                if (item.ExistSameProperty(holeItem.id))

                {

                    multiProperty = gatherSoulPropertys[item.id].Count

                        > gatherSoulPropertys[holeItem.id].Count;

                }

                if (item.itemType == holeItem.itemType

                    && IsSamePropertyCompareHoles(hole, item) == -1)

                    && (sameHole == -1 || multiProperty))

                {

                    return true;

                }

@@ -899,21 +910,26 @@
                    break;

                }

            }

            if (tryEquipHole != -1)

            TryExecuteReplaceSoul(tryEquipHole, item);

        }



        public void TryExecuteReplaceSoul(int hole, GatherSoulItem item)

        {

            if (hole != -1)

            {

                GatherSoulItem holeItem;

                if (TryGetItem(tryEquipHole, out holeItem))

                if (TryGetItem(hole, out holeItem))

                {

                    var sameHole = -1;

                    if (gatherSoulPropertys[item.id].Count > gatherSoulPropertys[holeItem.id].Count)

                    {

                        sameHole = IsSamePropertyCompareHoles(tryEquipHole, item);

                        sameHole = IsSamePropertyCompareHoles(hole, item);

                    }

                    if (sameHole != -1)

                    {

                        SendEquipPack((int)PackType.rptInterimPack, sameHole, (int)PackType.rptGatherSoul, 0);

                    }

                    SendEquipPack((int)PackType.rptGatherSoul, item.index, (int)PackType.rptInterimPack, tryEquipHole);

                    SendEquipPack((int)PackType.rptGatherSoul, item.index, (int)PackType.rptInterimPack, hole);

                }

            }

            else if (item.itemType == GATHERSOUL_CORE_TYPE)

@@ -930,7 +946,7 @@
                    {

                        SendEquipPack((int)PackType.rptInterimPack, sameHole, (int)PackType.rptGatherSoul, 0);

                    }

                    SendEquipPack((int)PackType.rptGatherSoul, item.index, (int)PackType.rptInterimPack, tryEquipHole);

                    SendEquipPack((int)PackType.rptGatherSoul, item.index, (int)PackType.rptInterimPack, hole);

                }

            }

        }


 UI/HUD/PopUpNum.cs

@@ -130,6 +130,9 @@
                case Pattern.PlayerImmune:

                case Pattern.PetImmune:

                case Pattern.EnemyImmune:

                case Pattern.EnemyZhanSha:

                case Pattern.PetZhanSha:

                case Pattern.PlayerZhanSha:

                    break;

                default:

                    var chars = Mathf.Abs(_popupInfo.num).ToString();


 Utility/EnumHelper.cs

@@ -1352,7 +1352,9 @@
    /** 免疫 */

    Immune,

    /** 压制 */

    Suppress

    Suppress,

    /**斩杀**/

    ZhanSha,

}



public enum E_PlayerState