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

client_Wu Xijin

2019-06-28 49c7f5f4b0839954cf9fe2d6a069a74bf0c33da8

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

 Core/NetworkPackage/ServerPack/HB1_Role/HB107_tagMCRolePointInfo.cs

@@ -6,7 +6,7 @@
public class HB107_tagMCRolePointInfo : GameNetPackBasic {


    public byte PointAttrIDCount;    // 点类型个数


    public  byte[] PointAttrIDList;    // 点类型列表


    public  ushort[] PointValueList;    // 点类型对应已加自由点数列表

    public  uint[] PointValueList;    // 点类型对应已加自由点数列表




    public HB107_tagMCRolePointInfo () {


        _cmd = (ushort)0xB107;


@@ -15,7 +15,7 @@
    public override void ReadFromBytes (byte[] vBytes) {


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


        TransBytes (out PointAttrIDList, vBytes, NetDataType.BYTE, PointAttrIDCount);


        TransBytes (out PointValueList, vBytes, NetDataType.WORD, PointAttrIDCount);

        TransBytes (out PointValueList, vBytes, NetDataType.DWORD, PointAttrIDCount);

    }





}



 System/EquipStar/EquipStarModel.cs

@@ -29,6 +29,7 @@
        public readonly LogicInt starResultEffect = new LogicInt();

        Dictionary<int, EquipSetStar> equipStars = new Dictionary<int, EquipSetStar>();
        public Dictionary<int, EquipSetStar> EquipStars { get { return equipStars; } }

        Redpoint redpoint = new Redpoint(106, 1720000);
        bool redpointDirty = false;

 System/FairyAu/ExchangeActiveTokenModel.cs

@@ -5,11 +5,14 @@
using System;

using System.Text.RegularExpressions;



public class ExchangeActiveTokenModel : Model

public class ExchangeActiveTokenModel : Model,IPlayerLoginOk

{

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

    private EquipStarModel m_EquipStarModel { get { return ModelCenter.Instance.GetModel<EquipStarModel>(); } }

    private EquipModel m_EquipModel { get { return ModelCenter.Instance.GetModel<EquipModel>(); } }

    private Dictionary<int, bool> m_RealmEquIsAllMaxStarDic = new Dictionary<int, bool>();

    private int? m_MaxEquLv = null;



    public HashSet<ItemModel> ChoseEquips { get; private set; }

    public int NewActivePoint { get; private set; }



@@ -17,21 +20,88 @@
    public int NormalEquipActiveCount { get; private set; }

    public int Item3801ActiveCount { get; private set; }

    public int Item3802ActiveCount { get; private set; }

    


    public event Action RefreshActiveCanGetEvent;

    public event Action ExchangetSuccessEvent;



   


    public override void Init()

    {

        Debug.Log("init");

        ChoseEquips = new HashSet<ItemModel>();

        ParseConfig();

        m_PackModel.refreshItemCountEvent += RefreshRealmEquIsAllMaxStarDicAndRedPoint;

    }





    public override void UnInit()

    {



        m_PackModel.refreshItemCountEvent -= RefreshRealmEquIsAllMaxStarDicAndRedPoint;

    }

    


    public void OnPlayerLoginOk()

    {

        UpdateExchangeBtnRedPoint();

    }



    #region 交换活跃度按钮红点

    public const int ExchangeBtnRedPointID = 1070119;

    public Redpoint ExchangeBtnRedPoint = new Redpoint(10701, ExchangeBtnRedPointID);



    public void UpdateExchangeBtnRedPoint()

    {

        GetShowEquips(false);

        if (ChoseEquips.Count > 0)

        {

            ExchangeBtnRedPoint.state = RedPointState.Simple;

        }

        else

        {

            ExchangeBtnRedPoint.state = RedPointState.None;

        }

    }



    #endregion



    public void RefreshRealmEquIsAllMaxStarDicAndRedPoint(PackType type, int index, int itemId)

    {

        if (type != PackType.Equip && type != PackType.Item)

        {

            return;

        }

        int lv = ItemConfig.Get(itemId).LV;

        SetRealmEquIsAllMaxStar(lv);

        foreach (var value in m_RealmEquIsAllMaxStarDic.Values)

        {

            if(value)

            {

                UpdateExchangeBtnRedPoint();

                break;

            }

        }

    }

    //某个境界的装备是否满级

    public void SetRealmEquIsAllMaxStar(int Lv)

    {

        Int2 equPos = new Int2(Lv, 1);

        bool bIsAllEquMaxStar = true;

        bIsAllEquMaxStar = true;

        for (int j = 1; j < 9; j++)

        {

            equPos.y = j;

            int posStarLevel = m_EquipStarModel.GetStarLevel(equPos);

            int equMaxStarLevel = m_EquipStarModel.GetEquipPositionMaxStarLevel(equPos);

            if (equMaxStarLevel > posStarLevel || equMaxStarLevel == 0)

            {

                bIsAllEquMaxStar = false;

                break;

            }

        }

        m_RealmEquIsAllMaxStarDic[Lv] = bIsAllEquMaxStar;

    }



    public void ReciveExchangeResult(HA502_tagMCFamilyActivityExchangeResult info)

    {

        NewActivePoint = (int)info.Point;

@@ -175,43 +245,36 @@
 

    }



    public List<ItemModel> GetShowEquips()





    public List<ItemModel> GetShowEquips(bool bIsNeedSort = true)

    {

        ChoseEquips.Clear();

        SinglePack.FilterParams par = new SinglePack.FilterParams();

        par.qualitys = new List<int>() { 4 };

        par.itemTypes = new List<int>() { 101, 102, 103, 104, 105, 106, 107, 108 };

        var suitEquips = m_PackModel.GetItems(PackType.Item, par);

        Int2 equPos = new Int2(1, 1);

        bool bIsAllEquMaxStar = true;

       
        for (int i = 1; i < 9; ++i)

        {

            equPos.y = i;

            int posStarLevel = m_EquipStarModel.GetStarLevel(equPos);

            int equMaxStarLevel = m_EquipStarModel.GetEquipPositionMaxStarLevel(equPos);

            if(equMaxStarLevel > posStarLevel || equMaxStarLevel == 0)

            {

                bIsAllEquMaxStar = false;

                break;

            }

            
        }



        //SetRealmEquIsAllMaxStarDic();

        var playerJob = PlayerDatas.Instance.baseData.Job;

        //物品排序

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

        {

            var iEqu = suitEquips[i];

           
            if (bIsAllEquMaxStar)

            if (!m_RealmEquIsAllMaxStarDic.ContainsKey(iEqu.config.LV))

            {

                SetRealmEquIsAllMaxStar(iEqu.config.LV);

            }

            if (m_RealmEquIsAllMaxStarDic[iEqu.config.LV])

            {

                if(!IsBetterThanBodyEquip(iEqu))

                {

                    ChoseEquips.Add(iEqu);

                }

            }



            if(!bIsNeedSort)

            {

                continue;

            }

            for (int j = i - 1; j >= 0; j--)

            {

                var jEqu = suitEquips[j];

@@ -265,4 +328,5 @@
        return suitEquips;

    }



    
}

 System/FairyAu/FairyBasicFunctionWin.cs

@@ -41,6 +41,10 @@
        }

        CoinTaskTipModel m_CoinTaskTip;

        CoinTaskTipModel coinTaskTip { get { return m_CoinTaskTip ?? (m_CoinTaskTip = ModelCenter.Instance.GetModel<CoinTaskTipModel>()); } }

        ExchangeActiveTokenModel m_ExchangeActiveTokenModel

        {

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

        #region Built-in

        protected override void BindController()

        {

@@ -55,8 +59,9 @@
            SkillBtn.onClick.AddListener(SkillBtna);

            HallBtn.onClick.AddListener(HallButton);

            FairyAuBtn.AddListener(FairyAuButton);

            m_ExchangeBtn.AddListener(() => WindowCenter.Instance.Open<ExchangeActiveTokenWin>());

            m_ExchangeBtn.AddListener(OnExchangeBtnDown);

        }





        protected override void OnPreOpen()

        {

@@ -82,6 +87,15 @@
        }

        #endregion



        private void OnExchangeBtnDown()

        {

            if(m_ExchangeActiveTokenModel.ExchangeBtnRedPoint.state != RedPointState.None)

            {

                m_ExchangeActiveTokenModel.ExchangeBtnRedPoint.state = RedPointState.None;

            }

            WindowCenter.Instance.Open<ExchangeActiveTokenWin>();

        }



        void InitFairyInfo()

        {

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


 System/FairyAu/FairyModel.cs

@@ -11,6 +11,7 @@
    {

        DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }

        FairyBossModel fairyBossModel { get { return ModelCenter.Instance.GetModel<FairyBossModel>(); } }

       


        public event Action fairyCreateTimesUpdate;

        public override void Init()

@@ -49,6 +50,8 @@
        {



        }



        


        public void OnBeforePlayerDataInitialize()

        {

@@ -830,6 +833,10 @@
            }

        }





        
       


        private bool fairyLeagueDugeonCoolDown = false;

        DateTime fairyLeagueBeginTime = DateTime.Now;




 System/FairyAu/MethodToWin.cs

@@ -8,7 +8,7 @@
using System;

namespace Snxxz.UI

{

    public class MethodToWin : Window ,SecondWindowInterface

    public class MethodToWin : Window, SecondWindowInterface

    {

        //心法

        [SerializeField] ScrollerController m_ScrollerController;

@@ -31,7 +31,7 @@
        Dictionary<int, string> _dicFamilyIcon;//心法Icon

        Dictionary<int, string> _dicFamilyName;//心法名



        private  AchievementGuideEffect AchievementGuideEffect1;

        private AchievementGuideEffect AchievementGuideEffect1;

        enum BasicAttribute

        {

            BasicsAttack = 1,//基础攻击

@@ -44,31 +44,42 @@
        }

        public void Basic_Attribute(int id)

        {

            var config = FamilyTechConfig.Get(id * 1000 + 1);

            if (config == null)

            {

                return;

            }

            var propertyConfig = PlayerPropertyConfig.Get(config.attrType);

            switch ((BasicAttribute)id)

            {

                case BasicAttribute.BasicsAttack:

                    m_PrimaryAttribute.text = string.Format(Language.Get("MethodTo_C"), PlayerDatas.Instance.baseData.BasicsMaxAttack);

                    m_PrimaryAttribute.text = Language.Get("MethodTo_C", propertyConfig.ISPercentage == 0 ? UIHelper.GetPropertyValue((PropertyType)config.attrType)

                        : PlayerDatas.Instance.baseData.BasicsMaxAttack);

                    break;

                case BasicAttribute.BasicsLife:

                    m_PrimaryAttribute.text = string.Format(Language.Get("MethodTo_D"), PlayerDatas.Instance.baseData.BasicsLife);

                    m_PrimaryAttribute.text = Language.Get("MethodTo_D", propertyConfig.ISPercentage == 0 ? UIHelper.GetPropertyValue((PropertyType)config.attrType) :

                        PlayerDatas.Instance.baseData.BasicsLife);

                    break;

                case BasicAttribute.BasicsDefense:

                    m_PrimaryAttribute.text = string.Format(Language.Get("MethodTo_E"), PlayerDatas.Instance.baseData.BasicsDefense);

                    m_PrimaryAttribute.text = Language.Get("MethodTo_E", propertyConfig.ISPercentage == 0 ? UIHelper.GetPropertyValue((PropertyType)config.attrType) :

                        PlayerDatas.Instance.baseData.BasicsDefense);

                    break;

                case BasicAttribute.BasicsScoreAHit:

                    m_PrimaryAttribute.text = string.Format(Language.Get("MethodTo_F"), PlayerDatas.Instance.baseData.BasicsScoreAHit);

                    m_PrimaryAttribute.text = Language.Get("MethodTo_F", propertyConfig.ISPercentage == 0 ? UIHelper.GetPropertyValue((PropertyType)config.attrType) :

                        PlayerDatas.Instance.baseData.BasicsScoreAHit);

                    break;

                case BasicAttribute.BasicsDodge:

                    m_PrimaryAttribute.text = string.Format(Language.Get("MethodTo_G"), PlayerDatas.Instance.baseData.BasicsDodge);

                    m_PrimaryAttribute.text = Language.Get("MethodTo_G", propertyConfig.ISPercentage == 0 ? UIHelper.GetPropertyValue((PropertyType)config.attrType) :

                        PlayerDatas.Instance.baseData.BasicsDodge);

                    break;

                case BasicAttribute.Hurt:

                    m_PrimaryAttribute.text = string.Format(Language.Get("MethodTo_H"), PlayerDatas.Instance.extersion.realATK);

                    m_PrimaryAttribute.text = Language.Get("MethodTo_H", propertyConfig.ISPercentage == 0 ? UIHelper.GetPropertyValue((PropertyType)config.attrType) :

                        PlayerDatas.Instance.extersion.realATK);

                    break;

                case BasicAttribute.Resistance:

                    m_PrimaryAttribute.text = string.Format(Language.Get("MethodTo_I"), PlayerDatas.Instance.extersion.realDEF);

                    m_PrimaryAttribute.text = Language.Get("MethodTo_I", propertyConfig.ISPercentage == 0 ? UIHelper.GetPropertyValue((PropertyType)config.attrType) :

                        PlayerDatas.Instance.extersion.realDEF);

                    break;





            }



        }

@@ -139,8 +150,11 @@
                    m_ScrollerController.m_Scorller.RefreshActiveCellViews();

                    break;

                default:

                    if (indexID != -1)

                    {

                        Basic_Attribute(indexID);

                    }

                    break;



            }

        }



@@ -149,7 +163,7 @@
            foreach (int key in method._DicSkill.Keys)

            {

                if (method.MethodRedPointBtnDic.ContainsKey(key))

                {                 
                {

                    if (method.MethodRedPointBtnDic[key].state == RedPointState.Simple)

                    {

                        indexID = key;

@@ -258,22 +272,28 @@
            {

                _SkillLevelText.text = _dicFamilyName[id] + method._DicSkill[id].SkillLV.ToString() + Language.Get("Z1041");

                var configFamilyNow = FamilyTechConfig.Get(method._DicSkill[id].SkillID);

                var propertyConfig = PlayerPropertyConfig.Get(configFamilyNow.attrType);

                if (configFamilyTech != null)

                {

                    _attrValue = configFamilyTech.attrType;

                    m_LowerCurrentAttribute.text = string.Format(Language.Get("MethodTo_A"), PlayerPropertyConfig.Get(_attrValue.ToString()).Name, UIHelper.ReplacePercentage(configFamilyNow.attrValue, 1));

                    m_LowerCurrentAttribute.text = string.Format(Language.Get("MethodTo_A"),

                        propertyConfig.Name, UIHelper.ReplacePercentage(configFamilyNow.attrValue, propertyConfig.ISPercentage) +

                        (propertyConfig.ISPercentage == 1 ? "%" : string.Empty));

                }

                else

                {

                    var configFamilyTechMax = FamilyTechConfig.Get(method._DicSkill[id].SkillID);

                    int _attrValueMax = configFamilyTechMax.attrType;

                    m_LowerCurrentAttribute.text = string.Format(Language.Get("MethodTo_A"), PlayerPropertyConfig.Get(_attrValueMax.ToString()).Name, UIHelper.ReplacePercentage(configFamilyNow.attrValue, 1));

                    m_LowerCurrentAttribute.text = string.Format(Language.Get("MethodTo_A"),

                        propertyConfig.Name, UIHelper.ReplacePercentage(configFamilyNow.attrValue, propertyConfig.ISPercentage) +

                        (propertyConfig.ISPercentage == 1 ? "%" : string.Empty));

                }

                if (configFamilyTech != null)

                {



                    m_Properties.text = string.Format(Language.Get("MethodTo_B"), PlayerPropertyConfig.Get(_attrValue.ToString()).Name, UIHelper.ReplacePercentage(configFamilyTech.attrValue, 1));



                    m_Properties.text = string.Format(Language.Get("MethodTo_B"),

                        propertyConfig.Name, UIHelper.ReplacePercentage(configFamilyTech.attrValue, propertyConfig.ISPercentage) +

                        (propertyConfig.ISPercentage == 1 ? "%" : string.Empty));

                }

                else

                {

@@ -302,10 +322,14 @@
            else

            {

                _SkillLevelText.text = _dicFamilyName[id] + (method._DicSkill[id].SkillLV + 1).ToString() + Language.Get("Z1041");

                int _attrValue1 = configFamilyTechOne.attrType;

                m_LowerCurrentAttribute.text = string.Format(Language.Get("MethodTo_A"), PlayerPropertyConfig.Get(_attrValue1.ToString()).Name, UIHelper.ReplacePercentage(0, 1));

                var propertyConfig = PlayerPropertyConfig.Get(configFamilyTechOne.attrType);

                m_LowerCurrentAttribute.text = string.Format(Language.Get("MethodTo_A"),

                    propertyConfig.Name, UIHelper.ReplacePercentage(0, propertyConfig.ISPercentage) +

                    (propertyConfig.ISPercentage == 1 ? "%" : string.Empty));

                m_Properties.gameObject.SetActive(true);

                m_Properties.text = string.Format(Language.Get("MethodTo_B"), PlayerPropertyConfig.Get(_attrValue1.ToString()).Name, UIHelper.ReplacePercentage(configFamilyTech.attrValue, 1));

                m_Properties.text = string.Format(Language.Get("MethodTo_B"),

                    propertyConfig.Name, UIHelper.ReplacePercentage(configFamilyTech.attrValue, propertyConfig.ISPercentage) +

                    (propertyConfig.ISPercentage == 1 ? "%" : string.Empty));

                m_gameObject.SetActive(true);

                if (method._ContributionNumber >= configFamilyTech.needPoint)

                {

@@ -336,7 +360,7 @@
                    CA607_tagCMFamilyTechLVUP tag_CA607 = new CA607_tagCMFamilyTechLVUP();

                    tag_CA607.TechID = (uint)indexID;

                    GameNetSystem.Instance.SendInfo(tag_CA607);

                   // DebugEx.LogError("输出心法科技需要提升的技能IndexID"+ indexID);

                    // DebugEx.LogError("输出心法科技需要提升的技能IndexID"+ indexID);

                }

                else

                {

@@ -389,7 +413,7 @@
                indexID = MethodId[0];

                m_ScrollerController.JumpIndex(indexID - 1);

                m_ScrollerController.m_Scorller.RefreshActiveCellViews();//刷新可见

               


                if (AchievementGoto.guideAchievementId == 216)

                {

                    if (Conditional())

@@ -411,7 +435,7 @@
                {

                    if (Conditional())

                    {

                        AchievementGuideEffect1= AchievementGuideEffectPool.Require(1);

                        AchievementGuideEffect1 = AchievementGuideEffectPool.Require(1);

                        if (AchievementGuideEffect1.effect != null)

                        {

                            AchievementGuideEffect1.effect.ResetOrder(3500);


 System/FairyAu/UnionPanel.cs

@@ -5,10 +5,12 @@
using UnityEngine.UI;

namespace Snxxz.UI

{



    public class UnionPanel : OneLevelWin

    {

        Dictionary<int, FunctionButton> m_FunctionButtons = new Dictionary<int, FunctionButton>();



        //private FairyModel m_FairyModel { get { return ModelCenter.Instance.GetModel<FairyModel>(); }  }

        
        protected override void BindController()

        {

            m_TitleIcon = this.GetComponent<Image>("Pivot/Container_BackGround/Img_Title");
@@ -43,9 +45,9 @@


        protected override void OnPreOpen()

        {



            PlayerDatas.Instance.fairyData.OnRefreshFairyInfo += OnRefreshFariyInfo;

            PlayerDatas.Instance.fairyData.OnRefreshFairyMine += OnRefreshFairyMine;



            InitFairyFunc();

        }




 System/Login/LoginModel.cs

@@ -354,6 +354,8 @@
                    {

                        send.Password = "";

                    }

                    send.Extra += ("|" + VersionConfig.Get().version);

                    send.ExtraLen = (byte)send.Extra.Length;

                    send.MAC = DeviceUtility.GetMac();

                    send.Version = _serverInfo.Version;

                    send.LineNO = 255;


 System/Role/ReikiRootModel.cs

@@ -626,7 +626,7 @@


                var lastFreePoint = m_ReikiRootFreePoints.ContainsKey(id) ? m_ReikiRootFreePoints[id] : 0;



                var point = package.PointValueList[i];

                var point = (int)package.PointValueList[i];

                m_ReikiRootFreePoints[id] = point;



                afterReikiRootPoints[id] = m_ReikiRootPoints[id] - lastFreePoint + point;


 System/WindowBase/ModelCenter.cs

@@ -234,6 +234,7 @@
            RegisterModel<TaskFeedbackModel>();

            RegisterModel<MonthWeekInvestModel>();

            RegisterModel<NewDropItemModel>();

            RegisterModel<ExchangeActiveTokenModel>();

            inited = true;

        }




 System/WindowJump/WindowJumpMgr.cs

@@ -740,6 +740,8 @@
            case JumpUIType.Alchemy7:

            case JumpUIType.Alchemy8:

            case JumpUIType.Alchemy9:

            case JumpUIType.Alchemy10:

            case JumpUIType.Alchemy11:

                var selectAlchemy = 0;

                int.TryParse(_tagWinSearchModel.SelectActive, out selectAlchemy);

                ModelCenter.Instance.GetModel<AlchemyModel>().jumpAlchemy = selectAlchemy;

@@ -1726,7 +1728,9 @@
    ExchangeActiveToken = 332,

    Daily_FairyFeast = 333,//限时活动仙盟宴会

    Daily_FairyMatches = 334,//限时活动仙盟联赛

    CrossServerBoss,//蓬莱仙境

    CrossServerBoss = 335,//蓬莱仙境

    Alchemy10 = 336,

    Alchemy11 = 337,



    DhszTs = 1001,//定海神针功法提升界面

    HyqTs = 1002,//皓月枪功法提升界面