From acfcd7af4539cbaf2e80064abedd0e764e733d54 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期五, 22 二月 2019 10:24:27 +0800
Subject: [PATCH] 3335 代码修改
---
System/MainInterfacePanel/MainInterfaceWin.cs | 47 +++++++++++++++++++++++++----------------------
1 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/System/MainInterfacePanel/MainInterfaceWin.cs b/System/MainInterfacePanel/MainInterfaceWin.cs
index 83a3f5e..828deba 100644
--- a/System/MainInterfacePanel/MainInterfaceWin.cs
+++ b/System/MainInterfacePanel/MainInterfaceWin.cs
@@ -31,30 +31,30 @@
[SerializeField] TeamInvitationEntrance m_TeamInvitationEntrance;
[SerializeField] FairyCallMemberBehaviour m_FairyCallBehaviour;
[SerializeField] MapSwitchingBehaviour m_MapSwitchingBehaviour;
-
- [SerializeField] Transform CopyOfThePanel;
[SerializeField] DungeonBossBriefInfoContainer m_BossBriefInfos;
+ [SerializeField] AnimationFadeOut m_AnimationFadeOut;
[SerializeField] IntensifySmoothSlider _ExpSlider;//缁忛獙鏉�
[SerializeField] Button _DownButton;//鏌ョ湅缁忛獙鏁板��
[SerializeField] Text _ExpRate;//鏁板��
[SerializeField] UIEffect m_UIEffect_A;//缁忛獙鐗规晥
[SerializeField] UIEffect m_UIEffect_B;//缁忛獙鐗规晥
- private float ExpValueFloat = 0;
- private bool SliderOpen = true;
- public static bool recordPositionBool = true;
- [SerializeField] GameObject m_TaskAndTeamTip;
+
+ [SerializeField] Button _SwitchShowBtn;//鍒囨崲鎸夐挳
[SerializeField] Button m_TaskSwithButton;//鍏充簬鍔熻兘棰勫憡
[SerializeField] Transform m_EffectTask;//浠诲姟瀹屾垚鐗规晥鎾斁浣嶇疆
- private bool TaskSwithBool = true;
- [SerializeField] Button _SwitchShowBtn;//鍒囨崲鎸夐挳
- [SerializeField] AnimationFadeOut m_AnimationFadeOut;
+ [SerializeField] Transform CopyOfThePanel;
+ [SerializeField] GameObject m_TaskAndTeamTip;
[SerializeField] GameObject m_MailObj;//閭欢鏄鹃殣
[SerializeField] ClickScreenOtherSpace _MarkRay;//渚挎嵎鍒囨崲鎸夐挳
[SerializeField] MainPositionTween m_MainPositionTween;
[SerializeField] MainButtonMisc m_MainButtonMisc;
#region
+ private bool TaskSwithBool = true;
+ private float ExpValueFloat = 0;
+ private bool SliderOpen = true;
+ public static bool recordPositionBool = true;
private int mapId = 0;
public static event Action Event_ChatCallback;
public static event Action<bool, float> Event_Duplicates;
@@ -282,15 +282,17 @@
WindowCenter.Instance.Close<PathfindingIconWin>();
}
}
-
- private void CompletionOfTaskEvent(int obj)
- {
- EffectMgr.Instance.PlayUIEffect(1100, 1100, m_EffectTask, false);
- }
+
protected override void OnAfterClose()
{
}
+ #endregion
+ private void CompletionOfTaskEvent(int obj)
+ {
+ EffectMgr.Instance.PlayUIEffect(1100, 1100, m_EffectTask, false);
+ }
+
private void secondEvent()
{
SetAtkType();
@@ -311,6 +313,7 @@
UnFlodFunctionArea(true, 0);
}
}
+
private void OnGuideBegin()//寮曞寮�濮�
{
if (!m_MainPositionTween.IsTaskAndPanelShow)
@@ -409,17 +412,12 @@
}
if (!onMainModel.ShieldedArea.Contains(PlayerDatas.Instance.baseData.MapID))//鍓嶅洓鍙狟oss鍜屾椿鍔˙oss鐗规畩澶勭悊
{
-
- }
- else
- {
if (IsBossBool && atkInt.Length > 1 && Buffmodel.PkType != 5)
{
onMainModel.AreaState = Buffmodel.PkType;
DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)5);
}
}
-
}
private void SetAtkType()//閫嶉仴鍩庨潪boss鍖哄煙鐗规畩澶勭悊
@@ -434,8 +432,7 @@
}
}
}
-
-
+
public void MarkRayButton()
{
if (NewBieCenter.Instance.inGuiding)
@@ -471,10 +468,12 @@
m_MainPositionTween.SetSkillTipOrRightTipPosTween(true);
}
}
+
void DownButton(GameObject go)
{
_ExpRate.gameObject.SetActive(true);
}
+
void UpButton(GameObject go)
{
_ExpRate.gameObject.SetActive(false);
@@ -623,7 +622,7 @@
IsCrossServerOneVsOne();
}
}
- #endregion
+
private bool IsDungeon()
{
@@ -733,6 +732,7 @@
recordPositionBool = false;
_MarkRay.gameObject.SetActive(true);
}
+
private void ShowCastSkill()//鏄剧ず鎶�鑳界粍,闅愯棌鎸夐挳缁�(寮哄埗鍒囨崲)
{
m_MainPositionTween.SetSkillTipOrRightTipPos(true);
@@ -759,11 +759,13 @@
m_TaskSwithButton.gameObject.SetActive(true);
}
}
+
private void bossGrabHintEvent()
{
IsShowTaskPanel();
AtkTypeChange();
}
+
private void IsCrossServerOneVsOne()
{
if (CrossServerUtility.IsCrossServerOneVsOne())//鏄惁鍐嶈法鏈嶅壇鏈腑
@@ -798,6 +800,7 @@
}
}
}
+
private void SetTipPanelOrBossList(bool _bool, bool _isTween)//椤跺眰鎸夐挳缁勫拰boss鍒楄〃鐨勭浉浜掑垏鎹�
{
var inDungeon = IsDungeon();
--
Gitblit v1.8.0