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

client_Zxw

2018-11-01 7788118762e57c9119e3884b0096743985ae0a4d

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

 Core/GameEngine/Model/Player/Rank/PlayerRankData.cs

@@ -119,6 +119,7 @@
        OpenServerRealm = 15,

        OpenServerFightPower = 16,

        Def_BT_FCCostGold = 17,  //消费排行榜(仙界盛典)

        OpenServerRune = 18,

    }



    public class RankData


 Core/GameEngine/Model/TelPartialConfig/tagStoreConfig.cs

@@ -13,6 +13,8 @@
        private static Dictionary<int, List<StoreConfig>> storeConfigs = new Dictionary<int, List<StoreConfig>>();

        public void OnConfigParseCompleted()

        {

            if (ShopType == 0) return;



            if (!s_storeModelDict.ContainsKey(ShopType))

            {

                List<StoreConfig> modellist = new List<StoreConfig>();


 Core/NetworkPackage/DTCFile/ServerPack/HB4_Fight/DTCB401_tagMCSkillHurtList.cs

@@ -35,7 +35,8 @@


        if (vNetData.HurtCount > 0)

        {

            if (_skill.id != _attacker.SkillMgr.CurCastSkill.id)

            if (_attacker.SkillMgr.CurCastSkill != null

             && _skill.id != _attacker.SkillMgr.CurCastSkill.id)

            {

                _skill.ClearServerHurtList();

            }


 System/BetterItemGet/BetterEquipGetModel.cs

@@ -45,6 +45,18 @@
            currentEquipGuid = string.Empty;

        }



        #region 解析本地表

        public int autoEquipLvLimit { get; private set; }

        public int autoEquipCoolTime { get; private set; }



        public void ParseConfig()

        {

            FuncConfigConfig equipAutoEquip = Config.Instance.Get<FuncConfigConfig>("EquipAutoEquip");

            autoEquipLvLimit = int.Parse(equipAutoEquip.Numerical1);

            autoEquipCoolTime = int.Parse(equipAutoEquip.Numerical2);



        }

        #endregion

        public bool TryGetBetterEquip(string _guid, out ItemModel _equip)

        {

            return betterEquipModels.TryGetValue(_guid, out _equip);

@@ -135,6 +147,10 @@
                        {

                            showEquipRefreshEvent();

                        }

                        if(betterModel.chinItemModel.ItemColor < 3)

                        {

                          
                        }

                    }

                }

                else

@@ -146,6 +162,8 @@
                    }

                }

            }





        }



        IEnumerator Co_DelayRefreshBetterEquip(string _guid)


 System/Dogz/DogzModel.cs

@@ -981,6 +981,10 @@
            {

                if(value.state == RedPointState.Simple)

                {

                    if (UpdateDogzPutRedEvent != null)

                    {

                        UpdateDogzPutRedEvent();

                    }

                    return;

                }

            }


 System/OpenServerActivity/ImpactRankModel.cs

@@ -34,7 +34,7 @@
        {

            foreach (var _type in m_Redpoints.Keys)

            {

                if (!IsMissImpactRank(_type) && IsActivityClose(_type))

                if (!IsMissImpactRank(_type) && IsActivityClose(_type) && ContainsActivity(_type))

                {

                    C1001_tagCWatchBillboard _pak = new C1001_tagCWatchBillboard();

                    _pak.Type = (byte)GetRankType(_type);

@@ -72,7 +72,7 @@
        private void OnRefreshRank(int type)

        {

            if (type >= (int)PlayerRankData.RankType.OpenServerStrengthen

                && type <= (int)PlayerRankData.RankType.OpenServerFightPower)

                && type <= (int)PlayerRankData.RankType.OpenServerRune)

            {

                foreach (var _type in m_Redpoints.Keys)

                {

@@ -344,6 +344,11 @@
            return GetSurplusDay(_type) <= 0;

        }



        public bool ContainsActivity(int _type)

        {

            return impactRankTypeOpenDict.ContainsKey(_type);

        }



        public PlayerRankData.RankType GetRankType(int _type)

        {

            switch (_type)

@@ -360,6 +365,8 @@
                    return PlayerRankData.RankType.OpenServerRealm;

                case 6:

                    return PlayerRankData.RankType.OpenServerFightPower;

                case 7:

                    return PlayerRankData.RankType.OpenServerRune;

            }

            return PlayerRankData.RankType.OpenServerMount;

        }

@@ -413,7 +420,7 @@
            }

        }



        private PlayerRankData.RankType m_PresentBillRankType = PlayerRankData.RankType.OpenServerStrengthen;

        private PlayerRankData.RankType m_PresentBillRankType = PlayerRankData.RankType.OpenServerMount;

        public PlayerRankData.RankType presentBillRankType {

            get { return m_PresentBillRankType; }

            set {


 System/OpenServerActivity/ImpactRankWin.cs

@@ -374,31 +374,6 @@
            var _condition = model.impactRankTypeOpenDict[model.presentSelectType];

            switch (model.presentSelectType)

            {

                case 1:

                case 2:

                case 3:

                case 6:

                    if (_cfg is OSCBillRankAwardConfig)

                    {

                        OSCBillRankAwardConfig _billRankCfg = _cfg as OSCBillRankAwardConfig;

                        if (_billRankCfg.RankA == _billRankCfg.RankB)

                        {

                            _tip = Language.Get(StringUtility.Contact("ImpactRankCellType_Single_", model.presentSelectType),

                                _billRankCfg.RankA, _condition.limit);

                        }

                        else

                        {

                            _tip = Language.Get(StringUtility.Contact("ImpactRankCellType_Double_", model.presentSelectType),

                                _billRankCfg.RankA, _billRankCfg.RankB, _condition.limit);

                        }

                    }

                    else if (_cfg is OSCBillTagAwardConfig)

                    {

                        OSCBillTagAwardConfig _billTagCfg = _cfg as OSCBillTagAwardConfig;

                        _tip = Language.Get(StringUtility.Contact("ImpactRankCellType_Target_", model.presentSelectType),

                            _billTagCfg.Condition);

                    }

                    break;

                case 5:

                    if (_cfg is OSCBillRankAwardConfig)

                    {

@@ -424,24 +399,26 @@
                            _realmCfg != null ? _realmCfg.Name : string.Empty);

                    }

                    break;

                case 4:

                default:

                    if (_cfg is OSCBillRankAwardConfig)

                    {

                        OSCBillRankAwardConfig _billRankCfg = _cfg as OSCBillRankAwardConfig;

                        if (_billRankCfg.RankA == _billRankCfg.RankB)

                        {

                            _tip = Language.Get(StringUtility.Contact("ImpactRankCellType_Single_", 4), _billRankCfg.RankA, _condition.limit);

                            _tip = Language.Get(StringUtility.Contact("ImpactRankCellType_Single_", model.presentSelectType),

                                _billRankCfg.RankA, _condition.limit);

                        }

                        else

                        {

                            _tip = Language.Get(StringUtility.Contact("ImpactRankCellType_Double_", 4),

                            _tip = Language.Get(StringUtility.Contact("ImpactRankCellType_Double_", model.presentSelectType),

                                _billRankCfg.RankA, _billRankCfg.RankB, _condition.limit);

                        }

                    }

                    else if (_cfg is OSCBillTagAwardConfig)

                    {

                        OSCBillTagAwardConfig _billTagCfg = _cfg as OSCBillTagAwardConfig;

                        _tip = Language.Get(StringUtility.Contact("ImpactRankCellType_Target_", 4), _billTagCfg.Condition);

                        _tip = Language.Get(StringUtility.Contact("ImpactRankCellType_Target_", model.presentSelectType),

                            _billTagCfg.Condition);

                    }

                    break;

            }

@@ -493,6 +470,8 @@
                    return 17;

                case 6:

                    return 18;

                case 7:

                    return 31;

            }

            return 13;

        }


 System/Team/TeamFailEnterDungeonHandle.cs

@@ -1,6 +1,7 @@
using System;

using System.Collections;

using System.Collections.Generic;

using TableConfig;

using UnityEngine;

namespace Snxxz.UI

{

@@ -62,6 +63,16 @@
            {

                return;

            }

            if (!(StageManager.Instance.CurrentStage is DungeonStage))

            {

                return;

            }

            var mapId = PlayerDatas.Instance.baseData.MapID;

            var mapConfig = Config.Instance.Get<MapConfig>(mapId);

            if (mapConfig == null || mapConfig.MapFBType != (int)MapType.OpenCountry)

            {

                return;

            }

            if (StageManager.Instance.isLoading)

            {

                if (!tasks.ContainsKey(31080))


 System/Vip/VipExperienceWin.cs

@@ -10,28 +10,19 @@
using UnityEngine.UI;
using Snxxz.UI;

namespace Snxxz.UI {
namespace Snxxz.UI

{

    public class VipExperienceWin : Window
    {
        [SerializeField] Button m_CloseBtn;
        [SerializeField] Button m_ExperienceBtn;
        [SerializeField] Text m_ContentTxt;
        [SerializeField] Button m_Known;
        [SerializeField] Text m_KnownTxt;
        [SerializeField] Text m_Content;
        [SerializeField] float m_ViewDuration = 15f;
        [SerializeField] float m_CountDownSeconds = 5f;

        ItemTipsModel _itemTipsModel;
        ItemTipsModel itemTipsModel
        {
            get
            {
                return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>());
            }
        }

        PlayerPackModel _playerPack;
        PlayerPackModel playerPack
        {
            get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PlayerPackModel>()); }
        }
        float viewTime = 0f;
        float countDownTime = 0f;

        #region Built-in
        protected override void BindController()
@@ -40,21 +31,25 @@

        protected override void AddListeners()
        {
            m_CloseBtn.onClick.AddListener(CloseClick);
            m_ExperienceBtn.onClick.AddListener(OnExperienceBtn);
            m_Known.onClick.AddListener(CloseClick);
        }

        protected override void OnPreOpen()
        {
            m_ContentTxt.text = Language.Get("VipExperience3");
        }

            m_Content.text = Language.Get("VipExperience3");
            m_KnownTxt.text = Language.Get("VipCard4");
            viewTime = Time.time + m_ViewDuration;
            countDownTime = viewTime + m_CountDownSeconds;
            GlobalTimeEvent.Instance.secondEvent += SecondEvent;
        }



        protected override void OnAfterOpen()
        {
        }

        protected override void OnPreClose()
        {
        {

            GlobalTimeEvent.Instance.secondEvent -= SecondEvent;
        }

        protected override void OnAfterClose()
@@ -65,14 +60,26 @@
            }
        }
        #endregion
        private void OnExperienceBtn()
        {
            if (PackSendQuestMgr.Instance.useItemModel != null)
            {
                PackSendQuestMgr.Instance.CheckUseCondition(PackSendQuestMgr.Instance.useItemModel);
            }

            CloseImmediately();
        protected override void LateUpdate()

        {

            base.LateUpdate();

            if (Time.time >= countDownTime)

            {

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

                {

                    WindowCenter.Instance.CloseImmediately<VipExperienceWin>();

                }

            }

        }

        private void SecondEvent()

        {

            var seconds = Mathf.CeilToInt(countDownTime - Time.time);

            if (seconds <= m_CountDownSeconds)

            {

                m_KnownTxt.text = StringUtility.Contact(Language.Get("VipCard4"), "\n（", seconds, "）");

            }

        }
    }


 System/Vip/VipModel.cs

@@ -31,6 +31,7 @@
        private bool waitingJump = false;



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

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



        public override void Init()

        {

@@ -49,11 +50,23 @@
            WindowCenter.Instance.windowAfterOpenEvent += WindowAfterOpenEvent;

            TimeUtility.OnServerOpenDayRefresh += OnServerOpenDayRefresh;

            TreasureNewGotWin.CloseTreasureNewGotWinEvent += CloseTreasureNewGotWinEvent;

            NewBieCenter.Instance.guideCompletedEvent += GuideCompletedEvent;

            packModel.RefreshItemCountAct += RefreshItemCountAct;

            StageManager.Instance.onStageLoadFinish += OnStageLoadFinish;

        }



        public override void UnInit()

        {



            PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= PlayerDataRefreshInfoEvent;

            SDKUtility.Instance.onFreePlatformPayCancel -= OnChargeFail;

            SDKUtility.Instance.onFreePlatformPayFail -= OnChargeFail;

            SDKUtility.Instance.onFreePlatformPayOk -= OnChargeComplete;

            WindowCenter.Instance.windowAfterOpenEvent -= WindowAfterOpenEvent;

            TimeUtility.OnServerOpenDayRefresh -= OnServerOpenDayRefresh;

            TreasureNewGotWin.CloseTreasureNewGotWinEvent -= CloseTreasureNewGotWinEvent;

            NewBieCenter.Instance.guideCompletedEvent -= GuideCompletedEvent;

            packModel.RefreshItemCountAct -= RefreshItemCountAct;

            StageManager.Instance.onStageLoadFinish -= OnStageLoadFinish;

        }



        public void OnBeforePlayerDataInitialize()

@@ -200,6 +213,8 @@
            get; private set;

        }



        public int vipExperienceItemId { get; private set; }



        public int gotoVipLv { get; set; }



        private bool m_ChargeReset = true;

@@ -216,6 +231,8 @@
            m_VipExperienceDic = ConfigParse.GetDic<int, int>(cfg.Numerical1);

            cfg = Config.Instance.Get<FuncConfigConfig>("PayRMB");

            vipExpMoney = int.Parse(cfg.Numerical1);

            cfg = Config.Instance.Get<FuncConfigConfig>("VIPExperienceCard");

            vipExperienceItemId = int.Parse(cfg.Numerical1);

        }



        private void ParseVipGift()

@@ -521,8 +538,16 @@
            if (_experienceTime > 0)

            {

                TimeMgr.Instance.Register(TimeMgr.SyntonyType.VipExperirnceOverdue, _experienceTime);

                if (serverInited)

                {

                    popExperienceWindow = true;

                    CheckAutoPopExperienceWin();

                }

            }

            if (OnVipTimeEvent != null) OnVipTimeEvent();

            if (OnVipTimeEvent != null)

            {

                OnVipTimeEvent();

            }

        }



        public bool IsVipActive()

@@ -535,6 +560,66 @@
            int surplusTime = Mathf.Max(0, (int)(vipExperienceOverdue - TimeUtility.ServerNow).TotalSeconds);

            return surplusTime > 0;

        }



        #region 自动弹出Vip体验界面

        bool popExperienceWindow = false;

        public void CheckAutoPopExperienceWin()

        {

            if (!popExperienceWindow)

            {

                return;

            }

            if (!(StageManager.Instance.CurrentStage is DungeonStage))

            {

                return;

            }

            if (!WindowCenter.Instance.IsOpen<MainInterfaceWin>()

                || WindowCenter.Instance.ExitAnyFullScreenOrMaskWin()

                || NewBieCenter.Instance.inGuiding

                || WindowCenter.Instance.IsOpen<VipExperienceWin>())

            {

                return;

            }

            popExperienceWindow = false;

            WindowCenter.Instance.Open<VipExperienceWin>();

        }



        private void RefreshItemCountAct(PackType packType, int _index, int itemId)

        {

            if (serverInited && itemId == vipExperienceItemId)

            {

                CheckUseVipExperienceCard();

            }

        }



        private void CheckUseVipExperienceCard()

        {

            if (PlayerDatas.Instance.baseData.VIPLv > 0)

            {

                return;

            }

            if (IsVipExperience())

            {

                return;

            }

            var singlepack = packModel.GetSinglePackModel(PackType.rptItem);

            if (singlepack != null)

            {

                List<ItemModel> list = null;

                var count = singlepack.GetItemCountByID(vipExperienceItemId, out list);

                if (count > 0 && list != null && list.Count > 0)

                {

                    var itemModel = list[0];

                    CA323_tagCMUseItems pak = new CA323_tagCMUseItems();

                    pak.ItemIndex = (byte)itemModel.itemInfo.ItemPlace;

                    pak.UseCnt = 1;

                    pak.ExData = 0;

                    GameNetSystem.Instance.SendInfo(pak);

                }

            }

        }

        #endregion



        #region 打开Vip界面

        public void OpenVipPayUI(VipWinType type)

        {

@@ -620,6 +705,7 @@
            }

            return -1;

        }



        #region 充值

        public Dictionary<int, int> firstRechargeWeapon { get; private set; }

        public Dictionary<int, List<AwardItem>> m_RechargeGainItemDict { get; private set; }

@@ -778,10 +864,26 @@
        {

            if (_win is MainInterfaceWin)

            {

                if (!firstChargeRewardGet)

                if (!firstChargeRewardGet || popExperienceWindow)

                {

                    SnxxzGame.Instance.StartCoroutine(Co_Load());

                }

            }

        }



        private void OnStageLoadFinish()

        {

            if (!(StageManager.Instance.CurrentStage is DungeonStage))

            {

                popExperienceWindow = false;

            }

        }



        private void GuideCompletedEvent(int _id)

        {

            if (popExperienceWindow)

            {

                SnxxzGame.Instance.StartCoroutine(Co_CheckPopExperienceWin());

            }

        }



@@ -815,7 +917,23 @@
        IEnumerator Co_Load()

        {

            yield return WaitingForSecondConst.WaitMS500;

            CheckOpenFirstRechargeWin();

            if (!firstChargeRewardGet)

            {

                CheckOpenFirstRechargeWin();

            }

            if (popExperienceWindow)

            {

                CheckAutoPopExperienceWin();

            }

        }



        IEnumerator Co_CheckPopExperienceWin()

        {

            yield return WaitingForSecondConst.WaitMS500;

            if (popExperienceWindow)

            {

                CheckAutoPopExperienceWin();

            }

        }



        private void CheckOpenFirstRechargeWin()

@@ -1014,6 +1132,7 @@
                ResetGiftRedpoint = true;

            }

            UpdateGiftRedpoint();

            CheckUseVipExperienceCard();

        }

        #endregion

    }