From e979cc9b0b66845afd8acec521b3ac7cf4bb1dfd Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期六, 24 十一月 2018 14:53:23 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Welcome.meta | 9 +++
System/Welcome/WelcomeWin.cs | 108 ++++++++++++++++++++++++++++++++++++
Fight/Stage/Dungeon/DungeonStage.cs | 13 +++-
System/Welcome/WelcomeWin.cs.meta | 12 ++++
4 files changed, 139 insertions(+), 3 deletions(-)
diff --git a/Fight/Stage/Dungeon/DungeonStage.cs b/Fight/Stage/Dungeon/DungeonStage.cs
index 7eaf131..901f413 100644
--- a/Fight/Stage/Dungeon/DungeonStage.cs
+++ b/Fight/Stage/Dungeon/DungeonStage.cs
@@ -11,8 +11,7 @@
public static MapType CurrentMapType;
HeavenBattleModel _heavenModel;
- HeavenBattleModel heavenModel
- {
+ HeavenBattleModel heavenModel {
get { return _heavenModel ?? (_heavenModel = ModelCenter.Instance.GetModel<HeavenBattleModel>()); }
}
@@ -58,7 +57,15 @@
CameraController.Instance.ResetOriginal();
}
var _instance = TipPanel.Instance;
- WindowCenter.Instance.Open<MainInterfaceWin>(true);
+
+ if (PlayerDatas.Instance.baseData.LV == 1)
+ {
+ WindowCenter.Instance.Open<WelcomeWin>(true);
+ }
+ else
+ {
+ WindowCenter.Instance.Open<MainInterfaceWin>(true);
+ }
GA_Hero.forceAutoFight = false;
diff --git a/System/Welcome.meta b/System/Welcome.meta
new file mode 100644
index 0000000..2ebd70c
--- /dev/null
+++ b/System/Welcome.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 30b21d1f3c40d1e4d85d7c90a04f1af4
+folderAsset: yes
+timeCreated: 1543039669
+licenseType: Pro
+DefaultImporter:
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/System/Welcome/WelcomeWin.cs b/System/Welcome/WelcomeWin.cs
new file mode 100644
index 0000000..a131e05
--- /dev/null
+++ b/System/Welcome/WelcomeWin.cs
@@ -0,0 +1,108 @@
+锘�//--------------------------------------------------------
+// [Author]: 绗簩涓栫晫
+// [ Date ]: Saturday, November 24, 2018
+//--------------------------------------------------------
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace Snxxz.UI
+{
+
+ public class WelcomeWin : Window
+ {
+
+ [SerializeField] UIAlphaTween m_AlphaTween;
+ [SerializeField] Button m_Close;
+ [SerializeField] float m_ForbidTime = 5f;
+ [SerializeField] float m_OutTime = 10f;
+
+ float superOutTime = 15f;
+ float timer = 0f;
+ bool ensured = false;
+
+ #region Built-in
+ protected override void BindController()
+ {
+ }
+
+ protected override void AddListeners()
+ {
+ m_Close.AddListener(Ensure);
+ }
+
+ protected override void OnPreOpen()
+ {
+ ensured = false;
+ m_AlphaTween.SetStartState();
+ }
+
+ protected override void OnAfterOpen()
+ {
+ }
+
+ protected override void OnPreClose()
+ {
+ }
+
+ protected override void OnAfterClose()
+ {
+ }
+
+ protected override void LateUpdate()
+ {
+ base.LateUpdate();
+
+ timer += Time.deltaTime;
+ if (timer > m_OutTime)
+ {
+ if (!ensured)
+ {
+ ensured = true;
+ FadeOut();
+ }
+ }
+
+ if (timer > superOutTime)
+ {
+ OnFadeOutComplete();
+ }
+ }
+
+ #endregion
+
+ private void Ensure()
+ {
+ if (timer < m_ForbidTime)
+ {
+ return;
+ }
+
+ if (!ensured)
+ {
+ ensured = true;
+ FadeOut();
+ }
+ }
+
+ private void FadeOut()
+ {
+ m_AlphaTween.Play(OnFadeOutComplete);
+ }
+
+ private void OnFadeOutComplete()
+ {
+ CloseClick();
+ WindowCenter.Instance.Open<MainInterfaceWin>();
+ }
+
+ }
+
+}
+
+
+
+
diff --git a/System/Welcome/WelcomeWin.cs.meta b/System/Welcome/WelcomeWin.cs.meta
new file mode 100644
index 0000000..96e2493
--- /dev/null
+++ b/System/Welcome/WelcomeWin.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 5d0559ee4304a84488b5b8375c046487
+timeCreated: 1543039723
+licenseType: Pro
+MonoImporter:
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
--
Gitblit v1.8.0