From f237dce65b7eb454dfc9e2fe6c8efdebca085b4e Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期二, 11 九月 2018 14:13:07 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Core/NetworkPackage/ServerPack/HAC_Activity/HAC08_tagGCBossRebornPoint.cs | 2 +
System/Team/TeamInvitationWin.cs | 14 ++----
System/MainInterfacePanel/TaskListTip.cs | 18 ++++++++-
System/BossReborn/BossRebornModel.cs | 30 ++++++++++----
System/Team/TeamInvitationBehaviour.cs | 41 +++++++++++---------
System/BossReborn/BossRebornWin.cs | 9 ++++
6 files changed, 76 insertions(+), 38 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();
diff --git a/System/MainInterfacePanel/TaskListTip.cs b/System/MainInterfacePanel/TaskListTip.cs
index 5b81ee0..bbcc9f1 100644
--- a/System/MainInterfacePanel/TaskListTip.cs
+++ b/System/MainInterfacePanel/TaskListTip.cs
@@ -338,12 +338,26 @@
TaskScheduling();
if (WindowCenter.Instance.CheckOpen<MainInterfaceWin>() && !inDungeon)
{
- TheTaskToGenerate();//浠诲姟鍒楄〃闇�瑕侀噸鏂版帓鍒楅噸鏂板埛鏂拌祴鍊�
- // LodingDelTask(_IdTask);
+ DeleteSort(_IdTask);
}
}
+ private void DeleteSort(int taskID)//鍏充簬浠诲姟鍒犻櫎
+ {
+ for (int i = 0; i < Content.childCount; i++)
+ {
+ GameObject obj = Content.GetChild(i).gameObject;
+ TaskType taskType = obj.GetComponent<TaskType>();
+ if (obj.activeSelf && taskType.TaskID == taskID)
+ {
+ taskType.TaskID = 0;
+ taskType.ClearTaskName();
+ obj.SetActive(false);
+ obj.transform.SetAsLastSibling();
+ }
+ }
+ }
void TaskInformation(int _Taskid, Dictionary<int, Dictionary<string, string>> _Dic)//浠诲姟瀛楀吀淇℃伅
{
diff --git a/System/Team/TeamInvitationBehaviour.cs b/System/Team/TeamInvitationBehaviour.cs
index 1c35ac0..43e98a3 100644
--- a/System/Team/TeamInvitationBehaviour.cs
+++ b/System/Team/TeamInvitationBehaviour.cs
@@ -8,26 +8,18 @@
{
public class TeamInvitationBehaviour : ScrollItem
{
- [SerializeField]
- Image m_Realm;
- [SerializeField]
- Text m_PlayerName;
- [SerializeField]
- Text m_Job;
- [SerializeField]
- Image m_LevelSign;
- [SerializeField]
- Text m_Level;
+ [SerializeField] Image m_Realm;
+ [SerializeField] Text m_PlayerName;
+ [SerializeField] Text m_Job;
+ [SerializeField] Text m_Mission;
+ [SerializeField] Image m_LevelSign;
+ [SerializeField] Text m_Level;
+ [SerializeField] Button m_Select;
+ [SerializeField] Image m_Selected;
- [SerializeField]
- Button m_Select;
-
- [SerializeField]
- Image m_Selected;
-
- TeamModel m_Model;
- TeamModel model { get { return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<TeamModel>()); } }
+ TeamModel model { get { return ModelCenter.Instance.GetModel<TeamModel>(); } }
+ DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }
TeamInvitation invitation;
public override void Display(object _data)
@@ -51,6 +43,19 @@
m_LevelSign.gameObject.SetActive(isNirvanaLevel);
m_Level.text = isNirvanaLevel ? (invitation.level - GeneralConfig.Instance.greatMasterStartLV).ToString() : invitation.level.ToString();
+ var mission = invitation.mission;
+ var targetConfig = Config.Instance.Get<TeamTargetConfig>(mission.mapId);
+ if (targetConfig != null)
+ {
+ var dungeonId = dungeonModel.GetDungeonId(mission.mapId, mission.mapEx);
+ var config = Config.Instance.Get<DungeonConfig>(dungeonId);
+ m_Mission.text = config.FBName;
+ }
+ else
+ {
+ m_Mission.text = Language.Get("RightHereMap");
+ }
+
m_Selected.gameObject.SetActive(invitation.playerId == model.currentSelectedInvitation);
m_Select.RemoveAllListeners();
diff --git a/System/Team/TeamInvitationWin.cs b/System/Team/TeamInvitationWin.cs
index 6a921fa..295b598 100644
--- a/System/Team/TeamInvitationWin.cs
+++ b/System/Team/TeamInvitationWin.cs
@@ -14,15 +14,12 @@
public class TeamInvitationWin : Window
{
- [SerializeField]
- CyclicScroll m_InvitationScroll;
- [SerializeField]
- Button m_Close;
- [SerializeField]
- Button m_Confirm;
- TeamModel m_Model;
- TeamModel model { get { return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<TeamModel>()); } }
+ [SerializeField] CyclicScroll m_InvitationScroll;
+ [SerializeField] Button m_Close;
+ [SerializeField] Button m_Confirm;
+
+ TeamModel model { get { return ModelCenter.Instance.GetModel<TeamModel>(); } }
#region Built-in
protected override void BindController()
@@ -55,7 +52,6 @@
}
#endregion
-
private void ShowInvitations()
{
--
Gitblit v1.8.0