Core/GameEngine/Model/ConfigManager.cs
@@ -14,8 +14,7 @@ bool isPlaying = true; bool m_Inited = false; public bool inited { public bool inited { get { return m_Inited; } private set { m_Inited = value; } } Core/MapEditor.meta
File was deleted Core/MapEditor/Behavior.meta
File was deleted Core/MapEditor/Behavior/Bhv_Evt.cs
File was deleted Core/MapEditor/Behavior/Bhv_Evt.cs.meta
File was deleted Core/MapEditor/Behavior/Bhv_Evt_RefreshMonster.cs
File was deleted Core/MapEditor/Behavior/Bhv_Evt_RefreshMonster.cs.meta
File was deleted Core/MapEditor/Behavior/Bhv_MapData.cs
File was deleted Core/MapEditor/Behavior/Bhv_MapData.cs.meta
File was deleted Core/MapEditor/Behavior/Bhv_MapTrigger.cs
File was deleted Core/MapEditor/Behavior/Bhv_MapTrigger.cs.meta
File was deleted Core/MapEditor/Behavior/Bhv_MonsterData.cs
File was deleted Core/MapEditor/Behavior/Bhv_MonsterData.cs.meta
File was deleted Core/MapEditor/Behavior/Bhv_TransferPoint.cs
File was deleted Core/MapEditor/Behavior/Bhv_TransferPoint.cs.meta
File was deleted Core/MapEditor/Behavior/Bhv_Trasfer.cs
File was deleted Core/MapEditor/Behavior/Bhv_Trasfer.cs.meta
File was deleted Core/MapEditor/Data.meta
File was deleted Core/MapEditor/Data/Event.meta
File was deleted Core/MapEditor/Data/Event/Evt.cs
File was deleted Core/MapEditor/Data/Event/Evt.cs.meta
File was deleted Core/MapEditor/Data/Event/Evt_RefreshMonster.cs
File was deleted Core/MapEditor/Data/Event/Evt_RefreshMonster.cs.meta
File was deleted Core/MapEditor/Data/Event/MonsterData.cs
File was deleted Core/MapEditor/Data/Event/MonsterData.cs.meta
File was deleted Core/MapEditor/Data/MapData.cs
File was deleted Core/MapEditor/Data/MapData.cs.meta
File was deleted Core/MapEditor/Data/MapTrigger.cs
File was deleted Core/MapEditor/Data/MapTrigger.cs.meta
File was deleted Core/MapEditor/Data/Transfer.meta
File was deleted Core/MapEditor/Data/Transfer/MapTransferPoint.cs
File was deleted Core/MapEditor/Data/Transfer/MapTransferPoint.cs.meta
File was deleted Core/MapEditor/Data/Transfer/MapTrasfer.cs
File was deleted Core/MapEditor/Data/Transfer/MapTrasfer.cs.meta
File was deleted Core/MapEditor/Editor.meta
File was deleted Core/MapEditor/Editor/EditorResources.meta
File was deleted Core/MapEditor/Editor/EditorResources/EditorSkin.guiskin
File was deleted Core/MapEditor/Editor/EditorResources/EditorSkin.guiskin.meta
File was deleted Core/MapEditor/Editor/EditorResources/box_white.pngBinary files differ
Core/MapEditor/Editor/EditorResources/box_white.png.meta
File was deleted Core/MapEditor/Editor/MapEditor.cs
File was deleted Core/MapEditor/Editor/MapEditor.cs.meta
File was deleted Core/NetworkPackage/DTCFile/ClientPack.meta
New file @@ -0,0 +1,9 @@ fileFormatVersion: 2 guid: 722e5e3d30096674e811f5bd191246a0 folderAsset: yes timeCreated: 1539228128 licenseType: Pro DefaultImporter: userData: assetBundleName: assetBundleVariant: Core/ResModule/AssetBundle/AssetBundleUtility.cs
@@ -241,10 +241,6 @@ private IEnumerator Co_DoLoadAsset(string assetBundleName, string assetName, Action<bool, UnityEngine.Object> callBack = null) { #if UNITY_5 assetBundleName = assetBundleName.ToLower(); #endif #if UNITY_EDITOR RunTimeABLoadLog.AddLog(assetBundleName, assetName, UnityEngine.SceneManagement.SceneManager.GetActiveScene().name); #endif Core/ResModule/InstanceResourcesLoader.cs
@@ -62,13 +62,6 @@ GeneralDefine.ModeDefaultConfig[0][1]); } public static void AsyncLoadDefaultFuncNpc(Action<bool, UnityEngine.Object> callBack) { AsyncLoadNpc(GeneralDefine.ModeDefaultConfig[0][0], GeneralDefine.ModeDefaultConfig[0][1], callBack); } public static GameObject LoadDefaultHorse() { return LoadMob(GeneralDefine.ModeDefaultConfig[3][0], @@ -339,59 +332,6 @@ { var bundleName = StringUtility.Contact(ResourcesPath.EFFECT_Folder_Name, config.packageName); AssetBundleUtility.Instance.Co_LoadAsset(bundleName, config.fxName, _callBack); } } public static void AsyncLoadNpc(int npcID, Action<bool, UnityEngine.Object> callBack = null) { NPCConfig _m = Config.Instance.Get<NPCConfig>(npcID); if (_m == null || _m.MODE.Equals("0")) { if (callBack != null) { callBack(false, null); } } string _assetName; string _assetBundleName; if (GAMgr.Instance.s_NpcID2Assetname.TryGetValue(npcID, out _assetName)) { _assetBundleName = GAMgr.Instance.s_NpcID2BundleName[npcID]; } else { _assetName = StringUtility.Contact(raceSuffix, _m.MODE); _assetBundleName = StringUtility.Contact(ResourcesPath.MOB_FOLDER_NAME, _assetName); GAMgr.Instance.s_NpcID2Assetname[npcID] = _assetName; GAMgr.Instance.s_NpcID2BundleName[npcID] = _assetBundleName; } AsyncLoadNpc(_assetBundleName, _assetName, callBack); } public static void AsyncLoadNpc(string assetBundleName, string assetName, Action<bool, UnityEngine.Object> callBack = null) { if (AssetSource.mobFromEditor) { #if UNITY_EDITOR string _resourcePath = StringUtility.Contact(ResourcesPath.ResourcesOutAssetPath, "Mob/", assetName, ".prefab"); var _p = AssetDatabase.LoadAssetAtPath<GameObject>(_resourcePath); if (callBack != null) { callBack(true, _p); } #endif } else { AssetBundleUtility.Instance.Co_LoadAsset(assetBundleName, assetName, callBack); } } } Fight/GameActor/GA_NpcFunc.cs
@@ -119,14 +119,9 @@ } } protected override void OnPrefabLoadFinished(bool result, Object prefab) public override void InitPerformance(uint clientInstID, int npcID) { base.OnPrefabLoadFinished(result, prefab); if (!result) { return; } base.InitPerformance(clientInstID, npcID); if (string.IsNullOrEmpty(NpcConfig.Equips)) { Fight/GameActor/GActor.cs
@@ -14,8 +14,8 @@ public Transform MP_Stun { get; protected set; } public Transform MP_Weapon { get; protected set; } public uint ClientInstID { get; protected set; } public uint ServerInstID { get; protected set; } public uint ClientInstID { get; private set; } public uint ServerInstID { get; private set; } protected Transform m_Root = null; public Transform Root { get { return m_Root; } } @@ -93,7 +93,7 @@ public GameObjType ActorType { get; protected set; } public E_ActorGroup Group { get; protected set; } public E_ActorGroup Group { get; private set; } public GActorInfo ActorInfo { get; protected set; } private E_ActorState m_State; Fight/GameActor/GActorNpcNoFight.cs
@@ -25,57 +25,17 @@ } } protected GameNetPackBasic m_Package = null; public void Init(uint serverInstID, uint clientInstID, uint npcID, E_ActorGroup group, GameNetPackBasic package) { m_LoadDefaultRes = false; m_Package = package; NpcConfig = Config.Instance.Get<NPCConfig>((int)npcID); ClientInstID = clientInstID; if (NpcConfig == null) { // 报错 return; } ShowOrHide = true; needSyncGroundHeight = true; if (!m_Root) { m_Root = new GameObject().transform; // 将被复用,不被销毁 Object.DontDestroyOnLoad(m_Root); } m_Root.localScale = Vector3.one; Forward = m_Root.forward; // 角色属性 if (ActorInfo == null) { ActorInfo = new GActorInfo(); } ActorInfo.sid = serverInstID; ActorInfo.ownerSID = 0; ActorInfo.serverDie = false; #if UNITY_EDITOR m_Root.name = string.Format("{0}_{1}_{2}", GetType().ToString(), serverInstID, clientInstID); #endif ServerInstID = serverInstID; ClientInstID = clientInstID; Group = group; State = E_ActorState.Idle; // if (!m_AudioSource) // { @@ -88,7 +48,15 @@ // _audioSourceNode.transform.localPosition = new Vector3(0, 0.5f, 0); // m_AudioSource = _audioSourceNode.GetComponent<AudioSource>(); // } ActorType = GameObjType.gotNPC; // 初始化表现层 InitPerformance(clientInstID, (int)npcID); // 执行父类的初始化 Init(serverInstID, clientInstID, group, package); Root.gameObject.layer = LayerUtility.Monster; @@ -106,6 +74,7 @@ } RequestShadow(); RequestName(); // 这里针对指定的NPC特殊矫正位置 if (GeneralDefine.NpcPosOffset.ContainsKey(NpcConfig.NPCID)) @@ -128,9 +97,6 @@ // SoundPlayer.Instance.PlayAudio(m_AudioSource, _effectConfig.audio); //} } // 初始化表现层 InitPerformance(clientInstID, (int)npcID); } protected override void OnUnit() @@ -179,89 +145,76 @@ { } protected virtual void OnPrefabLoadFinished(bool result, UnityEngine.Object prefab) { if (!result) { return; } if (prefab == null) { if (!m_LoadDefaultRes) { InstanceResourcesLoader.AsyncLoadDefaultFuncNpc(OnPrefabLoadFinished); m_LoadDefaultRes = true; } else { m_LoadDefaultRes = false; } return; } if (PreFightMission.Instance.IsFinished()) { GAMgr.Instance.AddNeedDestroyPrefab(prefab as GameObject); } if (this is GA_Guard) { GAMgr.Instance.RemoveNeedDestroyPrefab(prefab as GameObject); } if (m_LoadDefaultRes) { m_Model = GameObjectPoolManager.Instance.RequestDefaultFuncNpc(); } else { m_Model = GameObjectPoolManager.Instance.RequestGameObject(prefab as GameObject); } if (m_Model) { m_Animator = m_Model.GetComponent<Animator>(); if (m_Animator) { RuntimeAnimatorController _controller = null; if (m_LoadDefaultRes) { _controller = InstanceResourcesLoader.LoadDefaultMobAnimatorController_Func(); } else { string _name = NpcConfig.MODE; if (_name.Contains("A_Zs")) { _name = "A_Zs"; GameObjectPoolManager.Instance.AddDontDestroyGoInstID(m_Model.GetInstanceID()); } else if (_name.Contains("A_Fs")) { _name = "A_Fs"; GameObjectPoolManager.Instance.AddDontDestroyGoInstID(m_Model.GetInstanceID()); } _controller = AnimatorControllerLoader.LoadMobController(AnimatorControllerLoader.controllerSuffix, _name); } if (_controller) { m_Animator.runtimeAnimatorController = _controller; } m_Animator.enabled = true; m_Animator.SetInteger(GAStaticDefine.Param_ActorInstID, (int)ClientInstID); } SetupBindNode(m_Model.transform); } OnInit(m_Package); } public virtual void InitPerformance(uint clientInstID, int npcID) { GameObject _prefab = InstanceResourcesLoader.LoadNpcPrefab(npcID); InstanceResourcesLoader.AsyncLoadNpc(npcID, OnPrefabLoadFinished); if (_prefab == null) { _prefab = InstanceResourcesLoader.LoadDefaultFuncNPC(); if (_prefab) { m_LoadDefaultRes = true; } } if (_prefab != null) { if (PreFightMission.Instance.IsFinished()) { GAMgr.Instance.AddNeedDestroyPrefab(_prefab); } if (this is GA_Guard) { GAMgr.Instance.RemoveNeedDestroyPrefab(_prefab); } if (m_LoadDefaultRes) { m_Model = GameObjectPoolManager.Instance.RequestDefaultFuncNpc(); } else { m_Model = GameObjectPoolManager.Instance.RequestNpcGameObject(npcID); } if (m_Model) { m_Animator = m_Model.GetComponent<Animator>(); if (m_Animator) { RuntimeAnimatorController _controller = null; if (m_LoadDefaultRes) { _controller = InstanceResourcesLoader.LoadDefaultMobAnimatorController_Func(); } else { string _name = NpcConfig.MODE; if (_name.Contains("A_Zs")) { _name = "A_Zs"; GameObjectPoolManager.Instance.AddDontDestroyGoInstID(m_Model.GetInstanceID()); } else if (_name.Contains("A_Fs")) { _name = "A_Fs"; GameObjectPoolManager.Instance.AddDontDestroyGoInstID(m_Model.GetInstanceID()); } _controller = AnimatorControllerLoader.LoadMobController(AnimatorControllerLoader.controllerSuffix, _name); } if (_controller) { m_Animator.runtimeAnimatorController = _controller; } m_Animator.enabled = true; m_Animator.SetInteger(GAStaticDefine.Param_ActorInstID, (int)clientInstID); } SetupBindNode(m_Model.transform); } } } public sealed override void SetAnimatorSpeed(float speed) Fight/Stage/Dungeon/FrontEndDungeon.meta
File was deleted Fight/Stage/Dungeon/FrontEndDungeon/FrontEndDungeon.cs
File was deleted Fight/Stage/Dungeon/FrontEndDungeon/FrontEndDungeon.cs.meta
File was deleted Fight/Stage/Dungeon/FrontEndDungeon/MapTransferSystem.cs
File was deleted Fight/Stage/Dungeon/FrontEndDungeon/MapTransferSystem.cs.meta
File was deleted Fight/Stage/StageManager.cs
@@ -336,12 +336,6 @@ mapOk.MapID = PlayerDatas.Instance.baseData.MapID; mapOk.Type = 0; GameNetSystem.Instance.SendInfo(mapOk); var _mapData = H2Engine.MapData.LoadFormFile("map_" + _stageId); if (_mapData != null) { } } else {
