LogicProject/System/OpenServerActivity/InvestModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
System/BT/LoginAwardWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
System/BT/Vourcher100Win.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
System/Chat/ChatCenter.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
System/Chat/ChatSendComponent.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
System/MainInterfacePanel/HighSettingTip.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
System/MainWin/MainWinTopGrid.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
System/Realm/RealmTowerWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
System/RuneTower/RuneTowerWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
System/SkyTower/SkyTowerWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
System/Vip/FirstRechargeWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
System/Vip/VipInvest/ForeverCardWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
System/Vip/VipModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
LogicProject/System/OpenServerActivity/InvestModel.cs
@@ -33,6 +33,8 @@ //投资类型 public List<int> investTypes = new List<int>(); public Dictionary<int, int> rechargeSumDict = new Dictionary<int, int>(); //投资类型激活对应的充值总额 //永久卡 权限 public const int foreverCardType = 12; //投资类型 @@ -79,6 +81,7 @@ GameEvent.beforePlayerDataInitializeEvent += OnBeforePlayerDataInitialize; GameEvent.playerLoginOkEvent += OnPlayerLoginOk; WindowCenter.Instance.windowAfterOpenEvent += Instance_windowAfterOpenEvent; vipModel.rechargeChangeEvent += OnRechargeEvent; //通过配置决定是否有此投资项,如港台没有登录投资 ParseConfig(); @@ -101,6 +104,7 @@ GameEvent.beforePlayerDataInitializeEvent -= OnBeforePlayerDataInitialize; GameEvent.playerLoginOkEvent -= OnPlayerLoginOk; WindowCenter.Instance.windowAfterOpenEvent -= Instance_windowAfterOpenEvent; vipModel.rechargeChangeEvent -= OnRechargeEvent; } public bool IsOpen() @@ -132,6 +136,15 @@ UpdateRedpoint(); } void OnRechargeEvent() { if (GetSingleInvestState(foreverCardType, GetIdsByType(foreverCardType)[0]) == 0 && vipModel.realRecharge >= rechargeSumDict[foreverCardType]) { PopupWindowsProcessor.Instance.Add("ForeverCardWin"); } UpdateRedpoint(); } void ParseConfig() { @@ -146,20 +159,24 @@ if (type == InvestType_Login || type == InvestType_Level || type == InvestType_Boss || type == foreverCardType) { m_InvestRechargeIds[type] = new List<int>(JsonMapper.ToObject<int[]>(json[typeKey].ToJson())); if (type == foreverCardType) { m_Redpoints.Add(type, new Redpoint(MainRedDot.ForeverCardRedPoint)); } else //if (type == foreverCardType) //{ // m_Redpoints.Add(type, new Redpoint(MainRedDot.ForeverCardRedPoint)); //} //else { //IL 处理新增的投资 type=9之后 m_Redpoints.Add(type, new Redpoint(redpointID, redpointID * 100 + type)); } } } //变成累充激活 m_Redpoints.Add(foreverCardType, new Redpoint(MainRedDot.ForeverCardRedPoint)); rechargeSumDict = ConfigParse.ParseIntDict(funcConfig.Numerical4); investTypes = m_InvestRechargeIds.Keys.ToList(); investTypes.Add(foreverCardType); investTypes.Sort(); var configs = InvestConfig.GetValues(); @@ -443,7 +460,8 @@ && !WindowCenter.Instance.ExistAnyFullScreenOrMaskWin() && !StageLoad.Instance.isLoading && !ModelCenter.Instance.GetModel<TreasureModel>().newGotShowing) { WindowCenter.Instance.Open<ForeverCardWin>(); //WindowCenter.Instance.Open<ForeverCardWin>(); PopupWindowsProcessor.Instance.Add("ForeverCardWin"); openState = openState | (int)Math.Pow(2, type); LocalSave.SetInt("ForeverCard" + PlayerDatas.Instance.baseData.PlayerID, openState); } @@ -533,6 +551,19 @@ var type = redList[j]; m_Redpoints[type].state = redpointTypes.Contains(type) ? RedPointState.Simple : RedPointState.None; } if (m_Redpoints[foreverCardType].state != RedPointState.Simple) { if (GetSingleInvestState(foreverCardType, GetIdsByType(foreverCardType)[0]) == 0 && vipModel.realRecharge >= rechargeSumDict[foreverCardType]) { m_Redpoints[foreverCardType].state = RedPointState.Simple; } else { m_Redpoints[foreverCardType].state = RedPointState.None; } } } public int GetBossAddMaxCnt(int type) System/BT/LoginAwardWin.cs
@@ -45,6 +45,7 @@ GlobalTimeEvent.Instance.secondEvent += Instance_secondEvent; roleModel.OnPlayerRewardEvent += OnPlayerRewardEvent; Display(); CloseClick(); } System/BT/Vourcher100Win.cs
@@ -41,6 +41,8 @@ PlayerDatas.Instance.playerDataRefreshEvent += OnPlayerDataRefreshEvent; vipModel.rechargeCountEvent += OnRechargeCountEvent; Display(); CloseClick(); } System/Chat/ChatCenter.cs
@@ -10,6 +10,9 @@ public class ChatCenter : Model, IBeforePlayerDataInitialize, IPlayerLoginOk, ISwitchAccount { public int talkRechargeLimmit; public int talkLevelLimmit; RealmModel realmModel { get { return ModelCenter.Instance.GetModel<RealmModel>(); } } public override void Init() { @@ -85,6 +88,10 @@ LocalChatHistory.localChatKeepHour = int.Parse(config.Numerical2); } } config = FuncConfigConfig.Get("TalkLimit"); talkRechargeLimmit = int.Parse(config.Numerical1); talkLevelLimmit = int.Parse(config.Numerical2); } public event Action<string, bool, bool> UpdateChatValueEvent; System/Chat/ChatSendComponent.cs
@@ -29,6 +29,7 @@ } } PhantasmPavilionModel phantasmPavilionModel { get { return ModelCenter.Instance.GetModel<PhantasmPavilionModel>(); } } VipModel vipModel { get { return ModelCenter.Instance.GetModel<VipModel>(); } } [NonSerialized] public Window parent; private bool m_OnChating = false; @@ -104,9 +105,10 @@ return; } if (PlayerDatas.Instance.baseData.VIPLv < 8) if (vipModel.realRecharge < chatCenter.talkRechargeLimmit || PlayerDatas.Instance.baseData.LV < chatCenter.talkLevelLimmit) { SysNotifyMgr.Instance.ShowTip("PassEquipLimitVip", 8); SysNotifyMgr.Instance.ShowTip("mdtqInfo1", chatCenter.talkRechargeLimmit, chatCenter.talkLevelLimmit); return; } System/MainInterfacePanel/HighSettingTip.cs
@@ -49,8 +49,6 @@ [SerializeField] Image m_NewDayActionName; [SerializeField] RedpointBehaviour m_NewDayActionRedPoint; [SerializeField] Button m_xg; [SerializeField] Button m_mr648; [SerializeField] Button m_Vourcher100; [SerializeField] Button m_ForeverCard; [SerializeField] Button m_XY; [SerializeField] Button m_LHD; @@ -108,8 +106,6 @@ }); m_xg.SetListener(() => { ModelCenter.Instance.GetModel<CelestialPalaceModel>().OpenCelestialPalaceWin(); }); m_mr648.SetListener(() => { WindowCenter.Instance.Open<LoginAwardWin>(); }); m_Vourcher100.SetListener(() => { WindowCenter.Instance.Open<Vourcher100Win>(); }); m_ForeverCard.SetListener(() => { WindowCenter.Instance.Open<ForeverCardWin>(); }); m_XY.SetListener(() => { WindowCenter.Instance.Open<FairyAffinityWin>(); }); m_LHD.SetListener(() => { WindowCenter.Instance.Open<CycleHallWin>(); }); System/MainWin/MainWinTopGrid.cs
@@ -109,12 +109,6 @@ return false; return true; } else if (m_FunctionId == 223) { if (PlayerDatas.Instance.baseData.coinTotal <= 0) return false; return true; } return FuncOpen.Instance.IsFuncOpen(m_FunctionId); } System/Realm/RealmTowerWin.cs
@@ -167,7 +167,7 @@ int GetFlashKillCount() { int count = 0; if (realmModel.currentFloor <= 20) if (realmModel.currentFloor <= 10) return count; var floors = RealmTowerConfig.GetFloorsByFloorID(realmModel.currentFloor); System/RuneTower/RuneTowerWin.cs
@@ -227,7 +227,7 @@ int GetFlashKillCount() { int count = 0; if (model.currentTower <= 2) if (model.currentTower <= 1) return count; for (int i = 0; i < GeneralDefine.flashKillMaxCount; i++) System/SkyTower/SkyTowerWin.cs
@@ -266,7 +266,7 @@ int GetFlashKillCount() { int count = 0; if (model.currentFloor <= 20) if (model.currentFloor <= 10) return count; for (int i = 0; i < GeneralDefine.flashKillMaxCount; i++) System/Vip/FirstRechargeWin.cs
@@ -162,17 +162,6 @@ pak.DataExStr = string.Empty; GameNetSystem.Instance.SendInfo(pak); } VipModel.RechargeCount rechargeCount; model.TryGetRechargeCount(LoginAwardModel.Vourcher100CtgID, out rechargeCount); //非0 已购买 if (rechargeCount.todayCount == 0) { Clock.AlarmAfter(1f, () => { WindowCenter.Instance.Open<Vourcher100Win>(); }); } } private void UpdateItems() System/Vip/VipInvest/ForeverCardWin.cs
@@ -17,13 +17,15 @@ { [SerializeField] Button m_Invest; [SerializeField] Text m_Price; [SerializeField] Text m_Process; [SerializeField] Button m_Get; [SerializeField] Image m_State; [SerializeField] Button m_Close; [SerializeField] List<ItemCell> itemCellList; VipModel vipModel { get { return ModelCenter.Instance.GetModel<VipModel>(); } } #region Built-in protected override void BindController() { @@ -72,9 +74,9 @@ m_Invest.SetActive(state == 0); m_Get.SetActive(state == 2); m_State.SetActive(state == 3); var orderInfoId = InvestModel.Instance.GetOrderInfoId(InvestModel.foreverCardType); var config = OrderInfoConfig.Get(orderInfoId); m_Price.text = Language.Get("PayMoneyNum", UIHelper.GetMoneyFormat(config.PayRMBNum)); int needMoney = InvestModel.Instance.rechargeSumDict[InvestModel.foreverCardType] / 10000; m_Price.text = Language.Get("ForeverCard6", needMoney); m_Process.text = Language.Get("ForeverCard7", UIHelper.GetMoneyFormat( vipModel.realRecharge / 10000.0), needMoney); for (int i = 0; i < itemCellList.Count; i++) { @@ -102,7 +104,15 @@ private void OnInvest() { InvestModel.Instance.SendInvest(InvestModel.foreverCardType); if (vipModel.realRecharge < InvestModel.Instance.rechargeSumDict[InvestModel.foreverCardType]) { WindowJumpMgr.Instance.WindowJumpToEx("VipRechargeWin"); return; } CA540_tagCMGoldInvest investGold = new CA540_tagCMGoldInvest(); investGold.InvestType = 12; GameNetSystem.Instance.SendInfo(investGold); } System/Vip/VipModel.cs
@@ -32,6 +32,9 @@ private bool waitingJump = false; public int realRecharge = 0; //真实充值金额 public event Action rechargeChangeEvent; //代金券记录 public List<HA008_tagGCPlayerRecInfo.tagGCPlayerRec> m_PlayerRecsVoucher = new List<HA008_tagGCPlayerRecInfo.tagGCPlayerRec>(); @@ -89,6 +92,7 @@ waitingJump = false; RechargeTimeLismit.Clear(); m_PlayerRecsVoucher.Clear(); realRecharge = 0; } private void PlayerDataRefreshInfoEvent(PlayerDataType _type) @@ -1069,6 +1073,7 @@ public void UpdateRechargeCount(HA110_tagMCCoinToGoldCountInfo package) { realRecharge = (int)package.RealTotal; for (int i = 0; i < package.RecordCount; i++) { var _data = package.CTGCountInfoList[i]; @@ -1086,6 +1091,8 @@ rechargeCountEvent(_data.RecordID); } } rechargeChangeEvent?.Invoke(); UpdateRedpoint(); }