3335 缥缈仙域

client_linchunjie

2019-04-17 1c831228af2253ed825a75bc327f933d370b01a2

3335 缥缈仙域

 Core/GameEngine/DataToCtl/PackageRegedit.cs

@@ -25,6 +25,7 @@
    public static void Init()

    {

        // 登记相应的数据体及对应的数据转逻辑类

        Register(typeof(HA325_tagMCNPCAttackCountInfo), typeof(DTCA325_tagMCNPCAttackCountInfo));

        Register(typeof(HB215_tagMCFBBuyBuffInfo), typeof(DTCB215_tagMCFBBuyBuffInfo));

        Register(typeof(HA718_tagMCCollectAwardItemInfo), typeof(DTCA718_tagMCCollectAwardItemInfo));

        Register(typeof(HB214_tagMCCuntomFBPrizeInfo), typeof(DTCB214_tagMCCuntomFBPrizeInfo));


 Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA325_tagMCNPCAttackCountInfo.cs

New file
@@ -0,0 +1,24 @@
//--------------------------------------------------------

//    [Author]:           第二世界

//    [  Date ]:           Wednesday, April 17, 2019

//--------------------------------------------------------



using System;

using System.Collections;

using System.Collections.Generic;

using Snxxz.UI;

public class DTCA325_tagMCNPCAttackCountInfo : DtcBasic

{



    public override void Done(GameNetPackBasic vNetPack)

    {

        base.Done(vNetPack);

        var package = vNetPack as HA325_tagMCNPCAttackCountInfo;

        ModelCenter.Instance.GetModel<DungeonModel>().UpdateDungeonAttackNpcInfo(package);

    }



}










 Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA325_tagMCNPCAttackCountInfo.cs.meta

New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: 99d0cc78beb3e9d45910bade3ca6f795
timeCreated: 1555490346
licenseType: Pro
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA326_tagMCNPCIDCollectionCntInfo.cs

@@ -35,8 +35,9 @@
                smallBoxCollectCount += collect.CollectionCnt;
            }

            ModelCenter.Instance.GetModel<DungeonModel>().UpdateDungeonCollectNpcInfo((int)collect.NPCID, collect.CollectionCnt);
        }
        }



        ModelCenter.Instance.GetModel<DungeonModel>().UpdateDungeonCollectNpcInfo(package);

        model.bigBoxCollectCount = bigBoxCollectCount;
        model.smallBoxCollectCount = smallBoxCollectCount;

 Core/NetworkPackage/ServerPack/HA3_Function/HA325_tagMCNPCAttackCountInfo.cs

New file
@@ -0,0 +1,29 @@
using UnityEngine;

using System.Collections;



// A3 25 NPC已攻击次数信息 #tagMCNPCAttackCountInfo



public class HA325_tagMCNPCAttackCountInfo : GameNetPackBasic {

    public byte Count;

    public  tagMCNPCAttackCount[] NPCAttackCountList;



    public HA325_tagMCNPCAttackCountInfo () {

        _cmd = (ushort)0xA325;

    }



    public override void ReadFromBytes (byte[] vBytes) {

        TransBytes (out Count, vBytes, NetDataType.BYTE);

        NPCAttackCountList = new tagMCNPCAttackCount[Count];

        for (int i = 0; i < Count; i ++) {

            NPCAttackCountList[i] = new tagMCNPCAttackCount();

            TransBytes (out NPCAttackCountList[i].NPCID, vBytes, NetDataType.DWORD);

            TransBytes (out NPCAttackCountList[i].AttackCount, vBytes, NetDataType.BYTE);

        }

    }



    public struct tagMCNPCAttackCount {

        public uint NPCID;

        public byte AttackCount;        //已攻击次数

    }



}


 Core/NetworkPackage/ServerPack/HA3_Function/HA325_tagMCNPCAttackCountInfo.cs.meta

New file
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: 11bfbdd59c80c48408204371a3c8b60d
timeCreated: 1555490312
licenseType: Pro
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 System/Dungeon/DungeonModel.cs

@@ -23,6 +23,7 @@
        Dictionary<int, DateTime> dungeonCountRemainTimes = new Dictionary<int, DateTime>();

        Dictionary<int, List<DungeonInspireConfig>> dungeonInspireDict = new Dictionary<int, List<DungeonInspireConfig>>();

        Dictionary<int, int> dungeonCollectNpcInfos = new Dictionary<int, int>();

        Dictionary<int, int> dungeonNpcAttackInfos = new Dictionary<int, int>();

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



        public event Action<DungeonCoolDownType> dungeonCoolDownEvent;

@@ -40,6 +41,7 @@
        public event Action<Dungeon> kylinDifficultySelectedEvent;

        public event Action<DungeonFightStage> dungeonFightStageChangeEevent;

        public event Action onCollectNpcInfoRefresh;

        public event Action onAttackNpcInfoRefresh;



        List<Item> sweepResultRewards = new List<Item>();

        List<Item> sweepResultItems = new List<Item>();

@@ -141,6 +143,7 @@
            dungeonCountRemainTimes.Clear();

            dungeonInspireCounts.Clear();

            dungeonCollectNpcInfos.Clear();

            dungeonNpcAttackInfos.Clear();

        }



        public void OnAfterPlayerDataInitialize()

@@ -648,12 +651,29 @@
            }

        }



        public void UpdateDungeonCollectNpcInfo(int npcId,int count)

        public void UpdateDungeonCollectNpcInfo(HA326_tagMCNPCIDCollectionCntInfo package)

        {

            dungeonCollectNpcInfos[npcId] = count;

            for (int i = 0; i < package.CollNPCCnt; i++)

            {

                var data = package.NPCCollCntList[i];

                dungeonCollectNpcInfos[(int)data.NPCID] = data.CollectionCnt;

            }

            if (onCollectNpcInfoRefresh != null)

            {

                onCollectNpcInfoRefresh();

            }

        }



        public void UpdateDungeonAttackNpcInfo(HA325_tagMCNPCAttackCountInfo package)

        {

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

            {

                var data = package.NPCAttackCountList[i];

                dungeonNpcAttackInfos[(int)data.NPCID] = data.AttackCount;

            }

            if (onAttackNpcInfoRefresh != null)

            {

                onAttackNpcInfoRefresh();

            }

        }



@@ -768,6 +788,15 @@
            return 0;

        }



        public int GetDungeonNpcAttackCount(int npcId)

        {

            if (dungeonNpcAttackInfos.ContainsKey(npcId))

            {

                return dungeonNpcAttackInfos[npcId];

            }

            return 0;

        }



        public void UpdateMission(string _mission)

        {

            var mapId = GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID);


 System/Dungeon/DungeonTargetBehaviour.cs

@@ -177,6 +177,15 @@
                        break;
                    }
                    m_TargetNums[_index].text = collectCount.ToString();
                    break;

                case DungeonTargetType.AttackCount:
                    var attackCount = model.GetDungeonNpcAttackCount(npcId);
                    if (_targetValue > 0)

                    {
                        m_TargetNums[_index].text = StringUtility.Contact(attackCount, "/", _targetValue);
                        break;
                    }
                    m_TargetNums[_index].text = attackCount.ToString();
                    break;
            }
        }

 Utility/EnumHelper.cs

@@ -1186,7 +1186,8 @@
    NPCDialogue = 8,    //npc对话

    VictorySumCnt = 9, //（仙魔胜利总场数）

    StageVictoryCnt = 10, //（阶段胜利场数）

    Collect,

    Collect = 11,

    AttackCount = 12,

}



public enum AchievementType