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

client_Zxw

2019-03-28 abcf3c6a70650feb840ee2764586d69f628459d4

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

 Core/NetworkPackage/ClientPack/ClientToMapServer/CA3_Item/CA308_tagCMItemTimeout.cs

New file
@@ -0,0 +1,23 @@
using UnityEngine;
using System.Collections;

// A3 08 物品过期 #tagCMItemTimeout

public class CA308_tagCMItemTimeout : GameNetPackBasic
{
    public byte PackType;    //背包类型
    public byte ItemIndex;    //物品在背包中索引

    public CA308_tagCMItemTimeout()
    {
        combineCmd = (ushort)0x03FE;
        _cmd = (ushort)0xA308;
    }

    public override void WriteToBytes()
    {
        WriteBytes(PackType, NetDataType.BYTE);
        WriteBytes(ItemIndex, NetDataType.BYTE);
    }

}

 Core/NetworkPackage/ClientPack/ClientToMapServer/CA3_Item/CA308_tagCMItemTimeout.cs.meta

File was renamed from Core/NetworkPackage/ClientPack/ClientToMapServer/CA3_Item/CA308_tagCMSuiteDecompose.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: ea64c080519e66c4ab3a1993ae07145a
timeCreated: 1520935258
guid: fc72c801eb0807248a65b3b6680a6046
timeCreated: 1553737813
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 Core/NetworkPackage/ClientPack/ClientToMapServer/CA3_Item/CA308_tagCMSuiteDecompose.cs

File was deleted

 System/FairyAu/FairyApplyWin.cs

@@ -218,6 +218,14 @@
                SysNotifyMgr.Instance.ShowTip("FairyGrabBossExitError");

                return;

            }



            var auctionModel = ModelCenter.Instance.GetModel<AuctionInquiryModel>();

            if (!auctionModel.IsFamilyQuit())

            {

                SysNotifyMgr.Instance.ShowTip("ExitFairyError_Auction");

                return;

            }



            PlayerFairyData.FairyData fairy = PlayerDatas.Instance.fairyData.fairy;

            if (fairy != null)

            {


 System/KnapSack/ItemTimeUtility.cs

@@ -12,6 +12,8 @@
    Dictionary<string, DateTime> auctionEndTimes = new Dictionary<string, DateTime>();
    Dictionary<string, DateTime> useEndTimes = new Dictionary<string, DateTime>();

    PackModel packModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } }

    public ItemTimeUtility()
    {
        logicUpdate = new LogicUpdate(1f);
@@ -55,14 +57,18 @@
        }
    }

    private void ProcessItemUseOverdue(string guid)
    {
        ItemOperateUtility.Instance.UseItem(guid);
    }

    private void ProcessAuctionOverdue(string guid)
    {
        ItemOperateUtility.Instance.UseItem(guid);
        var item = packModel.GetItemByGuid(guid);
        if (item == null)
        {
            return;
        }

        var info = new CA308_tagCMItemTimeout();
        info.PackType = (byte)item.packType;
        info.ItemIndex = (byte)item.gridIndex;
        GameNetSystem.Instance.SendInfo(info);
    }

}

 System/MainWin/RealmEntranceBehaviour.cs

@@ -67,8 +67,7 @@

        private void OpenRealmWin()
        {
            WindowCenter.Instance.Close<MainInterfaceWin>();
            WindowCenter.Instance.Open<RealmWin>();
            WindowCenter.Instance.Open<RealmTransitionWin>();
        }

    }

 System/Treasure/TreasureComponent.cs

@@ -664,6 +664,11 @@
            {

                return;

            }

            if (UI3DTreasureSelectStage.Instance.UnlockShowing

                && model.IsRequireUnlockAnim(category) == treasureId)

            {

                return;

            }

            if (!m_TreasureCanvaPool.ContainsKey(category))

            {

                var prefab = UILoader.LoadTreasure("Misc", "TreasureCanva_" + category.ToString());

@@ -767,6 +772,7 @@
            RecycleLockEffect();

            RecycleCondition();

            RecycleTreasureLabel();

            RecycleTreasureCanva();

            try

            {

                var _effect = SFXPlayUtility.Instance.Play(category == TreasureCategory.Demon ? 5157 : 5132, treasureRoot);


 System/Treasure/TreasureModel.cs

@@ -506,6 +506,21 @@
            return 0;

        }



        public int GetTreasureBySkillId(int skillId)

        {

            var list = GetTreasureCategory(TreasureCategory.Human);

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

            {

                Treasure treasure;

                if (TryGetTreasure(list[i], out treasure)

                    && treasure.skillId == skillId)

                {

                    return list[i];

                }

            }

            return 0;

        }



        public List<int> GetFurnacesAchievements()

        {

            return eightFurnacesAchievements;

@@ -547,7 +562,7 @@
                    continue;

                }

                var config = TreasureConfig.Get(id);

                if (config.PreTreasure == 0 || treasures[config.PreTreasure].state != TreasureState.Collected)

                if (config.PreTreasure != 0 && treasures[config.PreTreasure].state != TreasureState.Collected)

                {

                    continue;

                }

@@ -935,21 +950,6 @@
            {

                demonDungeonChallengeNext();

            }

        }



        public int GetTreasureBySkillId(int skillId)

        {

            var list = GetTreasureCategory(TreasureCategory.Human);

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

            {

                Treasure treasure;

                if (TryGetTreasure(list[i], out treasure)

                    && treasure.skillId == skillId)

                {

                    return list[i];

                }

            }

            return 0;

        }

    }