少年修仙传客户端代码仓库
client_Zxw
2018-08-25 9706e402dad8b71ba1400cad38afe758586be1d2
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
5个文件已修改
142 ■■■■ 已修改文件
System/BetterItemGet/RealmBetterEquipModel .cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/BlastFurnace/BlastFurnaceModel.cs 77 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/BlastFurnace/BlastFurnaceWin.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Role/RoleModel.cs 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/RolePromote/RolePromoteModel.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/BetterItemGet/RealmBetterEquipModel .cs
@@ -36,6 +36,7 @@
        public void OnBeforePlayerDataInitialize()
        {
            PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= RefreshRealm;
            currentEquipGuid = string.Empty;
            betterEquipModels.Clear();
        }
@@ -43,7 +44,6 @@
        public void OnPlayerLoginOk()
        {
            LocalSave.SetInt(RealmRecordKey,PlayerDatas.Instance.baseData.realmLevel);
            PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= RefreshRealm;
            PlayerDatas.Instance.PlayerDataRefreshInfoEvent += RefreshRealm;
        }
System/BlastFurnace/BlastFurnaceModel.cs
@@ -86,15 +86,12 @@
        playerPack.ItemCntReduceAct -= RefreshDanReduce;
        playerPack.RefreshItemSumUseCntAct -= RefreshItemUsce;
        WindowCenter.Instance.windowAfterCloseEvent -= StoveUpgradAfterClose;
        PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= RefreshRealm;
    }
    public void OnAfterPlayerDataInitialize()
    {
        playerPack.RefreshItemCountAct += RefreshMat;
        FuncOpen.Instance.OnFuncStateChangeEvent += RefreshFuncOpenState;
        playerPack.RefreshItemSumUseCntAct += RefreshItemUsce;
        WindowCenter.Instance.windowAfterCloseEvent += StoveUpgradAfterClose;
        playerPack.ItemCntReduceAct += RefreshDanReduce;
    }
    private void RefreshFuncOpenState(int funcId)
@@ -109,6 +106,13 @@
    {
        CheckMakerDandrugCondition();
        CheckRecycleStoreRed();
        CheckMakeDrugRedPoint(true);
        playerPack.RefreshItemCountAct += RefreshMat;
        FuncOpen.Instance.OnFuncStateChangeEvent += RefreshFuncOpenState;
        playerPack.RefreshItemSumUseCntAct += RefreshItemUsce;
        WindowCenter.Instance.windowAfterCloseEvent += StoveUpgradAfterClose;
        playerPack.ItemCntReduceAct += RefreshDanReduce;
        PlayerDatas.Instance.PlayerDataRefreshInfoEvent += RefreshRealm;
    }
    public void RefreshAddSpecMat(AlchemySpecConfig alchemySpecModel)
@@ -683,8 +687,11 @@
    public Redpoint recycleStoreRedpoint = new Redpoint(BLASTREDPOINT_KEY, RECYCLESTORE_KEY);
    public const int RECYCLEBTN_KEY = 110031000;
    private Redpoint recycleBtnRedpoint = new Redpoint(RECYCLESTORE_KEY, RECYCLEBTN_KEY);
    public List<Redpoint> danDrugRedPointlist { get; private set; }
    public const int RedPoint_MakeDrugKey = 11002;
    public Redpoint MakeDrugRedpoint = new Redpoint(BLASTREDPOINT_KEY, RedPoint_MakeDrugKey);
    public void SetDandrugRedPointlist()
    {
        if (alchemyModellist == null) return;
@@ -699,13 +706,17 @@
        }
    }
    private void RefreshMat(PackType type, int index, int id)
    {
        if (type != PackType.rptItem) return;
        CheckMakerDandrugCondition();
        CheckRecycleStoreRed();
        if (playerPack.CheckIsDrugById(id))
        {
            CheckMakeDrugRedPoint();
        }
    }
    private void RefreshItemUsce(int id)
@@ -714,11 +725,63 @@
        {
            CheckMakerDandrugCondition();
            CheckRecycleStoreRed();
            CheckMakeDrugRedPoint();
            StoveIsUpGrade = false;
            PlayRecycleGuid();
        }
    }
    private void RefreshRealm(PlayerDataRefresh type)
    {
        if (type != PlayerDataRefresh.OfficialRank) return;
        CheckMakeDrugRedPoint();
    }
    public void CheckMakeDrugRedPoint(bool isLogin = false,bool isClick = false)
    {
        bool isCheckRed = false;
        if(!isClick)
        {
            if(PlayerDatas.Instance.baseData.LV <= 151)
            {
                isCheckRed = true;
            }
            else if(PlayerDatas.Instance.baseData.LV > 151 && !isLogin)
            {
                isCheckRed = true;
            }
            if(isCheckRed)
            {
                List<AttrFruitConfig> list = playerPack.makeDruglist;
                if (list != null)
                {
                    for (int i = 0; i < list.Count; i++)
                    {
                        int haveCnt = playerPack.GetItemCountByID(PackType.rptItem, list[i].ID);
                        if (haveCnt > 0 && !playerPack.IsReachMaxUseDrug(list[i]))
                        {
                            MakeDrugRedpoint.state = RedPointState.Simple;
                            return;
                        }
                    }
                }
            }
            else
            {
                MakeDrugRedpoint.state = RedPointState.None;
            }
        }
        else
        {
            if(PlayerDatas.Instance.baseData.LV > 151)
            {
                MakeDrugRedpoint.state = RedPointState.None;
            }
        }
    }
    public void CheckMakerDandrugCondition()
    {
        for (int i = alchemyModellist.Count - 1; i > -1; i--)
System/BlastFurnace/BlastFurnaceWin.cs
@@ -76,7 +76,7 @@
                {
                    functionOrder = _lingDanTitle.order;
                }
                else if (ModelCenter.Instance.GetModel<RoleModel>().MakeDrugRedpoint.state != RedPointState.None)
                else if (FurnaceModel.MakeDrugRedpoint.state != RedPointState.None)
                {
                    functionOrder = _treasureRefineTitle.order;
                }
@@ -127,6 +127,7 @@
   
        private void OnClickTreasureRefineTitle()
        {
            FurnaceModel.CheckMakeDrugRedPoint(false,true);
            FurnaceModel.funcTitle = BlastFurnaceFuncTitle.AttrDan;
            _lingDanTips.SetActive(false);
            attrDanTips.SetActive(true);
System/Role/RoleModel.cs
@@ -8,20 +8,13 @@
{
    public class RoleModel : Model,IBeforePlayerDataInitialize,IAfterPlayerDataInitialize,IPlayerLoginOk
    {
        PlayerPackModel _playerPack;
        PlayerPackModel playerPack
        {
            get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PlayerPackModel>()); }
        }
        public override void Init()
        {
        }
        public void OnBeforePlayerDataInitialize()
        {
            playerPack.RefreshItemCountAct -= RefreshItemCnt;
            playerPack.RefreshItemSumUseCntAct -= RefreshItemUseCnt;
        }
        public void OnAfterPlayerDataInitialize()
@@ -31,56 +24,13 @@
        public void OnPlayerLoginOk()
        {
            playerPack.RefreshItemCountAct += RefreshItemCnt;
            playerPack.RefreshItemSumUseCntAct += RefreshItemUseCnt;
            CheckRedPointState();
        }
        public override void UnInit()
        {
        }
        private void RefreshItemCnt(PackType type, int index, int id)
        {
            if (type != PackType.rptItem) return;
            AttrFruitConfig fruitConfig = Config.Instance.Get<AttrFruitConfig>(id);
            if(fruitConfig != null)
            {
                CheckRedPointState();
            }
        }
        private void RefreshItemUseCnt(int id)
        {
            AttrFruitConfig fruitConfig = Config.Instance.Get<AttrFruitConfig>(id);
            if (fruitConfig != null)
            {
                CheckRedPointState();
            }
        }
        #region 红点逻辑
        public const int RedPoint_MakeDrugKey = 11002;
        public Redpoint MakeDrugRedpoint = new Redpoint(BlastFurnaceModel.BLASTREDPOINT_KEY, RedPoint_MakeDrugKey);
        public void CheckRedPointState()
        {
            List<AttrFruitConfig> list = playerPack.makeDruglist;
            if(list != null)
            {
                for(int i = 0; i < list.Count;i++)
                {
                    int haveCnt = playerPack.GetItemCountByID(PackType.rptItem,list[i].ID);
                    if(haveCnt > 0 && !playerPack.IsReachMaxUseDrug(list[i]))
                    {
                        MakeDrugRedpoint.state = RedPointState.Simple;
                        return;
                    }
                }
            }
            MakeDrugRedpoint.state = RedPointState.None;
        }
        #endregion
    }
}
System/RolePromote/RolePromoteModel.cs
@@ -754,7 +754,7 @@
                _id == methodData.fairyHeartRedpoint.id ||
                _id == realmModel.realmRedpoint.id ||
                _id == gemModel.gemTagRedPoint.id ||
                _id == roleModel.MakeDrugRedpoint.id ||
                _id == blastFurnaceModel.MakeDrugRedpoint.id ||
                IsTreasureRedpoint(_id))
            {
                CheckPromoteDetailEffect();
@@ -826,7 +826,7 @@
                case PromoteDetailType.FairyHeart:
                    return ModelCenter.Instance.GetModel<PlayerMethodData>().fairyHeartRedpoint.state == RedPointState.Simple;
                case PromoteDetailType.BlastFurnace:
                    return roleModel.MakeDrugRedpoint.state == RedPointState.Simple;
                    return blastFurnaceModel.MakeDrugRedpoint.state == RedPointState.Simple;
                case PromoteDetailType.max:
                    break;
            }