WangWeiZhi
/
YanCheng_Metrology
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology

This commit is contained in:
陈向学 2024-08-30 14:10:04 +08:00
parent e50f397089 4766fa4d06
commit 903084333c
5 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Assets/Scripts/Project/UI/UI_Panel/UI_CustomSessionPanel.cs
View File

@ -18,11 +18,15 @@ public class UI_CustomSessionPanel : BasePanel
{
this.triggerID = triggerID;
callBack += _callBack;
//GetControl<TextMeshProUGUI>("ClientText_DialogBox").text = clientTalk /*"好的"*/;
GetControl<TextMeshProUGUI>("ClientText_DialogBox").text = "";
//UItext = GetControl<TextMeshProUGUI>("ClientText_DialogBox");
StartTypewriterEffect(clientTalk);
}
public override void HideMe()
{
base.HideMe();
}
//}
/// <summary>
/// 按钮点击
@ -33,7 +37,6 @@ public class UI_CustomSessionPanel : BasePanel
switch (btnName)
{
case "ClientContinueBtn":
//GameManager.UIMgr.HidePanel<UI_CustomSessionPanel>();
callBack?.Invoke(triggerID);
break;
}

22
Assets/Scripts/Project/UI/UI_Panel/UI_MenuBar.cs
View File

@ -127,17 +127,6 @@ public class UI_MenuBar : BasePanel
notifyBtn.gameObject.SetActive(type == E_SceneType.Site);
}
private void OpenMenu()
{
GetControl<Image>("CloseDefaultBtn").sprite = ExpandSprite;
GetControl<Image>("MenuBar").rectTransform.DOAnchorPosX(0, 0.5f);
}
private void CloseMenu()
{
GetControl<Image>("MenuBar").rectTransform.DOAnchorPosX(110, 0.5f);
GetControl<Image>("CloseDefaultBtn").sprite = CollapseSprite;
}
/// <summary>
/// 倒计时
@ -155,6 +144,17 @@ public class UI_MenuBar : BasePanel
CloseMenu();
}
}
private void OpenMenu()
{
GetControl<Image>("CloseDefaultBtn").sprite = CollapseSprite;
GetControl<Image>("MenuBar").rectTransform.DOAnchorPosX(0, 0.2f);
}
private void CloseMenu()
{
GetControl<Image>("CloseDefaultBtn").sprite = ExpandSprite;
GetControl<Image>("MenuBar").rectTransform.DOAnchorPosX(110, 0.2f);
}
protected override void OnClick(string btnName)
{
switch (btnName)

4
Assets/Scripts/Project/UI/UI_Panel/UI_ReceiveTaskPanel.cs
View File

@ -14,8 +14,8 @@ public class UI_ReceiveTaskPanel : BasePanel
Vector3 uiPos = Vector3.zero;
RectTransformUtility.ScreenPointToWorldPointInRectangle(rPanel, pos, null, out uiPos);
rPanel.position = uiPos;
rPanel.DOLocalMove(new Vector3(588, 0, 0), 1.5f);
rPanel.DOScale(new Vector3(1, 1, 1), 1.5f);
rPanel.DOLocalMove(new Vector3(588, 0, 0), 1f);
rPanel.DOScale(new Vector3(1, 1, 1), 1f);
this.triggerName = triggerName;
}
protected override void OnClick(string btnName)

14
Assets/Scripts/Project/UI/UI_Panel/TipsForPracticePanel.cs → Assets/Scripts/Project/UI/UI_Panel/UI_TipsForPracticePanel.cs
View File

@ -1,16 +1,12 @@
using UnityEngine;
public class TipsForPracticePanel : BasePanel
public class UI_TipsForPracticePanel : BasePanel
{
public void Init()
{
}
void Start()
public void Init()
{
}
public override void ShowMe()
public override void ShowMe()
{
}
@ -20,7 +16,7 @@ public void Init()
}
protected override void OnClick(string btnName)
protected override void OnClick(string btnName)
{
switch (btnName)

0
Assets/Scripts/Project/UI/UI_Panel/TipsForPracticePanel.cs.meta → Assets/Scripts/Project/UI/UI_Panel/UI_TipsForPracticePanel.cs.meta
View File