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 
# Conflicts:
#	Assets/GameRes/AlwaysRes/FontResource/Fonts & Materials/SourceHanSansCN-Medium SDF.asset
This commit is contained in:
czbdw
2024-10-27 21:02:44 +08:00
parent e48fd490cd 7380a29f60
commit cdc910fa4a
17 changed files with 5495 additions and 1266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -201,7 +201,7 @@ namespace Game.Component
{
if (this._hasAtkState == false && hasAtk)
{
AudioManager.Instance.PlaySound (this.AttackTriggerAudioSound);
AudioManager.Instance.PlaySound (this.AttackTriggerAudioSound , 0.5f);
}
this._hasAtkState = hasAtk;

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

@@ -30,7 +30,7 @@ namespace Game.FsmNode
await UniTask.Delay (100);
MapContent.Instance.Pathfinder.Scan ();
// MapContent.Instance.Pathfinder.
AudioManager.Instance.PlayBGM (BgmAudio.FightingBgm);
// AudioManager.Instance.PlayBGM (BgmAudio.FightingBgm);
}
protected override void OnExit ()

2
Assets/Scripts/Game/FsmNode/GameStart.cs
View File

@@ -18,7 +18,7 @@ namespace Game.FsmNode
{
RoomManager.Instance.LoadScenePart (RoomManager.Instance.PartIndex);
}
AudioManager.Instance.PlayBGM(BgmAudio.NormalBgm , 0.65f);
// AudioManager.Instance.PlayBGM(BgmAudio.NormalBgm , 0.65f);
GameEventDefine.ChangeGameFsm.SendMessage (GameState.FightGame , true);
UIManager.Instance.CloseLoading (null);
MapContent.Instance.ResetGame ();

79
Assets/Scripts/Views/EndAboutPanel.cs Normal file
View File

@@ -0,0 +1,79 @@
using System.Collections.Generic;
using System.StateSystem;
using Framework.Audio;
using Framework.UI;
using Game.Component;
using UnityEngine;
using UnityEngine.UI;
using IcecreamView;
using StateSystem;
using UnityEngine.Playables;
namespace Views
{
public class EndAboutPanel : IcecreamView.IC_AbstractModule
{
[SerializeField] private PlayableDirector table1;
[SerializeField] private PlayableDirector table2;
[SerializeField] private PlayableDirector table3;
[SerializeField] private GameObject table4;
[SerializeField] private Button _closeBtn;
[SerializeField] private string BGM;
private AnimatorStateUpdate _animatorStateUpdate;
public override void OnInitView ()
{
this._closeBtn.gameObject.SetActive (false);
this._closeBtn.onClick.AddListener (() =>
{
UIManager.Instance.OpenLoading (() => { GameStateManager.Instance.OpenState (GameGlobalState.GameHome); });
this.ViewConnector.CloseView ();
});
}
public override void OnOpenView (IC_ViewData parameters)
{
AudioManager.Instance.PlayBGM (BGM , 1 , 0.6f);
string key = "CompleteCount";
if (!PlayerPrefs.HasKey (key))
{
PlayerPrefs.SetInt (key , 0);
}
PlayerPrefs.SetInt (key , PlayerPrefs.GetInt (key) + 1);
this._animatorStateUpdate = Transform.FindObjectOfType<AnimatorStateUpdate> ();
table1.stopped += OnTable2;
table2.stopped += OnTable3;
table3.stopped += OnTable4;
this.table1.gameObject.SetActive (true);
}
private void OnTable4 (PlayableDirector obj)
{
this._animatorStateUpdate.state = 7;
this.table3.gameObject.SetActive (false);
this.table4.gameObject.SetActive (true);
this._closeBtn.gameObject.SetActive (true);
}
private void OnTable3 (PlayableDirector obj)
{
this._animatorStateUpdate.state = 6;
this.table2.gameObject.SetActive (false);
this.table3.gameObject.SetActive (true);
}
private void OnTable2 (PlayableDirector obj)
{
this._animatorStateUpdate.state = 5;
this.table1.gameObject.SetActive (false);
this.table2.gameObject.SetActive (true);
}
public override void OnCloseView ()
{
}
}
}

11
Assets/Scripts/Views/EndAboutPanel.cs.meta Normal file
View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 61296cf19e7935f4e914d83473387d5e
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

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

@@ -172,7 +172,11 @@ namespace Views{
{
this.ViewConnector.CloseView ();
Destroy (MapContent.Instance.ScenePart.gameObject);
MapContent.Instance.ScenePart = null;
MapContent.Instance.ScenePart = null;
RoomManager.Instance._BossSceneDirector.stopped += director =>
{
UIManager.Instance.OpenView (UIPanel.EndAboutPanel);
};
//播放结尾gc动画
RoomManager.Instance._BossSceneDirector.Play();
UIManager.Instance.OpenView (UIPanel.BossTouchPanel);

1
Assets/Scripts/Views/UIPanel.cs
View File

@@ -23,6 +23,7 @@ namespace Views
public const string SuccessPanel ="SuccessPanel";
public const string InitTipPanel ="InitTipPanel";
public const string BossTouchPanel ="BossTouchPanel";
public const string EndAboutPanel ="EndAboutPanel";
//Code end
}
}