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

client_Wu Xijin

2019-01-22 675ca9691a94f7e2b7c41ffb3372e3696a68c728

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

 Core/GameEngine/Model/Config/EquipGSParamConfig.cs

@@ -1,16 +1,16 @@
//--------------------------------------------------------

//    [Author]:            第二世界

//    [  Date ]:           Wednesday, September 26, 2018

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



using UnityEngine;

using System;



namespace TableConfig {



    
    public partial class EquipGSParamConfig : ConfigBase {



//--------------------------------------------------------
//    [Author]:            第二世界
//    [  Date ]:           Tuesday, January 22, 2019
//--------------------------------------------------------

using UnityEngine;
using System;

namespace TableConfig {

    
    public partial class EquipGSParamConfig : ConfigBase {

        public int ID { get ; private set ; }

        public int EquipClass { get ; private set ; }

        public int EquipColor { get ; private set ; }

@@ -40,15 +40,29 @@
        public int SkillAtkRateReduceC { get ; private set ; }

        public int HitC { get ; private set ; }

        public int MissC { get ; private set ; }



        public override string getKey()

        {

            return ID.ToString();

        }



        public override void Parse() {

            try

            {

        public int SkillAddPer1C { get ; private set ; }

        public int SkillAddPer2C { get ; private set ; }

        public int SkillAddPer3C { get ; private set ; }

        public int SkillAddPer4C { get ; private set ; }

        public int SkillAddPer5C { get ; private set ; }

        public int SkillAddPer6C { get ; private set ; }

        public int SkillAddPer7C { get ; private set ; }

        public int SkillReducePer1C { get ; private set ; }

        public int SkillReducePer2C { get ; private set ; }

        public int SkillReducePer3C { get ; private set ; }

        public int SkillReducePer4C { get ; private set ; }

        public int SkillReducePer5C { get ; private set ; }

        public int SkillReducePer6C { get ; private set ; }

        public int SkillReducePer7C { get ; private set ; }

        public override string getKey()
        {
            return ID.ToString();
        }

        public override void Parse() {
            try
            {
                ID=IsNumeric(rawContents[0]) ? int.Parse(rawContents[0]):0; 

            

                EquipClass=IsNumeric(rawContents[1]) ? int.Parse(rawContents[1]):0; 

@@ -106,17 +120,45 @@
                HitC=IsNumeric(rawContents[27]) ? int.Parse(rawContents[27]):0; 

            

                MissC=IsNumeric(rawContents[28]) ? int.Parse(rawContents[28]):0; 

            }

            catch (Exception ex)

            {

                DebugEx.Log(ex);

            }

        }

	
    }



}









			
                SkillAddPer1C=IsNumeric(rawContents[29]) ? int.Parse(rawContents[29]):0; 
			
                SkillAddPer2C=IsNumeric(rawContents[30]) ? int.Parse(rawContents[30]):0; 
			
                SkillAddPer3C=IsNumeric(rawContents[31]) ? int.Parse(rawContents[31]):0; 
			
                SkillAddPer4C=IsNumeric(rawContents[32]) ? int.Parse(rawContents[32]):0; 
			
                SkillAddPer5C=IsNumeric(rawContents[33]) ? int.Parse(rawContents[33]):0; 
			
                SkillAddPer6C=IsNumeric(rawContents[34]) ? int.Parse(rawContents[34]):0; 
			
                SkillAddPer7C=IsNumeric(rawContents[35]) ? int.Parse(rawContents[35]):0; 
			
                SkillReducePer1C=IsNumeric(rawContents[36]) ? int.Parse(rawContents[36]):0; 
			
                SkillReducePer2C=IsNumeric(rawContents[37]) ? int.Parse(rawContents[37]):0; 
			
                SkillReducePer3C=IsNumeric(rawContents[38]) ? int.Parse(rawContents[38]):0; 
			
                SkillReducePer4C=IsNumeric(rawContents[39]) ? int.Parse(rawContents[39]):0; 
			
                SkillReducePer5C=IsNumeric(rawContents[40]) ? int.Parse(rawContents[40]):0; 
			
                SkillReducePer6C=IsNumeric(rawContents[41]) ? int.Parse(rawContents[41]):0; 
			
                SkillReducePer7C=IsNumeric(rawContents[42]) ? int.Parse(rawContents[42]):0; 
            }
            catch (Exception ex)
            {
                DebugEx.Log(ex);
            }
        }
	
    }

}





 Core/GameEngine/Model/Config/EquipGSParamConfig.cs.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: e238f9455d4062c4c867b41cfea2f046
timeCreated: 1548149155
timeCreated: 1548160973
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 Core/GameEngine/Model/TelPartialConfig/tagEquipGSParamConfig.cs

@@ -54,6 +54,19 @@
            _tagGsProValueDict.Add(AttrEnum.SkillHurtPrecent, gsModel.SkillAtkRateReduceC);

            _tagGsProValueDict.Add(AttrEnum.HIT, gsModel.HitC);

            _tagGsProValueDict.Add(AttrEnum.MISS, gsModel.MissC);

            _tagGsProValueDict.Add(AttrEnum.SkillAddPer1, gsModel.SkillAddPer1C);

            _tagGsProValueDict.Add(AttrEnum.SkillAddPer2, gsModel.SkillAddPer2C);

            _tagGsProValueDict.Add(AttrEnum.SkillAddPer3, gsModel.SkillAddPer3C);

            _tagGsProValueDict.Add(AttrEnum.SkillAddPer4, gsModel.SkillAddPer4C);

            _tagGsProValueDict.Add(AttrEnum.SkillAddPer5, gsModel.SkillAddPer5C);

            _tagGsProValueDict.Add(AttrEnum.SkillAddPer6, gsModel.SkillAddPer6C);

            _tagGsProValueDict.Add(AttrEnum.SkillReducePer1, gsModel.SkillReducePer1C);

            _tagGsProValueDict.Add(AttrEnum.SkillReducePer2, gsModel.SkillReducePer2C);

            _tagGsProValueDict.Add(AttrEnum.SkillReducePer3, gsModel.SkillReducePer3C);

            _tagGsProValueDict.Add(AttrEnum.SkillReducePer4, gsModel.SkillReducePer4C);

            _tagGsProValueDict.Add(AttrEnum.SkillReducePer5, gsModel.SkillReducePer5C);

            _tagGsProValueDict.Add(AttrEnum.SkillReducePer6, gsModel.SkillReducePer6C);

            _tagGsProValueDict.Add(AttrEnum.SkillReducePer7, gsModel.SkillReducePer7C);

            return _tagGsProValueDict;

        }

    }


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

@@ -42,6 +42,7 @@


        model.UpdateTreasurePotentialInfo(vNetData.OldSkillID, vNetData.NewSkillID);

        ModelCenter.Instance.GetModel<TalentModel>().UpdateTalentSkill(vNetData.OldSkillID, vNetData.NewSkillID);

        ModelCenter.Instance.GetModel<JadeDynastySkillModel>().OnReceivePackage(vNetData);

        if (vNetData != null)

        {

            //  horsemodel.MountSkill0310(vNetData.NewSkillID);


 System/GMCommand/GMInputWin.cs

@@ -91,10 +91,6 @@
            {

                OnClickSendBtn();

            }

            if (Input.GetKeyDown(KeyCode.P))

            {

                WindowCenter.Instance.Open<JadeDynastyKnapSackWin>();

            }

        }



        private void CreateCmdCell()


 System/JadeDynastyKnapSack/JadeDynastyEquipModel.cs

@@ -9,12 +9,13 @@
{

    public class JadeDynastyEquipModel : Model,IBeforePlayerDataInitialize,IAfterPlayerDataInitialize,IPlayerLoginOk

    {

        JadeDynastyTowerModel towerModel { get { return ModelCenter.Instance.GetModel<JadeDynastyTowerModel>(); } }

        PlayerPackModel playerPack { get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); } }



        public int UnlockTowerLayer

        {

            get { return 0; }

            get { return towerModel.highestPassFloor; }

        }



        PlayerPackModel playerPack { get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); } }



        public override void Init()

        {

@@ -329,21 +330,24 @@
                        }

                    }



                    if(minEquipLv != 0 && suitLvs != null)

                    if(suitLvs != null)

                    {

                        for(int i = suitLvs.Count - 1; i > -1; i++)

                        if (minEquipLv != 0)

                        {

                            int suitLv = suitLvs[i];

                            if(minEquipLv >= suitLv)

                            for (int i = suitLvs.Count - 1; i > -1; i++)

                            {

                                curSuitLv = suitLv;

                                break;

                                int suitLv = suitLvs[i];

                                if (minEquipLv >= suitLv)

                                {

                                    curSuitLv = suitLv;

                                    break;

                                }

                            }

                        }



                        foreach(var suitLv in suitLvs)

                        foreach (var suitLv in suitLvs)

                        {

                            if(suitLv > minEquipLv)

                            if (suitLv > minEquipLv)

                            {

                                nextSuitLV = suitLv;

                                break;

@@ -351,7 +355,7 @@
                        }

                    }



                    if(curSuitLv != 0 || nextSuitLV != 0)

                    if (curSuitLv != 0 || nextSuitLV != 0)

                    {

                        return true;

                    }


 System/JadeDynastyKnapSack/JadeDynastyKnapSackWin.cs

@@ -87,6 +87,10 @@
        {

            CloseSubWindows();

            CloseImmediately();

            if(!WindowJumpMgr.Instance.IsJumpState)

            {

                WindowCenter.Instance.Open<MainInterfaceWin>();

            }

        }



        private void CloseSubWindows()


 System/MainInterfacePanel/LowSettingTip.cs

@@ -26,7 +26,7 @@


        [SerializeField] Button m_TreasureSoulBtn;//觉醒按钮

        [SerializeField] Button m_GodBeastBtn;//神兽按钮



        [SerializeField] Button m_JadeDynastyBtn;//诛仙装备按钮

        FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } }

        public void Init()

        {

@@ -43,6 +43,7 @@
            m_BagualuBtn.AddListener(OnClickBagualuBtn);

            m_TreasureSoulBtn.AddListener(OnClickTreasureSoul);

            m_GodBeastBtn.AddListener(GodBeastBtn);

            m_JadeDynastyBtn.AddListener(JadeDynastyButton);

        }



        public void UnInit()

@@ -59,6 +60,7 @@
            _RankingListBtn.onClick.RemoveAllListeners();

            m_BagualuBtn.RemoveAllListeners();

            m_GodBeastBtn.RemoveAllListeners();

            m_JadeDynastyBtn.RemoveAllListeners();

        }



        void Role1Button()

@@ -101,7 +103,12 @@
            WindowCenter.Instance.Open<EquipReinforceWin>();

            //DesignDebug.Log("强化按钮");

        }



        void JadeDynastyButton()

        {

            WindowCenter.Instance.Close<MainInterfaceWin>();

            WindowCenter.Instance.Open<JadeDynastyKnapSackWin>();

            //DesignDebug.Log("诛仙装备");

        }





        void Asuram1Button()


 System/OpenServerActivity/OpenServiceAchievementWin.cs

@@ -354,8 +354,16 @@
            {

                m_One.SetActive(false);

                m_Two.SetActive(true);

                m_OpenServiceItemA1.SetReward(model.SelectedNow, ItemDayList[0], 0, 2);

                m_OpenServiceItemB1.SetReward(model.SelectedNow, ItemDayList[1], 1, 2);

                if (ItemDayList[0].NeedPoint > ItemDayList[1].NeedPoint)

                {

                    m_OpenServiceItemA1.SetReward(model.SelectedNow, ItemDayList[1], 1, 2);

                    m_OpenServiceItemB1.SetReward(model.SelectedNow, ItemDayList[0], 0, 2);                   
                }

                else

                {

                    m_OpenServiceItemA1.SetReward(model.SelectedNow, ItemDayList[0], 0, 2);

                    m_OpenServiceItemB1.SetReward(model.SelectedNow, ItemDayList[1], 1, 2);

                }             
            }

            else

            {


 Utility/EnumHelper.cs

@@ -1015,6 +1015,32 @@
    SuiteBasePer = 87, //套装基础属性  

    PlusBaseAtkPer = 88,  //强化攻击

    NpcHurtAddPer = 89,//对怪物伤害加成

    JobAHurtAddPer = 90,//对龙魂伤害增加百分比

    JobBHurtAddPer = 91,//对灵瑶伤害增加百分比

    JobCHurtAddPer = 92,//对弓箭手伤害增加百分比

    JobAAtkReducePer = 93,//承受龙魂伤害减少百分比

    JobBAtkReducePer = 94,//承受灵瑶伤害减少百分比

    JobCAtkReducePer = 95, //承受弓箭手伤害减少百分比

    ZXCloakAttrPer = 96, //诛仙·披风属性百分比

    ZXMaskAttrPer = 97, //诛仙·面罩属性百分比

    ZXGloveAttrPer = 98,//诛仙·手套属性百分比

    ZXRuyiAttrPer = 99,//诛仙·如意属性百分比

    ZXPendantAttrPer = 100, //诛仙·吊坠属性百分比

    ZXRingAttrPer = 101, //诛仙·戒指属性百分比

    SkillAddPer1 = 102,//定海神针技能伤害百分比

    SkillAddPer2 = 103, //皓月枪技能伤害百分比

    SkillAddPer3 = 104, //鬼牙刃技能伤害百分比

    SkillAddPer4 = 105, //磐龙印技能伤害百分比

    SkillAddPer5 = 106, //杏黄旗技能伤害百分比

    SkillAddPer6 = 107,//嗜天斧技能伤害百分比

    SkillAddPer7 = 108, //射日神弓技能伤害百分比

    SkillReducePer1 = 109, //定海神针技能减伤百分比

    SkillReducePer2 = 110, //皓月枪技能减伤百分比

    SkillReducePer3 = 111, //鬼牙刃技能减伤百分比

    SkillReducePer4 = 112, //磐龙印技能减伤百分比

    SkillReducePer5 = 113, //杏黄旗技能减伤百分比

    SkillReducePer6 = 114, //嗜天斧技能减伤百分比

    SkillReducePer7 = 115, //射日神弓技能减伤百分比

}

//UI图标类型

public enum SpriteFileType


 Utility/UIHelper.cs

@@ -807,7 +807,24 @@
                return paramConfig.AtkSpeedParameter;

            case "LuckyHitParameter":

                return paramConfig.LuckyHitParameter;



            case "SpeedPerParameter":

                return paramConfig.SpeedPerParameter;

            case "AtkPerParameter":

                return paramConfig.AtkPerParameter;

            case "MaxHPPerParameter":

                return paramConfig.MaxHPPerParameter;

            case "JobAHurtAddPer":

                return paramConfig.JobAHurtAddPer;

            case "JobBHurtAddPer":

                return paramConfig.JobBHurtAddPer;

            case "JobCHurtAddPer":

                return paramConfig.JobCHurtAddPer;

            case "JobAAtkReducePer":

                return paramConfig.JobAAtkReducePer;

            case "JobBAtkReducePer":

                return paramConfig.JobBAtkReducePer;

            case "JobCAtkReducePer":

                return paramConfig.JobCAtkReducePer;

        }



        return 0;