Prg_ZhangXuheng
/
NLDClient-yudde
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【UI】修复部分UI界面bug

main
chenyuqi 2024-09-03 13:17:55 +08:00
parent 36207d00f9
commit e419b10ce7
8 changed files with 114 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
ProjectNLD/Assets/Art/UI/Prefab/Story/UIStoryMain.prefab
View File

@ -2843,7 +2843,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 0}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@ -3969,6 +3969,7 @@ RectTransform:
m_Children:
- {fileID: 2737917791409061819}
- {fileID: 7567742953821114588}
- {fileID: 1164071276603789087}
- {fileID: 2227089383197208577}
- {fileID: 5957424364326929371}
- {fileID: 3818147698297716530}
@ -6225,6 +6226,81 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &7164780515932698737
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1164071276603789087}
- component: {fileID: 541924144394416338}
- component: {fileID: 8446542454156546195}
m_Layer: 5
m_Name: Image_Auto
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1164071276603789087
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7164780515932698737}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8616551682924160344}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 593.65497, y: -21.200073}
m_SizeDelta: {x: 90, y: 90}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &541924144394416338
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7164780515932698737}
m_CullTransparentMesh: 1
--- !u!114 &8446542454156546195
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7164780515932698737}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 2f9244a73806d9240af3020a1a12508e, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &7175404962917490470
GameObject:
m_ObjectHideFlags: 0
@ -8609,7 +8685,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Color: {r: 1, g: 1, b: 1, a: 0}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1

5
ProjectNLD/Assets/Code/Scripts/Framework/Audio/AudioCriManager.cs
View File

@ -539,6 +539,10 @@ public class AudioCriManager: Singlenton<AudioCriManager>, IStart, IInitable, IU
audio.SetPosObj(posObj);
audio.SetIsSpeak(false);
audio.SetIsLoop(false);
if (posObj)
{
audio.SetIs3D(true);
}
audio.Play(path, key);
return audio.audioID;
@ -557,6 +561,7 @@ public class AudioCriManager: Singlenton<AudioCriManager>, IStart, IInitable, IU
audio.SetPos(pos);
audio.SetIsLoop(false);
audio.SetIsSpeak(false);
audio.SetIs3D(true);
audio.Play(path, key);
return audio.audioID;
}

2
ProjectNLD/Assets/Code/Scripts/Gameplay/Level/Level.Speed.cs
View File

@ -25,7 +25,7 @@ namespace Gameplay.Level
{
PauseManager.instance.globalScale = _isPause ? 0 : _speed;
}
EventManager.Instance.Send(EventManager.EventName.LevelFightUIPauseChange);
}
public void SetSpeed(float speed)

13
ProjectNLD/Assets/Code/Scripts/Gameplay/UI/LevelFight/FightReady/UIFightClockController.cs
View File

@ -362,11 +362,12 @@ public class UIFightClockController : UIWindow{
private void OnListenToPauseChange()
{
if (LevelManager.Instance.CurrentLevel.IsPause())
{
LevelManager.Instance.CurrentLevel.SetPause(false);
OnResume();
}
OnResume();
// if (LevelManager.Instance.CurrentLevel.IsPause())
// {
// LevelManager.Instance.CurrentLevel.SetPause(false);
// OnResume();
// }
}
/**************** 点击事件 *****************/
@ -404,7 +405,7 @@ public class UIFightClockController : UIWindow{
void OnResume()
{
Image_RotateRotating.transform.DOPlay();
//Image_RotateRotating.transform.DOPlay();
RefreshFightStateUI();
RefreshSpeed();
}

4
ProjectNLD/Assets/Code/Scripts/Gameplay/UI/LevelFight/FightReady/UIPauseController.cs
View File

@ -100,8 +100,8 @@ public class UIPauseController : UIWindow
{
//UIManager.Instance.CloseWindow(UINameConst.UIPause);
CloseWindow();
//LevelManager.Instance.CurrentLevel.SetPause(false);
EventManager.Instance.Send(EventManager.EventName.LevelFightUIPauseChange);
LevelManager.Instance.CurrentLevel.SetPause(false);
//EventManager.Instance.Send(EventManager.EventName.LevelFightUIPauseChange);
}
private void Refresh()

2
ProjectNLD/Assets/Code/Scripts/Gameplay/UI/LevelFight/UI_StartBtn_CMSBtnController.cs
View File

@ -198,7 +198,7 @@ public class UI_StartBtn_CMSBtnController : UIWindow{
async void OnClickStart()
{
SetStartBtnState(false);
LevelManager.Instance.PlayBGM();
//LevelManager.Instance.PlayBGM();
EventManager.Instance.Send(EventManager.EventName.UIPreLevelBattleBegin);
await ShowTransitionMgr.Instance.ShowLevelTransition(UI_LevelTransitionController.OpenType.Start);
AreaManager.instance.readyAreaManager.HideReadyArea();

21
ProjectNLD/Assets/Code/Scripts/Gameplay/UI/Story/UIStoryMainController.cs
View File

@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using Cysharp.Threading.Tasks;
using DG.Tweening;
using Framework;
using Gameplay;
using Gameplay.Guide;
@ -47,6 +48,7 @@ public class UIStoryMainController : UIWindow
public Button Button_Hide;
public Button Button_Screen;
public Button Button_Auto;
public Image Image_Auto;
public TMP_Text Text_Auto;
public Button Button_ExitAuto;
public TMP_Text Text_ExitAuto;
@ -319,7 +321,9 @@ public class UIStoryMainController : UIWindow
{
EventManager.Instance.Send(EventManager.EventName.SOTRY_STOP_AUTO_PLAY);
}
_PlayAutoAnim();
//剧情自动逻辑
//...
}
@ -436,7 +440,20 @@ public class UIStoryMainController : UIWindow
{
ScreenCapture.CaptureScreenshot("C:/Users/13570/Desktop/GameScreenShot.png");
}
private void _PlayAutoAnim()
{
if (_isAuto)
{
var tw = Image_Auto.transform.DOLocalRotate(Vector3.back * 360, 2, RotateMode.FastBeyond360)
.SetEase(Ease.Linear).SetLoops(-1, LoopType.Restart).SetId("Auto");
}
else
{
DOTween.Kill("Auto");
Image_Auto.transform.localRotation = new Quaternion(0, 0, 0, 0);
}
}
//监听消息
private void OnOpenChoice(EDOpenChoiceData data)
{

1
ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UIBinder/UIStoryMainBinder.cs
View File

@ -33,6 +33,7 @@ public class UIStoryMainBinder
window.Button_Hide = window.GetComponent<Button>("Button_Hide");
window.Button_Screen = window.GetComponent<Button>("UI_TopButton/Button_Screen");
window.Button_Auto = window.GetComponent<Button>("UI_TopButton/Button_Auto");
window.Image_Auto = window.GetComponent<Image>("UI_TopButton/Image_Auto");
window.Text_Auto = window.GetComponent<TMP_Text>("UI_TopButton/Button_Auto/Text_Auto");
window.Button_ExitAuto = window.GetComponent<Button>("UI_TopButton/Button_ExitAuto");
window.Text_ExitAuto = window.GetComponent<TMP_Text>("UI_TopButton/Button_ExitAuto/Text_ExitAuto");