diff options
73 files changed, 847 insertions, 330 deletions
diff --git a/Assets/ActionTool/ActionToolGizmos.cs b/Assets/ActionTool/ActionToolGizmos.cs index eda72b1c..f1d90911 100644 --- a/Assets/ActionTool/ActionToolGizmos.cs +++ b/Assets/ActionTool/ActionToolGizmos.cs @@ -37,11 +37,11 @@ namespace ActionTool void DrawAxis()
{
Gizmos.color = Color.red;
- Gizmos.DrawLine(Vector3.zero, Vector3.right * 1000);
+ Gizmos.DrawLine(-Vector3.right * 1000, Vector3.right * 1000);
Gizmos.color = Color.green;
Gizmos.DrawLine(Vector3.zero, Vector3.up * 1000);
Gizmos.color = Color.blue;
- Gizmos.DrawLine(-Vector3.forward * 1000, Vector3.forward * 1000);
+ Gizmos.DrawLine(Vector3.zero, Vector3.forward * 1000);
}
void DrawColliders()
diff --git a/Assets/ActionTool/Editor/ActionData.cs b/Assets/ActionTool/Editor/ActionData.cs index 85b0cc6e..03dc6b86 100644 --- a/Assets/ActionTool/Editor/ActionData.cs +++ b/Assets/ActionTool/Editor/ActionData.cs @@ -204,10 +204,11 @@ namespace ActionTool if(applyRootMotion && m_RootMotion)
{
#if true
- m_Animator.transform.position = m_RootMotion.GetRootMotion(normalizeTime);
+ // Action Tool这里需要转换一下root motion的轴
+ m_Animator.transform.position = RootMotionUtility.ExchangeXZ(m_RootMotion.GetRootMotion(normalizeTime));
#else
Vector3 dis = m_RootMotion.GetRootMotionDistance(m_PrevNormalTime, normalizeTime);
- m_Animator.transform.position += dis;
+ m_Animator.transform.position += RootMotionUtility.ExchangeXZ(dis);
m_PrevNormalTime = normalizeTime;
#endif
}
diff --git a/Assets/ActionTool/Editor/ActionManager.cs b/Assets/ActionTool/Editor/ActionManager.cs index 2d45630e..52311140 100644 --- a/Assets/ActionTool/Editor/ActionManager.cs +++ b/Assets/ActionTool/Editor/ActionManager.cs @@ -63,7 +63,7 @@ namespace ActionTool public static Vector3 s_InitPosition = Vector3.zero;
- public static Quaternion s_InitRotation = Quaternion.identity;
+ public static Quaternion s_InitRotation = Quaternion.Euler(0,90,0);
private static RootMotionData s_RootMotion;
diff --git a/Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta b/Assets/Art/Models/Characters/Erika2/Erika2.Avatar.meta index b76e98a5..4627f5df 100644 --- a/Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta +++ b/Assets/Art/Models/Characters/Erika2/Erika2.Avatar.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 20381b3eecfbfe34a9d9222868969d29 +guid: d467e546efed7054c934b1a97a116c5c folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta b/Assets/Art/Models/Characters/Erika2/Erika2.AvatarDescription.meta index 41200932..ab214036 100644 --- a/Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta +++ b/Assets/Art/Models/Characters/Erika2/Erika2.AvatarDescription.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: abff7cb61c760094f8ab9437379e0f2c +guid: 063d53dfefca4e3429f5788835b0b4ea folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Bundle/Material.meta b/Assets/Art/Models/Characters/Erika2/Erika2.BlendShapes.meta index 85215e86..ee2ffc5f 100644 --- a/Assets/Bundle/Material.meta +++ b/Assets/Art/Models/Characters/Erika2/Erika2.BlendShapes.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8641bb4d4eee8b1419a1c8316ff9aee5 +guid: b82ae836c84f36049bdbdb08743b98e0 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.Materials.meta b/Assets/Art/Models/Characters/Erika2/Erika2.Materials.meta new file mode 100644 index 00000000..e0cb5de8 --- /dev/null +++ b/Assets/Art/Models/Characters/Erika2/Erika2.Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c219c63d9953ba84b8cbe80444bdbf22 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.Meshes.meta b/Assets/Art/Models/Characters/Erika2/Erika2.Meshes.meta new file mode 100644 index 00000000..640ede12 --- /dev/null +++ b/Assets/Art/Models/Characters/Erika2/Erika2.Meshes.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 32ad36f78e7f23f46a0ce64fce991723 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.MetaObject.meta b/Assets/Art/Models/Characters/Erika2/Erika2.MetaObject.meta new file mode 100644 index 00000000..4d017390 --- /dev/null +++ b/Assets/Art/Models/Characters/Erika2/Erika2.MetaObject.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 93031cff7ea5a314ca110920f817635f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.Textures.meta b/Assets/Art/Models/Characters/Erika2/Erika2.Textures.meta new file mode 100644 index 00000000..0d171fe4 --- /dev/null +++ b/Assets/Art/Models/Characters/Erika2/Erika2.Textures.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 69c2852d26b47fa44a688db1349ae258 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Projectile.meta b/Assets/Bundle/Projectile.meta deleted file mode 100644 index b01252f1..00000000 --- a/Assets/Bundle/Projectile.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 370f39b2edf043241a00acd3f6844aa6 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Bundle/Shader.meta b/Assets/Bundle/Shader.meta deleted file mode 100644 index 92ded933..00000000 --- a/Assets/Bundle/Shader.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5a8ba4f43d9a7b24d855cadccb986b60 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Bundle/UI.meta b/Assets/Bundle/UI.meta deleted file mode 100644 index 0914914c..00000000 --- a/Assets/Bundle/UI.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4392471259b05a74a82a4bc72b510eb1 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Bundle/Unit/Monster.meta b/Assets/Bundle/Unit/Monster.meta deleted file mode 100644 index 51d19a1d..00000000 --- a/Assets/Bundle/Unit/Monster.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 98c6b7d15b8909e4b911c42ea72b9930 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Bundle/Unit/NPC.meta b/Assets/Bundle/Unit/NPC.meta deleted file mode 100644 index eeea13e1..00000000 --- a/Assets/Bundle/Unit/NPC.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8ced034d375cdfa488814663ea17a79b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Dash.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Dash.asset index 07ea538e..416c2c91 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Dash.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Dash.asset @@ -10,14 +10,40 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: cab6406109041434e890f22d6455172f, type: 3} - m_Name: Air_Dash + m_Name: Air_Dash(Clone) m_EditorClassIdentifier: animationName: Air_Dash animationPath: Assets/Art/Animations/Erika/Air_Dash.anim animationEvents: [] hurtBoxes: - - type: 1 - pivot: 0 + - collider: + type: 0 + pivot: 0 + multiHit: 0 + hitBack: {x: 0, y: 0, z: 0} + freezeFramesSelf: 0 + freezeFramesOther: 0 + sparkPath: + sparkAnchor: 0 + sparkOffset: {x: 0, y: 0, z: 0} + multiSparks: 0 + spark2Path: + spark2Anchor: 0 + spark2Offset: {x: 0, y: 0, z: 0} + spark3Path: + spark3Anchor: 0 + spark3Offset: {x: 0, y: 0, z: 0} + selfEffect: 0 + otherEffect: 0 + zoomCamera: 0 + shakeScreen: 0 + shakeOffset: {x: 0, y: 0} + shakeStrength: 0 + colorDrift: 0 + blur: 0 + soundPath: + useGravity: 0 + multiple: 0 frames: - frame: 0 active: 1 @@ -44,9 +70,70 @@ MonoBehaviour: position: {x: 0, y: 0, z: 0} size: {x: 1, y: 1.34, z: 0.5} hitBoxes: - - type: 0 - pivot: 1 + - collider: + type: 0 + pivot: 0 + multiHit: 0 + hitBack: {x: 0, y: 0, z: 0} + freezeFramesSelf: 0 + freezeFramesOther: 0 + sparkPath: + sparkAnchor: 0 + sparkOffset: {x: 0, y: 0, z: 0} + multiSparks: 0 + spark2Path: + spark2Anchor: 0 + spark2Offset: {x: 0, y: 0, z: 0} + spark3Path: + spark3Anchor: 0 + spark3Offset: {x: 0, y: 0, z: 0} + selfEffect: 0 + otherEffect: 0 + zoomCamera: 0 + shakeScreen: 0 + shakeOffset: {x: 0, y: 0} + shakeStrength: 0 + colorDrift: 0 + blur: 0 + soundPath: + useGravity: 0 + multiple: 0 frames: [] throwBoxes: [] blockBoxes: [] defendBoxes: [] + speedCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + curves: + m_keys: + m_values: [] + toggles: + m_keys: 00000000 + m_values: + - from: 0.5 + to: 1 + parameters: + m_keys: + m_values: [] diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Dual_Unequip_Idle 1.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Dual_Unequip_Idle 1.asset index 4edb3d25..c355dded 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Dual_Unequip_Idle 1.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Dual_Unequip_Idle 1.asset @@ -20,25 +20,45 @@ MonoBehaviour: - collider: type: 1 pivot: 0 - useGravity: 0 - hitBack: {x: 0, y: 0, z: 0} multiHit: 0 + hitBack: {x: 0, y: 0, z: 0} + freezeFramesSelf: 0 + freezeFramesOther: 0 sparkPath: + sparkAnchor: 0 + sparkOffset: {x: 0, y: 0, z: 0} + multiSparks: 0 + spark2Path: + spark2Anchor: 0 + spark2Offset: {x: 0, y: 0, z: 0} + spark3Path: + spark3Anchor: 0 + spark3Offset: {x: 0, y: 0, z: 0} + selfEffect: 0 + otherEffect: 0 + zoomCamera: 0 + shakeScreen: 0 + shakeOffset: {x: 0, y: 0} + shakeStrength: 0 + colorDrift: 0 + blur: 0 + soundPath: + useGravity: 0 multiple: 0 frames: - frame: 0 active: 1 position: {x: 0, y: 0, z: 0} - size: {x: 1, y: 1, z: 0.5} + size: {x: 0.5, y: 1, z: 1} - frame: 149 active: 1 position: {x: 0, y: 0, z: 0} - size: {x: 1, y: 1, z: 0.5} + size: {x: 0.5, y: 1, z: 1} hitBoxes: [] throwBoxes: [] blockBoxes: [] defendBoxes: [] - curve: + speedCurve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -62,3 +82,12 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 + curves: + m_keys: + m_values: [] + toggles: + m_keys: + m_values: [] + parameters: + m_keys: + m_values: [] diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Run.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Run.asset index 4f63709a..df5e5520 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Run.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Run.asset @@ -19,25 +19,45 @@ MonoBehaviour: - collider: type: 1 pivot: 0 - useGravity: 0 - hitBack: {x: 0, y: 0, z: 0} multiHit: 0 + hitBack: {x: 0, y: 0, z: 0} + freezeFramesSelf: 0 + freezeFramesOther: 0 sparkPath: + sparkAnchor: 0 + sparkOffset: {x: 0, y: 0, z: 0} + multiSparks: 0 + spark2Path: + spark2Anchor: 0 + spark2Offset: {x: 0, y: 0, z: 0} + spark3Path: + spark3Anchor: 0 + spark3Offset: {x: 0, y: 0, z: 0} + selfEffect: 0 + otherEffect: 0 + zoomCamera: 0 + shakeScreen: 0 + shakeOffset: {x: 0, y: 0} + shakeStrength: 0 + colorDrift: 0 + blur: 0 + soundPath: + useGravity: 0 multiple: 0 frames: - frame: 0 active: 1 position: {x: 0, y: 0, z: 0} - size: {x: 1, y: 1.24, z: 0.61} + size: {x: 0.61, y: 1.24, z: 1} - frame: 16 active: 1 position: {x: 0, y: 0, z: 0} - size: {x: 1, y: 1.27, z: 0.5} + size: {x: 0.5, y: 1.27, z: 1} hitBoxes: [] throwBoxes: [] blockBoxes: [] defendBoxes: [] - curve: + speedCurve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -61,3 +81,12 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 + curves: + m_keys: + m_values: [] + toggles: + m_keys: + m_values: [] + parameters: + m_keys: + m_values: [] diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset index 7cc3c8c2..915c2d85 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset @@ -25,172 +25,274 @@ MonoBehaviour: - collider: type: 1 pivot: 0 - useGravity: 1 - hitBack: {x: 0, y: 0, z: 0} multiHit: 0 - sparkPath: - sparkOffset: {x: 0, y: 0, z: 0} + hitBack: {x: 0, y: 0, z: 0} freezeFramesSelf: 0 freezeFramesOther: 0 + sparkPath: + sparkAnchor: 0 + sparkOffset: {x: 0, y: 0, z: 0} + multiSparks: 0 + spark2Path: + spark2Anchor: 0 + spark2Offset: {x: 0, y: 0, z: 0} + spark3Path: + spark3Anchor: 0 + spark3Offset: {x: 0, y: 0, z: 0} + selfEffect: 0 + otherEffect: 0 + zoomCamera: 0 + shakeScreen: 0 + shakeOffset: {x: 0, y: 0} + shakeStrength: 0 + colorDrift: 0 + blur: 0 + soundPath: + useGravity: 1 multiple: 0 frames: - frame: 0 active: 1 position: {x: 0, y: 0, z: 0} - size: {x: 1, y: 1.3, z: 0.5} + size: {x: 0.5, y: 1.3, z: 1} - frame: 7 active: 1 position: {x: 0, y: 0, z: 0} - size: {x: 1, y: 1, z: 0.5} + size: {x: 0.5, y: 1, z: 1} - frame: 12 active: 1 position: {x: 0, y: 0, z: 0} - size: {x: 1, y: 1, z: 0.5} + size: {x: 0.5, y: 1, z: 1} - frame: 20 active: 1 position: {x: 0, y: 0, z: 0} - size: {x: 1, y: 0.7, z: 0.5} + size: {x: 0.5, y: 0.7, z: 1} - frame: 22 active: 1 position: {x: 0, y: 0, z: 0} - size: {x: 1, y: 0.75, z: 0.5} + size: {x: 0.5, y: 0.75, z: 1} - frame: 24 active: 1 position: {x: 0, y: 0, z: 0} - size: {x: 1, y: 1.3, z: 0.5} + size: {x: 0.5, y: 1.3, z: 1} - frame: 30 active: 1 position: {x: 0, y: 0, z: 0} - size: {x: 1, y: 1.4, z: 0.5} + size: {x: 0.5, y: 1.4, z: 1} - frame: 40 active: 1 position: {x: 0, y: 0, z: 0} - size: {x: 1, y: 1.16, z: 0.5} + size: {x: 0.5, y: 1.16, z: 1} - frame: 41 active: 1 position: {x: 0, y: 0, z: 0} - size: {x: 1, y: 0.78, z: 0.5} + size: {x: 0.5, y: 0.78, z: 1} - frame: 42 active: 1 position: {x: 0, y: 0, z: 0} - size: {x: 1, y: 0.95, z: 0.5} + size: {x: 0.5, y: 0.95, z: 1} - frame: 43 active: 1 position: {x: 0, y: 0, z: 0} - size: {x: 1, y: 1.07, z: 0.5} + size: {x: 0.5, y: 1.07, z: 1} - frame: 45 active: 1 position: {x: 0, y: 0, z: 0} - size: {x: 1, y: 0.61, z: 0.5} + size: {x: 0.5, y: 0.61, z: 1} - frame: 53 active: 1 position: {x: 0, y: 0, z: 0} - size: {x: 1, y: 1, z: 0.5} + size: {x: 0.5, y: 1, z: 1} - frame: 82 active: 1 position: {x: 0, y: 0, z: 0} - size: {x: 1, y: 1.3, z: 0.5} + size: {x: 0.5, y: 1.3, z: 1} hitBoxes: - collider: type: 0 pivot: 0 - useGravity: 0 - hitBack: {x: 0, y: 0, z: 0} multiHit: 0 - sparkPath: - sparkOffset: {x: 0, y: 0, z: 0} + hitBack: {x: 0, y: 0, z: 0} freezeFramesSelf: 0 freezeFramesOther: 0 + sparkPath: + sparkAnchor: 0 + sparkOffset: {x: 0, y: 0, z: 0} + multiSparks: 0 + spark2Path: + spark2Anchor: 0 + spark2Offset: {x: 0, y: 0, z: 0} + spark3Path: + spark3Anchor: 0 + spark3Offset: {x: 0, y: 0, z: 0} + selfEffect: 0 + otherEffect: 0 + zoomCamera: 0 + shakeScreen: 0 + shakeOffset: {x: 0, y: 0} + shakeStrength: 0 + colorDrift: 0 + blur: 0 + soundPath: + useGravity: 0 multiple: 0 frames: - frame: 11 active: 1 - position: {x: 0, y: 1, z: 1} - size: {x: 1, y: 1, z: 0.5} + position: {x: 1, y: 1, z: 0} + size: {x: 0.5, y: 1, z: 1} - frame: 17 active: 1 - position: {x: 0, y: 0.58, z: 1} - size: {x: 1, y: 1, z: 0.5} + position: {x: 1, y: 0.58, z: 0} + size: {x: 0.5, y: 1, z: 1} - collider: type: 0 pivot: 0 - useGravity: 0 - hitBack: {x: 0, y: 0, z: 0} multiHit: 0 - sparkPath: - sparkOffset: {x: 0, y: 0, z: 0} + hitBack: {x: 0, y: 0, z: 0} freezeFramesSelf: 0 freezeFramesOther: 0 + sparkPath: + sparkAnchor: 0 + sparkOffset: {x: 0, y: 0, z: 0} + multiSparks: 0 + spark2Path: + spark2Anchor: 0 + spark2Offset: {x: 0, y: 0, z: 0} + spark3Path: + spark3Anchor: 0 + spark3Offset: {x: 0, y: 0, z: 0} + selfEffect: 0 + otherEffect: 0 + zoomCamera: 0 + shakeScreen: 0 + shakeOffset: {x: 0, y: 0} + shakeStrength: 0 + colorDrift: 0 + blur: 0 + soundPath: + useGravity: 0 multiple: 0 frames: - frame: 24 active: 1 - position: {x: 0, y: 0.71, z: 1.14} - size: {x: 1, y: 1.78, z: 0.5} + position: {x: 1.14, y: 0.71, z: 0} + size: {x: 0.5, y: 1.78, z: 1} - frame: 28 active: 1 - position: {x: 0, y: 1.37, z: 1.31} - size: {x: 1, y: 1.62, z: 0.49} + position: {x: 1.31, y: 1.37, z: 0} + size: {x: 0.49, y: 1.62, z: 1} - collider: type: 0 pivot: 0 - useGravity: 0 - hitBack: {x: 0, y: 0, z: 0} multiHit: 0 - sparkPath: - sparkOffset: {x: 0, y: 0, z: 0} + hitBack: {x: 0, y: 0, z: 0} freezeFramesSelf: 0 freezeFramesOther: 0 + sparkPath: + sparkAnchor: 0 + sparkOffset: {x: 0, y: 0, z: 0} + multiSparks: 0 + spark2Path: + spark2Anchor: 0 + spark2Offset: {x: 0, y: 0, z: 0} + spark3Path: + spark3Anchor: 0 + spark3Offset: {x: 0, y: 0, z: 0} + selfEffect: 0 + otherEffect: 0 + zoomCamera: 0 + shakeScreen: 0 + shakeOffset: {x: 0, y: 0} + shakeStrength: 0 + colorDrift: 0 + blur: 0 + soundPath: + useGravity: 0 multiple: 0 frames: - frame: 40 active: 1 - position: {x: 0, y: 0.61, z: 1.08} - size: {x: 1, y: 1.35, z: 0.5} + position: {x: 1.08, y: 0.61, z: 0} + size: {x: 0.5, y: 1.35, z: 1} - frame: 43 active: 1 - position: {x: 0, y: 0.52, z: 1.08} - size: {x: 1, y: 1.43, z: 0.5} + position: {x: 1.08, y: 0.52, z: 0} + size: {x: 0.5, y: 1.43, z: 1} - collider: type: 0 pivot: 0 - useGravity: 0 - hitBack: {x: 0, y: 0, z: 0} multiHit: 0 - sparkPath: - sparkOffset: {x: 0, y: 0, z: 0} + hitBack: {x: 0, y: 0, z: 0} freezeFramesSelf: 0 freezeFramesOther: 0 + sparkPath: + sparkAnchor: 0 + sparkOffset: {x: 0, y: 0, z: 0} + multiSparks: 0 + spark2Path: + spark2Anchor: 0 + spark2Offset: {x: 0, y: 0, z: 0} + spark3Path: + spark3Anchor: 0 + spark3Offset: {x: 0, y: 0, z: 0} + selfEffect: 0 + otherEffect: 0 + zoomCamera: 0 + shakeScreen: 0 + shakeOffset: {x: 0, y: 0} + shakeStrength: 0 + colorDrift: 0 + blur: 0 + soundPath: + useGravity: 0 multiple: 0 frames: - frame: 44 active: 1 - position: {x: 0, y: 0.52, z: 0.82} - size: {x: 1, y: 1, z: 0.5} + position: {x: 0.82, y: 0.52, z: 0} + size: {x: 0.5, y: 1, z: 1} - frame: 46 active: 1 - position: {x: 0, y: 0.3, z: 0.85} - size: {x: 1, y: 1, z: 0.5} + position: {x: 0.85, y: 0.3, z: 0} + size: {x: 0.5, y: 1, z: 1} - collider: type: 0 pivot: 0 - useGravity: 0 - hitBack: {x: 0, y: 0, z: 0} multiHit: 0 - sparkPath: - sparkOffset: {x: 0, y: 0, z: 0} + hitBack: {x: 0, y: 0, z: 0} freezeFramesSelf: 0 freezeFramesOther: 0 + sparkPath: + sparkAnchor: 0 + sparkOffset: {x: 0, y: 0, z: 0} + multiSparks: 0 + spark2Path: + spark2Anchor: 0 + spark2Offset: {x: 0, y: 0, z: 0} + spark3Path: + spark3Anchor: 0 + spark3Offset: {x: 0, y: 0, z: 0} + selfEffect: 0 + otherEffect: 0 + zoomCamera: 0 + shakeScreen: 0 + shakeOffset: {x: 0, y: 0} + shakeStrength: 0 + colorDrift: 0 + blur: 0 + soundPath: + useGravity: 0 multiple: 0 frames: - frame: 48 active: 1 - position: {x: 0, y: 0, z: 1.13} - size: {x: 1, y: 1, z: 0.5} + position: {x: 1.13, y: 0, z: 0} + size: {x: 0.5, y: 1, z: 1} - frame: 51 active: 1 - position: {x: 0, y: 0.31, z: 0.67} - size: {x: 1, y: 1, z: 0.5} + position: {x: 0.67, y: 0.31, z: 0} + size: {x: 0.5, y: 1, z: 1} throwBoxes: [] blockBoxes: [] defendBoxes: [] diff --git a/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorControllerCrossFade.controller b/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorControllerCrossFade.controller index 429a9a07..294f664f 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorControllerCrossFade.controller +++ b/Assets/Bundle/Unit/PC/Erika/AnimatorController/Erika_AnimatorControllerCrossFade.controller @@ -14,19 +14,19 @@ AnimatorController: m_DefaultFloat: 0.4 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: PlaybackSpeed0 m_Type: 1 m_DefaultFloat: 1 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: PlaybackSpeed1 m_Type: 1 m_DefaultFloat: 1 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Basic @@ -306,7 +306,7 @@ AnimatorState: m_TimeParameterActive: 0 m_Motion: {fileID: 7400000, guid: 30ab9f767efd0ad4bbb7f1a3f0103903, type: 2} m_Tag: - m_SpeedParameter: + m_SpeedParameter: IdleStatus m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: @@ -388,6 +388,32 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &1102214450384744764 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: AirDash + 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: 76fde77dd4724694eb0955b10a0d54e4, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &1102230929257620240 AnimatorState: serializedVersion: 5 @@ -678,6 +704,32 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &1102696179637896120 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Empty + 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: 599f2b26128dfd742b4aefbc285c4d3e, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &1102700468040696058 AnimatorState: serializedVersion: 5 @@ -821,13 +873,13 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: 1102108504916990050} - m_Position: {x: 192, y: -492, z: 0} + m_Position: {x: -96, y: -504, z: 0} - serializedVersion: 1 m_State: {fileID: 1102289505320285826} m_Position: {x: 444, y: -504, z: 0} - serializedVersion: 1 m_State: {fileID: 1102474951772684744} - m_Position: {x: -72, y: -492, z: 0} + m_Position: {x: 168, y: -504, z: 0} - serializedVersion: 1 m_State: {fileID: 1102064426511052762} m_Position: {x: 444, y: -600, z: 0} @@ -836,38 +888,44 @@ AnimatorStateMachine: m_Position: {x: 444, y: -552, z: 0} - serializedVersion: 1 m_State: {fileID: 1102700468040696058} - m_Position: {x: 264, y: -816, z: 0} + m_Position: {x: 708, y: -456, z: 0} - serializedVersion: 1 m_State: {fileID: 1102403163851985622} - m_Position: {x: 264, y: -864, z: 0} + m_Position: {x: 708, y: -504, z: 0} - serializedVersion: 1 m_State: {fileID: 1102018842156954176} - m_Position: {x: 264, y: -960, z: 0} + m_Position: {x: 708, y: -600, z: 0} - serializedVersion: 1 m_State: {fileID: 1102397782345947260} - m_Position: {x: 264, y: -912, z: 0} + m_Position: {x: 708, y: -552, z: 0} - serializedVersion: 1 m_State: {fileID: 1102230929257620240} - m_Position: {x: 552, y: -816, z: 0} + m_Position: {x: 1236, y: -456, z: 0} - serializedVersion: 1 m_State: {fileID: 1102642339950476984} - m_Position: {x: 552, y: -864, z: 0} + m_Position: {x: 1236, y: -504, z: 0} - serializedVersion: 1 m_State: {fileID: 1102101182547217892} - m_Position: {x: 552, y: -912, z: 0} + m_Position: {x: 1236, y: -552, z: 0} - serializedVersion: 1 m_State: {fileID: 1102269967399741822} - m_Position: {x: 552, y: -960, z: 0} + m_Position: {x: 1236, y: -600, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102696179637896120} + m_Position: {x: -456, y: -792, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102214450384744764} + m_Position: {x: 972, y: -600, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] m_AnyStatePosition: {x: -408, y: -888, z: 0} - m_EntryPosition: {x: 216, y: -420, z: 0} + m_EntryPosition: {x: -408, y: -840, z: 0} m_ExitPosition: {x: -408, y: -924, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 1102108504916990050} + m_DefaultState: {fileID: 1102696179637896120} --- !u!1107 &1107669995669758872 AnimatorStateMachine: serializedVersion: 5 diff --git a/Assets/Bundle/Unit/PC/Erika/Materials/AfterImage.meta b/Assets/Bundle/Unit/PC/Erika/Materials/AfterImage.meta deleted file mode 100644 index 1d22d5d2..00000000 --- a/Assets/Bundle/Unit/PC/Erika/Materials/AfterImage.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e777b7b5be18d4e4092e116011158c68 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta b/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta deleted file mode 100644 index 8c41a6b2..00000000 --- a/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5dc1b71affc68b54594096a1b96a5c00 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/Erika/Models.meta b/Assets/Bundle/Unit/PC/Erika/Models.meta deleted file mode 100644 index 11148d17..00000000 --- a/Assets/Bundle/Unit/PC/Erika/Models.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0d712421d808a43438a43d8a5d34effe -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/Erika/UnitData.meta b/Assets/Bundle/Unit/PC/Erika/UnitData.meta deleted file mode 100644 index 7d4b13eb..00000000 --- a/Assets/Bundle/Unit/PC/Erika/UnitData.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 922befa8a94692845b88500a23229d7f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta b/Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta new file mode 100644 index 00000000..be6badd6 --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2c46a5a23283c7d428ae8bb13663ab6a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta deleted file mode 100644 index f5434a00..00000000 --- a/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 07c3b2bf6cb8cc2498422bbb105cbad8 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta deleted file mode 100644 index 4ed2c938..00000000 --- a/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 827d77abe87680a47ae2d71a9e953a18 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta deleted file mode 100644 index 43a52cd1..00000000 --- a/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7a2b72fbb41383047ac45e6c22ea9663 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta deleted file mode 100644 index 85d58a8c..00000000 --- a/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b2b0838fb0603964e99904eefe81ad7f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta deleted file mode 100644 index dd867045..00000000 --- a/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1c8a678ea9e801f439a1003d04f33cf5 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta deleted file mode 100644 index dc530723..00000000 --- a/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ebf636c7cf7b1934b885298ce1f5f42e -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta deleted file mode 100644 index b28b6f04..00000000 --- a/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2022e8298d3a8624992143eb57c0f8ac -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta deleted file mode 100644 index eeca0d3b..00000000 --- a/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f6aa859c834c51f498ef0b3c3b83a0f5 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta deleted file mode 100644 index 7f91da28..00000000 --- a/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: df69962f5b01e444a8bea87e31c7d0a4 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Bundle/Unit/Prop.meta b/Assets/Bundle/Unit/Prop.meta deleted file mode 100644 index affd6eed..00000000 --- a/Assets/Bundle/Unit/Prop.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: dafc173db1ebeab4c80641cc3d4fa528 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Data/ActionData.meta b/Assets/Data/ActionData.meta deleted file mode 100644 index 48dd5af5..00000000 --- a/Assets/Data/ActionData.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4e712aac7b9add047ab7a8691dd1a17a -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Data/AnimationData/Erika.meta b/Assets/Data/AnimationData/Erika.meta deleted file mode 100644 index 10bf1fb1..00000000 --- a/Assets/Data/AnimationData/Erika.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 02289cc4b0fe1c34988c293ff6dbca02 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Data/RootMotionData/Erika.meta b/Assets/Data/RootMotionData/Erika.meta deleted file mode 100644 index 57b03e09..00000000 --- a/Assets/Data/RootMotionData/Erika.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2c4e05f9eb0abc949a472e82070dfef1 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Data/UnitData.meta b/Assets/Data/UnitData.meta deleted file mode 100644 index d0809213..00000000 --- a/Assets/Data/UnitData.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5bdb120d934aa114ab2f20e111a3c4d2 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/Demo/AnimationEditScene.unity b/Assets/Scenes/Demo/AnimationEditScene.unity index ebded105..fc30ab7f 100644 --- a/Assets/Scenes/Demo/AnimationEditScene.unity +++ b/Assets/Scenes/Demo/AnimationEditScene.unity @@ -38,7 +38,7 @@ RenderSettings: 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_IndirectSpecularColor: {r: 0.18028334, g: 0.22571328, b: 0.3069217, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -312,8 +312,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 861741897} - m_LocalRotation: {x: 0.016969634, y: -0.7069037, z: 0.016969668, w: 0.7069026} - m_LocalPosition: {x: 9.145469, y: 2.5208502, z: 4.259833} + m_LocalRotation: {x: 0.035991836, y: 0.00299806, z: -0.00010797656, w: 0.9993476} + m_LocalPosition: {x: 7.3199778, y: 2.6892922, z: -9.924468} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -501,10 +501,10 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2098653157} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.0507812, y: 0, z: 5.1894274} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 10} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} diff --git a/Assets/Scripts/Input/InputManager.cs b/Assets/Scripts/Input/InputManager.cs index b5e3d8a1..62fd5f91 100644 --- a/Assets/Scripts/Input/InputManager.cs +++ b/Assets/Scripts/Input/InputManager.cs @@ -2,12 +2,22 @@ using System.Collections.Generic;
using UnityEngine;
+public struct InputCommand
+{
+ public KeyCode key;
+ public float time;
+}
+
// 处理输入逻辑，不涉及读取输入，只处理逻辑
public class InputManager : SingletonMB<InputManager>
{
PCController _pc;
+ List<InputCommand> m_CommandQueue = new List<InputCommand>();
+
+ const float threshold = 3;
+
PCController pc
{
get
@@ -49,4 +59,57 @@ public class InputManager : SingletonMB<InputManager> pc.unitState.ChangeState(UnitState.EUnitState.Attack, new UnitState.SkillParam());
}
+ public void OnUpdate()
+ {
+ foreach (KeyCode vKey in System.Enum.GetValues(typeof(KeyCode)))
+ {
+ if (Input.GetKeyDown(vKey))
+ {
+ InputCommand cmd = new InputCommand();
+ cmd.key = vKey;
+ cmd.time = Time.time;
+ m_CommandQueue.Add(cmd);
+ Debug.Log(cmd.time);
+ string cmdStr = "";
+ m_CommandQueue.ForEach(s => cmdStr += s.key.ToString() + ",");
+ Debug.Log(cmdStr);
+ }
+ }
+ float curTime = Time.time;
+ int removeCount = 0;
+ for(int i = 0; i < m_CommandQueue.Count; ++i)
+ {
+ if(curTime - m_CommandQueue[i].time > threshold)
+ {
+ removeCount++;
+ }
+ }
+ m_CommandQueue.RemoveRange(0, removeCount);
+ }
+
+ public bool TryCommand(float interval = 0.5f, params KeyCode[] keys)
+ {
+ if (keys.Length > m_CommandQueue.Count)
+ return false;
+ int count = m_CommandQueue.Count;
+ float preTime = m_CommandQueue[count - keys.Length].time;
+ for (int i = 0; i < keys.Length; ++i)
+ {
+ if(keys[i] == m_CommandQueue[i + count - keys.Length].key)
+ {
+ if(m_CommandQueue[i + count - keys.Length].time - preTime > interval)
+ {
+ return false;
+ }
+ preTime = m_CommandQueue[i + count - keys.Length].time;
+ }
+ else
+ {
+ return false;
+ }
+ }
+ m_CommandQueue.RemoveRange(count - keys.Length, keys.Length);
+ return true;
+ }
+
}
diff --git a/Assets/Scripts/Props.meta b/Assets/Scripts/Props.meta deleted file mode 100644 index bb96602e..00000000 --- a/Assets/Scripts/Props.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f299520ed9fcf4a45858ad4ef5a8d5d1 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Scene.meta b/Assets/Scripts/Scene.meta deleted file mode 100644 index eb7a8716..00000000 --- a/Assets/Scripts/Scene.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: eaee2d0f48cff9b40baf0686a8105600 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Test 1/TestErika.cs b/Assets/Scripts/Test 1/TestErika.cs index deafc7c3..f6f9ba0e 100644 --- a/Assets/Scripts/Test 1/TestErika.cs +++ b/Assets/Scripts/Test 1/TestErika.cs @@ -25,7 +25,9 @@ public class TestErika : MonoBehaviour unitController = GameObject.Instantiate(unitControllerPrefab); unitController.transform.position = Vector3.zero; unitController.transform.rotation = Quaternion.identity; + unit = GameObject.Instantiate(unitPrefab); + unit.transform.rotation = Quaternion.Euler(0, 90, 0); unit.transform.SetParent(unitController.transform); Init(); diff --git a/Assets/Scripts/Test 1/TestInput.cs b/Assets/Scripts/Test 1/TestInput.cs index f7178549..72e0351b 100644 --- a/Assets/Scripts/Test 1/TestInput.cs +++ b/Assets/Scripts/Test 1/TestInput.cs @@ -7,6 +7,8 @@ public class TestInput : MonoBehaviour private void Update() { + InputManager.Instance.OnUpdate(); + //if(Input.GetKeyDown("j")) //{ // InputManager.Instance.OnAttack(); diff --git a/Assets/Scripts/Unit/AnimationData.cs b/Assets/Scripts/Unit/AnimationData.cs index 32845da1..4d229346 100644 --- a/Assets/Scripts/Unit/AnimationData.cs +++ b/Assets/Scripts/Unit/AnimationData.cs @@ -12,6 +12,7 @@ public enum EAnimationToogle {
Combo = 0, // 连击
SuperArmor = 1, //霸体
+ Break = 2, // 打断
}
[Serializable]
diff --git a/Assets/Scripts/Unit/Collider/ColliderBox_Hurtbox.cs b/Assets/Scripts/Unit/Collider/ColliderBox_Hurtbox.cs index 62c61006..788b457a 100644 --- a/Assets/Scripts/Unit/Collider/ColliderBox_Hurtbox.cs +++ b/Assets/Scripts/Unit/Collider/ColliderBox_Hurtbox.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using UnityEngine; +using UnityEngine; public partial class ColliderBox { diff --git a/Assets/Scripts/Unit/Collider/ColliderData.cs b/Assets/Scripts/Unit/Collider/ColliderData.cs index 4c8e5bed..58743aff 100644 --- a/Assets/Scripts/Unit/Collider/ColliderData.cs +++ b/Assets/Scripts/Unit/Collider/ColliderData.cs @@ -101,7 +101,7 @@ public class ColliderData frame.frame = frameIndex;
frame.active = true;
frame.position = Vector3.zero;
- frame.size = new Vector3(1,1,0.5f);
+ frame.size = new Vector3(0.5f,1,1);
frames.Add(frame);
frames.Sort((a, b) => {
if (a == null)
diff --git a/Assets/Scripts/Unit/Component/UnitAnimation.cs b/Assets/Scripts/Unit/Component/UnitAnimation.cs index a6a7f3eb..4532023d 100644 --- a/Assets/Scripts/Unit/Component/UnitAnimation.cs +++ b/Assets/Scripts/Unit/Component/UnitAnimation.cs @@ -286,6 +286,9 @@ public class UnitAnimation : UnitComponent public AnimatorLayerInfo[] layers { get { return m_LayerInfo; } }
private readonly AnimatorLayerInfo[] m_LayerInfo = new AnimatorLayerInfo[(int)ELayer.Count];
+ public bool applyRootMotion { get; set; }// 动态设置root motion
+ public bool applyRootCurve { get; set; } // 程序生成的root motion
+
public bool isInTransition
{
get
@@ -309,6 +312,8 @@ public class UnitAnimation : UnitComponent {
LogHelper.LogError("没有挂Animator组件");
}
+
+ applyRootMotion = true;
}
public override void OnUpdate()
@@ -317,8 +322,12 @@ public class UnitAnimation : UnitComponent UpdateLayer();
UpdateAnimation();
- UpdateRootMotion();
- }
+
+ if(applyRootMotion)
+ UpdateRootMotion();
+ if(applyRootCurve)
+ UpdateRootCurve();
+ }
void UpdateLayer()
{
@@ -342,7 +351,13 @@ public class UnitAnimation : UnitComponent m_Owner.unitRootMotion.UpdateRootMotion();
}
- public void AnimIdle()
+ void UpdateRootCurve()
+ {
+
+ }
+
+
+ public void AnimIdle()
{
#if ANIM_CROSS_FADE
m_Animator.CrossFade("Idle", 0.2f, 0);
@@ -394,7 +409,19 @@ public class UnitAnimation : UnitComponent #endif
}
- public void AnimLanding()
+ public void AnimAirDash()
+ {
+ if (layers[0].stateInfo.IsName("AirDash"))
+ {
+ m_Animator.Play("AirDash", 0, 0);
+ }
+ else
+ {
+ m_Animator.CrossFade("AirDash", 0.05f);
+ }
+ }
+
+ public void AnimLanding()
{
#if ANIM_CROSS_FADE
m_Animator.CrossFade("Landing", 0.05f);
diff --git a/Assets/Scripts/Unit/Component/UnitState.cs b/Assets/Scripts/Unit/Component/UnitState.cs index 7a731b02..bc934f43 100644 --- a/Assets/Scripts/Unit/Component/UnitState.cs +++ b/Assets/Scripts/Unit/Component/UnitState.cs @@ -20,6 +20,7 @@ public class UnitState : UnitComponent //
Attack ,
AirAttack ,
+ AirDash ,
//
HitAir ,
HitAirHit ,
@@ -63,6 +64,11 @@ public class UnitState : UnitComponent }
+ public struct AirDashParam
+ {
+
+ }
+
public struct JumpParam
{ }
@@ -114,6 +120,21 @@ public class UnitState : UnitComponent IEnumerator Nein() { yield break; }
void OnNienExit(EUnitState nextState) { }
+ public void TurnAround(bool bRight)
+ {
+ m_Owner.transform.rotation = Quaternion.Euler(0, bRight ? 0 : 180, 0);
+ }
+
+ public void TurnLeft()
+ {
+ TurnAround(false);
+ }
+
+ public void TurnRight()
+ {
+ TurnAround(true);
+ }
+
#region Idle
IEnumerator Idle(IdleParam param)
@@ -212,14 +233,36 @@ public class UnitState : UnitComponent yield return null; // 等待animator更新
while (true)
{
- bool canAttack = m_Owner.unitAnimation.layers[0].IsToggleOpen(EAnimationToogle.Combo);
- if(canAttack && Input.GetKeyDown("j") )
- {
- ++id;
- m_Owner.unitAnimation.AnimAirAttack(id);
- yield return null; // 等待animator更新
- yield return new WaitForTransitionDone(m_Owner.unitAnimation);
- }
+ bool canCombo = m_Owner.unitAnimation.layers[0].IsToggleOpen(EAnimationToogle.Combo);
+ if(canCombo)
+ {
+ if (InputManager.Instance.TryCommand(0.5f, KeyCode.A, KeyCode.A))
+ {
+ TurnLeft();
+ ChangeState(EUnitState.AirDash, new AirDashParam());
+ }
+ if (InputManager.Instance.TryCommand(0.5f, KeyCode.D, KeyCode.D))
+ {
+ TurnRight();
+ ChangeState(EUnitState.AirDash, new AirDashParam());
+ }
+
+ if (Input.GetKeyDown("j"))
+ {
+ if (Input.GetKey("a"))
+ {
+ TurnAround(false);
+ }
+ if (Input.GetKey("d"))
+ {
+ TurnAround(true);
+ }
+ ++id;
+ m_Owner.unitAnimation.AnimAirAttack(id);
+ yield return null; // 等待animator更新
+ yield return new WaitForTransitionDone(m_Owner.unitAnimation);
+ }
+ }
bool reachEnd = m_Owner.unitAnimation.layers[0].playbackNomralizedTime == 1;
if (reachEnd)
@@ -236,11 +279,63 @@ public class UnitState : UnitComponent }
- #endregion
+ #endregion
+
+ #region AirDash
+
+ IEnumerator AirDash(AirDashParam param)
+ {
+ m_Owner.unitAnimation.AnimAirDash();
+ yield return null;
+ while(true)
+ {
+ bool reachEnd = m_Owner.unitAnimation.layers[0].playbackNomralizedTime == 1;
+ if (reachEnd)
+ {
+ ChangeState(EUnitState.Landing, new LandingParam());
+ }
+
+ bool canCombo = m_Owner.unitAnimation.layers[0].IsToggleOpen(EAnimationToogle.Combo);
+ if(canCombo)
+ {
+ if (InputManager.Instance.TryCommand(0.5f, KeyCode.A, KeyCode.A))
+ {
+ TurnLeft();
+ m_Owner.unitAnimation.AnimAirDash();
+ }
+ if (InputManager.Instance.TryCommand(0.5f, KeyCode.D, KeyCode.D))
+ {
+ TurnRight();
+ m_Owner.unitAnimation.AnimAirDash();
+ }
+
+ if (Input.GetKeyDown("j"))
+ {
+ if (Input.GetKey("a"))
+ {
+ TurnAround(false);
+ }
+ if (Input.GetKey("d"))
+ {
+ TurnAround(true);
+ }
+ ChangeState(EUnitState.AirAttack, new SkillParam());
+ }
+ }
+
+ yield return null;
+ }
+ }
+
+ void OnAirDashExit(EUnitState next)
+ {
+ }
+
+ #endregion
- #region Jump
+ #region Jump
- IEnumerator Jump(JumpParam param)
+ IEnumerator Jump(JumpParam param)
{
unitAnimation.AnimJump();
yield return null;
@@ -271,18 +366,28 @@ public class UnitState : UnitComponent m_Owner.unitAnimation.AnimLanding();
yield return null;
yield return new WaitForTransitionDone(m_Owner.unitAnimation);
- float vy = 0;
+ float vy = 2;
float g = 9.8f;
bool landingGround = false;
+ float vz = 5;
while (true)
{
Vector3 pos = m_Owner.transform.position;
vy += g * Time.deltaTime;
pos.y -= vy * Time.deltaTime;
pos.y = Mathf.Max(0, pos.y);
- m_Owner.transform.position = pos;
- Debug.Log(pos.y);
- if(pos.y > 0 && pos.y <= 1 && !landingGround)
+ if (Input.GetKey("a"))
+ {
+ TurnAround(false);
+ pos.x -= vz * Time.deltaTime;
+ }
+ if (Input.GetKey("d"))
+ {
+ TurnAround(true);
+ pos.x += vz * Time.deltaTime;
+ }
+ m_Owner.transform.position = pos;
+ if (pos.y > 0 && pos.y <= 1 && !landingGround)
{
landingGround = true;
m_Owner.unitAnimation.AnimLandingGround();
diff --git a/Assets/Scripts/Unit/RootMotion/RootMotionData.cs b/Assets/Scripts/Unit/RootMotion/RootMotionData.cs index 84a42ec1..f60689ad 100644 --- a/Assets/Scripts/Unit/RootMotion/RootMotionData.cs +++ b/Assets/Scripts/Unit/RootMotion/RootMotionData.cs @@ -40,3 +40,15 @@ public class RootMotionData : ScriptableObject }
}
+
+public static class RootMotionUtility
+{
+ // zy平面的移动改为xy平面的移动
+ public static Vector3 ExchangeXZ(Vector3 dest)
+ {
+ float z = dest.z;
+ dest.z = dest.x;
+ dest.x = z;
+ return dest;
+ }
+}
diff --git a/Assets/Scripts/Unit/UnitRootMotion.cs b/Assets/Scripts/Unit/UnitRootMotion.cs index c4d4b2c9..8c6edaa0 100644 --- a/Assets/Scripts/Unit/UnitRootMotion.cs +++ b/Assets/Scripts/Unit/UnitRootMotion.cs @@ -70,8 +70,9 @@ public class UnitRootMotion : UnitComponent public void UpdateRootMotion()
{
+ // 因为Unti被旋转了90度，所以这里的deltaPosition的forward是x方向了
Vector3 dest = m_Owner.unitAnimation.animator.deltaPosition;
- dest.x = 0; //限制x轴始终在x=0
+ dest.z = 0;
var state = m_Owner.unitAnimation.layers[0].stateInfo;
if(state.IsTag("IgnoreY"))
@@ -79,7 +80,8 @@ public class UnitRootMotion : UnitComponent dest.y = 0;
}
- m_Owner.transform.position += dest;
+ //m_Owner.transform.position += RootMotionUtility.ExchangeXZ(dest); // 不需要exchangeXZ
+ m_Owner.transform.position += dest;
}
#endif
diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Editor.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Editor.meta new file mode 100644 index 00000000..fc69e121 --- /dev/null +++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6b4092aee1925294286c91c8b2f0246b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Functions.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Functions.meta new file mode 100644 index 00000000..16dceda0 --- /dev/null +++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Functions.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7f677b222bd908a4eb6e8b6f446f0c95 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Includes.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Includes.meta new file mode 100644 index 00000000..3feeaa0c --- /dev/null +++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Includes.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f65f99730f449cd42b5428ed33579276 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines.meta new file mode 100644 index 00000000..d2cc8de3 --- /dev/null +++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0d1d19a8d9a9258489a54453cbd409bf +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Resources.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Resources.meta new file mode 100644 index 00000000..60091bee --- /dev/null +++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Resources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5fa002e3b21354f4b847ab441877ecda +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Runtime.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Runtime.meta new file mode 100644 index 00000000..c50ca514 --- /dev/null +++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Runtime.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c9c840958f8546c4e9667f0757d8557a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Shaders.meta index fa9e76cd..20eca756 100644 --- a/Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta +++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Shaders.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e38cb65072bb4a64cbe162792de9bec2 +guid: 0f14f2cbed5e00a40a3fa94241cf6c27 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Animation.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Animation.meta new file mode 100644 index 00000000..35b83bfb --- /dev/null +++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Animation.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5e705a58e98ec1a409129eb57fa15477 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Materials.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Materials.meta new file mode 100644 index 00000000..88f9f501 --- /dev/null +++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c77d30703ebcc5c4bbb57517b133b0f4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Shaders.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Shaders.meta new file mode 100644 index 00000000..4d33dc86 --- /dev/null +++ b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Shaders.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 142685877fe50f64caba63abfda167a7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/User.meta b/Assets/ThirdParty/BOXOPHOBIC/User.meta new file mode 100644 index 00000000..293c8b38 --- /dev/null +++ b/Assets/ThirdParty/BOXOPHOBIC/User.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f0aa5379d96b0e14795df45a380643fb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/Constants.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/Constants.meta new file mode 100644 index 00000000..a5ee5a64 --- /dev/null +++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/Constants.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4c9d2f06234e7e643b2118057d8e0673 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/SettingsUtils.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/SettingsUtils.meta new file mode 100644 index 00000000..3fdad1c4 --- /dev/null +++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/SettingsUtils.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6fcf51a07e84ca941a62046a0b693a19 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledGUI.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledGUI.meta new file mode 100644 index 00000000..94757653 --- /dev/null +++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledGUI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 28d59ef8b8ebe8d48a3a27e990a2d7e9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledInspector.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledInspector.meta new file mode 100644 index 00000000..d2c0b7b4 --- /dev/null +++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledInspector.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: edc7fbbe770e693488770a7aaeae2aa6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMaterial.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMaterial.meta new file mode 100644 index 00000000..069be515 --- /dev/null +++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMaterial.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8ed975ceb335a144c93320e22ae1780a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMono.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMono.meta new file mode 100644 index 00000000..7ea21e4b --- /dev/null +++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMono.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5a3babbb69c72f8419243020c0dfb70b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Resources.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Resources.meta new file mode 100644 index 00000000..f2a1c8a6 --- /dev/null +++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Resources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cd6738b410016744eaf6e182174c0b2b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/SettingsUtils.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/SettingsUtils.meta new file mode 100644 index 00000000..50e68eff --- /dev/null +++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/SettingsUtils.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f32bd65977ebf9049bd5e40e18d1556c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledInspector.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledInspector.meta new file mode 100644 index 00000000..68664862 --- /dev/null +++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledInspector.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 151a76ee3bec1ae449cd56f31d474de5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledMono.meta b/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledMono.meta new file mode 100644 index 00000000..aab2c856 --- /dev/null +++ b/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledMono.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3ae8613087e217249a69059295113b1c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: |