From 8c100e89699a34f4bac02143b5d53f5b338cef02 Mon Sep 17 00:00:00 2001 From: sin365 <353374337@qq.com> Date: Sat, 7 Jan 2023 23:24:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=BB=E5=87=BB=E6=93=8D=E4=BD=9C=EF=BC=8C?= =?UTF-8?q?=E5=88=A4=E5=AE=9A=E7=9B=92=E6=96=B9=E6=A1=88=EF=BC=8C=E6=91=84?= =?UTF-8?q?=E5=83=8F=E6=9C=BA=E6=8A=96=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Axibug/Axibug.prefab | 3 +- Assets/GameAssets/Prefabs/AttackBox.meta | 8 + .../Prefabs/AttackBox/HorizontalCut_Down.anim | 262 +++++++++ .../AttackBox/HorizontalCut_Down.anim.meta | 8 + .../Prefabs/AttackBox/HorizontalCut_Up.anim | 280 ++++++++++ .../AttackBox/HorizontalCut_Up.anim.meta | 8 + .../Prefabs/AttackBox/KeepAttack.anim | 116 ++++ .../Prefabs/AttackBox/KeepAttack.anim.meta | 8 + .../Prefabs/AttackBox/NoneAttack.anim | 116 ++++ .../Prefabs/AttackBox/NoneAttack.anim.meta | 8 + .../Prefabs/AttackBox/NormalAttack.controller | 256 +++++++++ .../AttackBox/NormalAttack.controller.meta | 8 + .../Prefabs/AttackBox/NormalAttack.prefab | 194 +++++++ .../AttackBox/NormalAttack.prefab.meta | 7 + .../Prefabs/AttackBox/VerticalCut.anim | 244 ++++++++ .../Prefabs/AttackBox/VerticalCut.anim.meta | 8 + .../Role/Warrior/Aniamtion/Attack_1.anim | 89 +++ .../Role/Warrior/Aniamtion/Attack_1.anim.meta | 8 + .../Role/Warrior/Aniamtion/Attack_2.anim | 80 +++ .../Role/Warrior/Aniamtion/Attack_2.anim.meta | 8 + .../Role/Warrior/Aniamtion/Dash-Attack.anim | 2 +- .../Warrior/Aniamtion/myWarrior.controller | 165 ++++-- Assets/Scenes/MainScene.unity | 13 - Assets/Scenes/Playground.unity | 527 ++++++++++++++++++ Assets/Scenes/Playground.unity.meta | 7 + Assets/Scripts/Main/AnimeScript.meta | 8 + Assets/Scripts/Main/AnimeScript/InAttack.cs | 37 ++ .../Scripts/Main/AnimeScript/InAttack.cs.meta | 11 + Assets/Scripts/Main/Battle.meta | 8 + Assets/Scripts/Main/Battle/AttackBox.cs | 40 ++ Assets/Scripts/Main/Battle/AttackBox.cs.meta | 11 + Assets/Scripts/Main/Camera.meta | 8 + Assets/Scripts/Main/Camera/CameraShake.cs | 61 ++ .../Scripts/Main/Camera/CameraShake.cs.meta | 11 + Assets/Scripts/Main/Common.meta | 8 + Assets/Scripts/Main/Common/Common.cs | 25 + Assets/Scripts/Main/Common/Common.cs.meta | 11 + .../Main/CustomsComponent/InputComponent.cs | 24 +- .../CustomsComponent/MainPlayerComponent.cs | 59 ++ .../Main/CustomsComponent/RoleMgrComponent.cs | 48 +- .../Main/Definition/DataStruct/Input.meta | 8 + .../DataStruct/Input/InputMotionData.cs | 96 ++++ .../DataStruct/Input/InputMotionData.cs.meta | 11 + .../Main/Definition/DataStruct/Tags.cs | 2 +- .../Scripts/Main/Definition/Enums/NodeType.cs | 2 +- Assets/Scripts/Main/Event.meta | 8 + Assets/Scripts/Main/Event/BattleEvent.meta | 8 + .../Event/BattleEvent/AttackHitEventArgs.cs | 37 ++ .../BattleEvent/AttackHitEventArgs.cs.meta | 11 + Assets/Scripts/Main/Event/CameraEvent.meta | 8 + .../Event/CameraEvent/CameraShakeEventArgs.cs | 25 + .../CameraEvent/CameraShakeEventArgs.cs.meta | 11 + .../Scripts/Main/Event/MainPlayerInput.meta | 8 + .../MainPlayerInAttackEventArgs.cs | 28 + .../MainPlayerInAttackEventArgs.cs.meta | 11 + .../MainPlayerPushNewMotionEventArgs.cs | 28 + .../MainPlayerPushNewMotionEventArgs.cs.meta | 11 + .../Role/CharacterMachine/CharacterMachine.cs | 6 +- Assets/Scripts/Main/Role/MainRole.cs | 12 +- Assets/Scripts/Main/Role/RoleBase.cs | 104 ++-- ProjectSettings/TagManager.asset | 3 +- Unity.AssetBundleBrowser.Editor.csproj | 406 +++++++------- UserSettings/EditorUserSettings.asset | 3 + 63 files changed, 3348 insertions(+), 302 deletions(-) create mode 100644 Assets/GameAssets/Prefabs/AttackBox.meta create mode 100644 Assets/GameAssets/Prefabs/AttackBox/HorizontalCut_Down.anim create mode 100644 Assets/GameAssets/Prefabs/AttackBox/HorizontalCut_Down.anim.meta create mode 100644 Assets/GameAssets/Prefabs/AttackBox/HorizontalCut_Up.anim create mode 100644 Assets/GameAssets/Prefabs/AttackBox/HorizontalCut_Up.anim.meta create mode 100644 Assets/GameAssets/Prefabs/AttackBox/KeepAttack.anim create mode 100644 Assets/GameAssets/Prefabs/AttackBox/KeepAttack.anim.meta create mode 100644 Assets/GameAssets/Prefabs/AttackBox/NoneAttack.anim create mode 100644 Assets/GameAssets/Prefabs/AttackBox/NoneAttack.anim.meta create mode 100644 Assets/GameAssets/Prefabs/AttackBox/NormalAttack.controller create mode 100644 Assets/GameAssets/Prefabs/AttackBox/NormalAttack.controller.meta create mode 100644 Assets/GameAssets/Prefabs/AttackBox/NormalAttack.prefab create mode 100644 Assets/GameAssets/Prefabs/AttackBox/NormalAttack.prefab.meta create mode 100644 Assets/GameAssets/Prefabs/AttackBox/VerticalCut.anim create mode 100644 Assets/GameAssets/Prefabs/AttackBox/VerticalCut.anim.meta create mode 100644 Assets/GameAssets/Prefabs/Role/Warrior/Aniamtion/Attack_1.anim create mode 100644 Assets/GameAssets/Prefabs/Role/Warrior/Aniamtion/Attack_1.anim.meta create mode 100644 Assets/GameAssets/Prefabs/Role/Warrior/Aniamtion/Attack_2.anim create mode 100644 Assets/GameAssets/Prefabs/Role/Warrior/Aniamtion/Attack_2.anim.meta create mode 100644 Assets/Scenes/Playground.unity create mode 100644 Assets/Scenes/Playground.unity.meta create mode 100644 Assets/Scripts/Main/AnimeScript.meta create mode 100644 Assets/Scripts/Main/AnimeScript/InAttack.cs create mode 100644 Assets/Scripts/Main/AnimeScript/InAttack.cs.meta create mode 100644 Assets/Scripts/Main/Battle.meta create mode 100644 Assets/Scripts/Main/Battle/AttackBox.cs create mode 100644 Assets/Scripts/Main/Battle/AttackBox.cs.meta create mode 100644 Assets/Scripts/Main/Camera.meta create mode 100644 Assets/Scripts/Main/Camera/CameraShake.cs create mode 100644 Assets/Scripts/Main/Camera/CameraShake.cs.meta create mode 100644 Assets/Scripts/Main/Common.meta create mode 100644 Assets/Scripts/Main/Common/Common.cs create mode 100644 Assets/Scripts/Main/Common/Common.cs.meta create mode 100644 Assets/Scripts/Main/Definition/DataStruct/Input.meta create mode 100644 Assets/Scripts/Main/Definition/DataStruct/Input/InputMotionData.cs create mode 100644 Assets/Scripts/Main/Definition/DataStruct/Input/InputMotionData.cs.meta create mode 100644 Assets/Scripts/Main/Event.meta create mode 100644 Assets/Scripts/Main/Event/BattleEvent.meta create mode 100644 Assets/Scripts/Main/Event/BattleEvent/AttackHitEventArgs.cs create mode 100644 Assets/Scripts/Main/Event/BattleEvent/AttackHitEventArgs.cs.meta create mode 100644 Assets/Scripts/Main/Event/CameraEvent.meta create mode 100644 Assets/Scripts/Main/Event/CameraEvent/CameraShakeEventArgs.cs create mode 100644 Assets/Scripts/Main/Event/CameraEvent/CameraShakeEventArgs.cs.meta create mode 100644 Assets/Scripts/Main/Event/MainPlayerInput.meta create mode 100644 Assets/Scripts/Main/Event/MainPlayerInput/MainPlayerInAttackEventArgs.cs create mode 100644 Assets/Scripts/Main/Event/MainPlayerInput/MainPlayerInAttackEventArgs.cs.meta create mode 100644 Assets/Scripts/Main/Event/MainPlayerInput/MainPlayerPushNewMotionEventArgs.cs create mode 100644 Assets/Scripts/Main/Event/MainPlayerInput/MainPlayerPushNewMotionEventArgs.cs.meta diff --git a/Assets/Axibug/Axibug.prefab b/Assets/Axibug/Axibug.prefab index 4c56cfa..7d58adf 100644 --- a/Assets/Axibug/Axibug.prefab +++ b/Assets/Axibug/Axibug.prefab @@ -1117,7 +1117,8 @@ PrefabInstance: propertyPath: m_Name value: MainCamNode objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 1957308639, guid: 1b7ff190d1acc9945b3300f5c99f0c38, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 1b7ff190d1acc9945b3300f5c99f0c38, type: 3} --- !u!4 &5437893104048697931 stripped Transform: diff --git a/Assets/GameAssets/Prefabs/AttackBox.meta b/Assets/GameAssets/Prefabs/AttackBox.meta new file mode 100644 index 0000000..62a625e --- /dev/null +++ b/Assets/GameAssets/Prefabs/AttackBox.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5b461720e53dea043823cf27ef0aaaba +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameAssets/Prefabs/AttackBox/HorizontalCut_Down.anim b/Assets/GameAssets/Prefabs/AttackBox/HorizontalCut_Down.anim new file mode 100644 index 0000000..3a16bff --- /dev/null +++ b/Assets/GameAssets/Prefabs/AttackBox/HorizontalCut_Down.anim @@ -0,0 +1,262 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: HorizontalCut_Down + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.4 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.7 + value: {x: 0, y: 0, z: -90} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Node1 + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.4 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.7 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Node1 + classID: 1 + script: {fileID: 0} + m_PPtrCurves: [] + m_SampleRate: 10 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 1143867972 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1143867972 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.7 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.4 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: Node1 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.4 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: Node1 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.4 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.7 + value: -90 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Node1 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.4 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.7 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Node1 + classID: 1 + script: {fileID: 0} + m_EulerEditorCurves: + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Node1 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Node1 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Node1 + classID: 4 + script: {fileID: 0} + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/GameAssets/Prefabs/AttackBox/HorizontalCut_Down.anim.meta b/Assets/GameAssets/Prefabs/AttackBox/HorizontalCut_Down.anim.meta new file mode 100644 index 0000000..e93b0e3 --- /dev/null +++ b/Assets/GameAssets/Prefabs/AttackBox/HorizontalCut_Down.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1863731e60b8fbc438a044eb9c9dd10e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameAssets/Prefabs/AttackBox/HorizontalCut_Up.anim b/Assets/GameAssets/Prefabs/AttackBox/HorizontalCut_Up.anim new file mode 100644 index 0000000..325ef25 --- /dev/null +++ b/Assets/GameAssets/Prefabs/AttackBox/HorizontalCut_Up.anim @@ -0,0 +1,280 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: HorizontalCut_Up + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.1 + value: {x: 0, y: 0, z: -90} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.3 + value: {x: 0, y: 0, z: 45} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Node1 + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.1 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.3 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Node1 + classID: 1 + script: {fileID: 0} + m_PPtrCurves: [] + m_SampleRate: 10 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 1143867972 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1143867972 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.5 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.3 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: Node1 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.3 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: Node1 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0.1 + value: -90 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.3 + value: 45 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Node1 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.1 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.3 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Node1 + classID: 1 + script: {fileID: 0} + m_EulerEditorCurves: + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Node1 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Node1 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Node1 + classID: 4 + script: {fileID: 0} + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/GameAssets/Prefabs/AttackBox/HorizontalCut_Up.anim.meta b/Assets/GameAssets/Prefabs/AttackBox/HorizontalCut_Up.anim.meta new file mode 100644 index 0000000..efbd14a --- /dev/null +++ b/Assets/GameAssets/Prefabs/AttackBox/HorizontalCut_Up.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2bb3c1143897f114ea81268defdc1138 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameAssets/Prefabs/AttackBox/KeepAttack.anim b/Assets/GameAssets/Prefabs/AttackBox/KeepAttack.anim new file mode 100644 index 0000000..e6ffb86 --- /dev/null +++ b/Assets/GameAssets/Prefabs/AttackBox/KeepAttack.anim @@ -0,0 +1,116 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: KeepAttack + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.3 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Node1 + classID: 1 + script: {fileID: 0} + m_PPtrCurves: [] + m_SampleRate: 10 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 1143867972 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.3 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.3 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Node1 + classID: 1 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/GameAssets/Prefabs/AttackBox/KeepAttack.anim.meta b/Assets/GameAssets/Prefabs/AttackBox/KeepAttack.anim.meta new file mode 100644 index 0000000..d010f06 --- /dev/null +++ b/Assets/GameAssets/Prefabs/AttackBox/KeepAttack.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a01cdb37190388d48962b1c2a925ad08 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameAssets/Prefabs/AttackBox/NoneAttack.anim b/Assets/GameAssets/Prefabs/AttackBox/NoneAttack.anim new file mode 100644 index 0000000..316b9df --- /dev/null +++ b/Assets/GameAssets/Prefabs/AttackBox/NoneAttack.anim @@ -0,0 +1,116 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: NoneAttack + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.3 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Node1 + classID: 1 + script: {fileID: 0} + m_PPtrCurves: [] + m_SampleRate: 10 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 1143867972 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.3 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.3 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Node1 + classID: 1 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/GameAssets/Prefabs/AttackBox/NoneAttack.anim.meta b/Assets/GameAssets/Prefabs/AttackBox/NoneAttack.anim.meta new file mode 100644 index 0000000..8d85c1b --- /dev/null +++ b/Assets/GameAssets/Prefabs/AttackBox/NoneAttack.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1c84648d78403a84eaa7641ca74272b6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameAssets/Prefabs/AttackBox/NormalAttack.controller b/Assets/GameAssets/Prefabs/AttackBox/NormalAttack.controller new file mode 100644 index 0000000..c968ec4 --- /dev/null +++ b/Assets/GameAssets/Prefabs/AttackBox/NormalAttack.controller @@ -0,0 +1,256 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-9087518327803160042 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -8692109954130743551} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.9994324 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-8692109954130743551 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: NoneAttack + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 1c84648d78403a84eaa7641ca74272b6, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-5051538649638018815 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -8692109954130743551} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.9994324 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-2913372157276921532 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: KeepAttack + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: a01cdb37190388d48962b1c2a925ad08, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-2217922872224882137 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -8692109954130743551} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.9997162 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: NormalAttack + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 3164537827086126525} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &2726917790948579376 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: HorizontalCut_Up + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -9087518327803160042} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 2bb3c1143897f114ea81268defdc1138, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &3164537827086126525 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -8692109954130743551} + m_Position: {x: 420, y: 80, z: 0} + - serializedVersion: 1 + m_State: {fileID: 7803269837765215679} + m_Position: {x: 710, y: 40, z: 0} + - serializedVersion: 1 + m_State: {fileID: 8659831588494589018} + m_Position: {x: 510, y: 180, z: 0} + - serializedVersion: 1 + m_State: {fileID: 2726917790948579376} + m_Position: {x: 580, y: -20, z: 0} + - serializedVersion: 1 + m_State: {fileID: -2913372157276921532} + m_Position: {x: 420, y: -80, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 80, y: 100, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -8692109954130743551} +--- !u!1102 &7803269837765215679 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: VerticalCut + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 0c51a027f0fa4b74dabd9519717b85cc, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &8659831588494589018 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: HorizontalCut_Down + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -2217922872224882137} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 1863731e60b8fbc438a044eb9c9dd10e, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/GameAssets/Prefabs/AttackBox/NormalAttack.controller.meta b/Assets/GameAssets/Prefabs/AttackBox/NormalAttack.controller.meta new file mode 100644 index 0000000..834d9a7 --- /dev/null +++ b/Assets/GameAssets/Prefabs/AttackBox/NormalAttack.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b28e938f193b9cf47965cd3c1a01b60f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameAssets/Prefabs/AttackBox/NormalAttack.prefab b/Assets/GameAssets/Prefabs/AttackBox/NormalAttack.prefab new file mode 100644 index 0000000..aca626d --- /dev/null +++ b/Assets/GameAssets/Prefabs/AttackBox/NormalAttack.prefab @@ -0,0 +1,194 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1365430532339548841 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2287893598708722228} + m_Layer: 18 + m_Name: Node1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2287893598708722228 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1365430532339548841} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 3492351266235957729} + m_Father: {fileID: 7482125358235909741} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7661140780953666760 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7482125358235909741} + - component: {fileID: 4076979820179973323} + m_Layer: 18 + m_Name: NormalAttack + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7482125358235909741 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7661140780953666760} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 2287893598708722228} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &4076979820179973323 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7661140780953666760} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: b28e938f193b9cf47965cd3c1a01b60f, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &8685263677329216329 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3492351266235957729} + - component: {fileID: 1502486284235144025} + - component: {fileID: 3013213046364157919} + - component: {fileID: 6242888806953577077} + - component: {fileID: 1407785372001023205} + m_Layer: 18 + m_Name: Box1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3492351266235957729 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8685263677329216329} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.9, z: 0} + m_LocalScale: {x: 1, y: 1.8, z: 1} + m_Children: [] + m_Father: {fileID: 2287893598708722228} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &1502486284235144025 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8685263677329216329} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &3013213046364157919 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8685263677329216329} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &6242888806953577077 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8685263677329216329} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &1407785372001023205 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8685263677329216329} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6789fd78b2842364aa2ebaefd01e7bfa, type: 3} + m_Name: + m_EditorClassIdentifier: + selfNodeType: 0 + selfRoleId: 0 diff --git a/Assets/GameAssets/Prefabs/AttackBox/NormalAttack.prefab.meta b/Assets/GameAssets/Prefabs/AttackBox/NormalAttack.prefab.meta new file mode 100644 index 0000000..3614aa8 --- /dev/null +++ b/Assets/GameAssets/Prefabs/AttackBox/NormalAttack.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 40a672532f44209409aa7a924cac8367 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameAssets/Prefabs/AttackBox/VerticalCut.anim b/Assets/GameAssets/Prefabs/AttackBox/VerticalCut.anim new file mode 100644 index 0000000..442f0d3 --- /dev/null +++ b/Assets/GameAssets/Prefabs/AttackBox/VerticalCut.anim @@ -0,0 +1,244 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: VerticalCut + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 90, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.26666668 + value: {x: 90, y: 0, z: -180} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Node1 + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.26666668 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Node1 + classID: 1 + script: {fileID: 0} + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 1143867972 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1143867972 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.26666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 90 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: Node1 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: Node1 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.26666668 + value: -180 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Node1 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.26666668 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Node1 + classID: 1 + script: {fileID: 0} + m_EulerEditorCurves: + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Node1 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Node1 + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Node1 + classID: 4 + script: {fileID: 0} + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/GameAssets/Prefabs/AttackBox/VerticalCut.anim.meta b/Assets/GameAssets/Prefabs/AttackBox/VerticalCut.anim.meta new file mode 100644 index 0000000..722a057 --- /dev/null +++ b/Assets/GameAssets/Prefabs/AttackBox/VerticalCut.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0c51a027f0fa4b74dabd9519717b85cc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameAssets/Prefabs/Role/Warrior/Aniamtion/Attack_1.anim b/Assets/GameAssets/Prefabs/Role/Warrior/Aniamtion/Attack_1.anim new file mode 100644 index 0000000..5a4acb8 --- /dev/null +++ b/Assets/GameAssets/Prefabs/Role/Warrior/Aniamtion/Attack_1.anim @@ -0,0 +1,89 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack_1 + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -7879541775824577086, guid: ae72133dacba6ec4eb33ecde48f50e56, type: 3} + - time: 0.1 + value: {fileID: -6442761953431332421, guid: ae72133dacba6ec4eb33ecde48f50e56, type: 3} + - time: 0.2 + value: {fileID: -7823500323640422531, guid: ae72133dacba6ec4eb33ecde48f50e56, type: 3} + - time: 0.3 + value: {fileID: 3272844186751121127, guid: ae72133dacba6ec4eb33ecde48f50e56, type: 3} + - time: 0.4 + value: {fileID: 8629003983396144442, guid: ae72133dacba6ec4eb33ecde48f50e56, type: 3} + - time: 0.5 + value: {fileID: -6211648682532063752, guid: ae72133dacba6ec4eb33ecde48f50e56, type: 3} + - time: 0.6 + value: {fileID: 4804923502247703499, guid: ae72133dacba6ec4eb33ecde48f50e56, type: 3} + - time: 0.7 + value: {fileID: -6253208296904073923, guid: ae72133dacba6ec4eb33ecde48f50e56, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 10 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -7879541775824577086, guid: ae72133dacba6ec4eb33ecde48f50e56, type: 3} + - {fileID: -6442761953431332421, guid: ae72133dacba6ec4eb33ecde48f50e56, type: 3} + - {fileID: -7823500323640422531, guid: ae72133dacba6ec4eb33ecde48f50e56, type: 3} + - {fileID: 3272844186751121127, guid: ae72133dacba6ec4eb33ecde48f50e56, type: 3} + - {fileID: 8629003983396144442, guid: ae72133dacba6ec4eb33ecde48f50e56, type: 3} + - {fileID: -6211648682532063752, guid: ae72133dacba6ec4eb33ecde48f50e56, type: 3} + - {fileID: 4804923502247703499, guid: ae72133dacba6ec4eb33ecde48f50e56, type: 3} + - {fileID: -6253208296904073923, guid: ae72133dacba6ec4eb33ecde48f50e56, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.8 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/GameAssets/Prefabs/Role/Warrior/Aniamtion/Attack_1.anim.meta b/Assets/GameAssets/Prefabs/Role/Warrior/Aniamtion/Attack_1.anim.meta new file mode 100644 index 0000000..a7653d5 --- /dev/null +++ b/Assets/GameAssets/Prefabs/Role/Warrior/Aniamtion/Attack_1.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 83576976c63c9074ca624cd2d70bbb40 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameAssets/Prefabs/Role/Warrior/Aniamtion/Attack_2.anim b/Assets/GameAssets/Prefabs/Role/Warrior/Aniamtion/Attack_2.anim new file mode 100644 index 0000000..4a28787 --- /dev/null +++ b/Assets/GameAssets/Prefabs/Role/Warrior/Aniamtion/Attack_2.anim @@ -0,0 +1,80 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack_2 + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -381468241496348146, guid: ae72133dacba6ec4eb33ecde48f50e56, type: 3} + - time: 0.1 + value: {fileID: -2164224423321271568, guid: ae72133dacba6ec4eb33ecde48f50e56, type: 3} + - time: 0.2 + value: {fileID: 7378919880078719499, guid: ae72133dacba6ec4eb33ecde48f50e56, type: 3} + - time: 0.3 + value: {fileID: -50406204238961237, guid: ae72133dacba6ec4eb33ecde48f50e56, type: 3} + - time: 0.5 + value: {fileID: -50406204238961237, guid: ae72133dacba6ec4eb33ecde48f50e56, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 10 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -381468241496348146, guid: ae72133dacba6ec4eb33ecde48f50e56, type: 3} + - {fileID: -2164224423321271568, guid: ae72133dacba6ec4eb33ecde48f50e56, type: 3} + - {fileID: 7378919880078719499, guid: ae72133dacba6ec4eb33ecde48f50e56, type: 3} + - {fileID: -50406204238961237, guid: ae72133dacba6ec4eb33ecde48f50e56, type: 3} + - {fileID: -50406204238961237, guid: ae72133dacba6ec4eb33ecde48f50e56, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.6 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/GameAssets/Prefabs/Role/Warrior/Aniamtion/Attack_2.anim.meta b/Assets/GameAssets/Prefabs/Role/Warrior/Aniamtion/Attack_2.anim.meta new file mode 100644 index 0000000..2ab3c9d --- /dev/null +++ b/Assets/GameAssets/Prefabs/Role/Warrior/Aniamtion/Attack_2.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1b794e8e60cdcf24bb02ed0fa9bba75c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GameAssets/Prefabs/Role/Warrior/Aniamtion/Dash-Attack.anim b/Assets/GameAssets/Prefabs/Role/Warrior/Aniamtion/Dash-Attack.anim index 4dba39f..ee4af8c 100644 --- a/Assets/GameAssets/Prefabs/Role/Warrior/Aniamtion/Dash-Attack.anim +++ b/Assets/GameAssets/Prefabs/Role/Warrior/Aniamtion/Dash-Attack.anim @@ -7,7 +7,7 @@ AnimationClip: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Dash-Attack - serializedVersion: 6 + serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 m_UseHighQualityCurve: 1 diff --git a/Assets/GameAssets/Prefabs/Role/Warrior/Aniamtion/myWarrior.controller b/Assets/GameAssets/Prefabs/Role/Warrior/Aniamtion/myWarrior.controller index 27d0676..985f9c4 100644 --- a/Assets/GameAssets/Prefabs/Role/Warrior/Aniamtion/myWarrior.controller +++ b/Assets/GameAssets/Prefabs/Role/Warrior/Aniamtion/myWarrior.controller @@ -1,5 +1,27 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-7493560171476867958 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 4054845936075069209} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.7916667 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-6335382322422097306 AnimatorState: serializedVersion: 6 @@ -62,13 +84,10 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 4054845936075069209} - m_Position: {x: 200, y: 0, z: 0} + m_Position: {x: 240, y: 30, z: 0} - serializedVersion: 1 m_State: {fileID: 7852368639546613177} - m_Position: {x: 290, y: 70, z: 0} - - serializedVersion: 1 - m_State: {fileID: -2654552166376096974} - m_Position: {x: 270, y: 130, z: 0} + m_Position: {x: 340, y: 110, z: 0} - serializedVersion: 1 m_State: {fileID: -3802118723531622627} m_Position: {x: 300, y: 200, z: 0} @@ -123,6 +142,12 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: 9019407523607455547} m_Position: {x: 900, y: 1300, z: 0} + - serializedVersion: 1 + m_State: {fileID: 5828820298934977185} + m_Position: {x: 450, y: -170, z: 0} + - serializedVersion: 1 + m_State: {fileID: 993502365009367806} + m_Position: {x: 540, y: -100, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -159,6 +184,19 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!114 &-3384194924314367751 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1f25b8c125efdad4585737ed25a28b12, type: 3} + m_Name: + m_EditorClassIdentifier: + CanSkipTime: 0.8 --- !u!1101 &-3299496346932648763 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -184,32 +222,6 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1102 &-2654552166376096974 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Attack - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: d580f1d1a428cb040b4d98afe8ba4e60, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: --- !u!1102 &-2059664036498852191 AnimatorState: serializedVersion: 6 @@ -316,6 +328,19 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!114 &290963878403150093 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1f25b8c125efdad4585737ed25a28b12, type: 3} + m_Name: + m_EditorClassIdentifier: + CanSkipTime: 0.8 --- !u!1102 &381074812473331180 AnimatorState: serializedVersion: 6 @@ -368,6 +393,34 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &993502365009367806 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack_2 + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -7493560171476867958} + m_StateMachineBehaviours: + - {fileID: -3384194924314367751} + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 1b794e8e60cdcf24bb02ed0fa9bba75c, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &1147905805402225859 AnimatorState: serializedVersion: 6 @@ -499,6 +552,28 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &4566977503824153951 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 4054845936075069209} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.7916667 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &4753130485075786422 AnimatorState: serializedVersion: 6 @@ -551,6 +626,34 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &5828820298934977185 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Attack_1 + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 4566977503824153951} + m_StateMachineBehaviours: + - {fileID: 290963878403150093} + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 83576976c63c9074ca624cd2d70bbb40, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &6195707702753524182 AnimatorState: serializedVersion: 6 diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 6499998..58a8847 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -238,7 +238,6 @@ GameObject: - component: {fileID: 1687258584} - component: {fileID: 1687258582} - component: {fileID: 1687258586} - - component: {fileID: 1687258583} m_Layer: 0 m_Name: MainCam m_TagString: MainCamera @@ -254,18 +253,6 @@ AudioListener: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1687258581} m_Enabled: 1 ---- !u!114 &1687258583 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1687258581} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 948f4100a11a5c24981795d21301da5c, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!20 &1687258584 Camera: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Playground.unity b/Assets/Scenes/Playground.unity new file mode 100644 index 0000000..dd6ef0e --- /dev/null +++ b/Assets/Scenes/Playground.unity @@ -0,0 +1,527 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1001 &142697875 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1033268005220519993, guid: 8d165a1792098184192d72682db05a51, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1033268005220519993, guid: 8d165a1792098184192d72682db05a51, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1033268005220519993, guid: 8d165a1792098184192d72682db05a51, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1033268005220519993, guid: 8d165a1792098184192d72682db05a51, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1033268005220519993, guid: 8d165a1792098184192d72682db05a51, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1033268005220519993, guid: 8d165a1792098184192d72682db05a51, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1033268005220519993, guid: 8d165a1792098184192d72682db05a51, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1033268005220519993, guid: 8d165a1792098184192d72682db05a51, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1033268005220519993, guid: 8d165a1792098184192d72682db05a51, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1033268005220519993, guid: 8d165a1792098184192d72682db05a51, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1033268005220519993, guid: 8d165a1792098184192d72682db05a51, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1033268005220519994, guid: 8d165a1792098184192d72682db05a51, type: 3} + propertyPath: m_Name + value: Warrior + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8d165a1792098184192d72682db05a51, type: 3} +--- !u!1 &836543364 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 836543366} + - component: {fileID: 836543365} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &836543365 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 836543364} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &836543366 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 836543364} + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1 &1468752882 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1468752886} + - component: {fileID: 1468752885} + - component: {fileID: 1468752884} + - component: {fileID: 1468752883} + - component: {fileID: 1468752887} + m_Layer: 0 + m_Name: Sphere + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!135 &1468752883 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1468752882} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1468752884 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1468752882} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1468752885 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1468752882} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1468752886 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1468752882} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 3.59, y: 0.15, z: 4.65} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!54 &1468752887 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1468752882} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!1 &2138060551 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2138060554} + - component: {fileID: 2138060553} + - component: {fileID: 2138060552} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &2138060552 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2138060551} + m_Enabled: 1 +--- !u!20 &2138060553 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2138060551} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &2138060554 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2138060551} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &7767126264415761571 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 7482125358235909741, guid: 40a672532f44209409aa7a924cac8367, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7482125358235909741, guid: 40a672532f44209409aa7a924cac8367, type: 3} + propertyPath: m_LocalPosition.x + value: 2.0487704 + objectReference: {fileID: 0} + - target: {fileID: 7482125358235909741, guid: 40a672532f44209409aa7a924cac8367, type: 3} + propertyPath: m_LocalPosition.y + value: -0.88113517 + objectReference: {fileID: 0} + - target: {fileID: 7482125358235909741, guid: 40a672532f44209409aa7a924cac8367, type: 3} + propertyPath: m_LocalPosition.z + value: 4.7647505 + objectReference: {fileID: 0} + - target: {fileID: 7482125358235909741, guid: 40a672532f44209409aa7a924cac8367, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7482125358235909741, guid: 40a672532f44209409aa7a924cac8367, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7482125358235909741, guid: 40a672532f44209409aa7a924cac8367, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7482125358235909741, guid: 40a672532f44209409aa7a924cac8367, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7482125358235909741, guid: 40a672532f44209409aa7a924cac8367, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7482125358235909741, guid: 40a672532f44209409aa7a924cac8367, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7482125358235909741, guid: 40a672532f44209409aa7a924cac8367, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7661140780953666760, guid: 40a672532f44209409aa7a924cac8367, type: 3} + propertyPath: m_Name + value: NormalAttack + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 40a672532f44209409aa7a924cac8367, type: 3} diff --git a/Assets/Scenes/Playground.unity.meta b/Assets/Scenes/Playground.unity.meta new file mode 100644 index 0000000..0191c3d --- /dev/null +++ b/Assets/Scenes/Playground.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4d7ec97e21c358e479bfc5848dd0c627 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Main/AnimeScript.meta b/Assets/Scripts/Main/AnimeScript.meta new file mode 100644 index 0000000..f14c536 --- /dev/null +++ b/Assets/Scripts/Main/AnimeScript.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a9e24c48bfac31b44b5427c91fb6ef43 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Main/AnimeScript/InAttack.cs b/Assets/Scripts/Main/AnimeScript/InAttack.cs new file mode 100644 index 0000000..1c4afe8 --- /dev/null +++ b/Assets/Scripts/Main/AnimeScript/InAttack.cs @@ -0,0 +1,37 @@ +using Game; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class InAttack : StateMachineBehaviour +{ + public float CanSkipTime = 0.8f; + // OnStateEnter is called when a transition starts and the state machine starts to evaluate this state + override public void OnStateEnter(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) + { + AppEntry.Event.Fire(null, MainPlayerInAttackEventArgs.Create(true)); + } + + // OnState}Update is called on each Update frame between OnStateEnter and OnStateExit callbacks + override public void OnStateUpdate(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) + { + } + + // OnStateExit is called when a transition ends and the state machine finishes evaluating this state + override public void OnStateExit(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) + { + AppEntry.Event.Fire(null, MainPlayerInAttackEventArgs.Create(false)); + } + + // OnStateMove is called right after Animator.OnAnimatorMove() + //override public void OnStateMove(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) + //{ + // // Implement code that processes and affects root motion + //} + + // OnStateIK is called right after Animator.OnAnimatorIK() + //override public void OnStateIK(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) + //{ + // // Implement code that sets up animation IK (inverse kinematics) + //} +} diff --git a/Assets/Scripts/Main/AnimeScript/InAttack.cs.meta b/Assets/Scripts/Main/AnimeScript/InAttack.cs.meta new file mode 100644 index 0000000..d64fd6f --- /dev/null +++ b/Assets/Scripts/Main/AnimeScript/InAttack.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1f25b8c125efdad4585737ed25a28b12 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Main/Battle.meta b/Assets/Scripts/Main/Battle.meta new file mode 100644 index 0000000..e62b0b0 --- /dev/null +++ b/Assets/Scripts/Main/Battle.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a63425bb3f466c74f81f348443e766de +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Main/Battle/AttackBox.cs b/Assets/Scripts/Main/Battle/AttackBox.cs new file mode 100644 index 0000000..863bbc5 --- /dev/null +++ b/Assets/Scripts/Main/Battle/AttackBox.cs @@ -0,0 +1,40 @@ +using Axibug; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace Game +{ + public class AttackBox : MonoBehaviour + { + public E_NODE_TYPE selfNodeType; + public long selfRoleId; + + public void InitNode(RoleBase role) + { + selfNodeType = role.RoleType; + selfRoleId = role.RoleID; + } + + public void OnTriggerEnter(Collider other) + { + //AxibugLog.Debug("OnTriggerEnter => tag" + other.tag); + Debug.Log("OnTriggerEnter => tag " + other.tag); + + //TODO + AppEntry.Event.Fire(null, CameraShakeEventArgs.Create()); + + if (Common.CheckTagIsRole(other.tag, out E_NODE_TYPE Target_nodeType)) + { + + RoleBase underatkrole = other.GetComponent(); + AppEntry.Event.Fire(null, AttackHitEventArgs.Create(selfNodeType, selfRoleId, Target_nodeType, underatkrole.RoleID)); + } + } + + private void OnTriggerExit(Collider other) + { + Debug.Log("OnTriggerExit => tag " + other.tag); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Main/Battle/AttackBox.cs.meta b/Assets/Scripts/Main/Battle/AttackBox.cs.meta new file mode 100644 index 0000000..cf3f5d7 --- /dev/null +++ b/Assets/Scripts/Main/Battle/AttackBox.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6789fd78b2842364aa2ebaefd01e7bfa +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Main/Camera.meta b/Assets/Scripts/Main/Camera.meta new file mode 100644 index 0000000..595b2cd --- /dev/null +++ b/Assets/Scripts/Main/Camera.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7df970919f1b2f54a8050add6eada631 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Main/Camera/CameraShake.cs b/Assets/Scripts/Main/Camera/CameraShake.cs new file mode 100644 index 0000000..f4c0e1f --- /dev/null +++ b/Assets/Scripts/Main/Camera/CameraShake.cs @@ -0,0 +1,61 @@ +using Axibug; +using Axibug.Event; +using Game; +using System.Collections; +using UnityEngine; + + +//TODO ºóÐøÒƶ¯µ½ºÏÊʵÄλÖà +public class CameraShake : MonoBehaviour +{ + public float _magnitude = 0.02f; + + private void OnEnable() + { + AppEntry.Event.Subscribe(CameraShakeEventArgs.EventId, OnCameraShakeEventArgs); + } + + private void OnDisable() + { + AppEntry.Event.Unsubscribe(CameraShakeEventArgs.EventId, OnCameraShakeEventArgs); + } + + private void OnCameraShakeEventArgs(object sender, LogicEventArgs e) + { + CameraShakeEventArgs msg = (CameraShakeEventArgs)e; + if (msg == null) throw new GameException("OnCameraShakeEventArgs is null"); + StartShake(); + } + + + void StartShake() + { + if (IEnumerator_Shake != null) + StopCoroutine(IEnumerator_Shake); + + IEnumerator_Shake = StartCoroutine(PlayCameraShakeAnimation(0.1f, _magnitude)); + } + + Coroutine IEnumerator_Shake; + + public IEnumerator PlayCameraShakeAnimation(float duration, float magnitude) + { + Vector3 originalPosition = Vector3.zero; + float elapsedTime = 0f; + + while (elapsedTime < duration) + { + float x = Random.Range(-1f, 1f) * magnitude; + float y = Random.Range(-1f, 1f) * magnitude; + + transform.localPosition = new Vector3(x, y, originalPosition.z); + elapsedTime += Time.deltaTime; + + yield return null; + } + + transform.localPosition = originalPosition; + + IEnumerator_Shake = null; + } +} \ No newline at end of file diff --git a/Assets/Scripts/Main/Camera/CameraShake.cs.meta b/Assets/Scripts/Main/Camera/CameraShake.cs.meta new file mode 100644 index 0000000..9217f90 --- /dev/null +++ b/Assets/Scripts/Main/Camera/CameraShake.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a0ee4bab85d6cdc4db3954b87da65358 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Main/Common.meta b/Assets/Scripts/Main/Common.meta new file mode 100644 index 0000000..b27cbb1 --- /dev/null +++ b/Assets/Scripts/Main/Common.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8fe62a71a7f0d9d4e801a8792526b422 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Main/Common/Common.cs b/Assets/Scripts/Main/Common/Common.cs new file mode 100644 index 0000000..e315f3b --- /dev/null +++ b/Assets/Scripts/Main/Common/Common.cs @@ -0,0 +1,25 @@ +using UnityEngine; +using UnityEngine.UI; +namespace Game +{ + public class Common + { + static public bool CheckTagIsRole(string tag,out E_NODE_TYPE nodetype) + { + switch (tag) + { + case Tags.MainPlayer: + nodetype = E_NODE_TYPE.N_MAINPLAYER; + return true; + case Tags.NPC: + nodetype = E_NODE_TYPE.N_NPC; + return true; + case Tags.Monster: + nodetype = E_NODE_TYPE.N_MONSTER; + return true; + } + nodetype = E_NODE_TYPE.N_FREE; + return false; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Main/Common/Common.cs.meta b/Assets/Scripts/Main/Common/Common.cs.meta new file mode 100644 index 0000000..e638057 --- /dev/null +++ b/Assets/Scripts/Main/Common/Common.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f6e44a94007b96b44aa7fa57b3dc3c33 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Main/CustomsComponent/InputComponent.cs b/Assets/Scripts/Main/CustomsComponent/InputComponent.cs index 8147254..50ebcc3 100644 --- a/Assets/Scripts/Main/CustomsComponent/InputComponent.cs +++ b/Assets/Scripts/Main/CustomsComponent/InputComponent.cs @@ -11,10 +11,14 @@ namespace Game { public class InputComponent : GameComponent { - public Vector2 InputV2 { get { return _InputV2; } } + public Vector2 InputV2 { get { return _InputV2; } } + public bool Attack { get { return _Attack; } } private Vector2 _clickPoint; //Êó±êµã»÷uiλÖà private Vector2 _InputV2; + private bool _Attack; + + public InputMotionData mInputMotionData = new InputMotionData(); private void Start() { @@ -26,6 +30,8 @@ namespace Game { _InputV2 = Vector2.zero; _clickPoint = Vector2.zero; + _Attack = false; + mInputMotionData.Init(); } @@ -113,11 +119,16 @@ namespace Game { //TODO µã»÷µ½NPC } - else if (obj.CompareTag(Tags.Players)) + else if (obj.CompareTag(Tags.MainPlayer)) { - //TODO µã»÷µ½Íæ¼Ò + //TODO µãµ½×Ô¼º return true; } + //else if (obj.CompareTag(Tags.Players)) + //{ + // //TODO µã»÷µ½Íæ¼Ò + // return true; + //} return false; } @@ -193,16 +204,12 @@ namespace Game void Update_Input() { - ////AD·½Ïò¿ØÖÆ - //_InputV2.x = Input.GetAxis("Horizontal"); - ////WS·½Ïò¿ØÖÆ - //_InputV2.y = Input.GetAxis("Vertical"); //AD·½Ïò¿ØÖÆ _InputV2.x = Input.GetAxisRaw("Horizontal"); //WS·½Ïò¿ØÖÆ _InputV2.y = Input.GetAxisRaw("Vertical"); - //AxibugLog.Debug("InputV2 =>" + InputV2); + _Attack = Input.GetKeyDown(KeyCode.J); } #region Ë«Ö¸ÊÖÊÆ @@ -212,7 +219,6 @@ namespace Game private float min = -300; protected static float current = 0; private float last = -1; - public bool Update_DoubleTouch() { if (false)//ÓÐÆäËûºÍË«Ö¸»¥³âµÄ²Ù×÷ÔòÌø³ö£¬¿É²¹³ä diff --git a/Assets/Scripts/Main/CustomsComponent/MainPlayerComponent.cs b/Assets/Scripts/Main/CustomsComponent/MainPlayerComponent.cs index bb879da..fffc83a 100644 --- a/Assets/Scripts/Main/CustomsComponent/MainPlayerComponent.cs +++ b/Assets/Scripts/Main/CustomsComponent/MainPlayerComponent.cs @@ -8,6 +8,8 @@ using UnityEngine; using static Axibug.Utility; using UnityEditor; using Axibug.Resources; +using Axibug; +using Axibug.Event; namespace Game { @@ -28,6 +30,12 @@ namespace Game MainCamNode = transform.Find("MainCamNode"); CamPos = MainCamNode.Find("CamPos"); InGame = false; + AppEntry.Event.Subscribe(MainPlayerInAttackEventArgs.EventId, OnMainPlayerInAttackEventArgs); + } + + private void OnDisable() + { + AppEntry.Event.Unsubscribe(MainPlayerInAttackEventArgs.EventId, OnMainPlayerInAttackEventArgs); } public void ReSetMainPlayer() @@ -58,6 +66,9 @@ namespace Game public void SetMainCamera() { + //¹ÒÉÏÉãÏñ»úÕ𶯽ű¾ + MainCamNode.gameObject.AddComponent(); + //°ÑÉãÏñ»úNode¹Òµ½Íæ¼ÒÏ MainCamNode.parent = Player.transform; //°ÑÖ÷ÉãÏñ»ú¹Òµ½MainCamNodeµÄCamPosÏ @@ -69,9 +80,57 @@ namespace Game public void Update_MoveForInput() { if (!Player) return; + Player.InputV2 = GamePlayEntry.Input.InputV2; + + if (GamePlayEntry.Input.Attack) + { + //AxibugLog.Debug("DoAttack"); + DoNextMotionAnimeName(); + } } + public void DoNextMotionAnimeName() + { + Player.Anime.BackToIdle(); + string AnimeName; + string AtkBoxAnimeName; + //ÊÇ·ñÊÇ×îÖÕÕÐʽ + bool IsEndMotion = false; + //Ò»´ÎҲû°´Ï + if (!GamePlayEntry.Input.mInputMotionData.CheckHistoryLastMotion(E_MOTION_TYPE.Attack_1)) + { + AnimeName = "Attack_1"; + AtkBoxAnimeName = "HorizontalCut_Down"; + GamePlayEntry.Input.mInputMotionData.AddMontionKey(E_MOTION_TYPE.Attack_1); + } + else + { + //½áÊø¶¯×÷ + AnimeName = "Attack_2"; + AtkBoxAnimeName = "HorizontalCut_Up"; + GamePlayEntry.Input.mInputMotionData.AddMontionKey(E_MOTION_TYPE.Attack_2); + IsEndMotion = true; + } + + Player.Anime.SetAttack(AnimeName); + Player.DoAtkBox(AtkBoxAnimeName); + + if(IsEndMotion) + GamePlayEntry.Input.mInputMotionData.ClearHistoryMotion(); + } + + #region ʼþ + + //½ÇÉ«Òƶ¯ + private void OnMainPlayerInAttackEventArgs(object sender, LogicEventArgs e) + { + MainPlayerInAttackEventArgs msg = (MainPlayerInAttackEventArgs)e; + if (msg == null) throw new GameException("MainPlayerInAttackEventArgs is null"); + Player.IsInAttack = msg.IsIn; + } + + #endregion } } diff --git a/Assets/Scripts/Main/CustomsComponent/RoleMgrComponent.cs b/Assets/Scripts/Main/CustomsComponent/RoleMgrComponent.cs index 6a56757..af94657 100644 --- a/Assets/Scripts/Main/CustomsComponent/RoleMgrComponent.cs +++ b/Assets/Scripts/Main/CustomsComponent/RoleMgrComponent.cs @@ -14,7 +14,6 @@ namespace Game public class RoleMgrComponent : GameComponent { private Queue temp_RemoveUser = new Queue();//ÐèÒªÒƳýµÄÍæ¼ÒÁбí - private Queue temp_RemoveRequest = new Queue();//ÇëÇóÊý¾ÝÁбí private Dictionary dictAllRole = new Dictionary(); private Dictionary> dictRoleList = new Dictionary>(); @@ -111,12 +110,22 @@ namespace Game GamePlayEntry.MainPlayer.transform.position = data.status.pos; SetRigibody(playergo.transform); + //¹Ò×é¼þ MainRole role = playergo.gameObject.AddComponent(); role.Init(data); + //¹¥»÷ºÐ×Ó + GameObject AttackBoxGo = CloneAttackBox(role.BridgeTransfrom); + AttackBoxGo.transform.localPosition = Vector3.zero; + AttackBoxGo.transform.localEulerAngles = Vector3.zero; + + //¹¥»÷ºÐ×Ó¶¯»­»ú + role.AttackBoxAnime = AttackBoxGo.GetComponent(); + AddRole(role); + return role; } @@ -156,6 +165,42 @@ namespace Game return go; } + + private GameObject CloneAttackBox(Transform parent) + { + string rootPath = "Assets/GameAssets"; + string MapName = $"Assets/GameAssets/Prefabs/AttackBox/NormalAttack.prefab"; + string tmp = MapName.Remove(0, rootPath.Length + 1); + int idx = tmp.LastIndexOf('/'); + string bundleName = tmp.Substring(0, idx); + + UnityEngine.Object asset = null; + if (AppEntry.Base.EditorResourceMode) + { +#if UNITY_EDITOR + asset = AssetDatabase.LoadAssetAtPath(MapName); +#endif + } + else + { + int id = MapName.GetHashCode(); + asset = PrefabManager.LoadPrefab(bundleName.ToLower(), MapName, id, parent); + } + + if (asset == null) + { + Debug.LogError($"asset¼ÓÔØʧ°Ü£¬path={MapName}"); + return null; + } + + GameObject go = Instantiate(asset, parent) as GameObject; + if (go == null) + { + Debug.LogError("LoadPrefabByEditor2. go == null. asset:" + asset); + } + return go; + } + void SetRigibody(Transform trans) { Rigidbody mRigidbody = trans.gameObject.AddComponent(); @@ -164,7 +209,6 @@ namespace Game mRigidbody.constraints = RigidbodyConstraints.FreezeRotation; } - } } diff --git a/Assets/Scripts/Main/Definition/DataStruct/Input.meta b/Assets/Scripts/Main/Definition/DataStruct/Input.meta new file mode 100644 index 0000000..15ba420 --- /dev/null +++ b/Assets/Scripts/Main/Definition/DataStruct/Input.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: edb89b575a083204d8e398f4393fcaaa +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Main/Definition/DataStruct/Input/InputMotionData.cs b/Assets/Scripts/Main/Definition/DataStruct/Input/InputMotionData.cs new file mode 100644 index 0000000..6e9895a --- /dev/null +++ b/Assets/Scripts/Main/Definition/DataStruct/Input/InputMotionData.cs @@ -0,0 +1,96 @@ +using System; +using System.Collections.Generic; +using System.Configuration; +using UnityEngine; + +namespace Game +{ + public enum E_MOTION_TYPE + { + None, + Attack_1, + Attack_2, + } + + public class MontionkeyClass + { + public int Frame; + public E_MOTION_TYPE MontionType; + } + + //Ö÷¿ØÍæ¼Ò½ÇÉ«²Ù×÷Êý¾Ý + public class InputMotionData + { + /// + /// ÊͷųöÀ´µÄÐÐΪÀúÊ· + /// + List KeyHistory = new List(); + static Queue tempHistoryQueue = new Queue(); + const int MontionHistoryLimit = 10; + + public void Init() + { + ClearHistoryMotion(); + } + + MontionkeyClass EnqueueOneMotionHistory() + { + if (tempHistoryQueue.Count > 0) + return tempHistoryQueue.Dequeue(); + + return new MontionkeyClass(); + } + + public void AddMontionKey(E_MOTION_TYPE type) + { + while (KeyHistory.Count > MontionHistoryLimit) + { + tempHistoryQueue.Enqueue(KeyHistory[0]); + KeyHistory.RemoveAt(0); + } + + MontionkeyClass motion = EnqueueOneMotionHistory(); + + motion.Frame = Time.frameCount; + motion.MontionType = type; + KeyHistory.Add(motion); + } + + public void ClearHistoryMotion() + { + for (int i = 0; i < KeyHistory.Count; i++) + { + tempHistoryQueue.Enqueue(KeyHistory[i]); + } + KeyHistory.Clear(); + } + + public bool CheckHistoryLastMotion(E_MOTION_TYPE type) + { + if (KeyHistory.Count == 0) + return false; + return KeyHistory[KeyHistory.Count - 1].MontionType == type; + } + + /// + /// ¼ì²éÁ¬ÐøÐÐΪÊÇ·ñÆ¥Åä + /// + /// + /// + public bool CheckHistoryLastMotion(E_MOTION_TYPE[] types) + { + if (KeyHistory.Count < types.Length) + return false; + + for (int i = 0; i < types.Length; i++) + { + if (KeyHistory[KeyHistory.Count - i - 1].MontionType != types[types.Length - i - 1]) + { + return false; + } + } + + return true; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Main/Definition/DataStruct/Input/InputMotionData.cs.meta b/Assets/Scripts/Main/Definition/DataStruct/Input/InputMotionData.cs.meta new file mode 100644 index 0000000..5341ede --- /dev/null +++ b/Assets/Scripts/Main/Definition/DataStruct/Input/InputMotionData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: cc7e63dd67015e74e87a6430ee89cc71 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Main/Definition/DataStruct/Tags.cs b/Assets/Scripts/Main/Definition/DataStruct/Tags.cs index 950143f..a7b7a79 100644 --- a/Assets/Scripts/Main/Definition/DataStruct/Tags.cs +++ b/Assets/Scripts/Main/Definition/DataStruct/Tags.cs @@ -3,7 +3,7 @@ namespace Game public class Tags { public const string MainPlayer = "MainPlayer"; - public const string Players = "Players"; + //public const string Players = "Players"; public const string Monster = "Monster"; public const string NPC = "NPC"; public const string DROP = "Drop"; diff --git a/Assets/Scripts/Main/Definition/Enums/NodeType.cs b/Assets/Scripts/Main/Definition/Enums/NodeType.cs index 4e6709a..16fe91f 100644 --- a/Assets/Scripts/Main/Definition/Enums/NodeType.cs +++ b/Assets/Scripts/Main/Definition/Enums/NodeType.cs @@ -5,7 +5,7 @@ namespace Game public enum E_NODE_TYPE { N_FREE = 0x00, - N_ROLE, // Íæ¼Ò + //N_ROLE, // Íæ¼Ò N_MONSTER, N_NPC, N_PET, diff --git a/Assets/Scripts/Main/Event.meta b/Assets/Scripts/Main/Event.meta new file mode 100644 index 0000000..6f668f7 --- /dev/null +++ b/Assets/Scripts/Main/Event.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d56461f9370705e42bd78077d8da5511 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Main/Event/BattleEvent.meta b/Assets/Scripts/Main/Event/BattleEvent.meta new file mode 100644 index 0000000..b558d28 --- /dev/null +++ b/Assets/Scripts/Main/Event/BattleEvent.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 185a8df97a2ee2540bf2cb51d1c32b2a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Main/Event/BattleEvent/AttackHitEventArgs.cs b/Assets/Scripts/Main/Event/BattleEvent/AttackHitEventArgs.cs new file mode 100644 index 0000000..688ddc8 --- /dev/null +++ b/Assets/Scripts/Main/Event/BattleEvent/AttackHitEventArgs.cs @@ -0,0 +1,37 @@ +using Axibug; +using Axibug.Event; + +namespace Game +{ + public class AttackHitEventArgs : LogicEventArgs + { + public static readonly int EventId = typeof(AttackHitEventArgs).GetHashCode(); + public E_NODE_TYPE Attacker_Type = E_NODE_TYPE.N_FREE; + public long Attacker_RoleID = 0; + public E_NODE_TYPE UnderAtk_Type = E_NODE_TYPE.N_FREE; + public long UnderAtk_RoleID = 0; + + /// + /// »ñÈ¡¼ÓÔØÊý¾Ý±í³É¹¦Ê¼þ±àºÅ¡£ + /// + public override int Id { get { return EventId; } } + + public static AttackHitEventArgs Create(E_NODE_TYPE attacker_Type, long attacker_RoleID, E_NODE_TYPE underAtk_Type, long underAtk_RoleID) + { + AttackHitEventArgs s = ReferencePool.Acquire(); + s.Attacker_Type = attacker_Type; + s.Attacker_RoleID = attacker_RoleID; + s.UnderAtk_Type = underAtk_Type; + s.UnderAtk_RoleID = underAtk_RoleID; + return s; + } + + public override void Clear() + { + Attacker_Type = E_NODE_TYPE.N_FREE; + Attacker_RoleID = 0; + UnderAtk_Type = E_NODE_TYPE.N_FREE; + UnderAtk_RoleID = 0; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Main/Event/BattleEvent/AttackHitEventArgs.cs.meta b/Assets/Scripts/Main/Event/BattleEvent/AttackHitEventArgs.cs.meta new file mode 100644 index 0000000..38bdc4b --- /dev/null +++ b/Assets/Scripts/Main/Event/BattleEvent/AttackHitEventArgs.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7b87c0b98be9b4e418555aa2aac7c3fb +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Main/Event/CameraEvent.meta b/Assets/Scripts/Main/Event/CameraEvent.meta new file mode 100644 index 0000000..42912a9 --- /dev/null +++ b/Assets/Scripts/Main/Event/CameraEvent.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 56f7c50c8cfd7994c8af471807dc7311 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Main/Event/CameraEvent/CameraShakeEventArgs.cs b/Assets/Scripts/Main/Event/CameraEvent/CameraShakeEventArgs.cs new file mode 100644 index 0000000..d306749 --- /dev/null +++ b/Assets/Scripts/Main/Event/CameraEvent/CameraShakeEventArgs.cs @@ -0,0 +1,25 @@ +using Axibug; +using Axibug.Event; + +namespace Game +{ + public class CameraShakeEventArgs : LogicEventArgs + { + public static readonly int EventId = typeof(CameraShakeEventArgs).GetHashCode(); + + /// + /// »ñÈ¡¼ÓÔØÊý¾Ý±í³É¹¦Ê¼þ±àºÅ¡£ + /// + public override int Id { get { return EventId; } } + + public static CameraShakeEventArgs Create() + { + CameraShakeEventArgs s = ReferencePool.Acquire(); + return s; + } + + public override void Clear() + { + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Main/Event/CameraEvent/CameraShakeEventArgs.cs.meta b/Assets/Scripts/Main/Event/CameraEvent/CameraShakeEventArgs.cs.meta new file mode 100644 index 0000000..ca621fa --- /dev/null +++ b/Assets/Scripts/Main/Event/CameraEvent/CameraShakeEventArgs.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 76b0ab59ed89d32419df165338225ac5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Main/Event/MainPlayerInput.meta b/Assets/Scripts/Main/Event/MainPlayerInput.meta new file mode 100644 index 0000000..0921d93 --- /dev/null +++ b/Assets/Scripts/Main/Event/MainPlayerInput.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4385bce4eb19ca84c881d97d4ebf91bb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Main/Event/MainPlayerInput/MainPlayerInAttackEventArgs.cs b/Assets/Scripts/Main/Event/MainPlayerInput/MainPlayerInAttackEventArgs.cs new file mode 100644 index 0000000..5171493 --- /dev/null +++ b/Assets/Scripts/Main/Event/MainPlayerInput/MainPlayerInAttackEventArgs.cs @@ -0,0 +1,28 @@ +using Axibug; +using Axibug.Event; + +namespace Game +{ + public class MainPlayerInAttackEventArgs : LogicEventArgs + { + public static readonly int EventId = typeof(MainPlayerInAttackEventArgs).GetHashCode(); + public bool IsIn = false; + + /// + /// »ñÈ¡¼ÓÔØÊý¾Ý±í³É¹¦Ê¼þ±àºÅ¡£ + /// + public override int Id { get { return EventId; } } + + public static MainPlayerInAttackEventArgs Create(bool isIn) + { + MainPlayerInAttackEventArgs s = ReferencePool.Acquire(); + s.IsIn = isIn; + return s; + } + + public override void Clear() + { + IsIn = false; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Main/Event/MainPlayerInput/MainPlayerInAttackEventArgs.cs.meta b/Assets/Scripts/Main/Event/MainPlayerInput/MainPlayerInAttackEventArgs.cs.meta new file mode 100644 index 0000000..524fd25 --- /dev/null +++ b/Assets/Scripts/Main/Event/MainPlayerInput/MainPlayerInAttackEventArgs.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 347f132693fbf1c4fb9c065d0681e479 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Main/Event/MainPlayerInput/MainPlayerPushNewMotionEventArgs.cs b/Assets/Scripts/Main/Event/MainPlayerInput/MainPlayerPushNewMotionEventArgs.cs new file mode 100644 index 0000000..4b5c0ab --- /dev/null +++ b/Assets/Scripts/Main/Event/MainPlayerInput/MainPlayerPushNewMotionEventArgs.cs @@ -0,0 +1,28 @@ +using Axibug; +using Axibug.Event; + +namespace Game +{ + public class MainPlayerPushNewMotionEventArgs : LogicEventArgs + { + public static readonly int EventId = typeof(MainPlayerPushNewMotionEventArgs).GetHashCode(); + public E_MOTION_TYPE Motion = E_MOTION_TYPE.None; + + /// + /// »ñÈ¡¼ÓÔØÊý¾Ý±í³É¹¦Ê¼þ±àºÅ¡£ + /// + public override int Id { get { return EventId; } } + + public static MainPlayerPushNewMotionEventArgs Create(E_MOTION_TYPE motion) + { + MainPlayerPushNewMotionEventArgs s = ReferencePool.Acquire(); + s.Motion = motion; + return s; + } + + public override void Clear() + { + Motion = E_MOTION_TYPE.None; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Main/Event/MainPlayerInput/MainPlayerPushNewMotionEventArgs.cs.meta b/Assets/Scripts/Main/Event/MainPlayerInput/MainPlayerPushNewMotionEventArgs.cs.meta new file mode 100644 index 0000000..e0ab458 --- /dev/null +++ b/Assets/Scripts/Main/Event/MainPlayerInput/MainPlayerPushNewMotionEventArgs.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0c1c8c3e6387f3e43a9f6de71eedfba0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Main/Role/CharacterMachine/CharacterMachine.cs b/Assets/Scripts/Main/Role/CharacterMachine/CharacterMachine.cs index b646cf0..002ddae 100644 --- a/Assets/Scripts/Main/Role/CharacterMachine/CharacterMachine.cs +++ b/Assets/Scripts/Main/Role/CharacterMachine/CharacterMachine.cs @@ -53,10 +53,14 @@ namespace Game _animator.SetBool("Dead", false); } + //public void SetAttack(string anim) + //{ + // _animator.SetBool(anim, true); + //} public void SetAttack(string anim) { - _animator.SetBool(anim, true); + _animator.Play(anim); } public void SetOtherAnime(string anim) diff --git a/Assets/Scripts/Main/Role/MainRole.cs b/Assets/Scripts/Main/Role/MainRole.cs index 26c018e..0722251 100644 --- a/Assets/Scripts/Main/Role/MainRole.cs +++ b/Assets/Scripts/Main/Role/MainRole.cs @@ -16,7 +16,17 @@ namespace Game base.Init(data); } - public override void MeshChangeState(bool ToMoveState) + protected override void OnEnable() + { + base.OnEnable(); + } + + protected override void OnDisable() + { + base.OnDisable(); + } + + public override void MeshChangeMoveState(bool ToMoveState) { if (ToMoveState) { diff --git a/Assets/Scripts/Main/Role/RoleBase.cs b/Assets/Scripts/Main/Role/RoleBase.cs index 8534988..e4e42fe 100644 --- a/Assets/Scripts/Main/Role/RoleBase.cs +++ b/Assets/Scripts/Main/Role/RoleBase.cs @@ -12,12 +12,20 @@ namespace Game public E_NODE_TYPE RoleType => mBaseData.RoleType; public long RoleID => mBaseData.innate.roleid; public ICharMachineBase Anime => mAnime; + + public Animator AttackBoxAnime; + public AttackBox AttackBoxCollider; + public Vector2 InputV2; public bool mIsMove = false; public bool mIsLeft = false; + public bool IsInAttack = false; bool LastIsMove = false; bool LastIsLeft = false; + public Transform ModelTransfrom { get { return mModelTransfrom; } } + public Transform BridgeTransfrom { get { return mBridgeTransfrom; } } + /// /// ¶¯»­¿ØÖÆÆ÷ /// @@ -47,8 +55,14 @@ namespace Game mIsLeft = false; LastIsLeft = false; + IsInAttack = false; + MeshChangeDir(mIsLeft); } + protected virtual void OnDisable() + { + + } /// /// ³õʼ»¯ @@ -72,45 +86,62 @@ namespace Game } } + public virtual void SetAttackBoxAnime(Animator attackBoxAnime) + { + AttackBoxAnime = attackBoxAnime; + AttackBoxCollider = attackBoxAnime.transform.Find("Node1/Box1").GetComponent(); + AttackBoxCollider.InitNode(this); + } + protected virtual void Update() { #region Òƶ¯ - //ÊÇ·ñÒƶ¯ - bool ToMoveState = false; - if (InputV2 != Vector2.zero) - ToMoveState = true; - if (LastIsMove != ToMoveState) + if (IsInAttack) { - AxibugLog.Debug("MeshChangeState =>" + ToMoveState); - MeshChangeState(ToMoveState); + LastIsMove = false; + Move_currentVector = Vector3.zero; } - LastIsMove = ToMoveState; + else + { + //ÊÇ·ñÒƶ¯ + bool ToMoveState = false; + if (InputV2 != Vector2.zero) + ToMoveState = true; - Move_currentVector = new Vector3(InputV2.x, 0, InputV2.y); - AxibugLog.Debug("Move_currentVector =>" + Move_currentVector); + if (LastIsMove != ToMoveState) + { + //AxibugLog.Debug("MeshChangeMoveState =>" + ToMoveState); + MeshChangeMoveState(ToMoveState); + } + LastIsMove = ToMoveState; + + Move_currentVector = new Vector3(InputV2.x, 0, InputV2.y); + //AxibugLog.Debug("Move_currentVector =>" + Move_currentVector); + + + //³¯Ïò + bool ToLeftDir = false; + bool bChange = false; + if (InputV2.x < 0) + { + ToLeftDir = true; + bChange = true; + } + else if (InputV2.x > 0) + { + ToLeftDir = false; + bChange = true; + } + + if (bChange && LastIsLeft != ToLeftDir) + { + //AxibugLog.Debug("MeshChangeDir =>" + ToLeftDir); + MeshChangeDir(ToLeftDir); + LastIsLeft = ToLeftDir; + } + } #endregion - - //³¯Ïò - bool ToLeftDir = false; - bool bChange = false; - if (InputV2.x < 0) - { - ToLeftDir = true; - bChange = true; - } - else if (InputV2.x > 0) - { - ToLeftDir = false; - bChange = true; - } - - if (bChange && LastIsLeft != ToLeftDir) - { - AxibugLog.Debug("MeshChangeDir =>" + ToLeftDir); - MeshChangeDir(ToLeftDir); - LastIsLeft = ToLeftDir; - } } protected virtual void FixedUpdate() @@ -118,7 +149,7 @@ namespace Game FixedUpdate_Move(); } - public abstract void MeshChangeState(bool ToMoveState); + public abstract void MeshChangeMoveState(bool ToMoveState); public void MeshChangeDir(bool ToLeftDir) { @@ -141,7 +172,14 @@ namespace Game Vector3 _playerPos = mRigidbody.position; _playerPos += Move_currentVector * Move_Speed * Time.deltaTime; mRigidbody.MovePosition(_playerPos); - AxibugLog.Debug("FixedUpdate_Move =>" + _playerPos); + //AxibugLog.Debug("FixedUpdate_Move =>" + _playerPos); + } + #endregion + + #region ¹¥»÷ºÐ×Ó¶¯»­»ú + public void DoAtkBox(string AtkBoxAnimeName) + { + AttackBoxAnime.Play(AtkBoxAnimeName); } #endregion } diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 4f9547c..96b584b 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -5,7 +5,6 @@ TagManager: serializedVersion: 2 tags: - MainPlayer - - Players - Monster - NPC - Drop @@ -29,7 +28,7 @@ TagManager: - - - - - + - AttackBox - - PostProcessing - diff --git a/Unity.AssetBundleBrowser.Editor.csproj b/Unity.AssetBundleBrowser.Editor.csproj index 2469bfc..bddd547 100644 --- a/Unity.AssetBundleBrowser.Editor.csproj +++ b/Unity.AssetBundleBrowser.Editor.csproj @@ -22,7 +22,7 @@ full false Temp\Bin\Debug\ - UNITY_2020_3_33;UNITY_2020_3;UNITY_2020;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;UNITY_2020_2_OR_NEWER;UNITY_2020_3_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;USE_SEARCH_ENGINE_API;SCENE_TEMPLATE_MODULE;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;ENABLE_MANAGED_UNITYTLS;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;PLATFORM_STANDALONE;PLATFORM_STANDALONE_WIN;UNITY_STANDALONE_WIN;UNITY_STANDALONE;UNITY_UGP_API;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;PLATFORM_UPDATES_TIME_OUTSIDE_OF_PLAYER_LOOP;GFXDEVICE_WAITFOREVENT_MESSAGEPUMP;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_IG;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_CLOUD_FEATURES;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_LEGACY_INPUT_MANAGER;UNITY_POST_PROCESSING_STACK_V2;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER + UNITY_2020_3_33;UNITY_2020_3;UNITY_2020;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;UNITY_2020_2_OR_NEWER;UNITY_2020_3_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;USE_SEARCH_ENGINE_API;SCENE_TEMPLATE_MODULE;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;ENABLE_MANAGED_UNITYTLS;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;PLATFORM_STANDALONE;PLATFORM_STANDALONE_WIN;UNITY_STANDALONE_WIN;UNITY_STANDALONE;UNITY_UGP_API;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;PLATFORM_UPDATES_TIME_OUTSIDE_OF_PLAYER_LOOP;GFXDEVICE_WAITFOREVENT_MESSAGEPUMP;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_IG;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_CLOUD_FEATURES;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_LEGACY_INPUT_MANAGER;UNITY_POST_PROCESSING_STACK_V2;ENABLE_LOG;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER prompt 4 0169 @@ -53,7 +53,7 @@ 2020.3.33f1c2 - + @@ -80,244 +80,244 @@ - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.AIModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.AIModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.ARModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.ARModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.AccessibilityModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.AccessibilityModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.AndroidJNIModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.AndroidJNIModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.AnimationModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.AnimationModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.AssetBundleModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.AssetBundleModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.AudioModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.AudioModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.AutoStreamingModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.AutoStreamingModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.ClothModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.ClothModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.CloudFoundationModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.CloudFoundationModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.ClusterInputModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.ClusterInputModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.ClusterRendererModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.ClusterRendererModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.CoreModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.CoreModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.CrashReportingModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.CrashReportingModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.DSPGraphModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.DSPGraphModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.DirectorModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.DirectorModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.GIModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.GIModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.GameCenterModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.GameCenterModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.GridModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.GridModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.HotReloadModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.HotReloadModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.IMGUIModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.IMGUIModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.ImageConversionModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.ImageConversionModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.InputModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.InputModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.InputLegacyModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.InputLegacyModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.JSONSerializeModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.JSONSerializeModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.LocalizationModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.LocalizationModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.ParticleSystemModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.ParticleSystemModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.PerformanceReportingModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.PerformanceReportingModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.PhysicsModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.PhysicsModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.Physics2DModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.Physics2DModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.ProfilerModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.ProfilerModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.RuntimeInitializeOnLoadManagerInitializerModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.RuntimeInitializeOnLoadManagerInitializerModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.ScreenCaptureModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.ScreenCaptureModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.SharedInternalsModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.SharedInternalsModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.SpriteMaskModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.SpriteMaskModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.SpriteShapeModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.SpriteShapeModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.StreamingModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.StreamingModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.SubstanceModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.SubstanceModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.SubsystemsModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.SubsystemsModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.TLSModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.TLSModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.TerrainModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.TerrainModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.TerrainPhysicsModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.TerrainPhysicsModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.TextCoreModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.TextCoreModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.TextRenderingModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.TextRenderingModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.TilemapModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.TilemapModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.UIModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.UIModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.UIElementsModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.UIElementsModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.UIElementsNativeModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.UIElementsNativeModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.UNETModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.UNETModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.UmbraModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.UmbraModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.UnityAnalyticsModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.UnityAnalyticsModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.UnityConnectModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.UnityConnectModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.UnityCurlModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.UnityCurlModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.UnityTestProtocolModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.UnityTestProtocolModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.UnityWebRequestModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.UnityWebRequestModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.UnityWebRequestAssetBundleModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.UnityWebRequestAssetBundleModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.UnityWebRequestAudioModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.UnityWebRequestAudioModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.UnityWebRequestTextureModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.UnityWebRequestTextureModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.UnityWebRequestWWWModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.UnityWebRequestWWWModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.VFXModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.VFXModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.VRModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.VRModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.VehiclesModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.VehiclesModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.VideoModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.VideoModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.VirtualTexturingModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.VirtualTexturingModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.WindModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.WindModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.XRModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.XRModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEditor.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEditor.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEditor.CoreModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEditor.CoreModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEditor.GraphViewModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEditor.GraphViewModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEditor.PackageManagerUIModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEditor.PackageManagerUIModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEditor.SceneTemplateModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEditor.SceneTemplateModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEditor.UIElementsModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEditor.UIElementsModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEditor.UIElementsSamplesModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEditor.UIElementsSamplesModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEditor.UIServiceModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEditor.UIServiceModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEditor.UnityConnectModule.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEngine\UnityEditor.UnityConnectModule.dll - D:\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEditor.Graphs.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\Managed\UnityEditor.Graphs.dll - D:\Unity\2020.3.33f1c2\Editor\Data\PlaybackEngines\AndroidPlayer\UnityEditor.Android.Extensions.dll - - - D:\Unity\2020.3.33f1c2\Editor\Data\PlaybackEngines\iOSSupport\UnityEditor.iOS.Extensions.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\PlaybackEngines\AndroidPlayer\UnityEditor.Android.Extensions.dll - D:\Unity\2020.3.33f1c2\Editor\Data\PlaybackEngines\WindowsStandaloneSupport\UnityEditor.WindowsStandalone.Extensions.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\PlaybackEngines\WindowsStandaloneSupport\UnityEditor.WindowsStandalone.Extensions.dll + + + C:\Program Files (x86)\Microsoft Visual Studio Tools for Unity\16.0\Editor\SyntaxTree.VisualStudio.Unity.Bridge.dll Library\PackageCache\com.unity.collab-proxy@1.15.15\Lib\Editor\PlasticSCM\Unity.Plastic.Newtonsoft.Json.dll @@ -352,359 +352,353 @@ Library\PackageCache\com.unity.ext.nunit@1.0.6\net35\unity-custom\nunit.framework.dll - - D:\Unity\2020.3.33f1c2\Editor\Data\PlaybackEngines\iOSSupport\UnityEditor.iOS.Extensions.Xcode.dll - - - D:\Unity\2020.3.33f1c2\Editor\Data\PlaybackEngines\iOSSupport\UnityEditor.iOS.Extensions.Common.dll - - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\mscorlib.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\mscorlib.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\System.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\System.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\System.Core.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\System.Core.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\System.Runtime.Serialization.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\System.Runtime.Serialization.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\System.Xml.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\System.Xml.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\System.Xml.Linq.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\System.Xml.Linq.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\System.Numerics.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\System.Numerics.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\System.Numerics.Vectors.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\System.Numerics.Vectors.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\System.Net.Http.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\System.Net.Http.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\System.IO.Compression.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\System.IO.Compression.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Microsoft.CSharp.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Microsoft.CSharp.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\System.Data.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\System.Data.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\Microsoft.Win32.Primitives.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\Microsoft.Win32.Primitives.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\netstandard.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\netstandard.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.AppContext.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.AppContext.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Collections.Concurrent.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Collections.Concurrent.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Collections.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Collections.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Collections.NonGeneric.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Collections.NonGeneric.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Collections.Specialized.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Collections.Specialized.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.ComponentModel.Annotations.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.ComponentModel.Annotations.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.ComponentModel.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.ComponentModel.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.ComponentModel.EventBasedAsync.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.ComponentModel.EventBasedAsync.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.ComponentModel.Primitives.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.ComponentModel.Primitives.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.ComponentModel.TypeConverter.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.ComponentModel.TypeConverter.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Console.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Console.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Data.Common.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Data.Common.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Diagnostics.Contracts.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Diagnostics.Contracts.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Diagnostics.Debug.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Diagnostics.Debug.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Diagnostics.FileVersionInfo.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Diagnostics.FileVersionInfo.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Diagnostics.Process.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Diagnostics.Process.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Diagnostics.StackTrace.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Diagnostics.StackTrace.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Diagnostics.TextWriterTraceListener.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Diagnostics.TextWriterTraceListener.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Diagnostics.Tools.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Diagnostics.Tools.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Diagnostics.TraceSource.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Diagnostics.TraceSource.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Drawing.Primitives.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Drawing.Primitives.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Dynamic.Runtime.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Dynamic.Runtime.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Globalization.Calendars.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Globalization.Calendars.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Globalization.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Globalization.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Globalization.Extensions.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Globalization.Extensions.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.IO.Compression.ZipFile.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.IO.Compression.ZipFile.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.IO.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.IO.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.IO.FileSystem.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.IO.FileSystem.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.IO.FileSystem.DriveInfo.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.IO.FileSystem.DriveInfo.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.IO.FileSystem.Primitives.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.IO.FileSystem.Primitives.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.IO.FileSystem.Watcher.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.IO.FileSystem.Watcher.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.IO.IsolatedStorage.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.IO.IsolatedStorage.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.IO.MemoryMappedFiles.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.IO.MemoryMappedFiles.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.IO.Pipes.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.IO.Pipes.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.IO.UnmanagedMemoryStream.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.IO.UnmanagedMemoryStream.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Linq.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Linq.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Linq.Expressions.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Linq.Expressions.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Linq.Parallel.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Linq.Parallel.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Linq.Queryable.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Linq.Queryable.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Net.Http.Rtc.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Net.Http.Rtc.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Net.NameResolution.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Net.NameResolution.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Net.NetworkInformation.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Net.NetworkInformation.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Net.Ping.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Net.Ping.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Net.Primitives.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Net.Primitives.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Net.Requests.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Net.Requests.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Net.Security.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Net.Security.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Net.Sockets.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Net.Sockets.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Net.WebHeaderCollection.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Net.WebHeaderCollection.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Net.WebSockets.Client.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Net.WebSockets.Client.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Net.WebSockets.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Net.WebSockets.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.ObjectModel.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.ObjectModel.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Reflection.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Reflection.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Reflection.Emit.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Reflection.Emit.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Reflection.Emit.ILGeneration.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Reflection.Emit.ILGeneration.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Reflection.Emit.Lightweight.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Reflection.Emit.Lightweight.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Reflection.Extensions.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Reflection.Extensions.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Reflection.Primitives.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Reflection.Primitives.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Resources.Reader.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Resources.Reader.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Resources.ResourceManager.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Resources.ResourceManager.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Resources.Writer.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Resources.Writer.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Runtime.CompilerServices.VisualC.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Runtime.CompilerServices.VisualC.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Runtime.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Runtime.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Runtime.Extensions.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Runtime.Extensions.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Runtime.Handles.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Runtime.Handles.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Runtime.InteropServices.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Runtime.InteropServices.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Runtime.InteropServices.RuntimeInformation.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Runtime.InteropServices.RuntimeInformation.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Runtime.InteropServices.WindowsRuntime.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Runtime.InteropServices.WindowsRuntime.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Runtime.Numerics.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Runtime.Numerics.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Runtime.Serialization.Formatters.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Runtime.Serialization.Formatters.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Runtime.Serialization.Json.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Runtime.Serialization.Json.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Runtime.Serialization.Primitives.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Runtime.Serialization.Primitives.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Runtime.Serialization.Xml.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Runtime.Serialization.Xml.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Security.Claims.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Security.Claims.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Security.Cryptography.Algorithms.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Security.Cryptography.Algorithms.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Security.Cryptography.Csp.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Security.Cryptography.Csp.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Security.Cryptography.Encoding.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Security.Cryptography.Encoding.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Security.Cryptography.Primitives.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Security.Cryptography.Primitives.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Security.Cryptography.X509Certificates.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Security.Cryptography.X509Certificates.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Security.Principal.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Security.Principal.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Security.SecureString.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Security.SecureString.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.ServiceModel.Duplex.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.ServiceModel.Duplex.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.ServiceModel.Http.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.ServiceModel.Http.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.ServiceModel.NetTcp.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.ServiceModel.NetTcp.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.ServiceModel.Primitives.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.ServiceModel.Primitives.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.ServiceModel.Security.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.ServiceModel.Security.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Text.Encoding.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Text.Encoding.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Text.Encoding.Extensions.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Text.Encoding.Extensions.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Text.RegularExpressions.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Text.RegularExpressions.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Threading.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Threading.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Threading.Overlapped.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Threading.Overlapped.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Threading.Tasks.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Threading.Tasks.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Threading.Tasks.Parallel.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Threading.Tasks.Parallel.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Threading.Thread.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Threading.Thread.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Threading.ThreadPool.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Threading.ThreadPool.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Threading.Timer.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Threading.Timer.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.ValueTuple.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.ValueTuple.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Xml.ReaderWriter.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Xml.ReaderWriter.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Xml.XDocument.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Xml.XDocument.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Xml.XmlDocument.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Xml.XmlDocument.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Xml.XmlSerializer.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Xml.XmlSerializer.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Xml.XPath.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Xml.XPath.dll - D:\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Xml.XPath.XDocument.dll + F:\Program Files\Unity\2020.3.33f1c2\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades\System.Xml.XPath.XDocument.dll Library\ScriptAssemblies\UnityEditor.UI.dll diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index eb48357..222ac95 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -15,6 +15,9 @@ EditorUserSettings: value: 2242470311464669081d033702205a03593b112d243c1431343a4f17adc43135eda812ecea350c3f3c0cea721130082beb flags: 0 RecentlyUsedScenePath-3: + value: 22424703114646680e0b0227036c6f1c170e1f38233d2834633c133af6f9 + flags: 0 + RecentlyUsedScenePath-4: value: 22424703114646680e0b0227036c72111f192b292926237e38271427fb flags: 0 UnityEditor.ShaderGraph.Blackboard: