少年修仙传客户端代码仓库
Client_PangDeRong
2019-01-22 a5386c0a8a0746e93a8c21504888ea7ac926ce8d
5930 子 【开发】【1.5.100】诛仙装备开发 / 【前端】【1.5.100】诛仙装备开发
11个文件已修改
98 ■■■■ 已修改文件
Core/GameEngine/Model/Config/EquipGSParamConfig.cs 补丁 | 查看 | 原始文档 | blame | 历史
Core/GameEngine/Model/Config/EquipGSParamConfig.cs.meta 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/GameEngine/Model/Config/FightPowerParamConfig.cs 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/GameEngine/Model/Config/FightPowerParamConfig.cs.meta 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/JadeDynastyKnapSack/JadeDynastyEquipBeh.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/JadeDynastyKnapSack/JadeDynastyEquipModel.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/JadeDynastyKnapSack/JadeDynastySuitAttrBeh.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/Logic/EquipTip.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/Logic/PackSendQuestMgr.cs 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/Logic/PlayerPackModels.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/KnapSack/Logic/SinglePackModel.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/GameEngine/Model/Config/EquipGSParamConfig.cs
Core/GameEngine/Model/Config/EquipGSParamConfig.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: e238f9455d4062c4c867b41cfea2f046
timeCreated: 1537960022
timeCreated: 1548149155
licenseType: Pro
MonoImporter:
  serializedVersion: 2
Core/GameEngine/Model/Config/FightPowerParamConfig.cs
@@ -1,6 +1,6 @@
//--------------------------------------------------------
//    [Author]:            第二世界
//    [  Date ]:           Friday, June 01, 2018
//    [  Date ]:           Tuesday, January 22, 2019
//--------------------------------------------------------
using UnityEngine;
@@ -31,6 +31,15 @@
        public int FaintDefRate { get ; private set ; }
        public int AtkSpeedParameter { get ; private set ; }
        public int LuckyHitParameter { get ; private set ; }
        public int SpeedPerParameter { get ; private set ; }
        public int AtkPerParameter { get ; private set ; }
        public int MaxHPPerParameter { get ; private set ; }
        public int JobAHurtAddPer { get ; private set ; }
        public int JobBHurtAddPer { get ; private set ; }
        public int JobCHurtAddPer { get ; private set ; }
        public int JobAAtkReducePer { get ; private set ; }
        public int JobBAtkReducePer { get ; private set ; }
        public int JobCAtkReducePer { get ; private set ; }
        public override string getKey()
        {
@@ -79,6 +88,24 @@
                AtkSpeedParameter=IsNumeric(rawContents[18]) ? int.Parse(rawContents[18]):0; 
            
                LuckyHitParameter=IsNumeric(rawContents[19]) ? int.Parse(rawContents[19]):0; 
                SpeedPerParameter=IsNumeric(rawContents[20]) ? int.Parse(rawContents[20]):0;
                AtkPerParameter=IsNumeric(rawContents[21]) ? int.Parse(rawContents[21]):0;
                MaxHPPerParameter=IsNumeric(rawContents[22]) ? int.Parse(rawContents[22]):0;
                JobAHurtAddPer=IsNumeric(rawContents[23]) ? int.Parse(rawContents[23]):0;
                JobBHurtAddPer=IsNumeric(rawContents[24]) ? int.Parse(rawContents[24]):0;
                JobCHurtAddPer=IsNumeric(rawContents[25]) ? int.Parse(rawContents[25]):0;
                JobAAtkReducePer=IsNumeric(rawContents[26]) ? int.Parse(rawContents[26]):0;
                JobBAtkReducePer=IsNumeric(rawContents[27]) ? int.Parse(rawContents[27]):0;
                JobCAtkReducePer=IsNumeric(rawContents[28]) ? int.Parse(rawContents[28]):0;
            }
            catch (Exception ex)
            {
Core/GameEngine/Model/Config/FightPowerParamConfig.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 81c3ee0874f68494d9284a3240009448
timeCreated: 1527846597
timeCreated: 1548149194
licenseType: Pro
MonoImporter:
  serializedVersion: 2
System/JadeDynastyKnapSack/JadeDynastyEquipBeh.cs
@@ -57,14 +57,18 @@
        private void PutOffEquip(PackType type, int index, int id)
        {
            if (type != PackType.rptJadeDynastyEquip || index != (int)equipType) return;
            int equipIndex = 0;
            equipModel.TryGetJadeDynastyEquipIndex((int)equipType, out equipIndex);
            if (type != PackType.rptJadeDynastyEquip || index != equipIndex) return;
            SetDisplay();
        }
        private void PutOnEquip(PackType type, int index, int id)
        {
            if (type != PackType.rptJadeDynastyEquip || index != (int)equipType) return;
            int equipIndex = 0;
            equipModel.TryGetJadeDynastyEquipIndex((int)equipType, out equipIndex);
            if (type != PackType.rptJadeDynastyEquip || index != equipIndex) return;
            SetDisplay();
        }
System/JadeDynastyKnapSack/JadeDynastyEquipModel.cs
@@ -143,6 +143,17 @@
        #region 封包
        #endregion
        public bool TryGetJadeDynastyEquipIndex(int equipPlace,out int equipIndex)
        {
            equipIndex = 0;
            if(equipPlace >= (int)RoleEquipType.JadeDynasty_Cloak && equipPlace <= (int)RoleEquipType.JadeDynasty_Sword4)
            {
                equipIndex = equipPlace - 121;
                return true;
            }
            return false;
        }
        public bool TryGetLockTowerLayer(int equipPlace,out int towerLayer)
        {
            towerLayer = 0;
System/JadeDynastyKnapSack/JadeDynastySuitAttrBeh.cs
@@ -128,7 +128,8 @@
                activeObj.SetActive(!isActive);
                if(!isActive)
                {
                    string conditionSB = StringUtility.Contact("达到8阶激活");
                    string conditionSB = StringUtility.Contact("达到",suitAttrData.suitLv,"阶激活");
                    activeText.text = conditionSB;
                }
                for (int i = 0; i < attrObjlist.Count; i++)
                {
System/KnapSack/Logic/EquipTip.cs
@@ -864,8 +864,8 @@
                jadeDynastySuitObj.SetActive(false);
                return;
            }
            curJadeDynastySuitAttr.SetDisplay(PackType.rptJadeDynastyItem);
            nextJadeDynastySuitAttr.SetDisplay(PackType.rptJadeDynastyItem,true);
            curJadeDynastySuitAttr.SetDisplay(itemAttrData.packType);
            nextJadeDynastySuitAttr.SetDisplay(itemAttrData.packType, true);
        }
        private void SetMidUIHeight(float midHeight)
System/KnapSack/Logic/PackSendQuestMgr.cs
@@ -165,6 +165,19 @@
                        break;
                }
            }
            if(config.EquipPlace >= (int)RoleEquipType.JadeDynasty_Cloak
                && config.EquipPlace <= (int)RoleEquipType.JadeDynasty_Sword4)
            {
                var jadeDynastyModel = ModelCenter.Instance.GetModel<JadeDynastyEquipModel>();
                bool islock = jadeDynastyModel.IsLockEquipPlace(config.EquipPlace);
                isCanPut = !islock;
                if(islock)
                {
                    MessageWin.Inst.ShowFixedTip("请解锁诛仙塔");
                }
            }
            if(isCanPut)
            {
                CheckPutOnPlace();
@@ -577,7 +590,7 @@
        private void SendPutOnJadeDynastyEquip(int equipPlace, int itemIndex)
        {
            CA330_tagCMEquipZhuXianItem equipZhuXianItem = new CA330_tagCMEquipZhuXianItem();
            equipZhuXianItem.EquipIndex = (byte)equipPlace;
            equipZhuXianItem.EquipIndex = (byte)(equipPlace - 121);
            equipZhuXianItem.ItemIndex = (byte)itemIndex;
            GameNetSystem.Instance.SendInfo(equipZhuXianItem);
        }
@@ -650,11 +663,12 @@
        public void SendPutOffQuest(ItemWinBtnType btnType,string guid)
        {
            ItemModel putOnModel = playerPack.GetItemModelByGUID(guid);
            if (putOnModel == null || putOnModel.packType != PackType.rptEquip) return;
            if (putOnModel == null) return;
            SinglePackModel singlePack = null;
            int remainGrid = 0;
            int equipPlace = putOnModel.itemInfo.ItemPlace;
            equipPlace = putOnModel.packType == PackType.rptJadeDynastyEquip ? equipPlace + 121 : equipPlace;
            switch ((RoleEquipType)equipPlace)
            {
                case RoleEquipType.JadeDynasty_Cloak:
@@ -710,7 +724,7 @@
        private void SendPutOffJadeDynastyEquip(int equipPlace)
        {
            CA331_tagCMUnEquipZhuXianItem unEquipZhuXianItem = new CA331_tagCMUnEquipZhuXianItem();
            unEquipZhuXianItem.EquipIndex = (byte)equipPlace;
            unEquipZhuXianItem.EquipIndex = (byte)(equipPlace - 121);
            GameNetSystem.Instance.SendInfo(unEquipZhuXianItem);
        }
System/KnapSack/Logic/PlayerPackModels.cs
@@ -845,6 +845,16 @@
        public ItemModel GetItemModelByIndex(PackType type, int index)
        {
            switch(type)
            {
                case PackType.rptJadeDynastyEquip:
                    if(index >= 121)
                    {
                        index = index - 121;
                    }
                    break;
            }
            ItemModel itemModel = null;
            if (playerPackDict.ContainsKey(type))
            {
System/KnapSack/Logic/SinglePackModel.cs
@@ -60,6 +60,15 @@
        public ItemModel GetItemModelByIndex(int index)
        {
            switch (packType)
            {
                case PackType.rptJadeDynastyEquip:
                    if (index >= 121)
                    {
                        index = index - 121;
                    }
                    break;
            }
            ItemModel itemModel = null;
            packModelIndexDict.TryGetValue(index, out itemModel);
            return itemModel;