From 22891bf59032ba88262824255a706d652031384b Mon Sep 17 00:00:00 2001 From: chai Date: Thu, 10 Mar 2022 14:07:40 +0800 Subject: * move folder --- Assets/Scripts/Managers/AvatarManager.cs | 30 ------ Assets/Scripts/Managers/AvatarManager.cs.meta | 11 -- Assets/Scripts/Managers/BattleManager.cs | 12 --- Assets/Scripts/Managers/BattleManager.cs.meta | 11 -- Assets/Scripts/Managers/HitManager.cs | 134 ------------------------ Assets/Scripts/Managers/HitManager.cs.meta | 11 -- Assets/Scripts/Managers/Physics.meta | 8 -- Assets/Scripts/Managers/ResourceManager.cs | 27 ----- Assets/Scripts/Managers/ResourceManager.cs.meta | 11 -- Assets/Scripts/Managers/SceneManager.cs | 10 -- Assets/Scripts/Managers/SceneManager.cs.meta | 11 -- Assets/Scripts/Managers/UnitManager.cs | 58 ---------- Assets/Scripts/Managers/UnitManager.cs.meta | 11 -- 13 files changed, 345 deletions(-) delete mode 100644 Assets/Scripts/Managers/AvatarManager.cs delete mode 100644 Assets/Scripts/Managers/AvatarManager.cs.meta delete mode 100644 Assets/Scripts/Managers/BattleManager.cs delete mode 100644 Assets/Scripts/Managers/BattleManager.cs.meta delete mode 100644 Assets/Scripts/Managers/HitManager.cs delete mode 100644 Assets/Scripts/Managers/HitManager.cs.meta delete mode 100644 Assets/Scripts/Managers/Physics.meta delete mode 100644 Assets/Scripts/Managers/ResourceManager.cs delete mode 100644 Assets/Scripts/Managers/ResourceManager.cs.meta delete mode 100644 Assets/Scripts/Managers/SceneManager.cs delete mode 100644 Assets/Scripts/Managers/SceneManager.cs.meta delete mode 100644 Assets/Scripts/Managers/UnitManager.cs delete mode 100644 Assets/Scripts/Managers/UnitManager.cs.meta (limited to 'Assets/Scripts/Managers') diff --git a/Assets/Scripts/Managers/AvatarManager.cs b/Assets/Scripts/Managers/AvatarManager.cs deleted file mode 100644 index 6ccac62a..00000000 --- a/Assets/Scripts/Managers/AvatarManager.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class AvatarManager : Singleton -{ - private List m_Avatars = new List(); - - public void AddAvatar(Avatar avatar) - { - m_Avatars.Add(avatar); - } - - public void OnUpdate() - { - foreach (var avatar in m_Avatars) - { - avatar.OnUpdate(); - } - } - - public void OnPhysicsUpdate() - { - foreach(var avatar in m_Avatars) - { - avatar.OnPhysicsUpdate(); - } - } - -} diff --git a/Assets/Scripts/Managers/AvatarManager.cs.meta b/Assets/Scripts/Managers/AvatarManager.cs.meta deleted file mode 100644 index a130d1a3..00000000 --- a/Assets/Scripts/Managers/AvatarManager.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: be28f7eef9edbed4ea13fd6f474cacb8 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Managers/BattleManager.cs b/Assets/Scripts/Managers/BattleManager.cs deleted file mode 100644 index 967f5c4d..00000000 --- a/Assets/Scripts/Managers/BattleManager.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class BattleManager : Singleton -{ - public void OnHitOccur() - { - - } - -} diff --git a/Assets/Scripts/Managers/BattleManager.cs.meta b/Assets/Scripts/Managers/BattleManager.cs.meta deleted file mode 100644 index ce0cee41..00000000 --- a/Assets/Scripts/Managers/BattleManager.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 1131367ba4b66ec4493a09bdeb570943 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Managers/HitManager.cs b/Assets/Scripts/Managers/HitManager.cs deleted file mode 100644 index d16a462c..00000000 --- a/Assets/Scripts/Managers/HitManager.cs +++ /dev/null @@ -1,134 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public struct HitInfo -{ - public HitDefination hitDef; - public Hitbox hitbox; - public Hurtbox hurtbox; - public Vector3 contact; - public Vector3 size; -} - -public struct HurtInfo -{ - public HitDefination hitDef; - public Hitbox hitbox; - public Hurtbox hurtbox; - public Vector3 contact; - public Vector3 size; -} - -public class HitManager : Singleton -{ - private List m_HitBoxes = new List(); - private List m_HurtBoxes = new List(); - - public void AddHitBox(Hitbox hitbox) - { - m_HitBoxes.Add(hitbox); - } - - public void AddHurtBox(Hurtbox hurtbox) - { - m_HurtBoxes.Add(hurtbox); - } - - public void RemoveHitBox(Hitbox hitbox) - { - m_HitBoxes.Remove(hitbox); - } - - public void RemoveHurtBox(Hurtbox hurtbox) - { - m_HurtBoxes.Remove(hurtbox); - } - - /// - /// 根据碰撞结果产生击中信息 - /// - public void OnPhysicsUpdate() - { - for(int i = 0;i < m_HitBoxes.Count; ++i) - { - Hitbox hitbox = m_HitBoxes[i]; - if (hitbox == null) - return; - for (int j = 0; j < PhysicsWorld.Instance.Collisions.Count; ++j) - { - PhysicsCollisionInfo info = PhysicsWorld.Instance.Collisions[j]; - PhysicsPrimitive collider; - if(info.prim1 == hitbox.Collider) - { - collider = info.prim2; - } - else if(info.prim2 == hitbox.Collider) - { - collider = info.prim1; - } - else - { - continue; - } - - Hurtbox hurtbox = GetHurtboxByCollider(collider); - if(hurtbox == null) - { - Debug.LogError("没有找到hurtbox"); - continue; - } - - HitDefination hitDef = null; - - if (hitbox.Host is Avatar) - { - Avatar attacker = hitbox.Host as Avatar; - Hit hit = attacker.GetHit(); - if(hit == null) - continue; - if (hit.HasRecord(hurtbox.Host)) - continue; - hit.AddRecord(hurtbox.Host); - hitDef = hit.defination; - } - - // 发送击中消息 - HitInfo hitInfo = new HitInfo (); - hitInfo.hitbox = hitbox; - hitInfo.hurtbox = hurtbox; - hitInfo.contact = info.contact; - hitInfo.size = info.size; - hitInfo.hitDef = hitDef; - - hitbox.Host.OnHit(hitInfo); - - // 发送受击消息 - HurtInfo hurtInfo = new HurtInfo(); - hurtInfo.hitbox = hitbox; - hurtInfo.hurtbox = hurtbox; - hurtInfo.contact = info.contact; - hurtInfo.size = info.size; - hurtInfo.hitDef = hitDef; - - hurtbox.Host.OnHurt(hurtInfo); - - // 场景处理特效等 - BattleManager.Instance.OnHitOccur(); - } - } - } - - Hurtbox GetHurtboxByCollider(PhysicsPrimitive collider) - { - foreach(var hurtbox in m_HurtBoxes) - { - if(hurtbox.Collider == collider) - { - return hurtbox; - } - } - return null; - } - -} diff --git a/Assets/Scripts/Managers/HitManager.cs.meta b/Assets/Scripts/Managers/HitManager.cs.meta deleted file mode 100644 index dab849f7..00000000 --- a/Assets/Scripts/Managers/HitManager.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: e99f64b7dd0fd8d4aa9d7cc0d8fa2165 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Managers/Physics.meta b/Assets/Scripts/Managers/Physics.meta deleted file mode 100644 index 2296b3f8..00000000 --- a/Assets/Scripts/Managers/Physics.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 603d4624aaedd794cb89497954a83f4a -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Managers/ResourceManager.cs b/Assets/Scripts/Managers/ResourceManager.cs deleted file mode 100644 index 974eb53a..00000000 --- a/Assets/Scripts/Managers/ResourceManager.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -#if UNITY_EDITOR -using UnityEditor; -#endif - -public partial class ResourceManager : Singleton -{ - Dictionary m_CachedObject = new Dictionary(); - - public T LoadAsset(string path) where T : UnityEngine.Object - { - if(m_CachedObject.ContainsKey(path)) - { - return m_CachedObject[path] as T; - } - -#if UNITY_EDITOR - T obj = AssetDatabase.LoadAssetAtPath(path); - m_CachedObject.Add(path, obj); -#else -#endif - return obj; - } - -} diff --git a/Assets/Scripts/Managers/ResourceManager.cs.meta b/Assets/Scripts/Managers/ResourceManager.cs.meta deleted file mode 100644 index 98c1315c..00000000 --- a/Assets/Scripts/Managers/ResourceManager.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 55ea2b1da79987e459caa3fbb6bd096a -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Managers/SceneManager.cs b/Assets/Scripts/Managers/SceneManager.cs deleted file mode 100644 index 182b662d..00000000 --- a/Assets/Scripts/Managers/SceneManager.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class SceneManager : Singleton -{ - - public Camera mainCamera { get { return MainCamera.Instance.camera; } } - -} diff --git a/Assets/Scripts/Managers/SceneManager.cs.meta b/Assets/Scripts/Managers/SceneManager.cs.meta deleted file mode 100644 index c8bbc8f8..00000000 --- a/Assets/Scripts/Managers/SceneManager.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: fc495e12ea00bc248889c82ebc476f03 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Managers/UnitManager.cs b/Assets/Scripts/Managers/UnitManager.cs deleted file mode 100644 index 920cbe9e..00000000 --- a/Assets/Scripts/Managers/UnitManager.cs +++ /dev/null @@ -1,58 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class UnitManager : Singleton -{ - public PCController pc { get; private set; } - - public List monsters { get; private set; } - - private Dictionary> m_Snapshots = new Dictionary>(); - - public void SetPlayerCharacter(PCController pc) - { - this.pc = pc; - } - - public UnitSnapshot ClaimSnapshotSolo(UnitSnapshotInfo info) - { - UnitSnapshot snapshot = ClaimSnapshot(info.unit); - snapshot.ApplySnapshot(info); - return snapshot; - } - - public UnitSnapshot ClaimSnapshot(UnitController unit) - { - List snapshots; - UnitSnapshot snap = null; - if (m_Snapshots.TryGetValue(unit, out snapshots) && snapshots.Count > 0) - { - snap = snapshots[snapshots.Count - 1]; - snapshots.RemoveAt(snapshots.Count - 1); - return snap; - } - var obj = ResourceManager.Instance.LoadAsset(unit.unitDetail.snapshotAvatarPath); - if(obj) - { - snap = Object.Instantiate(obj); - //snap.gameObject.hideFlags = HideFlags.HideInHierarchy | HideFlags.DontSave; - snap.Initialize(unit); - snap.active = false; - } - return snap; - } - - public void ReleaseSnapshot(ref UnitSnapshot snap) - { - List snapshots; - if (!m_Snapshots.TryGetValue(snap.owner, out snapshots)) - { - snapshots = new List(); - m_Snapshots.Add(snap.owner, snapshots); - } - snapshots.Add(snap); - snap = null; - } - -} diff --git a/Assets/Scripts/Managers/UnitManager.cs.meta b/Assets/Scripts/Managers/UnitManager.cs.meta deleted file mode 100644 index 8f44e5ae..00000000 --- a/Assets/Scripts/Managers/UnitManager.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: f38cf602494915748a234fd75081ea2e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: -- cgit v1.1-26-g67d0