diff --git a/Assets/GameRes/AutoSource/Part/Part1.prefab b/Assets/GameRes/AutoSource/Part/Part1.prefab index 0ca2e95..f5f099a 100644 --- a/Assets/GameRes/AutoSource/Part/Part1.prefab +++ b/Assets/GameRes/AutoSource/Part/Part1.prefab @@ -2007,7 +2007,7 @@ MonoBehaviour: m_EditorClassIdentifier: cameraCollider: {fileID: 4977006423313078515} createPos: {fileID: 25658124931772993} - completeConditionNumber: 9 + completeConditionNumber: 1 playerBaseSpeed: 2 successProp: {fileID: 2048375561032638617} --- !u!1 &8878032678881439204 diff --git a/Assets/Scripts/Game/FsmNode/GameStart.cs b/Assets/Scripts/Game/FsmNode/GameStart.cs index 670fb9b..215d7f7 100644 --- a/Assets/Scripts/Game/FsmNode/GameStart.cs +++ b/Assets/Scripts/Game/FsmNode/GameStart.cs @@ -13,6 +13,10 @@ namespace Game.FsmNode { protected override async void OnEnter (params object[] args) { + if (MapContent.Instance.ScenePart == null) + { + RoomManager.Instance.LoadScenePart (RoomManager.Instance.PartIndex); + } AudioManager.Instance.PlayBGM(BgmAudio.NormalBgm , 0.65f); GameEventDefine.ChangeGameFsm.SendMessage (GameState.FightGame , true); UIManager.Instance.CloseLoading (null); diff --git a/Assets/Scripts/Game/RoomManager.cs b/Assets/Scripts/Game/RoomManager.cs index 9053f49..7a1512a 100644 --- a/Assets/Scripts/Game/RoomManager.cs +++ b/Assets/Scripts/Game/RoomManager.cs @@ -54,10 +54,6 @@ namespace Game this._gameFsm.Active (GameState.InitGame , args); GameUpdateMgr.Instance.AddUpdater (DoUpdate); this.BindEvent (); - if (MapContent.Instance.ScenePart == null) - { - LoadScenePart (this.PartIndex); - } this._gameFsm.OpenState (GameState.StartGame); } diff --git a/Assets/Scripts/System/RenderFeature/Art/GaussBlur/Global_GaussBlurEffect.mat b/Assets/Scripts/System/RenderFeature/Art/GaussBlur/Global_GaussBlurEffect.mat index ac7a793..63037a8 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.047 + - _blurOffset: 0.35 m_Colors: [] m_BuildTextureStacks: [] --- !u!114 &268278646524644520 diff --git a/Assets/Scripts/Views/SuccessPanel.cs b/Assets/Scripts/Views/SuccessPanel.cs index 9e72eda..5d5fd6d 100644 --- a/Assets/Scripts/Views/SuccessPanel.cs +++ b/Assets/Scripts/Views/SuccessPanel.cs @@ -71,6 +71,8 @@ namespace Views{ this.ViewConnector.CloseView (); if (RoomManager.Instance.PartIndex < 3) { + Destroy (MapContent.Instance.ScenePart.gameObject); + MapContent.Instance.ScenePart = null; RoomManager.Instance.PartIndex++; GameEventDefine.ChangeGameFsm.SendMessage (GameState.StartGame); }