From 7bec42b81c4eaa36babea411edd4e8ecab762ac1 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 30 十月 2018 17:50:39 +0800
Subject: [PATCH] 4424 【前端】【1.2.0】Boss之家去除疲劳值设定
---
Utility/EnumHelper.cs | 1 -
System/FindPrecious/BossHomeModel.cs | 33 ---------------------------------
System/FindPrecious/FindPreciousModel.cs | 4 +---
Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA3B7_tagMCBOSSAttactCnt.cs | 3 ---
System/MainInterfacePanel/InGamePushContainer.cs | 2 +-
System/FindPrecious/BossHomeWin.cs | 5 -----
System/DailyQuest/DailyQuestModel.cs | 4 ----
7 files changed, 2 insertions(+), 50 deletions(-)
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA3B7_tagMCBOSSAttactCnt.cs b/Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA3B7_tagMCBOSSAttactCnt.cs
index 5379314..9fef1db 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA3B7_tagMCBOSSAttactCnt.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA3B7_tagMCBOSSAttactCnt.cs
@@ -30,9 +30,6 @@
worldBossModel.wearyValue = info.KillCnt;
worldBossModel.extraBossWearyValue = info.ItemAddCnt;
break;
- case 1:
- bossHomeModel.wearyValue = info.KillCnt;
- break;
case 2:
dogzDungeonModel.wearyValue = info.KillCnt;
break;
diff --git a/System/DailyQuest/DailyQuestModel.cs b/System/DailyQuest/DailyQuestModel.cs
index 6ecc4a3..af7fdbd 100644
--- a/System/DailyQuest/DailyQuestModel.cs
+++ b/System/DailyQuest/DailyQuestModel.cs
@@ -259,8 +259,6 @@
{
case 11:
return Math.Max(dailyQuestOpenTime.DayTimes, GetDailyQuestCompletedTimes(_dailyQuestId));
- case 16:
- return ModelCenter.Instance.GetModel<VipModel>().GetVipPrivilegeCnt(VipPrivilegeType.BossHomeAwardLimit);
default:
return dailyQuestOpenTime.DayReKind > 0 ? dailyQuestOpenTime.DayTimes : dailyQuestOpenTime.WeekTimes;
}
@@ -766,8 +764,6 @@
{
switch ((DailyQuestType)_dailyQuestId)
{
- case DailyQuestType.BossHome:
- return ModelCenter.Instance.GetModel<VipModel>().GetVipPrivilegeCnt(VipPrivilegeType.BossHomeAwardLimit) > 0;
case DailyQuestType.PersonalBoss:
return ModelCenter.Instance.GetModel<DungeonModel>().GetTotalTimes(PersonalBossModel.PERSONALBOSS_MAPID) > 0;
default:
diff --git a/System/FindPrecious/BossHomeModel.cs b/System/FindPrecious/BossHomeModel.cs
index 7e8c8e5..77c17ac 100644
--- a/System/FindPrecious/BossHomeModel.cs
+++ b/System/FindPrecious/BossHomeModel.cs
@@ -9,7 +9,6 @@
public class BossHomeModel : Model, IMapInitOk
{
public const int BOSSHOME_MAPID = 31020;
- public const int BOSSHOME_REDPOINT = 76002;
int m_SelectedFloor = 0;
public int selectedFloor {
@@ -45,24 +44,9 @@
}
}
- int m_WearyValue = 0;
- public int wearyValue {
- get { return m_WearyValue; }
- set {
- m_WearyValue = value;
- UpdateRedpoint();
- if (bossWearyValueChangeEvent != null)
- {
- bossWearyValueChangeEvent();
- }
- }
- }
-
public event Action<int> bossHomeFloorSelectedEvent;
public event Action<int> bossSelectedEvent;
- public event Action bossWearyValueChangeEvent;
- public Redpoint bossHomeRedpoint = new Redpoint(FindPreciousModel.FINDPRECIOUS_REDPOINTID, BOSSHOME_REDPOINT);
Dictionary<int, BossHomeData> bossHomes = new Dictionary<int, BossHomeData>();
Dictionary<int, int> vipLackFloorCost = new Dictionary<int, int>();
List<int> sortedBosses = new List<int>();
@@ -71,12 +55,10 @@
public override void Init()
{
ParseConfig();
- PlayerDatas.Instance.PlayerDataRefreshEvent += OnPlayerDataChange;
}
public override void UnInit()
{
- PlayerDatas.Instance.PlayerDataRefreshEvent -= OnPlayerDataChange;
}
public bool TryGetBossHomeData(int _layer, out BossHomeData _data)
@@ -144,21 +126,6 @@
{
return 0;
}
- }
-
- private void OnPlayerDataChange(PlayerDataRefresh _type, int _value)
- {
- if (_type == PlayerDataRefresh.VIPLv)
- {
- UpdateRedpoint();
- }
- }
-
- private void UpdateRedpoint()
- {
- var count = vipModel.GetVipPrivilegeCnt(VipPrivilegeType.BossHomeAwardLimit) - m_WearyValue;
- bossHomeRedpoint.count = count;
- bossHomeRedpoint.state = count > 0 ? RedPointState.Quantity : RedPointState.None;
}
private void ParseConfig()
diff --git a/System/FindPrecious/BossHomeWin.cs b/System/FindPrecious/BossHomeWin.cs
index 7fb3164..1186c1c 100644
--- a/System/FindPrecious/BossHomeWin.cs
+++ b/System/FindPrecious/BossHomeWin.cs
@@ -27,7 +27,6 @@
[SerializeField] Button m_KillRecord;
[SerializeField] Transform m_SurpassLevel;
[SerializeField] ToggleButton m_Subscribe;
- [SerializeField] TextEx m_WearyValue;
BossHomeModel model { get { return ModelCenter.Instance.GetModel<BossHomeModel>(); } }
FindPreciousModel findPreciousModel { get { return ModelCenter.Instance.GetModel<FindPreciousModel>(); } }
@@ -51,10 +50,6 @@
model.selectedFloor = model.GetRecommendFloor();
m_FloorGroup.Init();
m_Vip.text = StringUtility.Contact("V", model.GetFloorVipRequirement(model.selectedFloor));
-
- var wearyValueLimit = vipModel.GetVipPrivilegeCnt(VipPrivilegeType.BossHomeAwardLimit);
- m_WearyValue.text = StringUtility.Contact(model.wearyValue, "/", wearyValueLimit);
- m_WearyValue.colorType = model.wearyValue >= wearyValueLimit ? TextColType.Red : TextColType.DarkGreen;
}
protected override void OnAfterOpen()
diff --git a/System/FindPrecious/FindPreciousModel.cs b/System/FindPrecious/FindPreciousModel.cs
index 25d81a8..d13e35e 100644
--- a/System/FindPrecious/FindPreciousModel.cs
+++ b/System/FindPrecious/FindPreciousModel.cs
@@ -389,13 +389,11 @@
private void UpdateRedpoint(int _redpointId)
{
if (_redpointId == WorldBossModel.WORLDBOSS_REDPOINT ||
- _redpointId == BossHomeModel.BOSSHOME_REDPOINT ||
_redpointId == PersonalBossModel.PERSONAL_REDPOINTID)
{
var worldBossRedpointCount = worldBossModel.worldBossRedPoint.count;
- var bossHomeRedpointCount = bossHomeModel.bossHomeRedpoint.count;
var personalBossRedpointCount = personalBossModel.personalRedpoint.count;
- var totalCount = worldBossRedpointCount + bossHomeRedpointCount + personalBossRedpointCount;
+ var totalCount = worldBossRedpointCount + personalBossRedpointCount;
findPreciousRedpoint.state = totalCount > 0 ? RedPointState.Quantity : RedPointState.None;
findPreciousRedpoint.count = totalCount;
}
diff --git a/System/MainInterfacePanel/InGamePushContainer.cs b/System/MainInterfacePanel/InGamePushContainer.cs
index db488e9..ce6cc97 100644
--- a/System/MainInterfacePanel/InGamePushContainer.cs
+++ b/System/MainInterfacePanel/InGamePushContainer.cs
@@ -224,7 +224,7 @@
show = !GeneralDefine.worldBossNoRebornRemindMaps.Contains(mapId);
break;
case FindPreciousType.BossHome:
- killable = bossHomeModel.wearyValue < vipModel.GetVipPrivilegeCnt(VipPrivilegeType.BossHomeAwardLimit);
+ killable = true;
show = !GeneralDefine.bossHomeNoRebornRemindMaps.Contains(mapId);
break;
case FindPreciousType.ElderGodArea:
diff --git a/Utility/EnumHelper.cs b/Utility/EnumHelper.cs
index cb4d9be..fd15534 100644
--- a/Utility/EnumHelper.cs
+++ b/Utility/EnumHelper.cs
@@ -1111,7 +1111,6 @@
FairyDaimondGift = 23,
MarketPutawayPwd = 24,
DemonJar = 25,
- BossHomeAwardLimit = 27,
DemonJarDouble = 28,
BindJadeWheel=30,
PrayForDrug = 31,
--
Gitblit v1.8.0