Core/GameEngine/Model/Player/Fairy/PlayerFairyData.cs
@@ -23,8 +23,8 @@ { get { return _storeModel ?? (_storeModel = ModelCenter.Instance.GetModel<StoreModel>()); } } PlayerFairyAuTreasureData m_PlayerFairyAuTreasureData; PlayerFairyAuTreasureData playerFairyAuTreasureData { get { return m_PlayerFairyAuTreasureData ?? (m_PlayerFairyAuTreasureData = ModelCenter.Instance.GetModel<PlayerFairyAuTreasureData>()); } } FairyAuTreasureModel m_PlayerFairyAuTreasureData; FairyAuTreasureModel playerFairyAuTreasureData { get { return m_PlayerFairyAuTreasureData ?? (m_PlayerFairyAuTreasureData = ModelCenter.Instance.GetModel<FairyAuTreasureModel>()); } } public FairyData fairy = null; public FairyMember mine = null; public event Action OnRefreshFairyInfo; Core/GameEngine/Model/Player/PlayerDatas.cs
@@ -732,7 +732,7 @@ method.CepaContribution((int)value); break; case PlayerDataRefresh.FamilyStoreScore: ModelCenter.Instance.GetModel<PlayerFairyAuTreasureData>().FairyAuIntegral((int)value); ModelCenter.Instance.GetModel<FairyAuTreasureModel>().FairyAuIntegral((int)value); break; case PlayerDataRefresh.SuperHitReduce: extersion.SuperHitReduce = (int)value; Core/NetworkPackage/DTCFile/ServerPack/H07_PlayerItem/DTC0707_tagItemCountRefresh.cs
@@ -8,8 +8,8 @@ public class DTC0707_tagItemCountRefresh : DtcBasic { private WingsRedDot W_ModelRedDit; private WingsRedDot model { get { return W_ModelRedDit ?? (W_ModelRedDit = ModelCenter.Instance.GetModel<WingsRedDot>()); } } private WingsRedDotModel W_ModelRedDit; private WingsRedDotModel model { get { return W_ModelRedDit ?? (W_ModelRedDit = ModelCenter.Instance.GetModel<WingsRedDotModel>()); } } PackModel _playerPack; PackModel playerPack Core/NetworkPackage/DTCFile/ServerPack/H08_Event/DTC0801_tagEventTalk.cs
@@ -8,12 +8,12 @@ public class DTC0801_tagEventTalk : DtcBasic { PlayerTaskDatas m_TaskModel; PlayerTaskDatas taskmodel TaskModel m_TaskModel; TaskModel taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>()); return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<TaskModel>()); } }
@@ -8,12 +8,12 @@ public class DTC0820_tagMissionDict : DtcBasic { PlayerTaskDatas m_TaskModel; PlayerTaskDatas taskmodel TaskModel m_TaskModel; TaskModel taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>()); return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<TaskModel>()); } }
@@ -8,12 +8,12 @@ public class DTC0823_tagDelMission : DtcBasic { PlayerTaskDatas m_TaskModel; PlayerTaskDatas taskmodel TaskModel m_TaskModel; TaskModel taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>()); return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<TaskModel>()); } } public override void Done(GameNetPackBasic vNetPack) Core/NetworkPackage/DTCFile/ServerPack/H08_Event/DTC0826_tagClearMissionDict.cs
@@ -7,12 +7,12 @@ public class DTC0826_tagClearMissionDict : DtcBasic { PlayerTaskDatas m_TaskModel; PlayerTaskDatas taskmodel TaskModel m_TaskModel; TaskModel taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>()); return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<TaskModel>()); } } public override void Done(GameNetPackBasic vNetPack) { Core/NetworkPackage/DTCFile/ServerPack/H08_Event/DTC0827_tagMissionDesc.cs
@@ -8,12 +8,12 @@ public class DTC0827_tagMissionDesc : DtcBasic { PlayerTaskDatas m_TaskModel; PlayerTaskDatas taskmodel TaskModel m_TaskModel; TaskModel taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>()); return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<TaskModel>()); } } public override void Done(GameNetPackBasic vNetPack) Core/NetworkPackage/DTCFile/ServerPack/HA4_Family/DTCA403_tagGCFamilyActionInfo.cs
@@ -8,8 +8,8 @@ public class DTCA403_tagGCFamilyActionInfo : DtcBasic { PlayerFairyAuTreasureData m_PlayerFairyAuTreasureData; PlayerFairyAuTreasureData playerFairyAuTreasureData { get { return m_PlayerFairyAuTreasureData ?? (m_PlayerFairyAuTreasureData = ModelCenter.Instance.GetModel<PlayerFairyAuTreasureData>()); } } FairyAuTreasureModel m_PlayerFairyAuTreasureData; FairyAuTreasureModel playerFairyAuTreasureData { get { return m_PlayerFairyAuTreasureData ?? (m_PlayerFairyAuTreasureData = ModelCenter.Instance.GetModel<FairyAuTreasureModel>()); } } public override void Done(GameNetPackBasic vNetPack) { base.Done(vNetPack); HA403_tagGCFamilyActionInfo vNetData = vNetPack as HA403_tagGCFamilyActionInfo; if (vNetData != null) Core/NetworkPackage/DTCFile/ServerPack/HA4_Family/DTCA404_tagGCFamilyRedPacketInfo.cs
@@ -8,8 +8,8 @@ public class DTCA404_tagGCFamilyRedPacketInfo : DtcBasic { PlayerRedPacketDatas m_RedPacket; PlayerRedPacketDatas redPacket { get { return m_RedPacket ?? (m_RedPacket = ModelCenter.Instance.GetModel<PlayerRedPacketDatas>()); } } RedPacketModel m_RedPacket; RedPacketModel redPacket { get { return m_RedPacket ?? (m_RedPacket = ModelCenter.Instance.GetModel<RedPacketModel>()); } } public override void Done(GameNetPackBasic vNetPack) { base.Done(vNetPack); Core/NetworkPackage/DTCFile/ServerPack/HA4_Family/DTCA405_tagGCFamilyRedPacketGrabInfo.cs
@@ -7,8 +7,8 @@ public class DTCA405_tagGCFamilyRedPacketGrabInfo : DtcBasic { PlayerRedPacketDatas m_RedPacket; PlayerRedPacketDatas redPacket { get { return m_RedPacket ?? (m_RedPacket = ModelCenter.Instance.GetModel<PlayerRedPacketDatas>()); } } RedPacketModel m_RedPacket; RedPacketModel redPacket { get { return m_RedPacket ?? (m_RedPacket = ModelCenter.Instance.GetModel<RedPacketModel>()); } } public override void Done(GameNetPackBasic vNetPack) { base.Done(vNetPack); Core/NetworkPackage/DTCFile/ServerPack/HA4_Family/DTCA406_tagGCFamilyStoreItemInfo.cs
@@ -7,8 +7,8 @@ public class DTCA406_tagGCFamilyStoreItemInfo : DtcBasic { PlayerFairyAuTreasureData m_PlayerFairyAuTreasureData; PlayerFairyAuTreasureData playerFairyAuTreasureData { get { return m_PlayerFairyAuTreasureData ?? (m_PlayerFairyAuTreasureData = ModelCenter.Instance.GetModel<PlayerFairyAuTreasureData>()); } } FairyAuTreasureModel m_PlayerFairyAuTreasureData; FairyAuTreasureModel playerFairyAuTreasureData { get { return m_PlayerFairyAuTreasureData ?? (m_PlayerFairyAuTreasureData = ModelCenter.Instance.GetModel<FairyAuTreasureModel>()); } } public override void Done(GameNetPackBasic vNetPack) { base.Done(vNetPack); HA406_tagGCFamilyStoreItemInfo vNetData = vNetPack as HA406_tagGCFamilyStoreItemInfo; if (vNetData != null) Core/NetworkPackage/DTCFile/ServerPack/HA4_Family/DTCA407_tagGCFamilyStoreItemClear.cs
@@ -5,8 +5,8 @@ // A4 07 家族仓库物品清除 #tagGCFamilyStoreItemClear public class DTCA407_tagGCFamilyStoreItemClear : DtcBasic { PlayerFairyAuTreasureData m_PlayerFairyAuTreasureData; PlayerFairyAuTreasureData playerFairyAuTreasureData { get { return m_PlayerFairyAuTreasureData ?? (m_PlayerFairyAuTreasureData = ModelCenter.Instance.GetModel<PlayerFairyAuTreasureData>()); } } FairyAuTreasureModel m_PlayerFairyAuTreasureData; FairyAuTreasureModel playerFairyAuTreasureData { get { return m_PlayerFairyAuTreasureData ?? (m_PlayerFairyAuTreasureData = ModelCenter.Instance.GetModel<FairyAuTreasureModel>()); } } public override void Done(GameNetPackBasic vNetPack) { base.Done(vNetPack); Core/NetworkPackage/DTCFile/ServerPack/HA5_Family/DTCA505_tagMCFamilyRedPacketGoldLimit.cs
@@ -7,8 +7,8 @@ public class DTCA505_tagMCFamilyRedPacketGoldLimit : DtcBasic { PlayerRedPacketDatas m_RedPacket; PlayerRedPacketDatas redPacket { get { return m_RedPacket ?? (m_RedPacket = ModelCenter.Instance.GetModel<PlayerRedPacketDatas>()); } } RedPacketModel m_RedPacket; RedPacketModel redPacket { get { return m_RedPacket ?? (m_RedPacket = ModelCenter.Instance.GetModel<RedPacketModel>()); } } public override void Done(GameNetPackBasic vNetPack) { base.Done(vNetPack); HA505_tagMCFamilyRedPacketGoldLimit vNetData = vNetPack as HA505_tagMCFamilyRedPacketGoldLimit; Core/NetworkPackage/DTCFile/ServerPack/HA7_Interaction/DTCA708_tagMCRunTaskAwardInfo.cs
@@ -7,12 +7,12 @@ public class DTCA708_tagMCRunTaskAwardInfo : DtcBasic { PlayerTaskDatas m_TaskModel; PlayerTaskDatas taskmodel TaskModel m_TaskModel; TaskModel taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>()); return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<TaskModel>()); } }
@@ -1063,8 +1063,8 @@ private float m_CalculAutoFightTime; public float calculAutoFightTime { get { return m_CalculAutoFightTime; } } PlayerTaskDatas m_TaskModel; PlayerTaskDatas taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>()); } } TaskModel m_TaskModel; TaskModel taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<TaskModel>()); } } PlayerMainDate m_MainModel; PlayerMainDate onMainModel { get { return m_MainModel ?? (m_MainModel = ModelCenter.Instance.GetModel<PlayerMainDate>()); } } @@ -1097,7 +1097,7 @@ { if (Time.realtimeSinceStartup - m_CalculAutoFightTime > taskmodel.TaskAutoTime && !NewBieCenter.Instance.inGuiding && PlayerTaskDatas.IsOPenAutoResolve()) && TaskModel.IsOPenAutoResolve()) { if (PlayerDatas.Instance.hero != null && PlayerDatas.Instance.hero.State == E_ActorState.AutoRun && onMainModel.MoveBool) @@ -1129,7 +1129,7 @@ { if (Time.realtimeSinceStartup - m_CalculAutoFightTime > 60 && !NewBieCenter.Instance.inGuiding && PlayerTaskDatas.IsOPenAutoResolve()) && TaskModel.IsOPenAutoResolve()) { MapTransferUtility.Instance.Clear(); Behaviour.StartHandupAI(); Fight/GameActor/GA_NpcCollect.cs
@@ -426,7 +426,7 @@ } else { PlayerTaskDatas _model = ModelCenter.Instance.GetModel<PlayerTaskDatas>(); TaskModel _model = ModelCenter.Instance.GetModel<TaskModel>(); m_CanCollect = _model.IsGather(NpcConfig.NPCID); } } Fight/GameActor/GA_NpcFunc.cs
@@ -58,11 +58,11 @@ GAStaticDefine.NpcID2ServerInstID[NpcConfig.NPCID] = ServerInstID; PlayerTaskDatas.Event_TaskResponse += OnTaskRefresh; TaskModel.Event_TaskResponse += OnTaskRefresh; bool _needHide = (NpcConfig.Show == 0); PlayerTaskDatas _model = ModelCenter.Instance.GetModel<PlayerTaskDatas>(); TaskModel _model = ModelCenter.Instance.GetModel<TaskModel>(); var _npcID = NpcConfig.NPCID; if (_npcID == 10404101) @@ -373,7 +373,7 @@ Object.Destroy(m_NPCInteractProcessor); m_NPCInteractProcessor = null; } PlayerTaskDatas.Event_TaskResponse -= OnTaskRefresh; TaskModel.Event_TaskResponse -= OnTaskRefresh; m_H0406 = null; ReleaseMissionSign(); @@ -494,12 +494,12 @@ } } PlayerTaskDatas m_TaskModel; PlayerTaskDatas taskmodel TaskModel m_TaskModel; TaskModel taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>()); return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<TaskModel>()); } }
@@ -481,7 +481,7 @@ public void OnEnter() { var playerTaskDatas = ModelCenter.Instance.GetModel<PlayerTaskDatas>(); var playerTaskDatas = ModelCenter.Instance.GetModel<TaskModel>(); var questId = playerTaskDatas.currentMission; playerTaskDatas.AutomaticTripToTask(questId);
@@ -5438,7 +5438,7 @@ #endif } public PlayerTaskDatas __Gen_Delegate_Imp234(object p0) public TaskModel __Gen_Delegate_Imp234(object p0) { #if THREAD_SAFE || HOTFIX_ENABLE lock (luaEnv.luaEnvLock) @@ -5452,7 +5452,7 @@ PCall(L, 1, 1, errFunc); PlayerTaskDatas __gen_ret = (PlayerTaskDatas)translator.GetObject(L, errFunc + 1, typeof(PlayerTaskDatas)); TaskModel __gen_ret = (TaskModel)translator.GetObject(L, errFunc + 1, typeof(TaskModel)); LuaAPI.lua_settop(L, errFunc - 1); return __gen_ret; #if THREAD_SAFE || HOTFIX_ENABLE Lua/Gen/SnxxzUIActivitiesPushMgrWrap.cs
@@ -20,7 +20,7 @@ public static void __Register(RealStatePtr L) { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); System.Type type = typeof(Snxxz.UI.ActivitiesPushMgr); System.Type type = typeof(Snxxz.UI.ActivitiesPushModel); Utils.BeginObjectRegister(type, L, translator, 0, 8, 0, 0); Utils.RegisterFunc(L, Utils.METHOD_IDX, "Init", _m_Init); @@ -42,9 +42,9 @@ Utils.BeginClassRegister(type, L, __CreateInstance, 4, 0, 0); Utils.RegisterObject(L, translator, Utils.CLS_IDX, "WholePeopleRankStart", Snxxz.UI.ActivitiesPushMgr.WholePeopleRankStart); Utils.RegisterObject(L, translator, Utils.CLS_IDX, "WholePeopleRankEnd", Snxxz.UI.ActivitiesPushMgr.WholePeopleRankEnd); Utils.RegisterObject(L, translator, Utils.CLS_IDX, "FlashRushToBuy", Snxxz.UI.ActivitiesPushMgr.FlashRushToBuy); Utils.RegisterObject(L, translator, Utils.CLS_IDX, "WholePeopleRankStart", Snxxz.UI.ActivitiesPushModel.WholePeopleRankStart); Utils.RegisterObject(L, translator, Utils.CLS_IDX, "WholePeopleRankEnd", Snxxz.UI.ActivitiesPushModel.WholePeopleRankEnd); Utils.RegisterObject(L, translator, Utils.CLS_IDX, "FlashRushToBuy", Snxxz.UI.ActivitiesPushModel.FlashRushToBuy); @@ -61,7 +61,7 @@ if(LuaAPI.lua_gettop(L) == 1) { Snxxz.UI.ActivitiesPushMgr gen_ret = new Snxxz.UI.ActivitiesPushMgr(); Snxxz.UI.ActivitiesPushModel gen_ret = new Snxxz.UI.ActivitiesPushModel(); translator.Push(L, gen_ret); return 1; @@ -90,7 +90,7 @@ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.ActivitiesPushMgr gen_to_be_invoked = (Snxxz.UI.ActivitiesPushMgr)translator.FastGetCSObj(L, 1); Snxxz.UI.ActivitiesPushModel gen_to_be_invoked = (Snxxz.UI.ActivitiesPushModel)translator.FastGetCSObj(L, 1); @@ -117,7 +117,7 @@ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.ActivitiesPushMgr gen_to_be_invoked = (Snxxz.UI.ActivitiesPushMgr)translator.FastGetCSObj(L, 1); Snxxz.UI.ActivitiesPushModel gen_to_be_invoked = (Snxxz.UI.ActivitiesPushModel)translator.FastGetCSObj(L, 1); @@ -144,7 +144,7 @@ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.ActivitiesPushMgr gen_to_be_invoked = (Snxxz.UI.ActivitiesPushMgr)translator.FastGetCSObj(L, 1); Snxxz.UI.ActivitiesPushModel gen_to_be_invoked = (Snxxz.UI.ActivitiesPushModel)translator.FastGetCSObj(L, 1); @@ -171,7 +171,7 @@ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.ActivitiesPushMgr gen_to_be_invoked = (Snxxz.UI.ActivitiesPushMgr)translator.FastGetCSObj(L, 1); Snxxz.UI.ActivitiesPushModel gen_to_be_invoked = (Snxxz.UI.ActivitiesPushModel)translator.FastGetCSObj(L, 1); @@ -198,7 +198,7 @@ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.ActivitiesPushMgr gen_to_be_invoked = (Snxxz.UI.ActivitiesPushMgr)translator.FastGetCSObj(L, 1); Snxxz.UI.ActivitiesPushModel gen_to_be_invoked = (Snxxz.UI.ActivitiesPushModel)translator.FastGetCSObj(L, 1); @@ -225,7 +225,7 @@ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.ActivitiesPushMgr gen_to_be_invoked = (Snxxz.UI.ActivitiesPushMgr)translator.FastGetCSObj(L, 1); Snxxz.UI.ActivitiesPushModel gen_to_be_invoked = (Snxxz.UI.ActivitiesPushModel)translator.FastGetCSObj(L, 1); @@ -253,7 +253,7 @@ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.ActivitiesPushMgr gen_to_be_invoked = (Snxxz.UI.ActivitiesPushMgr)translator.FastGetCSObj(L, 1); Snxxz.UI.ActivitiesPushModel gen_to_be_invoked = (Snxxz.UI.ActivitiesPushModel)translator.FastGetCSObj(L, 1); @@ -281,7 +281,7 @@ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.ActivitiesPushMgr gen_to_be_invoked = (Snxxz.UI.ActivitiesPushMgr)translator.FastGetCSObj(L, 1); Snxxz.UI.ActivitiesPushModel gen_to_be_invoked = (Snxxz.UI.ActivitiesPushModel)translator.FastGetCSObj(L, 1);
@@ -20,7 +20,7 @@ public static void __Register(RealStatePtr L) { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); System.Type type = typeof(Snxxz.UI.WingsRedDot); System.Type type = typeof(Snxxz.UI.WingsRedDotModel); Utils.BeginObjectRegister(type, L, translator, 0, 5, 2, 2); Utils.RegisterFunc(L, Utils.METHOD_IDX, "Init", _m_Init); @@ -59,7 +59,7 @@ if(LuaAPI.lua_gettop(L) == 1) { Snxxz.UI.WingsRedDot gen_ret = new Snxxz.UI.WingsRedDot(); Snxxz.UI.WingsRedDotModel gen_ret = new Snxxz.UI.WingsRedDotModel(); translator.Push(L, gen_ret); return 1; @@ -88,7 +88,7 @@ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.WingsRedDot gen_to_be_invoked = (Snxxz.UI.WingsRedDot)translator.FastGetCSObj(L, 1); Snxxz.UI.WingsRedDotModel gen_to_be_invoked = (Snxxz.UI.WingsRedDotModel)translator.FastGetCSObj(L, 1); @@ -115,7 +115,7 @@ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.WingsRedDot gen_to_be_invoked = (Snxxz.UI.WingsRedDot)translator.FastGetCSObj(L, 1); Snxxz.UI.WingsRedDotModel gen_to_be_invoked = (Snxxz.UI.WingsRedDotModel)translator.FastGetCSObj(L, 1); @@ -142,7 +142,7 @@ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.WingsRedDot gen_to_be_invoked = (Snxxz.UI.WingsRedDot)translator.FastGetCSObj(L, 1); Snxxz.UI.WingsRedDotModel gen_to_be_invoked = (Snxxz.UI.WingsRedDotModel)translator.FastGetCSObj(L, 1); @@ -169,7 +169,7 @@ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.WingsRedDot gen_to_be_invoked = (Snxxz.UI.WingsRedDot)translator.FastGetCSObj(L, 1); Snxxz.UI.WingsRedDotModel gen_to_be_invoked = (Snxxz.UI.WingsRedDotModel)translator.FastGetCSObj(L, 1); @@ -196,7 +196,7 @@ ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.WingsRedDot gen_to_be_invoked = (Snxxz.UI.WingsRedDot)translator.FastGetCSObj(L, 1); Snxxz.UI.WingsRedDotModel gen_to_be_invoked = (Snxxz.UI.WingsRedDotModel)translator.FastGetCSObj(L, 1); @@ -224,7 +224,7 @@ try { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.WingsRedDot gen_to_be_invoked = (Snxxz.UI.WingsRedDot)translator.FastGetCSObj(L, 1); Snxxz.UI.WingsRedDotModel gen_to_be_invoked = (Snxxz.UI.WingsRedDotModel)translator.FastGetCSObj(L, 1); translator.Push(L, gen_to_be_invoked.redPointStre); } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); @@ -238,7 +238,7 @@ try { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.WingsRedDot gen_to_be_invoked = (Snxxz.UI.WingsRedDot)translator.FastGetCSObj(L, 1); Snxxz.UI.WingsRedDotModel gen_to_be_invoked = (Snxxz.UI.WingsRedDotModel)translator.FastGetCSObj(L, 1); LuaAPI.lua_pushboolean(L, gen_to_be_invoked.IsBoolOpenWingeWin); } catch(System.Exception gen_e) { return LuaAPI.luaL_error(L, "c# exception:" + gen_e); @@ -254,7 +254,7 @@ try { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.WingsRedDot gen_to_be_invoked = (Snxxz.UI.WingsRedDot)translator.FastGetCSObj(L, 1); Snxxz.UI.WingsRedDotModel gen_to_be_invoked = (Snxxz.UI.WingsRedDotModel)translator.FastGetCSObj(L, 1); gen_to_be_invoked.redPointStre = (Snxxz.UI.Redpoint)translator.GetObject(L, 2, typeof(Snxxz.UI.Redpoint)); } catch(System.Exception gen_e) { @@ -269,7 +269,7 @@ try { ObjectTranslator translator = ObjectTranslatorPool.Instance.Find(L); Snxxz.UI.WingsRedDot gen_to_be_invoked = (Snxxz.UI.WingsRedDot)translator.FastGetCSObj(L, 1); Snxxz.UI.WingsRedDotModel gen_to_be_invoked = (Snxxz.UI.WingsRedDotModel)translator.FastGetCSObj(L, 1); gen_to_be_invoked.IsBoolOpenWingeWin = LuaAPI.lua_toboolean(L, 2); } catch(System.Exception gen_e) { System/Achievement/AchievementModel.cs
@@ -18,7 +18,7 @@ Dictionary<int, List<int>> achievementCategorys = new Dictionary<int, List<int>>(); PackModel playerPack { get { return ModelCenter.Instance.GetModel<PackModel>(); } } PlayerTaskDatas taskmodel { get { return ModelCenter.Instance.GetModel<PlayerTaskDatas>(); } } TaskModel taskmodel { get { return ModelCenter.Instance.GetModel<TaskModel>(); } } GetItemPathModel getItemPathModel { get { return ModelCenter.Instance.GetModel<GetItemPathModel>(); } } DailyQuestModel dailyQuestModel { get { return ModelCenter.Instance.GetModel<DailyQuestModel>(); } } Dictionary<int, int> equipQualityItemIdTables = new Dictionary<int, int>() { { 1, 2110 }, { 2, 2111 }, { 3, 2112 }, { 4, 2113 }, { 5, 2114 } }; System/AssetVersion/InGameDownLoad.cs
@@ -82,7 +82,7 @@ } } PlayerTaskDatas taskModel { get { return ModelCenter.Instance.GetModel<PlayerTaskDatas>(); } } TaskModel taskModel { get { return ModelCenter.Instance.GetModel<TaskModel>(); } } public List<Reward> rewards = new List<Reward>(); public bool hasReward { get; private set; } @@ -126,8 +126,8 @@ state = State.None; PlayerTaskDatas.Event_MainlineTask -= OnMainTaskChange; PlayerTaskDatas.Event_MainlineTask += OnMainTaskChange; TaskModel.Event_MainlineTask -= OnMainTaskChange; TaskModel.Event_MainlineTask += OnMainTaskChange; PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= OnPlayerLevelChange; PlayerDatas.Instance.PlayerDataRefreshInfoEvent += OnPlayerLevelChange; @@ -337,7 +337,7 @@ yield return null; } PlayerTaskDatas.Event_MainlineTask -= OnMainTaskChange; TaskModel.Event_MainlineTask -= OnMainTaskChange; PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= OnPlayerLevelChange; WindowCenter.Instance.Close<InGameDownLoadWin>(); System/BlastFurnace/GetItemPathModel.cs
@@ -215,7 +215,7 @@ public void SetUnionWarehouseGetWay() { var model1 = ModelCenter.Instance.GetModel<PlayerFairyAuTreasureData>(); var model1 = ModelCenter.Instance.GetModel<FairyAuTreasureModel>(); var model2 = ModelCenter.Instance.GetModel<TreasureFindHostModel>(); model1.JumpItemID = model2.adviceIdlist; } System/BossShow/BossShowModel.cs
@@ -20,12 +20,12 @@ GameObject bossShowCam; private ActorShowConfig actorShowModel; PlayerTaskDatas m_TaskModel; PlayerTaskDatas taskmodel TaskModel m_TaskModel; TaskModel taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>()); return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<TaskModel>()); } } @@ -381,7 +381,7 @@ { if (_show && !WindowCenter.Instance.IsOpen<BossShowDialogueWin>()) { var _task = ModelCenter.Instance.GetModel<PlayerTaskDatas>(); var _task = ModelCenter.Instance.GetModel<TaskModel>(); _task._TaskNow = actorShowModel.Dialogue; WindowCenter.Instance.Open<BossShowDialogueWin>(); } System/DailyQuest/DailyQuestWin.cs
@@ -30,7 +30,7 @@ DailyQuestModel model { get { return ModelCenter.Instance.GetModel<DailyQuestModel>(); } } DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } } PlayerTaskDatas taskModel { get { return ModelCenter.Instance.GetModel<PlayerTaskDatas>(); } } TaskModel taskModel { get { return ModelCenter.Instance.GetModel<TaskModel>(); } } TreasureModel treasureModel { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } } MapModel mapModel { get { return ModelCenter.Instance.GetModel<MapModel>(); } }
@@ -32,8 +32,8 @@ private int _CurrentNumber = 1;//获取当前数量 private int _NumberID = 0, _Number = 0, _Integral = 0, _BiggestLimit = 0, _ExperienceAdd = 0;//获取物品ID,数量,所需积分,做大上限,经验的增加 PlayerFairyAuTreasureData m_PlayerFairyAuTreasureData; PlayerFairyAuTreasureData playerFairyAuTreasureData { get { return m_PlayerFairyAuTreasureData ?? (m_PlayerFairyAuTreasureData = ModelCenter.Instance.GetModel<PlayerFairyAuTreasureData>()); } } FairyAuTreasureModel m_PlayerFairyAuTreasureData; FairyAuTreasureModel playerFairyAuTreasureData { get { return m_PlayerFairyAuTreasureData ?? (m_PlayerFairyAuTreasureData = ModelCenter.Instance.GetModel<FairyAuTreasureModel>()); } } #region Built-in protected override void BindController() System/FairyAu/DonateEquipTipsWin.cs
@@ -24,8 +24,8 @@ PackModel _playerPack; PackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PackModel>()); } } PlayerFairyAuTreasureData m_PlayerFairyAuTreasureData; PlayerFairyAuTreasureData playerFairyAuTreasureData { get { return m_PlayerFairyAuTreasureData ?? (m_PlayerFairyAuTreasureData = ModelCenter.Instance.GetModel<PlayerFairyAuTreasureData>()); } } FairyAuTreasureModel m_PlayerFairyAuTreasureData; FairyAuTreasureModel playerFairyAuTreasureData { get { return m_PlayerFairyAuTreasureData ?? (m_PlayerFairyAuTreasureData = ModelCenter.Instance.GetModel<FairyAuTreasureModel>()); } } private int _BagIndex = 0;//标记背包物品下标 private int MaxDonationAmount = 0;//最大捐献数量 System/FairyAu/FairyAuTaskWin.cs
@@ -40,8 +40,8 @@ private int _requireNumber = 0;//立即完成所需的仙玉数量 private List<RewardAnalysis.RewardInfo> rewardList = new List<RewardAnalysis.RewardInfo>(); private ImpactRankModel.RankAwardItem RankAwardItem = new ImpactRankModel.RankAwardItem();//新增奖励物品 PlayerTaskDatas m_TaskModel; PlayerTaskDatas taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>()); } } TaskModel m_TaskModel; TaskModel taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<TaskModel>()); } } ItemTipsModel _itemTipsModel; ItemTipsModel itemTipsModel { get { return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>()); } } PlayerMainDate m_MainModel; @@ -72,7 +72,7 @@ { timeType = 0; DeadModel.playerDieEvent += OnPlayerDie; PlayerTaskDatas.Event_FairyAuTask += FairyAuRefresh; TaskModel.Event_FairyAuTask += FairyAuRefresh; // PlayerTaskDatas.Event_FairyAuReward += FairyAuGrades; RewardsToOpen(); ContentAssignment(); @@ -104,7 +104,7 @@ protected override void OnAfterClose() { DeadModel.playerDieEvent -= OnPlayerDie; PlayerTaskDatas.Event_FairyAuTask -= FairyAuRefresh; TaskModel.Event_FairyAuTask -= FairyAuRefresh; // PlayerTaskDatas.Event_FairyAuReward -= FairyAuGrades; taskmodel.FairyAuBool = false; if (!WindowJumpMgr.Instance.IsJumpState) System/FairyAu/FairyAuTreasureModel.cs
File was renamed from System/FairyAu/PlayerFairyAuTreasureData.cs @@ -1,272 +1,272 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; using System; using Snxxz.UI; //仙盟宝库 public class FamilyStoreItem//家族仓库物品信息 { public int Index;//仓库格子索引 public int ItemID;//物品ID public ItemJsonData ItemData; public Dictionary<int, List<int>> _UserData; [Serializable] public class ItemJsonData { public string UserData; public int IsSuit; public int EquipGS; } } public class FamilyActionInfoClass//接收家族行为信息 { public int FamilyID;//家族ID public int ActionType;//类型 public int Time;//时间 public string Name;//玩家名 public int OperationType;//操作类型1-捐献，2-兑换，3-销毁 public int PlayerID;//操作的玩家ID; public int ItemID;//物品ID public ItemJsonData ItemData; public Dictionary<int, List<int>> _UserData; [Serializable] public class ItemJsonData { public int ItemID; public string UserData; public int IsSuit; public int EquipGS; } } public class PlayerFairyAuTreasureData : Model, IBeforePlayerDataInitialize, IPlayerLoginOk { public Dictionary<int, FamilyStoreItem> _DicfamilyStoreItem = new Dictionary<int, FamilyStoreItem>();//家族仓库物品信息 public List<FamilyActionInfoClass> _InformationList = new List<FamilyActionInfoClass>(); public delegate void OnFairyAuIntegral(); public static event OnFairyAuIntegral Event_FairyAuIntegral;//用于仙盟积分的刷新 public delegate void OnFamilyActionInfo(); public static event OnFamilyActionInfo Event_FamilyActionInfo;//家族行为信息的刷新 public delegate void OnFamilyStoreItemInfo(); public static event OnFamilyStoreItemInfo Event_FamilyStoreItemInfo;//仓库信息的刷新 public static event Action<List<int>> Del_FamilyStoreItemInfo;//仓库信息物品的删除 PackModel _playerPack; PackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PackModel>()); } } public int _FairyAuIntegral = 0;//获取仙盟积分 public List<int> JumpItemID = new List<int>();//从跳转到仙盟仓库需要选中高亮 List<int> EquipmentList = new List<int>();//关于装备位置 public bool IsShowPoint = false;//是否显示红点 private const int Redpoint_key1 = 1070103; public Redpoint redPointStre1 = new Redpoint(10701, Redpoint_key1);//仙盟仓库红点 public override void Init() { var funConfig = FuncConfigConfig.Get("StrengthenDisplay"); int[] List = ConfigParse.GetMultipleStr<int>(funConfig.Numerical1); EquipmentList.Clear(); for (int i = 0; i < List.Length; i++) { EquipmentList.Add(List[i]); } } public override void UnInit() { } public void OnBeforePlayerDataInitialize() { _DicfamilyStoreItem.Clear(); _FairyAuIntegral = 0; } public void OnPlayerLoginOk() { PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= Updatefighting;//数据的刷新(h0418) PlayerDatas.Instance.PlayerDataRefreshInfoEvent += Updatefighting; WarehouseTipsWin.RedPointUpdate -= RedPointUpdate; WarehouseTipsWin.RedPointUpdate += RedPointUpdate; } public void FairyAuIntegral(int value)//获取仙盟积分 { _FairyAuIntegral = value; if (Event_FairyAuIntegral != null) Event_FairyAuIntegral(); } public void FamilyStoreItemInfo(HA406_tagGCFamilyStoreItemInfo info)//家族仓库信息 { if (!_DicfamilyStoreItem.ContainsKey(0)) { FamilyStoreItem _FamilyStoreItemP = new FamilyStoreItem(); _FamilyStoreItemP.Index = 0; FuncConfigConfig _PetFoodExchange = FuncConfigConfig.Get("PetFoodExchange"); _FamilyStoreItemP.ItemID = int.Parse(_PetFoodExchange.Numerical1); _DicfamilyStoreItem.Add(0, _FamilyStoreItemP); } for (int i = 0; i < info.Count; i++) { if (_DicfamilyStoreItem.ContainsKey(info.StoreItemList[i].Index + 1)) continue; FamilyStoreItem _FamilyStoreItem = new FamilyStoreItem(); _FamilyStoreItem.ItemData = JsonUtility.FromJson<FamilyStoreItem.ItemJsonData>(info.StoreItemList[i].ItemData); _FamilyStoreItem.Index = info.StoreItemList[i].Index + 1; _FamilyStoreItem.ItemID = (int)info.StoreItemList[i].ItemID; _FamilyStoreItem._UserData = ConfigParse.Analysis(_FamilyStoreItem.ItemData.UserData); _DicfamilyStoreItem.Add((int)info.StoreItemList[i].Index + 1, _FamilyStoreItem); } if (Event_FamilyStoreItemInfo != null) { Event_FamilyStoreItemInfo(); } IsShowRedPoint(); } List<int> List = new List<int>(); public void WarehouseToRefresh(byte[] _list)//仓库刷新 { List.Clear(); for (int i = 0; i < _list.Length; i++) { List.Add(_list[i] + 1); } if (Del_FamilyStoreItemInfo != null) { Del_FamilyStoreItemInfo(List); } IsShowRedPoint(); } public void FamilyStoreDel(int _index, int ClearType)//家族仓库物品删除(清除的格子索引, 仅单格子清除时有效,从0开始代表第一格,0-单格子清除; 1-所有物品清除) { if (_DicfamilyStoreItem.ContainsKey(_index + 1) && ClearType == 0) { _DicfamilyStoreItem.Remove(_index + 1); } if (ClearType == 1) { _DicfamilyStoreItem.Clear(); if (!_DicfamilyStoreItem.ContainsKey(0)) { FamilyStoreItem _FamilyStoreItemP = new FamilyStoreItem(); _FamilyStoreItemP.Index = 0; FuncConfigConfig _PetFoodExchange = FuncConfigConfig.Get("PetFoodExchange"); _FamilyStoreItemP.ItemID = int.Parse(_PetFoodExchange.Numerical1); _DicfamilyStoreItem.Add(0, _FamilyStoreItemP); } } } public void FamilyActionInfo(HA403_tagGCFamilyActionInfo info)//接收家族行为信息 { _InformationList.Clear(); for (int i = 0; i < info.Count; i++) { FamilyActionInfoClass _FamilyActionInfoClass = new FamilyActionInfoClass(); _FamilyActionInfoClass.FamilyID = (int)info.FamilyID; _FamilyActionInfoClass.ActionType = (int)info.ActionType; _FamilyActionInfoClass.Time = (int)info.FamilyActionList[i].Time; _FamilyActionInfoClass.Name = info.FamilyActionList[i].Name; _FamilyActionInfoClass.OperationType = (int)info.FamilyActionList[i].Value1; _FamilyActionInfoClass.PlayerID = (int)info.FamilyActionList[i].Value2; _FamilyActionInfoClass.ItemID = (int)info.FamilyActionList[i].Value3; _FamilyActionInfoClass.ItemData = JsonUtility.FromJson<FamilyActionInfoClass.ItemJsonData>(info.FamilyActionList[i].UseData); _FamilyActionInfoClass._UserData = ConfigParse.Analysis(_FamilyActionInfoClass.ItemData.UserData); _InformationList.Add(_FamilyActionInfoClass); } if (Event_FamilyActionInfo != null) Event_FamilyActionInfo();//家族行为信息的刷新 } private bool IsEquipmentComparison() { bool IsBool = false; SinglePack singlePack = playerPack.GetSinglePack(PackType.Equip); for (int i = 0; i < EquipmentList.Count; i++) { ItemModel ItemModel = singlePack.GetItemByIndex(i); int Type = i; if (ItemModel != null) { foreach (var key in _DicfamilyStoreItem.Keys) { if (key == 0) { continue; } int ItemId = _DicfamilyStoreItem[key].ItemID; var itemConfig = ItemConfig.Get(ItemId); int RealmLevel = PlayerDatas.Instance.baseData.realmLevel; int equipScore = ItemLogicUtility.Instance.GetEquipScore(PackType.Equip, ItemId, _DicfamilyStoreItem[key]._UserData); if (ItemModel.config.EquipPlace == Type && RealmLevel >= itemConfig.RealmLimit && equipScore >= ItemModel.equipScore) { IsBool = true; } } } else { foreach (var key in _DicfamilyStoreItem.Keys) { if (key == 0) { continue; } int ItemId = _DicfamilyStoreItem[key].ItemID; var itemConfig = ItemConfig.Get(ItemId); int RealmLevel = PlayerDatas.Instance.baseData.realmLevel; if (itemConfig.EquipPlace == Type && RealmLevel >= itemConfig.RealmLimit) { IsBool = true; } } } } return IsBool; } private void IsShowRedPoint() { int GetDayOfYear = DateTime.Now.DayOfYear; string strKey= "Treasure"+ PlayerDatas.Instance.baseData.PlayerID; int day = LocalSave.GetInt(strKey); if (day != GetDayOfYear && IsEquipmentComparison()) { LocalSave.SetInt(strKey, GetDayOfYear); IsShowPoint = true; } if (IsShowPoint) { redPointStre1.state = RedPointState.Simple; } else { redPointStre1.state = RedPointState.None; } } private void Updatefighting(PlayerDataRefresh obj)//刷新境界 { if (obj == PlayerDataRefresh.OfficialRank) { IsShowRedPoint(); } } private void RedPointUpdate() { IsShowRedPoint(); } } using System.Collections; using System.Collections.Generic; using UnityEngine; using System; using Snxxz.UI; //仙盟宝库 public class FamilyStoreItem//家族仓库物品信息 { public int Index;//仓库格子索引 public int ItemID;//物品ID public ItemJsonData ItemData; public Dictionary<int, List<int>> _UserData; [Serializable] public class ItemJsonData { public string UserData; public int IsSuit; public int EquipGS; } } public class FamilyActionInfoClass//接收家族行为信息 { public int FamilyID;//家族ID public int ActionType;//类型 public int Time;//时间 public string Name;//玩家名 public int OperationType;//操作类型1-捐献，2-兑换，3-销毁 public int PlayerID;//操作的玩家ID; public int ItemID;//物品ID public ItemJsonData ItemData; public Dictionary<int, List<int>> _UserData; [Serializable] public class ItemJsonData { public int ItemID; public string UserData; public int IsSuit; public int EquipGS; } } public class FairyAuTreasureModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk { public Dictionary<int, FamilyStoreItem> _DicfamilyStoreItem = new Dictionary<int, FamilyStoreItem>();//家族仓库物品信息 public List<FamilyActionInfoClass> _InformationList = new List<FamilyActionInfoClass>(); public delegate void OnFairyAuIntegral(); public static event OnFairyAuIntegral Event_FairyAuIntegral;//用于仙盟积分的刷新 public delegate void OnFamilyActionInfo(); public static event OnFamilyActionInfo Event_FamilyActionInfo;//家族行为信息的刷新 public delegate void OnFamilyStoreItemInfo(); public static event OnFamilyStoreItemInfo Event_FamilyStoreItemInfo;//仓库信息的刷新 public static event Action<List<int>> Del_FamilyStoreItemInfo;//仓库信息物品的删除 PackModel _playerPack; PackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PackModel>()); } } public int _FairyAuIntegral = 0;//获取仙盟积分 public List<int> JumpItemID = new List<int>();//从跳转到仙盟仓库需要选中高亮 List<int> EquipmentList = new List<int>();//关于装备位置 public bool IsShowPoint = false;//是否显示红点 private const int Redpoint_key1 = 1070103; public Redpoint redPointStre1 = new Redpoint(10701, Redpoint_key1);//仙盟仓库红点 public override void Init() { var funConfig = FuncConfigConfig.Get("StrengthenDisplay"); int[] List = ConfigParse.GetMultipleStr<int>(funConfig.Numerical1); EquipmentList.Clear(); for (int i = 0; i < List.Length; i++) { EquipmentList.Add(List[i]); } } public override void UnInit() { } public void OnBeforePlayerDataInitialize() { _DicfamilyStoreItem.Clear(); _FairyAuIntegral = 0; } public void OnPlayerLoginOk() { PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= Updatefighting;//数据的刷新(h0418) PlayerDatas.Instance.PlayerDataRefreshInfoEvent += Updatefighting; WarehouseTipsWin.RedPointUpdate -= RedPointUpdate; WarehouseTipsWin.RedPointUpdate += RedPointUpdate; } public void FairyAuIntegral(int value)//获取仙盟积分 { _FairyAuIntegral = value; if (Event_FairyAuIntegral != null) Event_FairyAuIntegral(); } public void FamilyStoreItemInfo(HA406_tagGCFamilyStoreItemInfo info)//家族仓库信息 { if (!_DicfamilyStoreItem.ContainsKey(0)) { FamilyStoreItem _FamilyStoreItemP = new FamilyStoreItem(); _FamilyStoreItemP.Index = 0; FuncConfigConfig _PetFoodExchange = FuncConfigConfig.Get("PetFoodExchange"); _FamilyStoreItemP.ItemID = int.Parse(_PetFoodExchange.Numerical1); _DicfamilyStoreItem.Add(0, _FamilyStoreItemP); } for (int i = 0; i < info.Count; i++) { if (_DicfamilyStoreItem.ContainsKey(info.StoreItemList[i].Index + 1)) continue; FamilyStoreItem _FamilyStoreItem = new FamilyStoreItem(); _FamilyStoreItem.ItemData = JsonUtility.FromJson<FamilyStoreItem.ItemJsonData>(info.StoreItemList[i].ItemData); _FamilyStoreItem.Index = info.StoreItemList[i].Index + 1; _FamilyStoreItem.ItemID = (int)info.StoreItemList[i].ItemID; _FamilyStoreItem._UserData = ConfigParse.Analysis(_FamilyStoreItem.ItemData.UserData); _DicfamilyStoreItem.Add((int)info.StoreItemList[i].Index + 1, _FamilyStoreItem); } if (Event_FamilyStoreItemInfo != null) { Event_FamilyStoreItemInfo(); } IsShowRedPoint(); } List<int> List = new List<int>(); public void WarehouseToRefresh(byte[] _list)//仓库刷新 { List.Clear(); for (int i = 0; i < _list.Length; i++) { List.Add(_list[i] + 1); } if (Del_FamilyStoreItemInfo != null) { Del_FamilyStoreItemInfo(List); } IsShowRedPoint(); } public void FamilyStoreDel(int _index, int ClearType)//家族仓库物品删除(清除的格子索引, 仅单格子清除时有效,从0开始代表第一格,0-单格子清除; 1-所有物品清除) { if (_DicfamilyStoreItem.ContainsKey(_index + 1) && ClearType == 0) { _DicfamilyStoreItem.Remove(_index + 1); } if (ClearType == 1) { _DicfamilyStoreItem.Clear(); if (!_DicfamilyStoreItem.ContainsKey(0)) { FamilyStoreItem _FamilyStoreItemP = new FamilyStoreItem(); _FamilyStoreItemP.Index = 0; FuncConfigConfig _PetFoodExchange = FuncConfigConfig.Get("PetFoodExchange"); _FamilyStoreItemP.ItemID = int.Parse(_PetFoodExchange.Numerical1); _DicfamilyStoreItem.Add(0, _FamilyStoreItemP); } } } public void FamilyActionInfo(HA403_tagGCFamilyActionInfo info)//接收家族行为信息 { _InformationList.Clear(); for (int i = 0; i < info.Count; i++) { FamilyActionInfoClass _FamilyActionInfoClass = new FamilyActionInfoClass(); _FamilyActionInfoClass.FamilyID = (int)info.FamilyID; _FamilyActionInfoClass.ActionType = (int)info.ActionType; _FamilyActionInfoClass.Time = (int)info.FamilyActionList[i].Time; _FamilyActionInfoClass.Name = info.FamilyActionList[i].Name; _FamilyActionInfoClass.OperationType = (int)info.FamilyActionList[i].Value1; _FamilyActionInfoClass.PlayerID = (int)info.FamilyActionList[i].Value2; _FamilyActionInfoClass.ItemID = (int)info.FamilyActionList[i].Value3; _FamilyActionInfoClass.ItemData = JsonUtility.FromJson<FamilyActionInfoClass.ItemJsonData>(info.FamilyActionList[i].UseData); _FamilyActionInfoClass._UserData = ConfigParse.Analysis(_FamilyActionInfoClass.ItemData.UserData); _InformationList.Add(_FamilyActionInfoClass); } if (Event_FamilyActionInfo != null) Event_FamilyActionInfo();//家族行为信息的刷新 } private bool IsEquipmentComparison() { bool IsBool = false; SinglePack singlePack = playerPack.GetSinglePack(PackType.Equip); for (int i = 0; i < EquipmentList.Count; i++) { ItemModel ItemModel = singlePack.GetItemByIndex(i); int Type = i; if (ItemModel != null) { foreach (var key in _DicfamilyStoreItem.Keys) { if (key == 0) { continue; } int ItemId = _DicfamilyStoreItem[key].ItemID; var itemConfig = ItemConfig.Get(ItemId); int RealmLevel = PlayerDatas.Instance.baseData.realmLevel; int equipScore = ItemLogicUtility.Instance.GetEquipScore(PackType.Equip, ItemId, _DicfamilyStoreItem[key]._UserData); if (ItemModel.config.EquipPlace == Type && RealmLevel >= itemConfig.RealmLimit && equipScore >= ItemModel.equipScore) { IsBool = true; } } } else { foreach (var key in _DicfamilyStoreItem.Keys) { if (key == 0) { continue; } int ItemId = _DicfamilyStoreItem[key].ItemID; var itemConfig = ItemConfig.Get(ItemId); int RealmLevel = PlayerDatas.Instance.baseData.realmLevel; if (itemConfig.EquipPlace == Type && RealmLevel >= itemConfig.RealmLimit) { IsBool = true; } } } } return IsBool; } private void IsShowRedPoint() { int GetDayOfYear = DateTime.Now.DayOfYear; string strKey= "Treasure"+ PlayerDatas.Instance.baseData.PlayerID; int day = LocalSave.GetInt(strKey); if (day != GetDayOfYear && IsEquipmentComparison()) { LocalSave.SetInt(strKey, GetDayOfYear); IsShowPoint = true; } if (IsShowPoint) { redPointStre1.state = RedPointState.Simple; } else { redPointStre1.state = RedPointState.None; } } private void Updatefighting(PlayerDataRefresh obj)//刷新境界 { if (obj == PlayerDataRefresh.OfficialRank) { IsShowRedPoint(); } } private void RedPointUpdate() { IsShowRedPoint(); } } System/FairyAu/FairyAuTreasureModel.cs.meta
System/FairyAu/GiveRedBagTipsWin.cs
@@ -38,8 +38,8 @@ // private int _Number = 0;//用来获取仙盟的人数 private int _RedLines = 0;//红包额度 PlayerRedPacketDatas m_RedPacket; PlayerRedPacketDatas redPacket { get { return m_RedPacket ?? (m_RedPacket = ModelCenter.Instance.GetModel<PlayerRedPacketDatas>()); } } RedPacketModel m_RedPacket; RedPacketModel redPacket { get { return m_RedPacket ?? (m_RedPacket = ModelCenter.Instance.GetModel<RedPacketModel>()); } } protected override void BindController() { System/FairyAu/PlayerRedPacketDatas.cs.meta
File was deleted System/FairyAu/RedBagScripts.cs
@@ -34,8 +34,8 @@ } [SerializeField] Button RedBagBtn;//红包 PlayerRedPacketDatas m_RedPacket; PlayerRedPacketDatas redPacket { get { return m_RedPacket ?? (m_RedPacket = ModelCenter.Instance.GetModel<PlayerRedPacketDatas>()); } } RedPacketModel m_RedPacket; RedPacketModel redPacket { get { return m_RedPacket ?? (m_RedPacket = ModelCenter.Instance.GetModel<RedPacketModel>()); } } public void RedPacket(int State ,int redPackeIndex)//关于红包类型 { m_NullObj.SetActive(false); System/FairyAu/RedBagTipsWin.cs
@@ -26,8 +26,8 @@ [SerializeField] Button _CloseBtn;//关闭按钮 private int _PlayerID;//获取玩家的ID public bool _RedBool = false;//用来控制判断是否V6红包 PlayerRedPacketDatas m_RedPacket; PlayerRedPacketDatas redPacket { get { return m_RedPacket ?? (m_RedPacket = ModelCenter.Instance.GetModel<PlayerRedPacketDatas>()); } } RedPacketModel m_RedPacket; RedPacketModel redPacket { get { return m_RedPacket ?? (m_RedPacket = ModelCenter.Instance.GetModel<RedPacketModel>()); } } #region Built-in protected override void BindController() { @@ -42,8 +42,8 @@ protected override void OnPreOpen() { PlayerRedPacketDatas.Event_RedEnvelopeToAdd += RedEnvelopeToAdd;//红包的添加 PlayerRedPacketDatas.Event_RedEnvelopeToRefresh += RedEnvelopeToRefresh;//红包的刷新 RedPacketModel.Event_RedEnvelopeToAdd += RedEnvelopeToAdd;//红包的添加 RedPacketModel.Event_RedEnvelopeToRefresh += RedEnvelopeToRefresh;//红包的刷新 //PlayerRedPacketDatas.Event_DetailsRedEnvelopeRefresh += DetailsRedEnvelopeRefresh;//红包详情刷新 m_ScrollerController.OnRefreshCell += OnRefreshGridCell; m_ScrollerController1.OnRefreshCell += BulletinBoard; @@ -66,8 +66,8 @@ m_ScrollerController1.OnRefreshCell -= BulletinBoard; m_ScrollerController.OnRefreshCell -= OnRefreshGridCell; //PlayerRedPacketDatas.Event_DetailsRedEnvelopeRefresh -= DetailsRedEnvelopeRefresh;//红包详情刷新 PlayerRedPacketDatas.Event_RedEnvelopeToAdd -= RedEnvelopeToAdd;//红包的添加 PlayerRedPacketDatas.Event_RedEnvelopeToRefresh -= RedEnvelopeToRefresh;//红包的刷新 RedPacketModel.Event_RedEnvelopeToAdd -= RedEnvelopeToAdd;//红包的添加 RedPacketModel.Event_RedEnvelopeToRefresh -= RedEnvelopeToRefresh;//红包的刷新 } private void BulletinBoard(ScrollerDataType type, CellView cell)//公告栏生成位置 System/FairyAu/RedDetailsTipsWin.cs
@@ -25,8 +25,8 @@ [SerializeField] Button m_SpaceClose; [SerializeField] Button m_CloseSfxBtn; #region Built-in PlayerRedPacketDatas m_RedPacket; PlayerRedPacketDatas redPacket { get { return m_RedPacket ?? (m_RedPacket = ModelCenter.Instance.GetModel<PlayerRedPacketDatas>()); } } RedPacketModel m_RedPacket; RedPacketModel redPacket { get { return m_RedPacket ?? (m_RedPacket = ModelCenter.Instance.GetModel<RedPacketModel>()); } } RedEnvelopeModel envelopeModel { get { return ModelCenter.Instance.GetModel<RedEnvelopeModel>(); } } protected override void BindController() { System/FairyAu/RedPacketModel.cs
File was renamed from System/FairyAu/PlayerRedPacketDatas.cs @@ -1,43 +1,43 @@ using Snxxz.UI; using System; using Snxxz.UI; using System; using System.Collections; using System.Collections.Generic; using System.Linq; using UnityEngine; //红包信息 public class FamilyRedPacket//红包信息 { public int RedPacketID;//红包唯一ID public int PlayerID;//玩家ID public string Name;//玩家名字 public int Time;//时间 public int PlayeJob;//玩家职业 public int MoneyType;//金钱类型//1是V6红包 public int MoneyNum;//金钱数量 public int GetWay; //获得途径 public int PacketCnt; //可抢个数 public int State; //0未发,1未领取,2已领取,3全部领完 public string Wish; //祝福语 } public class FamilyRedPacktGrabinfo//家族抢红包的信息 { public string Name;//玩家名字 public int PlayerJob;//玩家职业 public int MoneyNum;//金钱数量 using System.Linq; using UnityEngine; //红包信息 public class FamilyRedPacket//红包信息 { public int RedPacketID;//红包唯一ID public int PlayerID;//玩家ID public string Name;//玩家名字 public int Time;//时间 public int PlayeJob;//玩家职业 public int MoneyType;//金钱类型//1是V6红包 public int MoneyNum;//金钱数量 public int GetWay; //获得途径 public int PacketCnt; //可抢个数 public int State; //0未发,1未领取,2已领取,3全部领完 public string Wish; //祝福语 } public class PlayerRedPacketDatas : Model, IBeforePlayerDataInitialize, IPlayerLoginOk { public Dictionary<int, FamilyRedPacket> _DicRedBag = new Dictionary<int, FamilyRedPacket>();//接收红包信息 public Dictionary<int, FamilyRedPacktGrabinfo> _DicRedGrabinfo = new Dictionary<int, FamilyRedPacktGrabinfo>();//获取抢红包的信息字典 public delegate void RedEnvelopeToAdd(FamilyRedPacket _familyRedPacket); public class FamilyRedPacktGrabinfo//家族抢红包的信息 { public string Name;//玩家名字 public int PlayerJob;//玩家职业 public int MoneyNum;//金钱数量 } public class RedPacketModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk { public Dictionary<int, FamilyRedPacket> _DicRedBag = new Dictionary<int, FamilyRedPacket>();//接收红包信息 public Dictionary<int, FamilyRedPacktGrabinfo> _DicRedGrabinfo = new Dictionary<int, FamilyRedPacktGrabinfo>();//获取抢红包的信息字典 public delegate void RedEnvelopeToAdd(FamilyRedPacket _familyRedPacket); public static event RedEnvelopeToAdd Event_RedEnvelopeToAdd;//红包的添加 public delegate void RedEnvelopeToRefresh(FamilyRedPacket _familyRedPacket); public static event RedEnvelopeToRefresh Event_RedEnvelopeToRefresh;//红包的刷新 @@ -53,258 +53,258 @@ public int redpackDetailId = 0; public bool IsRedBagGetBool = false; public static event Action OnRedBagGetEvent;//是否有可领取的红包 private const int Redpoint_key1 = 1070202; public Redpoint redPointStre1 = new Redpoint(10702, Redpoint_key1); public int RedEnvelopeID = 0;//发红包的ID（用于默认弹出开） private int GrabRedBagId = 0; public override void Init() { PlayerDatas.Instance.fairyData.OnRefreshFairyMine += OnRefreshFairyMine; } public override void UnInit() { } public void OnBeforePlayerDataInitialize() { UseLimit = 0; RedEnvelopeID = 0; IsRedBagGetBool = false; RedBagId = 0; } public void OnPlayerLoginOk() { public static event Action OnRedBagGetEvent;//是否有可领取的红包 private const int Redpoint_key1 = 1070202; public Redpoint redPointStre1 = new Redpoint(10702, Redpoint_key1); public int RedEnvelopeID = 0;//发红包的ID（用于默认弹出开） private int GrabRedBagId = 0; public override void Init() { PlayerDatas.Instance.fairyData.OnRefreshFairyMine += OnRefreshFairyMine; } private void OnRefreshFairyMine()//退出仙盟 { if (_DicRedBag.Count > 0 && !PlayerDatas.Instance.fairyData.HasFairy) { var list = _DicRedBag.Values.ToList(); for (int i = 0; i < list.Count; i++) { if (IsDisplayInFamily(list[i].GetWay)) { _DicRedBag.Remove(list[i].RedPacketID); } } } public override void UnInit() { } public void RedEnvelopeInfo(HA404_tagGCFamilyRedPacketInfo info)//家族红包总信息 { if ((int)info.IsAll == 1) { _DicRedBag.Clear(); for (int i = 0; i < info.Count; i++) { if (!_DicRedBag.ContainsKey((int)info.RedPacketInfo[i].RedPacketID)) { FamilyRedPacket _familyRed = new FamilyRedPacket(); _familyRed.RedPacketID = (int)info.RedPacketInfo[i].RedPacketID; _familyRed.PlayerID = (int)info.RedPacketInfo[i].PlayerID; _familyRed.Name = info.RedPacketInfo[i].Name; _familyRed.Time = (int)info.RedPacketInfo[i].Time; _familyRed.PlayeJob = (int)info.RedPacketInfo[i].PlayeJob; _familyRed.MoneyType = (int)info.RedPacketInfo[i].MoneyType; _familyRed.MoneyNum = (int)info.RedPacketInfo[i].MoneyNum; _familyRed.GetWay = (int)info.RedPacketInfo[i].GetWay; _familyRed.PacketCnt = (int)info.RedPacketInfo[i].PacketCnt; _familyRed.State = (int)info.RedPacketInfo[i].State; _familyRed.Wish = (string)info.RedPacketInfo[i].Wish; _DicRedBag.Add((int)info.RedPacketInfo[i].RedPacketID, _familyRed); } } } else { for (int i = 0; i < info.Count; i++) { if (!_DicRedBag.ContainsKey((int)info.RedPacketInfo[i].RedPacketID)) { FamilyRedPacket _familyRed = new FamilyRedPacket(); _familyRed.RedPacketID = (int)info.RedPacketInfo[i].RedPacketID; _familyRed.PlayerID = (int)info.RedPacketInfo[i].PlayerID; _familyRed.Name = info.RedPacketInfo[i].Name; _familyRed.Time = (int)info.RedPacketInfo[i].Time; _familyRed.PlayeJob = (int)info.RedPacketInfo[i].PlayeJob; _familyRed.MoneyType = (int)info.RedPacketInfo[i].MoneyType; _familyRed.MoneyNum = (int)info.RedPacketInfo[i].MoneyNum; _familyRed.GetWay = (int)info.RedPacketInfo[i].GetWay; _familyRed.PacketCnt = (int)info.RedPacketInfo[i].PacketCnt; _familyRed.State = (int)info.RedPacketInfo[i].State; _familyRed.Wish = (string)info.RedPacketInfo[i].Wish; _DicRedBag.Add((int)info.RedPacketInfo[i].RedPacketID, _familyRed); if (Event_RedEnvelopeToAdd != null) Event_RedEnvelopeToAdd(_familyRed); } else { _DicRedBag[(int)info.RedPacketInfo[i].RedPacketID].RedPacketID = (int)info.RedPacketInfo[i].RedPacketID; _DicRedBag[(int)info.RedPacketInfo[i].RedPacketID].PlayerID = (int)info.RedPacketInfo[i].PlayerID; _DicRedBag[(int)info.RedPacketInfo[i].RedPacketID].Name = info.RedPacketInfo[i].Name; _DicRedBag[(int)info.RedPacketInfo[i].RedPacketID].Time = (int)info.RedPacketInfo[i].Time; _DicRedBag[(int)info.RedPacketInfo[i].RedPacketID].PlayeJob = (int)info.RedPacketInfo[i].PlayeJob; _DicRedBag[(int)info.RedPacketInfo[i].RedPacketID].MoneyType = (int)info.RedPacketInfo[i].MoneyType; _DicRedBag[(int)info.RedPacketInfo[i].RedPacketID].MoneyNum = (int)info.RedPacketInfo[i].MoneyNum; _DicRedBag[(int)info.RedPacketInfo[i].RedPacketID].GetWay = (int)info.RedPacketInfo[i].GetWay; _DicRedBag[(int)info.RedPacketInfo[i].RedPacketID].PacketCnt = (int)info.RedPacketInfo[i].PacketCnt; _DicRedBag[(int)info.RedPacketInfo[i].RedPacketID].State = (int)info.RedPacketInfo[i].State; if ((int)info.RedPacketInfo[i].RedPacketID == GrabRedBagId) { var Values = _DicRedGrabinfo.Values; foreach (var value in Values) { if (value.Name == PlayerDatas.Instance.baseData.PlayerName) { _DicRedBag[(int)info.RedPacketInfo[i].RedPacketID].State = 2; } } } _DicRedBag[(int)info.RedPacketInfo[i].RedPacketID].Wish = (string)info.RedPacketInfo[i].Wish; if (Event_RedEnvelopeToRefresh != null) { Event_RedEnvelopeToRefresh(_DicRedBag[(int)info.RedPacketInfo[i].RedPacketID]); RedBagPoppingOpen(); } } } } IsRedBagGet(); RedPacketRedDot(); } private void RedBagPoppingOpen() { if (_DicRedBag.ContainsKey(RedEnvelopeID) && WindowCenter.Instance.IsOpen<RedBagTipsWin>()) { var redBag = _DicRedBag[RedEnvelopeID]; if (IsDisplayInFamily(redBag.GetWay) && redBag.GetWay != 0 && redBag.PlayerID == PlayerDatas.Instance.PlayerId && redBag.State == 1) { RedBagId = RedEnvelopeID; WindowCenter.Instance.Open<RedpackOpenWin>();//打开领取界面 } } } public void IsRedBagGet() { IsRedBagGetBool = false; foreach (var value in _DicRedBag.Values) { if (!IsDisplayInFamily(value.GetWay)) { continue; } if (value.State == 1) { IsRedBagGetBool = true; } } if (IsRedBagGetBool) { if (OnRedBagGetEvent != null) { OnRedBagGetEvent(); } } } private void RedPacketRedDot() { redPointStre1.state = RedPointState.None; bool _bool = false; foreach (var value in _DicRedBag.Values) { if (value.PlayerID == PlayerDatas.Instance.baseData.PlayerID && value.State == 0 && IsDisplayInFamily(value.GetWay)) { _bool = true; } if (value.State == 1 && IsDisplayInFamily(value.GetWay)) { _bool = true; } } if (_bool) { redPointStre1.state = RedPointState.Simple; } } public string RedPacketMaxName = null;//最大红包数量的ID public void GrabRedEnvelope( HA405_tagGCFamilyRedPacketGrabInfo info)//家族抢红包信息 { GrabRedBagId = (int)info.RedPacketID; int _moneyNum = 0; _DicRedGrabinfo.Clear(); for (int i = 0; i < info.Count;i++) { if (!_DicRedGrabinfo.ContainsKey(i)) { FamilyRedPacktGrabinfo _familyRed = new FamilyRedPacktGrabinfo(); _familyRed.Name = info.GrabInfo[i].Name; _familyRed.PlayerJob = info.GrabInfo[i].PlayeJob; _familyRed.MoneyNum = (int)info.GrabInfo[i].MoneyNum; if ((int)info.GrabInfo[i].MoneyNum > _moneyNum) { _moneyNum = (int)info.GrabInfo[i].MoneyNum; RedPacketMaxName = info.GrabInfo[i].Name; } _DicRedGrabinfo.Add(i, _familyRed); } } if (Event_DetailsRedEnvelopeRefresh != null) Event_DetailsRedEnvelopeRefresh(); } public bool IsDisplayInFamily(int getWay) { if (getWay == 5) { return false; } if (getWay == FestivalRedpackModel.FESTIVALSYSTEMREDPACK1 || getWay == FestivalRedpackModel.FESTIVALSYSTEMREDPACK2 || getWay == FestivalRedpackModel.FESTIVALTASKREDPACKTYPE) { return false; } return true; } public void OnBeforePlayerDataInitialize() { UseLimit = 0; RedEnvelopeID = 0; IsRedBagGetBool = false; RedBagId = 0; } public void OnPlayerLoginOk() { } private void OnRefreshFairyMine()//退出仙盟 { if (_DicRedBag.Count > 0 && !PlayerDatas.Instance.fairyData.HasFairy) { var list = _DicRedBag.Values.ToList(); for (int i = 0; i < list.Count; i++) { if (IsDisplayInFamily(list[i].GetWay)) { _DicRedBag.Remove(list[i].RedPacketID); } } } } public void RedEnvelopeInfo(HA404_tagGCFamilyRedPacketInfo info)//家族红包总信息 { if ((int)info.IsAll == 1) { _DicRedBag.Clear(); for (int i = 0; i < info.Count; i++) { if (!_DicRedBag.ContainsKey((int)info.RedPacketInfo[i].RedPacketID)) { FamilyRedPacket _familyRed = new FamilyRedPacket(); _familyRed.RedPacketID = (int)info.RedPacketInfo[i].RedPacketID; _familyRed.PlayerID = (int)info.RedPacketInfo[i].PlayerID; _familyRed.Name = info.RedPacketInfo[i].Name; _familyRed.Time = (int)info.RedPacketInfo[i].Time; _familyRed.PlayeJob = (int)info.RedPacketInfo[i].PlayeJob; _familyRed.MoneyType = (int)info.RedPacketInfo[i].MoneyType; _familyRed.MoneyNum = (int)info.RedPacketInfo[i].MoneyNum; _familyRed.GetWay = (int)info.RedPacketInfo[i].GetWay; _familyRed.PacketCnt = (int)info.RedPacketInfo[i].PacketCnt; _familyRed.State = (int)info.RedPacketInfo[i].State; _familyRed.Wish = (string)info.RedPacketInfo[i].Wish; _DicRedBag.Add((int)info.RedPacketInfo[i].RedPacketID, _familyRed); } } } else { for (int i = 0; i < info.Count; i++) { if (!_DicRedBag.ContainsKey((int)info.RedPacketInfo[i].RedPacketID)) { FamilyRedPacket _familyRed = new FamilyRedPacket(); _familyRed.RedPacketID = (int)info.RedPacketInfo[i].RedPacketID; _familyRed.PlayerID = (int)info.RedPacketInfo[i].PlayerID; _familyRed.Name = info.RedPacketInfo[i].Name; _familyRed.Time = (int)info.RedPacketInfo[i].Time; _familyRed.PlayeJob = (int)info.RedPacketInfo[i].PlayeJob; _familyRed.MoneyType = (int)info.RedPacketInfo[i].MoneyType; _familyRed.MoneyNum = (int)info.RedPacketInfo[i].MoneyNum; _familyRed.GetWay = (int)info.RedPacketInfo[i].GetWay; _familyRed.PacketCnt = (int)info.RedPacketInfo[i].PacketCnt; _familyRed.State = (int)info.RedPacketInfo[i].State; _familyRed.Wish = (string)info.RedPacketInfo[i].Wish; _DicRedBag.Add((int)info.RedPacketInfo[i].RedPacketID, _familyRed); if (Event_RedEnvelopeToAdd != null) Event_RedEnvelopeToAdd(_familyRed); } else { _DicRedBag[(int)info.RedPacketInfo[i].RedPacketID].RedPacketID = (int)info.RedPacketInfo[i].RedPacketID; _DicRedBag[(int)info.RedPacketInfo[i].RedPacketID].PlayerID = (int)info.RedPacketInfo[i].PlayerID; _DicRedBag[(int)info.RedPacketInfo[i].RedPacketID].Name = info.RedPacketInfo[i].Name; _DicRedBag[(int)info.RedPacketInfo[i].RedPacketID].Time = (int)info.RedPacketInfo[i].Time; _DicRedBag[(int)info.RedPacketInfo[i].RedPacketID].PlayeJob = (int)info.RedPacketInfo[i].PlayeJob; _DicRedBag[(int)info.RedPacketInfo[i].RedPacketID].MoneyType = (int)info.RedPacketInfo[i].MoneyType; _DicRedBag[(int)info.RedPacketInfo[i].RedPacketID].MoneyNum = (int)info.RedPacketInfo[i].MoneyNum; _DicRedBag[(int)info.RedPacketInfo[i].RedPacketID].GetWay = (int)info.RedPacketInfo[i].GetWay; _DicRedBag[(int)info.RedPacketInfo[i].RedPacketID].PacketCnt = (int)info.RedPacketInfo[i].PacketCnt; _DicRedBag[(int)info.RedPacketInfo[i].RedPacketID].State = (int)info.RedPacketInfo[i].State; if ((int)info.RedPacketInfo[i].RedPacketID == GrabRedBagId) { var Values = _DicRedGrabinfo.Values; foreach (var value in Values) { if (value.Name == PlayerDatas.Instance.baseData.PlayerName) { _DicRedBag[(int)info.RedPacketInfo[i].RedPacketID].State = 2; } } } _DicRedBag[(int)info.RedPacketInfo[i].RedPacketID].Wish = (string)info.RedPacketInfo[i].Wish; if (Event_RedEnvelopeToRefresh != null) { Event_RedEnvelopeToRefresh(_DicRedBag[(int)info.RedPacketInfo[i].RedPacketID]); RedBagPoppingOpen(); } } } } IsRedBagGet(); RedPacketRedDot(); } private void RedBagPoppingOpen() { if (_DicRedBag.ContainsKey(RedEnvelopeID) && WindowCenter.Instance.IsOpen<RedBagTipsWin>()) { var redBag = _DicRedBag[RedEnvelopeID]; if (IsDisplayInFamily(redBag.GetWay) && redBag.GetWay != 0 && redBag.PlayerID == PlayerDatas.Instance.PlayerId && redBag.State == 1) { RedBagId = RedEnvelopeID; WindowCenter.Instance.Open<RedpackOpenWin>();//打开领取界面 } } } public void IsRedBagGet() { IsRedBagGetBool = false; foreach (var value in _DicRedBag.Values) { if (!IsDisplayInFamily(value.GetWay)) { continue; } if (value.State == 1) { IsRedBagGetBool = true; } } if (IsRedBagGetBool) { if (OnRedBagGetEvent != null) { OnRedBagGetEvent(); } } } private void RedPacketRedDot() { redPointStre1.state = RedPointState.None; bool _bool = false; foreach (var value in _DicRedBag.Values) { if (value.PlayerID == PlayerDatas.Instance.baseData.PlayerID && value.State == 0 && IsDisplayInFamily(value.GetWay)) { _bool = true; } if (value.State == 1 && IsDisplayInFamily(value.GetWay)) { _bool = true; } } if (_bool) { redPointStre1.state = RedPointState.Simple; } } public string RedPacketMaxName = null;//最大红包数量的ID public void GrabRedEnvelope( HA405_tagGCFamilyRedPacketGrabInfo info)//家族抢红包信息 { GrabRedBagId = (int)info.RedPacketID; int _moneyNum = 0; _DicRedGrabinfo.Clear(); for (int i = 0; i < info.Count;i++) { if (!_DicRedGrabinfo.ContainsKey(i)) { FamilyRedPacktGrabinfo _familyRed = new FamilyRedPacktGrabinfo(); _familyRed.Name = info.GrabInfo[i].Name; _familyRed.PlayerJob = info.GrabInfo[i].PlayeJob; _familyRed.MoneyNum = (int)info.GrabInfo[i].MoneyNum; if ((int)info.GrabInfo[i].MoneyNum > _moneyNum) { _moneyNum = (int)info.GrabInfo[i].MoneyNum; RedPacketMaxName = info.GrabInfo[i].Name; } _DicRedGrabinfo.Add(i, _familyRed); } } if (Event_DetailsRedEnvelopeRefresh != null) Event_DetailsRedEnvelopeRefresh(); } public bool IsDisplayInFamily(int getWay) { if (getWay == 5) { return false; } if (getWay == FestivalRedpackModel.FESTIVALSYSTEMREDPACK1 || getWay == FestivalRedpackModel.FESTIVALSYSTEMREDPACK2 || getWay == FestivalRedpackModel.FESTIVALTASKREDPACKTYPE) { return false; } return true; } } System/FairyAu/RedPacketModel.cs.meta
File was renamed from System/SystemSetting/ActivitiesPushMgr.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: e05d215b8c30a264eb3c61935dbbd3e8 timeCreated: 1533286661 guid: b96d301c7646c3e429a4aa1801f9b96f timeCreated: 1551078596 licenseType: Pro MonoImporter: serializedVersion: 2 System/FairyAu/RedpackOpenWin.cs
@@ -18,7 +18,7 @@ [SerializeField] Button _CloseBtn;//红包关闭 [SerializeField] Button _OpenBtn;//红包打开 [SerializeField] Text _TopText;//祝福语 PlayerRedPacketDatas redpackModel { get { return ModelCenter.Instance.GetModel<PlayerRedPacketDatas>(); } } RedPacketModel redpackModel { get { return ModelCenter.Instance.GetModel<RedPacketModel>(); } } RedEnvelopeModel envelopeModel { get { return ModelCenter.Instance.GetModel<RedEnvelopeModel>(); } } private int redpackServerId; System/FairyAu/TreasureTheLog.cs
@@ -5,7 +5,6 @@ using UnityEngine; using System.Collections; using UnityEngine.UI; using System.Text; using System.Collections.Generic; //宝库日志 @@ -16,25 +15,21 @@ { public ScrollerController _ScrollerController;//用来控制滑动条位置 public Transform _Content;//d动态创建的节点 PlayerFairyAuTreasureData m_PlayerFairyAuTreasureData; PlayerFairyAuTreasureData playerFairyAuTreasureData { get { return m_PlayerFairyAuTreasureData ?? (m_PlayerFairyAuTreasureData = ModelCenter.Instance.GetModel<PlayerFairyAuTreasureData>()); } } FairyAuTreasureModel m_PlayerFairyAuTreasureData; FairyAuTreasureModel playerFairyAuTreasureData { get { return m_PlayerFairyAuTreasureData ?? (m_PlayerFairyAuTreasureData = ModelCenter.Instance.GetModel<FairyAuTreasureModel>()); } } public void Init() { _ScrollerController.OnRefreshCell += OnRefreshGridCell; PlayerFairyAuTreasureData.Event_FamilyActionInfo += FamilyActionInf;//家族行为信息的刷新 FairyAuTreasureModel.Event_FamilyActionInfo += FamilyActionInf;//家族行为信息的刷新 OnCreateGridLineCell(_ScrollerController); } public void UnInit() { _ScrollerController.OnRefreshCell -= OnRefreshGridCell; PlayerFairyAuTreasureData.Event_FamilyActionInfo -= FamilyActionInf;//家族行为信息的刷新 FairyAuTreasureModel.Event_FamilyActionInfo -= FamilyActionInf;//家族行为信息的刷新 } void OnCreateGridLineCell(ScrollerController _ScrollerController)//预制体创建 { System/FairyAu/WarehouseTipsWin.cs
@@ -25,8 +25,8 @@ PackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PackModel>()); } } ItemTipsModel _itemTipsModel; ItemTipsModel itemTipsModel { get { return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>()); } } PlayerFairyAuTreasureData m_PlayerFairyAuTreasureData; PlayerFairyAuTreasureData playerFairyAuTreasureData { get { return m_PlayerFairyAuTreasureData ?? (m_PlayerFairyAuTreasureData = ModelCenter.Instance.GetModel<PlayerFairyAuTreasureData>()); } } FairyAuTreasureModel m_PlayerFairyAuTreasureData; FairyAuTreasureModel playerFairyAuTreasureData { get { return m_PlayerFairyAuTreasureData ?? (m_PlayerFairyAuTreasureData = ModelCenter.Instance.GetModel<FairyAuTreasureModel>()); } } #region 属性 [SerializeField] ScrollerController _GridlineCtrl; @@ -128,10 +128,10 @@ _listArray.Add(key); } _FamilyPosition = (int)PlayerDatas.Instance.fairyData.mine.FamilyLV; PlayerFairyAuTreasureData.Event_FairyAuIntegral += FairyAuIntegral;//仙盟积分刷新 PlayerFairyAuTreasureData.Event_FamilyStoreItemInfo += FamilyStoreItemInfo;//仓库信息刷新 PlayerFairyAuTreasureData.Del_FamilyStoreItemInfo += Del_FamilyStoreItemInfo;//仓库物品删除 PlayerFairyAuTreasureData.Event_FamilyActionInfo += FamilyActionInfo;//家族行为信息刷新 FairyAuTreasureModel.Event_FairyAuIntegral += FairyAuIntegral;//仙盟积分刷新 FairyAuTreasureModel.Event_FamilyStoreItemInfo += FamilyStoreItemInfo;//仓库信息刷新 FairyAuTreasureModel.Del_FamilyStoreItemInfo += Del_FamilyStoreItemInfo;//仓库物品删除 FairyAuTreasureModel.Event_FamilyActionInfo += FamilyActionInfo;//家族行为信息刷新 _GridlineCtrl.OnRefreshCell += OnRefreshGridCell; _bool = false; w_TreasureTheLog.Init(); @@ -172,10 +172,10 @@ protected override void OnAfterClose() { w_TreasureTheLog.UnInit(); PlayerFairyAuTreasureData.Event_FairyAuIntegral -= FairyAuIntegral;//仙盟积分刷新 PlayerFairyAuTreasureData.Event_FamilyStoreItemInfo -= FamilyStoreItemInfo;//仓库信息刷新 PlayerFairyAuTreasureData.Event_FamilyActionInfo -= FamilyActionInfo;//家族行为信息刷新 PlayerFairyAuTreasureData.Del_FamilyStoreItemInfo -= Del_FamilyStoreItemInfo;//仓库物品删除 FairyAuTreasureModel.Event_FairyAuIntegral -= FairyAuIntegral;//仙盟积分刷新 FairyAuTreasureModel.Event_FamilyStoreItemInfo -= FamilyStoreItemInfo;//仓库信息刷新 FairyAuTreasureModel.Event_FamilyActionInfo -= FamilyActionInfo;//家族行为信息刷新 FairyAuTreasureModel.Del_FamilyStoreItemInfo -= Del_FamilyStoreItemInfo;//仓库物品删除 _GridlineCtrl.OnRefreshCell -= OnRefreshGridCell; }
@@ -589,7 +589,7 @@ return false; } if (!PlayerTaskDatas.IsOPenAutoResolve()) if (!TaskModel.IsOPenAutoResolve()) { return false; } System/MainInterfacePanel/CardLevelTaskButton.cs
@@ -21,12 +21,12 @@ private string[] BountyMissionsType;//赏金 private string[] FairyAuMissionType;//仙盟任务 Dictionary<int, MissionDetailDates> _AllMissionDict = new Dictionary<int, MissionDetailDates>();//任务初始化接收字典 PlayerTaskDatas m_TaskModel; PlayerTaskDatas taskmodel TaskModel m_TaskModel; TaskModel taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>()); return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<TaskModel>()); } } private void Awake() System/MainInterfacePanel/CoinTaskTipModel.cs
@@ -39,11 +39,11 @@ public void OnPlayerLoginOk() { PlayerTaskDatas.TaskCoinTaskEvent -= TaskCoinTaskEvent; PlayerTaskDatas.TaskCoinTaskEvent += TaskCoinTaskEvent; TaskModel.TaskCoinTaskEvent -= TaskCoinTaskEvent; TaskModel.TaskCoinTaskEvent += TaskCoinTaskEvent; PlayerTaskDatas.FairyTaskEvent -= FairyTaskEvent; PlayerTaskDatas.FairyTaskEvent += FairyTaskEvent; TaskModel.FairyTaskEvent -= FairyTaskEvent; TaskModel.FairyTaskEvent += FairyTaskEvent; StageLoad.Instance.onStageLoadFinish -= onStageLoadFinish; StageLoad.Instance.onStageLoadFinish += onStageLoadFinish; } System/MainInterfacePanel/CoinTaskWin.cs
@@ -58,8 +58,8 @@ StringBuilder variation = new StringBuilder();//变化值 private int RewardForNumber = 0;//奖励数值 PlayerTaskDatas m_TaskModel; PlayerTaskDatas taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>()); } } TaskModel m_TaskModel; TaskModel taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<TaskModel>()); } } ItemTipsModel _itemTipsModel; ItemTipsModel itemTipsModel { get { return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>()); } } @@ -92,8 +92,8 @@ timeType = 0; RewardForNumber = taskmodel.BountyRewardsNumber; RewardFor(); PlayerTaskDatas.Event_nBounty += OnBounty;//赏金任务添加 PlayerTaskDatas.Event_BountyRewards += BountyRewards;//获取赏金奖励 TaskModel.Event_nBounty += OnBounty;//赏金任务添加 TaskModel.Event_BountyRewards += BountyRewards;//获取赏金奖励 _BountyDic = taskmodel.BountyDic; RewardsToOpen(); ContentAssignment(); @@ -110,8 +110,8 @@ private void OnDisable() { PlayerTaskDatas.Event_nBounty -= OnBounty; PlayerTaskDatas.Event_BountyRewards -= BountyRewards; TaskModel.Event_nBounty -= OnBounty; TaskModel.Event_BountyRewards -= BountyRewards; taskmodel.BountyMotionBool = false; if (coinTaskTip.IsPopup) { System/MainInterfacePanel/DefaultDialogueBoxWin.cs
@@ -23,8 +23,8 @@ private int _NPCID = 0;//获取NPCID Dictionary<int, MissionDetailDates> _AllMissionDict = new Dictionary<int, MissionDetailDates>();//任务初始化接收字典 #region Built-in PlayerTaskDatas m_TaskModel; PlayerTaskDatas taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>()); } } TaskModel m_TaskModel; TaskModel taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<TaskModel>()); } } protected override void BindController() { } System/MainInterfacePanel/DialogueDuidanceWin.cs
@@ -38,8 +38,8 @@ private int typesPeaker = -1; private float timeType = 0f; PlayerTaskDatas m_TaskModel; PlayerTaskDatas taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>()); } } TaskModel m_TaskModel; TaskModel taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<TaskModel>()); } } TreasureModel m_treasureModel; TreasureModel treasureModel { get { return m_treasureModel ?? (m_treasureModel = ModelCenter.Instance.GetModel<TreasureModel>()); } } System/MainInterfacePanel/EffectToFaBaoWin.cs
@@ -26,8 +26,8 @@ public float LightCross = 0.3f; List<UIEffect> effectList = new List<UIEffect>(); #region Built-in PlayerTaskDatas m_TaskModel; PlayerTaskDatas taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>()); } } TaskModel m_TaskModel; TaskModel taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<TaskModel>()); } } public static event Action EffectToFaBaoEvent; protected override void BindController() { System/MainInterfacePanel/FlyShoseConfirmwin.cs
@@ -32,7 +32,7 @@ private int NeedMoney = 1; private int progressRef = -1; PlayerTaskDatas taskmodel { get { return ModelCenter.Instance.GetModel<PlayerTaskDatas>(); } } TaskModel taskmodel { get { return ModelCenter.Instance.GetModel<TaskModel>(); } } PlayerMainDate mainModel { get { return ModelCenter.Instance.GetModel<PlayerMainDate>(); } } GetItemPathModel GetItemPath { get { return ModelCenter.Instance.GetModel<GetItemPathModel>(); } } FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } } System/MainInterfacePanel/FlyingShoesTask.cs
@@ -42,8 +42,8 @@ private List<int> DemonMissionTypeList = new List<int>();//魔族 private List<string> DemonMissionTypeListKey = new List<string>();//魔族 private List<int> TransportTask = new List<int>();//在PK状态下或打Boss状态下依旧可以传送的任务id PlayerTaskDatas m_TaskModel; PlayerTaskDatas taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>()); } } TaskModel m_TaskModel; TaskModel taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<TaskModel>()); } } PackModel _playerPack; PackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PackModel>()); } } PlayerMainDate m_MainModel; System/MainInterfacePanel/HoistingWin.cs
@@ -29,8 +29,8 @@ TreasureModel m_Model; TreasureModel model { get { return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<TreasureModel>()); } } PlayerTaskDatas m_TaskModel; PlayerTaskDatas taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>()); } } TaskModel m_TaskModel; TaskModel taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<TaskModel>()); } } WorldBossModel Worldmodel { get { return ModelCenter.Instance.GetModel<WorldBossModel>(); } } DailyQuestModel dailyquestmodel { get { return ModelCenter.Instance.GetModel<DailyQuestModel>(); } } System/MainInterfacePanel/InformationTipsWin.cs
@@ -22,12 +22,12 @@ private int _Gold = 0;//获取流动仙玉 private int _GoldPaper = 0;//获取绑定仙玉 PlayerTaskDatas m_TaskModel; PlayerTaskDatas taskmodel TaskModel m_TaskModel; TaskModel taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>()); return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<TaskModel>()); } } #region Built-in @@ -89,11 +89,11 @@ if (_Toggle_Tips.isOn) { PlayerTaskDatas._globalbool = true; TaskModel._globalbool = true; } else { PlayerTaskDatas._globalbool = false; TaskModel._globalbool = false; } } System/MainInterfacePanel/MainButtonMisc.cs
@@ -27,7 +27,7 @@ FestivalRedpackModel festivalRedpackModel { get { return ModelCenter.Instance.GetModel<FestivalRedpackModel>(); } } OSRedEnvelopeModel OSEnvelopeModel { get { return ModelCenter.Instance.GetModel<OSRedEnvelopeModel>(); } } PlayerRedPacketDatas redPacket { get { return ModelCenter.Instance.GetModel<PlayerRedPacketDatas>(); } } RedPacketModel redPacket { get { return ModelCenter.Instance.GetModel<RedPacketModel>(); } } WishingPoolModel wishModel { get { return ModelCenter.Instance.GetModel<WishingPoolModel>(); } } MysticalPurchaseModel purchaseModel { get { return ModelCenter.Instance.GetModel<MysticalPurchaseModel>(); } } DungeonAssistModel assistModel { get { return ModelCenter.Instance.GetModel<DungeonAssistModel>(); } } @@ -53,7 +53,7 @@ ShowFairyGrabBoss(); IsCrossServerOneVsOne(); PlayerRedPacketDatas.OnRedBagGetEvent += OnRedBagGet; RedPacketModel.OnRedBagGetEvent += OnRedBagGet; OSEnvelopeModel.OSRedEnvelopeUpdateEvent += OnRedBagGet; OSEnvelopeModel.OSRedEnvelopeInfoEnvent += OnRedBagGet; RedpointCenter.Instance.redpointValueChangeEvent += RedpointValueChangeEvent; @@ -76,7 +76,7 @@ public void Unit() { m_CollectBehaviour.Dispose(); PlayerRedPacketDatas.OnRedBagGetEvent -= OnRedBagGet; RedPacketModel.OnRedBagGetEvent -= OnRedBagGet; OSEnvelopeModel.OSRedEnvelopeUpdateEvent -= OnRedBagGet; OSEnvelopeModel.OSRedEnvelopeInfoEnvent -= OnRedBagGet; RedpointCenter.Instance.redpointValueChangeEvent -= RedpointValueChangeEvent; System/MainInterfacePanel/MainInterfaceWin.cs
@@ -66,7 +66,7 @@ RealmModel realmModel { get { return ModelCenter.Instance.GetModel<RealmModel>(); } } MountModel horsemodel { get { return ModelCenter.Instance.GetModel<MountModel>(); } } PlayerMainDate onMainModel { get { return ModelCenter.Instance.GetModel<PlayerMainDate>(); } } PlayerTaskDatas onPlayerTask { get { return ModelCenter.Instance.GetModel<PlayerTaskDatas>(); } } TaskModel onPlayerTask { get { return ModelCenter.Instance.GetModel<TaskModel>(); } } BuffModel Buffmodel { get { return ModelCenter.Instance.GetModel<BuffModel>(); } } PKModel pKModel { get { return ModelCenter.Instance.GetModel<PKModel>(); } } RuneTowerModel runeTowerModel { get { return ModelCenter.Instance.GetModel<RuneTowerModel>(); } } @@ -141,7 +141,7 @@ NewBieCenter.Instance.guideCompletedEvent += OnGuideCompleted; WindowCenter.Instance.windowAfterOpenEvent += WindowAfterEvent; WindowCenter.Instance.windowAfterCloseEvent += WindowAfterEvent; PlayerTaskDatas.CompletionOfTaskEvent += CompletionOfTaskEvent; TaskModel.CompletionOfTaskEvent += CompletionOfTaskEvent; NewBieCenter.Instance.guideBeginEvent += GuideBeginEvent; fairyGrabBossModel.bossGrabHintEvent += bossGrabHintEvent; GlobalTimeEvent.Instance.secondEvent += secondEvent; @@ -259,7 +259,7 @@ NewBieCenter.Instance.guideCompletedEvent -= OnGuideCompleted; WindowCenter.Instance.windowAfterOpenEvent -= WindowAfterEvent; WindowCenter.Instance.windowAfterCloseEvent -= WindowAfterEvent; PlayerTaskDatas.CompletionOfTaskEvent -= CompletionOfTaskEvent; TaskModel.CompletionOfTaskEvent -= CompletionOfTaskEvent; NewBieCenter.Instance.guideBeginEvent -= GuideBeginEvent; GlobalTimeEvent.Instance.secondEvent -= secondEvent; fairyGrabBossModel.bossGrabHintEvent -= bossGrabHintEvent; System/MainInterfacePanel/MysteriousMissionWin.cs
@@ -27,8 +27,8 @@ FunctionUnlockFlyObject flyObject; PlayerMainDate m_MainModel; PlayerMainDate mainModel { get { return m_MainModel ?? (m_MainModel = ModelCenter.Instance.GetModel<PlayerMainDate>()); } } PlayerTaskDatas m_TaskModel; PlayerTaskDatas taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>()); } } TaskModel m_TaskModel; TaskModel taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<TaskModel>()); } } #region Built-in protected override void BindController() { System/MainInterfacePanel/PlayerTaskDatas.cs
@@ -1,7 +1,6 @@ using System; using System.Collections; using System.Collections.Generic; using UnityEngine; using LitJson; using System.Text.RegularExpressions; @@ -53,7 +52,7 @@ } public class PlayerTaskDatas : Model, IBeforePlayerDataInitialize, IPlayerLoginOk public class TaskModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk { /** 任务总清单 */ System/MainInterfacePanel/SideMission.cs
@@ -24,8 +24,8 @@ [SerializeField] Button _Btn_Forward;//支线前往按钮 [SerializeField] Text _Text_Forward;//按钮文字 [SerializeField] Button m_FinishAtOnce;//立即完成 PlayerTaskDatas m_TaskModel; PlayerTaskDatas taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>()); } } TaskModel m_TaskModel; TaskModel taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<TaskModel>()); } } ItemTipsModel _itemTipsModel; ItemTipsModel itemTipsModel { get { return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>()); } } PackModel _playerPack; System/MainInterfacePanel/SkillTaskWin.cs
@@ -25,8 +25,8 @@ [SerializeField] Image m_Image;//孔数 PlayerMainDate m_MainModel; PlayerMainDate mainModel { get { return m_MainModel ?? (m_MainModel = ModelCenter.Instance.GetModel<PlayerMainDate>()); } } PlayerTaskDatas m_TaskModel; PlayerTaskDatas taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>()); } } TaskModel m_TaskModel; TaskModel taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<TaskModel>()); } } #region Built-in protected override void BindController() { System/MainInterfacePanel/StoryMissions.cs
@@ -19,12 +19,12 @@ Dictionary<int, MissionDetailDates> _AllMissionDict = new Dictionary<int, MissionDetailDates>();//任务初始化接收字典 Dictionary<int, Dictionary<string, string>> _DicTaskInforma = new Dictionary<int, Dictionary<string, string>>();//任务字典的信息 PlayerTaskDatas m_TaskModel; PlayerTaskDatas taskmodel TaskModel m_TaskModel; TaskModel taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>()); return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<TaskModel>()); } } PackModel _playerPack; System/MainInterfacePanel/StoryMissionsModel.cs
@@ -27,8 +27,8 @@ public Dictionary<int, List<TaskListConfig>> TaskCfgDict = new Dictionary<int, List<TaskListConfig>>(); public Dictionary<int, int> TaskMainDic = new Dictionary<int, int>();//剧情编号，任务ID public Dictionary<int, List<TaskListType>> taskListConfig = new Dictionary<int, List<TaskListType>>();//关于任务列表 PlayerTaskDatas m_PlayerTaskDatas; PlayerTaskDatas onPlayerTask { get { return m_PlayerTaskDatas ?? (m_PlayerTaskDatas = ModelCenter.Instance.GetModel<PlayerTaskDatas>()); } } TaskModel m_PlayerTaskDatas; TaskModel onPlayerTask { get { return m_PlayerTaskDatas ?? (m_PlayerTaskDatas = ModelCenter.Instance.GetModel<TaskModel>()); } } public override void Init() { var configTaskListValue = TaskListConfig.GetValues(); System/MainInterfacePanel/StoryTask.cs
@@ -34,8 +34,8 @@ private int MainTaaskChapterNow = 1;//获取当前选中的选中章节数 private int MainTaskIDNow = 0;//当前选中的任务ID private bool _IsOpenbool = true; PlayerTaskDatas m_TaskModel; PlayerTaskDatas taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>()); } } TaskModel m_TaskModel; TaskModel taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<TaskModel>()); } } ItemTipsModel _itemTipsModel; ItemTipsModel itemTipsModel { get { return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>()); } } @@ -47,7 +47,7 @@ private void OnEnable() { _IsOpenbool = true; PlayerTaskDatas.Event_TaskInformation += TaskInformation;//任务字典信息 TaskModel.Event_TaskInformation += TaskInformation;//任务字典信息 _DicTaskInforma = taskmodel._DicTaskInformation; _MainTaskDic = taskmodel.MainTaskDic; GetMainIDAndMainTaskChapter(); @@ -71,7 +71,7 @@ private void OnDisable() { StopCoroutine("Delay"); PlayerTaskDatas.Event_TaskInformation -= TaskInformation;//任务字典信息 TaskModel.Event_TaskInformation -= TaskInformation;//任务字典信息 } void OnCreateGridLineCell(ScrollerController gridCtrl)//任务预制体创建 System/MainInterfacePanel/TaskAllocation.cs
@@ -20,10 +20,10 @@ private static StringBuilder textBuilder = new StringBuilder(); private const string Info_Pattern = "{([a-zA-Z0-9_]+)}"; PlayerTaskDatas m_TaskModel; PlayerTaskDatas taskmodel { TaskModel m_TaskModel; TaskModel taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>()); return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<TaskModel>()); } } public string GetTaskInfo(string val, int _item)//用于0820中字典的值替换（1字符串2任务ID） System/MainInterfacePanel/TaskBoxBGMWin.cs
@@ -32,8 +32,8 @@ private string StrConversa = null;//对话内容接收 Dictionary<int, MissionDetailDates> _AllMissionDict;//任务初始化接收字典 private List<RewardAnalysis.RewardInfo> rewardList = new List<RewardAnalysis.RewardInfo>(); PlayerTaskDatas m_TaskModel; PlayerTaskDatas taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>()); } } TaskModel m_TaskModel; TaskModel taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<TaskModel>()); } } ItemTipsModel _itemTipsModel; ItemTipsModel itemTipsModel { get { return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>()); } } System/MainInterfacePanel/TaskListTip.cs
@@ -31,8 +31,8 @@ List<int> _list = new List<int>();//用来控制进行排序 TreasureModel m_Model; TreasureModel model { get { return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<TreasureModel>()); } } PlayerTaskDatas m_TaskModel; PlayerTaskDatas taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>()); } } TaskModel m_TaskModel; TaskModel taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<TaskModel>()); } } PackModel _playerPack; PackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PackModel>()); } } PlayerMainDate m_MainModel; @@ -94,12 +94,12 @@ ListSort1.Add(TaskSortType2[i]); } } PlayerTaskDatas.Event_TaskToAdd += TaskToAdd;//任务的添加 PlayerTaskDatas.Event_TaskRefreshes += TaskRefreshes;//任务的刷新 PlayerTaskDatas.Event_TaskToDelete += OnTaskToDelete;//任务的删除 PlayerTaskDatas.Event_TaskInformation += TaskInformation;//任务字典信息 PlayerTaskDatas.MainCardLevelChange += MainCardLevelChange;//卡级任务修改 PlayerTaskDatas.CardLevelChange += CardLevelChangeEvent;//卡级任务状态改变 TaskModel.Event_TaskToAdd += TaskToAdd;//任务的添加 TaskModel.Event_TaskRefreshes += TaskRefreshes;//任务的刷新 TaskModel.Event_TaskToDelete += OnTaskToDelete;//任务的删除 TaskModel.Event_TaskInformation += TaskInformation;//任务字典信息 TaskModel.MainCardLevelChange += MainCardLevelChange;//卡级任务修改 TaskModel.CardLevelChange += CardLevelChangeEvent;//卡级任务状态改变 model.collectingTreasureChangeEvent += OnCollectingTreasureChangeEvent; FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent; TreasureNewGotWin.CloseTreasureNewGotWinEvent += CloseTreasureNewGotWinEvent; @@ -127,14 +127,14 @@ { m_HumanTreasure.Dispose(); model.collectingTreasureChangeEvent -= OnCollectingTreasureChangeEvent; PlayerTaskDatas.Event_TaskRefreshes -= TaskRefreshes;//任务的刷新 PlayerTaskDatas.Event_TaskToAdd -= TaskToAdd;//任务的添加 PlayerTaskDatas.Event_TaskToDelete -= OnTaskToDelete;//任务的删除 PlayerTaskDatas.Event_TaskInformation -= TaskInformation;//任务字典信息 TaskModel.Event_TaskRefreshes -= TaskRefreshes;//任务的刷新 TaskModel.Event_TaskToAdd -= TaskToAdd;//任务的添加 TaskModel.Event_TaskToDelete -= OnTaskToDelete;//任务的删除 TaskModel.Event_TaskInformation -= TaskInformation;//任务字典信息 FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent; TreasureNewGotWin.CloseTreasureNewGotWinEvent -= CloseTreasureNewGotWinEvent; PlayerTaskDatas.MainCardLevelChange -= MainCardLevelChange;//卡级任务修改 PlayerTaskDatas.CardLevelChange -= CardLevelChangeEvent;//卡级任务状态改变 TaskModel.MainCardLevelChange -= MainCardLevelChange;//卡级任务修改 TaskModel.CardLevelChange -= CardLevelChangeEvent;//卡级任务状态改变 PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= Updatefighting;//数据的刷新(h0418) StopAllCoroutines(); } @@ -408,7 +408,7 @@ foreach (var key in taskmodel.SideQuestsDic.Keys) { var State = taskmodel.GetTaskStatus(key); if (State == PlayerTaskDatas.TaskStatus.CardLevel) if (State == TaskModel.TaskStatus.CardLevel) { IsDefault = false; } @@ -546,7 +546,7 @@ private void Selected()//选中逻辑修改 { if (taskmodel.GetTaskStatus(taskmodel.GetNowTaskID) == PlayerTaskDatas.TaskStatus.CardLevel) if (taskmodel.GetTaskStatus(taskmodel.GetNowTaskID) == TaskModel.TaskStatus.CardLevel) { bool _IsBool = false; var taskList = TaskListConfig.Get(taskmodel.GetNowTaskID); @@ -556,7 +556,7 @@ } for (int i = 0; i < _list.Count; i++) { if (taskmodel.GetTaskStatus(_list[i]) != PlayerTaskDatas.TaskStatus.CardLevel) if (taskmodel.GetTaskStatus(_list[i]) != TaskModel.TaskStatus.CardLevel) { if (_IsBool)//主线卡级 { System/MainInterfacePanel/TaskType.cs
@@ -6,8 +6,8 @@ public class TaskType : MonoBehaviour { [SerializeField] List<int> MysteriousTaskID = new List<int>(); PlayerTaskDatas m_TaskModel; PlayerTaskDatas taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>()); } } TaskModel m_TaskModel; TaskModel taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<TaskModel>()); } } public bool m_TypeBool = true; public int TaskID = 0; void Start() System/MainInterfacePanel/TaskWin.cs
@@ -25,13 +25,14 @@ [SerializeField] GameObject _StoryTaskWin; [SerializeField] GameObject _SideMission; #region Built-in PlayerTaskDatas m_TaskModel; PlayerTaskDatas taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>()); } } TaskModel taskmodel { get { return ModelCenter.Instance.GetModel<TaskModel>(); } } PlayerDeadModel _deadModel; PlayerDeadModel DeadModel { get { return _deadModel ?? (_deadModel = ModelCenter.Instance.GetModel<PlayerDeadModel>()); } } CoinTaskTipModel m_CoinTaskTip; CoinTaskTipModel coinTaskTip { get { return m_CoinTaskTip ?? (m_CoinTaskTip = ModelCenter.Instance.GetModel<CoinTaskTipModel>()); } } protected override void BindController() System/NewBieGuidance/FunctionalGuideCenter.cs
@@ -25,16 +25,16 @@ bool inited = false; TreasureModel model { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } } PlayerTaskDatas taskmodel { get { return ModelCenter.Instance.GetModel<PlayerTaskDatas>(); } } TaskModel taskmodel { get { return ModelCenter.Instance.GetModel<TaskModel>(); } } TreasureModel treasureModel { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } } AchievementModel achievementModel { get { return ModelCenter.Instance.GetModel<AchievementModel>(); } } public FunctionalGuideCenter() { PlayerTaskDatas.tryGetTaskAwardEvent += OnTryGetMainLineTaskReward; PlayerTaskDatas.Event_MainlineTask += OnMainLineTaskUpdate; PlayerTaskDatas.CardLevelChange += OnMainLineLimitStateChange; PlayerTaskDatas.SideQuestChangeEvent += OnBranchQuestStateChange; TaskModel.tryGetTaskAwardEvent += OnTryGetMainLineTaskReward; TaskModel.Event_MainlineTask += OnMainLineTaskUpdate; TaskModel.CardLevelChange += OnMainLineLimitStateChange; TaskModel.SideQuestChangeEvent += OnBranchQuestStateChange; treasureModel.treasureStateChangeEvent += OnTreasureStateChange; } @@ -182,7 +182,7 @@ switch ((GuideTriggerType)config.TriggerType) { case GuideTriggerType.QuestLimit: if (limitState != PlayerTaskDatas.TaskStatus.CardLevel || limitState != PlayerTaskDatas.TaskStatus.TreasureCardLevel) if (limitState != TaskModel.TaskStatus.CardLevel || limitState != TaskModel.TaskStatus.TreasureCardLevel) { RemoveGuide(guideId); } @@ -279,11 +279,11 @@ return mainTaskId == config.Condition && taskmodel.currentMissionState == 2; case GuideTriggerType.QuestLimit: return mainTaskId == config.Condition && (taskmodel.GetTaskStatus(config.Condition) == PlayerTaskDatas.TaskStatus.CardLevel || taskmodel.GetTaskStatus(config.Condition) == PlayerTaskDatas.TaskStatus.TreasureCardLevel); (taskmodel.GetTaskStatus(config.Condition) == TaskModel.TaskStatus.CardLevel || taskmodel.GetTaskStatus(config.Condition) == TaskModel.TaskStatus.TreasureCardLevel); case GuideTriggerType.QuestContinue: var questState = taskmodel.SideQuestState(config.Condition); var taskStatus = taskmodel.GetTaskStatus(config.Condition); return questState == 1 && (taskStatus == PlayerTaskDatas.TaskStatus.Normal); return questState == 1 && (taskStatus == TaskModel.TaskStatus.Normal); case GuideTriggerType.Treasure: if (!model.newGotShowing) { System/NewBieGuidance/FunctionalGuideTrigger.cs
@@ -61,8 +61,8 @@ FuncOpen.Instance.OnFuncStateChangeEvent += OnFunctionOpen; PlayerDatas.Instance.PlayerDataRefreshInfoEvent += OnLevelChange; PlayerTaskDatas.Event_MainlineTask += OnMainLineTaskUpdate; PlayerTaskDatas.CardLevelChange += OnMainLineTaskLimitStateChange; TaskModel.Event_MainlineTask += OnMainLineTaskUpdate; TaskModel.CardLevelChange += OnMainLineTaskLimitStateChange; FunctionUnlockFlyObject.functionUnLockShowEndEvent += OnFunctionUnLockShowEnd; FunctionalGuideCenter.Instance.beginGuideEvent += BeginFunctionalGuide; @@ -92,8 +92,8 @@ container.gameObject.SetActive(false); FuncOpen.Instance.OnFuncStateChangeEvent -= OnFunctionOpen; PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= OnLevelChange; PlayerTaskDatas.Event_MainlineTask -= OnMainLineTaskUpdate; PlayerTaskDatas.CardLevelChange -= OnMainLineTaskLimitStateChange; TaskModel.Event_MainlineTask -= OnMainLineTaskUpdate; TaskModel.CardLevelChange -= OnMainLineTaskLimitStateChange; FunctionUnlockFlyObject.functionUnLockShowEndEvent -= OnFunctionUnLockShowEnd; FunctionalGuideCenter.Instance.beginGuideEvent -= BeginFunctionalGuide; System/NewBieGuidance/NewBieCenter.cs
@@ -40,7 +40,7 @@ bool inited = false; PlayerTaskDatas taskmodel { get { return ModelCenter.Instance.GetModel<PlayerTaskDatas>(); } } TaskModel taskmodel { get { return ModelCenter.Instance.GetModel<TaskModel>(); } } BetterEquipGetModel betterItemGetModel { get { return ModelCenter.Instance.GetModel<BetterEquipGetModel>(); } } PreciousItemGetModel preciousItemGetModel { get { return ModelCenter.Instance.GetModel<PreciousItemGetModel>(); } } TreasureModel treasureModel { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } } @@ -344,9 +344,9 @@ return taskmodel.currentMission == config.Condition && taskmodel.currentMissionState == 2; case GuideTriggerType.QuestLimit: return taskmodel.currentMission == config.Condition && (taskmodel.GetTaskStatus(config.Condition) == PlayerTaskDatas.TaskStatus.CardLevel || taskmodel.GetTaskStatus(config.Condition) == PlayerTaskDatas.TaskStatus.TreasureCardLevel); (taskmodel.GetTaskStatus(config.Condition) == TaskModel.TaskStatus.CardLevel || taskmodel.GetTaskStatus(config.Condition) == TaskModel.TaskStatus.TreasureCardLevel); case GuideTriggerType.QuestContinue: return taskmodel.currentMission == config.Condition && (taskmodel.GetTaskStatus(config.Condition) == PlayerTaskDatas.TaskStatus.Normal); return taskmodel.currentMission == config.Condition && (taskmodel.GetTaskStatus(config.Condition) == TaskModel.TaskStatus.Normal); case GuideTriggerType.Map: return PlayerDatas.Instance.baseData.MapID == config.Condition; case GuideTriggerType.RealmSitDown: @@ -362,7 +362,7 @@ case GuideTriggerType.Pray: return taskmodel.currentMission == config.Condition && prayerModel.CanFreeCoinPrayer() && (taskmodel.GetTaskStatus(config.Condition) == PlayerTaskDatas.TaskStatus.CardLevel || taskmodel.GetTaskStatus(config.Condition) == PlayerTaskDatas.TaskStatus.TreasureCardLevel); (taskmodel.GetTaskStatus(config.Condition) == TaskModel.TaskStatus.CardLevel || taskmodel.GetTaskStatus(config.Condition) == TaskModel.TaskStatus.TreasureCardLevel); case GuideTriggerType.VIPExperience: return PlayerDatas.Instance.baseData.VIPLv <= 0; case GuideTriggerType.FairyLandBuyTimes: System/NewBieGuidance/NewBieTrigger.cs
@@ -42,8 +42,8 @@ CheckNewBieGuide(); FuncOpen.Instance.OnFuncStateChangeEvent += OnFunctionOpen; PlayerDatas.Instance.PlayerDataRefreshInfoEvent += OnLevelChange; PlayerTaskDatas.Event_MainlineTask += OnMainLineTaskChange; PlayerTaskDatas.CardLevelChange += OnTaskLimitStateChange; TaskModel.Event_MainlineTask += OnMainLineTaskChange; TaskModel.CardLevelChange += OnTaskLimitStateChange; betterItemGetModel.showEquipRefreshEvent += OnGetBetterEquip; preciousItemGetModel.showItemRefreshEvent += OnShowPreciousItemRefresh; @@ -62,8 +62,8 @@ { FuncOpen.Instance.OnFuncStateChangeEvent -= OnFunctionOpen; PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= OnLevelChange; PlayerTaskDatas.Event_MainlineTask -= OnMainLineTaskChange; PlayerTaskDatas.CardLevelChange -= OnTaskLimitStateChange; TaskModel.Event_MainlineTask -= OnMainLineTaskChange; TaskModel.CardLevelChange -= OnTaskLimitStateChange; betterItemGetModel.showEquipRefreshEvent -= OnGetBetterEquip; preciousItemGetModel.showItemRefreshEvent -= OnShowPreciousItemRefresh; FunctionUnlockFlyObject.functionUnLockShowEndEvent -= OnFunctionUnLockShowEnd; @@ -94,9 +94,9 @@ CheckNewBieGuide(); FuncOpen.Instance.OnFuncStateChangeEvent += OnFunctionOpen; PlayerDatas.Instance.PlayerDataRefreshInfoEvent += OnLevelChange; PlayerTaskDatas.Event_MainlineTask += OnMainLineTaskChange; PlayerTaskDatas.CardLevelChange += OnTaskLimitStateChange; PlayerTaskDatas.SideQuestChangeEvent += OnBranchQuestChange; TaskModel.Event_MainlineTask += OnMainLineTaskChange; TaskModel.CardLevelChange += OnTaskLimitStateChange; TaskModel.SideQuestChangeEvent += OnBranchQuestChange; betterItemGetModel.showEquipRefreshEvent += OnGetBetterEquip; preciousItemGetModel.showItemRefreshEvent += OnShowPreciousItemRefresh; @@ -117,9 +117,9 @@ FuncOpen.Instance.OnFuncStateChangeEvent -= OnFunctionOpen; PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= OnLevelChange; PlayerTaskDatas.Event_MainlineTask -= OnMainLineTaskChange; PlayerTaskDatas.CardLevelChange -= OnTaskLimitStateChange; PlayerTaskDatas.SideQuestChangeEvent -= OnBranchQuestChange; TaskModel.Event_MainlineTask -= OnMainLineTaskChange; TaskModel.CardLevelChange -= OnTaskLimitStateChange; TaskModel.SideQuestChangeEvent -= OnBranchQuestChange; betterItemGetModel.showEquipRefreshEvent -= OnGetBetterEquip; preciousItemGetModel.showItemRefreshEvent -= OnShowPreciousItemRefresh; System/OpenServerActivity/FestivalRedpackWin.cs
@@ -205,7 +205,7 @@ if (PlayerDatas.Instance.PlayerId == envelope.player || model.grabRedpackTimes > 0) { ModelCenter.Instance.GetModel<PlayerRedPacketDatas>().RedBagId = envelope.id; ModelCenter.Instance.GetModel<RedPacketModel>().RedBagId = envelope.id; WindowCenter.Instance.Open<RedpackOpenWin>(); break; } System/OpenServerActivity/OSRedEnvelopeModel.cs
@@ -86,7 +86,7 @@ set { m_SelectType = value; ModelCenter.Instance.GetModel<PlayerRedPacketDatas>().RedBagId = 0; ModelCenter.Instance.GetModel<RedPacketModel>().RedBagId = 0; if (FuncChangeEvent != null) { FuncChangeEvent(); System/OpenServerActivity/OpenServerRedEnvelopeWin.cs
@@ -128,7 +128,7 @@ if (PlayerDatas.Instance.PlayerId == envelope.player || model.getEnvelopeTimes > 0) { ModelCenter.Instance.GetModel<PlayerRedPacketDatas>().RedBagId = envelope.id; ModelCenter.Instance.GetModel<RedPacketModel>().RedBagId = envelope.id; WindowCenter.Instance.Open<RedpackOpenWin>(); break; } System/OpenServerActivity/RedEnvelopeModel.cs
@@ -10,7 +10,7 @@ { Dictionary<int, string> redpackSfxDict = new Dictionary<int, string>(); PlayerRedPacketDatas redPackdata { get { return ModelCenter.Instance.GetModel<PlayerRedPacketDatas>(); } } RedPacketModel redPackdata { get { return ModelCenter.Instance.GetModel<RedPacketModel>(); } } OSRedEnvelopeModel envelopeModel { get { return ModelCenter.Instance.GetModel<OSRedEnvelopeModel>(); } } FestivalRedpackModel festivalRedpackModel { get { return ModelCenter.Instance.GetModel<FestivalRedpackModel>(); } } @@ -120,7 +120,7 @@ if (!WindowCenter.Instance.IsOpen<RedpackSystemDetailsWin>()) { envelopeSfx = vNetData.RedPacketID == envelopeSfx && self ? envelopeSfx : 0; ModelCenter.Instance.GetModel<PlayerRedPacketDatas>().redpackDetailId = (int)vNetData.RedPacketID; ModelCenter.Instance.GetModel<RedPacketModel>().redpackDetailId = (int)vNetData.RedPacketID; WindowCenter.Instance.Open<RedpackSystemDetailsWin>(); } cacheEnvelopeId = 0; @@ -130,7 +130,7 @@ if (!WindowCenter.Instance.IsOpen<RedDetailsTipsWin>()) { envelopeSfx = vNetData.RedPacketID == envelopeSfx && self ? envelopeSfx : 0; ModelCenter.Instance.GetModel<PlayerRedPacketDatas>().redpackDetailId = (int)vNetData.RedPacketID; ModelCenter.Instance.GetModel<RedPacketModel>().redpackDetailId = (int)vNetData.RedPacketID; WindowCenter.Instance.Open<RedDetailsTipsWin>(); } cacheEnvelopeId = 0; System/OpenServerActivity/RedPackBehaviour.cs
@@ -55,7 +55,7 @@ { if (_envelope.state == 1) { ModelCenter.Instance.GetModel<PlayerRedPacketDatas>().RedBagId = _envelope.id; ModelCenter.Instance.GetModel<RedPacketModel>().RedBagId = _envelope.id; WindowCenter.Instance.Open<RedpackOpenWin>(); } if (_envelope.state == 2 || _envelope.state == 3) System/OpenServerActivity/RedpackSystemDetailsWin.cs
@@ -24,8 +24,8 @@ [SerializeField] Button m_SpaceClose; [SerializeField] Button m_CloseSfxBtn; #region Built-in PlayerRedPacketDatas m_RedPacket; PlayerRedPacketDatas redPacket { get { return m_RedPacket ?? (m_RedPacket = ModelCenter.Instance.GetModel<PlayerRedPacketDatas>()); } } RedPacketModel m_RedPacket; RedPacketModel redPacket { get { return m_RedPacket ?? (m_RedPacket = ModelCenter.Instance.GetModel<RedPacketModel>()); } } RedEnvelopeModel envelopeModel { get { return ModelCenter.Instance.GetModel<RedEnvelopeModel>(); } } protected override void BindController() { System/Role/RoleTitleCell.cs
@@ -26,7 +26,7 @@ } } PlayerTaskDatas task { get { return ModelCenter.Instance.GetModel<PlayerTaskDatas>(); } } TaskModel task { get { return ModelCenter.Instance.GetModel<TaskModel>(); } } public override void Refresh(CellView cell) { System/Skill/SkillModel.cs
@@ -15,13 +15,13 @@ { ParseConfig(); FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent; PlayerTaskDatas.Event_TaskInformation += TaskInformationUpdate; TaskModel.Event_TaskInformation += TaskInformationUpdate; } public override void UnInit() { FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent; PlayerTaskDatas.Event_TaskInformation -= TaskInformationUpdate; TaskModel.Event_TaskInformation -= TaskInformationUpdate; } public void OnBeforePlayerDataInitialize() @@ -363,7 +363,7 @@ } } PlayerTaskDatas task { get { return ModelCenter.Instance.GetModel<PlayerTaskDatas>(); } } TaskModel task { get { return ModelCenter.Instance.GetModel<TaskModel>(); } } PlayerMainDate mainData { get { return ModelCenter.Instance.GetModel<PlayerMainDate>(); } } public void SendEquipPassSkill(int _page, int _index, int _skillId) { System/Skill/SkillPassWin.cs
@@ -50,7 +50,7 @@ } } PlayerTaskDatas task { get { return ModelCenter.Instance.GetModel<PlayerTaskDatas>(); } } TaskModel task { get { return ModelCenter.Instance.GetModel<TaskModel>(); } } RolePromoteModel m_PromoteModel; RolePromoteModel promoteModel System/Strengthening/EquipReinforceWin.cs
@@ -9,8 +9,8 @@ public class EquipReinforceWin : Window { private WingsRedDot W_ModelRedDit; private WingsRedDot model { get { return W_ModelRedDit ?? (W_ModelRedDit = ModelCenter.Instance.GetModel<WingsRedDot>()); } } private WingsRedDotModel W_ModelRedDit; private WingsRedDotModel model { get { return W_ModelRedDit ?? (W_ModelRedDit = ModelCenter.Instance.GetModel<WingsRedDotModel>()); } } private StrengthenModel M_Strengtheng; private StrengthenModel strengtheng { get { return M_Strengtheng ?? (M_Strengtheng = ModelCenter.Instance.GetModel<StrengthenModel>()); } } private WashTips _washTips; @@ -67,10 +67,10 @@ return m_gemModel ?? (m_gemModel = ModelCenter.Instance.GetModel<GemModel>()); } } WingsRedDot m_WingsRedDot; WingsRedDot wingsRedDot { WingsRedDotModel m_WingsRedDot; WingsRedDotModel wingsRedDot { get { return m_WingsRedDot ?? (m_WingsRedDot = ModelCenter.Instance.GetModel<WingsRedDot>()); return m_WingsRedDot ?? (m_WingsRedDot = ModelCenter.Instance.GetModel<WingsRedDotModel>()); } } protected override void BindController() System/Strengthening/StrengtheningSripts.cs
@@ -86,7 +86,7 @@ PackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PackModel>()); } } PlayerMainDate m_MainModel; PlayerMainDate onMainModel { get { return m_MainModel ?? (m_MainModel = ModelCenter.Instance.GetModel<PlayerMainDate>()); } } PlayerTaskDatas m_PlayerTask; TaskModel m_PlayerTask; public static Action IsFightUp;
File was renamed from System/Strengthening/WingsRedDot.cs @@ -1,245 +1,240 @@ //-------------------------------------------------------- // [Author]: 第二世界 // [ Date ]: Monday, November 20, 2017 //-------------------------------------------------------- using UnityEngine; using System.Collections; using UnityEngine.UI; using System; using System.Collections.Generic; using Snxxz.UI; //翅膀精炼红点 namespace Snxxz.UI { [XLua.LuaCallCSharp] public class WingsRedDot : Model, IPlayerLoginOk, IBeforePlayerDataInitialize { private const int Redpoint_key = 10603; public Redpoint redPointStre = new Redpoint(MainRedDot.RedPoint_key1, Redpoint_key); private int WingNumber = 0;//翅膀数量标记 private int Marking = 0; private bool IsOnePutOn = true; public bool IsBoolOpenWingeWin = false; PackModel _playerPack; PackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PackModel>()); } } public override void Init() { } public void OnPlayerLoginOk() { playerPack.itemCntAddEvent += ItemCntAddAct;//物品数量增加 playerPack.itemCntReduceEvent += ItemCntReduceAct;//物品数量减少 FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChange; ItemModel itemModel = playerPack.GetItemByIndex(PackType.Equip, (int)RoleEquipType.Wing); if (IsOnePutOn) { WingsDot(); } if (itemModel != null) { IsOnePutOn = false; } } public void OnBeforePlayerDataInitialize() { playerPack.itemCntAddEvent -= ItemCntAddAct;//物品数量增加 FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChange; playerPack.itemCntReduceEvent -= ItemCntReduceAct;//物品数量减少 } public override void UnInit() { } private void OnFuncStateChange(int obj) { if (obj == 90) { WingsDot(); } } public class WingsInformation { public int WingsID; public int WingsCount; } private Dictionary<int, WingsInformation> _dicWings = new Dictionary<int, WingsInformation>(); private List<WingRefineAttrConfig> WingRefineAttr = new List<WingRefineAttrConfig>(); public void WingsDot() { redPointStre.state = RedPointState.None; ItemModel itemModel = playerPack.GetItemByIndex(PackType.Equip, (int)RoleEquipType.Wing); if (itemModel == null || !FuncOpen.Instance.IsFuncOpen(90)) { WingNumber = 0; Marking = 0; return; } var WingItemA = WingRefineExpConfig.Get(itemModel.itemId); if (WingItemA == null) { WingNumber = 0; Marking = 0; return; } SinglePack singlePackModel = playerPack.GetSinglePack(PackType.Item); Dictionary<int, ItemModel> backpack_dic = singlePackModel.GetAllItems(); List<int> wingsRefinelist = itemModel.GetUseDataModel((int)ItemUseDataKey.wingProgressValue); if (wingsRefinelist != null) { var config = WingRefineExpConfig.Get((int)itemModel.itemId); int WingsPhase = config.WingsPhase;//获取翅膀阶数 if (WingRefineAttr.Count <= 0) { WingRefineAttr = WingRefineAttrConfig.GetValues(); } //var WingRefineAttr = WingRefineAttrConfig.GetValues(); int Max = 0; foreach (var value in WingRefineAttr) { if (value.wingsPhase == WingsPhase) { Max = value.EXPupper;//最大精炼度 } } int Now = wingsRefinelist[0]; if (Now >= Max) { WingNumber = 0; Marking = 0; return; } } _dicWings.Clear(); foreach (int index in backpack_dic.Keys) { var item = backpack_dic[index]; var itemId = item.itemId; if (WingRefineExpConfig.Has(itemId) && ItemConfig.IsWing(itemId)) { var _WingsInformation = new WingsInformation(); _WingsInformation.WingsID = itemId; _WingsInformation.WingsCount = item.count; _dicWings.Add(index, _WingsInformation); } } var config1 = WingRefineExpConfig.Get((int)itemModel.itemId); foreach (var key in _dicWings.Keys) { var wings = ItemConfig.Get(_dicWings[key].WingsID); if (wings.EndureReduceType != 0) { return; } var config2 = WingRefineExpConfig.Get(_dicWings[key].WingsID); if (config1.WingsPhase >= config2.WingsPhase) { WingNumber += playerPack.GetItemCountByID(PackType.Item, _dicWings[key].WingsID); } } if (IsBoolOpenWingeWin) { return; } if (WingNumber > Marking && FuncOpen.Instance.IsFuncOpen(90)) { Marking = WingNumber; redPointStre.state = RedPointState.Simple; return; } else { Marking = WingNumber; } } private void ItemCntAddAct(PackType arg1, int ItemIndex, int ItemID)//物品数量增加 { if (arg1 == PackType.Item)//物品背包物品增加 { ItemBagAdd(ItemIndex, ItemID); } if (arg1 == PackType.Equip)//装备背包物品增加 { ItemModel itemModel = playerPack.GetItemByIndex(PackType.Equip, (int)RoleEquipType.Wing); if (IsOnePutOn) { WingsDot(); } if (itemModel != null) { IsOnePutOn = false; } } } private void ItemBagAdd(int ItemIndex, int ItemID)//物品背包数量添加 { ItemModel ItemModel = playerPack.GetItemByIndex(PackType.Item, ItemIndex); int ItemCount = ItemModel.preItemCount; var WingItem = WingRefineExpConfig.Get(ItemModel.itemId); if (IsBoolOpenWingeWin || WingItem == null) { return; } if (_dicWings.ContainsKey(ItemIndex)) { if (ItemCount > _dicWings[ItemIndex].WingsCount) { _dicWings[ItemIndex].WingsCount = ItemCount; redPointStre.state = RedPointState.Simple; } else { _dicWings[ItemIndex].WingsCount = ItemCount; } } } private void ItemCntReduceAct(PackType arg1, int Index, int ItemID) { if (arg1 == PackType.Item)//物品背包物品减少 { var WingItem = WingRefineExpConfig.Get(ItemID); if (WingItem != null && _dicWings.ContainsKey(Index)) { _dicWings.Remove(Index); if (_dicWings.Count <= 0 && redPointStre.state == RedPointState.Simple) { redPointStre.state = RedPointState.None; return; } } } if (arg1 == PackType.Equip)//装备脱下 { ItemModel itemModel = playerPack.GetItemByIndex(PackType.Equip, (int)RoleEquipType.Wing); if (itemModel == null && redPointStre.state == RedPointState.Simple) { redPointStre.state = RedPointState.None; return; } } } } } //-------------------------------------------------------- // [Author]: 第二世界 // [ Date ]: Monday, November 20, 2017 //-------------------------------------------------------- using UnityEngine; using System.Collections; using UnityEngine.UI; using System; using System.Collections.Generic; using Snxxz.UI; //翅膀精炼红点 namespace Snxxz.UI { [XLua.LuaCallCSharp] public class WingsRedDotModel : Model, IPlayerLoginOk, IBeforePlayerDataInitialize { private const int Redpoint_key = 10603; public Redpoint redPointStre = new Redpoint(MainRedDot.RedPoint_key1, Redpoint_key); private int WingNumber = 0;//翅膀数量标记 private int Marking = 0; private bool IsOnePutOn = true; public bool IsBoolOpenWingeWin = false; PackModel packModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } } public override void Init() { } public void OnPlayerLoginOk() { packModel.itemCntAddEvent += ItemCntAddAct;//物品数量增加 packModel.itemCntReduceEvent += ItemCntReduceAct;//物品数量减少 FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChange; ItemModel itemModel = packModel.GetItemByIndex(PackType.Equip, (int)RoleEquipType.Wing); if (IsOnePutOn) { WingsDot(); } if (itemModel != null) { IsOnePutOn = false; } } public void OnBeforePlayerDataInitialize() { packModel.itemCntAddEvent -= ItemCntAddAct;//物品数量增加 FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChange; packModel.itemCntReduceEvent -= ItemCntReduceAct;//物品数量减少 } public override void UnInit() { } private void OnFuncStateChange(int obj) { if (obj == 90) { WingsDot(); } } public class WingsInformation { public int WingsID; public int WingsCount; } private Dictionary<int, WingsInformation> _dicWings = new Dictionary<int, WingsInformation>(); private List<WingRefineAttrConfig> WingRefineAttr = new List<WingRefineAttrConfig>(); public void WingsDot() { redPointStre.state = RedPointState.None; ItemModel itemModel = packModel.GetItemByIndex(PackType.Equip, (int)RoleEquipType.Wing); if (itemModel == null || !FuncOpen.Instance.IsFuncOpen(90)) { WingNumber = 0; Marking = 0; return; } var WingItemA = WingRefineExpConfig.Get(itemModel.itemId); if (WingItemA == null) { WingNumber = 0; Marking = 0; return; } SinglePack singlePackModel = packModel.GetSinglePack(PackType.Item); Dictionary<int, ItemModel> backpack_dic = singlePackModel.GetAllItems(); List<int> wingsRefinelist = itemModel.GetUseDataModel((int)ItemUseDataKey.wingProgressValue); if (wingsRefinelist != null) { var config = WingRefineExpConfig.Get((int)itemModel.itemId); int WingsPhase = config.WingsPhase;//获取翅膀阶数 if (WingRefineAttr.Count <= 0) { WingRefineAttr = WingRefineAttrConfig.GetValues(); } //var WingRefineAttr = WingRefineAttrConfig.GetValues(); int Max = 0; foreach (var value in WingRefineAttr) { if (value.wingsPhase == WingsPhase) { Max = value.EXPupper;//最大精炼度 } } int Now = wingsRefinelist[0]; if (Now >= Max) { WingNumber = 0; Marking = 0; return; } } _dicWings.Clear(); foreach (int index in backpack_dic.Keys) { var item = backpack_dic[index]; var itemId = item.itemId; if (WingRefineExpConfig.Has(itemId) && ItemConfig.IsWing(itemId)) { var _WingsInformation = new WingsInformation(); _WingsInformation.WingsID = itemId; _WingsInformation.WingsCount = item.count; _dicWings.Add(index, _WingsInformation); } } var config1 = WingRefineExpConfig.Get((int)itemModel.itemId); foreach (var key in _dicWings.Keys) { var wings = ItemConfig.Get(_dicWings[key].WingsID); if (wings.EndureReduceType != 0) { return; } var config2 = WingRefineExpConfig.Get(_dicWings[key].WingsID); if (config1.WingsPhase >= config2.WingsPhase) { WingNumber += packModel.GetItemCountByID(PackType.Item, _dicWings[key].WingsID); } } if (IsBoolOpenWingeWin) { return; } if (WingNumber > Marking && FuncOpen.Instance.IsFuncOpen(90)) { Marking = WingNumber; redPointStre.state = RedPointState.Simple; return; } else { Marking = WingNumber; } } private void ItemCntAddAct(PackType arg1, int ItemIndex, int ItemID)//物品数量增加 { if (arg1 == PackType.Item)//物品背包物品增加 { ItemBagAdd(ItemIndex, ItemID); } if (arg1 == PackType.Equip)//装备背包物品增加 { ItemModel itemModel = packModel.GetItemByIndex(PackType.Equip, (int)RoleEquipType.Wing); if (IsOnePutOn) { WingsDot(); } if (itemModel != null) { IsOnePutOn = false; } } } private void ItemBagAdd(int ItemIndex, int ItemID)//物品背包数量添加 { ItemModel ItemModel = packModel.GetItemByIndex(PackType.Item, ItemIndex); int ItemCount = ItemModel.preItemCount; var WingItem = WingRefineExpConfig.Get(ItemModel.itemId); if (IsBoolOpenWingeWin || WingItem == null) { return; } if (_dicWings.ContainsKey(ItemIndex)) { if (ItemCount > _dicWings[ItemIndex].WingsCount) { _dicWings[ItemIndex].WingsCount = ItemCount; redPointStre.state = RedPointState.Simple; } else { _dicWings[ItemIndex].WingsCount = ItemCount; } } } private void ItemCntReduceAct(PackType arg1, int Index, int ItemID) { if (arg1 == PackType.Item)//物品背包物品减少 { var WingItem = WingRefineExpConfig.Get(ItemID); if (WingItem != null && _dicWings.ContainsKey(Index)) { _dicWings.Remove(Index); if (_dicWings.Count <= 0 && redPointStre.state == RedPointState.Simple) { redPointStre.state = RedPointState.None; return; } } } if (arg1 == PackType.Equip)//装备脱下 { ItemModel itemModel = packModel.GetItemByIndex(PackType.Equip, (int)RoleEquipType.Wing); if (itemModel == null && redPointStre.state == RedPointState.Simple) { redPointStre.state = RedPointState.None; return; } } } } }
System/Strengthening/WingsRefined.cs
@@ -46,8 +46,8 @@ PackModel _playerPack; PackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PackModel>()); } } WingsRedDot M_WingsRedDotModel; WingsRedDot wingsRedDotModel { get { return M_WingsRedDotModel ?? (M_WingsRedDotModel = ModelCenter.Instance.GetModel<WingsRedDot>()); } } WingsRedDotModel M_WingsRedDotModel; WingsRedDotModel wingsRedDotModel { get { return M_WingsRedDotModel ?? (M_WingsRedDotModel = ModelCenter.Instance.GetModel<WingsRedDotModel>()); } } private bool IsOpen = false; class WingRefineAttrModel System/SystemSetting/ActivitiesPushModel.cs
File was renamed from System/SystemSetting/ActivitiesPushMgr.cs @@ -1,319 +1,319 @@ using LitJson; using System; using System.Collections.Generic; using System.Linq; using System.Text; namespace Snxxz.UI { [XLua.LuaCallCSharp] public class ActivitiesPushMgr : Model,IBeforePlayerDataInitialize,IAfterPlayerDataInitialize,IPlayerLoginOk { public const int WholePeopleRankStart = 2091000; //全民冲榜开始 public const int WholePeopleRankEnd = 20910000; //全民冲榜截止 public const int FlashRushToBuy = 209014; //限时抢购 ImpactRankModel impactRank { get { return ModelCenter.Instance.GetModel<ImpactRankModel>(); } } FlashRushToBuyModel rushToBuyModel { get { return ModelCenter.Instance.GetModel<FlashRushToBuyModel>(); } } private List<int> rankTypelist = new List<int>(); public override void Init() { List<OSCBillRankAwardConfig> configs = OSCBillRankAwardConfig.GetValues(); for(int i = 0; i < configs.Count; i++) { if(!rankTypelist.Contains(configs[i].RangListType)) { rankTypelist.Add(configs[i].RangListType); } } } public void OnBeforePlayerDataInitialize() { rushToBuyModel.UpdateAllAppointmentEvent -= UpdateAllAppointment; rushToBuyModel.UpdateAppointmentEvent -= UpdateAppointment; GlobalTimeEvent.Instance.minuteEvent -= RefreshMinuteTime; OpenServerActivityCenter.Instance.openServerActivityStateChange -= RefreshOpenServerState; } public void OnAfterPlayerDataInitialize() { } public void OnPlayerLoginOk() { SetRankStartPushInfo(); SetRankEndPushInfo(); SetFlashRushToBuyAppointmentInfo(); GlobalTimeEvent.Instance.minuteEvent += RefreshMinuteTime; OpenServerActivityCenter.Instance.openServerActivityStateChange += RefreshOpenServerState; rushToBuyModel.UpdateAllAppointmentEvent += UpdateAllAppointment; rushToBuyModel.UpdateAppointmentEvent += UpdateAppointment; } public override void UnInit() { } private void RefreshMinuteTime() { RemovePushByTime(PushInfoType.RankStart,11); RemovePushByTime(PushInfoType.RankEnd,23); RemoveFlashRushToBuyAppointmentByTime(); } private void RefreshOpenServerState() { SetRankStartPushInfo(); SetRankEndPushInfo(); RemovePushByActiveClose(PushInfoType.RankStart); RemovePushByActiveClose(PushInfoType.RankEnd); SetFlashRushToBuyAppointmentInfo(); } #region 开服活动冲榜推送 private void SetRankStartPushInfo() { for(int i = 0; i <rankTypelist.Count; i++) { int rankStartId = WholePeopleRankStart + rankTypelist[i]; if (impactRank.IsActivityClose(rankTypelist[i])) { RemovePushInfo(rankStartId); } else { int day = impactRank.GetOpenDay(rankTypelist[i]); int remainHour = 11 - TimeUtility.ServerNow.Hour; int remainMinute = 0 - TimeUtility.ServerNow.Minute; int remainSecond = day * 24 * 60 * 60 + remainHour * 60 * 60 + remainMinute * 60; if (remainSecond > 0) { PlayerRankData.RankType rankType = impactRank.GetRankType(rankTypelist[i]); string rankName = StringUtility.Contact("OSCBillRankTitle_", rankType); SendPushInfo(GetPushJsonData(rankStartId, remainSecond, Language.Get("SetUpPrivate106"), Language.Get("SetUpPrivate107",Language.Get(rankName)))); } } } } private void SetRankEndPushInfo() { for(int i = 0; i < rankTypelist.Count; i++) { int rankEndId = WholePeopleRankEnd + rankTypelist[i]; if (impactRank.IsActivityClose(rankTypelist[i])) { RemovePushInfo(rankEndId); } else { int day = impactRank.GetSurplusDay(rankTypelist[i]); int remainHour = 23 - TimeUtility.ServerNow.Hour; int remainMinute = 0 - TimeUtility.ServerNow.Minute; int remainSecond = (day - 1) * 24 * 60 * 60 + remainHour * 60 * 60 + remainMinute * 60; if (remainSecond > 0) { PlayerRankData.RankType rankType = impactRank.GetRankType(rankTypelist[i]); string rankName = StringUtility.Contact("OSCBillRankTitle_", rankType); SendPushInfo(GetPushJsonData(rankEndId, remainSecond, Language.Get("SetUpPrivate106"), Language.Get("SetUpPrivate108", Language.Get(rankName)))); } } } } private void RemovePushByActiveClose(PushInfoType type) { switch (type) { case PushInfoType.RankStart: for (int i = 0; i < rankTypelist.Count; i++) { int rankStartId = WholePeopleRankStart + rankTypelist[i]; if (impactRank.IsActivityClose(rankTypelist[i])) { RemovePushInfo(rankStartId); } } break; case PushInfoType.RankEnd: for (int i = 0; i < rankTypelist.Count; i++) { int rankEndId = WholePeopleRankEnd + rankTypelist[i]; if (impactRank.IsActivityClose(rankTypelist[i])) { RemovePushInfo(rankEndId); } } break; } } private void RemovePushByTime(PushInfoType type, int time) { int remainHour = time - TimeUtility.ServerNow.Hour; int remainMinute = 0 - TimeUtility.ServerNow.Minute; int remainSecond = remainHour * 60 * 60 + remainMinute * 60; switch (type) { case PushInfoType.RankStart: for (int i = 0; i < rankTypelist.Count; i++) { int rankStartId = WholePeopleRankStart + rankTypelist[i]; if (!impactRank.IsActivityClose(rankTypelist[i])) { int day = impactRank.GetOpenDay(rankTypelist[i]); if (day <= 0 && remainSecond <= 120) { RemovePushInfo(rankStartId); } } } break; case PushInfoType.RankEnd: for (int i = 0; i < rankTypelist.Count; i++) { int rankEndId = WholePeopleRankEnd + rankTypelist[i]; if (!impactRank.IsActivityClose(rankTypelist[i])) { int day = impactRank.GetSurplusDay(rankTypelist[i]); if (day <= 1 && remainSecond <= 120) { RemovePushInfo(rankEndId); } } } break; } } #endregion #region 限时抢购推送 private void UpdateAllAppointment() { SetFlashRushToBuyAppointmentInfo(); } private void UpdateAppointment(int shopGuid) { if (!rushToBuyModel.IsOpen) return; var operation = rushToBuyModel.GetOperationFlashRushToBuy(); int pushId = FlashRushToBuy * 10 + shopGuid; OperationFlashRushToBuy.FlashSaleItem saleItem; OperationFlashRushToBuy.FlashSaleShop saleShop; bool isSaleItem = operation.TryGetFlashItem(shopGuid,out saleShop,out saleItem); if(isSaleItem) { if(saleItem.isAppointment != 1) { RemovePushInfo(pushId); } else { int seconds = 0; int buyState = operation.GetBuyTimeState(TimeUtility.ServerNow, saleShop.dayIndex, saleShop.timeIndex, out seconds); if(seconds > 800) { int remainSecond = seconds - 600; SendPushInfo(GetPushJsonData(pushId, remainSecond, "限时抢购", "亲爱的道友，您预约的限时抢购商品即将开抢，请尽快进入游戏秒杀！")); } } } } private void SetFlashRushToBuyAppointmentInfo() { if (!rushToBuyModel.IsOpen) return; var operation = rushToBuyModel.GetOperationFlashRushToBuy(); for(int i = 0; i < operation.flashShops.Count; i++) { var flashShop = operation.flashShops[i]; int seconds = 0; int buyState = operation.GetBuyTimeState(TimeUtility.ServerNow, flashShop.dayIndex,flashShop.timeIndex,out seconds); var saleItems = operation.flashShops[i].items; for (int j = 0; j < saleItems.Length; j++) { int pushId = FlashRushToBuy * 10 + saleItems[j].shopGuid; if (buyState == -1 && seconds > 800 && saleItems[j].isAppointment == 1) { int remainSecond = seconds - 600; SendPushInfo(GetPushJsonData(pushId, remainSecond, "限时抢购", "亲爱的道友，您预约的限时抢购商品即将开抢，请尽快进入游戏秒杀！")); } else { RemovePushInfo(pushId); } } } } private void RemoveFlashRushToBuyAppointmentByTime() { if (!rushToBuyModel.IsOpen) return; var operation = rushToBuyModel.GetOperationFlashRushToBuy(); for (int i = 0; i < operation.flashShops.Count; i++) { var flashShop = operation.flashShops[i]; int seconds = 0; int buyState = operation.GetBuyTimeState(TimeUtility.ServerNow, flashShop.dayIndex, flashShop.timeIndex, out seconds); var saleItems = operation.flashShops[i].items; for (int j = 0; j < saleItems.Length; j++) { int pushId = FlashRushToBuy * 10 + saleItems[j].shopGuid; if (buyState != -1) { RemovePushInfo(pushId); } else { if(seconds <= 180) { RemovePushInfo(pushId); } } } } } #endregion public void RemovePushInfo(int pushId) { SDKUtility.Instance.GeTui_RemoveLocalMessage(pushId.ToString()); } public void SendPushInfo(JsonData data) { SDKUtility.Instance.GeTui_SendLocalMessage(data); } public JsonData GetPushJsonData(int pushId,int pushtime,string title,string content) { JsonData _params = new JsonData(); _params["code"] = 2005; _params["id"] = pushId;// id 重要, 标示每个通知的更新或者移除 _params["title"] = title;// 推送标题 _params["subtitle"] = "";// 副标题 _params["content"] = content;// 具体内容 _params["badge"] = -1;// 角标 // 以下为决定应该多久后弹出此通知 System.TimeSpan ts = System.DateTime.UtcNow - new System.DateTime(1970, 1, 1, 0, 0, 0, 0); long ret = System.Convert.ToInt64(ts.TotalSeconds) + pushtime;// 表示3秒后 _params["fireTime"] = ret; return _params; } public enum PushInfoType { RankStart, RankEnd, } } } using LitJson; using System; using System.Collections.Generic; using System.Linq; using System.Text; namespace Snxxz.UI { [XLua.LuaCallCSharp] public class ActivitiesPushModel : Model, IBeforePlayerDataInitialize, IAfterPlayerDataInitialize, IPlayerLoginOk { public const int WholePeopleRankStart = 2091000; //全民冲榜开始 public const int WholePeopleRankEnd = 20910000; //全民冲榜截止 public const int FlashRushToBuy = 209014; //限时抢购 ImpactRankModel impactRank { get { return ModelCenter.Instance.GetModel<ImpactRankModel>(); } } FlashRushToBuyModel rushToBuyModel { get { return ModelCenter.Instance.GetModel<FlashRushToBuyModel>(); } } private List<int> rankTypelist = new List<int>(); public override void Init() { List<OSCBillRankAwardConfig> configs = OSCBillRankAwardConfig.GetValues(); for (int i = 0; i < configs.Count; i++) { if (!rankTypelist.Contains(configs[i].RangListType)) { rankTypelist.Add(configs[i].RangListType); } } } public void OnBeforePlayerDataInitialize() { rushToBuyModel.UpdateAllAppointmentEvent -= UpdateAllAppointment; rushToBuyModel.UpdateAppointmentEvent -= UpdateAppointment; GlobalTimeEvent.Instance.minuteEvent -= RefreshMinuteTime; OpenServerActivityCenter.Instance.openServerActivityStateChange -= RefreshOpenServerState; } public void OnAfterPlayerDataInitialize() { } public void OnPlayerLoginOk() { SetRankStartPushInfo(); SetRankEndPushInfo(); SetFlashRushToBuyAppointmentInfo(); GlobalTimeEvent.Instance.minuteEvent += RefreshMinuteTime; OpenServerActivityCenter.Instance.openServerActivityStateChange += RefreshOpenServerState; rushToBuyModel.UpdateAllAppointmentEvent += UpdateAllAppointment; rushToBuyModel.UpdateAppointmentEvent += UpdateAppointment; } public override void UnInit() { } private void RefreshMinuteTime() { RemovePushByTime(PushInfoType.RankStart, 11); RemovePushByTime(PushInfoType.RankEnd, 23); RemoveFlashRushToBuyAppointmentByTime(); } private void RefreshOpenServerState() { SetRankStartPushInfo(); SetRankEndPushInfo(); RemovePushByActiveClose(PushInfoType.RankStart); RemovePushByActiveClose(PushInfoType.RankEnd); SetFlashRushToBuyAppointmentInfo(); } #region 开服活动冲榜推送 private void SetRankStartPushInfo() { for (int i = 0; i < rankTypelist.Count; i++) { int rankStartId = WholePeopleRankStart + rankTypelist[i]; if (impactRank.IsActivityClose(rankTypelist[i])) { RemovePushInfo(rankStartId); } else { int day = impactRank.GetOpenDay(rankTypelist[i]); int remainHour = 11 - TimeUtility.ServerNow.Hour; int remainMinute = 0 - TimeUtility.ServerNow.Minute; int remainSecond = day * 24 * 60 * 60 + remainHour * 60 * 60 + remainMinute * 60; if (remainSecond > 0) { PlayerRankData.RankType rankType = impactRank.GetRankType(rankTypelist[i]); string rankName = StringUtility.Contact("OSCBillRankTitle_", rankType); SendPushInfo(GetPushJsonData(rankStartId, remainSecond, Language.Get("SetUpPrivate106"), Language.Get("SetUpPrivate107", Language.Get(rankName)))); } } } } private void SetRankEndPushInfo() { for (int i = 0; i < rankTypelist.Count; i++) { int rankEndId = WholePeopleRankEnd + rankTypelist[i]; if (impactRank.IsActivityClose(rankTypelist[i])) { RemovePushInfo(rankEndId); } else { int day = impactRank.GetSurplusDay(rankTypelist[i]); int remainHour = 23 - TimeUtility.ServerNow.Hour; int remainMinute = 0 - TimeUtility.ServerNow.Minute; int remainSecond = (day - 1) * 24 * 60 * 60 + remainHour * 60 * 60 + remainMinute * 60; if (remainSecond > 0) { PlayerRankData.RankType rankType = impactRank.GetRankType(rankTypelist[i]); string rankName = StringUtility.Contact("OSCBillRankTitle_", rankType); SendPushInfo(GetPushJsonData(rankEndId, remainSecond, Language.Get("SetUpPrivate106"), Language.Get("SetUpPrivate108", Language.Get(rankName)))); } } } } private void RemovePushByActiveClose(PushInfoType type) { switch (type) { case PushInfoType.RankStart: for (int i = 0; i < rankTypelist.Count; i++) { int rankStartId = WholePeopleRankStart + rankTypelist[i]; if (impactRank.IsActivityClose(rankTypelist[i])) { RemovePushInfo(rankStartId); } } break; case PushInfoType.RankEnd: for (int i = 0; i < rankTypelist.Count; i++) { int rankEndId = WholePeopleRankEnd + rankTypelist[i]; if (impactRank.IsActivityClose(rankTypelist[i])) { RemovePushInfo(rankEndId); } } break; } } private void RemovePushByTime(PushInfoType type, int time) { int remainHour = time - TimeUtility.ServerNow.Hour; int remainMinute = 0 - TimeUtility.ServerNow.Minute; int remainSecond = remainHour * 60 * 60 + remainMinute * 60; switch (type) { case PushInfoType.RankStart: for (int i = 0; i < rankTypelist.Count; i++) { int rankStartId = WholePeopleRankStart + rankTypelist[i]; if (!impactRank.IsActivityClose(rankTypelist[i])) { int day = impactRank.GetOpenDay(rankTypelist[i]); if (day <= 0 && remainSecond <= 120) { RemovePushInfo(rankStartId); } } } break; case PushInfoType.RankEnd: for (int i = 0; i < rankTypelist.Count; i++) { int rankEndId = WholePeopleRankEnd + rankTypelist[i]; if (!impactRank.IsActivityClose(rankTypelist[i])) { int day = impactRank.GetSurplusDay(rankTypelist[i]); if (day <= 1 && remainSecond <= 120) { RemovePushInfo(rankEndId); } } } break; } } #endregion #region 限时抢购推送 private void UpdateAllAppointment() { SetFlashRushToBuyAppointmentInfo(); } private void UpdateAppointment(int shopGuid) { if (!rushToBuyModel.IsOpen) return; var operation = rushToBuyModel.GetOperationFlashRushToBuy(); int pushId = FlashRushToBuy * 10 + shopGuid; OperationFlashRushToBuy.FlashSaleItem saleItem; OperationFlashRushToBuy.FlashSaleShop saleShop; bool isSaleItem = operation.TryGetFlashItem(shopGuid, out saleShop, out saleItem); if (isSaleItem) { if (saleItem.isAppointment != 1) { RemovePushInfo(pushId); } else { int seconds = 0; int buyState = operation.GetBuyTimeState(TimeUtility.ServerNow, saleShop.dayIndex, saleShop.timeIndex, out seconds); if (seconds > 800) { int remainSecond = seconds - 600; SendPushInfo(GetPushJsonData(pushId, remainSecond, "限时抢购", "亲爱的道友，您预约的限时抢购商品即将开抢，请尽快进入游戏秒杀！")); } } } } private void SetFlashRushToBuyAppointmentInfo() { if (!rushToBuyModel.IsOpen) return; var operation = rushToBuyModel.GetOperationFlashRushToBuy(); for (int i = 0; i < operation.flashShops.Count; i++) { var flashShop = operation.flashShops[i]; int seconds = 0; int buyState = operation.GetBuyTimeState(TimeUtility.ServerNow, flashShop.dayIndex, flashShop.timeIndex, out seconds); var saleItems = operation.flashShops[i].items; for (int j = 0; j < saleItems.Length; j++) { int pushId = FlashRushToBuy * 10 + saleItems[j].shopGuid; if (buyState == -1 && seconds > 800 && saleItems[j].isAppointment == 1) { int remainSecond = seconds - 600; SendPushInfo(GetPushJsonData(pushId, remainSecond, "限时抢购", "亲爱的道友，您预约的限时抢购商品即将开抢，请尽快进入游戏秒杀！")); } else { RemovePushInfo(pushId); } } } } private void RemoveFlashRushToBuyAppointmentByTime() { if (!rushToBuyModel.IsOpen) return; var operation = rushToBuyModel.GetOperationFlashRushToBuy(); for (int i = 0; i < operation.flashShops.Count; i++) { var flashShop = operation.flashShops[i]; int seconds = 0; int buyState = operation.GetBuyTimeState(TimeUtility.ServerNow, flashShop.dayIndex, flashShop.timeIndex, out seconds); var saleItems = operation.flashShops[i].items; for (int j = 0; j < saleItems.Length; j++) { int pushId = FlashRushToBuy * 10 + saleItems[j].shopGuid; if (buyState != -1) { RemovePushInfo(pushId); } else { if (seconds <= 180) { RemovePushInfo(pushId); } } } } } #endregion public void RemovePushInfo(int pushId) { SDKUtility.Instance.GeTui_RemoveLocalMessage(pushId.ToString()); } public void SendPushInfo(JsonData data) { SDKUtility.Instance.GeTui_SendLocalMessage(data); } public JsonData GetPushJsonData(int pushId, int pushtime, string title, string content) { JsonData _params = new JsonData(); _params["code"] = 2005; _params["id"] = pushId;// id 重要, 标示每个通知的更新或者移除 _params["title"] = title;// 推送标题 _params["subtitle"] = "";// 副标题 _params["content"] = content;// 具体内容 _params["badge"] = -1;// 角标 // 以下为决定应该多久后弹出此通知 System.TimeSpan ts = System.DateTime.UtcNow - new System.DateTime(1970, 1, 1, 0, 0, 0, 0); long ret = System.Convert.ToInt64(ts.TotalSeconds) + pushtime;// 表示3秒后 _params["fireTime"] = ret; return _params; } public enum PushInfoType { RankStart, RankEnd, } } } System/SystemSetting/ActivitiesPushModel.cs.metacopy from System/SystemSetting/ActivitiesPushMgr.cs.meta copy to System/SystemSetting/ActivitiesPushModel.cs.meta
File was copied from System/SystemSetting/ActivitiesPushMgr.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: e05d215b8c30a264eb3c61935dbbd3e8 timeCreated: 1533286661 guid: 85a4fd1c4a74de647b4a189065267c29 timeCreated: 1551078596 licenseType: Pro MonoImporter: serializedVersion: 2 System/Treasure/FairyTreasureCollectPanelPattern5.cs
@@ -47,7 +47,7 @@ } } PlayerTaskDatas task { get { return ModelCenter.Instance.GetModel<PlayerTaskDatas>(); } } TaskModel task { get { return ModelCenter.Instance.GetModel<TaskModel>(); } } Achievement currentAchievement;
@@ -31,7 +31,7 @@ TreasureModel model { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } } PlayerTaskDatas task { get { return ModelCenter.Instance.GetModel<PlayerTaskDatas>(); } } TaskModel task { get { return ModelCenter.Instance.GetModel<TaskModel>(); } } public void Display(int _id) { System/Treasure/TreasureAchievement.cs
@@ -34,7 +34,7 @@ TreasureModel treasureModel { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } } AchievementModel model { get { return ModelCenter.Instance.GetModel<AchievementModel>(); } } PlayerTaskDatas task { get { return ModelCenter.Instance.GetModel<PlayerTaskDatas>(); } } TaskModel task { get { return ModelCenter.Instance.GetModel<TaskModel>(); } } AchievementGroup m_AchievementGroup; public AchievementGroup achievementGroup { @@ -141,7 +141,7 @@ if (achievement.id == GeneralDefine.specialGuide41Achievement && task.GetTaskStatus(GeneralDefine.specialGuide41Mission) == PlayerTaskDatas.TaskStatus.TreasureCardLevel == TaskModel.TaskStatus.TreasureCardLevel && !NewBieCenter.Instance.completeGuidesBuf.Contains(41) && string.IsNullOrEmpty(guid)) { System/Treasure/TreasureLevelUpWin.cs
@@ -79,7 +79,7 @@ } } PlayerTaskDatas task { get { return ModelCenter.Instance.GetModel<PlayerTaskDatas>(); } } TaskModel task { get { return ModelCenter.Instance.GetModel<TaskModel>(); } } Treasure m_Treasure; @@ -127,7 +127,7 @@ protected override void OnActived() { base.OnActived(); PlayerTaskDatas.CardLevelChange += CardLevelChange; TaskModel.CardLevelChange += CardLevelChange; model.treasureLevelProgressUpdateEvent += TreasureLevelProgressUpdateEvent; model.treasureSelectedEvent += TreasureSelectedEvent; model.treasureStageUpEvent += TreasureStageUpEvent; @@ -158,7 +158,7 @@ protected override void OnPreClose() { model.treasureLevelProgressUpdateEvent -= TreasureLevelProgressUpdateEvent; PlayerTaskDatas.CardLevelChange -= CardLevelChange; TaskModel.CardLevelChange -= CardLevelChange; model.treasureSelectedEvent -= TreasureSelectedEvent; model.treasureStageUpEvent -= TreasureStageUpEvent; m_TreasureAnimation.OnStepComplete -= OnStepComplete; @@ -505,7 +505,7 @@ model.openFromTreasureCollect = false; foreach (var value in task.MainTaskDic.Values) { if (task.GetTaskStatus(value.ID) == PlayerTaskDatas.TaskStatus.TreasureCardLevel) if (task.GetTaskStatus(value.ID) == TaskModel.TaskStatus.TreasureCardLevel) { model.openFromTaskId = value.ID; break; @@ -514,7 +514,7 @@ } if (model.openFromTaskId != 0 && model.castSoulGuideTaskIds.Contains(model.openFromTaskId) && task.GetTaskStatus(model.openFromTaskId) == PlayerTaskDatas.TaskStatus.TreasureCardLevel && task.GetTaskStatus(model.openFromTaskId) == TaskModel.TaskStatus.TreasureCardLevel && m_Treasure.achievementRedpoint.state == RedPointState.None && m_Treasure is HumanTreasure && (m_Treasure as HumanTreasure).castSoulRedpoint.state == RedPointState.None) System/Treasure/TreasureModel.cs
@@ -1745,7 +1745,7 @@ } } } var taskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>(); var taskModel = ModelCenter.Instance.GetModel<TaskModel>(); var missions = taskModel.MainTaskDic; if (missions != null) { System/Treasure/TreasureNewGotWin.cs
@@ -55,7 +55,7 @@ [SerializeField] Text m_FightPower; TreasureModel model { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } } PlayerTaskDatas taskmodel { get { return ModelCenter.Instance.GetModel<PlayerTaskDatas>(); } } TaskModel taskmodel { get { return ModelCenter.Instance.GetModel<TaskModel>(); } } SkillModel skillModel { get { return ModelCenter.Instance.GetModel<SkillModel>(); } } KingTreasureModel kingTreasureModel { get { return ModelCenter.Instance.GetModel<KingTreasureModel>(); } } CrossServerOneVsOneModel oneVsOneModel { get { return ModelCenter.Instance.GetModel<CrossServerOneVsOneModel>(); } } System/Welcome/WelcomeWin.cs
@@ -111,7 +111,7 @@ { CloseClick(); WindowCenter.Instance.Open<MainInterfaceWin>(); var taskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>(); var taskModel = ModelCenter.Instance.GetModel<TaskModel>(); taskModel.AutomaticTripToTask(taskModel.currentMission); }
@@ -112,7 +112,7 @@ RegisterModel<LoginModel>(); RegisterModel<EquipWashModel>(); RegisterModel<HeavenBattleModel>(); RegisterModel<WingsRedDot>(); RegisterModel<WingsRedDotModel>(); RegisterModel<TeamModel>(); RegisterModel<BossHomeModel>(); RegisterModel<RealmModel>(); @@ -149,9 +149,9 @@ RegisterModel<PreciousItemGetModel>(); RegisterModel<PlayerMainDate>(); RegisterModel<StoryMissionsModel>(); RegisterModel<PlayerFairyAuTreasureData>(); RegisterModel<FairyAuTreasureModel>(); RegisterModel<BoxGetItemModel>(); RegisterModel<PlayerRedPacketDatas>(); RegisterModel<RedPacketModel>(); RegisterModel<GuardModel>(); RegisterModel<PlayerMethodData>(); RegisterModel<ItemUseModel>(); @@ -185,7 +185,7 @@ RegisterModel<FlashSaleModel>(); RegisterModel<FairylandCeremonyModel>(); RegisterModel<TrialDungeonModel>(); RegisterModel<ActivitiesPushMgr>(); RegisterModel<ActivitiesPushModel>(); RegisterModel<MultipleRealmPointModel>(); RegisterModel<DogzDungeonModel>(); RegisterModel<DogzModel>(); System/WindowJump/WindowJumpMgr.cs
@@ -272,7 +272,7 @@ SetJumpLogic<RolePointWin>(_tagWinSearchModel.TABID); break; case JumpUIType.MainTask: PlayerTaskDatas taskDatas = ModelCenter.Instance.GetModel<PlayerTaskDatas>(); TaskModel taskDatas = ModelCenter.Instance.GetModel<TaskModel>(); taskDatas.AutomaticTripToTask(taskDatas.currentMission); SetJumpLogic<MainInterfaceWin>(_tagWinSearchModel.TABID); break; @@ -844,7 +844,7 @@ } break; case JumpUIType.PlotTaskFunc3: var taskmodel = ModelCenter.Instance.GetModel<PlayerTaskDatas>(); var taskmodel = ModelCenter.Instance.GetModel<TaskModel>(); if (taskmodel.SideQuestsDic.Count < 1) { SysNotifyMgr.Instance.ShowTip("SideQuest_None"); System/WorldMap/LocalMapTag.cs
@@ -33,9 +33,9 @@ Vector3 worldPosition = Vector3.zero; int npcId = 0; int index = 0; PlayerTaskDatas taskmodel { TaskModel taskmodel { get { return ModelCenter.Instance.GetModel<PlayerTaskDatas>(); return ModelCenter.Instance.GetModel<TaskModel>(); } } @@ -62,8 +62,8 @@ } m_TaskState.SetNativeSize(); PlayerTaskDatas.Event_TaskResponse -= OnTaskStateChange; PlayerTaskDatas.Event_TaskResponse += OnTaskStateChange; TaskModel.Event_TaskResponse -= OnTaskStateChange; TaskModel.Event_TaskResponse += OnTaskStateChange; break; case TagType.WayPoint: break; @@ -123,7 +123,7 @@ public void Dispose() { PlayerTaskDatas.Event_TaskResponse -= OnTaskStateChange; TaskModel.Event_TaskResponse -= OnTaskStateChange; fairyLeagueModel.UpdateWarCrystalEvent -= OnCrystalStateChange; PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= PlayerDataRefreshInfoEvent; } System/WorldMap/MapModel.cs
@@ -24,7 +24,7 @@ List<int> sortedHangUpPoints = new List<int>(); List<int> sortedMaps = new List<int>(); PlayerTaskDatas taskModel { get { return ModelCenter.Instance.GetModel<PlayerTaskDatas>(); } } TaskModel taskModel { get { return ModelCenter.Instance.GetModel<TaskModel>(); } } FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } } int m_NewUnlockedMap = 0; @@ -65,13 +65,13 @@ ParseLocalMaps(); PlayerDatas.Instance.PlayerDataRefreshInfoEvent += OnPlayerLevelChange; PlayerTaskDatas.Event_TaskInformation += OnMainLineTaskInfoUpdate; TaskModel.Event_TaskInformation += OnMainLineTaskInfoUpdate; } public override void UnInit() { PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= OnPlayerLevelChange; PlayerTaskDatas.Event_TaskInformation -= OnMainLineTaskInfoUpdate; TaskModel.Event_TaskInformation -= OnMainLineTaskInfoUpdate; } public void OnBeforePlayerDataInitialize() UI/Common/FuncOpen.cs
@@ -64,9 +64,9 @@ } } PlayerTaskDatas m_TaskModel; PlayerTaskDatas taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>()); } } TaskModel m_TaskModel; TaskModel taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<TaskModel>()); } } private static Dictionary<int, bool> funcOpenState = new Dictionary<int, bool>(); private int[] funcArray;
