From 624435afd782b7bb187d193b341cca7c3d198dce Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期五, 28 九月 2018 20:00:22 +0800
Subject: [PATCH] Revert "2287 添加上古战场线路显示"
---
Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0439_tagPlayerChangeDienstgrad.cs | 4
Fight/GameActor/GA_Player.cs | 4
System/Message/SysNotifyMgr.cs | 2
Fight/Stage/StageManager.cs | 18 +-
UI/HUD/HeadUpName.cs | 24 ++--
Fight/GameActor/GA_Hero.cs | 4
System/Dungeon/DungeonFightWin.cs | 14 --
System/Message/BattleHint.cs | 46 ++++----
System/Dungeon/DungeonAncientTargetWin.cs | 112 +++++++++++-----------
Fight/GameActor/GActorPlayerBase.cs | 32 ++---
10 files changed, 118 insertions(+), 142 deletions(-)
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0439_tagPlayerChangeDienstgrad.cs b/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0439_tagPlayerChangeDienstgrad.cs
index 73bc008..9d9afaa 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0439_tagPlayerChangeDienstgrad.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0439_tagPlayerChangeDienstgrad.cs
@@ -30,8 +30,8 @@
GActorPlayerBase _player = GAMgr.Instance.GetBySID(vNetData.PlayerID) as GActorPlayerBase;
if (_player != null)
{
- var titleId = PlayerDatas.Instance.baseData.MapID == 31160 ? 0 : vNetData.GradID;//上古战场不显示称号
- _player.SwitchTitle(titleId);
+ //var titleId = PlayerDatas.Instance.baseData.MapID == 31160 ? 0 : vNetData.GradID;//上古战场不显示称号
+ _player.SwitchTitle(vNetData.GradID);
}
}
diff --git a/Fight/GameActor/GA_Hero.cs b/Fight/GameActor/GA_Hero.cs
index 3ddfea2..9d5171c 100644
--- a/Fight/GameActor/GA_Hero.cs
+++ b/Fight/GameActor/GA_Hero.cs
@@ -419,8 +419,7 @@
var titleModel = ModelCenter.Instance.GetModel<TitleModel>();
var _title = titleModel.GetTitleEquip();
uint _titleID = 0;
- if (_title != null && titleModel.IsTitleGain(_title.id)
- && PlayerDatas.Instance.baseData.MapID != 31160)//涓婂彜鎴樺満涓嶆樉绀虹О鍙�
+ if (_title != null && titleModel.IsTitleGain(_title.id))//涓婂彜鎴樺満涓嶆樉绀虹О鍙�
{
_titleID = (uint)_title.id;
}
@@ -440,7 +439,6 @@
}
base.SetFairyLeagueHeadUp(PlayerDatas.Instance.baseData.MapID == FairyLeagueModel.FAIRY_LEAGUE_DUNGEON);
- CheckAncientHeadUp();
}
public sealed override void SwitchRedName(bool on)
diff --git a/Fight/GameActor/GA_Player.cs b/Fight/GameActor/GA_Player.cs
index 9ac2e84..68cdd51 100644
--- a/Fight/GameActor/GA_Player.cs
+++ b/Fight/GameActor/GA_Player.cs
@@ -352,8 +352,7 @@
m_HeadUpName = HeadUpName.RequireHeadUpName(HeadUpName.Pattern.Player, MP_Name, 0, CameraController.Instance.CameraObject);
}
- var titleId = PlayerDatas.Instance.baseData.MapID == 31160 ? 0 : ActorInfo.titleID;
- m_HeadUpName.SetPlayerInfo((int)ActorInfo.realm, titleId, ActorInfo.PlayerName, ActorInfo.familyName, m_H0434.State == 1);
+ m_HeadUpName.SetPlayerInfo((int)ActorInfo.realm, ActorInfo.titleID, ActorInfo.PlayerName, ActorInfo.familyName, m_H0434.State == 1);
if (StatusMgr.Instance.IsExist(ServerInstID, StatusMgr.Instance.bossBelongBuffID))
{
@@ -361,7 +360,6 @@
}
base.SetFairyLeagueHeadUp(PlayerDatas.Instance.baseData.MapID == FairyLeagueModel.FAIRY_LEAGUE_DUNGEON);
- CheckAncientHeadUp();
}
public sealed override void SwitchRedName(bool on)
diff --git a/Fight/GameActor/GActorPlayerBase.cs b/Fight/GameActor/GActorPlayerBase.cs
index df65ffa..b58924b 100644
--- a/Fight/GameActor/GActorPlayerBase.cs
+++ b/Fight/GameActor/GActorPlayerBase.cs
@@ -43,8 +43,6 @@
public JobSetupConfig JobSetup { get; protected set; }
- DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }
-
public override int NextAction
{
get
@@ -218,7 +216,6 @@
MovingState = E_MovingState.Normal;
SystemSetting.Instance.qualityLevelChangeEvent += OnGameQualityChange;
- dungeonModel.updateMissionEvent += CheckAncientHeadUp;
base.OnInit(package);
}
@@ -340,7 +337,6 @@
JobSetup = null;
SystemSetting.Instance.qualityLevelChangeEvent -= OnGameQualityChange;
- dungeonModel.updateMissionEvent -= CheckAncientHeadUp;
base.OnUnit();
}
@@ -352,20 +348,20 @@
UpdateRush();
}
- public void CheckAncientHeadUp()
- {
- if (PlayerDatas.Instance.baseData.MapID == 31160)
- {
- var help = dungeonModel.mission;
- SwitchAncientKing(help.topPlayerID == ServerInstID);
- SwitchAncientEnemy(help.enemyID == ServerInstID && ServerInstID != PlayerDatas.Instance.baseData.PlayerID);
- }
- else
- {
- SwitchAncientKing(false);
- SwitchAncientEnemy(false);
- }
- }
+ //public void CheckAncientHeadUp()
+ //{
+ // if (PlayerDatas.Instance.baseData.MapID == 31160)
+ // {
+ // var help = dungeonModel.mission;
+ // SwitchAncientKing(help.topPlayerID == ServerInstID);
+ // SwitchAncientEnemy(help.enemyID == ServerInstID && ServerInstID != PlayerDatas.Instance.baseData.PlayerID);
+ // }
+ // else
+ // {
+ // SwitchAncientKing(false);
+ // SwitchAncientEnemy(false);
+ // }
+ //}
#region 瑁呭绌挎埓鐩稿叧
diff --git a/Fight/Stage/StageManager.cs b/Fight/Stage/StageManager.cs
index 70376a6..0e9510e 100644
--- a/Fight/Stage/StageManager.cs
+++ b/Fight/Stage/StageManager.cs
@@ -559,15 +559,15 @@
_hero.IdleImmediate();
_hero.SetFairyLeagueHeadUp(PlayerDatas.Instance.baseData.MapID == FairyLeagueModel.FAIRY_LEAGUE_DUNGEON);
- _hero.CheckAncientHeadUp();
- var titleId = 0;
- if (PlayerDatas.Instance.baseData.MapID != 31160)
- {
- var titelModel = ModelCenter.Instance.GetModel<TitleModel>();
- var title = titelModel.GetTitleEquip();
- titleId = title != null && titelModel.IsTitleGain(title.id) ? title.id : 0;
- }
- _hero.SwitchTitle((uint)titleId);
+ //_hero.CheckAncientHeadUp();
+ //var titleId = 0;
+ //if (PlayerDatas.Instance.baseData.MapID != 31160)
+ //{
+ // var titelModel = ModelCenter.Instance.GetModel<TitleModel>();
+ // var title = titelModel.GetTitleEquip();
+ // titleId = title != null && titelModel.IsTitleGain(title.id) ? title.id : 0;
+ //}
+ //_hero.SwitchTitle((uint)titleId);
// 鍒ゆ柇buff
if (StatusMgr.Instance.IsExist(PlayerDatas.Instance.PlayerId, StatusMgr.Instance.redNameBuffID))
diff --git a/System/Dungeon/DungeonAncientTargetWin.cs b/System/Dungeon/DungeonAncientTargetWin.cs
index 98be4e3..73d9205 100644
--- a/System/Dungeon/DungeonAncientTargetWin.cs
+++ b/System/Dungeon/DungeonAncientTargetWin.cs
@@ -1,57 +1,55 @@
-锘縰sing System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.UI;
-
-namespace Snxxz.UI
-{
- public class DungeonAncientTargetWin : Window
- {
- [SerializeField] Text m_DungeonName;
- [SerializeField] DungeonTargetBehaviour m_DungeonTargetBehaviour;
-
- DungeonModel m_Model;
- DungeonModel model
- {
- get { return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<DungeonModel>()); }
- }
-
- protected override void AddListeners()
- {
- }
-
- protected override void BindController()
- {
- }
-
- protected override void OnAfterClose()
- {
- }
-
- protected override void OnAfterOpen()
- {
- }
-
- protected override void OnPreClose()
- {
- //model.updateMissionEvent -= UpdateTargets;
- }
-
- protected override void OnPreOpen()
- {
- //model.updateMissionEvent += UpdateTargets;
- var line = PlayerDatas.Instance.baseData.FBID + 1;
- m_DungeonName.text = StringUtility.Contact(Language.Get("AncientBattle"), "锛�", Language.Get("FBLine", line), "锛�");
- m_DungeonTargetBehaviour.Init(31160);
- //UpdateTargets();
- }
-
- private void UpdateTargets()
- {
- //var _help = model.mission;
- //m_DungeonTargets[0].text = _help.topName;
- //m_DungeonTargets[1].text = UIHelper.ReplaceLargeNum(_help.topScore);
- }
- }
-}
-
+锘縰sing System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace Snxxz.UI
+{
+ public class DungeonAncientTargetWin : Window
+ {
+ [SerializeField] List<Text> m_DungeonTargets;
+ [SerializeField] DungeonTargetBehaviour m_DungeonTargetBehaviour;
+
+ DungeonModel m_Model;
+ DungeonModel model
+ {
+ get { return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<DungeonModel>()); }
+ }
+
+ protected override void AddListeners()
+ {
+ }
+
+ protected override void BindController()
+ {
+ }
+
+ protected override void OnAfterClose()
+ {
+ }
+
+ protected override void OnAfterOpen()
+ {
+ }
+
+ protected override void OnPreClose()
+ {
+ model.updateMissionEvent -= UpdateTargets;
+ }
+
+ protected override void OnPreOpen()
+ {
+ model.updateMissionEvent += UpdateTargets;
+ m_DungeonTargetBehaviour.Init(31160);
+ UpdateTargets();
+ }
+
+ private void UpdateTargets()
+ {
+ var _help = model.mission;
+ m_DungeonTargets[0].text = _help.topName;
+ m_DungeonTargets[1].text = UIHelper.ReplaceLargeNum(_help.topScore);
+ }
+ }
+}
+
diff --git a/System/Dungeon/DungeonFightWin.cs b/System/Dungeon/DungeonFightWin.cs
index 909441b..e4aded4 100644
--- a/System/Dungeon/DungeonFightWin.cs
+++ b/System/Dungeon/DungeonFightWin.cs
@@ -27,7 +27,6 @@
[SerializeField] RectTransform m_ContainerResPoint;
[SerializeField] RectTransform m_ContainerAncient;
[SerializeField] Button m_AncientBtn;
- [SerializeField] Button m_AncientKing;
[SerializeField] DungeonItemCollect m_ItemCollect;
[SerializeField] DungeonGuardSkyBehaviour m_GuardSky;
[SerializeField] DungeonBossBriefInfoContainer m_BossInfosContainer;
@@ -56,7 +55,6 @@
{
m_ExitDungeon.AddListener(ExitDungeon);
m_AncientBtn.onClick.AddListener(OnAncientBtn);
- m_AncientKing.onClick.AddListener(AncientKing);
}
protected override void OnPreOpen()
@@ -319,18 +317,6 @@
else
{
WindowCenter.Instance.Open<DungeonAncientAchieveWin>();
- }
- }
-
- private void AncientKing()
- {
- if (WindowCenter.Instance.IsOpen<DungeonAncientKingWin>())
- {
- WindowCenter.Instance.CloseImmediately<DungeonAncientKingWin>();
- }
- else
- {
- WindowCenter.Instance.Open<DungeonAncientKingWin>();
}
}
diff --git a/System/Message/BattleHint.cs b/System/Message/BattleHint.cs
index 17183b1..a2c1ac4 100644
--- a/System/Message/BattleHint.cs
+++ b/System/Message/BattleHint.cs
@@ -16,15 +16,15 @@
public void OnStageLoadFinish()
{
Clear();
- var mapId = PlayerDatas.Instance.baseData.MapID;
- if (cacheMapId != 0 && cacheMapId != 31160
- && mapId == 31160)
- {
- SnxxzGame.Instance.StartCoroutine(Co_LoadFinish());
- }
- var help = dungeonModel.mission;
- ancientKing = mapId != 31160 ? 0 : help.topPlayerID;
- cacheMapId = PlayerDatas.Instance.baseData.MapID;
+ //var mapId = PlayerDatas.Instance.baseData.MapID;
+ //if (cacheMapId != 0 && cacheMapId != 31160
+ // && mapId == 31160)
+ //{
+ // SnxxzGame.Instance.StartCoroutine(Co_LoadFinish());
+ //}
+ //var help = dungeonModel.mission;
+ //ancientKing = mapId != 31160 ? 0 : help.topPlayerID;
+ //cacheMapId = PlayerDatas.Instance.baseData.MapID;
}
public event Action battleHintUpdate;
@@ -56,7 +56,7 @@
&& ancientKing != help.topPlayerID)
{
ancientKing = help.topPlayerID;
- Receive(1);
+ //Receive(1);
}
}
ancientKing = help.topPlayerID;
@@ -71,24 +71,24 @@
}
if (msg.Equals("AncientBattlefield_8"))
{
- Receive(2);
+ //Receive(2);
}
}
public void Receive(int ancientType)
{
- battleHints.Enqueue(ancientType);
- if (!WindowCenter.Instance.IsOpen<BattleHintWin>())
- {
- WindowCenter.Instance.Open<BattleHintWin>();
- }
- else
- {
- if (battleHintUpdate != null)
- {
- battleHintUpdate();
- }
- }
+ //battleHints.Enqueue(ancientType);
+ //if (!WindowCenter.Instance.IsOpen<BattleHintWin>())
+ //{
+ // WindowCenter.Instance.Open<BattleHintWin>();
+ //}
+ //else
+ //{
+ // if (battleHintUpdate != null)
+ // {
+ // battleHintUpdate();
+ // }
+ //}
}
public void ReceiveEvenKill(string message, ArrayList list)
diff --git a/System/Message/SysNotifyMgr.cs b/System/Message/SysNotifyMgr.cs
index 7e481bf..5046c40 100644
--- a/System/Message/SysNotifyMgr.cs
+++ b/System/Message/SysNotifyMgr.cs
@@ -220,7 +220,7 @@
}
break;
case SysNotifyType.SysEvenKill:
- BattleHint.Instance.ReceiveEvenKill(msg, tipInfoList);
+ //BattleHint.Instance.ReceiveEvenKill(msg, tipInfoList);
break;
}
}
diff --git a/UI/HUD/HeadUpName.cs b/UI/HUD/HeadUpName.cs
index 9a2c1ee..2ec924f 100644
--- a/UI/HUD/HeadUpName.cs
+++ b/UI/HUD/HeadUpName.cs
@@ -152,12 +152,12 @@
{
return;
}
- m_AncientKing.gameObject.SetActive(isAncientKing);
- if (isAncientKing)
- {
- m_AncientKing.SetSprite("IntegralKing");
- m_AncientKing.SetNativeSize();
- }
+ //m_AncientKing.gameObject.SetActive(isAncientKing);
+ //if (isAncientKing)
+ //{
+ // m_AncientKing.SetSprite("IntegralKing");
+ // m_AncientKing.SetNativeSize();
+ //}
}
public void SetAncientEnemy(bool isAncientEnemy)
@@ -166,12 +166,12 @@
{
return;
}
- m_AncientEnemy.gameObject.SetActive(isAncientEnemy);
- if (isAncientEnemy)
- {
- m_AncientEnemy.SetSprite("Enemy");
- m_AncientEnemy.SetNativeSize();
- }
+ //m_AncientEnemy.gameObject.SetActive(isAncientEnemy);
+ //if (isAncientEnemy)
+ //{
+ // m_AncientEnemy.SetSprite("Enemy");
+ // m_AncientEnemy.SetNativeSize();
+ //}
}
public void SetAlliance(string _alliance)
--
Gitblit v1.8.0