From 78bfe524ea4776c47f6314e56e97f39970b00fce Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 25 九月 2018 15:07:07 +0800
Subject: [PATCH] Merge branch 'master' into 1871天赋功能
---
System/Realm/RealmUpWin.cs | 113 +++++++++++++++++++++++++++++++++-----------------------
1 files changed, 67 insertions(+), 46 deletions(-)
diff --git a/System/Realm/RealmUpWin.cs b/System/Realm/RealmUpWin.cs
index ebb2a97..db6af7f 100644
--- a/System/Realm/RealmUpWin.cs
+++ b/System/Realm/RealmUpWin.cs
@@ -41,9 +41,12 @@
[SerializeField] UIEffect m_RealmDungeonSfx;
+ [SerializeField] RectTransform m_ContainerGroup;
+ [SerializeField] Button m_Group;
+ [SerializeField] Button m_AutoGroup;
+ [SerializeField] Button m_GroupDungeon;
[SerializeField] Button m_SingleDungeon;
[SerializeField] Button m_FuncButton;
- [SerializeField] Text m_FuncButtonTxt;
[SerializeField] Text m_RealmStageTip;
[SerializeField] RectTransform m_ContainerFightPower;
@@ -77,6 +80,9 @@
m_SingleDungeon.onClick.AddListener(SingleDungeon);
m_FuncButton.onClick.AddListener(OnFunctionClick);
m_RealmPreview.onClick.AddListener(OnRealmPreview);
+ m_Group.onClick.AddListener(OpenGroup);
+ m_AutoGroup.onClick.AddListener(AutoGroup);
+ m_GroupDungeon.onClick.AddListener(GroupDungeon);
}
protected override void OnPreOpen()
@@ -86,6 +92,7 @@
cacheRealmPoint = PlayerDatas.Instance.extersion.realmPoint;
m_RawBoss.gameObject.SetActive(false);
m_RawPlayer.gameObject.SetActive(false);
+ m_ContainerGroup.gameObject.SetActive(false);
overdueTime = DateTime.Now;
Display();
}
@@ -98,7 +105,7 @@
StopBoss();
m_RawBoss.gameObject.SetActive(false);
m_RawPlayer.gameObject.SetActive(true);
- UI3DModelExhibition.Instance.BeginShowSitDownPlayer(m_RawPlayer, PlayerDatas.Instance.baseData.Job);
+ UI3DModelExhibition.Instance.ShowSitDownPlayer(m_RawPlayer, PlayerDatas.Instance.baseData.Job);
}
}
@@ -126,7 +133,7 @@
PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= PlayerDataRefreshInfoEvent;
WindowCenter.Instance.windowAfterCloseEvent -= WindowAfterCloseEvent;
StopBoss();
- UI3DModelExhibition.Instance.StopShowPlayer();
+ UI3DModelExhibition.Instance.StopShow();
realmModel.realmDungeonState = false;
if (cacheCoroutine != null)
{
@@ -153,7 +160,7 @@
yield return WaitingForSecondConst.WaitMS800;
var config = Config.Instance.Get<RealmConfig>(PlayerDatas.Instance.baseData.realmLevel);
m_RawPlayer.gameObject.SetActive(false);
- UI3DModelExhibition.Instance.StopShowPlayer();
+ UI3DModelExhibition.Instance.StopShow();
yield return WaitingForSecondConst.GetWaitForSeconds(m_DelayEnterTime > 0 ? m_DelayEnterTime : 1f);
StartBoss(config, true);
}
@@ -275,28 +282,28 @@
m_RawPlayer.gameObject.SetActive(true);
StopBoss();
m_RawBoss.gameObject.SetActive(false);
- UI3DModelExhibition.Instance.BeginShowSitDownPlayer(m_RawPlayer, PlayerDatas.Instance.baseData.Job);
+ UI3DModelExhibition.Instance.ShowSitDownPlayer(m_RawPlayer, PlayerDatas.Instance.baseData.Job);
}
else if (_realmPoint >= config.NeedGood)
{
m_RawBoss.gameObject.SetActive(true);
m_RawPlayer.gameObject.SetActive(false);
- UI3DModelExhibition.Instance.StopShowPlayer();
+ UI3DModelExhibition.Instance.StopShow();
StartBoss(config);
}
}
private void StopBoss()
{
- UI3DModelExhibition.Instance.StopShowNPC();
+ UI3DModelExhibition.Instance.StopShow();
}
private void StartBoss(RealmConfig config, bool act = false)
{
StopBoss();
m_RawBoss.gameObject.SetActive(true);
- UI3DModelExhibition.Instance.StopShowPlayer();
- UI3DModelExhibition.Instance.BeginShowNPC(config.BossID, config.IsBigRealm == 1 ? Vector3.zero : direction, m_RawBoss, false);
+ UI3DModelExhibition.Instance.StopShow();
+ UI3DModelExhibition.Instance.ShowNPC(config.BossID, config.IsBigRealm == 1 ? Vector3.zero : direction, m_RawBoss, false);
var npcConfig = Config.Instance.Get<NPCConfig>(config.BossID);
var npcModel = UI3DModelExhibition.Instance.NpcModelPet;
m_RawBoss.transform.localPosition = config.IsBigRealm == 1 ? m_BossPositions[1] : m_BossPositions[0];
@@ -326,56 +333,70 @@
{
var _realmPoint = PlayerDatas.Instance.extersion.realmPoint;
var config = Config.Instance.Get<RealmConfig>(PlayerDatas.Instance.baseData.realmLevel);
- m_FuncButton.gameObject.SetActive(!realmModel.IsRealmHighest);
- m_SingleDungeon.gameObject.SetActive(false);
- if (_realmPoint >= config.NeedPoint)
- {
- m_FuncButtonTxt.text = Language.Get(config.IsBigRealm == 1 ? "RealmWin_Bewrite_13" : "RealmWin_Bewrite_12");
- m_SingleDungeon.gameObject.SetActive(config.IsBigRealm == 1 && !realmModel.IsRealmHighest);
- }
- else
- {
- m_FuncButtonTxt.text = Language.Get("RealmWin_Bewrite_1");
- }
+ bool satisfyChallenge = _realmPoint >= config.NeedPoint;
+ m_Group.gameObject.SetActive(!realmModel.IsRealmHighest && config.IsBigRealm == 1 && satisfyChallenge);
+ m_SingleDungeon.gameObject.SetActive(!realmModel.IsRealmHighest && satisfyChallenge);
+ m_FuncButton.gameObject.SetActive(!realmModel.IsRealmHighest && !satisfyChallenge);
}
private void OnFunctionClick()
{
- var _realmPoint = PlayerDatas.Instance.extersion.realmPoint;
- var config = Config.Instance.Get<RealmConfig>(PlayerDatas.Instance.baseData.realmLevel);
- if (_realmPoint >= config.NeedPoint)
+ WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.DailyQuestFunc1);
+ }
+
+ private void GroupDungeon()
+ {
+ if (DateTime.Now < overdueTime)
{
- if (DateTime.Now < overdueTime)
- {
- return;
- }
- PlayerDatas.Instance.realm.realmHelpList.Clear();
- if (config.IsBigRealm == 1)
- {
- var teamModel = ModelCenter.Instance.GetModel<TeamModel>();
- if (teamModel.myTeam.inTeam && teamModel.myTeam.iamCaptainer)
- {
- ModelCenter.Instance.GetModel<DungeonModel>().GroupChallenge(RealmModel.REALM_DUNGEON_ID, 1);
- }
- else
- {
- teamModel.missionBuf = teamModel.currentMission = new TeamMission(31110, 1);
- WindowCenter.Instance.Open<TeamFrameWin>(false, teamModel.myTeam.inTeam ? 1 : 0);
- }
- }
- else
- {
- ModelCenter.Instance.GetModel<DungeonModel>().SingleChallenge(RealmModel.REALM_DUNGEON_ID);
- }
+ return;
+ }
+ if (PlayerDatas.Instance.baseData.MapID == RealmModel.REALM_DUNGEON_ID)
+ {
+ return;
+ }
+ var teamModel = ModelCenter.Instance.GetModel<TeamModel>();
+ if (teamModel.myTeam.inTeam && teamModel.myTeam.iamCaptainer)
+ {
+ ModelCenter.Instance.GetModel<DungeonModel>().GroupChallenge(RealmModel.REALM_DUNGEON_ID, 1);
}
else
{
- WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.DailyQuestFunc1);
+ teamModel.missionBuf = teamModel.currentMission = new TeamMission(31110, 1);
+ WindowCenter.Instance.Open<TeamFrameWin>(false, teamModel.myTeam.inTeam ? 1 : 0);
+ }
+ }
+
+ private void AutoGroup()
+ {
+ if (DateTime.Now < overdueTime)
+ {
+ return;
+ }
+ var teamModel = ModelCenter.Instance.GetModel<TeamModel>();
+ teamModel.RequestAutoMatchTeam(new TeamMission(RealmModel.REALM_DUNGEON_ID, 1));
+ WindowCenter.Instance.Open<TeamFrameWin>(false, 1);
+ }
+
+ private void OpenGroup()
+ {
+ var opened = m_ContainerGroup.gameObject.activeSelf;
+ if (!opened)
+ {
+ m_ContainerGroup.gameObject.SetActive(true);
}
}
private void SingleDungeon()
{
+ if (DateTime.Now < overdueTime)
+ {
+ return;
+ }
+ if (PlayerDatas.Instance.baseData.MapID == RealmModel.REALM_DUNGEON_ID)
+ {
+ return;
+ }
+ PlayerDatas.Instance.realm.realmHelpList.Clear();
var _realmPoint = PlayerDatas.Instance.extersion.realmPoint;
var config = Config.Instance.Get<RealmConfig>(PlayerDatas.Instance.baseData.realmLevel);
if (_realmPoint >= config.NeedPoint)
--
Gitblit v1.8.0