From 61b5058b990da2fe7f4b76e1e61b817d4f511432 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期四, 30 八月 2018 10:28:32 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/FindPrecious/LootPreciousFrameWin.cs | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/System/FindPrecious/LootPreciousFrameWin.cs b/System/FindPrecious/LootPreciousFrameWin.cs
index e84abe4..3eb7c7f 100644
--- a/System/FindPrecious/LootPreciousFrameWin.cs
+++ b/System/FindPrecious/LootPreciousFrameWin.cs
@@ -5,6 +5,7 @@
using UnityEngine;
using System.Collections;
using UnityEngine.UI;
+using System;
namespace Snxxz.UI
{
@@ -14,10 +15,13 @@
[SerializeField] FunctionButtonGroup m_FunctionGroup;
[SerializeField] FunctionButton m_DemonJar;
+ [SerializeField] FunctionButton m_FairyGrabBoss;
[SerializeField] Button m_Left;
[SerializeField] Button m_Right;
[SerializeField] Button m_Close;
+
+ FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } }
#region Built-in
protected override void BindController()
@@ -27,6 +31,7 @@
protected override void AddListeners()
{
m_DemonJar.AddListener(ShowDemonJar);
+ m_FairyGrabBoss.AddListener(FairyGrabBoss);
m_Left.AddListener(ShowLastFunction);
m_Right.AddListener(ShowNextFunction);
@@ -35,7 +40,6 @@
protected override void OnPreOpen()
{
-
}
protected override void OnAfterOpen()
@@ -74,9 +78,17 @@
functionOrder = m_DemonJar.order;
}
+ private void FairyGrabBoss()
+ {
+ CloseSubWindows();
+ WindowCenter.Instance.Open<FairyGrabBossWin>();
+ functionOrder = m_FairyGrabBoss.order;
+ }
+
private void CloseSubWindows()
{
WindowCenter.Instance.CloseImmediately<DemonJarWin>();
+ WindowCenter.Instance.CloseImmediately<FairyGrabBossWin>();
}
private void ShowLastFunction()
--
Gitblit v1.8.0