From ab19e54405f23499b794b67aed389a7a4b644c22 Mon Sep 17 00:00:00 2001 From: chai Date: Mon, 9 Aug 2021 15:05:07 +0800 Subject: *mics --- Assets/ActionTool/Editor/ActionPreviewEditor.cs | 71 ++++++++++++++++++--- .../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/Projectile.meta | 8 +++ Assets/Bundle/Shader.meta | 8 +++ Assets/Bundle/UI.meta | 8 +++ Assets/Bundle/Unit/Monster.meta | 8 +++ Assets/Bundle/Unit/NPC.meta | 8 +++ .../PC/Erika/AnimationData/Air_Combo03_Z0_4.asset | 8 ++- .../Unit/PC/Erika/AnimationData/Take 001.asset | 2 +- .../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/Editor/ErikaScenes.cs | 32 ++++++++++ Assets/Editor/ErikaScenes.cs.meta | 11 ++++ Assets/Editor/Tools/ShortcutHelper.cs | 7 +- Assets/Scripts/Props.meta | 8 +++ Assets/Scripts/Scene.meta | 8 +++ .../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 --- ...3\270\345\205\263\351\227\256\351\242\230.xlsx" | Bin 0 -> 426149 bytes ...2\250\347\224\273\347\255\233\351\200\211.xlsx" | Bin 0 -> 821095 bytes 66 files changed, 347 insertions(+), 248 deletions(-) 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/Projectile.meta create mode 100644 Assets/Bundle/Shader.meta create mode 100644 Assets/Bundle/UI.meta create mode 100644 Assets/Bundle/Unit/Monster.meta create mode 100644 Assets/Bundle/Unit/NPC.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/Editor/ErikaScenes.cs create mode 100644 Assets/Editor/ErikaScenes.cs.meta create mode 100644 Assets/Scripts/Props.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 create mode 100644 "Documents/\345\212\250\347\224\273\347\233\270\345\205\263\351\227\256\351\242\230.xlsx" create mode 100644 "Documents/\345\212\250\347\224\273\347\255\233\351\200\211.xlsx" diff --git a/Assets/ActionTool/Editor/ActionPreviewEditor.cs b/Assets/ActionTool/Editor/ActionPreviewEditor.cs index 9c5fac92..938ffd39 100644 --- a/Assets/ActionTool/Editor/ActionPreviewEditor.cs +++ b/Assets/ActionTool/Editor/ActionPreviewEditor.cs @@ -47,6 +47,12 @@ namespace ActionTool const float kFrameHeight = 20; float m_GridY = 0; + float m_ToolbarOffset = 0; // <= 0 + bool m_ShowLeftButton; + bool m_ShowRightButton; + Rect m_LeftRegion; + Rect m_RightRegion; + bool m_IsLeftOrRightButtonClicked; ActionEditorStyles styles; ActionEditorUI ui; @@ -67,6 +73,8 @@ namespace ActionTool m_UITextureNewThrowBox = (Texture)Resources.Load("throwbox"); m_UITextureNewBlockBox = (Texture)Resources.Load("blockbox"); m_UITextureNewDefendBox = (Texture)Resources.Load("defendbox"); + + m_IsLeftOrRightButtonClicked = false; } void Update() @@ -114,7 +122,14 @@ namespace ActionTool void GUI_Toolbar() { - float x = 0, y = kToolbarControlMargin; + Event e = Event.current; + + float x = m_ToolbarOffset, y = kToolbarControlMargin; + m_IsLeftOrRightButtonClicked = (e.isMouse && ((m_ShowLeftButton && m_LeftRegion.Contains(e.mousePosition)) || + (m_ShowRightButton && m_RightRegion.Contains(e.mousePosition)))); + + GUI.enabled = !m_IsLeftOrRightButtonClicked; + GUI_Toolbar_BG(); GUI_Toolbar_Start(ref x, ref y); GUI_Toolbar_Previous(ref x, ref y); @@ -126,7 +141,7 @@ namespace ActionTool GUI_DrawSeperateLine(x + 10 + kToolbarControlMargin, 0, kToolbarHeight); x += 20; - GUI.enabled = ActionManager.animationData != null; + GUI.enabled = !m_IsLeftOrRightButtonClicked && ActionManager.animationData != null; GUI_Toolbar_NewHurtBox(ref x, ref y); GUI_Toolbar_NewHitBox(ref x, ref y); GUI_Toolbar_NewThrowBox(ref x, ref y); @@ -134,18 +149,21 @@ namespace ActionTool GUI_Toolbar_NewDefendBox(ref x, ref y); //GUI_Toolbar_Detail(ref x, ref y); //GUI_Toolbar_Delete(ref x, ref y); - GUI.enabled = true; + GUI.enabled = !m_IsLeftOrRightButtonClicked; GUI_DrawSeperateLine(x + 10 + kToolbarControlMargin, 0, kToolbarHeight); x += 20; - GUI.enabled = ActionManager.animationData == null; + GUI.enabled = !m_IsLeftOrRightButtonClicked && ActionManager.animationData == null; GUI_Toolbar_NewAnimationData(ref x, ref y); - GUI.enabled = true; + GUI.enabled = !m_IsLeftOrRightButtonClicked; - GUI.enabled = ActionManager.animationData != null; + GUI.enabled = !m_IsLeftOrRightButtonClicked && ActionManager.animationData != null; GUI_Toolbar_Save(ref x, ref y); + GUI.enabled = !m_IsLeftOrRightButtonClicked; + GUI.enabled = true; + GUI_Toolbar_Expand(x); } void GUI_Toolbar_BG() @@ -684,7 +702,7 @@ namespace ActionTool { x += kToolbarControlMargin + 20; Rect rect = new Rect(x, y, kToolbarControlSize, kToolbarControlSize); - GUI.enabled = ActionManager.colliderData != null; + GUI.enabled = !m_IsLeftOrRightButtonClicked && ActionManager.colliderData != null; if (GUI.Button(rect, new GUIContent(styles.infoIcon, "Detail"))) { ActionManager.EditCollider(); @@ -697,7 +715,7 @@ namespace ActionTool { x += kToolbarControlMargin; Rect rect = new Rect(x, y, kToolbarControlSize, kToolbarControlSize); - GUI.enabled = ActionManager.colliderData != null; + GUI.enabled = !m_IsLeftOrRightButtonClicked && ActionManager.colliderData != null; if (GUI.Button(rect, new GUIContent(styles.deleteIcon, "Delete this collider"))) { ActionManager.DeleteCurBox(); @@ -730,7 +748,42 @@ namespace ActionTool x += kToolbarControlSize; } - void GUI_Events() + void GUI_Toolbar_Expand(float x) + { + x += 5; + float width = position.width; + if (width >= x - m_ToolbarOffset) + { + m_ShowLeftButton = m_ShowRightButton = false; + return; + } + float btnWidth = 20; + Rect leftRect = new Rect(-2, kToolbarControlMargin - 6, btnWidth, kToolbarControlSize + 11); + Rect rightRect = new Rect(position.width - 18, kToolbarControlMargin - 6, btnWidth, kToolbarControlSize + 11); + m_LeftRegion = leftRect; + m_RightRegion = rightRect; + Color col = GUI.backgroundColor; + GUI.backgroundColor = Color.gray; + if (x > width) + { + m_ShowRightButton = true; + if (GUI.Button(rightRect, "►", EditorStyles.miniButtonLeft)) + { + m_ToolbarOffset -= Mathf.Min(kToolbarControlSize, x - width); + } + } + if(m_ToolbarOffset < 0) + { + m_ShowLeftButton = true; + if (GUI.Button(leftRect, "◄", EditorStyles.miniButtonRight)) + { + m_ToolbarOffset += Mathf.Min(kToolbarControlSize, -m_ToolbarOffset); + } + } + GUI.backgroundColor = col; + } + + void GUI_Events() { DrawAllEvents(); GenericMenu_Event(); 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/Projectile.meta b/Assets/Bundle/Projectile.meta new file mode 100644 index 00000000..b01252f1 --- /dev/null +++ b/Assets/Bundle/Projectile.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 370f39b2edf043241a00acd3f6844aa6 +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.meta b/Assets/Bundle/Unit/Monster.meta new file mode 100644 index 00000000..51d19a1d --- /dev/null +++ b/Assets/Bundle/Unit/Monster.meta @@ -0,0 +1,8 @@ +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 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_Z0_4.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_4.asset index b069e596..1b602fcd 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_4.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_4.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: cab6406109041434e890f22d6455172f, type: 3} - m_Name: Air_Combo03_Z0_4(Clone) + m_Name: Air_Combo03_Z0_4 m_EditorClassIdentifier: animationName: Air_Combo03_Z0_4 animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/Air_Combo03_Z0_4.anim @@ -134,4 +134,8 @@ MonoBehaviour: toggles: m_keys: 00000000 m_values: - - {x: 0.63, y: 1} + - from: 0 + to: 0 + 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 bcde2316..94ad1c74 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Take 001.asset @@ -10,7 +10,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: cab6406109041434e890f22d6455172f, type: 3} - m_Name: Take 001(Clone)(Clone)(Clone) + m_Name: Take 001(Clone) m_EditorClassIdentifier: animationName: Take 001 animationPath: Assets/Art/Animations/Erika/Take 001.anim 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/Editor/ErikaScenes.cs b/Assets/Editor/ErikaScenes.cs new file mode 100644 index 00000000..58065fb1 --- /dev/null +++ b/Assets/Editor/ErikaScenes.cs @@ -0,0 +1,32 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEditor; +using UnityEditor.SceneManagement; + +public static class ErikaScenes +{ + + [MenuItem("Erika/Scene/打开特效场景")] + static void OpenFxScene() + { + string animScene = "Assets/Scenes/Demo/VfxScene.unity"; + var scene = EditorSceneManager.GetActiveScene(); + if (scene == null || scene.path != animScene) + { + EditorSceneManager.OpenScene(animScene); + } + } + + [MenuItem("Erika/Scene/打开动画场景")] + static void OpenAnimationScene() + { + string animScene = "Assets/Scenes/Demo/AnimationEditScene.unity"; + var scene = EditorSceneManager.GetActiveScene(); + if (scene == null || scene.path != animScene) + { + EditorSceneManager.OpenScene(animScene); + } + } + +} diff --git a/Assets/Editor/ErikaScenes.cs.meta b/Assets/Editor/ErikaScenes.cs.meta new file mode 100644 index 00000000..9c676b11 --- /dev/null +++ b/Assets/Editor/ErikaScenes.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 94285cb3bd8d858478bc5f265605db6b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Editor/Tools/ShortcutHelper.cs b/Assets/Editor/Tools/ShortcutHelper.cs index d0173d23..33cf29c5 100644 --- a/Assets/Editor/Tools/ShortcutHelper.cs +++ b/Assets/Editor/Tools/ShortcutHelper.cs @@ -6,7 +6,7 @@ using UnityEditor.SceneManagement; public class ShortcutHelper { - [MenuItem("Erika/Scene/打开Saionji场景 _F5")] + [MenuItem("Erika/Scene/打开Saionji场景")] static void OpenSaionjiScene() { string path = Application.dataPath + "/Scenes/Demo/FightDemoScene.unity"; @@ -17,7 +17,7 @@ public class ShortcutHelper EditorSceneManager.OpenScene(path); } - [MenuItem("Erika/Scene/打开UMotion场景 _F6")] + [MenuItem("Erika/Scene/打开UMotion场景")] static void OpenUMotionScene() { string path = Application.dataPath + "/Scenes/Demo/AnimationEditScene.unity"; @@ -28,5 +28,4 @@ public class ShortcutHelper EditorSceneManager.OpenScene(path); } - -} +} \ No newline at end of file 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/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/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: diff --git "a/Documents/\345\212\250\347\224\273\347\233\270\345\205\263\351\227\256\351\242\230.xlsx" "b/Documents/\345\212\250\347\224\273\347\233\270\345\205\263\351\227\256\351\242\230.xlsx" new file mode 100644 index 00000000..7b874acb Binary files /dev/null and "b/Documents/\345\212\250\347\224\273\347\233\270\345\205\263\351\227\256\351\242\230.xlsx" differ diff --git "a/Documents/\345\212\250\347\224\273\347\255\233\351\200\211.xlsx" "b/Documents/\345\212\250\347\224\273\347\255\233\351\200\211.xlsx" new file mode 100644 index 00000000..c7fecd54 Binary files /dev/null and "b/Documents/\345\212\250\347\224\273\347\255\233\351\200\211.xlsx" differ -- cgit v1.1-26-g67d0