From 2f723e5320ef618985cc9ea8f71deafd3e4bec36 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期二, 16 四月 2019 11:35:50 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Dungeon/DungeonTargetBehaviour.cs | 55 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 36 insertions(+), 19 deletions(-)
diff --git a/System/Dungeon/DungeonTargetBehaviour.cs b/System/Dungeon/DungeonTargetBehaviour.cs
index 47eadf0..068f23d 100644
--- a/System/Dungeon/DungeonTargetBehaviour.cs
+++ b/System/Dungeon/DungeonTargetBehaviour.cs
@@ -11,11 +11,13 @@
[SerializeField] Text descText;
[SerializeField] List<Text> m_TargetDescs;
[SerializeField] List<Text> m_TargetNums;
- private int currentDungeonId=0;
+ private int currentDungeonId = 0;
DungeonModel m_Model;
- DungeonModel model {
- get {
+ DungeonModel model
+ {
+ get
+ {
return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<DungeonModel>());
}
}
@@ -72,76 +74,91 @@
var weel = Mathf.Clamp(model.mission.wheel, 1, int.MaxValue) - 1;
descText.text = config.Info.Length > weel ? config.Info[weel] : config.Info[0];
break;
+ case HazyGrassModel.FairyGrassMapId:
+ case HazyGrassModel.ReikiGrassMapId:
+ break;
default:
descText.text = config.Info.Length > step ? config.Info[step] : config.Info[0];
break;
}
}
- private void GetTargetInfo(int _index,string desc,int _targetValue,int _targetStep,int _targetType,int npcId=0)
+ private void GetTargetInfo(int _index, string desc, int _targetValue, int _targetStep, int _targetType, int npcId = 0)
{
m_TargetDescs[_index].text = desc;
m_TargetNums[_index].text = string.Empty;
- switch ((DungeonTargetType)_targetType) {
+ switch ((DungeonTargetType)_targetType)
+ {
case DungeonTargetType.NPC:
int killCnt = 0;
- if (npcId != 0) {
+ if (npcId != 0)
+ {
var npcConfig = NPCConfig.Get(npcId);
desc = desc.Replace("@NPCName@", npcConfig.charName);
- if (model.mission.npc != null) {
- for (int i = 0; i < model.mission.npc.Length; i++) {
+ if (model.mission.npc != null)
+ {
+ for (int i = 0; i < model.mission.npc.Length; i++)
+ {
var npcInfo = model.mission.npc[i];
- if (npcInfo.NPCID == npcId) {
+ if (npcInfo.NPCID == npcId)
+ {
killCnt = npcInfo.killCnt;
break;
}
}
}
}
- if (_targetValue > 0) {
- m_TargetNums[_index].text= StringUtility.Contact(killCnt, "/", _targetValue);
+ if (_targetValue > 0)
+ {
+ m_TargetNums[_index].text = StringUtility.Contact(killCnt, "/", _targetValue);
break;
}
m_TargetNums[_index].text = killCnt.ToString();
break;
case DungeonTargetType.Exp:
- if (_targetValue > 0) {
- m_TargetNums[_index].text=StringUtility.Contact(UIHelper.ReplaceLargeNum((ulong)model.mission.totalExp), "/", UIHelper.ReplaceLargeNum((ulong)_targetValue));
+ if (_targetValue > 0)
+ {
+ m_TargetNums[_index].text = StringUtility.Contact(UIHelper.ReplaceLargeNum((ulong)model.mission.totalExp), "/", UIHelper.ReplaceLargeNum((ulong)_targetValue));
break;
}
m_TargetNums[_index].text = StringUtility.Contact(UIHelper.ReplaceLargeNum((ulong)model.mission.totalExp),
model.mission.isFullExp == 1 ? StringUtility.Contact(" ", Language.Get("FullExp")) : string.Empty);
break;
case DungeonTargetType.Score:
- if (_targetValue > 0) {
- m_TargetNums[_index].text= StringUtility.Contact(model.mission.score, "/", _targetValue);
+ if (_targetValue > 0)
+ {
+ m_TargetNums[_index].text = StringUtility.Contact(model.mission.score, "/", _targetValue);
break;
}
m_TargetNums[_index].text = model.mission.score.ToString();
break;
case DungeonTargetType.Money:
- if (_targetValue > 0) {
+ if (_targetValue > 0)
+ {
m_TargetNums[_index].text = StringUtility.Contact(model.mission.money, "/", _targetValue);
break;
}
m_TargetNums[_index].text = model.mission.money.ToString();
break;
case DungeonTargetType.Wave:
- if (_targetValue > 0) {
+ if (_targetValue > 0)
+ {
m_TargetNums[_index].text = StringUtility.Contact(model.mission.wheel, "/", _targetValue);
break;
}
m_TargetNums[_index].text = model.mission.wheel.ToString();
break;
case DungeonTargetType.NpcTotal:
- if (_targetValue > 0) {
+ if (_targetValue > 0)
+ {
m_TargetNums[_index].text = StringUtility.Contact(model.mission.npcTotal, "/", _targetValue);
break;
}
m_TargetNums[_index].text = model.mission.npcTotal.ToString();
break;
case DungeonTargetType.Stage:
- if (_targetValue > 0) {
+ if (_targetValue > 0)
+ {
m_TargetNums[_index].text = StringUtility.Contact(model.mission.step, "/", _targetValue);
break;
}
--
Gitblit v1.8.0