From 670dbdbac95aa8eb17fa9c5ee03bb273d42048db Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 22 一月 2019 19:40:33 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/JadeDynastyTower/JadeDynastyTowerModel.cs | 20 ++++++++++++++------
System/JadeDynastyTower/JadeDynastyTowerBehaviour.cs | 19 +++++++++++++++++--
System/JadeDynastyTower/JadeDynastyTowerWin.cs | 2 ++
3 files changed, 33 insertions(+), 8 deletions(-)
diff --git a/System/JadeDynastyTower/JadeDynastyTowerBehaviour.cs b/System/JadeDynastyTower/JadeDynastyTowerBehaviour.cs
index 7fc1cd9..ba58db9 100644
--- a/System/JadeDynastyTower/JadeDynastyTowerBehaviour.cs
+++ b/System/JadeDynastyTower/JadeDynastyTowerBehaviour.cs
@@ -55,9 +55,24 @@
{
m_Tower.verticalNormalizedPosition = 0f;
}
- else if (floorIndex > floors.Count - 3)
+ else if (floorIndex >= floors.Count - 2)
{
- m_Tower.verticalNormalizedPosition = 1f;
+ var hasTop = model.IsTopFloor(floors[floors.Count - 1]);
+ if (hasTop)
+ {
+ if (floorIndex >= floors.Count - 1)
+ {
+ m_Tower.verticalNormalizedPosition = 1f;
+ }
+ else
+ {
+ m_Tower.verticalNormalizedPosition = 0.5f;
+ }
+ }
+ else
+ {
+ m_Tower.verticalNormalizedPosition = 1f;
+ }
}
else
{
diff --git a/System/JadeDynastyTower/JadeDynastyTowerModel.cs b/System/JadeDynastyTower/JadeDynastyTowerModel.cs
index 2617bf5..2ad227f 100644
--- a/System/JadeDynastyTower/JadeDynastyTowerModel.cs
+++ b/System/JadeDynastyTower/JadeDynastyTowerModel.cs
@@ -62,6 +62,8 @@
break;
case 2:
break;
+ case 3:
+ break;
default:
break;
}
@@ -75,16 +77,22 @@
private int GetErrorOfChallenge()
{
- //if (!FuncOpen.Instance.IsFuncOpen(FUNCTIONID))
- // {
- // return 1;
- //}
+ if (!FuncOpen.Instance.IsFuncOpen(FUNCTIONID))
+ {
+ return 1;
+ }
+
+ var coolDown = dungeonModel.GetEnterCoolDown(JadeDynastyTowerModel.DATA_MAPID);
+ if (coolDown != null && coolDown.suplursSeconds > 0)
+ {
+ return 2;
+ }
var enterTimes = dungeonModel.GetEnterTimes(DATA_MAPID);
var totalTimes = dungeonModel.GetTotalTimes(DATA_MAPID);
if (enterTimes >= totalTimes)
{
- return 2;
+ return 3;
}
return 0;
@@ -125,7 +133,7 @@
}
else if (currentIndex >= sortedFloors.Count - 2)
{
- for (var i = sortedFloors.Count - 4; i <= sortedFloors.Count - 1; i++)
+ for (var i = sortedFloors.Count - 3; i <= sortedFloors.Count - 1; i++)
{
floors.Add(sortedFloors[i]);
}
diff --git a/System/JadeDynastyTower/JadeDynastyTowerWin.cs b/System/JadeDynastyTower/JadeDynastyTowerWin.cs
index 8f2347a..f33175c 100644
--- a/System/JadeDynastyTower/JadeDynastyTowerWin.cs
+++ b/System/JadeDynastyTower/JadeDynastyTowerWin.cs
@@ -111,6 +111,8 @@
m_ChallengeTitle.text = Language.Get("Multiple_Challenge");
challengeButtonShowState = ChallengeButtonShowState.Normal;
}
+
+ m_ChallengeImage.gray = !model.IsChallengable();
}
private void DisplayFightPower()
--
Gitblit v1.8.0