From 390ad3660ffb53e88788b364ae18fd37cfc2b22d Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期一, 20 五月 2019 20:31:44 +0800
Subject: [PATCH] Merge branch 'master' into HazyRegion_1
---
System/CreateRolePostProcess/CreateRolePostProcessor.cs | 60 ++++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 38 insertions(+), 22 deletions(-)
diff --git a/System/CreateRolePostProcess/CreateRolePostProcessor.cs b/System/CreateRolePostProcess/CreateRolePostProcessor.cs
index eef9636..ed56b9b 100644
--- a/System/CreateRolePostProcess/CreateRolePostProcessor.cs
+++ b/System/CreateRolePostProcess/CreateRolePostProcessor.cs
@@ -23,18 +23,26 @@
onEnd = onComplete;
isSkiped = false;
- var uiroot = WindowCenter.Instance.uiRoot;
- uiroot.EnableCanvas(false, uiroot.baseCanvas,
- uiroot.lifeBarCanvas,
- uiroot.nameCanvas,
- uiroot.normalCanvas,
- uiroot.modalCanvas,
- uiroot.tipsCanvas,
- uiroot.systemCanvas,
- uiroot.recycleBin,
- uiroot.fightCanvasGroup.damageNumGroups[0].parent);
+ if (Application.isEditor)
+ {
+ var uiroot = WindowCenter.Instance.uiRoot;
+ uiroot.EnableCanvas(false, uiroot.baseCanvas,
+ uiroot.lifeBarCanvas,
+ uiroot.nameCanvas,
+ uiroot.normalCanvas,
+ uiroot.modalCanvas,
+ uiroot.tipsCanvas,
+ uiroot.systemCanvas,
+ uiroot.recycleBin,
+ uiroot.fightCanvasGroup.damageNumGroups[0].parent);
- WindowCenter.Instance.Open<CreateRoleMovieSkipWin>();
+ WindowCenter.Instance.Open<CreateRoleMovieSkipWin>();
+ }
+ else
+ {
+ CameraManager.uiCamera.enabled = false;
+ }
+
PlayMovie();
}
@@ -80,18 +88,26 @@
static void OnStop()
{
- var uiroot = WindowCenter.Instance.uiRoot;
- uiroot.EnableCanvas(true, uiroot.baseCanvas,
- uiroot.lifeBarCanvas,
- uiroot.nameCanvas,
- uiroot.normalCanvas,
- uiroot.modalCanvas,
- uiroot.tipsCanvas,
- uiroot.systemCanvas,
- uiroot.recycleBin,
- uiroot.fightCanvasGroup.damageNumGroups[0].parent);
+ if (Application.isEditor)
+ {
+ var uiroot = WindowCenter.Instance.uiRoot;
+ uiroot.EnableCanvas(true, uiroot.baseCanvas,
+ uiroot.lifeBarCanvas,
+ uiroot.nameCanvas,
+ uiroot.normalCanvas,
+ uiroot.modalCanvas,
+ uiroot.tipsCanvas,
+ uiroot.systemCanvas,
+ uiroot.recycleBin,
+ uiroot.fightCanvasGroup.damageNumGroups[0].parent);
- WindowCenter.Instance.Close<CreateRoleMovieSkipWin>();
+ WindowCenter.Instance.Close<CreateRoleMovieSkipWin>();
+ }
+ else
+ {
+ CameraManager.uiCamera.enabled = false;
+ }
+
var sendInfo = new CA108_tagCMRefreshMainServerRole();
GameNetSystem.Instance.SendInfo(sendInfo);
if (onEnd != null)
--
Gitblit v1.8.0