3335 物品相关类型重构

client_Wu Xijin

2019-02-25 9a8583c696c85286956048e4955e4314e46202a2

3335 物品相关类型重构

 Core/GameEngine/Model/Player/PlayerDatas.cs

@@ -24,8 +24,8 @@
    PlayerSkillDatas m_Skill = new PlayerSkillDatas();

    public PlayerSkillDatas skill { get { return m_Skill; } }



    PlayerStrengthengDatas m_StrengthengModel;

    PlayerStrengthengDatas strengthengmodel { get { return m_StrengthengModel ?? (m_StrengthengModel = ModelCenter.Instance.GetModel<PlayerStrengthengDatas>()); } }

    StrengthenModel m_StrengthengModel;

    StrengthenModel strengthengmodel { get { return m_StrengthengModel ?? (m_StrengthengModel = ModelCenter.Instance.GetModel<StrengthenModel>()); } }



    PlayerMethodData M_Method;

    PlayerMethodData method { get { return M_Method ?? (M_Method = ModelCenter.Instance.GetModel<PlayerMethodData>()); } }


 Core/NetworkPackage/DTCFile/ServerPack/H03_MainCharacter/DTC0310_tagRoleSkillChange.cs

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


    TreasureModel m_Model;

    TreasureModel model { get { return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<TreasureModel>()); } }

    PlayerMountDatas m_HorseModel;

    PlayerMountDatas horsemodel

    MountModel m_HorseModel;

    MountModel horsemodel

    {

        get

        {

            return m_HorseModel ?? (m_HorseModel = ModelCenter.Instance.GetModel<PlayerMountDatas>());

            return m_HorseModel ?? (m_HorseModel = ModelCenter.Instance.GetModel<MountModel>());

        }

    }

    PlayerMainDate m_MainModel;


 Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0428_tagPlayerRideHorse.cs

@@ -8,12 +8,12 @@

public class DTC0428_tagPlayerRideHorse : DtcBasic
{
    PlayerMountDatas m_HorseModel;
    PlayerMountDatas horsemodel
    MountModel m_HorseModel;
    MountModel horsemodel
    {
        get
        {
            return m_HorseModel ?? (m_HorseModel = ModelCenter.Instance.GetModel<PlayerMountDatas>());
            return m_HorseModel ?? (m_HorseModel = ModelCenter.Instance.GetModel<MountModel>());
        }
    }
    private bool _horseRid
@@ -58,7 +58,7 @@
            }
        }

        if (string.IsNullOrEmpty(ModelCenter.Instance.GetModel<PlayerMountDatas>()._HorseIDNow) == false
        if (string.IsNullOrEmpty(ModelCenter.Instance.GetModel<MountModel>()._HorseIDNow) == false
         && FuncOpen.Instance.IsFuncOpen(8))
        {
            C0309_tagCRideHorse _tag0309 = new C0309_tagCRideHorse();

 Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0433_tagDownHorse.cs

@@ -8,12 +8,12 @@


public class DTC0433_tagDownHorse : DtcBasic {



    PlayerMountDatas m_HorseModel;

    PlayerMountDatas horsemodel

    MountModel m_HorseModel;

    MountModel horsemodel

    {

        get

        {

            return m_HorseModel ?? (m_HorseModel = ModelCenter.Instance.GetModel<PlayerMountDatas>());

            return m_HorseModel ?? (m_HorseModel = ModelCenter.Instance.GetModel<MountModel>());

        }

    }

    public override void Done(GameNetPackBasic vNetPack) {



 Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0605_tagObjAddBuff.cs

@@ -9,12 +9,12 @@
public class DTC0605_tagObjAddBuff : DtcBasic
{

    PlayerBuffDatas m_BuffModel;
    PlayerBuffDatas model
    BuffModel m_BuffModel;
    BuffModel model
    {
        get
        {
            return m_BuffModel ?? (m_BuffModel = ModelCenter.Instance.GetModel<PlayerBuffDatas>());
            return m_BuffModel ?? (m_BuffModel = ModelCenter.Instance.GetModel<BuffModel>());
        }
    }
    public override void Done(GameNetPackBasic vNetPack)

 Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0606_tagObjDelBuff.cs

@@ -4,12 +4,12 @@

public class DTC0606_tagObjDelBuff : DtcBasic
{
    PlayerBuffDatas m_BuffModel;
    PlayerBuffDatas model
    BuffModel m_BuffModel;
    BuffModel model
    {
        get
        {
            return m_BuffModel ?? (m_BuffModel = ModelCenter.Instance.GetModel<PlayerBuffDatas>());
            return m_BuffModel ?? (m_BuffModel = ModelCenter.Instance.GetModel<BuffModel>());
        }
    }
    public override void Done(GameNetPackBasic vNetPack)

 Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0612_tagClearObjBuff.cs

@@ -9,12 +9,12 @@
public class DTC0612_tagClearObjBuff : DtcBasic

{



    PlayerBuffDatas m_BuffModel;

    PlayerBuffDatas model

    BuffModel m_BuffModel;

    BuffModel model

    {

        get

        {

            return m_BuffModel ?? (m_BuffModel = ModelCenter.Instance.GetModel<PlayerBuffDatas>());

            return m_BuffModel ?? (m_BuffModel = ModelCenter.Instance.GetModel<BuffModel>());

        }

    }

    public override void Done(GameNetPackBasic vNetPack)


 Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0617_tagObjAddBuffPack.cs

@@ -6,12 +6,12 @@
public class DTC0617_tagObjAddBuffPack : DtcBasic
{

    PlayerBuffDatas m_BuffModel;
    PlayerBuffDatas model
    BuffModel m_BuffModel;
    BuffModel model
    {
        get
        {
            return m_BuffModel ?? (m_BuffModel = ModelCenter.Instance.GetModel<PlayerBuffDatas>());
            return m_BuffModel ?? (m_BuffModel = ModelCenter.Instance.GetModel<BuffModel>());
        }
    }


 Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA301_tagTrainHorseData.cs

@@ -8,12 +8,12 @@


public class DTCA301_tagTrainHorseData : DtcBasic {



    PlayerMountDatas m_HorseModel;

    PlayerMountDatas horsemodel

    MountModel m_HorseModel;

    MountModel horsemodel

    {

        get

        {

            return m_HorseModel ?? (m_HorseModel = ModelCenter.Instance.GetModel<PlayerMountDatas>());

            return m_HorseModel ?? (m_HorseModel = ModelCenter.Instance.GetModel<MountModel>());

        }

    }

    public override void Done(GameNetPackBasic vNetPack)


 Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA339_tagMCAttrFruitEatCntList.cs

@@ -7,20 +7,20 @@


public class DTCA339_tagMCAttrFruitEatCntList : DtcBasic {
    PlayerPetDatas m_petModel;
    PlayerPetDatas petmodel
    PetModel m_petModel;
    PetModel petmodel
    {
        get
        {
            return m_petModel ?? (m_petModel = ModelCenter.Instance.GetModel<PlayerPetDatas>());
            return m_petModel ?? (m_petModel = ModelCenter.Instance.GetModel<PetModel>());
        }
    }
    PlayerMountDatas m_HorseModel;
    PlayerMountDatas horsemodel
    MountModel m_HorseModel;
    MountModel horsemodel
    {
        get
        {
            return m_HorseModel ?? (m_HorseModel = ModelCenter.Instance.GetModel<PlayerMountDatas>());
            return m_HorseModel ?? (m_HorseModel = ModelCenter.Instance.GetModel<MountModel>());
        }
    }


 Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA3B3_tagMCEquipPartStarLVInfo.cs

@@ -8,8 +8,8 @@


public class DTCA3B3_tagMCEquipPartStarLVInfo : DtcBasic {



    PlayerStrengthengDatas m_StrengthengModel;

    PlayerStrengthengDatas strengthengmodel { get { return m_StrengthengModel ?? (m_StrengthengModel = ModelCenter.Instance.GetModel<PlayerStrengthengDatas>()); } }

    StrengthenModel m_StrengthengModel;

    StrengthenModel strengthengmodel { get { return m_StrengthengModel ?? (m_StrengthengModel = ModelCenter.Instance.GetModel<StrengthenModel>()); } }

   

    public override void Done(GameNetPackBasic vNetPack) {


      


 Fight/Actor/Skill/AttackHandler.cs

@@ -953,7 +953,7 @@
        // 4511 buff中攻击造成坐骑攻击属性XX%的额外伤害

        if (StatusMgr.Instance.TryGetSkillEffectValue(attacker.ServerInstID, 4511, out _effectValue))

        {

            PlayerMountDatas _mountData = Snxxz.UI.ModelCenter.Instance.GetModel<PlayerMountDatas>();

            MountModel _mountData = Snxxz.UI.ModelCenter.Instance.GetModel<MountModel>();

            int _allMountAtk = _mountData.GetAllMountAttack();

            _allMountAtk = (int)(_effectValue.value1 * Constants.F_DELTA * _allMountAtk);

            _aFinalHurt += _allMountAtk;


 Fight/Stage/StageLoad.cs

@@ -386,7 +386,7 @@
            itemModel = equipModel.GetItemByIndex((int)RoleEquipType.mount);
            if (itemModel != null)
            {
                var mountModel = ModelCenter.Instance.GetModel<PlayerMountDatas>();
                var mountModel = ModelCenter.Instance.GetModel<MountModel>();
                if (mountModel.HorseRidingBool)
                {
                    hero.OnHorse(1);

 Lua/Gen/DelegatesGensBridge.cs

@@ -958,7 +958,7 @@
#endif
        }
        
        public PlayerBuffDatas __Gen_Delegate_Imp42(object p0)
        public BuffModel __Gen_Delegate_Imp42(object p0)
        {
#if THREAD_SAFE || HOTFIX_ENABLE
            lock (luaEnv.luaEnvLock)
@@ -972,7 +972,7 @@
                PCall(L, 1, 1, errFunc);
                
                
                PlayerBuffDatas __gen_ret = (PlayerBuffDatas)translator.GetObject(L, errFunc + 1, typeof(PlayerBuffDatas));
                BuffModel __gen_ret = (BuffModel)translator.GetObject(L, errFunc + 1, typeof(BuffModel));
                LuaAPI.lua_settop(L, errFunc - 1);
                return  __gen_ret;
#if THREAD_SAFE || HOTFIX_ENABLE

 System/BlastFurnace/BlastFurnaceModel.cs

@@ -39,8 +39,8 @@
        get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PackModel>()); }

    }

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

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

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

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

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



    public override void Init()

    {

@@ -91,8 +91,8 @@
        playerPack.refreshItemSumUseCountEvent -= RefreshItemUsce;

        WindowCenter.Instance.windowAfterCloseEvent -= StoveUpgradAfterClose;

        PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= RefreshRealm;

        PlayerPetDatas.Event_H0704Add -= AddPetEvent;

        PlayerMountDatas.Event_MountHA301A -= AddMountEvent;

        PetModel.Event_H0704Add -= AddPetEvent;

        MountModel.Event_MountHA301A -= AddMountEvent;



    }



@@ -112,8 +112,8 @@
        WindowCenter.Instance.windowAfterCloseEvent += StoveUpgradAfterClose;

        playerPack.itemCntReduceEvent += RefreshDanReduce;

        PlayerDatas.Instance.PlayerDataRefreshInfoEvent += RefreshRealm;

        PlayerPetDatas.Event_H0704Add += AddPetEvent;

        PlayerMountDatas.Event_MountHA301A += AddMountEvent;

        PetModel.Event_H0704Add += AddPetEvent;

        MountModel.Event_MountHA301A += AddMountEvent;



    }



@@ -768,7 +768,7 @@
                if (tipsModel.unlockPetDict.ContainsKey(idlist[i]))

                {

                    PetInfoConfig petInfo = tipsModel.unlockPetDict[idlist[i]];

                    var petmodel = ModelCenter.Instance.GetModel<PlayerPetDatas>();

                    var petmodel = ModelCenter.Instance.GetModel<PetModel>();

                    if (!petmodel._DicPetBack.ContainsKey(petInfo.ID))

                    {

                        return false;

@@ -778,7 +778,7 @@
                if (tipsModel.unlockMountDict.ContainsKey(idlist[i]))

                {

                    HorseConfig horseConfig = tipsModel.unlockMountDict[idlist[i]];

                    var mountModel = ModelCenter.Instance.GetModel<PlayerMountDatas>();

                    var mountModel = ModelCenter.Instance.GetModel<MountModel>();

                    if (!mountModel._DicHorse.ContainsKey(horseConfig.HorseID))

                    {

                        return false;


 System/BlastFurnace/GetPetMatPathWin.cs

@@ -67,8 +67,8 @@
        Dictionary<int, List<int>> mountSkillDict;

        private List<GameObject> tempObjlist = new List<GameObject>();

        PetMatType matType = PetMatType.None;

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

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

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

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



        protected override void BindController()

        {


 System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs

@@ -453,7 +453,7 @@
        }



        Clock clientMatchClock;

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

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

        /// <summary>

        ///0-取消匹配; 1-进行匹配

        /// </summary>


 System/CrossServerOneVsOne/CrossServerSettlementWin.cs

@@ -49,8 +49,8 @@
        #region Built-in
        CrossServerOneVsOneModel crossServerModel { get { return ModelCenter.Instance.GetModel<CrossServerOneVsOneModel>(); } }

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

        PlayerBuffDatas m_BuffModel;

        PlayerBuffDatas Buffmodel { get { return m_BuffModel ?? (m_BuffModel = ModelCenter.Instance.GetModel<PlayerBuffDatas>()); } }

        BuffModel m_BuffModel;

        BuffModel Buffmodel { get { return m_BuffModel ?? (m_BuffModel = ModelCenter.Instance.GetModel<BuffModel>()); } }

        float timer = 0f;

        private int WinSorce = 0;

        private int FailureSorce = 0;


 System/CrossServerOneVsOne/FightingPKWin.cs

@@ -38,8 +38,8 @@
        private List<int> _OpponentBuffSortList = new List<int>();//对手buff列表

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

        DateTime dungeonEndTime;

        PlayerBuffDatas m_BuffModel;

        PlayerBuffDatas Buffmodel { get { return m_BuffModel ?? (m_BuffModel = ModelCenter.Instance.GetModel<PlayerBuffDatas>()); } }

        BuffModel m_BuffModel;

        BuffModel Buffmodel { get { return m_BuffModel ?? (m_BuffModel = ModelCenter.Instance.GetModel<BuffModel>()); } }



        private int positionType = 1;
        #region Built-in
@@ -101,9 +101,9 @@
            HeroBehaviour.OnStartHandupAI += OnHeroHandupAIStarted;

            dungeonModel.dungeonCoolDownEvent += DungeonCoolDownEvent;
            dungeonModel.updateMissionEvent += UpdateMissionEvent;

            PlayerBuffDatas.Even_ObjAddBuf += AddBuff;

            PlayerBuffDatas.Even_ObjDelBuff += DelBuff;
            PlayerBuffDatas.BuffUpdateEvent += BuffUpdateEvent;
            BuffModel.Even_ObjAddBuf += AddBuff;

            BuffModel.Even_ObjDelBuff += DelBuff;
            BuffModel.BuffUpdateEvent += BuffUpdateEvent;
            OpponentInformation.Instance.ShieldUpdate += ShieldUpdate;
        }



@@ -121,9 +121,9 @@
            HeroBehaviour.OnStartHandupAI -= OnHeroHandupAIStarted;

            dungeonModel.dungeonCoolDownEvent -= DungeonCoolDownEvent;

            dungeonModel.updateMissionEvent -= UpdateMissionEvent;

            PlayerBuffDatas.Even_ObjAddBuf -= AddBuff;

            PlayerBuffDatas.Even_ObjDelBuff -= DelBuff;

            PlayerBuffDatas.BuffUpdateEvent -= BuffUpdateEvent;

            BuffModel.Even_ObjAddBuf -= AddBuff;

            BuffModel.Even_ObjDelBuff -= DelBuff;

            BuffModel.BuffUpdateEvent -= BuffUpdateEvent;

            OpponentInformation.Instance.ShieldUpdate -= ShieldUpdate;
        }




 System/Dungeon/DungeonFairyLandWin.cs

@@ -31,12 +31,12 @@
                return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<DungeonModel>());

            }

        }

        PlayerBuffDatas m_BuffModel;

        PlayerBuffDatas Buffmodel

        BuffModel m_BuffModel;

        BuffModel Buffmodel

        {

            get

            {

                return m_BuffModel ?? (m_BuffModel = ModelCenter.Instance.GetModel<PlayerBuffDatas>());

                return m_BuffModel ?? (m_BuffModel = ModelCenter.Instance.GetModel<BuffModel>());

            }

        }

        DungeonLiquidModel m_DungeonLiquidModel;

@@ -79,8 +79,8 @@
            UpdateBuf();

            model.dungeonFairyLandChangeEvent += StageChangeEvent;

            model.dungeonInspireLvEvent += DungeonEncourageEvent;

            PlayerBuffDatas.Even_ObjAddBuf += AddBuff;

            PlayerBuffDatas.Even_ObjDelBuff += DeleteBuff;

            BuffModel.Even_ObjAddBuf += AddBuff;

            BuffModel.Even_ObjDelBuff += DeleteBuff;

            teamModel.myTeamRefreshEvent += MyTeamRefreshEvent;

        }



@@ -116,8 +116,8 @@
        {

            model.dungeonFairyLandChangeEvent -= StageChangeEvent;

            model.dungeonInspireLvEvent -= DungeonEncourageEvent;

            PlayerBuffDatas.Even_ObjAddBuf -= AddBuff;

            PlayerBuffDatas.Even_ObjDelBuff -= DeleteBuff;

            BuffModel.Even_ObjAddBuf -= AddBuff;

            BuffModel.Even_ObjDelBuff -= DeleteBuff;

            teamModel.myTeamRefreshEvent -= MyTeamRefreshEvent;

        }




 System/Dungeon/DungeonLiquidBehaviour.cs

@@ -30,12 +30,12 @@
            }

        }



        PlayerBuffDatas m_BuffModel;

        PlayerBuffDatas Buffmodel

        BuffModel m_BuffModel;

        BuffModel Buffmodel

        {

            get

            {

                return m_BuffModel ?? (m_BuffModel = ModelCenter.Instance.GetModel<PlayerBuffDatas>());

                return m_BuffModel ?? (m_BuffModel = ModelCenter.Instance.GetModel<BuffModel>());

            }

        }



@@ -49,8 +49,8 @@
        private void OnEnable()

        {

            ResetTween();

            PlayerBuffDatas.Even_ObjAddBuf += UpdateBuf;

            PlayerBuffDatas.Even_ObjDelBuff += UpdateBuf;

            BuffModel.Even_ObjAddBuf += UpdateBuf;

            BuffModel.Even_ObjDelBuff += UpdateBuf;

            UpdateBuf();

        }



@@ -91,8 +91,8 @@


        private void OnDisable()

        {

            PlayerBuffDatas.Even_ObjAddBuf -= UpdateBuf;

            PlayerBuffDatas.Even_ObjDelBuff -= UpdateBuf;

            BuffModel.Even_ObjAddBuf -= UpdateBuf;

            BuffModel.Even_ObjDelBuff -= UpdateBuf;

        }



        private void UpdateBuf()


 System/Dungeon/DungeonLiquidCell.cs

@@ -31,12 +31,12 @@
        }

    }



    PlayerBuffDatas m_BuffModel;

    PlayerBuffDatas Buffmodel

    BuffModel m_BuffModel;

    BuffModel Buffmodel

    {

        get

        {

            return m_BuffModel ?? (m_BuffModel = ModelCenter.Instance.GetModel<PlayerBuffDatas>());

            return m_BuffModel ?? (m_BuffModel = ModelCenter.Instance.GetModel<BuffModel>());

        }

    }




 System/Dungeon/DungeonUseLiquidWin.cs

@@ -30,10 +30,10 @@
            }

        }



        PlayerBuffDatas m_BuffModel;

        PlayerBuffDatas Buffmodel {

        BuffModel m_BuffModel;

        BuffModel Buffmodel {

            get {

                return m_BuffModel ?? (m_BuffModel = ModelCenter.Instance.GetModel<PlayerBuffDatas>());

                return m_BuffModel ?? (m_BuffModel = ModelCenter.Instance.GetModel<BuffModel>());

            }

        }



@@ -59,8 +59,8 @@
        {

            OnRefershLiquid();

            playerPack.refreshItemCountEvent += OnRefreshItem;

            PlayerBuffDatas.Even_ObjAddBuf += UpdateBuf;

            PlayerBuffDatas.Even_ObjDelBuff += UpdateBuf;

            BuffModel.Even_ObjAddBuf += UpdateBuf;

            BuffModel.Even_ObjDelBuff += UpdateBuf;

            UpdateBuf();

        }



@@ -72,8 +72,8 @@
        protected override void OnPreClose()

        {

            playerPack.refreshItemCountEvent -= OnRefreshItem;

            PlayerBuffDatas.Even_ObjAddBuf -= UpdateBuf;

            PlayerBuffDatas.Even_ObjDelBuff -= UpdateBuf;

            BuffModel.Even_ObjAddBuf -= UpdateBuf;

            BuffModel.Even_ObjDelBuff -= UpdateBuf;

        }



        protected override void OnAfterClose()


 System/FairyAu/FairyGrabBossBuffTip.cs

@@ -18,24 +18,24 @@
            get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); }

        }



        PlayerBuffDatas buffModel

        BuffModel buffModel

        {

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

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

        }



        public void Init()

        {

            PlayerBuffDatas.Even_ObjAddBuf -= AddBuff;

            PlayerBuffDatas.Even_ObjDelBuff -= DeleteBuff;

            BuffModel.Even_ObjAddBuf -= AddBuff;

            BuffModel.Even_ObjDelBuff -= DeleteBuff;



            PlayerBuffDatas.Even_ObjAddBuf += AddBuff;

            PlayerBuffDatas.Even_ObjDelBuff += DeleteBuff;

            BuffModel.Even_ObjAddBuf += AddBuff;

            BuffModel.Even_ObjDelBuff += DeleteBuff;

        }



        public void UnInit()

        {

            PlayerBuffDatas.Even_ObjAddBuf -= AddBuff;

            PlayerBuffDatas.Even_ObjDelBuff -= DeleteBuff;

            BuffModel.Even_ObjAddBuf -= AddBuff;

            BuffModel.Even_ObjDelBuff -= DeleteBuff;

        }



        public void Display(int _npcId)


 System/KnapSack/Logic/ItemLogicUtility.cs

@@ -25,10 +25,10 @@

        PackModel playerPack { get { return ModelCenter.Instance.GetModel<PackModel>(); } }
        ItemTipsModel itemTipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }
        PlayerBuffDatas buffDatas { get { return ModelCenter.Instance.GetModel<PlayerBuffDatas>(); } }
        PlayerMountDatas mountDatas { get { return ModelCenter.Instance.GetModel<PlayerMountDatas>(); } }
        PlayerPetDatas petDatas { get { return ModelCenter.Instance.GetModel<PlayerPetDatas>(); } }
        PlayerStrengthengDatas strengthDatas { get { return ModelCenter.Instance.GetModel<PlayerStrengthengDatas>(); } }
        BuffModel buffDatas { get { return ModelCenter.Instance.GetModel<BuffModel>(); } }
        MountModel mountDatas { get { return ModelCenter.Instance.GetModel<MountModel>(); } }
        PetModel petDatas { get { return ModelCenter.Instance.GetModel<PetModel>(); } }
        StrengthenModel strengthDatas { get { return ModelCenter.Instance.GetModel<StrengthenModel>(); } }
        MagicianModel magicianModel { get { return ModelCenter.Instance.GetModel<MagicianModel>(); } }
        TrialDungeonModel trialModel { get { return ModelCenter.Instance.GetModel<TrialDungeonModel>(); } }
        ComposeWinModel composeModel { get { return ModelCenter.Instance.GetModel<ComposeWinModel>(); } }

 System/KnapSack/Logic/ItemOperateUtility.cs

@@ -11,9 +11,9 @@
    {
        PackModel playerPack { get { return ModelCenter.Instance.GetModel<PackModel>(); } }
        ItemTipsModel itemTipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }
        PlayerStrengthengDatas strengthModel { get { return ModelCenter.Instance.GetModel<PlayerStrengthengDatas>(); } }
        StrengthenModel strengthModel { get { return ModelCenter.Instance.GetModel<StrengthenModel>(); } }
        EquipWashModel equipWashModel { get { return ModelCenter.Instance.GetModel<EquipWashModel>(); } }
        PlayerBuffDatas Buffmodel { get { return ModelCenter.Instance.GetModel<PlayerBuffDatas>(); } }
        BuffModel Buffmodel { get { return ModelCenter.Instance.GetModel<BuffModel>(); } }
        ItemOverdueModel itemOverdue { get { return ModelCenter.Instance.GetModel<ItemOverdueModel>(); } }
        FairyModel fairyModel { get { return ModelCenter.Instance.GetModel<FairyModel>(); } }
        BoxGetItemModel BoxModel { get { return ModelCenter.Instance.GetModel<BoxGetItemModel>(); } }

 System/KnapSack/Logic/ItemTipsModel.cs

@@ -777,8 +777,8 @@
        {

            if (attrData == null) return;



            var horseModel = ModelCenter.Instance.GetModel<PlayerMountDatas>();

            var petmodel = ModelCenter.Instance.GetModel<PlayerPetDatas>();

            var horseModel = ModelCenter.Instance.GetModel<MountModel>();

            var petmodel = ModelCenter.Instance.GetModel<PetModel>();

            bool isOverdue = ItemLogicUtility.Instance.IsOverdue(attrData.guid, attrData.itemId, attrData.useDataDict);

            HorseConfig horseConfig = null;

            PetInfoConfig petInfo = null;

@@ -2105,8 +2105,8 @@
        #endregion



        #region 物品增加战斗力

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

        public PlayerStrengthengDatas strengthengmodel { get { return ModelCenter.Instance.GetModel<PlayerStrengthengDatas>(); } }

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

        public StrengthenModel strengthengmodel { get { return ModelCenter.Instance.GetModel<StrengthenModel>(); } }



        public bool TryGetFightPowerByItemId(int itemId, out int fightPower)

        {

@@ -2632,7 +2632,7 @@


        public bool isHavePutLimit { get; private set; }



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

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

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

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

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


 System/KnapSack/Logic/PackModel.cs

@@ -1190,7 +1190,7 @@
            List<string> strenlist = ItemPlusSumAttrConfig.GetKeys();
            if (strenlist == null || strenlist.Count < 1) return false;
            int playerSumSTR = 0;
            Dictionary<int, EquipmentInitialization> strenInfoDict = ModelCenter.Instance.GetModel<PlayerStrengthengDatas>()._EqInfo;
            Dictionary<int, EquipmentInitialization> strenInfoDict = ModelCenter.Instance.GetModel<StrengthenModel>()._EqInfo;
            foreach (var value in strenInfoDict.Values)
            {
                ItemModel itemModel = GetItemByIndex(PackType.Equip, value.EquipIndex);

 System/KnapSack/Logic/PetMatInfoWin.cs

@@ -36,8 +36,8 @@
        [SerializeField] CanvasGroup tipAlpha;



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

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

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

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

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



        Dictionary<int, int> petSkillDict;

        Dictionary<int, List<int>> mountSkillDict;


 System/KnapSack/Logic/PlayerStrengtheningLVWin.cs

@@ -33,12 +33,12 @@
        private ItemPlusSumAttrConfig nextActiveSTRConfig = null;

        private int nextActiveCnt = 0;



        PlayerStrengthengDatas m_StrengthengModel;

        PlayerStrengthengDatas strengthengmodel

        StrengthenModel m_StrengthengModel;

        StrengthenModel strengthengmodel

        {

            get

            {

                return m_StrengthengModel ?? (m_StrengthengModel = ModelCenter.Instance.GetModel<PlayerStrengthengDatas>());

                return m_StrengthengModel ?? (m_StrengthengModel = ModelCenter.Instance.GetModel<StrengthenModel>());

            }

        }




 System/KnapSack/Logic/WashPointBatchUseWin.cs

@@ -31,12 +31,12 @@
            get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PackModel>()); }
        }

        PlayerBuffDatas _buffModel;
        PlayerBuffDatas Buffmodel
        BuffModel _buffModel;
        BuffModel Buffmodel
        {
            get
            {
                return _buffModel ?? (_buffModel = ModelCenter.Instance.GetModel<PlayerBuffDatas>());
                return _buffModel ?? (_buffModel = ModelCenter.Instance.GetModel<BuffModel>());
            }
        }


 System/KnapSack/New/BatchBuyWin.cs

@@ -41,12 +41,12 @@
            get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PackModel>()); }

        }



        PlayerBuffDatas _buffModel;

        PlayerBuffDatas Buffmodel

        BuffModel _buffModel;

        BuffModel Buffmodel

        {

            get

            {

                return _buffModel ?? (_buffModel = ModelCenter.Instance.GetModel<PlayerBuffDatas>());

                return _buffModel ?? (_buffModel = ModelCenter.Instance.GetModel<BuffModel>());

            }

        }




 System/KnapSack/New/BatchWin.cs

@@ -28,7 +28,7 @@


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

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

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

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



        private ItemModel itemModel;

        #region Built-in


 System/KnapSack/New/RoleEquipStrengthTips.cs

@@ -41,12 +41,12 @@
        _noOpenText = transform.Find("CurrentStrength/NoOpenText").GetComponent<Text>();

       

    }

    PlayerStrengthengDatas m_StrengthengModel;

    PlayerStrengthengDatas strengthengmodel

    StrengthenModel m_StrengthengModel;

    StrengthenModel strengthengmodel

    {

        get

        {

            return m_StrengthengModel ?? (m_StrengthengModel = ModelCenter.Instance.GetModel<PlayerStrengthengDatas>());

            return m_StrengthengModel ?? (m_StrengthengModel = ModelCenter.Instance.GetModel<StrengthenModel>());

        }

    }

    private void OnEnable()


 System/MainInterfacePanel/BuffListWin.cs

@@ -23,12 +23,12 @@
        private ScrollRect _ScrollRect;

        private Dictionary<int, ObjBuff> objBuffic;

        private List<int> _SortList = new List<int>();//排序列表

        PlayerBuffDatas m_BuffModel;

        PlayerBuffDatas Buffmodel

        BuffModel m_BuffModel;

        BuffModel Buffmodel

        {

            get

            {

                return m_BuffModel ?? (m_BuffModel = ModelCenter.Instance.GetModel<PlayerBuffDatas>());

                return m_BuffModel ?? (m_BuffModel = ModelCenter.Instance.GetModel<BuffModel>());

            }

        }

        #region Built-in

@@ -45,8 +45,8 @@
        {

            objBuffic = Buffmodel._BuffDic;

            m_ScrollerController.OnRefreshCell += OnRefreshGridCell;

            PlayerBuffDatas.Even_ObjAddBuf += AddBuff;

            PlayerBuffDatas.Even_ObjDelBuff += DelBuff;

            BuffModel.Even_ObjAddBuf += AddBuff;

            BuffModel.Even_ObjDelBuff += DelBuff;

            BuffScheduling();

            UpdateControllerPosition();

            OnCreateGridLineCell(m_ScrollerController);

@@ -63,8 +63,8 @@
        protected override void OnAfterClose()

        {

            m_ScrollerController.OnRefreshCell -= OnRefreshGridCell;

            PlayerBuffDatas.Even_ObjAddBuf -= AddBuff;

            PlayerBuffDatas.Even_ObjDelBuff -= DelBuff;

            BuffModel.Even_ObjAddBuf -= AddBuff;

            BuffModel.Even_ObjDelBuff -= DelBuff;

        }

        #endregion




 System/MainInterfacePanel/CombatModeWin.cs

@@ -28,8 +28,8 @@
        private int _PkType = 0;
        private int[] AtkTypeList;
        #region Built-in
        PlayerBuffDatas m_BuffModel;
        PlayerBuffDatas Buffmodel { get { return m_BuffModel ?? (m_BuffModel = ModelCenter.Instance.GetModel<PlayerBuffDatas>()); } }
        BuffModel m_BuffModel;
        BuffModel Buffmodel { get { return m_BuffModel ?? (m_BuffModel = ModelCenter.Instance.GetModel<BuffModel>()); } }
        PKModel m_PKModel;
        PKModel pKModel { get { return m_PKModel ?? (m_PKModel = ModelCenter.Instance.GetModel<PKModel>()); } }

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


 System/MainInterfacePanel/HeadPortraitTip.cs

@@ -52,8 +52,8 @@
        private float loadingtime = 0f;//默认时间

        VipModel m_VipModel;

        VipModel vipModel { get { return m_VipModel ?? (m_VipModel = ModelCenter.Instance.GetModel<VipModel>()); } }

        PlayerBuffDatas m_BuffModel;

        PlayerBuffDatas Buffmodel { get { return m_BuffModel ?? (m_BuffModel = ModelCenter.Instance.GetModel<PlayerBuffDatas>()); } }

        BuffModel m_BuffModel;

        BuffModel Buffmodel { get { return m_BuffModel ?? (m_BuffModel = ModelCenter.Instance.GetModel<BuffModel>()); } }

        PKModel m_PKModel;

        PKModel pKModel { get { return m_PKModel ?? (m_PKModel = ModelCenter.Instance.GetModel<PKModel>()); } }

        PlayerMainDate m_MainModel;

@@ -79,8 +79,8 @@
            _TimeTxt.text = DateTime.Now.ToString("HH:mm");

            PlayerDatas.Instance.PlayerDataRefreshInfoEvent += Updatefighting;//数据的刷新(h0418)

            PlayerDatas.Instance.OnSwitchAttackMode += OnSwitchAttackMode;

            PlayerBuffDatas.Even_ObjAddBuf += BuffGameObject;

            PlayerBuffDatas.Even_ObjDelBuff += BuffGameObject;

            BuffModel.Even_ObjAddBuf += BuffGameObject;

            BuffModel.Even_ObjDelBuff += BuffGameObject;

            PlayerMainDate.ElectricQuantityEvent += OnElectricQuantity;

            OnNetworkState();

            PlayerMainDate.NetworkStateEvent += OnNetworkState;

@@ -110,8 +110,8 @@
        public void UnInit()

        {

            PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= Updatefighting;//数据的刷新(h0418)

            PlayerBuffDatas.Even_ObjAddBuf -= BuffGameObject;

            PlayerBuffDatas.Even_ObjDelBuff -= BuffGameObject;

            BuffModel.Even_ObjAddBuf -= BuffGameObject;

            BuffModel.Even_ObjDelBuff -= BuffGameObject;

            PlayerDatas.Instance.OnSwitchAttackMode -= OnSwitchAttackMode;

            PlayerMainDate.ElectricQuantityEvent -= OnElectricQuantity;

            PlayerMainDate.NetworkStateEvent -= OnNetworkState;


 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -64,10 +64,10 @@
        public static event Action IsOpenMaininterface;



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

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

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

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

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

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

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

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

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

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


 System/MainInterfacePanel/PKModel.cs

@@ -15,12 +15,12 @@
    [XLua.LuaCallCSharp]
    public class PKModel : Model,IBeforePlayerDataInitialize,IAfterPlayerDataInitialize
    {
        PlayerBuffDatas m_BuffModel;
        PlayerBuffDatas Buffmodel
        BuffModel m_BuffModel;
        BuffModel Buffmodel
        {
            get
            {
                return m_BuffModel ?? (m_BuffModel = ModelCenter.Instance.GetModel<PlayerBuffDatas>());
                return m_BuffModel ?? (m_BuffModel = ModelCenter.Instance.GetModel<BuffModel>());
            }
        }


 System/MainInterfacePanel/PlayerBuffDatas.cs

@@ -20,7 +20,7 @@
    public int SkillTypeID;

}



public class PlayerBuffDatas : Model, IBeforePlayerDataInitialize, IPlayerLoginOk

public class BuffModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk

{

    public int PkType = 0;//PK对象选择

    public delegate void OnObjAddBuff();


 System/MainInterfacePanel/PlayerMainDate.cs

@@ -24,8 +24,8 @@
    {

        get { return m_PlayerPackModel ?? (m_PlayerPackModel = ModelCenter.Instance.GetModel<PackModel>()); }

    }

    PlayerBuffDatas m_BuffModel;

    PlayerBuffDatas Buffmodel { get { return m_BuffModel ?? (m_BuffModel = ModelCenter.Instance.GetModel<PlayerBuffDatas>()); } }

    BuffModel m_BuffModel;

    BuffModel Buffmodel { get { return m_BuffModel ?? (m_BuffModel = ModelCenter.Instance.GetModel<BuffModel>()); } }

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

    //用于记录XP技能的信息

    public delegate void OnXpSkill();


 System/Message/RichTableEvent.cs

@@ -674,7 +674,7 @@
    public static int GetStrengthenType(int _id)

    {

        var _itemCfg = ItemConfig.Get(_id);

        var _type = ModelCenter.Instance.GetModel<PlayerStrengthengDatas>().GameDefineIndex(_itemCfg.EquipPlace);

        var _type = ModelCenter.Instance.GetModel<StrengthenModel>().GameDefineIndex(_itemCfg.EquipPlace);

        return _type;

    }




 System/Mount/AutoTrainTipsWin.cs

@@ -37,8 +37,8 @@
        private bool isBool = true;

        public static bool IsFairy = false;

        List<HorseSkillClass> MountSkills = new List<HorseSkillClass>();

        PlayerMountDatas m_MountModel;

        PlayerMountDatas mountModel { get { return m_MountModel ?? (m_MountModel = ModelCenter.Instance.GetModel<PlayerMountDatas>()); } }

        MountModel m_MountModel;

        MountModel mountModel { get { return m_MountModel ?? (m_MountModel = ModelCenter.Instance.GetModel<MountModel>()); } }

        protected override void BindController()

        {

            moutwin = WindowCenter.Instance.Get<MountWin>();


 System/Mount/MountModel.cs

File was renamed from System/Mount/PlayerMountDatas.cs
@@ -28,7 +28,7 @@
    public int HorseLV;//所需等级

}



public class PlayerMountDatas : Model, IBeforePlayerDataInitialize, IPlayerLoginOk

public class MountModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{

    public string _HorseIDNow = string.Empty;//获取当前的坐骑ID

    public int HorseIDNow = 0;


 System/Mount/MountModel.cs.meta

 System/Mount/MountPanelAssignment.cs

@@ -68,8 +68,8 @@
        [SerializeField] ScrollerController allPetSkillCtrl;//所有的技能



        private int mount_ID = 0;//用来标记坐骑的ID

        PlayerMountDatas m_MountModel;

        PlayerMountDatas mountModel { get { return m_MountModel ?? (m_MountModel = ModelCenter.Instance.GetModel<PlayerMountDatas>()); } }

        MountModel m_MountModel;

        MountModel mountModel { get { return m_MountModel ?? (m_MountModel = ModelCenter.Instance.GetModel<MountModel>()); } }

        GetItemPathModel _GetItemPath;

        GetItemPathModel GetItemPath { get { return _GetItemPath ?? (_GetItemPath = ModelCenter.Instance.GetModel<GetItemPathModel>()); } }



@@ -87,7 +87,7 @@
        private void OnEnable()

        {



            PlayerMountDatas.Event_MountHA301U += OnMountHA301Update;

            MountModel.Event_MountHA301U += OnMountHA301Update;

            allPetSkillCtrl.OnRefreshCell += RefreshAllMountSkillCell;

            FlySkillIconWin.FlySkillID += FlySkillID;

            CreateAllMountSkill();

@@ -95,7 +95,7 @@
        private void OnDisable()

        {

            mount_ID = 0;

            PlayerMountDatas.Event_MountHA301U -= OnMountHA301Update;

            MountModel.Event_MountHA301U -= OnMountHA301Update;

            allPetSkillCtrl.OnRefreshCell -= RefreshAllMountSkillCell;

            FlySkillIconWin.FlySkillID -= FlySkillID;

            m_MountRawImg.gameObject.SetActive(false);


 System/Mount/MountSkillWin.cs

@@ -52,8 +52,8 @@
        private Dictionary<int, int> _GetMountSkills;//坐骑获得的技能（技能的Type值和技能等级）
        private List<int> _MountList = new List<int>();//坐骑技能列表
        private Dictionary<int, HorseClass> _dicHorse;//已拥有是我坐骑字典
        PlayerMountDatas m_HorseModel;
        PlayerMountDatas horsemodel { get { return m_HorseModel ?? (m_HorseModel = ModelCenter.Instance.GetModel<PlayerMountDatas>()); } }
        MountModel m_HorseModel;
        MountModel horsemodel { get { return m_HorseModel ?? (m_HorseModel = ModelCenter.Instance.GetModel<MountModel>()); } }

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

 System/Mount/MountStoneTipsWin.cs

@@ -25,12 +25,12 @@
        private Dictionary<int, int> tag_Item = new Dictionary<int, int>();//坐骑魂石存

        Dictionary<string, ItemConfig> tagCIM = new Dictionary<string, ItemConfig>();

        private List<int> ListID = new List<int>();

        PlayerMountDatas m_HorseModel;

        PlayerMountDatas horsemodel

        MountModel m_HorseModel;

        MountModel horsemodel

        {

            get

            {

                return m_HorseModel ?? (m_HorseModel = ModelCenter.Instance.GetModel<PlayerMountDatas>());

                return m_HorseModel ?? (m_HorseModel = ModelCenter.Instance.GetModel<MountModel>());

            }

        }

        protected override void BindController()

@@ -58,7 +58,7 @@


        protected override void OnAfterOpen()

        {

            PlayerMountDatas.Event_MountHA339U += HA339;

            MountModel.Event_MountHA339U += HA339;

            roleParticularModel.PowerUpdate += PowerUpdate;

        }



@@ -70,7 +70,7 @@
        protected override void OnAfterClose()

        {

            m_ScrollerController.OnRefreshCell -= OnRefreshGridCell;

            PlayerMountDatas.Event_MountHA339U -= HA339;

            MountModel.Event_MountHA339U -= HA339;

            roleParticularModel.PowerUpdate -= PowerUpdate;

        }




 System/Mount/MountWin.cs

@@ -50,8 +50,8 @@
        GetItemPathModel GetItemPath { get { return _GetItemPath ?? (_GetItemPath = ModelCenter.Instance.GetModel<GetItemPathModel>()); } }

        PackModel _playerPack;

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

        PlayerMountDatas m_MountModel;

        PlayerMountDatas mountModel { get { return m_MountModel ?? (m_MountModel = ModelCenter.Instance.GetModel<PlayerMountDatas>()); } }

        MountModel m_MountModel;

        MountModel mountModel { get { return m_MountModel ?? (m_MountModel = ModelCenter.Instance.GetModel<MountModel>()); } }

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



        public static event Action RedPointMountDan;

@@ -78,10 +78,10 @@
        protected override void OnPreOpen()

        {

            mountModel.Wait = true;

            PlayerMountDatas.Event_MountAlteration += OnMountAlteration;

            PlayerMountDatas.Event_MountHA301U += OnMountUpdate;

            PlayerMountDatas.Event_MountHA301A += OnMountAdd;

            PlayerMountDatas.OnMountUieffectUpLv += OnMountUieffectUpLv;

            MountModel.Event_MountAlteration += OnMountAlteration;

            MountModel.Event_MountHA301U += OnMountUpdate;

            MountModel.Event_MountHA301A += OnMountAdd;

            MountModel.OnMountUieffectUpLv += OnMountUieffectUpLv;

            RidingAndPetActivationWin.FairyJadeDEvent += FairyJadeDEvent;

            FlySkillIconWin.FairyJadeDEvent += FairyJadeDEvent;

            m_ScrollerController.OnRefreshCell += OnRefreshGridCell;

@@ -103,11 +103,11 @@
        protected override void OnPreClose()

        {

            AchievementGoto.achievementType = 0;

            PlayerMountDatas.Event_MountAlteration -= OnMountAlteration;

            PlayerMountDatas.Event_MountHA301U -= OnMountUpdate;

            PlayerMountDatas.Event_MountHA301A -= OnMountAdd;

            MountModel.Event_MountAlteration -= OnMountAlteration;

            MountModel.Event_MountHA301U -= OnMountUpdate;

            MountModel.Event_MountHA301A -= OnMountAdd;

            m_ScrollerController.OnRefreshCell -= OnRefreshGridCell;

            PlayerMountDatas.OnMountUieffectUpLv -= OnMountUieffectUpLv;

            MountModel.OnMountUieffectUpLv -= OnMountUieffectUpLv;

            RidingAndPetActivationWin.FairyJadeDEvent -= FairyJadeDEvent;

            FlySkillIconWin.FairyJadeDEvent -= FairyJadeDEvent;

            OnClickStopDomesticateBtn();


 System/Pet/PetAttributeMethods.cs

@@ -79,8 +79,8 @@
        [SerializeField] UIEffect m_UIeffect2;//经验条特效

        private int typePetID = 0;

        private float timePlay = 0;//灵宠动作播放时间

        PlayerPetDatas m_petModel;

        PlayerPetDatas petmodel { get { return m_petModel ?? (m_petModel = ModelCenter.Instance.GetModel<PlayerPetDatas>()); } }

        PetModel m_petModel;

        PetModel petmodel { get { return m_petModel ?? (m_petModel = ModelCenter.Instance.GetModel<PetModel>()); } }

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

        PackModel _playerPack;

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

@@ -95,8 +95,8 @@
            isAutoTrain = false;

            breakLockBtn.AddListener(ClickBreakBtn);

            petAutoTrainBtn.AddListener(ClickPetAutoTrainBtn);

            PlayerPetDatas.Event_H0704Update += RefreshPetInfoUpdate;

            PlayerPetDatas.Event_H0704Add += RefreshPetInfo;

            PetModel.Event_H0704Update += RefreshPetInfoUpdate;

            PetModel.Event_H0704Add += RefreshPetInfo;

            petStoneBtn.AddListener(() => { WindowCenter.Instance.Open<PetStoneTipsWin>(); });

            curPetSkillCtrl.OnRefreshCell += RefreshCurPetSkillCell;

            allPetSkillCtrl.OnRefreshCell += RefreshAllPetSkillCell;

@@ -115,8 +115,8 @@
        {

            typePetID = 0;

            StopCoroutine("FrameDelay");

            PlayerPetDatas.Event_H0704Update -= RefreshPetInfoUpdate;

            PlayerPetDatas.Event_H0704Add -= RefreshPetInfo;

            PetModel.Event_H0704Update -= RefreshPetInfoUpdate;

            PetModel.Event_H0704Add -= RefreshPetInfo;

            curPetSkillCtrl.OnRefreshCell -= RefreshCurPetSkillCell;

            allPetSkillCtrl.OnRefreshCell -= RefreshAllPetSkillCell;

            FlySkillIconWin.FlySkillID -= FlySkillID;


 System/Pet/PetAttributeWin.cs

@@ -25,8 +25,8 @@
        List<PetInfoConfig> sortlist = new List<PetInfoConfig>();//灵兽顺序排列

        GetItemPathModel _GetItemPath;

        GetItemPathModel GetItemPath { get { return _GetItemPath ?? (_GetItemPath = ModelCenter.Instance.GetModel<GetItemPathModel>()); } }

        PlayerPetDatas m_petModel;

        PlayerPetDatas petmodel { get { return m_petModel ?? (m_petModel = ModelCenter.Instance.GetModel<PlayerPetDatas>()); } }

        PetModel m_petModel;

        PetModel petmodel { get { return m_petModel ?? (m_petModel = ModelCenter.Instance.GetModel<PetModel>()); } }



        PackModel _playerPack;

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

@@ -56,9 +56,9 @@
            ToAddSorting();

            isOpenFirst = true;

            petmodel.Wait = true;

            PlayerPetDatas.Event_H0704Add += AddPet;

            PlayerPetDatas.Event_H0704Update += PetUpdate;

            PlayerPetDatas.Event_SpiritPetPlay += OnSpiritPetPlay;

            PetModel.Event_H0704Add += AddPet;

            PetModel.Event_H0704Update += PetUpdate;

            PetModel.Event_SpiritPetPlay += OnSpiritPetPlay;

            m_ScrollerController.OnRefreshCell += OnRefreshGridCell;

            OptionIsSelected();//默认赋值

            OnCreateGridLineCell(m_ScrollerController);

@@ -81,10 +81,10 @@
        {

            StopCoroutine("IeWait");

            AchievementGoto.achievementType = 0;

            PlayerPetDatas.Event_H0704Add -= AddPet;

            PetModel.Event_H0704Add -= AddPet;

            m_ScrollerController.OnRefreshCell -= OnRefreshGridCell;

            PlayerPetDatas.Event_SpiritPetPlay -= OnSpiritPetPlay;

            PlayerPetDatas.Event_H0704Update -= PetUpdate;

            PetModel.Event_SpiritPetPlay -= OnSpiritPetPlay;

            PetModel.Event_H0704Update -= PetUpdate;

        }






 System/Pet/PetButton.cs

@@ -27,8 +27,8 @@
        [SerializeField] PetAttributeMethods _PetAttributeMethods;

        [SerializeField] Button m_PlayedButton;//出战按钮

        [SerializeField] Text m_Played_Text;//出战文本

        PlayerPetDatas m_petModel;

        PlayerPetDatas petmodel { get { return m_petModel ?? (m_petModel = ModelCenter.Instance.GetModel<PlayerPetDatas>()); } }

        PetModel m_petModel;

        PetModel petmodel { get { return m_petModel ?? (m_petModel = ModelCenter.Instance.GetModel<PetModel>()); } }



        public Button PetButton1

        {


 System/Pet/PetModel.cs

File was renamed from System/Pet/PlayerPetDatas.cs
@@ -21,7 +21,7 @@
    PetDebris = 1,//灵宠碎片

    PetStone = 2,//灵宠魂石

}

public class PlayerPetDatas : Model, IBeforePlayerDataInitialize, IPlayerLoginOk

public class PetModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{

    public Dictionary<int, int> _TagPetItem = new Dictionary<int, int>();//关于灵兽魂石

    public Dictionary<int, PetBackpack> _DicPetBack = new Dictionary<int, PetBackpack>();//宠物背包列表


 System/Pet/PetModel.cs.meta

copy from System/Pet/PlayerPetDatas.cs.meta
copy to System/Pet/PetModel.cs.meta
File was copied from System/Pet/PlayerPetDatas.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 7d2b250209cbc8143a7380cc7db246e7
timeCreated: 1504666613
guid: 8265a87a293bfe24f8ff0e6436b7c7da
timeCreated: 1551075434
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 System/Pet/PetStoneTipsWin.cs

@@ -31,8 +31,8 @@
        PackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PackModel>()); } }



        #region Built-in

        PlayerPetDatas m_petModel;

        PlayerPetDatas petmodel { get { return m_petModel ?? (m_petModel = ModelCenter.Instance.GetModel<PlayerPetDatas>()); } }

        PetModel m_petModel;

        PetModel petmodel { get { return m_petModel ?? (m_petModel = ModelCenter.Instance.GetModel<PetModel>()); } }



        RoleParticularModel m_RoleParticularModel;

        RoleParticularModel roleParticularModel { get { return m_RoleParticularModel ?? (m_RoleParticularModel = ModelCenter.Instance.GetModel<RoleParticularModel>()); } }

@@ -60,7 +60,7 @@
        protected override void OnAfterOpen()

        {

           

            PlayerPetDatas.Event_Ha339 += HA339;

            PetModel.Event_Ha339 += HA339;

            roleParticularModel.PowerUpdate += PowerUpdate;

        }



@@ -68,7 +68,7 @@
        {

            m_petModel.PetStoneItemId = 0;

            m_ScrollerController.OnRefreshCell -= OnRefreshGridCell;

            PlayerPetDatas.Event_Ha339 -= HA339;

            PetModel.Event_Ha339 -= HA339;

            roleParticularModel.PowerUpdate -= PowerUpdate;

        }




 System/Pet/PetWin.cs

@@ -19,10 +19,10 @@
        [SerializeField] Button _CloseBtn;

        [SerializeField] Button _LeftBtn;

        [SerializeField] Button _RightBtn;

        PlayerPetDatas m_petModel;

        PlayerPetDatas petmodel { get { return m_petModel ?? (m_petModel = ModelCenter.Instance.GetModel<PlayerPetDatas>()); } }

        PlayerMountDatas m_MountModel;

        PlayerMountDatas mountModel { get { return m_MountModel ?? (m_MountModel = ModelCenter.Instance.GetModel<PlayerMountDatas>()); } }

        PetModel m_petModel;

        PetModel petmodel { get { return m_petModel ?? (m_petModel = ModelCenter.Instance.GetModel<PetModel>()); } }

        MountModel m_MountModel;

        MountModel mountModel { get { return m_MountModel ?? (m_MountModel = ModelCenter.Instance.GetModel<MountModel>()); } }

        void CloseBtn()

        {

            CloseChild();


 System/Pet/RidingAndPetActivationModel.cs

@@ -21,11 +21,11 @@
        public int SkillID1 = 0;

        public int Lv = 1;



        PlayerPetDatas m_petModel;

        PlayerPetDatas petmodel { get { return m_petModel ?? (m_petModel = ModelCenter.Instance.GetModel<PlayerPetDatas>()); } }

        PetModel m_petModel;

        PetModel petmodel { get { return m_petModel ?? (m_petModel = ModelCenter.Instance.GetModel<PetModel>()); } }



        PlayerMountDatas m_MountModel;

        PlayerMountDatas mountModel { get { return m_MountModel ?? (m_MountModel = ModelCenter.Instance.GetModel<PlayerMountDatas>()); } }

        MountModel m_MountModel;

        MountModel mountModel { get { return m_MountModel ?? (m_MountModel = ModelCenter.Instance.GetModel<MountModel>()); } }

        //==============坐骑属性弹框

        public PropertyTip property;

        public int RidingId;


 System/Pet/RidingAndPetActivationWin.cs

@@ -42,8 +42,8 @@
        [SerializeField] GameObject m_Text;



        #region Built-in

        PlayerMountDatas m_MountModel;

        PlayerMountDatas mountModel { get { return m_MountModel ?? (m_MountModel = ModelCenter.Instance.GetModel<PlayerMountDatas>()); } }

        MountModel m_MountModel;

        MountModel mountModel { get { return m_MountModel ?? (m_MountModel = ModelCenter.Instance.GetModel<MountModel>()); } }

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

        List<HorseSkillClass> MountSkills = new List<HorseSkillClass>();

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


 System/Pet/TargetPetAttrWin.cs

@@ -53,9 +53,9 @@
        [Header("关闭按钮")]

        [SerializeField]

        Button m_CloseButton;//满级

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

        PlayerMountDatas m_MountModel;

        PlayerMountDatas mountModel { get { return m_MountModel ?? (m_MountModel = ModelCenter.Instance.GetModel<PlayerMountDatas>()); } }

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

        MountModel m_MountModel;

        MountModel mountModel { get { return m_MountModel ?? (m_MountModel = ModelCenter.Instance.GetModel<MountModel>()); } }

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



        protected override void BindController()


 System/Role/RoleAttrWin.cs

@@ -27,12 +27,12 @@
        [SerializeField] ScrollerController m_Controller;



        private int attrShowType = 0;

        PlayerPetDatas m_petModel;

        PlayerPetDatas petmodel

        PetModel m_petModel;

        PetModel petmodel

        {

            get

            {

                return m_petModel ?? (m_petModel = ModelCenter.Instance.GetModel<PlayerPetDatas>());

                return m_petModel ?? (m_petModel = ModelCenter.Instance.GetModel<PetModel>());

            }

        }

        List<PlayerPropertyConfig> propList = null;


 System/RoleParticulars/RoleParticularsWin.cs

@@ -48,10 +48,10 @@
                return m_EquipWashModel ?? (m_EquipWashModel = ModelCenter.Instance.GetModel<EquipWashModel>());

            }

        }

        PlayerStrengthengDatas m_StrengthengModel;

        PlayerStrengthengDatas strengthengmodel {

        StrengthenModel m_StrengthengModel;

        StrengthenModel strengthengmodel {

            get {

                return m_StrengthengModel ?? (m_StrengthengModel = ModelCenter.Instance.GetModel<PlayerStrengthengDatas>());

                return m_StrengthengModel ?? (m_StrengthengModel = ModelCenter.Instance.GetModel<StrengthenModel>());

            }

        }




 System/RoleParticulars/ViewFuncCell.cs

@@ -36,12 +36,12 @@
            }

        }



        PlayerPetDatas m_petModel;

        PlayerPetDatas petmodel

        PetModel m_petModel;

        PetModel petmodel

        {

            get

            {

                return m_petModel ?? (m_petModel = ModelCenter.Instance.GetModel<PlayerPetDatas>());

                return m_petModel ?? (m_petModel = ModelCenter.Instance.GetModel<PetModel>());

            }

        }



@@ -51,20 +51,20 @@
            get { return _suitModel ?? (_suitModel = ModelCenter.Instance.GetModel<PlayerSuitModel>()); }

        }



        PlayerMountDatas m_HorseModel;

        PlayerMountDatas horsemodel

        MountModel m_HorseModel;

        MountModel horsemodel

        {

            get

            {

                return m_HorseModel ?? (m_HorseModel = ModelCenter.Instance.GetModel<PlayerMountDatas>());

                return m_HorseModel ?? (m_HorseModel = ModelCenter.Instance.GetModel<MountModel>());

            }

        }

        PlayerStrengthengDatas m_StrengthengModel;

        PlayerStrengthengDatas strengthengmodel

        StrengthenModel m_StrengthengModel;

        StrengthenModel strengthengmodel

        {

            get

            {

                return m_StrengthengModel ?? (m_StrengthengModel = ModelCenter.Instance.GetModel<PlayerStrengthengDatas>());

                return m_StrengthengModel ?? (m_StrengthengModel = ModelCenter.Instance.GetModel<StrengthenModel>());

            }

        }




 System/RoleParticulars/ViewHorseDetailWin.cs

@@ -232,7 +232,7 @@
                m_SkillBtn.AddListener(OnClickSkill);



                m_Effect.StopImediatly();

                var model = ModelCenter.Instance.GetModel<PlayerMountDatas>();

                var model = ModelCenter.Instance.GetModel<MountModel>();

                if (model.ListEffectSkill != null

                    && model.ListEffectSkill.Contains(_skillId))

                {


 System/RoleParticulars/ViewPetDetailWin.cs

@@ -217,7 +217,7 @@
                m_SkillBtn.AddListener(OnClickSkill);



                m_Effect.StopImediatly();

                var model = ModelCenter.Instance.GetModel<PlayerPetDatas>();

                var model = ModelCenter.Instance.GetModel<PetModel>();

                if (model.ListEffectSkill != null

                    && model.ListEffectSkill.Contains(_skillId))

                {


 System/RolePromote/RolePromoteModel.cs

@@ -21,14 +21,14 @@
            ParseConfig();

            playerPack.refreshItemCountEvent += RefreshItemCountAct;

            PlayerStoneData.OnRefreshStoneData += OnRefreshStoneData;

            PlayerMountDatas.Event_MountHA301A += OnRefreshMountData;

            PlayerPetDatas.Event_H0704Add += OnRefreshPetData;

            PlayerPetDatas.Event_H0704Update += OnRefreshPetData;

            MountModel.Event_MountHA301A += OnRefreshMountData;

            PetModel.Event_H0704Add += OnRefreshPetData;

            PetModel.Event_H0704Update += OnRefreshPetData;

            petmodel.PlayerLoginOkData += OnRefreshPetData;

            equipWashModel.RefreshWashModelEvent += RefreshWashModelEvent;

            RedpointCenter.Instance.redpointValueChangeEvent += RedpointValueChangeEvent;

            ItemLogicUtility.Instance.GetBetterEquipEvent += RefreshGetBetterEquipEvent;

            PlayerMountDatas.PlayerLoginOKData += PlayerLoginOKData;

            MountModel.PlayerLoginOKData += PlayerLoginOKData;

            blastFurnaceModel.blastFurnacePromoteUpdate += BlastFurnacePromoteUpdate;

            PlayerDatas.Instance.PlayerDataRefreshInfoEvent += PlayerDataRefreshInfoEvent;

            OnBeforePlayerDataInitialize();

@@ -98,28 +98,28 @@
                return m_RuneModel ?? (m_RuneModel = ModelCenter.Instance.GetModel<RuneModel>());

            }

        }

        PlayerPetDatas m_petModel;

        PlayerPetDatas petmodel

        PetModel m_petModel;

        PetModel petmodel

        {

            get

            {

                return m_petModel ?? (m_petModel = ModelCenter.Instance.GetModel<PlayerPetDatas>());

                return m_petModel ?? (m_petModel = ModelCenter.Instance.GetModel<PetModel>());

            }

        }

        PlayerMountDatas m_HorseModel;

        PlayerMountDatas horsemodel

        MountModel m_HorseModel;

        MountModel horsemodel

        {

            get

            {

                return m_HorseModel ?? (m_HorseModel = ModelCenter.Instance.GetModel<PlayerMountDatas>());

                return m_HorseModel ?? (m_HorseModel = ModelCenter.Instance.GetModel<MountModel>());

            }

        }

        PlayerStrengthengDatas m_StrengthengModel;

        PlayerStrengthengDatas strengthengmodel

        StrengthenModel m_StrengthengModel;

        StrengthenModel strengthengmodel

        {

            get

            {

                return m_StrengthengModel ?? (m_StrengthengModel = ModelCenter.Instance.GetModel<PlayerStrengthengDatas>());

                return m_StrengthengModel ?? (m_StrengthengModel = ModelCenter.Instance.GetModel<StrengthenModel>());

            }

        }




 System/Store/Logic/BuyPetMatInfoWin.cs

@@ -80,8 +80,8 @@
        {

            get { return _storeModel ?? (_storeModel = ModelCenter.Instance.GetModel<StoreModel>()); }

        }

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

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

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

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



        BuyItemPopModel buyItem;

        BuyShopItemLimit shopItemLimit;


 System/Strengthening/EquipReinforceWin.cs

@@ -11,8 +11,8 @@


        private WingsRedDot W_ModelRedDit;

        private WingsRedDot model { get { return W_ModelRedDit ?? (W_ModelRedDit = ModelCenter.Instance.GetModel<WingsRedDot>()); } }

        private PlayerStrengthengDatas M_Strengtheng;

        private PlayerStrengthengDatas strengtheng { get { return M_Strengtheng ?? (M_Strengtheng = ModelCenter.Instance.GetModel<PlayerStrengthengDatas>()); } }

        private StrengthenModel M_Strengtheng;

        private StrengthenModel strengtheng { get { return M_Strengtheng ?? (M_Strengtheng = ModelCenter.Instance.GetModel<StrengthenModel>()); } }

        private WashTips _washTips;

        public WashTips WashTip {

            get {


 System/Strengthening/PlayerStrengthengDatas.cs.meta

File was deleted

 System/Strengthening/StrengthenModel.cs

File was renamed from System/Strengthening/PlayerStrengthengDatas.cs
@@ -38,7 +38,7 @@
    }

}



public class PlayerStrengthengDatas : Model, IBeforePlayerDataInitialize, IPlayerLoginOk

public class StrengthenModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk
{

    public Dictionary<int, EquipmentInitialization> _EqInfo = new Dictionary<int, EquipmentInitialization>();//接收服务器下发的数值

    Dictionary<int, int> DefineIndexDic = new Dictionary<int, int>();//装备强化类型

@@ -58,8 +58,8 @@
    {

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

    }

    PlayerStrengthengDatas m_StrengthengModel;

    PlayerStrengthengDatas strengthengmodel { get { return m_StrengthengModel ?? (m_StrengthengModel = ModelCenter.Instance.GetModel<PlayerStrengthengDatas>()); } }

    StrengthenModel m_StrengthengModel;
    StrengthenModel strengthengmodel { get { return m_StrengthengModel ?? (m_StrengthengModel = ModelCenter.Instance.GetModel<StrengthenModel>()); } }
    public class EquipRedDot

    {

        public int CurrentLevel;//当前等级


 System/Strengthening/StrengthenModel.cs.meta

File was renamed from System/Pet/PlayerPetDatas.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 7d2b250209cbc8143a7380cc7db246e7
timeCreated: 1504666613
guid: 2d254a99ec23f0d4d8fa268703d6c70b
timeCreated: 1551075430
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 System/Strengthening/StrengtheningSripts.cs

@@ -76,8 +76,8 @@


    GetItemPathModel _GetItemPath;

    GetItemPathModel GetItemPath { get { return _GetItemPath ?? (_GetItemPath = ModelCenter.Instance.GetModel<GetItemPathModel>()); } }

    PlayerStrengthengDatas m_StrengthengModel;

    PlayerStrengthengDatas strengthengmodel { get { return m_StrengthengModel ?? (m_StrengthengModel = ModelCenter.Instance.GetModel<PlayerStrengthengDatas>()); } }

    StrengthenModel m_StrengthengModel;

    StrengthenModel strengthengmodel { get { return m_StrengthengModel ?? (m_StrengthengModel = ModelCenter.Instance.GetModel<StrengthenModel>()); } }



    ItemTipsModel _itemTipsModel;

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

@@ -170,7 +170,7 @@
        _effects = true;

        _open = true;

        _money = PlayerDatas.Instance.baseData.allSliver;

        PlayerStrengthengDatas.Event_Ha3b3 += EquipPartStar;//刷新服务器关于装备信息

        StrengthenModel.Event_Ha3b3 += EquipPartStar;//刷新服务器关于装备信息

        PlayerDatas.Instance.PlayerDataRefreshInfoEvent += RefreshMoney;//金钱的刷新

        Initialize();

        WindowCenter.Instance.windowBeforeCloseEvent += windowBeforeCloseEvent;

@@ -1216,7 +1216,7 @@
    {

        _open = false;

        StopBtn();//停止强化关闭携程

        PlayerStrengthengDatas.Event_Ha3b3 -= EquipPartStar;//刷新服务器关于装备信息

        StrengthenModel.Event_Ha3b3 -= EquipPartStar;//刷新服务器关于装备信息

        PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= RefreshMoney;//金钱的刷新

        WindowCenter.Instance.windowBeforeCloseEvent -= windowBeforeCloseEvent;

        int playerLv = PlayerDatas.Instance.baseData.LV;


 System/SystemSetting/SettingEffectMgr.cs

@@ -17,10 +17,10 @@
    private StoreConfig _tagShopModel;

    private int[] shopIdlist;



    PlayerPetDatas m_petModel;

    PlayerPetDatas petmodel {

    PetModel m_petModel;

    PetModel petmodel {

        get {

            return m_petModel ?? (m_petModel = ModelCenter.Instance.GetModel<PlayerPetDatas>());

            return m_petModel ?? (m_petModel = ModelCenter.Instance.GetModel<PetModel>());

        }

    }




 System/Treasure/TreasureSoulModel.cs

@@ -47,7 +47,7 @@
        public override void Init()

        {

            packModel.refreshItemCountEvent += RefreshItemCountAct;

            PlayerStrengthengDatas.RefreshEquipUpgradLvAct += RefreshEquipSTRLv;

            StrengthenModel.RefreshEquipUpgradLvAct += RefreshEquipSTRLv;

            FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;

            ParseConfig();

        }

@@ -74,7 +74,7 @@
        public override void UnInit()

        {

            packModel.refreshItemCountEvent -= RefreshItemCountAct;

            PlayerStrengthengDatas.RefreshEquipUpgradLvAct -= RefreshEquipSTRLv;

            StrengthenModel.RefreshEquipUpgradLvAct -= RefreshEquipSTRLv;

            FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent;

        }



@@ -447,7 +447,7 @@
                    state = itemGet ? TreasurePrivilegeState.Doing : TreasurePrivilegeState.Reward;

                    break;

                case TreasurePrivilege.StrengthenAdd:

                    var strengthen = ModelCenter.Instance.GetModel<PlayerStrengthengDatas>();

                    var strengthen = ModelCenter.Instance.GetModel<StrengthenModel>();

                    var playerpack = ModelCenter.Instance.GetModel<PackModel>();

                    presentGetCount = 0;

                    foreach (var value in strengthen._EqInfo.Values)


 System/Treasure/TreasureSoulPattern4.cs

@@ -12,11 +12,11 @@


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

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

        public PlayerStrengthengDatas strengthengmodel

        public StrengthenModel strengthengmodel

        {

            get

            {

                return ModelCenter.Instance.GetModel<PlayerStrengthengDatas>();

                return ModelCenter.Instance.GetModel<StrengthenModel>();

            }

        }

        public override void Display(int _id)


 System/Treasure/TreasureSoulWin.cs

@@ -46,11 +46,11 @@
        PlayerSuitModel suitModel { get { return ModelCenter.Instance.GetModel<PlayerSuitModel>(); } }

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



        public PlayerStrengthengDatas strengthengmodel

        public StrengthenModel strengthengmodel

        {

            get

            {

                return ModelCenter.Instance.GetModel<PlayerStrengthengDatas>();

                return ModelCenter.Instance.GetModel<StrengthenModel>();

            }

        }




 System/WindowBase/ModelCenter.cs

@@ -127,11 +127,11 @@
            RegisterModel<TitleModel>();

            RegisterModel<KingFairyModel>();

            RegisterModel<DemonJarModel>();

            RegisterModel<PlayerBuffDatas>();

            RegisterModel<PlayerPetDatas>();

            RegisterModel<PlayerMountDatas>();

            RegisterModel<BuffModel>();

            RegisterModel<PetModel>();

            RegisterModel<MountModel>();

            RegisterModel<TaiChiModel>();

            RegisterModel<PlayerStrengthengDatas>();

            RegisterModel<StrengthenModel>();

            RegisterModel<OffLineOnHookModel>();

            RegisterModel<RuneComposeModel>();

            RegisterModel<ItemOverdueModel>();


 System/WindowJump/WindowJumpMgr.cs

@@ -20,12 +20,12 @@
    private FuncOpenLVConfig _tagOpenLvModel;

    private Dictionary<int, List<string>> openWindows = new Dictionary<int, List<string>>();

    public Dictionary<int, string> jumpWinNameDict = new Dictionary<int, string>();

    PlayerPetDatas m_petModel;

    PlayerPetDatas petmodel

    PetModel m_petModel;

    PetModel petmodel

    {

        get

        {

            return m_petModel ?? (m_petModel = ModelCenter.Instance.GetModel<PlayerPetDatas>());

            return m_petModel ?? (m_petModel = ModelCenter.Instance.GetModel<PetModel>());

        }

    }



@@ -40,8 +40,8 @@


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

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

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

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

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

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

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

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

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