From 845699e7870361e81d13247758cbe79b7816ed42 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 21 八月 2018 10:51:43 +0800
Subject: [PATCH] 1889 【前端】神兽地界及界面相关
---
System/DogzDungeon/DogzDungeonBreifInfoBehaviour.cs | 43 ---------------------
System/DogzDungeon/DogzDungeonWin.cs | 3 +
Utility/EnumHelper.cs | 14 +++---
Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA326_tagMCNPCIDCollectionCntInfo.cs | 7 +++
Core/GameEngine/Model/Config/DogzDungeonConfig.cs | 17 +-------
Core/GameEngine/Model/Config/DogzDungeonConfig.cs.meta | 2
System/DogzDungeon/DogzDungeonModel.cs | 6 +++
7 files changed, 26 insertions(+), 66 deletions(-)
diff --git a/Core/GameEngine/Model/Config/DogzDungeonConfig.cs b/Core/GameEngine/Model/Config/DogzDungeonConfig.cs
index d53fcfc..724d1a3 100644
--- a/Core/GameEngine/Model/Config/DogzDungeonConfig.cs
+++ b/Core/GameEngine/Model/Config/DogzDungeonConfig.cs
@@ -1,6 +1,6 @@
锘�//--------------------------------------------------------
// [Author]: 绗簩涓栫晫
-// [ Date ]: Saturday, August 18, 2018
+// [ Date ]: Tuesday, August 21, 2018
//--------------------------------------------------------
using UnityEngine;
@@ -13,8 +13,6 @@
public int NPCID { get ; private set ; }
public int MonsterType { get ; private set ; }
- public int RefreshTimeType { get ; private set ; }
- public int[] RefreshTime;
public int[] RareItemID;
public string PortraitID { get ; private set; }
@@ -30,23 +28,14 @@
MonsterType=IsNumeric(rawContents[1]) ? int.Parse(rawContents[1]):0;
- RefreshTimeType=IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]):0;
-
- string[] RefreshTimeStringArray = rawContents[3].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
- RefreshTime = new int[RefreshTimeStringArray.Length];
- for (int i=0;i<RefreshTimeStringArray.Length;i++)
- {
- int.TryParse(RefreshTimeStringArray[i],out RefreshTime[i]);
- }
-
- string[] RareItemIDStringArray = rawContents[4].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ string[] RareItemIDStringArray = rawContents[2].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
RareItemID = new int[RareItemIDStringArray.Length];
for (int i=0;i<RareItemIDStringArray.Length;i++)
{
int.TryParse(RareItemIDStringArray[i],out RareItemID[i]);
}
- PortraitID = rawContents[5].Trim();
+ PortraitID = rawContents[3].Trim();
}
catch (Exception ex)
{
diff --git a/Core/GameEngine/Model/Config/DogzDungeonConfig.cs.meta b/Core/GameEngine/Model/Config/DogzDungeonConfig.cs.meta
index f0ba486..006e3ba 100644
--- a/Core/GameEngine/Model/Config/DogzDungeonConfig.cs.meta
+++ b/Core/GameEngine/Model/Config/DogzDungeonConfig.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: e3a382a765dc3ce4db610c70a6b30d8f
-timeCreated: 1534559386
+timeCreated: 1534817173
licenseType: Pro
MonoImporter:
serializedVersion: 2
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA326_tagMCNPCIDCollectionCntInfo.cs b/Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA326_tagMCNPCIDCollectionCntInfo.cs
index 63eeefc..414807f 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA326_tagMCNPCIDCollectionCntInfo.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA326_tagMCNPCIDCollectionCntInfo.cs
@@ -21,10 +21,15 @@
for (int i = 0; i < package.NPCCollCntList.Length; i++)
{
var collect = package.NPCCollCntList[i];
- if (collect.NPCID == 9999)
+ if (collect.NPCID == model.bigBoxNpcId)
{
model.bigBoxCollectCount = collect.CollectionCnt;
}
+
+ if (collect.NPCID == model.smallBoxNpcId)
+ {
+ model.smallBoxCollectCount = collect.CollectionCnt;
+ }
}
}
diff --git a/System/DogzDungeon/DogzDungeonBreifInfoBehaviour.cs b/System/DogzDungeon/DogzDungeonBreifInfoBehaviour.cs
index d43624d..bf0e0d7 100644
--- a/System/DogzDungeon/DogzDungeonBreifInfoBehaviour.cs
+++ b/System/DogzDungeon/DogzDungeonBreifInfoBehaviour.cs
@@ -13,7 +13,6 @@
public class DogzDungeonBreifInfoBehaviour : FindPreciousBossBriefInfoBehaviour
{
- [SerializeField] Text m_RefreshTimesDescription;
[SerializeField] Image m_Attention;
protected override int selectedBossId {
@@ -51,48 +50,6 @@
}
DogzDungeonModel model { get { return ModelCenter.Instance.GetModel<DogzDungeonModel>(); } }
-
- protected override void DrawBossBaseInfo(string _icon, string _name, int _level, int _realm)
- {
- var config = ConfigManager.Instance.GetTemplate<DogzDungeonConfig>(bossId);
- m_Portrait.SetSprite(_icon);
- m_Portrait.SetNativeSize();
- m_BossName.text = _name;
-
- m_BossLevel.text = config.MonsterType == 3 ? "(闅忔満boss)" : Language.Get("Z1024", _level);
-
- if (m_Realm != null)
- {
- if (_realm > 0)
- {
- m_Realm.gameObject.SetActive(true);
- var realmConfig = ConfigManager.Instance.GetTemplate<RealmConfig>(_realm);
- if (realmConfig != null)
- {
- m_Realm.SetSprite(realmConfig.Img);
- }
- }
- else
- {
- m_Realm.gameObject.SetActive(false);
- }
- }
- }
-
- private void DisplayRefreshTimesDescription()
- {
- var config = ConfigManager.Instance.GetTemplate<DogzDungeonConfig>(bossId);
-
- var timeStrings = new string[config.RefreshTime.Length];
- for (int i = 0; i < config.RefreshTime.Length; i++)
- {
- timeStrings[i] = config.RefreshTime[i].ToString();
- }
-
- m_RefreshTimesDescription.text = string.Join("銆�", timeStrings);
-
- }
-
public override void Display(object _data)
{
diff --git a/System/DogzDungeon/DogzDungeonModel.cs b/System/DogzDungeon/DogzDungeonModel.cs
index 94be9bd..61ca2ee 100644
--- a/System/DogzDungeon/DogzDungeonModel.cs
+++ b/System/DogzDungeon/DogzDungeonModel.cs
@@ -59,6 +59,12 @@
}
}
+ int m_SmallBoxCollectCount = 0;
+ public int smallBoxCollectCount {
+ get { return m_SmallBoxCollectCount; }
+ set { m_SmallBoxCollectCount = value; }
+ }
+
public event Action<int> bossSelectedEvent;
public event Action bossWearyValueChangeEvent;
public event Action bigBoxCollectCountChangeEvent;
diff --git a/System/DogzDungeon/DogzDungeonWin.cs b/System/DogzDungeon/DogzDungeonWin.cs
index 5e4f153..39fabaf 100644
--- a/System/DogzDungeon/DogzDungeonWin.cs
+++ b/System/DogzDungeon/DogzDungeonWin.cs
@@ -70,6 +70,9 @@
protected override void OnActived()
{
base.OnActived();
+ ShowBosses();
+ model.RequestBoxSurplusInfo();
+ model.RequestEliteSurplusInfo();
}
#endregion
diff --git a/Utility/EnumHelper.cs b/Utility/EnumHelper.cs
index b8a5b0e..bb44f35 100644
--- a/Utility/EnumHelper.cs
+++ b/Utility/EnumHelper.cs
@@ -1115,13 +1115,13 @@
public enum FindPreciousType
{
- None,
- WorldBoss,
- BossHome,
- PersonalBoss,
- ElderGodArea,
- DemonJar,
- DogzDungeon,
+ WorldBoss = 0,
+ BossHome = 1,
+ PersonalBoss = 2,
+ ElderGodArea = 3,
+ DemonJar = 4,
+ DogzDungeon = 5,
+ None = 99,
}
public enum GotServerRewardType
--
Gitblit v1.8.0