| Fight/Actor/HeroBehaviour.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Fight/Actor/Skill/Skill.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Fight/Actor/State/SMB/SMB_Base.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Fight/Actor/State/SMB/STM_BaseAttack.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Fight/Actor/UserInputHandler.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Fight/Stage/Dungeon/AdventureStage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Fight/Stage/Dungeon/AdventureStage.cs.meta | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Utility/RuntimeLogUtility.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Fight/Actor/HeroBehaviour.cs
@@ -708,6 +708,7 @@ CB405_tagCMSuperAtk _b405 = null; if (!ClientDungeonStageUtility.isClientDungeon && !ClientSceneManager.Instance.IsClientFightMode && !AdventureStage.Instance.IsInAdventureStage #if UNITY_EDITOR && !RuntimeLogUtility.TEST_CLIENT_PVP #endif Fight/Actor/Skill/Skill.cs
@@ -186,6 +186,7 @@ || userSID != PlayerDatas.Instance.PlayerId || ClientDungeonStageUtility.isClientDungeon || ClientSceneManager.Instance.IsClientFightMode || AdventureStage.Instance.IsInAdventureStage #if UNITY_EDITOR || RuntimeLogUtility.TEST_CLIENT_PVP #endif Fight/Actor/State/SMB/SMB_Base.cs
@@ -93,7 +93,8 @@ { // Debug.LogFormat("{0} attack {1} ==================== 0", attacker.GetType().ToString(), target.GetType().ToString()); if (!PreFightMission.Instance.IsFinished() || ClientSceneManager.Instance.IsClientFightMode) || ClientSceneManager.Instance.IsClientFightMode || AdventureStage.Instance.IsInAdventureStage) { return; } Fight/Actor/State/SMB/STM_BaseAttack.cs
@@ -725,6 +725,7 @@ { if (!ClientDungeonStageUtility.isClientDungeon && !ClientSceneManager.Instance.IsClientFightMode && !AdventureStage.Instance.IsInAdventureStage #if UNITY_EDITOR && !RuntimeLogUtility.TEST_CLIENT_PVP #endif Fight/Actor/UserInputHandler.cs
@@ -369,7 +369,8 @@ //s_LastStatus = moveOrStop; if (!PreFightMission.Instance.IsFinished()) if (!PreFightMission.Instance.IsFinished() || AdventureStage.Instance.IsInAdventureStage) { return; } Fight/Stage/Dungeon/AdventureStage.cs
New file @@ -0,0 +1,62 @@ using System.Collections; using Snxxz.UI; using UnityEngine.SceneManagement; using UnityEngine; public class AdventureStage : Singleton<AdventureStage> { public bool IsInAdventureStage { get; private set; } private Vector3 m_CacheHeroPos; public void Enter() { IsInAdventureStage = true; m_CacheHeroPos = PlayerDatas.Instance.hero.Pos; SnxxzGame.Instance.StartCoroutine(_Enter()); } public void Exit() { IsInAdventureStage = false; SnxxzGame.Instance.StartCoroutine(_Exit()); } private IEnumerator _Enter() { WindowCenter.Instance.Open<LoadingWin>(); if (!AssetSource.sceneFromEditor) { AssetBundleUtility.Instance.Sync_LoadAll("maps/map000_xsdt"); } var _async = SceneManager.LoadSceneAsync("Map000_Xsdt", LoadSceneMode.Additive); yield return _async; var _hero = PlayerDatas.Instance.hero; if (_hero != null) { _hero.Pos = new Vector3(188.49f, 62.512f, 23.85f); } CameraController.Instance.Apply(); yield return null; WindowCenter.Instance.Close<LoadingWin>(); } private IEnumerator _Exit() { WindowCenter.Instance.Open<LoadingWin>(); var _async = SceneManager.UnloadSceneAsync("Map000_Xsdt"); yield return _async; if (!AssetSource.sceneFromEditor) { AssetBundleUtility.Instance.UnloadAssetBundle("maps/map000_xsdt", true, false); } var _hero = PlayerDatas.Instance.hero; if (_hero != null) { _hero.Pos = m_CacheHeroPos; } CameraController.Instance.Apply(); yield return null; WindowCenter.Instance.Close<LoadingWin>(); } } Fight/Stage/Dungeon/AdventureStage.cs.meta
New file @@ -0,0 +1,12 @@ fileFormatVersion: 2 guid: 7fb6ffd2c7112ef42bc89374308b6762 timeCreated: 1554777545 licenseType: Pro MonoImporter: serializedVersion: 2 defaultReferences: [] executionOrder: 0 icon: {instanceID: 0} userData: assetBundleName: assetBundleVariant: Utility/RuntimeLogUtility.cs
@@ -237,9 +237,9 @@ if (GUILayout.Button("创建PVP敌方")) { var _npc = GAMgr.Instance.ReqClntFightNpc<GA_NpcClientFightNorm>(10101003, E_ActorGroup.Enemy); _npc.BornPos = _npc.Pos = PlayerDatas.Instance.hero.Pos; _npc.ActorInfo.ResetHp(9999999, -1, 9999999); // var _npc = GAMgr.Instance.ReqClntFightNpc<GA_NpcClientFightNorm>(10101003, E_ActorGroup.Enemy); // _npc.BornPos = _npc.Pos = PlayerDatas.Instance.hero.Pos; // _npc.ActorInfo.ResetHp(9999999, -1, 9999999); // GActorPlayerBase.PlayerInfo _playerInfo = new GActorPlayerBase.PlayerInfo(); // _playerInfo.maxHp = (uint)PlayerDatas.Instance.extersion.MaxMP; @@ -273,11 +273,13 @@ // }; // GAMgr.Instance.ReqClntPlayer<GA_PVPClientPlayer>(_playerInfo, E_ActorGroup.Player); AdventureStage.Instance.Enter(); } if (GUILayout.Button("重置PVP敌方")) { GA_PVPClientPlayer.Reset(); // GA_PVPClientPlayer.Reset(); AdventureStage.Instance.Exit(); } _navChkPos = EditorGUILayout.Vector3Field("检测点", _navChkPos);
