2648 【前端】角色加点功能去除

client_linchunjie

2018-08-20 bec6281b04630827bd400e1b6a50ce8a57dc95ec

2648 【前端】角色加点功能去除

2672【前端】去掉93引导条件

 Core/GameEngine/Model/Player/PlayerDatas.cs

@@ -317,7 +317,6 @@
                break;

            case PlayerDataRefresh.FreePoint:

                baseData.FreePoint = value;

                ModelCenter.Instance.GetModel<RolePointModel>().UpdateRedPoint();

                break;

            case PlayerDataRefresh.FreeSkillPoint:

                baseData.FreeSkillPoint = value;


 Core/NetworkPackage/DTCFile/ServerPack/H01_System/DTC0102_tagCDBPlayer.cs

@@ -140,7 +140,6 @@
        SettingEffectMgr.Instance.Begin();



        DEBUG_STEP = 4;
        ModelCenter.Instance.GetModel<RolePointModel>().UpdateRedPoint();
        QuickSetting.Instance.SetQuickSetting(vNetData.Setting);
        NetLinkWin.Hide();
        WindowCenter.Instance.Close<SelectRoleWin>();

 System/KnapSack/Logic/PackSendQuestMgr.cs

@@ -94,14 +94,6 @@
        }



        #region 发送穿戴装备的请求

        RolePointModel _rolePointModel;

        RolePointModel rolePointModel

        {

            get

            {

                return _rolePointModel ?? (_rolePointModel = ModelCenter.Instance.GetModel<RolePointModel>());

            }

        }

        ItemConfig sendItemConfig = null;

        ItemModel sendItemModel = null;

        int itemIndex = -1;

@@ -333,7 +325,7 @@
                                foreach (var key in sumOffsetlist.Keys)

                                {

                                    PlayerDatas.Instance.PlayerDataRefreshInfoEvent += RefreshFreePoint;

                                    rolePointModel.SendAddPoint((int)key, (int)sumOffsetlist[key]);

                                    //rolePointModel.SendAddPoint((int)key, (int)sumOffsetlist[key]);

                                }

                            }

                            else


 System/KnapSack/Logic/WashAttrPointWin.cs

@@ -1,185 +1,176 @@
using UnityEngine;
using UnityEngine.UI;
using TableConfig;
using System;

namespace Snxxz.UI
{
    public class WashAttrPointWin : Window
    {
        [SerializeField] Toggle strenToggle; //力量
        [SerializeField] Toggle agilityToggle; //身法
        [SerializeField] Toggle physiqueToggle; //体质
        [SerializeField] Toggle mentAlityToggle; //灵力
        [SerializeField] Button closeBtn;
        [SerializeField] Button okBtn;
        [SerializeField] Text washAttrDesText;

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

        RolePointModel _rolePointModel;
        RolePointModel rolePointModel
        {
            get
            {
                return _rolePointModel ?? (_rolePointModel = ModelCenter.Instance.GetModel<RolePointModel>());
            }
        }

        public static ItemModel itemModel = null;
        private ItemConfig itemConfig = null;
        private AttrEnum selectAttr = AttrEnum.POWER;

        float washPoint = 0;

        protected override void AddListeners()
        {
           
        }

        protected override void BindController()
        {
           
        }

        protected override void OnPreOpen()
        {
            washPoint = 0;
            strenToggle.isOn = true;
            agilityToggle.isOn = false;
            physiqueToggle.isOn = false;
            mentAlityToggle.isOn = false;
            strenToggle.onValueChanged.AddListener((bool isOn)=> { OnClickToggle(isOn); });
            agilityToggle.onValueChanged.AddListener((bool isOn) => { OnClickToggle(isOn); });
            physiqueToggle.onValueChanged.AddListener((bool isOn) => { OnClickToggle(isOn); });
            mentAlityToggle.onValueChanged.AddListener((bool isOn) => { OnClickToggle(isOn); });
            closeBtn.AddListener(CloseWin);
            okBtn.AddListener(ClickSureBtn);
        }

        protected override void OnAfterOpen()
        {
            InitUI();

        }

        protected override void OnPreClose()
        {
            closeBtn.RemoveAllListeners();
            strenToggle.RemoveAllListeners();
            agilityToggle.RemoveAllListeners();
            physiqueToggle.RemoveAllListeners();
            mentAlityToggle.RemoveAllListeners();
            okBtn.RemoveAllListeners();
        }
        protected override void OnAfterClose()
        {

        }

        private void InitUI()
        {
            if (itemModel == null) return;

            itemConfig = ConfigManager.Instance.GetTemplate<ItemConfig>(itemModel.itemId);
            SetCurWashAttr();
            RefreshWashAttrDes();
        }

        private void OnClickToggle(bool isOn)
        {
            SetCurWashAttr();
            RefreshWashAttrDes();
        }

        private void SetCurWashAttr()
        {
            if (strenToggle.isOn)
            {
                selectAttr = AttrEnum.POWER;
            }
            else if (agilityToggle.isOn)
            {
                selectAttr = AttrEnum.AGILITY;
            }
            else if (physiqueToggle.isOn)
            {
                selectAttr = AttrEnum.PHYSIQUE;
            }
            else if (mentAlityToggle.isOn)
            {
                selectAttr = AttrEnum.MENTALITY;
            }
        }

        private void RefreshWashAttrDes()
        {
            float initPoint = rolePointModel.GetPointCreate(PlayerDatas.Instance.baseData.Job)[(int)selectAttr];
            switch (selectAttr)
            {
                case AttrEnum.POWER:
                    washPoint = PlayerDatas.Instance.GetPlayerDataByType(PlayerDataRefresh.BaseSTR) - initPoint;
                    break;
                case AttrEnum.AGILITY:
                    washPoint = PlayerDatas.Instance.GetPlayerDataByType(PlayerDataRefresh.BasePHY) - initPoint;
                    break;
                case AttrEnum.PHYSIQUE:
                    washPoint = PlayerDatas.Instance.GetPlayerDataByType(PlayerDataRefresh.BaseCON) - initPoint;
                    break;
                case AttrEnum.MENTALITY:
                    washPoint = PlayerDatas.Instance.GetPlayerDataByType(PlayerDataRefresh.BasePNE) - initPoint;
                    break;
            }

            PlayerPropertyConfig propertyConfig = ConfigManager.Instance.GetTemplate<PlayerPropertyConfig>((int)selectAttr);
            washAttrDesText.text = Language.Get("BagWin_Washpoint2", propertyConfig.Name, UIHelper.GetPropertyMapPlayerData(selectAttr), washPoint);
        }

        private void ClickSureBtn()
        {
            if (itemConfig == null || itemModel == null) return;

            if(washPoint <= 0)
            {
                SysNotifyMgr.Instance.ShowTip("WashPoint");
            }
            else
            {
                int needCnt = (int)washPoint / itemConfig.EffectValueA1;
                int remain = (int)washPoint % itemConfig.EffectValueA1;

                if(remain > 0)
                {
                    needCnt = needCnt + 1;
                }
            
                if(needCnt > itemModel.itemInfo.ItemCount)
                {
                    needCnt = itemModel.itemInfo.ItemCount;
                }

                if (itemModel.chinItemModel.BatchUse == 1 && needCnt > 1)
                {
                    BatchUseModel.Instance.SetBatchModel(itemModel.itemInfo.ItemGUID);
                    BatchUseModel.Instance.SetExtraInfo((int)selectAttr,needCnt);
                    WindowCenter.Instance.Open<WashPointBatchUseWin>();
                }
                else
                {
                    PackSendQuestMgr.Instance.SendMakeUseQuest(itemModel.itemInfo.ItemPlace,1,(int)selectAttr);
                }
                
            }
            CloseWin();
        }

        private void CloseWin()
        {
            CloseImmediately();
        }
    }
}
using UnityEngine;

using UnityEngine.UI;

using TableConfig;

using System;



namespace Snxxz.UI

{

    public class WashAttrPointWin : Window

    {

        [SerializeField] Toggle strenToggle; //力量

        [SerializeField] Toggle agilityToggle; //身法

        [SerializeField] Toggle physiqueToggle; //体质

        [SerializeField] Toggle mentAlityToggle; //灵力

        [SerializeField] Button closeBtn;

        [SerializeField] Button okBtn;

        [SerializeField] Text washAttrDesText;



        PlayerPackModel _playerPack;

        PlayerPackModel playerPack

        {

            get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PlayerPackModel>()); }

        }



        public static ItemModel itemModel = null;

        private ItemConfig itemConfig = null;

        private AttrEnum selectAttr = AttrEnum.POWER;



        float washPoint = 0;



        protected override void AddListeners()

        {

           
        }



        protected override void BindController()

        {

           
        }



        protected override void OnPreOpen()

        {

            washPoint = 0;

            strenToggle.isOn = true;

            agilityToggle.isOn = false;

            physiqueToggle.isOn = false;

            mentAlityToggle.isOn = false;

            strenToggle.onValueChanged.AddListener((bool isOn)=> { OnClickToggle(isOn); });

            agilityToggle.onValueChanged.AddListener((bool isOn) => { OnClickToggle(isOn); });

            physiqueToggle.onValueChanged.AddListener((bool isOn) => { OnClickToggle(isOn); });

            mentAlityToggle.onValueChanged.AddListener((bool isOn) => { OnClickToggle(isOn); });

            closeBtn.AddListener(CloseWin);

            okBtn.AddListener(ClickSureBtn);

        }



        protected override void OnAfterOpen()

        {

            InitUI();



        }



        protected override void OnPreClose()

        {

            closeBtn.RemoveAllListeners();

            strenToggle.RemoveAllListeners();

            agilityToggle.RemoveAllListeners();

            physiqueToggle.RemoveAllListeners();

            mentAlityToggle.RemoveAllListeners();

            okBtn.RemoveAllListeners();

        }

        protected override void OnAfterClose()

        {



        }



        private void InitUI()

        {

            if (itemModel == null) return;



            itemConfig = ConfigManager.Instance.GetTemplate<ItemConfig>(itemModel.itemId);

            SetCurWashAttr();

            RefreshWashAttrDes();

        }



        private void OnClickToggle(bool isOn)

        {

            SetCurWashAttr();

            RefreshWashAttrDes();

        }



        private void SetCurWashAttr()

        {

            if (strenToggle.isOn)

            {

                selectAttr = AttrEnum.POWER;

            }

            else if (agilityToggle.isOn)

            {

                selectAttr = AttrEnum.AGILITY;

            }

            else if (physiqueToggle.isOn)

            {

                selectAttr = AttrEnum.PHYSIQUE;

            }

            else if (mentAlityToggle.isOn)

            {

                selectAttr = AttrEnum.MENTALITY;

            }

        }



        private void RefreshWashAttrDes()

        {

            //float initPoint = rolePointModel.GetPointCreate(PlayerDatas.Instance.baseData.Job)[(int)selectAttr];

            //switch (selectAttr)

            //{

            //    case AttrEnum.POWER:

            //        washPoint = PlayerDatas.Instance.GetPlayerDataByType(PlayerDataRefresh.BaseSTR) - initPoint;

            //        break;

            //    case AttrEnum.AGILITY:

            //        washPoint = PlayerDatas.Instance.GetPlayerDataByType(PlayerDataRefresh.BasePHY) - initPoint;

            //        break;

            //    case AttrEnum.PHYSIQUE:

            //        washPoint = PlayerDatas.Instance.GetPlayerDataByType(PlayerDataRefresh.BaseCON) - initPoint;

            //        break;

            //    case AttrEnum.MENTALITY:

            //        washPoint = PlayerDatas.Instance.GetPlayerDataByType(PlayerDataRefresh.BasePNE) - initPoint;

            //        break;

            //}



            PlayerPropertyConfig propertyConfig = ConfigManager.Instance.GetTemplate<PlayerPropertyConfig>((int)selectAttr);

            washAttrDesText.text = Language.Get("BagWin_Washpoint2", propertyConfig.Name, UIHelper.GetPropertyMapPlayerData(selectAttr), washPoint);

        }



        private void ClickSureBtn()

        {

            if (itemConfig == null || itemModel == null) return;



            if(washPoint <= 0)

            {

                SysNotifyMgr.Instance.ShowTip("WashPoint");

            }

            else

            {

                int needCnt = (int)washPoint / itemConfig.EffectValueA1;

                int remain = (int)washPoint % itemConfig.EffectValueA1;



                if(remain > 0)

                {

                    needCnt = needCnt + 1;

                }

            
                if(needCnt > itemModel.itemInfo.ItemCount)

                {

                    needCnt = itemModel.itemInfo.ItemCount;

                }



                if (itemModel.chinItemModel.BatchUse == 1 && needCnt > 1)

                {

                    BatchUseModel.Instance.SetBatchModel(itemModel.itemInfo.ItemGUID);

                    BatchUseModel.Instance.SetExtraInfo((int)selectAttr,needCnt);

                    WindowCenter.Instance.Open<WashPointBatchUseWin>();

                }

                else

                {

                    PackSendQuestMgr.Instance.SendMakeUseQuest(itemModel.itemInfo.ItemPlace,1,(int)selectAttr);

                }

                
            }

            CloseWin();

        }



        private void CloseWin()

        {

            CloseImmediately();

        }

    }

}


 System/NewBieGuidance/NewBieCenter.cs

@@ -54,7 +54,6 @@
        PlayerDeadModel playerDeadModel { get { return ModelCenter.Instance.GetModel<PlayerDeadModel>(); } }

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

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

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



        public event Action guideStepChangeEvent;

        public event Action guideBeginEvent;

@@ -362,8 +361,6 @@
                case GuideTriggerType.TrialExchange:

                    var trialCompleteTimes = dailyModel.GetDailyQuestCompletedTimes((int)DailyQuestType.Trial);

                    return trialCompleteTimes >= 3;

                case GuideTriggerType.MedicineRecycle:

                    return blastFurnaceModel.IsRecycleDanDrug();

                default:

                    return false;

            }


 System/Role/RoleAttrWin.cs

@@ -14,12 +14,9 @@


        [SerializeField] Image baseImg;

        [SerializeField] Image specialImg;

        [SerializeField] Image addImg;

        [SerializeField] Button addBtn;



        [SerializeField] Text m_BaseTxt;

        [SerializeField] Text m_SpecialTxt;

        [SerializeField] Text m_AddTxt;



        private readonly Color selectTxtCol = new Color32(52, 7, 1, 255);

        private readonly Color unSelectTxtCol = new Color32(125, 91, 52, 255);

@@ -39,31 +36,15 @@


        [SerializeField] Text descText;



        private void OnAddBtn()

        {

            if (attrShowType == 3) return;

            attrShowType = 3;



            addImg.SetSprite("2LVSelectTab_b");

            specialImg.SetSprite("2LVUnSelectTab_b");

            baseImg.SetSprite("2LVUnSelectTab_b");

            m_BaseTxt.color = unSelectTxtCol;

            m_SpecialTxt.color = unSelectTxtCol;

            m_AddTxt.color = selectTxtCol;

            OnRefreshScroll();

        }



        private void OnSpecialBtn()

        {

            if (attrShowType == 2) return;

            attrShowType = 2;



            addImg.SetSprite("2LVUnSelectTab_b");

            specialImg.SetSprite("2LVSelectTab_b");

            baseImg.SetSprite("2LVUnSelectTab_b");

            m_BaseTxt.color = unSelectTxtCol;

            m_SpecialTxt.color = selectTxtCol;

            m_AddTxt.color = unSelectTxtCol;



            OnRefreshScroll();

        }

@@ -73,12 +54,10 @@
            if (attrShowType == 1) return;

            attrShowType = 1;



            addImg.SetSprite("2LVUnSelectTab_b");

            specialImg.SetSprite("2LVUnSelectTab_b");

            baseImg.SetSprite("2LVSelectTab_b");

            m_BaseTxt.color = selectTxtCol;

            m_SpecialTxt.color = unSelectTxtCol;

            m_AddTxt.color = unSelectTxtCol;



            OnRefreshScroll();

        }

@@ -173,7 +152,6 @@
        {

            m_Controller.OnRefreshCell += OnRefreshCell;

            m_Controller.OnGetDynamicSize += OnGetDynamicSize;

            addBtn.onClick.AddListener(OnAddBtn);

            specialBtn.onClick.AddListener(OnSpecialBtn);

            baseBtn.onClick.AddListener(OnBaseBtn);

            closeBtn.onClick.AddListener(OnClose);


 System/Role/RolePanel.cs

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

        [SerializeField] Slider m_ExpSlider;

        [SerializeField] Text m_WorldExp;

        [SerializeField] Button m_PromoteBtn;

        [SerializeField] Button m_PlayerPropertyBtn;

        [SerializeField] Button m_TitleBtn;

        [SerializeField] Button m_RenameBtn;

@@ -127,17 +126,17 @@
        {

            WindowCenter.Instance.Open<RoleAttrWin>();

        }

        private void OnPromoteClick()

        {

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

            {

                WindowCenter.Instance.Open<RolePoint>();

            }

            else

            {

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

            }

        }

        //private void OnPromoteClick()

        //{

        //    if (FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.AddPoint))

        //    {

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

        //    }

        //    else

        //    {

        //        FuncOpen.Instance.ProcessorFuncErrorTip((int)FuncOpenEnum.AddPoint);

        //    }

        //}

        private void OnRefreshPlayerInfo(PlayerDataRefresh refreshType)

        {

            switch (refreshType)

@@ -269,7 +268,7 @@
            functionButtonMagician.onClick.AddListener(OnFuncMagician);

            functionButtonGulu.onClick.AddListener(OnFuncGulu);

            functionButtonHorucx.onClick.AddListener(OnFuncHorucx);

            m_PromoteBtn.onClick.AddListener(OnPromoteClick);

            //m_PromoteBtn.onClick.AddListener(OnPromoteClick);

            m_PlayerPropertyBtn.onClick.AddListener(OnAttrExplainClick);

            m_TitleBtn.onClick.AddListener(OnDesignationClick);

            m_RenameBtn.onClick.AddListener(OnRenameClick);


 System/Role/RolePoint.cs

File was deleted

 System/Role/RolePoint.cs.meta

File was deleted

 System/Role/RolePointModel.cs

File was deleted

 System/Role/RolePointModel.cs.meta

File was deleted

 System/RolePromote/RolePromoteModel.cs

@@ -710,11 +710,6 @@
        #endregion



        #region 主界面提升

        RolePointModel rolePointModel

        {

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

        }



        PlayerMethodData methodData

        {

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

@@ -750,8 +745,7 @@


        private void RedpointValueChangeEvent(int _id)

        {

            if (_id == rolePointModel.addPointRedpoint.id ||

                _id == strengthengmodel.StrengthRedpoint.id ||

            if (_id == strengthengmodel.StrengthRedpoint.id ||

                _id == MainRedDot.RedPoint_MountPackKey ||

                _id == MainRedDot.Instance.redPonintPetFunc2.id ||

                _id == MainRedDot.Instance.redPointWashFunc.id ||

@@ -795,8 +789,6 @@
            {

                case PromoteDetailType.BetterEquip:

                    return modelInterface.CheckBetterEquip(RoleEquipType.retSpiritAnimal);

                case PromoteDetailType.AddPoint:

                    return ModelCenter.Instance.GetModel<RolePointModel>().addPointRedpoint.state == RedPointState.Simple;

                case PromoteDetailType.EquipStrength:

                    return strengthengmodel.StrengthRedpoint.state == RedPointState.Simple;

                case PromoteDetailType.Mount:

@@ -845,7 +837,6 @@
        public enum PromoteDetailType

        {

            BetterEquip,

            AddPoint,

            EquipStrength,

            Mount,

            Pet,


 System/Tip/PromoteDetailsWin.cs

@@ -72,9 +72,6 @@
                case RolePromoteModel.PromoteDetailType.BetterEquip:

                    WindowCenter.Instance.Open<KnapSackWin>();

                    break;

                case RolePromoteModel.PromoteDetailType.AddPoint:

                    WindowCenter.Instance.Open<RolePoint>();

                    break;

                case RolePromoteModel.PromoteDetailType.EquipStrength:

                    WindowCenter.Instance.Open<EquipReinforceWin>();

                    break;


 System/WindowBase/ModelCenter.cs

@@ -81,7 +81,6 @@


            RegisterModel<UnionTaskModel>();

            RegisterModel<FriendsModel>();

            RegisterModel<RolePointModel>();

            RegisterModel<RoleParticularModel>();

            RegisterModel<WorldBossModel>();

            RegisterModel<RolePromoteModel>();


 System/WindowJump/WindowJumpMgr.cs

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

                break;

            case JumpUIType.RolePoint:

                SetJumpLogic<RolePoint>(_tagWinSearchModel.TABID);

                //SetJumpLogic<RolePoint>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.MainTask:

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

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

                break;

            case JumpUIType.RebornOpenAddPoint:

                SetJumpLogic<RolePoint>(_tagWinSearchModel.TABID);

                //SetJumpLogic<RolePoint>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.RebornOpenHourse:

                SetJumpLogic<PetWin>(_tagWinSearchModel.TABID);


 Utility/EnumHelper.cs

@@ -1182,7 +1182,6 @@
    FairyLandBuyTimes = 20,//仙界秘境购买次数

    TeamAutoAccept = 21,//自动接受组队邀请

    TrialExchange = 22,//宗门试炼兑换材料

    MedicineRecycle = 23,//丹药回收引导



    QuestCanAccept = 100,//任务可接

    QuestCanDo = 101,//任务可进行