diff --git a/Assets/GameRes/View/LoadingPanel.prefab b/Assets/GameRes/View/LoadingPanel.prefab index 39c67ae..5a84b2d 100644 --- a/Assets/GameRes/View/LoadingPanel.prefab +++ b/Assets/GameRes/View/LoadingPanel.prefab @@ -345,7 +345,7 @@ MonoBehaviour: Volume: 1 Delay: 0 _closeAudioData: - AudioName: 20 + AudioName: 0 IsLoop: 0 Volume: 1 Delay: 0 diff --git a/Assets/Resources/BeginStaticPanel.prefab b/Assets/Resources/BeginStaticPanel.prefab index 9eff901..fa87822 100644 --- a/Assets/Resources/BeginStaticPanel.prefab +++ b/Assets/Resources/BeginStaticPanel.prefab @@ -1565,6 +1565,7 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 7624515150984311592} - {fileID: 3177260320638737076} - {fileID: 2374024862025964088} - {fileID: 3705581280124726578} @@ -1874,6 +1875,81 @@ MonoBehaviour: IsAutoStartValue: 0 StartValue: {x: 0, y: 0, z: 0} EndValue: {x: 0, y: 0, z: -360} +--- !u!1 &6053135807112921453 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7624515150984311592} + - component: {fileID: 8910969604858088213} + - component: {fileID: 4126484886284211607} + m_Layer: 5 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7624515150984311592 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6053135807112921453} + 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: 4838644678723712850} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8910969604858088213 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6053135807112921453} + m_CullTransparentMesh: 1 +--- !u!114 &4126484886284211607 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6053135807112921453} + 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: 0, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 1 + 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 &6743320458867731797 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Game/Component/EnemyEntity.cs b/Assets/Scripts/Game/Component/EnemyEntity.cs index bbdd14a..1f29aa4 100644 --- a/Assets/Scripts/Game/Component/EnemyEntity.cs +++ b/Assets/Scripts/Game/Component/EnemyEntity.cs @@ -166,7 +166,7 @@ namespace Game.Component #if UNITY_EDITOR public bool HasRunaway => MapContent.Instance?.IsRunaway ?? false; - public float CurMoveSpeed => (MapContent.Instance?.MoveGlobalOffset ?? 0) * this._curMoveSpeedOffset * (this.MaxMoveSpeed * + public float CurMoveSpeed => (MapContent.Instance?.EnemyMoveGlobalOffset ?? 0) * this._curMoveSpeedOffset * (this.MaxMoveSpeed * (1 + ( this._expTimeHandler?.IsPlaying ?? false ? (1 - this._expTimeHandler.CurProgress) * this._expSpeedOffset @@ -176,7 +176,7 @@ namespace Game.Component #else public bool HasRunaway => MapContent.Instance?.IsRunaway ?? false; - public float CurMoveSpeed => (MapContent.Instance.MoveGlobalOffset) * this._curMoveSpeedOffset * (this.MaxMoveSpeed * + public float CurMoveSpeed => (MapContent.Instance.EnemyMoveGlobalOffset) * this._curMoveSpeedOffset * (this.MaxMoveSpeed * (1 + ( this._expTimeHandler?.IsPlaying ?? false ? (1 - this._expTimeHandler.CurProgress) * this._expSpeedOffset diff --git a/Assets/Scripts/Game/Component/EnemyFSM_AI/Sleep.cs b/Assets/Scripts/Game/Component/EnemyFSM_AI/Sleep.cs index 46193b9..9d5a099 100644 --- a/Assets/Scripts/Game/Component/EnemyFSM_AI/Sleep.cs +++ b/Assets/Scripts/Game/Component/EnemyFSM_AI/Sleep.cs @@ -1,13 +1,21 @@ -using XFFSM; +using UnityEngine; +using XFFSM; namespace Game.Component.EnemyFSM_AI { public class Sleep : EnemyFSMState { + public override void OnExit () + { + this.Entity.GetComponent ().enabled = true; + } + public override void OnEnter () { + // this.Entity. this.Entity.AnimState.SetState (EnemyAnimStateType.Idle); SetAiTarget (this.Entity.CreatePos); + this.Entity.GetComponent ().enabled = false; //此处可设置角色动画为沉睡状态 } } diff --git a/Assets/Scripts/Game/Component/MapContent.cs b/Assets/Scripts/Game/Component/MapContent.cs index 0aeaedc..6e5ff84 100644 --- a/Assets/Scripts/Game/Component/MapContent.cs +++ b/Assets/Scripts/Game/Component/MapContent.cs @@ -3,6 +3,7 @@ using Framework.Audio; using Framework.Timer; using Game.EventDefine; using UniFramework.Event; +using Unity.Mathematics; using UnityEngine; namespace Game.Component @@ -17,11 +18,14 @@ namespace Game.Component public bool IsActiveGame; private float _moveGlobalOffset = 1; + + private float _expGlobalOffset = 0; //玩家位置 - public Vector2 PlayerPosition { private set; get; } - public bool IsRunaway { get ; private set ; } - public float MoveGlobalOffset => this._moveGlobalOffset; + public Vector2 PlayerPosition { private set; get; } + public bool IsRunaway { get ; private set ; } + public float MoveGlobalOffset => this._moveGlobalOffset; + public float EnemyMoveGlobalOffset => math.clamp (this._moveGlobalOffset - this._expGlobalOffset , 0 , 1f); public bool IsPause { @@ -81,6 +85,7 @@ namespace Game.Component public void ResetGame () { + this._expGlobalOffset = Mathf.Clamp (this.ScenePart.LossCount * 0.025f , 0 , 0.25f); this.PlayerEntity.gameObject.SetActive (false); this.IsPause = false; this._RunawayTimeHandler?.Kill (); diff --git a/Assets/Scripts/Game/Component/ScenePart.cs b/Assets/Scripts/Game/Component/ScenePart.cs index 1645d15..346b894 100644 --- a/Assets/Scripts/Game/Component/ScenePart.cs +++ b/Assets/Scripts/Game/Component/ScenePart.cs @@ -20,6 +20,8 @@ namespace Game.Component [LabelText ("当前完成数：")] private int _currentConditionNumber = 0; + public int LossCount; + public int CurrentConditionNumber => this._currentConditionNumber; private List _enemyEntities; diff --git a/Assets/Scripts/Game/FsmNode/GameField.cs b/Assets/Scripts/Game/FsmNode/GameField.cs index 95cb6d1..23aced9 100644 --- a/Assets/Scripts/Game/FsmNode/GameField.cs +++ b/Assets/Scripts/Game/FsmNode/GameField.cs @@ -19,9 +19,10 @@ namespace Game.FsmNode CameraEffectUtils.Instance.SetAberration (1f , 0.5f); CameraEffectUtils.Instance.SetGameCamBlur (0.35f , 0.5f , null); AudioManager.Instance.PlaySoundEffect (SeAudio.OverGame_Fail); + GameManager.Instance.Vibrator (VibratorScale.Normal); GameEventDefine.GlobalRunaway.SendMessage (10); await UniTask.Delay (3000); - + MapContent.Instance.ScenePart.LossCount ++; this.stateMachineRunner.OpenState (GameState.StartGame); } diff --git a/Assets/Scripts/Game/FsmNode/GameStart.cs b/Assets/Scripts/Game/FsmNode/GameStart.cs index ea89828..b92ea89 100644 --- a/Assets/Scripts/Game/FsmNode/GameStart.cs +++ b/Assets/Scripts/Game/FsmNode/GameStart.cs @@ -18,11 +18,11 @@ namespace Game.FsmNode { RoomManager.Instance.LoadScenePart (RoomManager.Instance.PartIndex); } - // AudioManager.Instance.PlayBGM(BgmAudio.NormalBgm , 0.65f); - GameEventDefine.ChangeGameFsm.SendMessage (GameState.FightGame , true); UIManager.Instance.CloseLoading (null); MapContent.Instance.ResetGame (); + // AudioManager.Instance.PlayBGM(BgmAudio.NormalBgm , 0.65f); CameraManager.Instance.SetCameraState (CameraManager.CameraState.Player_Near); + GameEventDefine.ChangeGameFsm.SendMessage (GameState.FightGame , true); } protected override void OnExit () diff --git a/Assets/Scripts/System/RenderFeature/Art/GaussBlur/Global_GaussBlurEffect.mat b/Assets/Scripts/System/RenderFeature/Art/GaussBlur/Global_GaussBlurEffect.mat index 77f0979..34ba159 100644 --- a/Assets/Scripts/System/RenderFeature/Art/GaussBlur/Global_GaussBlurEffect.mat +++ b/Assets/Scripts/System/RenderFeature/Art/GaussBlur/Global_GaussBlurEffect.mat @@ -46,7 +46,7 @@ Material: m_Ints: [] m_Floats: - Vector1_c9f2135c9d254951b22c018d295f8558: 0.003 - - _blurOffset: 0.022401923 + - _blurOffset: 0.0076103834 m_Colors: [] m_BuildTextureStacks: [] --- !u!114 &268278646524644520 diff --git a/Assets/Scripts/System/StateSystem/State/StateInit.cs b/Assets/Scripts/System/StateSystem/State/StateInit.cs index 52e0d61..326a235 100644 --- a/Assets/Scripts/System/StateSystem/State/StateInit.cs +++ b/Assets/Scripts/System/StateSystem/State/StateInit.cs @@ -144,7 +144,6 @@ namespace StateSystem.State { CameraEffectUtils.Instance.SetAberration (0f , 0f); CameraEffectUtils.Instance.SetGameCamBlur (0f , 0f , null); - BeginStaticPanel.ReleasePanel (); if (HasTempGame) { this.stateMachineRunner.OpenState (GameGlobalState.GameRoom); @@ -153,6 +152,7 @@ namespace StateSystem.State { UIManager.Instance.OpenView (UIPanel.InitTipPanel); } + BeginStaticPanel.ReleasePanel (); }); } } diff --git a/Assets/Scripts/Views/BossTouchPanel.cs b/Assets/Scripts/Views/BossTouchPanel.cs index 0c2112c..7064825 100644 --- a/Assets/Scripts/Views/BossTouchPanel.cs +++ b/Assets/Scripts/Views/BossTouchPanel.cs @@ -34,10 +34,10 @@ namespace Views this._time = 1; } #if !UNITY_EDITOR - VibratorImp.Instance.Vibrator_Normal (0.2f , (int)(math.clamp (this._time , 0 , 1) * 50)); + VibratorImp.Instance.Vibrator_Normal (0.35f , (int)(math.clamp (this._time , 0 , 1) * 300)); #endif // GameManager.Instance.Vibrator (VibratorScale.Small); - CameraImpulseUtils.Instance.UniformImpulseCamera (0.5f , math.clamp (this._time , 0 , 2)); + CameraImpulseUtils.Instance.UniformImpulseCamera (0.5f , math.clamp (this._time , 0 , 5)); } private void DoUpdate () diff --git a/Assets/Scripts/Views/EndAboutPanel.cs b/Assets/Scripts/Views/EndAboutPanel.cs index 5097b93..6c3090a 100644 --- a/Assets/Scripts/Views/EndAboutPanel.cs +++ b/Assets/Scripts/Views/EndAboutPanel.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.StateSystem; +using Cysharp.Threading.Tasks; using Framework.Audio; using Framework.UI; using Game; @@ -51,11 +52,12 @@ namespace Views this.table1.gameObject.SetActive (true); } - private void OnTable4 (PlayableDirector obj) + private async void OnTable4 (PlayableDirector obj) { this._animatorStateUpdate.state = 7; this.table3.gameObject.SetActive (false); this.table4.gameObject.SetActive (true); + await UniTask.Delay (5000); this._closeBtn.gameObject.SetActive (true); } diff --git a/Assets/Scripts/Views/HomePanel.cs b/Assets/Scripts/Views/HomePanel.cs index ae9def6..74e7380 100644 --- a/Assets/Scripts/Views/HomePanel.cs +++ b/Assets/Scripts/Views/HomePanel.cs @@ -31,15 +31,17 @@ namespace Views{ _toGame.gameObject.SetActive (false); string key = "CompleteCount"; await UniTask.Delay (1000); - if (!PlayerPrefs.HasKey ("toApp") && PlayerPrefs.GetInt (key , 0) > 0) + // !PlayerPrefs.HasKey ("toApp") && + if ( PlayerPrefs.GetInt (key , 0) > 0) { //提醒玩家评论 - UIManager.Instance.OpenTip ("本项目由" + "Taptap聚光灯挑战赛@2024".ToColorString (new Color (1f, 0.38f, 0f)) + "活动在规定的21天时间完成制作\n你的评价将是对我们最大的支持！点击确认查看游戏详情页!" , + UIManager.Instance.OpenTip ("本项目由" + "Taptap聚光灯GameJam@2024".ToColorString (new Color (1f, 0.38f, 0f)) + "活动在规定的21天时间完成制作\n你的评价将是对我们最大的支持！点击确认查看游戏详情页!" , () => { PlayerPrefs.SetInt ("toApp" , 1); - LaunchAppUtils.ToTapTapTargetApp(GameGlobalConfig.Instance.TapUrl); + LaunchAppUtils.ToTapTapTargetApp(GameGlobalConfig.Instance.TapAppUrl); } , () => { }); + LaunchAppUtils.CheckTargetApp ("taptap.com"); } this._playableDirector = parameters.GetValue(); MapContent.Instance.Pathfinder.Scan (); diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index bd00a59..36c6cf5 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -141,7 +141,7 @@ PlayerSettings: vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 - bundleVersion: 1.1.0 + bundleVersion: 1.3.0 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -170,7 +170,7 @@ PlayerSettings: iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 1 - AndroidBundleVersionCode: 15 + AndroidBundleVersionCode: 29 AndroidMinSdkVersion: 24 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1