diff --git a/Assets/GameRes/AutoSource/Part/Part1.prefab b/Assets/GameRes/AutoSource/Part/Part1.prefab index ff4a05f..f5f099a 100644 --- a/Assets/GameRes/AutoSource/Part/Part1.prefab +++ b/Assets/GameRes/AutoSource/Part/Part1.prefab @@ -826,7 +826,7 @@ Transform: m_GameObject: {fileID: 2951899695186880099} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -4.47, y: 44.02, z: 0} + m_LocalPosition: {x: -2.362, y: 43.92, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2008,7 +2008,7 @@ MonoBehaviour: cameraCollider: {fileID: 4977006423313078515} createPos: {fileID: 25658124931772993} completeConditionNumber: 1 - playerBaseSpeed: 2.9 + playerBaseSpeed: 2 successProp: {fileID: 2048375561032638617} --- !u!1 &8878032678881439204 GameObject: @@ -3715,10 +3715,6 @@ PrefabInstance: propertyPath: m_Color.r value: 0 objectReference: {fileID: 0} - - target: {fileID: 6918498963853055623, guid: 65c92eb5afe54f20abc569cb82f507b7, type: 3} - propertyPath: m_SortingOrder - value: 11 - objectReference: {fileID: 0} - target: {fileID: 7523679845810402602, guid: 65c92eb5afe54f20abc569cb82f507b7, type: 3} propertyPath: m_Color.b value: 0 @@ -3819,157 +3815,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 6918498963853055623, guid: 65c92eb5afe54f20abc569cb82f507b7, type: 3} + m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 7310060415403639619, guid: 65c92eb5afe54f20abc569cb82f507b7, type: 3} - insertIndex: -1 - addedObject: {fileID: 5540411766152576529} - - targetCorrespondingSourceObject: {fileID: 3981866187634506580, guid: 65c92eb5afe54f20abc569cb82f507b7, type: 3} - insertIndex: -1 - addedObject: {fileID: 3534968788442820525} - - targetCorrespondingSourceObject: {fileID: 4784902606493260154, guid: 65c92eb5afe54f20abc569cb82f507b7, type: 3} - insertIndex: -1 - addedObject: {fileID: 6541212071114616192} - - targetCorrespondingSourceObject: {fileID: 5910598527768651636, guid: 65c92eb5afe54f20abc569cb82f507b7, type: 3} - insertIndex: -1 - addedObject: {fileID: 7212031491064291710} - - targetCorrespondingSourceObject: {fileID: 3205553538883407879, guid: 65c92eb5afe54f20abc569cb82f507b7, type: 3} - insertIndex: -1 - addedObject: {fileID: 4077323497537337720} - - targetCorrespondingSourceObject: {fileID: 3088183948843404524, guid: 65c92eb5afe54f20abc569cb82f507b7, type: 3} - insertIndex: -1 - addedObject: {fileID: 8968152187608196536} - - targetCorrespondingSourceObject: {fileID: 5836794687166550091, guid: 65c92eb5afe54f20abc569cb82f507b7, type: 3} - insertIndex: -1 - addedObject: {fileID: 1509811937129163912} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 65c92eb5afe54f20abc569cb82f507b7, type: 3} ---- !u!1 &12552559290920817 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3088183948843404524, guid: 65c92eb5afe54f20abc569cb82f507b7, type: 3} - m_PrefabInstance: {fileID: 3096214354061779869} - m_PrefabAsset: {fileID: 0} ---- !u!210 &8968152187608196536 -SortingGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 12552559290920817} - m_Enabled: 1 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 5 - m_SortAtRoot: 0 ---- !u!1 &471645929304568730 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3205553538883407879, guid: 65c92eb5afe54f20abc569cb82f507b7, type: 3} - m_PrefabInstance: {fileID: 3096214354061779869} - m_PrefabAsset: {fileID: 0} ---- !u!210 &4077323497537337720 -SortingGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 471645929304568730} - m_Enabled: 1 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 5 - m_SortAtRoot: 0 ---- !u!1 &2140785146595809481 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3981866187634506580, guid: 65c92eb5afe54f20abc569cb82f507b7, type: 3} - m_PrefabInstance: {fileID: 3096214354061779869} - m_PrefabAsset: {fileID: 0} ---- !u!210 &3534968788442820525 -SortingGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2140785146595809481} - m_Enabled: 1 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 5 - m_SortAtRoot: 0 ---- !u!1 &5730122145474158814 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7310060415403639619, guid: 65c92eb5afe54f20abc569cb82f507b7, type: 3} - m_PrefabInstance: {fileID: 3096214354061779869} - m_PrefabAsset: {fileID: 0} ---- !u!210 &5540411766152576529 -SortingGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5730122145474158814} - m_Enabled: 1 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 15 - m_SortAtRoot: 0 --- !u!4 &5764957274559610609 stripped Transform: m_CorrespondingSourceObject: {fileID: 8860489855637691756, guid: 65c92eb5afe54f20abc569cb82f507b7, type: 3} m_PrefabInstance: {fileID: 3096214354061779869} m_PrefabAsset: {fileID: 0} ---- !u!1 &7534686129494063847 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4784902606493260154, guid: 65c92eb5afe54f20abc569cb82f507b7, type: 3} - m_PrefabInstance: {fileID: 3096214354061779869} - m_PrefabAsset: {fileID: 0} ---- !u!210 &6541212071114616192 -SortingGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7534686129494063847} - m_Enabled: 1 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 5 - m_SortAtRoot: 0 ---- !u!1 &8714848490637329641 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 5910598527768651636, guid: 65c92eb5afe54f20abc569cb82f507b7, type: 3} - m_PrefabInstance: {fileID: 3096214354061779869} - m_PrefabAsset: {fileID: 0} ---- !u!210 &7212031491064291710 -SortingGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8714848490637329641} - m_Enabled: 1 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 5 - m_SortAtRoot: 0 ---- !u!1 &8932752813065401302 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 5836794687166550091, guid: 65c92eb5afe54f20abc569cb82f507b7, type: 3} - m_PrefabInstance: {fileID: 3096214354061779869} - m_PrefabAsset: {fileID: 0} ---- !u!210 &1509811937129163912 -SortingGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8932752813065401302} - m_Enabled: 1 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 5 - m_SortAtRoot: 0 --- !u!1001 &3521443652889329532 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Game/Component/MapContent.cs b/Assets/Scripts/Game/Component/MapContent.cs index ec174cd..1c0c715 100644 --- a/Assets/Scripts/Game/Component/MapContent.cs +++ b/Assets/Scripts/Game/Component/MapContent.cs @@ -74,19 +74,20 @@ namespace Game.Component this.ScenePart.InitPart (); // this.Pathfinder.data.SetData (this.ScenePart.mapCacheData.bytes); // this.Pathfinder.FlushGraphUpdates (); - this.Pathfinder.Scan (); CameraManager.Instance.SetBoxCollider (this.ScenePart.cameraCollider); } public void ResetGame () { + this.PlayerEntity.gameObject.SetActive (false); this.IsPause = false; this._RunawayTimeHandler?.Kill (); - this.IsRunaway = false; - this.ScenePart.RefreshInit (); + this.IsRunaway = false; this.PlayerEntity.speed = this.ScenePart.playerBaseSpeed; this.PlayerEntity.transform.position = this.ScenePart.createPos.position; + this.PlayerEntity.transform.rotation = this.ScenePart.createPos.rotation; this.PlayerEntity.gameObject.SetActive (true); + this.ScenePart.RefreshInit (); this.PlayerEntity.RefreshInit (); //播放特效 } diff --git a/Assets/Scripts/Game/FsmNode/GameFight.cs b/Assets/Scripts/Game/FsmNode/GameFight.cs index abe8249..9526cfb 100644 --- a/Assets/Scripts/Game/FsmNode/GameFight.cs +++ b/Assets/Scripts/Game/FsmNode/GameFight.cs @@ -1,5 +1,6 @@ using System; using System.Guide; +using Cysharp.Threading.Tasks; using Framework.Audio; using Framework.FSMLite; using Framework.UI; @@ -26,6 +27,8 @@ namespace Game.FsmNode CameraEffectUtils.Instance.SetAberration (0f , 0.5f); CameraEffectUtils.Instance.SetGameCamBlur (0f , 0.5f , null); MapContent.Instance.IsActiveGame = true; + await UniTask.Delay (100); + MapContent.Instance.Pathfinder.Scan (); // MapContent.Instance.Pathfinder. AudioManager.Instance.PlayBGM (BgmAudio.FightingBgm); } diff --git a/Assets/Scripts/Game/FsmNode/GameStart.cs b/Assets/Scripts/Game/FsmNode/GameStart.cs index 215d7f7..a661700 100644 --- a/Assets/Scripts/Game/FsmNode/GameStart.cs +++ b/Assets/Scripts/Game/FsmNode/GameStart.cs @@ -13,6 +13,7 @@ namespace Game.FsmNode { protected override async void OnEnter (params object[] args) { + MapContent.Instance.PlayerEntity.gameObject.SetActive (false); if (MapContent.Instance.ScenePart == null) { RoomManager.Instance.LoadScenePart (RoomManager.Instance.PartIndex);