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

updat core

Browse Source
This commit is contained in:
Foldcc_b1
2024-10-21 22:29:53 +08:00
parent 6c950bb377
commit fbbd08e0a5
40 changed files with 6519 additions and 5112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,10 +26,7 @@ namespace Game.Component
public void OnMove (Vector2 vector)
{
if (!MapContent.Instance.IsActiveGame)
{
return;
}
var t = this.transform;
// 获取前方方向的世界坐标

3
Assets/Scripts/Game/Component/ScenePart.cs
View File

@@ -15,8 +15,11 @@ namespace Game.Component
[LabelText ("当前完成数：")] private int _currentConditionNumber = 0;
public int CurrentConditionNumber => this._currentConditionNumber;
private List<EnemyEntity> _enemyEntities;
public float CurProgress => this._currentConditionNumber * 1f / completeConditionNumber;
public bool IsComplete => _currentConditionNumber >= completeConditionNumber;

4
Assets/Scripts/Game/FsmNode/GameField.cs
View File

@@ -15,9 +15,11 @@ namespace Game.FsmNode
{
CameraManager.Instance.SetCloseUpTarget (MapContent.Instance.PlayerEntity.transform , 2f);
CameraImpulseUtils.Instance.ExplosionImpulseCamera (1 , 0.5f , 0.5f , 0.5f);
CameraEffectUtils.Instance.SetAberration (1 , 0.5f);
CameraEffectUtils.Instance.SetAberration (1f , 0.5f);
CameraEffectUtils.Instance.SetGameCamBlur (0.35f , 0.5f , null);
AudioManager.Instance.PlaySoundEffect (SeAudio.OverGame_Fail);
await UniTask.Delay (2000);
this.stateMachineRunner.OpenState (GameState.StartGame);
}

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

@@ -22,6 +22,9 @@ namespace Game.FsmNode
public static string GroupName = typeof(GameFight).FullName;
protected override async void OnEnter (params object[] args)
{
UIManager.Instance.OpenView (UIPanel.GamePanel);
CameraEffectUtils.Instance.SetAberration (0f , 0.5f);
CameraEffectUtils.Instance.SetGameCamBlur (0f , 0.5f , null);
MapContent.Instance.IsActiveGame = true;
// MapContent.Instance.Pathfinder.
AudioManager.Instance.PlayBGM (BgmAudio.FightingBgm);
@@ -30,6 +33,7 @@ namespace Game.FsmNode
protected override void OnExit ()
{
UIManager.Instance.CloseView (UIPanel.GamePanel);
MapContent.Instance.IsActiveGame = false;
// MapContent.Instance.Pathfinder.PausePathfinding ();
}

2
Assets/Scripts/System/CommonUI/ScreenEffectPanel/CommonScreenEffectPanel.cs
View File

@@ -60,7 +60,7 @@ namespace Views
var particle = this._pool.Create ();
particle.rectTransform.anchoredPosition = localPos;
particle.Play ();
GameUpdateMgr.Instance.CreateTimer (0.5f , () => { this._pool.Destroy (particle); });
GameUpdateMgr.Instance.CreateTimer (1.5f , () => { this._pool.Destroy (particle); });
}
// [BindUIEvent(GameEventCode.OnScreenFlicker)]

2
Assets/Scripts/System/RenderFeature/Art/GaussBlur/Global_GaussBlurEffect.mat
View File

@@ -46,7 +46,7 @@ Material:
m_Ints: []
m_Floats:
- Vector1_c9f2135c9d254951b22c018d295f8558: 0.003
- _blurOffset: 0.017
- _blurOffset: 1
m_Colors: []
m_BuildTextureStacks: []
--- !u!114 &268278646524644520

25
Assets/Scripts/System/StateSystem/State/StateHome.cs
View File

@@ -23,17 +23,18 @@ namespace StateSystem.State
AudioManager.Instance.PlayBGM (BgmAudio.LobbyBgm);
GameUpdateMgr.Instance.AddUpdater (DoUpdate);
var activeScene = SceneManager.GetActiveScene ();
if (activeScene.name != SceneName.MainScene.ToString ())
{
Debug.Log ("进入Home，开始加载场景：" + SceneName.MainScene.ToString ());
this._loader = new SceneLoader (SceneName.MainScene);
this._loader.BeginLoad (OnLoading, OnActived);
}
else
{
OnActived ();
}
// var activeScene = SceneManager.GetActiveScene ();
// if (activeScene.name != SceneName.MainScene.ToString ())
// {
// Debug.Log ("进入Home，开始加载场景：" + SceneName.MainScene.ToString ());
// this._loader = new SceneLoader (SceneName.MainScene);
// this._loader.BeginLoad (OnLoading, OnActived);
// }
// else
// {
// OnActived ();
// }
OnActived ();
}
private void OnLoading (float obj)
@@ -57,7 +58,7 @@ namespace StateSystem.State
protected override void OnExit ()
{
GameUpdateMgr.Instance.RemoveUpdater (DoUpdate);
this._loader.Kill ();
// this._loader.Kill ();
}
private void DoUpdate ()

15
Assets/Scripts/System/StateSystem/State/StateInit.cs
View File

@@ -17,6 +17,7 @@ using Framework.Timer;
using Framework.UI;
using Framework.Utils;
using Framework.Utils.Extend;
using Game;
using Runtime.ADAggregator;
using StateSystem.Loader;
using TMPro;
@@ -33,7 +34,8 @@ namespace StateSystem.State
{
public class StateInit : StateMachine<GameGlobalState>
{
private SceneLoader _sceneLoader;
public static bool HasTempGame;
private SceneLoader _sceneLoader;
protected override void OnEnter (params object[] args)
{
CameraEffectUtils.Instance.SetGameCamBlur(0, 0, null);
@@ -55,10 +57,12 @@ namespace StateSystem.State
{
this._sceneLoader = new SceneLoader (SceneName.InitScene, true);
this._sceneLoader.BeginLoad (null, ManagerInit);
HasTempGame = false;
}
else
{
ManagerInit ();
HasTempGame = true;
}
}
@@ -139,7 +143,14 @@ namespace StateSystem.State
GameUpdateMgr.Instance.CreateTimer (1f , () =>
{
BeginStaticPanel.ReleasePanel ();
this.stateMachineRunner.OpenState (GameGlobalState.GameRoom);
if (HasTempGame)
{
this.stateMachineRunner.OpenState (GameGlobalState.GameRoom);
}
else
{
this.stateMachineRunner.OpenState (GameGlobalState.GameHome);
}
});
}
}

80
Assets/Scripts/Views/GamePanel.cs Normal file
View File

@@ -0,0 +1,80 @@
using System;
using System.Collections.Generic;
using Coffee.UIEffects;
using Framework.Timer;
using Framework.Utils.UITools;
using Game;
using Game.Component;
using Game.EventDefine;
using UnityEngine;
using UnityEngine.UI;
using IcecreamView;
using UniFramework.Event;
namespace Views
{
public class GamePanel : IcecreamView.IC_AbstractModule
{
[SerializeField] private ETCJoystick _joystick;
[SerializeField] private UIEffect _redPoint;
[SerializeField] private UIEffect _greenPoint;
[SerializeField] private UIEffect _bluePoint;
[SerializeField] private Image _slider;
[SerializeField] private TextNumber _textNumber;
public override void OnInitView ()
{
this._textNumber.TextAfterHandler = (value) => $"{value}/{MapContent.Instance.ScenePart.completeConditionNumber}";
this._joystick.onMove.AddListener (OnMovePlayer);
this._joystick.onMoveEnd.AddListener (OnEndMovePlayer);
}
private void OnEndMovePlayer ()
{
MapContent.Instance.PlayerEntity.OnMoveEnd ();
}
private void OnMovePlayer (Vector2 arg)
{
if (!MapContent.Instance.IsActiveGame)
{
return;
}
MapContent.Instance.PlayerEntity.OnMove (arg);
}
public override void OnOpenView (IC_ViewData parameters)
{
this._redPoint.effectFactor = RoomManager.Instance.PartIndex >= 1 ? 0 : 0.8f;
this._greenPoint.effectFactor = RoomManager.Instance.PartIndex >= 2 ? 0 : 0.8f;
this._bluePoint.effectFactor = RoomManager.Instance.PartIndex >= 3 ? 0 : 0.8f;
UniEvent.AddListener<GameEventDefine.OverlyCoin> (OnChangeCoin);
UniEvent.AddListener<GlobalEventDefine.RefreshView> (OnChangeCoin);
OnChangeCoin (null);
// GameUpdateMgr.Instance.AddUpdater (DoUpdate);
}
public override void OnCloseView ()
{
// GameUpdateMgr.Instance.RemoveUpdater (DoUpdate);
UniEvent.RemoveListener<GameEventDefine.OverlyCoin> ( OnChangeCoin);
UniEvent.RemoveListener<GlobalEventDefine.RefreshView> ( OnChangeCoin);
}
private void DoUpdate ()
{
this._slider.fillAmount = MapContent.Instance.ScenePart.CurProgress;
this._textNumber.Number = MapContent.Instance.ScenePart.CurrentConditionNumber;
}
private void OnChangeCoin (IEventMessage eventMessage)
{
// var message = eventMessage as GameEventDefine.OverlyCoin;
this._slider.fillAmount = MapContent.Instance.ScenePart.CurProgress;
this._textNumber.Number = MapContent.Instance.ScenePart.CurrentConditionNumber;
}
}
}

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

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

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

@@ -15,8 +15,7 @@ namespace Views{
public Button _settingGame;
public Button _aboutGame;
public Button _achiveGame;
public Button _changlleGame;
public override void OnOpenView(IC_ViewData parameters)
{
@@ -33,8 +32,8 @@ namespace Views{
this._toGame.onClick.AddListener (OnClickToGame , SeAudio.Btn_Click);
this._aboutGame.onClick.AddListener(OnClickAboutGame , SeAudio.Btn_Click);
this._settingGame.onClick.AddListener(OnClickSettingGame , SeAudio.Btn_Click);
this._achiveGame.onClick.AddListener(OnClickAchiveGame , SeAudio.Btn_Click);
this._changlleGame.onClick.AddListener(OnClickChanglleGame , SeAudio.Btn_Click);
// this._achiveGame.onClick.AddListener(OnClickAchiveGame , SeAudio.Btn_Click);
// this._changlleGame.onClick.AddListener(OnClickChanglleGame , SeAudio.Btn_Click);
}
private void OnClickChanglleGame()

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

@@ -19,6 +19,7 @@ namespace Views
public const string GameRevertPanel ="GameRevertPanel";
public const string SelectWeaponPanel ="SelectWeaponPanel";
public const string AboutPanel ="AboutPanel";
public const string GamePanel ="GamePanel";
//Code end
}
}