From f830df47deeef8b302569fd83a5b7cedf2db8106 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 14 八月 2018 11:06:43 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Core/GameEngine/Model/ConfigManager.cs | 2
Core/GameEngine/Model/Config/DemonJarConfig.cs.meta | 2
Utility/EnumHelper.cs | 1
System/Team/MyTeamWin.cs | 2 +
System/FindPrecious/DemonJarBossIntroduceBehaviour.cs.meta | 12 ++++++
Core/GameEngine/Model/Config/DemonJarConfig.cs | 25 +++++++-----
System/FindPrecious/BossIntroduceBehaviour.cs | 6 +-
System/FindPrecious/DemonJarBossIntroduceBehaviour.cs | 46 +++++++++++++++++++++++
8 files changed, 79 insertions(+), 17 deletions(-)
diff --git a/Core/GameEngine/Model/Config/DemonJarConfig.cs b/Core/GameEngine/Model/Config/DemonJarConfig.cs
index 9f954db..b52b89d 100644
--- a/Core/GameEngine/Model/Config/DemonJarConfig.cs
+++ b/Core/GameEngine/Model/Config/DemonJarConfig.cs
@@ -1,6 +1,6 @@
锘�//--------------------------------------------------------
// [Author]: 绗簩涓栫晫
-// [ Date ]: Friday, July 20, 2018
+// [ Date ]: Tuesday, August 14, 2018
//--------------------------------------------------------
using UnityEngine;
@@ -15,6 +15,7 @@
public int LineID { get ; private set ; }
public int Time { get ; private set ; }
public int[] MustItemID;
+ public string[] MustItemDescriptions;
public int[] RareItemID;
public string PortraitID { get ; private set; }
public int SpecialItemMark { get ; private set ; }
@@ -47,45 +48,47 @@
int.TryParse(MustItemIDStringArray[i],out MustItemID[i]);
}
- string[] RareItemIDStringArray = rawContents[4].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ MustItemDescriptions = rawContents[4].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+
+ string[] RareItemIDStringArray = rawContents[5].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[6].Trim();
- SpecialItemMark=IsNumeric(rawContents[6]) ? int.Parse(rawContents[6]):0;
+ SpecialItemMark=IsNumeric(rawContents[7]) ? int.Parse(rawContents[7]):0;
- CanEnterTimes=IsNumeric(rawContents[7]) ? int.Parse(rawContents[7]):0;
+ CanEnterTimes=IsNumeric(rawContents[8]) ? int.Parse(rawContents[8]):0;
- AutoAttention=IsNumeric(rawContents[8]) ? int.Parse(rawContents[8]):0;
+ AutoAttention=IsNumeric(rawContents[9]) ? int.Parse(rawContents[9]):0;
- string[] Job1StringArray = rawContents[9].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ string[] Job1StringArray = rawContents[10].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
Job1 = new int[Job1StringArray.Length];
for (int i=0;i<Job1StringArray.Length;i++)
{
int.TryParse(Job1StringArray[i],out Job1[i]);
}
- string[] Job2StringArray = rawContents[10].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ string[] Job2StringArray = rawContents[11].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
Job2 = new int[Job2StringArray.Length];
for (int i=0;i<Job2StringArray.Length;i++)
{
int.TryParse(Job2StringArray[i],out Job2[i]);
}
- string[] Job3StringArray = rawContents[11].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ string[] Job3StringArray = rawContents[12].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
Job3 = new int[Job3StringArray.Length];
for (int i=0;i<Job3StringArray.Length;i++)
{
int.TryParse(Job3StringArray[i],out Job3[i]);
}
- KillHurtMin=IsNumeric(rawContents[12]) ? int.Parse(rawContents[12]):0;
+ KillHurtMin=IsNumeric(rawContents[13]) ? int.Parse(rawContents[13]):0;
- KillHurtMax=IsNumeric(rawContents[13]) ? int.Parse(rawContents[13]):0;
+ KillHurtMax=IsNumeric(rawContents[14]) ? int.Parse(rawContents[14]):0;
}
catch (Exception ex)
{
diff --git a/Core/GameEngine/Model/Config/DemonJarConfig.cs.meta b/Core/GameEngine/Model/Config/DemonJarConfig.cs.meta
index de664cd..4d5781d 100644
--- a/Core/GameEngine/Model/Config/DemonJarConfig.cs.meta
+++ b/Core/GameEngine/Model/Config/DemonJarConfig.cs.meta
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 7e442059ea96745478dd5787f9e84ef5
-timeCreated: 1532068533
+timeCreated: 1534212554
licenseType: Pro
MonoImporter:
serializedVersion: 2
diff --git a/Core/GameEngine/Model/ConfigManager.cs b/Core/GameEngine/Model/ConfigManager.cs
index 716d56b..d2976d0 100644
--- a/Core/GameEngine/Model/ConfigManager.cs
+++ b/Core/GameEngine/Model/ConfigManager.cs
@@ -42,6 +42,7 @@
AddAsyncTask<IconConfig>();
AddAsyncTask<ItemConfig>();
AddAsyncTask<SkillConfig>();
+ AddAsyncTask<TASKINFOConfig>();
AddAsyncTask<mapnpcConfig>();
AddAsyncTask<LoginSeverListConfig>();
AddAsyncTask<DienstgradConfig>();
@@ -56,7 +57,6 @@
AddAsyncTask<ItemPlusConfig>();
AddAsyncTask<ItemPlusMaxConfig>();
AddAsyncTask<PyTaskConfig>();
- AddAsyncTask<TASKINFOConfig>();
AddAsyncTask<MailConfig>();
AddAsyncTask<RuneTowerConfig>();
AddAsyncTask<EquipWashConfig>();
diff --git a/System/FindPrecious/BossIntroduceBehaviour.cs b/System/FindPrecious/BossIntroduceBehaviour.cs
index 847284a..cda2e3e 100644
--- a/System/FindPrecious/BossIntroduceBehaviour.cs
+++ b/System/FindPrecious/BossIntroduceBehaviour.cs
@@ -13,7 +13,7 @@
public class BossIntroduceBehaviour : MonoBehaviour
{
- [SerializeField] FindPreciousType m_FindPreciousType = FindPreciousType.WorldBoss;
+ [SerializeField] protected FindPreciousType m_FindPreciousType = FindPreciousType.WorldBoss;
[SerializeField] Transform m_ContainerReward;
[SerializeField] Transform m_ContainerBossInfo;
@@ -32,7 +32,7 @@
float confirmDelay = 0.3f;
float confirmTimer = 0f;
int tempBossId = 0;
- int bossId = 0;
+ protected int bossId = 0;
public void Display(int _bossId, bool _immediately)
{
@@ -92,7 +92,7 @@
m_BossAbility.Display(bossId);
}
- private void DrawReward()
+ protected virtual void DrawReward()
{
UI3DModelExhibition.Instance.StopShowNPC();
m_ViewType = ViewType.Reward;
diff --git a/System/FindPrecious/DemonJarBossIntroduceBehaviour.cs b/System/FindPrecious/DemonJarBossIntroduceBehaviour.cs
new file mode 100644
index 0000000..bbf767a
--- /dev/null
+++ b/System/FindPrecious/DemonJarBossIntroduceBehaviour.cs
@@ -0,0 +1,46 @@
+锘�//--------------------------------------------------------
+// [Author]: 绗簩涓栫晫
+// [ Date ]: Tuesday, August 14, 2018
+//--------------------------------------------------------
+using UnityEngine;
+using System.Collections;
+using UnityEngine.UI;
+using TableConfig;
+
+namespace Snxxz.UI
+{
+
+ public class DemonJarBossIntroduceBehaviour : BossIntroduceBehaviour
+ {
+
+ [SerializeField] Text[] m_UndoubtedlyRewardDescription;
+
+ protected override void DrawReward()
+ {
+ base.DrawReward();
+
+ if (m_FindPreciousType == FindPreciousType.DemonJar)
+ {
+ var demonJarConfig = ConfigManager.Instance.GetTemplate<DemonJarConfig>(bossId);
+ for (int i = 0; i < m_UndoubtedlyRewardDescription.Length; i++)
+ {
+ var behaviour = m_UndoubtedlyRewardDescription[i];
+ if (i < demonJarConfig.MustItemDescriptions.Length)
+ {
+ behaviour.gameObject.SetActive(true);
+ behaviour.text = demonJarConfig.MustItemDescriptions[i];
+ }
+ else
+ {
+ behaviour.gameObject.SetActive(false);
+ }
+ }
+ }
+ }
+
+ }
+
+}
+
+
+
diff --git a/System/FindPrecious/DemonJarBossIntroduceBehaviour.cs.meta b/System/FindPrecious/DemonJarBossIntroduceBehaviour.cs.meta
new file mode 100644
index 0000000..c679d19
--- /dev/null
+++ b/System/FindPrecious/DemonJarBossIntroduceBehaviour.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: c1971e6d24a8dc4469a7c7465ff1e3b9
+timeCreated: 1534212978
+licenseType: Pro
+MonoImporter:
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/System/Team/MyTeamWin.cs b/System/Team/MyTeamWin.cs
index 083e10a..3b61b82 100644
--- a/System/Team/MyTeamWin.cs
+++ b/System/Team/MyTeamWin.cs
@@ -102,6 +102,7 @@
model.teammateChangeMapEvent += UpdateMission;
model.missionLevelLimitChangeEvent += UpdateMission;
model.missionLevelLimitChangeEvent += UpdateLevelLimit;
+ model.missionLevelLimitChangeEvent += UpdateAutoPrepareButton;
model.matchingStateChangeEvent += OnMatchStateChange;
m_TeamInviteEntrancePanel.activeOrDeActiveEvent += OnInvitePanelActiveOrDeActive;
@@ -130,6 +131,7 @@
model.teammateChangeMapEvent -= UpdateMission;
model.missionLevelLimitChangeEvent -= UpdateMission;
model.missionLevelLimitChangeEvent -= UpdateLevelLimit;
+ model.missionLevelLimitChangeEvent -= UpdateAutoPrepareButton;
model.matchingStateChangeEvent -= OnMatchStateChange;
m_TeamInviteEntrancePanel.activeOrDeActiveEvent -= OnInvitePanelActiveOrDeActive;
diff --git a/Utility/EnumHelper.cs b/Utility/EnumHelper.cs
index 923f3db..a44a433 100644
--- a/Utility/EnumHelper.cs
+++ b/Utility/EnumHelper.cs
@@ -1117,7 +1117,6 @@
PersonalBoss,
ElderGodArea,
DemonJar,
- AerialBuilding,
}
public enum GotServerRewardType
--
Gitblit v1.8.0