From b45f84d1a84cb768d0b136fe37ad18364d74af1f Mon Sep 17 00:00:00 2001
From: xingchen Qiu <843224210@qq.com>
Date: 星期三, 10 四月 2019 15:54:34 +0800
Subject: [PATCH] 6352 骑宠争夺更新
---
System/RidingPet/RidingPetContentionWin.cs | 75 +++++++++++++++++++++----------------
1 files changed, 43 insertions(+), 32 deletions(-)
diff --git a/System/RidingPet/RidingPetContentionWin.cs b/System/RidingPet/RidingPetContentionWin.cs
index 0a54862..44a6334 100644
--- a/System/RidingPet/RidingPetContentionWin.cs
+++ b/System/RidingPet/RidingPetContentionWin.cs
@@ -9,9 +9,9 @@
{
[SerializeField] Button m_MountsGoToButton;
[SerializeField] Button m_SpiritPetGoToButton;
- [SerializeField] Container_RidingPet m_Container_Mounts;
- [SerializeField] Container_RidingPet m_Container_SpiritPet;
- [SerializeField] BottomTip m_BottomTip;
+ [SerializeField] ContainerRidingPet m_ContainerMounts;
+ [SerializeField] ContainerRidingPet m_ContainerSpiritPet;
+ [SerializeField] RidingPetBottomTip m_RidingPetBottomTip;
MapModel mapModel { get { return ModelCenter.Instance.GetModel<MapModel>(); } }
RidingPetBossModel ridingPetBossModel { get { return ModelCenter.Instance.GetModel<RidingPetBossModel>(); } }
DungeonModel dungeondel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }
@@ -32,8 +32,8 @@
protected override void OnAfterClose()
{
- m_Container_Mounts.StopShowBossRawImage();
- m_Container_SpiritPet.StopShowAnotherBossImage();
+ m_ContainerMounts.StopShowBossRawImage();
+ m_ContainerSpiritPet.StopShowAnotherBossImage();
}
protected override void OnAfterOpen()
@@ -48,26 +48,38 @@
protected override void OnPreOpen()
{
- m_Container_Mounts.DisplayBossName();
- m_Container_SpiritPet.DisplayBossName();
+ m_ContainerMounts.DisplayBossName();
+ m_ContainerSpiritPet.DisplayBossName();
ridingPetBossModel.GetRidingPetBossLineDictAction += GetRidingBossDictPackageAction;
mapModel.RequestQueryMapLineState(RidingPetBossModel.RIDINGPETBOSS_MAP);
GetRidingBossDictPackageAction();
- m_Container_Mounts.DisplayBossRawImage();
- m_Container_SpiritPet.DisplayAnotherBossRawImage();
- m_Container_Mounts.DisplayRewardItem();
- m_Container_SpiritPet.DisplayRewardItem();
+
+ m_ContainerMounts.DisplayBossRawImage();
+ m_ContainerSpiritPet.DisplayAnotherBossRawImage();
+
+ m_ContainerMounts.DisplayRewardItem();
+ m_ContainerSpiritPet.DisplayRewardItem();
+ WindowCenter.Instance.windowBeforeCloseEvent += WindowBeforeCloseEvent;
+ }
+
+ private void WindowBeforeCloseEvent(Window _window)
+ {
+ if (_window is PetMatInfoWin)
+ {
+ m_ContainerMounts.DisplayBossRawImage();
+ m_ContainerSpiritPet.DisplayAnotherBossRawImage();
+ }
}
private void GoToKillMountsBoss()
{
- dungeondel.SingleChallenge(RidingPetBossModel.RIDINGPETBOSS_MAP, m_Container_Mounts.bossIdIndex);
+ dungeondel.SingleChallenge(RidingPetBossModel.RIDINGPETBOSS_MAP, m_ContainerMounts.bossIdIndex);
}
private void GoToKillSpiritPetBoss()
{
- dungeondel.SingleChallenge(RidingPetBossModel.RIDINGPETBOSS_MAP, m_Container_SpiritPet.bossIdIndex);
+ dungeondel.SingleChallenge(RidingPetBossModel.RIDINGPETBOSS_MAP, m_ContainerSpiritPet.bossIdIndex);
}
protected override void LateUpdate()
@@ -78,44 +90,43 @@
mapModel.RequestQueryMapLineState(RidingPetBossModel.RIDINGPETBOSS_MAP);
m_Timer -= 5;
}
- UpdatebottomTip();
+ if (m_Timer > 1)
+ {
+ UpdateRidingPetBottomTip();
+ m_Timer -= 1;
+ }
}
public void GetRidingBossDictPackageAction()
{
- switch (dailyQuestModel.GetQuestState(m_Container_Mounts.m_ActivityID))
+ switch (dailyQuestModel.GetQuestState((int)DailyQuestType.RidingPetActivity))
{
case DailyQuestModel.DailyQuestState.Completed:
case DailyQuestModel.DailyQuestState.Normal:
- m_Container_Mounts.DisplaySpiritPetHP();
+ m_ContainerMounts.DisplaySpiritPetHP();
+ m_ContainerSpiritPet.DisplaySpiritPetHP();
+ m_MountsGoToButton.interactable = true;
+ m_SpiritPetGoToButton.interactable = true;
break;
default:
- m_Container_Mounts.DisplayActivityTime();
- break;
- }
-
- switch (dailyQuestModel.GetQuestState(m_Container_SpiritPet.m_ActivityID))
- {
- case DailyQuestModel.DailyQuestState.Completed:
- case DailyQuestModel.DailyQuestState.Normal:
- m_Container_SpiritPet.DisplaySpiritPetHP();
- break;
- default:
- m_Container_SpiritPet.DisplayActivityTime();
+ m_ContainerMounts.DisplayActivityTime();
+ m_ContainerSpiritPet.DisplayActivityTime();
+ m_MountsGoToButton.interactable = false;
+ m_SpiritPetGoToButton.interactable = false;
break;
}
}
- public void UpdatebottomTip()
+ public void UpdateRidingPetBottomTip()
{
- switch (dailyQuestModel.GetQuestState(m_BottomTip.m_ActivityID))
+ switch (dailyQuestModel.GetQuestState((int)DailyQuestType.RidingPetActivity))
{
case DailyQuestModel.DailyQuestState.Completed:
case DailyQuestModel.DailyQuestState.Normal:
- m_BottomTip.DisplayBottomRemainTimeTip();
+ m_RidingPetBottomTip.DisplayBottomRemainTimeTip();
break;
default:
- m_BottomTip.DisplayBottomStartTip();
+ m_RidingPetBottomTip.DisplayBottomStartTip();
break;
}
}
--
Gitblit v1.8.0