From adb364a79f5dd69de08f72072cc2261131314e53 Mon Sep 17 00:00:00 2001 From: chai Date: Thu, 2 Sep 2021 13:01:49 +0800 Subject: +override rootmotion --- Assets/ActionTool/Editor/ActionData.cs | 21 ++++- Assets/ActionTool/Editor/ActionManager.cs | 22 +++++- Assets/ActionTool/Editor/ActionPreviewEditor.cs | 83 +++++++++++++++---- Assets/ActionTool/Editor/ActionRootMotionEditor.cs | 83 +++++++++++++++++++ .../Editor/ActionRootMotionEditor.cs.meta | 11 +++ .../ActionTool/Resources/button_control_record.png | Bin 0 -> 824 bytes .../Resources/button_control_record.png.meta | 88 +++++++++++++++++++++ .../Resources/button_control_takerecord.png | Bin 0 -> 1111 bytes .../Resources/button_control_takerecord.png.meta | 88 +++++++++++++++++++++ .../Models/Characters/Erika2/Erika2.Avatar.meta | 8 -- .../Erika2/Erika2.AvatarDescription.meta | 8 -- .../Characters/Erika2/Erika2.BlendShapes.meta | 8 -- .../Models/Characters/Erika2/Erika2.Materials.meta | 8 -- .../Models/Characters/Erika2/Erika2.Meshes.meta | 8 -- .../Characters/Erika2/Erika2.MetaObject.meta | 8 -- .../Models/Characters/Erika2/Erika2.Textures.meta | 8 -- .../AbstractWiresEffect/Scripts.meta | 8 ++ Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta | 8 ++ Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta | 8 ++ Assets/Bundle/Material.meta | 8 ++ Assets/Bundle/Shader.meta | 8 ++ Assets/Bundle/UI.meta | 8 ++ .../Unit/Monster/Robots_Prowler/ActionData.meta | 8 ++ .../Unit/Monster/Robots_Prowler/UnitData.meta | 8 ++ Assets/Bundle/Unit/NPC.meta | 8 ++ .../Unit/PC/Erika/AnimationData/Air_Combo03.asset | 2 +- .../Bundle/Unit/PC/Erika/AnimationData/rise4.asset | 57 +++++++++++++ .../Unit/PC/Erika/AnimationData/rise4.asset.meta | 8 ++ .../Bundle/Unit/PC/Erika/Materials/AfterImage.meta | 8 ++ Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta | 8 ++ Assets/Bundle/Unit/PC/Erika/Models.meta | 8 ++ Assets/Bundle/Unit/PC/Erika/UnitData.meta | 8 ++ Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta | 8 -- Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta | 8 ++ .../Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta | 8 ++ .../Bundle/Unit/PC/ErikaCyborg/AnimationData.meta | 8 ++ .../Unit/PC/ErikaCyborg/Materials/AfterImage.meta | 8 ++ .../Unit/PC/ErikaCyborg/Materials/Normal.meta | 8 ++ Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta | 8 ++ Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta | 8 ++ Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta | 8 ++ Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta | 8 ++ Assets/Bundle/Unit/Prop.meta | 8 ++ Assets/Data/ActionData.meta | 8 ++ Assets/Data/AnimationData/Erika.meta | 8 ++ Assets/Data/RootMotionData/Erika.meta | 8 ++ Assets/Data/UnitData.meta | 8 ++ Assets/Scripts/Curve3D.meta | 8 ++ Assets/Scripts/Drone.meta | 8 ++ Assets/Scripts/Props.meta | 8 ++ Assets/Scripts/Robot.meta | 8 ++ Assets/Scripts/Scene.meta | 8 ++ Assets/Scripts/Unit/AnimationData.cs | 48 ++++++++++- Assets/Scripts/Unit/TimelineEventProxy.cs | 1 - .../Atmospheric Height Fog/Core/Editor.meta | 8 -- .../Atmospheric Height Fog/Core/Functions.meta | 8 -- .../Atmospheric Height Fog/Core/Includes.meta | 8 -- .../Atmospheric Height Fog/Core/Pipelines.meta | 8 -- .../Atmospheric Height Fog/Core/Resources.meta | 8 -- .../Atmospheric Height Fog/Core/Runtime.meta | 8 -- .../Atmospheric Height Fog/Core/Shaders.meta | 8 -- .../Atmospheric Height Fog/Demo/Animation.meta | 8 -- .../Atmospheric Height Fog/Demo/Materials.meta | 8 -- .../Atmospheric Height Fog/Demo/Shaders.meta | 8 -- Assets/ThirdParty/BOXOPHOBIC/User.meta | 8 -- .../BOXOPHOBIC/Utils/Editor/Constants.meta | 8 -- .../BOXOPHOBIC/Utils/Editor/SettingsUtils.meta | 8 -- .../BOXOPHOBIC/Utils/Editor/StyledGUI.meta | 8 -- .../BOXOPHOBIC/Utils/Editor/StyledInspector.meta | 8 -- .../BOXOPHOBIC/Utils/Editor/StyledMaterial.meta | 8 -- .../BOXOPHOBIC/Utils/Editor/StyledMono.meta | 8 -- Assets/ThirdParty/BOXOPHOBIC/Utils/Resources.meta | 8 -- .../BOXOPHOBIC/Utils/Scripts/SettingsUtils.meta | 8 -- .../BOXOPHOBIC/Utils/Scripts/StyledInspector.meta | 8 -- .../BOXOPHOBIC/Utils/Scripts/StyledMono.meta | 8 -- 75 files changed, 738 insertions(+), 262 deletions(-) create mode 100644 Assets/ActionTool/Editor/ActionRootMotionEditor.cs create mode 100644 Assets/ActionTool/Editor/ActionRootMotionEditor.cs.meta create mode 100644 Assets/ActionTool/Resources/button_control_record.png create mode 100644 Assets/ActionTool/Resources/button_control_record.png.meta create mode 100644 Assets/ActionTool/Resources/button_control_takerecord.png create mode 100644 Assets/ActionTool/Resources/button_control_takerecord.png.meta delete mode 100644 Assets/Art/Models/Characters/Erika2/Erika2.Avatar.meta delete mode 100644 Assets/Art/Models/Characters/Erika2/Erika2.AvatarDescription.meta delete mode 100644 Assets/Art/Models/Characters/Erika2/Erika2.BlendShapes.meta delete mode 100644 Assets/Art/Models/Characters/Erika2/Erika2.Materials.meta delete mode 100644 Assets/Art/Models/Characters/Erika2/Erika2.Meshes.meta delete mode 100644 Assets/Art/Models/Characters/Erika2/Erika2.MetaObject.meta delete mode 100644 Assets/Art/Models/Characters/Erika2/Erika2.Textures.meta create mode 100644 Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta create mode 100644 Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta create mode 100644 Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta create mode 100644 Assets/Bundle/Material.meta create mode 100644 Assets/Bundle/Shader.meta create mode 100644 Assets/Bundle/UI.meta create mode 100644 Assets/Bundle/Unit/Monster/Robots_Prowler/ActionData.meta create mode 100644 Assets/Bundle/Unit/Monster/Robots_Prowler/UnitData.meta create mode 100644 Assets/Bundle/Unit/NPC.meta create mode 100644 Assets/Bundle/Unit/PC/Erika/AnimationData/rise4.asset create mode 100644 Assets/Bundle/Unit/PC/Erika/AnimationData/rise4.asset.meta create mode 100644 Assets/Bundle/Unit/PC/Erika/Materials/AfterImage.meta create mode 100644 Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta create mode 100644 Assets/Bundle/Unit/PC/Erika/Models.meta create mode 100644 Assets/Bundle/Unit/PC/Erika/UnitData.meta delete mode 100644 Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta create mode 100644 Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta create mode 100644 Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta create mode 100644 Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta create mode 100644 Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta create mode 100644 Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta create mode 100644 Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta create mode 100644 Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta create mode 100644 Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta create mode 100644 Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta create mode 100644 Assets/Bundle/Unit/Prop.meta create mode 100644 Assets/Data/ActionData.meta create mode 100644 Assets/Data/AnimationData/Erika.meta create mode 100644 Assets/Data/RootMotionData/Erika.meta create mode 100644 Assets/Data/UnitData.meta create mode 100644 Assets/Scripts/Curve3D.meta create mode 100644 Assets/Scripts/Drone.meta create mode 100644 Assets/Scripts/Props.meta create mode 100644 Assets/Scripts/Robot.meta create mode 100644 Assets/Scripts/Scene.meta delete mode 100644 Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Editor.meta delete mode 100644 Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Functions.meta delete mode 100644 Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Includes.meta delete mode 100644 Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines.meta delete mode 100644 Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Resources.meta delete mode 100644 Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Runtime.meta delete mode 100644 Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Shaders.meta delete mode 100644 Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Animation.meta delete mode 100644 Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Materials.meta delete mode 100644 Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Shaders.meta delete mode 100644 Assets/ThirdParty/BOXOPHOBIC/User.meta delete mode 100644 Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/Constants.meta delete mode 100644 Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/SettingsUtils.meta delete mode 100644 Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledGUI.meta delete mode 100644 Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledInspector.meta delete mode 100644 Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMaterial.meta delete mode 100644 Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMono.meta delete mode 100644 Assets/ThirdParty/BOXOPHOBIC/Utils/Resources.meta delete mode 100644 Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/SettingsUtils.meta delete mode 100644 Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledInspector.meta delete mode 100644 Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledMono.meta (limited to 'Assets') diff --git a/Assets/ActionTool/Editor/ActionData.cs b/Assets/ActionTool/Editor/ActionData.cs index 5e519c3e..82eedee3 100644 --- a/Assets/ActionTool/Editor/ActionData.cs +++ b/Assets/ActionTool/Editor/ActionData.cs @@ -214,17 +214,30 @@ namespace ActionTool m_Animator.Update(0); m_Animator.speed = 0; - if(applyRootMotion && m_RootMotion) + if(applyRootMotion) { + var animData = ActionManager.animationData; + bool overrideRM = animData != null && animData.overrideRootMotion != null; + + if(!overrideRM && m_RootMotion) + { #if true - // Action Tool这里需要转换一下root motion的轴 - m_Animator.transform.position = RootMotionUtility.ExchangeXZ(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 += RootMotionUtility.ExchangeXZ(dis); m_PrevNormalTime = normalizeTime; #endif - } + } + else if(overrideRM) + { + if(!ActionRootMotionEditor.IsRecord) + { + + } + } + } } public int GetCurrentFrame() diff --git a/Assets/ActionTool/Editor/ActionManager.cs b/Assets/ActionTool/Editor/ActionManager.cs index 52311140..7c3f1df4 100644 --- a/Assets/ActionTool/Editor/ActionManager.cs +++ b/Assets/ActionTool/Editor/ActionManager.cs @@ -28,6 +28,7 @@ namespace ActionTool public static ActionEventEditor EventEditWindow; public static ActionColliderFrameEditor ColliderFrameWindow; public static ActionColliderEditor ColliderWindow; + public static ActionRootMotionEditor RootMotionEditor; public static ActionToolSettings Settings; @@ -115,12 +116,22 @@ namespace ActionTool private static GameObject s_RootActionTool; private const string kRootActionTool = "RootActionTool"; - public const int kMaxEventsPerFrame = 10; - public static int eventAndBoxCount + public static int MaxEventsPerFrame // 所有帧里面事件最多有几个 { get { - return kMaxEventsPerFrame + (animationData != null ? animationData.GetBoxesCount() : 0); + if (animationData == null) + return 0; + return animationData.GetMaxAnimationEventsCount(); + } + } + + public static int GridRowCount + { + get + { + bool hasRM = animationData != null && animationData.overrideRootMotion != null; + return (MaxEventsPerFrame + 1) + (animationData != null ? animationData.GetBoxesCount() : 0) + (hasRM ? 1 : 0); } } @@ -481,5 +492,10 @@ namespace ActionTool animationData.DeleteEvent(animEvent); } + public static void EditRootMotionOverrideData() + { + RootMotionEditor = EditorWindow.GetWindow(true); + } + } } \ No newline at end of file diff --git a/Assets/ActionTool/Editor/ActionPreviewEditor.cs b/Assets/ActionTool/Editor/ActionPreviewEditor.cs index 73b01857..271c66da 100644 --- a/Assets/ActionTool/Editor/ActionPreviewEditor.cs +++ b/Assets/ActionTool/Editor/ActionPreviewEditor.cs @@ -240,6 +240,9 @@ namespace ActionTool void GUI_Detail(ref float y) { + var actionData = ActionManager.actionData; + var animationData = ActionManager.animationData; + float xl = 5, xr = xl + 105; GUI.Label(new Rect(xl, y, 105, 15), "Animation Name:", styles.textMiddle); @@ -281,7 +284,7 @@ namespace ActionTool y += 15; GUI.Label(new Rect(xl, y, 105, 15), "RootMotion:", styles.textMiddle); - if(ActionManager.actionData.rootMotion != null) + if(actionData.rootMotion != null && (animationData == null || animationData.overrideRootMotion == null)) { width = styles.textMiddleBold.CalcSize(new GUIContent(ActionManager.actionData.rootMotionPath)).x; GUI.Label(new Rect(xr, y, width, 15), ActionManager.actionData.rootMotionPath, styles.textMiddleBold); @@ -292,13 +295,40 @@ namespace ActionTool "Frame Count: " + rootMotion.frameCount ); } - if (GUI.Button(new Rect(xr + width + 10 + 60, y, 60, 15), "Override")) - { - } - } + if(animationData != null) + { + if (GUI.Button(new Rect(xr + width + 10 + 60, y, 60, 15), "Override")) + { + animationData.AddRootMotionOverriderData(); + } + } + } + else if(animationData != null && animationData.overrideRootMotion != null) + { + width = styles.textMiddle.CalcSize(new GUIContent("Override")).x; + GUI.Label(new Rect(xr, y, width, 15), "Override", styles.textMiddle); + if (GUI.Button(new Rect(xr + width + 10, y, 60, 15), "Edit")) + { + ActionManager.EditRootMotionOverrideData(); + } + Color bg = GUI.backgroundColor; + GUI.backgroundColor = Color.red; + if (GUI.Button(new Rect(xr + width + 10 + 70, y, 60, 15), "Delete")) + { + animationData.DeleteRootMotionOverrideData(); + } + GUI.backgroundColor = bg; + } else { - GUI.Label(new Rect(xr, y, 100, 15), "None", styles.textMiddleBold); + GUI.Label(new Rect(xr, y, 50, 15), "None", styles.textMiddleBold); + if(animationData != null) + { + if (GUI.Button(new Rect(xr + 60 + 10 + 60, y, 60, 15), "Override")) + { + animationData.AddRootMotionOverriderData(); + } + } } y += 15; } @@ -416,7 +446,7 @@ namespace ActionTool float y = iy; - float contentHeight = ActionManager.eventAndBoxCount * kFrameHeight + 40; + float contentHeight = ActionManager.GridRowCount * kFrameHeight + 40; Rect content = new Rect(0, 0, ((int)action.totalFrame + 1)* kFrameWidth + 30, contentHeight); float height = 300; if (position.height - kTimeLineViewYOffset > contentHeight + 15) @@ -432,6 +462,7 @@ namespace ActionTool GUI_Slider(ref y); GUI_Grid(ref y); GUI_Events(); + GUI_RM(); GUI_Boxes(); GUI_FrameLine(); @@ -484,12 +515,12 @@ namespace ActionTool ActionData action = ActionManager.actionData; int sampleCount = (int)action.totalFrame + 1; - Rect bgRect = new Rect(kTimeLineViewXOffset, y, sampleCount * kFrameWidth, ActionManager.eventAndBoxCount * kFrameHeight); + Rect bgRect = new Rect(kTimeLineViewXOffset, y, sampleCount * kFrameWidth, ActionManager.GridRowCount * kFrameHeight); GUI.Box(bgRect, ""); Color lineColor = new Color(0.3f, 0.3f, 0.3f); Color lineColor2 = new Color(0.5f, 0.5f, 0.5f); - for (int i = 0; i < ActionManager.eventAndBoxCount + 1; i++) + for (int i = 0; i < ActionManager.GridRowCount + 1; i++) { ui.DrawHorizontalLineFast(y + i * kFrameHeight, kTimeLineViewXOffset, kTimeLineViewXOffset + sampleCount * kFrameWidth, lineColor); } @@ -498,26 +529,44 @@ namespace ActionTool Color c = i % 5 == 0 ? lineColor2 : lineColor; float x = kTimeLineViewXOffset + i * kFrameWidth; //x = Mathf.Clamp(x, kTimeLineViewXOffset, kTimeLineViewXOffset + action.totalFrame * kFrameWidth); - ui.DrawVerticalLineFast(x, y, y + ActionManager.eventAndBoxCount * kFrameHeight, c); + ui.DrawVerticalLineFast(x, y, y + ActionManager.GridRowCount * kFrameHeight, c); } - y += ActionManager.eventAndBoxCount * kFrameHeight; + y += ActionManager.GridRowCount * kFrameHeight; } void GUI_FrameLine() { float y = m_GridY; ActionData action = ActionManager.actionData; - Rect bgRect = new Rect(kTimeLineViewXOffset, y, action.totalFrame * kFrameWidth, ActionManager.eventAndBoxCount * kFrameHeight); + Rect bgRect = new Rect(kTimeLineViewXOffset, y, action.totalFrame * kFrameWidth, ActionManager.GridRowCount * kFrameHeight); ui.defaultUIMaterail.SetPass(0); - ui.DrawVerticalLineFast(kTimeLineViewXOffset + bgRect.width * action.curAnimTimeNormal, y, y + ActionManager.eventAndBoxCount * kFrameHeight, Color.red); + ui.DrawVerticalLineFast(kTimeLineViewXOffset + bgRect.width * action.curAnimTimeNormal, y, y + ActionManager.GridRowCount * kFrameHeight, Color.red); + } + + void GUI_RM() + { + var animData = ActionManager.animationData; + if (animData == null || animData.overrideRootMotion == null) + return; + float y = m_GridY + (ActionManager.MaxEventsPerFrame + 1) * kFrameHeight; + Rect rect = new Rect(kTimeLineViewXOffset - 17, y - 1, 17, kFrameHeight); + if(GUI.Button(rect, "", styles.boxToggle)) + { + ActionManager.EditRootMotionOverrideData(); + } + Rect lb = rect; + lb.y += 3; + GUI.Label(lb, "RM", styles.textBoldSmall); + } void GUI_Boxes() { - float y = m_GridY + ActionManager.kMaxEventsPerFrame * kFrameHeight; - AnimationData animData = ActionManager.animationData; + var animData = ActionManager.animationData; + bool hasRM = animData != null && animData.overrideRootMotion != null; + float y = m_GridY + (ActionManager.MaxEventsPerFrame + 1 + (hasRM ? 1:0)) * kFrameHeight; if (animData == null) return; DrawBoxList(animData.hurtBoxes, ref y, Color.green); @@ -612,7 +661,7 @@ namespace ActionTool return; ActionData action = ActionManager.actionData; int sampleCount = (int)action.totalFrame + 1; - float y = m_GridY + ActionManager.kMaxEventsPerFrame * kFrameHeight; + float y = m_GridY + (ActionManager.MaxEventsPerFrame + 1) * kFrameHeight; Vector2 position = e.mousePosition; int boxCount = ActionManager.animationData.GetBoxesCount(); Rect boxRegion = new Rect(kTimeLineViewXOffset, y, action.totalFrame * kFrameWidth, boxCount * kFrameHeight); @@ -861,7 +910,7 @@ namespace ActionTool ActionData action = ActionManager.actionData; int sampleCount = (int)action.totalFrame + 1; Vector2 position = Event.current.mousePosition; - Rect eventRegion = new Rect(kTimeLineViewXOffset, m_GridY, sampleCount * kFrameWidth, TimelineEventProxy.kMaxEventsPerFrame * kFrameHeight); + Rect eventRegion = new Rect(kTimeLineViewXOffset, m_GridY, sampleCount * kFrameWidth, (ActionManager.MaxEventsPerFrame + 1) * kFrameHeight); if (!eventRegion.Contains(position)) return; diff --git a/Assets/ActionTool/Editor/ActionRootMotionEditor.cs b/Assets/ActionTool/Editor/ActionRootMotionEditor.cs new file mode 100644 index 00000000..ff0dae62 --- /dev/null +++ b/Assets/ActionTool/Editor/ActionRootMotionEditor.cs @@ -0,0 +1,83 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEditor; + +namespace ActionTool +{ + public class ActionRootMotionEditor : EditorWindow + { + ActionEditorStyles styles; + + public static bool IsRecord { get; private set; } + + const float kToolbarControlMargin = 5; + const float kToolbarHeight = 50; + const float kToolbarControlSize = kToolbarHeight - kToolbarControlMargin * 2; + float m_ToolbarOffset = 0; // <= 0 + + Texture m_UITextureRecord; + Texture m_UITextureTakeRecord; + + Texture2D tex; + + private void OnEnable() + { + maxSize = new Vector2(300, 80); + minSize = maxSize; + this.titleContent = new GUIContent("RootMotion Editor"); + + m_UITextureRecord = (Texture)Resources.Load("button_control_record"); + m_UITextureTakeRecord = (Texture)Resources.Load("button_control_takerecord"); + tex = new Texture2D(1, 1, TextureFormat.RGBA32, false); + tex.SetPixel(0, 0, new Color(1f, 0, 0) * 0.8f); + tex.Apply(); + } + + private void OnDisable() + { + + } + + private void Update() + { + + } + + private void OnGUI() + { + if(ActionManager.animationData == null || ActionManager.animationData.overrideRootMotion == null) + { + this.Close(); + return; + } + if (IsRecord) + { + GUI.DrawTexture(new Rect(0, 0, maxSize.x, maxSize.y), tex, ScaleMode.StretchToFill); + } + float x = m_ToolbarOffset, y = kToolbarControlMargin; + GUI_Record(ref x, ref y); + GUI_TakeRecord(ref x, ref y); + } + + void GUI_Record(ref float x, ref float y) + { + x += kToolbarControlMargin; + Rect rect = new Rect(x, y, kToolbarControlSize, kToolbarControlSize); + IsRecord = GUI.Toggle(rect, IsRecord, m_UITextureRecord, GUI.skin.button); + x += kToolbarControlSize; + } + + void GUI_TakeRecord(ref float x, ref float y) + { + x += kToolbarControlMargin; + Rect rect = new Rect(x, y, kToolbarControlSize, kToolbarControlSize); + if (GUI.Button(rect, m_UITextureTakeRecord)) + { + + } + x += kToolbarControlSize; + } + + } +} \ No newline at end of file diff --git a/Assets/ActionTool/Editor/ActionRootMotionEditor.cs.meta b/Assets/ActionTool/Editor/ActionRootMotionEditor.cs.meta new file mode 100644 index 00000000..599c18ad --- /dev/null +++ b/Assets/ActionTool/Editor/ActionRootMotionEditor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2e61eeb773ddf2e478e01d9b6a5ab786 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ActionTool/Resources/button_control_record.png b/Assets/ActionTool/Resources/button_control_record.png new file mode 100644 index 00000000..320d1141 Binary files /dev/null and b/Assets/ActionTool/Resources/button_control_record.png differ diff --git a/Assets/ActionTool/Resources/button_control_record.png.meta b/Assets/ActionTool/Resources/button_control_record.png.meta new file mode 100644 index 00000000..96790b95 --- /dev/null +++ b/Assets/ActionTool/Resources/button_control_record.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 5d711e656ba1b6c4686c131d61c1615d +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ActionTool/Resources/button_control_takerecord.png b/Assets/ActionTool/Resources/button_control_takerecord.png new file mode 100644 index 00000000..84e1c01e Binary files /dev/null and b/Assets/ActionTool/Resources/button_control_takerecord.png differ diff --git a/Assets/ActionTool/Resources/button_control_takerecord.png.meta b/Assets/ActionTool/Resources/button_control_takerecord.png.meta new file mode 100644 index 00000000..3a109cf6 --- /dev/null +++ b/Assets/ActionTool/Resources/button_control_takerecord.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: f956d171b82cd204a8a8e1069b900285 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.Avatar.meta b/Assets/Art/Models/Characters/Erika2/Erika2.Avatar.meta deleted file mode 100644 index 4627f5df..00000000 --- a/Assets/Art/Models/Characters/Erika2/Erika2.Avatar.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d467e546efed7054c934b1a97a116c5c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.AvatarDescription.meta b/Assets/Art/Models/Characters/Erika2/Erika2.AvatarDescription.meta deleted file mode 100644 index ab214036..00000000 --- a/Assets/Art/Models/Characters/Erika2/Erika2.AvatarDescription.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 063d53dfefca4e3429f5788835b0b4ea -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.BlendShapes.meta b/Assets/Art/Models/Characters/Erika2/Erika2.BlendShapes.meta deleted file mode 100644 index ee2ffc5f..00000000 --- a/Assets/Art/Models/Characters/Erika2/Erika2.BlendShapes.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b82ae836c84f36049bdbdb08743b98e0 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Art/Models/Characters/Erika2/Erika2.Materials.meta b/Assets/Art/Models/Characters/Erika2/Erika2.Materials.meta deleted file mode 100644 index e0cb5de8..00000000 --- a/Assets/Art/Models/Characters/Erika2/Erika2.Materials.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 640ede12..00000000 --- a/Assets/Art/Models/Characters/Erika2/Erika2.Meshes.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 4d017390..00000000 --- a/Assets/Art/Models/Characters/Erika2/Erika2.MetaObject.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 0d171fe4..00000000 --- a/Assets/Art/Models/Characters/Erika2/Erika2.Textures.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 69c2852d26b47fa44a688db1349ae258 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta b/Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta new file mode 100644 index 00000000..b76e98a5 --- /dev/null +++ b/Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 20381b3eecfbfe34a9d9222868969d29 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta b/Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta new file mode 100644 index 00000000..41200932 --- /dev/null +++ b/Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: abff7cb61c760094f8ab9437379e0f2c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta b/Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta new file mode 100644 index 00000000..fa9e76cd --- /dev/null +++ b/Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e38cb65072bb4a64cbe162792de9bec2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Material.meta b/Assets/Bundle/Material.meta new file mode 100644 index 00000000..85215e86 --- /dev/null +++ b/Assets/Bundle/Material.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8641bb4d4eee8b1419a1c8316ff9aee5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Shader.meta b/Assets/Bundle/Shader.meta new file mode 100644 index 00000000..92ded933 --- /dev/null +++ b/Assets/Bundle/Shader.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5a8ba4f43d9a7b24d855cadccb986b60 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/UI.meta b/Assets/Bundle/UI.meta new file mode 100644 index 00000000..0914914c --- /dev/null +++ b/Assets/Bundle/UI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4392471259b05a74a82a4bc72b510eb1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/Monster/Robots_Prowler/ActionData.meta b/Assets/Bundle/Unit/Monster/Robots_Prowler/ActionData.meta new file mode 100644 index 00000000..ca7266b0 --- /dev/null +++ b/Assets/Bundle/Unit/Monster/Robots_Prowler/ActionData.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a1d7b6e0d8fb1a642a65011fb6cd7d89 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/Monster/Robots_Prowler/UnitData.meta b/Assets/Bundle/Unit/Monster/Robots_Prowler/UnitData.meta new file mode 100644 index 00000000..142f5872 --- /dev/null +++ b/Assets/Bundle/Unit/Monster/Robots_Prowler/UnitData.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6ad7401709700f34db2b795830937d76 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/NPC.meta b/Assets/Bundle/Unit/NPC.meta new file mode 100644 index 00000000..eeea13e1 --- /dev/null +++ b/Assets/Bundle/Unit/NPC.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8ced034d375cdfa488814663ea17a79b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03.asset index 28c4d848..9ac4cfb7 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: cab6406109041434e890f22d6455172f, type: 3} - m_Name: Air_Combo03(Clone) + m_Name: Air_Combo03 m_EditorClassIdentifier: animationName: Air_Combo03 animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/Air_Combo03.anim diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/rise4.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/rise4.asset new file mode 100644 index 00000000..77c72e71 --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/rise4.asset @@ -0,0 +1,57 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: cab6406109041434e890f22d6455172f, type: 3} + m_Name: rise4(Clone) + m_EditorClassIdentifier: + animationName: rise4 + animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/rise4.anim + animationEvents: [] + hurtBoxes: [] + hitBoxes: [] + throwBoxes: [] + blockBoxes: [] + defendBoxes: [] + overrideRootMotion: + positions: [] + 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: + m_values: [] + parameters: + m_keys: + m_values: [] diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/rise4.asset.meta b/Assets/Bundle/Unit/PC/Erika/AnimationData/rise4.asset.meta new file mode 100644 index 00000000..214054a0 --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/rise4.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: acf4891535497a6459ff3cbe93c20342 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/Erika/Materials/AfterImage.meta b/Assets/Bundle/Unit/PC/Erika/Materials/AfterImage.meta new file mode 100644 index 00000000..1d22d5d2 --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/Materials/AfterImage.meta @@ -0,0 +1,8 @@ +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 new file mode 100644 index 00000000..8c41a6b2 --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta @@ -0,0 +1,8 @@ +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 new file mode 100644 index 00000000..11148d17 --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/Models.meta @@ -0,0 +1,8 @@ +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 new file mode 100644 index 00000000..7d4b13eb --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/UnitData.meta @@ -0,0 +1,8 @@ +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 deleted file mode 100644 index be6badd6..00000000 --- a/Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 new file mode 100644 index 00000000..f5434a00 --- /dev/null +++ b/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta @@ -0,0 +1,8 @@ +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 new file mode 100644 index 00000000..4ed2c938 --- /dev/null +++ b/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta @@ -0,0 +1,8 @@ +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 new file mode 100644 index 00000000..43a52cd1 --- /dev/null +++ b/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta @@ -0,0 +1,8 @@ +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 new file mode 100644 index 00000000..85d58a8c --- /dev/null +++ b/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta @@ -0,0 +1,8 @@ +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 new file mode 100644 index 00000000..dd867045 --- /dev/null +++ b/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta @@ -0,0 +1,8 @@ +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 new file mode 100644 index 00000000..dc530723 --- /dev/null +++ b/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta @@ -0,0 +1,8 @@ +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 new file mode 100644 index 00000000..b28b6f04 --- /dev/null +++ b/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta @@ -0,0 +1,8 @@ +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 new file mode 100644 index 00000000..eeca0d3b --- /dev/null +++ b/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta @@ -0,0 +1,8 @@ +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 new file mode 100644 index 00000000..7f91da28 --- /dev/null +++ b/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta @@ -0,0 +1,8 @@ +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 new file mode 100644 index 00000000..affd6eed --- /dev/null +++ b/Assets/Bundle/Unit/Prop.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dafc173db1ebeab4c80641cc3d4fa528 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/ActionData.meta b/Assets/Data/ActionData.meta new file mode 100644 index 00000000..48dd5af5 --- /dev/null +++ b/Assets/Data/ActionData.meta @@ -0,0 +1,8 @@ +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 new file mode 100644 index 00000000..10bf1fb1 --- /dev/null +++ b/Assets/Data/AnimationData/Erika.meta @@ -0,0 +1,8 @@ +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 new file mode 100644 index 00000000..57b03e09 --- /dev/null +++ b/Assets/Data/RootMotionData/Erika.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2c4e05f9eb0abc949a472e82070dfef1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Data/UnitData.meta b/Assets/Data/UnitData.meta new file mode 100644 index 00000000..d0809213 --- /dev/null +++ b/Assets/Data/UnitData.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5bdb120d934aa114ab2f20e111a3c4d2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Curve3D.meta b/Assets/Scripts/Curve3D.meta new file mode 100644 index 00000000..fef1c5e7 --- /dev/null +++ b/Assets/Scripts/Curve3D.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ad8b718b6b700d8419838dad07158567 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Drone.meta b/Assets/Scripts/Drone.meta new file mode 100644 index 00000000..694cff70 --- /dev/null +++ b/Assets/Scripts/Drone.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ec3412151f8a72a41b2ed21316763399 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Props.meta b/Assets/Scripts/Props.meta new file mode 100644 index 00000000..bb96602e --- /dev/null +++ b/Assets/Scripts/Props.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f299520ed9fcf4a45858ad4ef5a8d5d1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Robot.meta b/Assets/Scripts/Robot.meta new file mode 100644 index 00000000..0b5a087e --- /dev/null +++ b/Assets/Scripts/Robot.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7c09ca1609552d24bbe697d1516f8aa9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Scene.meta b/Assets/Scripts/Scene.meta new file mode 100644 index 00000000..eb7a8716 --- /dev/null +++ b/Assets/Scripts/Scene.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: eaee2d0f48cff9b40baf0686a8105600 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Unit/AnimationData.cs b/Assets/Scripts/Unit/AnimationData.cs index 4114966c..80891d83 100644 --- a/Assets/Scripts/Unit/AnimationData.cs +++ b/Assets/Scripts/Unit/AnimationData.cs @@ -76,14 +76,24 @@ public enum EAnimationParameter [Serializable] public class ParameterDictionary : SerializableDictionary { } +[Serializable] public class RootMotionOverrideData { - public class PosData + [Serializable] + public class PosData { - Vector3 position; - float frame; + [SerializeField] Vector3 position; + [SerializeField] float frame; } - List positions; + [SerializeField] public List positions; + public RootMotionOverrideData() + { + positions = new List(); + } + public Vector3 GetPosition(float frame) + { + return Vector3.zero; + } } // 某个动画的数据，包括帧事件、碰撞盒、速度曲线 @@ -334,6 +344,28 @@ public class AnimationData : ScriptableObject return events; } + public int GetMaxAnimationEventsCount() + { + List frames = GetAnimationEventFrameIndices(); + if(frames == null) + { + ListPool.Release(frames); + return 0; + } + int count = 0; + for(int i = 0; i < frames.Count; ++i) + { + List events = GetAnimationEventsAtFrame(frames[i]); + if (count < events.Count) + { + count = events.Count; + } + ListPool.Release(events); + } + ListPool.Release(frames); + return count; + } + public List GetAnimationEventFrameIndices() { if (animationEvents == null) @@ -359,7 +391,15 @@ public class AnimationData : ScriptableObject } } + public void AddRootMotionOverriderData( ) + { + this.overrideRootMotion = new RootMotionOverrideData(); + } + public void DeleteRootMotionOverrideData() + { + this.overrideRootMotion = null; + } #if UNITY_EDITOR public void OnSaveToDisk() diff --git a/Assets/Scripts/Unit/TimelineEventProxy.cs b/Assets/Scripts/Unit/TimelineEventProxy.cs index 4a71400c..7d2231c6 100644 --- a/Assets/Scripts/Unit/TimelineEventProxy.cs +++ b/Assets/Scripts/Unit/TimelineEventProxy.cs @@ -73,7 +73,6 @@ public partial class TimelineEventProxy EventBulletTime, // 子弹时间 } - public const int kMaxEventsPerFrame = 10; public const int FPS = 30; // timeline 每秒采样30次 private int m_PrevFrame = -1; diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Editor.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Editor.meta deleted file mode 100644 index fc69e121..00000000 --- a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Editor.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 16dceda0..00000000 --- a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Functions.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 3feeaa0c..00000000 --- a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Includes.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index d2cc8de3..00000000 --- a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Pipelines.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 60091bee..00000000 --- a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Resources.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index c50ca514..00000000 --- a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Runtime.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: c9c840958f8546c4e9667f0757d8557a -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Shaders.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Shaders.meta deleted file mode 100644 index 20eca756..00000000 --- a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Core/Shaders.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0f14f2cbed5e00a40a3fa94241cf6c27 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Animation.meta b/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Animation.meta deleted file mode 100644 index 35b83bfb..00000000 --- a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Animation.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 88f9f501..00000000 --- a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Materials.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 4d33dc86..00000000 --- a/Assets/ThirdParty/BOXOPHOBIC/Atmospheric Height Fog/Demo/Shaders.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 293c8b38..00000000 --- a/Assets/ThirdParty/BOXOPHOBIC/User.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index a5ee5a64..00000000 --- a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/Constants.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 3fdad1c4..00000000 --- a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/SettingsUtils.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 94757653..00000000 --- a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledGUI.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index d2c0b7b4..00000000 --- a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledInspector.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 069be515..00000000 --- a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMaterial.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 7ea21e4b..00000000 --- a/Assets/ThirdParty/BOXOPHOBIC/Utils/Editor/StyledMono.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index f2a1c8a6..00000000 --- a/Assets/ThirdParty/BOXOPHOBIC/Utils/Resources.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 50e68eff..00000000 --- a/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/SettingsUtils.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 68664862..00000000 --- a/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledInspector.meta +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index aab2c856..00000000 --- a/Assets/ThirdParty/BOXOPHOBIC/Utils/Scripts/StyledMono.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3ae8613087e217249a69059295113b1c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: -- cgit v1.1-26-g67d0