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

client_Hale

2019-05-20 017308241486b4c60b56175e10c8508028e91976

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

 System/Skill/ExpertSkillActiveRemindWin.cs

@@ -14,11 +14,9 @@


    public class ExpertSkillActiveRemindWin : Window

    {

        [SerializeField] Text m_Reiki;

        [SerializeField] Text m_Remind;

        [SerializeField] Button m_GotoReiki;

        [SerializeField] Button m_Confirm;

        [SerializeField] Button m_Cancel;

        [SerializeField] Button m_GetPath;

        [SerializeField] Button m_Close;



        public static int skillId = 0;

@@ -34,8 +32,7 @@
        protected override void AddListeners()

        {

            m_GotoReiki.AddListener(GotoReiki);

            m_Confirm.AddListener(Confirm);

            m_Cancel.AddListener(CloseClick);

            m_GetPath.AddListener(GetPath);

            m_Close.AddListener(CloseClick);

        }



@@ -68,51 +65,27 @@
                var requireProperty = skillConfig.RequireProperty();

                var requireValue = skillConfig.RequirePropertyValue();

                var propertyConfig = PlayerPropertyConfig.Get(requireProperty);

                m_Remind.text = Language.Get("ExpertSkillActiveRemind", propertyConfig.Name, requireValue);



                var point = requireValue - reikiRootModel.GetReikiRootPoint(requireProperty);

                if (reikiRootModel.freePoint >= point)

                if (reikiRootModel.freePoint + reikiRootModel.GetReikiRootPoint(requireProperty) >= requireValue)

                {

                    m_Reiki.text = StringUtility.Contact(propertyConfig.Name, ":", requireValue);

                    m_Reiki.color = UIHelper.GetUIColor(TextColType.Green, true);

                    m_GotoReiki.gameObject.SetActive(false);

                    m_Confirm.gameObject.SetActive(true);

                    m_Cancel.gameObject.SetActive(true);

                    m_Remind.gameObject.SetActive(true);

                    m_GotoReiki.gameObject.SetActive(true);

                    m_GetPath.gameObject.SetActive(false);

                }

                else

                {

                    m_Reiki.text = StringUtility.Contact(propertyConfig.Name, ":", requireValue

                        , Language.Get("ExpertSkillActiveRemind", point));

                    m_Reiki.color = UIHelper.GetUIColor(TextColType.Red, true);

                    m_GotoReiki.gameObject.SetActive(true);

                    m_Confirm.gameObject.SetActive(false);

                    m_Cancel.gameObject.SetActive(false);

                    m_Remind.gameObject.SetActive(false);

                    m_GotoReiki.gameObject.SetActive(false);

                    m_GetPath.gameObject.SetActive(true);

                }

            }

        }



        private void Confirm()

        private void GetPath()

        {

            TreasurePotential expert;

            if (model.TryGetPotential(skillId, out expert))

            {

                var level = 0;

                model.TryGetExpertActiveLevel(skillId, out level);

                var skillConfig = SkillConfig.Get(skillId + level);

                var requireProperty = skillConfig.RequireProperty();

                var requireValue = skillConfig.RequirePropertyValue();

                var propertyConfig = PlayerPropertyConfig.Get(requireProperty);

                var point = requireValue - reikiRootModel.GetReikiRootPoint(requireProperty);



                if (reikiRootModel.freePoint >= point)

                {

                    model.autoActiveSkillId = skillId;

                    reikiRootModel.SendAddPoint(new byte[1] { (byte)requireProperty }, new ushort[1] { (ushort)point });

                }

            }



            CloseImmediately();

            RealmRecommandEquipGetWayWin.equipGetWays.Clear();

            RealmRecommandEquipGetWayWin.equipGetWays.AddRange(reikiRootModel.reikiRootGetWays);

            WindowCenter.Instance.Open<RealmRecommandEquipGetWayWin>();

        }



        private void GotoReiki()


 System/Skill/ExpertSkillSelectWin.cs

@@ -38,7 +38,7 @@
        bool m_OpenDetail = false;



        int m_SelectExpert = 0;

        public int selectExpert

        int selectExpert

        {

            get { return m_SelectExpert; }

            set


 System/Skill/TreasureSkillModel.cs

@@ -42,8 +42,6 @@


        public bool selectActivePriority { get; set; }



        public int autoActiveSkillId { get; set; }



        public readonly Redpoint redpoint = new Redpoint(103, 10304);

        public const int REDPOINTID_BASE = 10304000;

        public static int redpointIndex = 100;

@@ -75,7 +73,6 @@
            m_ExpertSkills.Clear();

            m_ExpertActiveLevels.Clear();

            serverInited = false;

            autoActiveSkillId = 0;

        }



        public void OnPlayerLoginOk()

@@ -148,24 +145,6 @@
                        }

                    }

                }



                if (serverInited)

                {

                    var error = 0;

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

                    {

                        var window = WindowCenter.Instance.Get<ExpertSkillSelectWin>();

                        if (window.selectExpert == autoActiveSkillId

                        && SatisfyActiveExpert(autoActiveSkillId, out error))

                        {

                            var pak = new CA516_tagCMSelectSkillElement();

                            pak.SkillTypeID = (uint)autoActiveSkillId;

                            GameNetSystem.Instance.SendInfo(pak);

                        }

                    }

                }



                autoActiveSkillId = 0;

            }

            else if (dataType == PlayerDataType.LV)

            {