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

client_Zxw

2019-03-28 3daa967211f7e6b88efe5a2d557caf82fd59a79c

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

 System/Role/MagicianModel.cs

@@ -266,7 +266,7 @@
        }



        #region 红点

        public const int MAGICAIN_REDPOINT = 10103;

        public const int MAGICAIN_REDPOINT = 10102;

        public const int MAGICAIN_INTERVAL = 100;

        public Dictionary<int, Redpoint> redpointDict = new Dictionary<int, Redpoint>();

        Redpoint magicianPoint = new Redpoint(101, MAGICAIN_REDPOINT);


 System/Role/ReikiRootModel.cs

@@ -51,9 +51,7 @@


        public int maxQuality { get; private set; }



        public const int FUNCTION = 36;



        public readonly Redpoint redpoint = new Redpoint(10101, 1010101);
        public readonly Redpoint redpoint = new Redpoint(101, 10103);


        public event Action onCacheFreePointRefresh;

        public event Action onReikiRootPointRefresh;


 System/Role/ReikiRootWin.cs

@@ -21,7 +21,6 @@
        [SerializeField] Text m_FreePoint;

        [SerializeField] Button m_Recommend;

        [SerializeField] Button m_Confirm;

        [SerializeField] Button m_Close;



        Dictionary<int, int> currentPropertyDict = new Dictionary<int, int>();

        Dictionary<int, int> upPropertyDict = new Dictionary<int, int>();

@@ -44,7 +43,6 @@
        {

            m_Recommend.AddListener(OnRecommend);

            m_Confirm.AddListener(Confirm);

            m_Close.AddListener(CloseClick);



            m_NumKeyboard.onValueChange.AddListener(OnPointValChange);

            m_NumKeyboard.onConfirm.AddListener((bool isOk) =>


 System/Role/RolePanel.cs

@@ -15,6 +15,7 @@
        [SerializeField] FunctionButtonGroup buttonGroup;

        [SerializeField] FunctionButton functionButtonRole;

        [SerializeField] FunctionButton functionButtonMagician;

        [SerializeField] FunctionButton m_ReikiRoot;

        [SerializeField] FunctionButton m_GatherSoul;

        [SerializeField] FunctionButton m_FashionDress;



@@ -42,7 +43,6 @@
        [SerializeField] RectTransform m_ContainerExp;

        [SerializeField] Slider m_ExpSlider;

        [SerializeField] Text m_WorldExp;

        [SerializeField] Button m_AddPoint;

        [SerializeField] Button m_PlayerPropertyBtn;

        [SerializeField] Button m_TitleBtn;

        [SerializeField] Button m_RenameBtn;

@@ -131,18 +131,6 @@
        private void OnAttrExplainClick()

        {

            WindowCenter.Instance.Open<RoleAttrWin>();

        }



        private void OnPromoteClick()

        {

            if (FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.ReikiRoot))

            {

                WindowCenter.Instance.Open<ReikiRootWin>();

            }

            else

            {

                FuncOpen.Instance.ProcessorFuncErrorTip((int)FuncOpenEnum.ReikiRoot);

            }

        }



        private void OnRefreshPlayerInfo(PlayerDataType refreshType)

@@ -277,8 +265,8 @@
        {

            functionButtonRole.onClick.AddListener(OnFuncRole);

            functionButtonMagician.onClick.AddListener(OnFuncMagician);

            m_AddPoint.onClick.AddListener(OnPromoteClick);

            m_GatherSoul.onClick.AddListener(GatherSoul);

            m_ReikiRoot.onClick.AddListener(ReikiRoot);

            m_FashionDress.onClick.AddListener(OpenFashionDress);

            m_PlayerPropertyBtn.onClick.AddListener(OnAttrExplainClick);

            m_TitleBtn.onClick.AddListener(OnDesignationClick);

@@ -289,6 +277,13 @@
            m_CloseBtn.onClick.AddListener(CloseClick);

        }



        private void ReikiRoot()

        {

            CloseChild();

            WindowCenter.Instance.Open<ReikiRootWin>();

            functionOrder = m_ReikiRoot.order;

        }



        private void GatherSoul()

        {

            CloseChild();


 System/Tip/PromoteDetailsWin.cs

@@ -78,7 +78,7 @@
                    WindowCenter.Instance.Open<KnapSackWin>();

                    break;

                case RolePromoteModel.PromoteDetailType.AddPoint:

                    WindowCenter.Instance.Open<ReikiRootWin>();

                    WindowCenter.Instance.Open<RolePanel>(false, 2);

                    break;

                case RolePromoteModel.PromoteDetailType.EquipStrength:

                    //WindowCenter.Instance.Open<EquipReinforceWin>();

@@ -93,7 +93,7 @@
                    WindowCenter.Instance.Open<RunePanel>();

                    break;

                case RolePromoteModel.PromoteDetailType.GodWeapon:

                    WindowCenter.Instance.Open<RolePanel>(false, 3);

                    WindowCenter.Instance.Open<RolePanel>(false, 1);

                    break;

                case RolePromoteModel.PromoteDetailType.TreasurePotential:

                    break;


 System/WindowJump/WindowJumpMgr.cs

@@ -250,7 +250,7 @@
                SetJumpLogic<RealmWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.RolePoint:

                SetJumpLogic<ReikiRootWin>(_tagWinSearchModel.TABID);

                SetJumpLogic<RolePanel>(2);

                break;

            case JumpUIType.MainTask:

                TaskModel taskDatas = ModelCenter.Instance.GetModel<TaskModel>();

@@ -417,7 +417,7 @@
                SetJumpLogic<KnapSackWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.RebornOpenAddPoint:

                SetJumpLogic<ReikiRootWin>(_tagWinSearchModel.TABID);

                SetJumpLogic<RolePanel>(2);

                break;

            case JumpUIType.RebornOpenHourse:

                SetJumpLogic<PetWin>(_tagWinSearchModel.TABID);