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/RidingPetBossModel.cs | 46 ++-------------
System/RidingPet/RidingPetContentionWin.cs | 75 ++++++++++++++----------
System/RidingPet/ContainerRidingPet.cs.meta | 0
Utility/EnumHelper.cs | 1
System/RidingPet/RidingPetBottomTip.cs.meta | 0
System/RidingPet/ContainerRidingPet.cs | 18 ++++-
System/RidingPet/RidingPetBossVictoryWin.cs | 4
System/RidingPet/RidingPetBottomTip.cs | 11 +--
8 files changed, 70 insertions(+), 85 deletions(-)
diff --git a/System/RidingPet/Container_RidingPet.cs b/System/RidingPet/ContainerRidingPet.cs
similarity index 75%
rename from System/RidingPet/Container_RidingPet.cs
rename to System/RidingPet/ContainerRidingPet.cs
index e6ec2bb..312c3a0 100644
--- a/System/RidingPet/Container_RidingPet.cs
+++ b/System/RidingPet/ContainerRidingPet.cs
@@ -12,19 +12,19 @@
namespace Snxxz.UI
{
- public class Container_RidingPet : MonoBehaviour
+ public class ContainerRidingPet : MonoBehaviour
{
[SerializeField] Text m_MountsBossName;
[SerializeField] Text m_ActivityInfo;
[SerializeField] RawImage m_BossRawImage;
DailyQuestModel dailyQuestModel { get { return ModelCenter.Instance.GetModel<DailyQuestModel>(); } }
+ ItemTipsModel itemTipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }
public int RawImagetestBossID = 50103006;
public RewardPositionType rewardPositonType;
[SerializeField] ItemCell[] m_RewardArray;
public int bossIdIndex = 0;
- public int m_ActivityID = 34;
public void DisplayBossName()
{
@@ -55,16 +55,16 @@
public void DisplaySpiritPetHP()
{
- m_ActivityInfo.text = Language.Get("RidingBossRemainHP", ModelCenter.Instance.GetModel<RidingPetBossModel>().GetBossRemianedHP(bossIdIndex));
+ m_ActivityInfo.text = Language.Get("RidingPetBossRemainHP", ModelCenter.Instance.GetModel<RidingPetBossModel>().GetBossRemianedHP(bossIdIndex));
}
public void DisplayActivityTime()
{
DailyQuestOpenTime dailyQuestOpentime;
- dailyQuestModel.TryGetOpenTime(m_ActivityID, out dailyQuestOpentime);
+ dailyQuestModel.TryGetOpenTime((int)DailyQuestType.RidingPetActivity, out dailyQuestOpentime);
HourMinute hourMin;
dailyQuestOpentime.TryGetNextOpenTime(out hourMin);
- m_ActivityInfo.text = Language.Get("RidingBossQuestTime", hourMin.hourBegin, hourMin.minuteBegin);
+ m_ActivityInfo.text = Language.Get("RidingPetBossQuestTime", hourMin.hourBegin, hourMin.minuteBegin);
}
public void DisplayRewardItem()
@@ -89,6 +89,14 @@
{
ItemCellModel cellModel = new ItemCellModel(itemConfig.ID, true, (ulong)1);
m_RewardArray[i].Init(cellModel);
+ if (m_RewardArray[i].button != null)
+ {
+ m_RewardArray[i].button.SetListener(()=>
+ {
+ ItemAttrData attrData = new ItemAttrData(itemConfig.ID, true, (ulong)1);
+ itemTipsModel.SetItemTipsModel(attrData);
+ });
+ }
}
}
}
diff --git a/System/RidingPet/Container_RidingPet.cs.meta b/System/RidingPet/ContainerRidingPet.cs.meta
similarity index 100%
rename from System/RidingPet/Container_RidingPet.cs.meta
rename to System/RidingPet/ContainerRidingPet.cs.meta
diff --git a/System/RidingPet/RidingPetBossModel.cs b/System/RidingPet/RidingPetBossModel.cs
index d1879b3..f3259aa 100644
--- a/System/RidingPet/RidingPetBossModel.cs
+++ b/System/RidingPet/RidingPetBossModel.cs
@@ -19,50 +19,16 @@
private string m_Boss2RewardID;
public event Action GetRidingPetBossLineDictAction;
- public string MountsBossID
- {
- get
- {
- if (m_MountsBossID == null)
- {
- m_MountsBossID = FuncConfigConfig.Get("QCBOSSID").Numerical1;
-
- }
- return m_MountsBossID;
- }
- }
- public string Boss1RewardID
- {
- get
- {
- if (m_Boss1RewardID == null)
- {
- m_Boss1RewardID = FuncConfigConfig.Get("QCBOSSID").Numerical2;
-
- }
- return m_Boss1RewardID;
- }
- }
-
- public string Boss2RewardID
- {
- get
- {
- if (m_Boss2RewardID == null)
- {
- m_Boss2RewardID = FuncConfigConfig.Get("QCBOSSID").Numerical3;
-
- }
- return m_Boss2RewardID;
- }
- }
public override void Init()
{
- BossIDArray = ConfigParse.GetMultipleStr<int>(MountsBossID);
- Boss1RewardIDArray = ConfigParse.GetMultipleStr<int>(Boss1RewardID);
- Boss2RewardIDArray = ConfigParse.GetMultipleStr<int>(Boss2RewardID);
+ m_MountsBossID = FuncConfigConfig.Get("QCBOSSID").Numerical1;
+ m_Boss1RewardID = FuncConfigConfig.Get("QCBOSSID").Numerical2;
+ m_Boss2RewardID = FuncConfigConfig.Get("QCBOSSID").Numerical3;
+ BossIDArray = ConfigParse.GetMultipleStr<int>(m_MountsBossID);
+ Boss1RewardIDArray = ConfigParse.GetMultipleStr<int>(m_Boss1RewardID);
+ Boss2RewardIDArray = ConfigParse.GetMultipleStr<int>(m_Boss2RewardID);
}
public void OnBeforePlayerDataInitialize()
diff --git a/System/RidingPet/RidingPetBossVictoryWin.cs b/System/RidingPet/RidingPetBossVictoryWin.cs
index 3f6f8f1..fe685cce 100644
--- a/System/RidingPet/RidingPetBossVictoryWin.cs
+++ b/System/RidingPet/RidingPetBossVictoryWin.cs
@@ -100,7 +100,7 @@
DisplayDungeonExit();
DisplayWinOrRank();
DisplayAuctionItem();
- DisPlayMyItem();
+ DisplayMyItem();
}
void DisplayDungeonExit()
@@ -171,7 +171,7 @@
}
}
- private void DisPlayMyItem()
+ private void DisplayMyItem()
{
var result = dungeonModel.dungeonResult;
if (result.itemInfo != null)
diff --git a/System/RidingPet/BottomTip.cs b/System/RidingPet/RidingPetBottomTip.cs
similarity index 65%
rename from System/RidingPet/BottomTip.cs
rename to System/RidingPet/RidingPetBottomTip.cs
index b45d4af..564b71c 100644
--- a/System/RidingPet/BottomTip.cs
+++ b/System/RidingPet/RidingPetBottomTip.cs
@@ -5,32 +5,31 @@
using UnityEngine;
using UnityEngine.UI;
-public class BottomTip : MonoBehaviour {
+public class RidingPetBottomTip : MonoBehaviour {
[SerializeField] Text bottomText;
DailyQuestModel dailyQuestModel { get { return ModelCenter.Instance.GetModel<DailyQuestModel>(); } }
- public int m_ActivityID = 34;
public void DisplayBottomStartTip()
{
DailyQuestOpenTime dailyQuestOpenTime;
- dailyQuestModel.TryGetOpenTime(m_ActivityID, out dailyQuestOpenTime);
+ dailyQuestModel.TryGetOpenTime((int)DailyQuestType.RidingPetActivity, out dailyQuestOpenTime);
int secondsToNext = dailyQuestOpenTime.GetNextSessionSurplusTime();
int hour = secondsToNext / 3600;
int min = secondsToNext % 3600 / 60;
int seconds = secondsToNext % 3600 % 60;
- bottomText.text = "<color=red>"+"娲诲姩寮�鍚�掕鏃讹細" + hour + "灏忔椂" + min + "鍒�" + seconds + "绉�"+"</color>";
+ bottomText.text = Language.Get("RidingPetQuestStartCountDown", hour, min, seconds);
}
public void DisplayBottomRemainTimeTip()
{
DailyQuestOpenTime dailyQuestOpenTime;
- dailyQuestModel.TryGetOpenTime(m_ActivityID, out dailyQuestOpenTime);
+ dailyQuestModel.TryGetOpenTime((int)DailyQuestType.RidingPetActivity, out dailyQuestOpenTime);
HourMinute hourMin;
dailyQuestOpenTime.TryGetNextOpenTime(out hourMin);
DateTime endTime = new DateTime(TimeUtility.Year, TimeUtility.Month, TimeUtility.Day, hourMin.hourEnd, hourMin.minuteEnd, 0);
TimeSpan remainTime = endTime - TimeUtility.ServerNow;
- bottomText.text = "<color=green>"+"娲诲姩鍓╀綑鏃堕棿锛�" + remainTime.Hours + "灏忔椂" + remainTime.Minutes + "鍒�" + remainTime.Seconds + "绉�"+"</color>";
+ bottomText.text = Language.Get("RidingPetQuestRemainTime",remainTime.Hours,remainTime.Minutes,remainTime.Seconds);
}
}
diff --git a/System/RidingPet/BottomTip.cs.meta b/System/RidingPet/RidingPetBottomTip.cs.meta
similarity index 100%
rename from System/RidingPet/BottomTip.cs.meta
rename to System/RidingPet/RidingPetBottomTip.cs.meta
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;
}
}
diff --git a/Utility/EnumHelper.cs b/Utility/EnumHelper.cs
index 53a5119..02247d3 100644
--- a/Utility/EnumHelper.cs
+++ b/Utility/EnumHelper.cs
@@ -290,6 +290,7 @@
GatherSoulDungeon = 30,
CrossServerPk = 31,
AllianceBoss = 32,
+ RidingPetActivity = 34
//JadeDynastyBoss = 32,--璇涗粰鍔熻兘鏆傛椂鍏抽棴
//JadeDynastyTower = 33,
}
--
Gitblit v1.8.0