From 96575ca75e3aaf940edac17f932dd9ba57f17d39 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 11 九月 2018 13:55:28 +0800
Subject: [PATCH] 3431 前端】Boss复活新增本次活动“Boss已复活次数”显示
---
Core/NetworkPackage/ServerPack/HAC_Activity/HAC08_tagGCBossRebornPoint.cs | 2 ++
System/BossReborn/BossRebornModel.cs | 30 +++++++++++++++++++++---------
System/BossReborn/BossRebornWin.cs | 9 +++++++++
3 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/Core/NetworkPackage/ServerPack/HAC_Activity/HAC08_tagGCBossRebornPoint.cs b/Core/NetworkPackage/ServerPack/HAC_Activity/HAC08_tagGCBossRebornPoint.cs
index 764a18c..5ef70be 100644
--- a/Core/NetworkPackage/ServerPack/HAC_Activity/HAC08_tagGCBossRebornPoint.cs
+++ b/Core/NetworkPackage/ServerPack/HAC_Activity/HAC08_tagGCBossRebornPoint.cs
@@ -7,6 +7,7 @@
{
public uint Point; // 澶嶆椿鐐规暟
public uint TotalPoint; // 澶嶆椿鎬荤偣鏁�
+ public ushort RebornCnt; // 澶嶆椿娆℃暟
public HAC08_tagGCBossRebornPoint()
{
@@ -17,6 +18,7 @@
{
TransBytes(out Point, vBytes, NetDataType.DWORD);
TransBytes(out TotalPoint, vBytes, NetDataType.DWORD);
+ TransBytes(out RebornCnt, vBytes, NetDataType.WORD);
}
}
\ No newline at end of file
diff --git a/System/BossReborn/BossRebornModel.cs b/System/BossReborn/BossRebornModel.cs
index 6e342b5..749f0ef 100644
--- a/System/BossReborn/BossRebornModel.cs
+++ b/System/BossReborn/BossRebornModel.cs
@@ -29,17 +29,31 @@
set { m_BossRebornInderalTotal = value; }
}
+ int m_BossRebornCount = -1;
+ public int bossRebornCount {
+ get { return m_BossRebornCount; }
+ set {
+ if (m_BossRebornCount != value)
+ {
+ m_BossRebornCount = value;
+ if (bossRebornCountEvent != null)
+ {
+ bossRebornCountEvent();
+ }
+ }
+ }
+ }
+
public int surplusSecond { get { return OperationTimeHepler.Instance.GetOperationSurplusTime(Operation.BossReborn); } }
- public bool priorityOpen
- {
- get
- {
+ public bool priorityOpen {
+ get {
return bossRebornPoint.state == RedPointState.GetReward;
}
}
public event Action bossRebornIntergralEvent;
+ public event Action bossRebornCountEvent;
public event Action<int> bossTaskStateChangeEvent;
public event Action<int> onStateUpate;
@@ -63,7 +77,7 @@
private void OperationEndEvent(Operation type, int state)
{
- if (type == Operation.BossReborn&&state==0)
+ if (type == Operation.BossReborn && state == 0)
{
if (onStateUpate != null)
{
@@ -83,10 +97,8 @@
}
}
- public bool IsOpen
- {
- get
- {
+ public bool IsOpen {
+ get {
return OperationTimeHepler.Instance.SatisfyOpenCondition(Operation.BossReborn);
}
}
diff --git a/System/BossReborn/BossRebornWin.cs b/System/BossReborn/BossRebornWin.cs
index bd6684f..c0fb6d1 100644
--- a/System/BossReborn/BossRebornWin.cs
+++ b/System/BossReborn/BossRebornWin.cs
@@ -19,6 +19,7 @@
[SerializeField] Slider m_Slider;
[SerializeField] Text m_Progress;
[SerializeField] Text m_Time;
+ [SerializeField] Text m_RebornCount;
[SerializeField] CyclicScroll m_TaskScroll;
BossRebornModel model { get { return ModelCenter.Instance.GetModel<BossRebornModel>(); } }
@@ -38,12 +39,14 @@
m_Description.text = Language.Get("BossFHLanguage7", model.bossRebornIndegralTotal);
UpdateIntegral();
UpdateCountDown();
+ UpdateRebornCount();
}
protected override void OnAfterOpen()
{
model.bossTaskStateChangeEvent += OnTaskStateChange;
model.bossRebornIntergralEvent += UpdateIntegral;
+ model.bossRebornCountEvent += UpdateRebornCount;
GlobalTimeEvent.Instance.secondEvent += OnPerSecond;
}
@@ -51,6 +54,7 @@
{
model.bossTaskStateChangeEvent -= OnTaskStateChange;
model.bossRebornIntergralEvent -= UpdateIntegral;
+ model.bossRebornCountEvent -= UpdateRebornCount;
GlobalTimeEvent.Instance.secondEvent -= OnPerSecond;
}
@@ -84,6 +88,11 @@
m_Time.text = Language.Get("BossFHLanguage2", TimeUtility.SecondsToDHMSCHS(model.surplusSecond));
}
+ private void UpdateRebornCount()
+ {
+ m_RebornCount.text = Language.Get("BossRebornTimes", model.bossRebornCount);
+ }
+
private void OnTaskStateChange(int _id)
{
UpdateActivities();
--
Gitblit v1.8.0