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

xingchen Qiu

2019-04-28 6610372fd1e05641a9a1cf634570c4850167dd25

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

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

@@ -15,6 +15,7 @@
        base.Done(vNetPack);

        var package = vNetPack as H0311_tagDeleteSkill;

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

        ModelCenter.Instance.GetModel<TreasureSkillModel>().OnDeleteSkill((int)package.SkillID);

    }



}


 System/RoleParticulars/OtherPlayerEquipModel.cs

@@ -27,6 +27,7 @@
            }
        }

        public int viewPlayerType { get; private set; }
        public int playerId { get; private set; }
        public int playerJob { get; private set; }
        public int playerRealm { get; private set; }
@@ -35,8 +36,6 @@

        public event Action selectedLevelChangeEvent;
        Dictionary<int, EquipDetailsGroup> equipDetailsGroups = new Dictionary<int, EquipDetailsGroup>();

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

        public override void Init()
        {
@@ -49,6 +48,7 @@

        public void ViewPlayerEquip(PlayerBriefInfo info)
        {
            this.viewPlayerType = info.viewType;
            this.playerId = info.id;
            this.playerJob = info.job;
            this.playerRealm = info.realm;
@@ -67,13 +67,13 @@
            }
            else
            {
                switch (roleParticularModel.viewPlayerType)
                switch (viewPlayerType)
                {
                    case 4:
                    case 7:
                        {
                            var sendInfo = new CC002_tagCGViewCrossPlayerInfo();
                            sendInfo.PlayerID = (uint)roleParticularModel.viewPlayer;
                            sendInfo.PlayerID = (uint)playerId;
                            GameNetSystem.Instance.SendInfo(sendInfo);
                        }
                        break;
@@ -81,7 +81,7 @@
                    case 6:
                        {
                            var sendInfo = new CA212_tagCMViewPlayerInfo();
                            sendInfo.PlayerID = (uint)roleParticularModel.viewPlayer;
                            sendInfo.PlayerID = (uint)playerId;
                            sendInfo.EquipClassLV = (byte)level;
                            GameNetSystem.Instance.SendToCrossServer(sendInfo);
                        }
@@ -89,7 +89,7 @@
                    default:
                        {
                            var sendInfo = new CA212_tagCMViewPlayerInfo();
                            sendInfo.PlayerID = (uint)roleParticularModel.viewPlayer;
                            sendInfo.PlayerID = (uint)playerId;
                            sendInfo.EquipClassLV = (byte)level;
                            GameNetSystem.Instance.SendInfo(sendInfo);
                        }
@@ -403,6 +403,7 @@

        public struct PlayerBriefInfo
        {
            public int viewType;
            public int id;
            public int job;
            public int realm;

 System/RoleParticulars/RoleParticularsWin.cs

@@ -115,6 +115,7 @@


            otherPlayerEquipModel.ViewPlayerEquip(new OtherPlayerEquipModel.PlayerBriefInfo()

            {

                viewType=model.viewPlayerType,

                id = model.viewPlayer,

                realm = viewPlayerData.rolePropData.RealmLV,

                job = viewPlayerData.rolePropData.Job,


 System/Skill/ExpertSkillConditionCell.cs

@@ -31,7 +31,7 @@
            }

            else

            {

                m_Description.color = UIHelper.s_Gray;

                m_Description.color = UIHelper.s_BrightWhiteColor;

            }

        }

    }


 System/Skill/ExpertSkillSelectWin.cs

@@ -97,7 +97,7 @@
        void SetDefaultSelect()

        {

            m_SelectExpert = 0;

            model.TryGetExpertSkill(selectSkillId, out m_SelectExpert);

            //model.TryGetExpertSkill(selectSkillId, out m_SelectExpert);

        }



        void DisplayExperts()


 System/Skill/TreasureSkillModel.cs

@@ -255,6 +255,21 @@
            {

                expertSkillRefresh();

            }

            UpdateRedpoint();

        }



        public void OnDeleteSkill(int skillID)

        {

            TreasurePotential treasurePotential;

            if (TryGetPotential(skillID, out treasurePotential))

            {

                treasurePotential.Reset();

            }

            if (expertSkillRefresh != null)

            {

                expertSkillRefresh();

            }

            UpdateRedpoint();

        }



        public bool TryLevelUpTreasureSkill(int skillId, out int error)

@@ -374,6 +389,16 @@
                {

                    skill.levelUpRedpoint.state = RedPointState.None;

                }



                var expertSkill = 0;

                if (skill.level > 0 && !TryGetExpertSkill(skill.skillId, out expertSkill))

                {

                    skill.expertRedpoint.state = RedPointState.Simple;

                }

                else

                {

                    skill.expertRedpoint.state = RedPointState.None;

                }

            }

        }

    }

@@ -386,6 +411,7 @@
        public int level { get; private set; }

        public Redpoint redpoint { get; private set; }

        public Redpoint levelUpRedpoint { get; private set; }

        public Redpoint expertRedpoint { get; private set; }

        public List<TreasurePotential> potentials { get; private set; }



        public TreasureSkill(int skillId, int redpointIndex)

@@ -400,6 +426,8 @@
                TreasureSkillModel.REDPOINTID_BASE + redpointIndex);

            levelUpRedpoint = new Redpoint(redpoint.id,

                TreasureSkillModel.REDPOINTID_BASE + TreasureSkillModel.redpointIndex++);

            expertRedpoint = new Redpoint(redpoint.id,

                TreasureSkillModel.REDPOINTID_BASE + TreasureSkillModel.redpointIndex++);

        }



        public SkillConfig GetSkillConfig(int level)


 System/Skill/TreasureSkillWin.cs

@@ -25,6 +25,7 @@
        [SerializeField] ItemBehaviour m_Item;

        [SerializeField] Button m_LevelUp;

        [SerializeField] RedpointBehaviour m_LevelRedpoint;

        [SerializeField] RedpointBehaviour m_ExpertRedpoint;



        TreasureSkillModel model

        {

@@ -145,6 +146,9 @@
            TreasureSkill skill;

            if (model.TryGetSkill(model.selectSkill, out skill))

            {

                m_LevelRedpoint.redpointId = skill.levelUpRedpoint.id;

                m_ExpertRedpoint.redpointId = skill.expertRedpoint.id;



                var config = skill.GetSkillConfig(skill.level);

                if (config == null)

                {

@@ -313,10 +317,10 @@
                    m_Reiki.color = UIHelper.GetPropertyColor(property);

                    if (level == 0)

                    {

                        var conditionLabel = string.Format("{0}灵根{1}激活", propertyConfig.Name, skillConfig.RequirePropertyValue());

                        var conditionLabel = string.Format("（{0}灵根{1}激活）", propertyConfig.Name, skillConfig.RequirePropertyValue());

                        conditionLabel = UIHelper.AppendColor(TextColType.Red, conditionLabel, true);

                        m_Description.text = StringUtility.Contact(skillConfig.Description, conditionLabel);

                        m_Description.color = UIHelper.s_Gray;

                        m_Description.color = UIHelper.s_BrightWhiteColor;

                    }

                    else

                    {


 System/WindowBase/ModelCenter.cs

@@ -233,6 +233,7 @@
            RegisterModel<HazyGrassModel>();

            RegisterModel<DungeonUseBuffModel>();

            RegisterModel<AlchemyModel>();

            RegisterModel<OtherPlayerEquipModel>();

            inited = true;

        }