From a29b9dd38264a40996b1f039c3d434563488ccfb Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 18 九月 2018 16:44:39 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/MainInterfaceWin.cs | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/System/MainInterfacePanel/MainInterfaceWin.cs b/System/MainInterfacePanel/MainInterfaceWin.cs
index a15fe85..f374c3d 100644
--- a/System/MainInterfacePanel/MainInterfaceWin.cs
+++ b/System/MainInterfacePanel/MainInterfaceWin.cs
@@ -271,6 +271,7 @@
if (mapId != PlayerDatas.Instance.baseData.MapID)
{
CopyOfThePanel.localPosition = CopyOfThePosition2.localPosition;
+ onMainModel.MainTopPanelShow = false;
CopyOfThePositionBool = false;
m_ContainerBossList.localPosition = CopyOfThePosition1.localPosition;
m_BossBriefInfos.Unfold(false);
@@ -317,6 +318,11 @@
if (mapId != PlayerDatas.Instance.baseData.MapID)
{
CopyOfThePanel.localPosition = CopyOfThePosition2.localPosition;
+ onMainModel.MainTopPanelShow = false;
+ if (IsCopyOfThePanel != null)
+ {
+ IsCopyOfThePanel(false);
+ }
CopyOfThePositionBool = false;
m_ContainerBossList.localPosition = CopyOfThePosition1.localPosition;
m_BossBriefInfos.Unfold(false);
@@ -327,6 +333,7 @@
if (!IsBossBool)
{
CopyOfThePanel.localPosition = CopyOfThePosition1.localPosition;
+ onMainModel.MainTopPanelShow = true;
CopyOfThePositionBool = true;
m_ContainerBossList.localPosition = CopyOfThePosition2.localPosition;
m_BossBriefInfos.Unfold(false);
@@ -529,6 +536,7 @@
if (Vector3.Distance(CopyOfThePanel.position, CopyOfThePosition1.position) > 2 && !inDungeon && !isNeutralMap)
{
CopyOfThePanel.DOLocalMoveY(CopyOfThePosition1.localPosition.y, CopyOfThePanelSpeed);
+ onMainModel.MainTopPanelShow = true;
if (IsCopyOfThePanel != null)
{
IsCopyOfThePanel(true);
@@ -679,6 +687,7 @@
{
Event_Duplicates(false, CopyOfThePanelSpeed);
}
+ onMainModel.MainTopPanelShow = false;
CopyOfThePanel.DOLocalMoveY(CopyOfThePosition2.localPosition.y, CopyOfThePanelSpeed);
m_ContainerBossList.DOLocalMoveY(CopyOfThePosition1.localPosition.y, CopyOfThePanelSpeed);
m_BossBriefInfos.Unfold(false);
@@ -759,6 +768,7 @@
if (inDungeon || IsBossBool || isNeutralMap)
{
CopyOfThePanel.DOLocalMoveY(CopyOfThePosition1.localPosition.y, CopyOfThePanelSpeed);
+ onMainModel.MainTopPanelShow = true;
if (IsCopyOfThePanel != null)
{
IsCopyOfThePanel(true);
@@ -776,6 +786,7 @@
if (Vector3.Distance(CopyOfThePanel.position, CopyOfThePosition1.position) > 2 && !inDungeon)
{
CopyOfThePanel.DOLocalMoveY(CopyOfThePosition1.localPosition.y, CopyOfThePanelSpeed);
+ onMainModel.MainTopPanelShow = true;
if (IsCopyOfThePanel != null)
{
IsCopyOfThePanel(true);
@@ -796,6 +807,7 @@
if (inDungeon || IsBossBool || isNeutralMap)
{
CopyOfThePanel.DOLocalMoveY(CopyOfThePosition2.localPosition.y, CopyOfThePanelSpeed);
+ onMainModel.MainTopPanelShow = false;
if (IsCopyOfThePanel != null)
{
IsCopyOfThePanel(false);
@@ -950,6 +962,7 @@
if (Vector3.Distance(CopyOfThePanel.position, CopyOfThePosition1.position) > 2)//涓婂眰闈㈡澘
{
CopyOfThePanel.DOLocalMoveY(CopyOfThePosition1.localPosition.y, CopyOfThePanelSpeed);
+ onMainModel.MainTopPanelShow = true;
m_ContainerBossList.DOLocalMoveY(CopyOfThePosition2.localPosition.y, CopyOfThePanelSpeed);
m_BossBriefInfos.Unfold(false);
if (IsCopyOfThePanel != null)
--
Gitblit v1.8.0