Merge branch 'master' into 3687天赋功能

client_linchunjie

2018-10-11 15c103c6dcfbfd9d96a5602e6a3ba90032f1eb06

Merge branch 'master' into 3687天赋功能

 Core/GameEngine/DataToCtl/PackageRegedit.cs

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

    {

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

        Register(typeof(H0311_tagDeleteSkill), typeof(DTC0311_tagDeleteSkill));

        Register(typeof(HB106_tagMCNotifyPlayerMove), typeof(DTCB106_tagMCNotifyPlayerMove));

        Register(typeof(H0132_tagCreateRoleSucess), typeof(DTC0132_tagCreateRoleSucess));

        Register(typeof(HA326_tagMCNPCIDCollectionCntInfo), typeof(DTCA326_tagMCNPCIDCollectionCntInfo));


 Core/NetworkPackage/DTCFile/ServerPack/H03_MainCharacter/DTC0311_tagDeleteSkill.cs

@@ -1,13 +1,24 @@
using UnityEngine;
//--------------------------------------------------------

//    [Author]:           第二世界

//    [  Date ]:           Thursday, October 11, 2018

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



using System;

using System.Collections;
using System.Collections.Generic;

using Snxxz.UI;

public class DTC0311_tagDeleteSkill : DtcBasic

{


/** 主角删除技能 */
public class DTC0311_tagDeleteSkill : DtcBasic {

    /** 重写基类的数据包转逻辑处理 */
    public override void Done(GameNetPackBasic vNetPack)
    {
        base.Done(vNetPack);
//        H0311_tagDeleteSkill vNetData = vNetPack as H0311_tagDeleteSkill;
        var package = vNetPack as H0311_tagDeleteSkill;

        ModelCenter.Instance.GetModel<TalentModel>().DeleteTalentSkill((int)package.SkillID);

    }


}









 Core/NetworkPackage/DTCFile/ServerPack/H03_MainCharacter/DTC0311_tagDeleteSkill.cs.meta

@@ -1,8 +1,12 @@
fileFormatVersion: 2
guid: 995d5419b5b880447917544b8c2cf104
guid: f1409e1bfa7856e4d87922bed8509b8f
timeCreated: 1539223309
licenseType: Pro
MonoImporter:
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 

 Core/NetworkPackage/ServerPack/H03_MainCharacter/H0311_tagDeleteSkill.cs

@@ -1,17 +1,17 @@
using UnityEngine;
using UnityEngine;

using System.Collections;

/** 主角删除技能 */
public class H0311_tagDeleteSkill : GameNetPackBasic {
//03 11 主角删除技能#tagDeleteSkill

    
    public int    SkillID;		
public class H0311_tagDeleteSkill : GameNetPackBasic {

    public uint SkillID;

    
    public H0311_tagDeleteSkill () {
        _cmd = (ushort)0x0311;
    }
    
    /** 从字节包中解析信息 */
    public override void ReadFromBytes (byte[] vBytes) {
        TransBytes (out SkillID, vBytes, NetDataType.DWORD);        
    }


}

 System/Skill/TalentModel.cs

@@ -82,6 +82,16 @@
        public void OnPlayerLoginOk()

        {

            serverInited = true;

            if (WindowCenter.Instance.IsOpen<TalentWin>())

            {

                foreach (var talent in talentSkills.Values)

                {

                    if (talentSkillUpdate != null)

                    {

                        talentSkillUpdate(talent.skillId);

                    }

                }

            }

            UpdateRedpoint();

        }



@@ -207,7 +217,7 @@


        public int GetSeriesPoint(int talentType,int talentSeries)

        {

            var job = (int)Math.Pow(PlayerDatas.Instance.baseData.Job, 2);

            var job = PlayerDatas.Instance.baseData.Job;

            List<int> list;

            var point = 0;

            if (TryGetTalents(job, talentType, talentSeries, out list))

@@ -305,6 +315,10 @@
        public void UpdateTalentSkill(int _oldSkillId, int _newSkillId)

        {

            var config = Config.Instance.Get<SkillConfig>(_newSkillId);

            if (config == null)

            {

                return;

            }

            if (talentSkills.ContainsKey(config.SkillTypeID))

            {

                var talentSkill = talentSkills[config.SkillTypeID];

@@ -315,6 +329,24 @@
                }

            }

        }



        public void DeleteTalentSkill(int _skillId)

        {

            var config = Config.Instance.Get<SkillConfig>(_skillId);

            if (config == null)

            {

                return;

            }

            if (talentSkills.ContainsKey(config.SkillTypeID))

            {

                var talentSkill = talentSkills[config.SkillTypeID];

                talentSkill.level = 0;

                if (talentSkillUpdate != null)

                {

                    talentSkillUpdate(config.SkillTypeID);

                }

            }

        }

        #endregion



        #region 红点


 System/Skill/TalentWin.cs

@@ -339,6 +339,7 @@
        private void OnSelectSkillEvent()

        {

            DisplaySelectSkill();

            DisplayLevelUp();

        }



        private void SelectTalentType()