foldcc/taptap2024_GJ_chidouren
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into master_mapDev

Browse Source
This commit is contained in:
czbdw
2024-10-27 21:22:01 +08:00
parent 6f16bfd496 5227e64327
commit 351b978a5f
8 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/GameRes/Config/Audio/AudioCode.asset
View File

@@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 47b44627e5f34323bc394721daf7d29f, type: 3} m_Script: {fileID: 11500000, guid: 47b44627e5f34323bc394721daf7d29f, type: 3}
m_Name: AudioCode m_Name: AudioCode
m_EditorClassIdentifier: m_EditorClassIdentifier:
LobbyBgm: LobbyBgm: At the beginning
FightBgm: FightBgm:
NormalBgm: NormalBgm:
SE_Btn_Click: UI/Button/Water_Bow_Buff_01 SE_Btn_Click: UI/Button/Water_Bow_Buff_01

2
Assets/GameRes/View/EndAboutPanel.prefab
View File

@@ -1421,7 +1421,7 @@ MonoBehaviour:
table3: {fileID: 3970012542898596748} table3: {fileID: 3970012542898596748}
table4: {fileID: 4059678398121849229} table4: {fileID: 4059678398121849229}
_closeBtn: {fileID: 9180588384656380933} _closeBtn: {fileID: 9180588384656380933}
BGM: BGM: In the End
--- !u!1 &4964899364994535113 --- !u!1 &4964899364994535113
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

2
Assets/Scripts/Game/Component/EnemyEntity.cs
View File

@@ -250,7 +250,7 @@ namespace Game.Component
if (this._curAttackCDTime > 0) if (this._curAttackCDTime > 0)
{ {
_curAttackCDTime -= Time.deltaTime; this._curAttackCDTime -= Time.deltaTime;
} }
AttackCheck (); AttackCheck ();

5
Assets/Scripts/Game/Component/PropEffect_PoolObject.cs
View File

@@ -20,7 +20,7 @@ namespace Game.Component
private TimeHandler _timeHandler; private TimeHandler _timeHandler;
private void OnEnable () public override void Pool_Enable ()
{ {
this._timeHandler?.Kill (); this._timeHandler?.Kill ();
if (!this.audioSetting.audioPath.IsNullOrWhitespace ()) if (!this.audioSetting.audioPath.IsNullOrWhitespace ())
@@ -28,9 +28,10 @@ namespace Game.Component
AudioManager.Instance.PlaySound (this.audioSetting.audioPath , this.audioSetting.volume); AudioManager.Instance.PlaySound (this.audioSetting.audioPath , this.audioSetting.volume);
} }
this._timeHandler = GameUpdateMgr.Instance.CreateTimer (this.duration , this.DestroyPoolObject); this._timeHandler = GameUpdateMgr.Instance.CreateTimer (this.duration , this.DestroyPoolObject);
base.Pool_Enable ();
} }
private void OnDisable () public void Pool_OnDisable ()
{ {
this._timeHandler?.Kill (); this._timeHandler?.Kill ();
} }

1
Assets/Scripts/Game/FsmNode/GameFight.cs
View File

@@ -23,6 +23,7 @@ namespace Game.FsmNode
public static string GroupName = typeof(GameFight).FullName; public static string GroupName = typeof(GameFight).FullName;
protected override async void OnEnter (params object[] args) protected override async void OnEnter (params object[] args)
{ {
UIManager.Instance.CloseView (UIPanel.GamePanel);
UIManager.Instance.OpenView (UIPanel.GamePanel); UIManager.Instance.OpenView (UIPanel.GamePanel);
CameraEffectUtils.Instance.SetAberration (0f , 0.5f); CameraEffectUtils.Instance.SetAberration (0f , 0.5f);
CameraEffectUtils.Instance.SetGameCamBlur (0f , 0.5f , null); CameraEffectUtils.Instance.SetGameCamBlur (0f , 0.5f , null);

2
Assets/Scripts/System/StateSystem/State/StateRoom.cs
View File

@@ -68,7 +68,7 @@ namespace StateSystem.State
private void PoolObjectPreload () private void PoolObjectPreload ()
{ {
GamePoolManager.Instance.LoadPoolObjects("",RoomGroup , 5); GamePoolManager.Instance.LoadPoolObjects("",RoomGroup , 0);
// GamePoolManager.Instance.LoadPoolObjects("Object/",RoomGroup , 5); // GamePoolManager.Instance.LoadPoolObjects("Object/",RoomGroup , 5);
} }

3
Assets/Scripts/Views/HomePanel.cs
View File

@@ -1,5 +1,6 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.StateSystem; using System.StateSystem;
using Framework.Audio;
using Framework.UI; using Framework.UI;
using Game; using Game;
using Game.Component; using Game.Component;
@@ -10,6 +11,7 @@ using MintAnimation.Runtime.Components.MintAnimation;
using Script.Core.Utils.Extend; using Script.Core.Utils.Extend;
using StateSystem; using StateSystem;
using UnityEngine.Playables; using UnityEngine.Playables;
using AudioType = Framework.Audio.AudioType;
namespace Views{ namespace Views{
@@ -78,6 +80,7 @@ namespace Views{
this._playableDirector.stopped += ToGaming; this._playableDirector.stopped += ToGaming;
this._playableDirector.initialTime = 0; this._playableDirector.initialTime = 0;
this._playableDirector.Play (); this._playableDirector.Play ();
AudioManager.Instance.StopPlayers (AudioType.BGM , 1f);
} }

3
Assets/Scripts/Views/SuccessPanel.cs
View File

@@ -2,6 +2,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using Coffee.UIEffects; using Coffee.UIEffects;
using Cysharp.Threading.Tasks; using Cysharp.Threading.Tasks;
using Framework.Audio;
using Framework.Timer; using Framework.Timer;
using Framework.UI; using Framework.UI;
using Game; using Game;
@@ -11,6 +12,7 @@ using UnityEngine;
using UnityEngine.UI; using UnityEngine.UI;
using IcecreamView; using IcecreamView;
using MintAnimation.Core; using MintAnimation.Core;
using AudioType = Framework.Audio.AudioType;
namespace Views{ namespace Views{
@@ -171,6 +173,7 @@ namespace Views{
private void ToBossCG () private void ToBossCG ()
{ {
this.ViewConnector.CloseView (); this.ViewConnector.CloseView ();
AudioManager.Instance.StopPlayers (AudioType.BGM , 1f);
Destroy (MapContent.Instance.ScenePart.gameObject); Destroy (MapContent.Instance.ScenePart.gameObject);
MapContent.Instance.ScenePart = null; MapContent.Instance.ScenePart = null;
RoomManager.Instance._BossSceneDirector.stopped += director => RoomManager.Instance._BossSceneDirector.stopped += director =>