From fbd6138e0705ed34ee0c94926925b49ce375dc7a Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期四, 04 七月 2019 15:45:16 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/HoistingWin.cs | 75 ++++++++++++-------------------------
1 files changed, 25 insertions(+), 50 deletions(-)
diff --git a/System/MainInterfacePanel/HoistingWin.cs b/System/MainInterfacePanel/HoistingWin.cs
index 0443b8e..37d88d7 100644
--- a/System/MainInterfacePanel/HoistingWin.cs
+++ b/System/MainInterfacePanel/HoistingWin.cs
@@ -15,13 +15,16 @@
public class HoistingWin : Window
{
- [SerializeField] Transform Content;
+ [SerializeField] ScrollRect m_Scroller;
[SerializeField] Button FairyLandButton;//浠欑晫绉樺锛�
[SerializeField] Button WorldBossButton;//涓栫晫Boss鎸夐挳
[SerializeField] Button PrayerButton;//绁堟効
- [SerializeField] Button BountyTaskButton;//璧忛噾
+ [SerializeField] Button m_DailyQuest;
[SerializeField] Button HangUpButton;//鎸傛満
[SerializeField] Button FairyTaskButton;//浠欑洘浠诲姟
+
+ [SerializeField] Vector2 m_Size;
+
private int number = 0;
DungeonModel m_DungeonModel;
DungeonModel dungeonModel { get { return m_DungeonModel ?? (m_DungeonModel = ModelCenter.Instance.GetModel<DungeonModel>()); } }
@@ -54,13 +57,6 @@
Close();
WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.WelfareFunc2);
});
- BountyTaskButton.AddListener(() =>
- {
- Close();
- dailyquestmodel.wannaLookDailyQuest = (int)DailyQuestType.BountyMission;
- WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.DailyQuestFunc1);
-
- });
HangUpButton.AddListener(() =>
{
Close();
@@ -79,18 +75,23 @@
Close();
WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.UnionTask);
});
+ m_DailyQuest.AddListener(() =>
+ {
+ Close();
+ WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.DailyQuestFunc1);
+ });
}
protected override void OnPreOpen()
{
number = 0;
- Content.gameObject.SetActive(true);
DungeonRecord dungeonRecord;
dungeonModel.TryGetRecord(31080, out dungeonRecord);
var times = dungeonRecord == null ? 0 : dungeonRecord.enterTimes;
if (FuncOpen.Instance.IsFuncOpen(86) && dungeonModel.GetTotalTimes(31080) > times)//浠欑晫绉樺
{
+ number++;
FairyLandButton.gameObject.SetActive(true);
}
else
@@ -99,6 +100,7 @@
}
if (FuncOpen.Instance.IsFuncOpen(21) && GeneralDefine.bossWearyValues[0] + Worldmodel.extraBossWearyValue > Worldmodel.wearyValue)
{
+ number++;
WorldBossButton.gameObject.SetActive(true);
}
else
@@ -107,6 +109,7 @@
}
if (FuncOpen.Instance.IsFuncOpen(60) && ModelCenter.Instance.GetModel<PrayerModel>().expPrayerCnt < ModelCenter.Instance.GetModel<PrayerModel>().GetAllExpPrayCnt())//绁堟効
{
+ number++;
PrayerButton.gameObject.SetActive(true);
}
else
@@ -114,43 +117,19 @@
PrayerButton.gameObject.SetActive(false);
}
- if (FuncOpen.Instance.IsFuncOpen(34))//璧忛噾
+ if (FuncOpen.Instance.IsFuncOpen(78))
{
- bool _bool = false;
- foreach (var value in taskmodel.SpecialTask.Values)
- {
- if (value.Type == 13 && value.MissionState != 0 && value.MissionState != 3)
- {
- _bool = true;
- }
- }
- foreach (var value in taskmodel.BountyDic.Values)
- {
- if (value.MissionState != 0 && value.MissionState != 3)
- {
- _bool = true;
- }
-
- }
-
- if (_bool)
- {
- BountyTaskButton.gameObject.SetActive(true);
- }
- else
- {
- BountyTaskButton.gameObject.SetActive(false);
- }
-
+ number++;
+ m_DailyQuest.gameObject.SetActive(true);
}
else
{
- BountyTaskButton.gameObject.SetActive(false);
+ m_DailyQuest.gameObject.SetActive(false);
}
-
if (FuncOpen.Instance.IsFuncOpen(40))//鎸傛満
{
+ number++;
HangUpButton.gameObject.SetActive(true);
}
else
@@ -159,25 +138,21 @@
}
if (FuncOpen.Instance.IsFuncOpen(16) && TaskAllocation.Instance.FairyAuAllNumber() < taskmodel.FairyAuTaskCount_Day)//浠欑洘浠诲姟
{
+ number++;
FairyTaskButton.gameObject.SetActive(true);
}
else
{
FairyTaskButton.gameObject.SetActive(false);
}
- for (int i = 0; i < Content.childCount; i++)
- {
- if (Content.GetChild(i).gameObject.activeSelf)
- {
- number += 1;
- }
+ m_Scroller.verticalNormalizedPosition = 1f;
- }
- if (number <= 0)
- {
- Content.gameObject.SetActive(false);
- }
+ var size = number * 64f + Mathf.Max(number - 1, 0) * 6;
+ size = Mathf.Clamp(size, m_Size.x, m_Size.y);
+ var rect = m_Scroller.transform as RectTransform;
+ rect.sizeDelta = rect.sizeDelta.SetY(size);
+ m_Scroller.enabled = number > 4;
}
protected override void OnAfterOpen()
--
Gitblit v1.8.0