diff options
-rw-r--r-- | Assets/Bundle/Scenes.meta (renamed from Assets/Scenes.meta) | 2 | ||||
-rw-r--r-- | Assets/Bundle/Scenes/Demo.meta (renamed from Assets/Scenes/Demo.meta) | 0 | ||||
-rw-r--r-- | Assets/Bundle/Scenes/Demo/AnimationEditScene.unity (renamed from Assets/Scenes/Demo/AnimationEditScene.unity) | 0 | ||||
-rw-r--r-- | Assets/Bundle/Scenes/Demo/AnimationEditScene.unity.meta (renamed from Assets/Scenes/Demo/AnimationEditScene.unity.meta) | 0 | ||||
-rw-r--r-- | Assets/Bundle/Scenes/Demo/AnimationEditScene_Profiles.meta (renamed from Assets/Scenes/Demo/AnimationEditScene_Profiles.meta) | 0 | ||||
-rw-r--r-- | Assets/Bundle/Scenes/Demo/AnimationEditScene_Profiles/GameObject Profile.asset (renamed from Assets/Scenes/Demo/AnimationEditScene_Profiles/GameObject Profile.asset) | 0 | ||||
-rw-r--r-- | Assets/Bundle/Scenes/Demo/AnimationEditScene_Profiles/GameObject Profile.asset.meta (renamed from Assets/Scenes/Demo/AnimationEditScene_Profiles/GameObject Profile.asset.meta) | 0 | ||||
-rw-r--r-- | Assets/Bundle/Scenes/Demo/AnimationPreviewScene.unity (renamed from Assets/Scenes/Demo/AnimationPreviewScene.unity) | 0 | ||||
-rw-r--r-- | Assets/Bundle/Scenes/Demo/AnimationPreviewScene.unity.meta (renamed from Assets/Scenes/Demo/AnimationPreviewScene.unity.meta) | 0 | ||||
-rw-r--r-- | Assets/Bundle/Scenes/Demo/BattleTestScene.unity (renamed from Assets/Scenes/Demo/BattleTestScene.unity) | 0 | ||||
-rw-r--r-- | Assets/Bundle/Scenes/Demo/BattleTestScene.unity.meta (renamed from Assets/Scenes/Demo/BattleTestScene.unity.meta) | 0 | ||||
-rw-r--r-- | Assets/Bundle/Scenes/Demo/FightDemoScene.unity (renamed from Assets/Scenes/Demo/FightDemoScene.unity) | 0 | ||||
-rw-r--r-- | Assets/Bundle/Scenes/Demo/FightDemoScene.unity.meta (renamed from Assets/Scenes/Demo/FightDemoScene.unity.meta) | 0 | ||||
-rw-r--r-- | Assets/Bundle/Scenes/Demo/ToonShadingScene.unity (renamed from Assets/Scenes/Demo/ToonShadingScene.unity) | 0 | ||||
-rw-r--r-- | Assets/Bundle/Scenes/Demo/ToonShadingScene.unity.meta (renamed from Assets/Scenes/Demo/ToonShadingScene.unity.meta) | 0 | ||||
-rw-r--r-- | Assets/Bundle/Scenes/Demo/UMotionEditScene.unity (renamed from Assets/Scenes/Demo/UMotionEditScene.unity) | 0 | ||||
-rw-r--r-- | Assets/Bundle/Scenes/Demo/UMotionEditScene.unity.meta (renamed from Assets/Scenes/Demo/UMotionEditScene.unity.meta) | 0 | ||||
-rw-r--r-- | Assets/Bundle/Scenes/Demo/VfxScene.unity (renamed from Assets/Scenes/Demo/VfxScene.unity) | 0 | ||||
-rw-r--r-- | Assets/Bundle/Scenes/Demo/VfxScene.unity.meta (renamed from Assets/Scenes/Demo/VfxScene.unity.meta) | 0 | ||||
-rw-r--r-- | Assets/Bundle/Scenes/MainScene.unity (renamed from Assets/Scenes/MainScene.unity) | 0 | ||||
-rw-r--r-- | Assets/Bundle/Scenes/MainScene.unity.meta (renamed from Assets/Scenes/MainScene.unity.meta) | 0 | ||||
-rw-r--r-- | Assets/Bundle/Scenes/VfxScene.unity (renamed from Assets/Scenes/VfxScene.unity) | 0 | ||||
-rw-r--r-- | Assets/Bundle/Scenes/VfxScene.unity.meta (renamed from Assets/Scenes/VfxScene.unity.meta) | 0 | ||||
-rw-r--r-- | Assets/Bundle/Scenes/scene_demo.unity (renamed from Assets/Scenes/scene_demo.unity) | 0 | ||||
-rw-r--r-- | Assets/Bundle/Scenes/scene_demo.unity.meta (renamed from Assets/Scenes/scene_demo.unity.meta) | 0 | ||||
-rw-r--r-- | Assets/Config/Characters.meta | 8 | ||||
-rw-r--r-- | Assets/Config/Characters/Saionji.meta | 8 | ||||
-rw-r--r-- | Assets/Config/Characters/Saionji/Saionji.ab | 4 | ||||
-rw-r--r-- | Assets/Config/Characters/Saionji/Saionji.ab.meta | 7 | ||||
-rw-r--r-- | Assets/Config/Characters/Saionji/Saionji.cmd | 0 | ||||
-rw-r--r-- | Assets/Config/Characters/Saionji/Saionji.cmd.meta | 7 | ||||
-rw-r--r-- | Assets/Resources.meta (renamed from Assets/Config.meta) | 2 | ||||
-rw-r--r-- | Assets/Tools/ActionTool/Editor/ActionManager.cs | 10 |
33 files changed, 5 insertions, 43 deletions
diff --git a/Assets/Scenes.meta b/Assets/Bundle/Scenes.meta index 510dd54f..f86b5199 100644 --- a/Assets/Scenes.meta +++ b/Assets/Bundle/Scenes.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 70c563b78fe86ad458c70b3c0f9387ab +guid: 1804ba46609b39a4a817ef8c02a1bfca folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scenes/Demo.meta b/Assets/Bundle/Scenes/Demo.meta index f2b50adc..f2b50adc 100644 --- a/Assets/Scenes/Demo.meta +++ b/Assets/Bundle/Scenes/Demo.meta diff --git a/Assets/Scenes/Demo/AnimationEditScene.unity b/Assets/Bundle/Scenes/Demo/AnimationEditScene.unity index 47a14f54..47a14f54 100644 --- a/Assets/Scenes/Demo/AnimationEditScene.unity +++ b/Assets/Bundle/Scenes/Demo/AnimationEditScene.unity diff --git a/Assets/Scenes/Demo/AnimationEditScene.unity.meta b/Assets/Bundle/Scenes/Demo/AnimationEditScene.unity.meta index a5cb8544..a5cb8544 100644 --- a/Assets/Scenes/Demo/AnimationEditScene.unity.meta +++ b/Assets/Bundle/Scenes/Demo/AnimationEditScene.unity.meta diff --git a/Assets/Scenes/Demo/AnimationEditScene_Profiles.meta b/Assets/Bundle/Scenes/Demo/AnimationEditScene_Profiles.meta index b8f68a17..b8f68a17 100644 --- a/Assets/Scenes/Demo/AnimationEditScene_Profiles.meta +++ b/Assets/Bundle/Scenes/Demo/AnimationEditScene_Profiles.meta diff --git a/Assets/Scenes/Demo/AnimationEditScene_Profiles/GameObject Profile.asset b/Assets/Bundle/Scenes/Demo/AnimationEditScene_Profiles/GameObject Profile.asset index 06572bff..06572bff 100644 --- a/Assets/Scenes/Demo/AnimationEditScene_Profiles/GameObject Profile.asset +++ b/Assets/Bundle/Scenes/Demo/AnimationEditScene_Profiles/GameObject Profile.asset diff --git a/Assets/Scenes/Demo/AnimationEditScene_Profiles/GameObject Profile.asset.meta b/Assets/Bundle/Scenes/Demo/AnimationEditScene_Profiles/GameObject Profile.asset.meta index 112ddc7e..112ddc7e 100644 --- a/Assets/Scenes/Demo/AnimationEditScene_Profiles/GameObject Profile.asset.meta +++ b/Assets/Bundle/Scenes/Demo/AnimationEditScene_Profiles/GameObject Profile.asset.meta diff --git a/Assets/Scenes/Demo/AnimationPreviewScene.unity b/Assets/Bundle/Scenes/Demo/AnimationPreviewScene.unity index 2b8e5c09..2b8e5c09 100644 --- a/Assets/Scenes/Demo/AnimationPreviewScene.unity +++ b/Assets/Bundle/Scenes/Demo/AnimationPreviewScene.unity diff --git a/Assets/Scenes/Demo/AnimationPreviewScene.unity.meta b/Assets/Bundle/Scenes/Demo/AnimationPreviewScene.unity.meta index d7fe4fa2..d7fe4fa2 100644 --- a/Assets/Scenes/Demo/AnimationPreviewScene.unity.meta +++ b/Assets/Bundle/Scenes/Demo/AnimationPreviewScene.unity.meta diff --git a/Assets/Scenes/Demo/BattleTestScene.unity b/Assets/Bundle/Scenes/Demo/BattleTestScene.unity index dd1bebd0..dd1bebd0 100644 --- a/Assets/Scenes/Demo/BattleTestScene.unity +++ b/Assets/Bundle/Scenes/Demo/BattleTestScene.unity diff --git a/Assets/Scenes/Demo/BattleTestScene.unity.meta b/Assets/Bundle/Scenes/Demo/BattleTestScene.unity.meta index a2d3ad6e..a2d3ad6e 100644 --- a/Assets/Scenes/Demo/BattleTestScene.unity.meta +++ b/Assets/Bundle/Scenes/Demo/BattleTestScene.unity.meta diff --git a/Assets/Scenes/Demo/FightDemoScene.unity b/Assets/Bundle/Scenes/Demo/FightDemoScene.unity index ad31c277..ad31c277 100644 --- a/Assets/Scenes/Demo/FightDemoScene.unity +++ b/Assets/Bundle/Scenes/Demo/FightDemoScene.unity diff --git a/Assets/Scenes/Demo/FightDemoScene.unity.meta b/Assets/Bundle/Scenes/Demo/FightDemoScene.unity.meta index ceb84e81..ceb84e81 100644 --- a/Assets/Scenes/Demo/FightDemoScene.unity.meta +++ b/Assets/Bundle/Scenes/Demo/FightDemoScene.unity.meta diff --git a/Assets/Scenes/Demo/ToonShadingScene.unity b/Assets/Bundle/Scenes/Demo/ToonShadingScene.unity index 5f56febb..5f56febb 100644 --- a/Assets/Scenes/Demo/ToonShadingScene.unity +++ b/Assets/Bundle/Scenes/Demo/ToonShadingScene.unity diff --git a/Assets/Scenes/Demo/ToonShadingScene.unity.meta b/Assets/Bundle/Scenes/Demo/ToonShadingScene.unity.meta index 76708e45..76708e45 100644 --- a/Assets/Scenes/Demo/ToonShadingScene.unity.meta +++ b/Assets/Bundle/Scenes/Demo/ToonShadingScene.unity.meta diff --git a/Assets/Scenes/Demo/UMotionEditScene.unity b/Assets/Bundle/Scenes/Demo/UMotionEditScene.unity index fb195ae0..fb195ae0 100644 --- a/Assets/Scenes/Demo/UMotionEditScene.unity +++ b/Assets/Bundle/Scenes/Demo/UMotionEditScene.unity diff --git a/Assets/Scenes/Demo/UMotionEditScene.unity.meta b/Assets/Bundle/Scenes/Demo/UMotionEditScene.unity.meta index 5e007e18..5e007e18 100644 --- a/Assets/Scenes/Demo/UMotionEditScene.unity.meta +++ b/Assets/Bundle/Scenes/Demo/UMotionEditScene.unity.meta diff --git a/Assets/Scenes/Demo/VfxScene.unity b/Assets/Bundle/Scenes/Demo/VfxScene.unity index 0554c08d..0554c08d 100644 --- a/Assets/Scenes/Demo/VfxScene.unity +++ b/Assets/Bundle/Scenes/Demo/VfxScene.unity diff --git a/Assets/Scenes/Demo/VfxScene.unity.meta b/Assets/Bundle/Scenes/Demo/VfxScene.unity.meta index 1c90e23c..1c90e23c 100644 --- a/Assets/Scenes/Demo/VfxScene.unity.meta +++ b/Assets/Bundle/Scenes/Demo/VfxScene.unity.meta diff --git a/Assets/Scenes/MainScene.unity b/Assets/Bundle/Scenes/MainScene.unity index 5da86b7d..5da86b7d 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Bundle/Scenes/MainScene.unity diff --git a/Assets/Scenes/MainScene.unity.meta b/Assets/Bundle/Scenes/MainScene.unity.meta index b9c568e6..b9c568e6 100644 --- a/Assets/Scenes/MainScene.unity.meta +++ b/Assets/Bundle/Scenes/MainScene.unity.meta diff --git a/Assets/Scenes/VfxScene.unity b/Assets/Bundle/Scenes/VfxScene.unity index 2dfc9a85..2dfc9a85 100644 --- a/Assets/Scenes/VfxScene.unity +++ b/Assets/Bundle/Scenes/VfxScene.unity diff --git a/Assets/Scenes/VfxScene.unity.meta b/Assets/Bundle/Scenes/VfxScene.unity.meta index e1266419..e1266419 100644 --- a/Assets/Scenes/VfxScene.unity.meta +++ b/Assets/Bundle/Scenes/VfxScene.unity.meta diff --git a/Assets/Scenes/scene_demo.unity b/Assets/Bundle/Scenes/scene_demo.unity index a673abf8..a673abf8 100644 --- a/Assets/Scenes/scene_demo.unity +++ b/Assets/Bundle/Scenes/scene_demo.unity diff --git a/Assets/Scenes/scene_demo.unity.meta b/Assets/Bundle/Scenes/scene_demo.unity.meta index ef8d05c9..ef8d05c9 100644 --- a/Assets/Scenes/scene_demo.unity.meta +++ b/Assets/Bundle/Scenes/scene_demo.unity.meta diff --git a/Assets/Config/Characters.meta b/Assets/Config/Characters.meta deleted file mode 100644 index 7d47b1cc..00000000 --- a/Assets/Config/Characters.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: bae44e9c3068fd444a77a3a6e7073e9b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Config/Characters/Saionji.meta b/Assets/Config/Characters/Saionji.meta deleted file mode 100644 index 5498cef1..00000000 --- a/Assets/Config/Characters/Saionji.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: bcec76836c034ce40aaef770936e5d8f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Config/Characters/Saionji/Saionji.ab b/Assets/Config/Characters/Saionji/Saionji.ab deleted file mode 100644 index e7222886..00000000 --- a/Assets/Config/Characters/Saionji/Saionji.ab +++ /dev/null @@ -1,4 +0,0 @@ -[Ability 1] ; move ability - - - diff --git a/Assets/Config/Characters/Saionji/Saionji.ab.meta b/Assets/Config/Characters/Saionji/Saionji.ab.meta deleted file mode 100644 index 9d48e0d1..00000000 --- a/Assets/Config/Characters/Saionji/Saionji.ab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: bce9f2b37ca34fb4ab701169c4b7d27a -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Config/Characters/Saionji/Saionji.cmd b/Assets/Config/Characters/Saionji/Saionji.cmd deleted file mode 100644 index e69de29b..00000000 --- a/Assets/Config/Characters/Saionji/Saionji.cmd +++ /dev/null diff --git a/Assets/Config/Characters/Saionji/Saionji.cmd.meta b/Assets/Config/Characters/Saionji/Saionji.cmd.meta deleted file mode 100644 index 35cb64ce..00000000 --- a/Assets/Config/Characters/Saionji/Saionji.cmd.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: a973140683fb2514aac7d79426d348a0 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Config.meta b/Assets/Resources.meta index 5d627227..3783a737 100644 --- a/Assets/Config.meta +++ b/Assets/Resources.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3e2116950975cb844b06e1f2c446312a +guid: 8d38694a49e1da4409cc08520b04f3c7 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Tools/ActionTool/Editor/ActionManager.cs b/Assets/Tools/ActionTool/Editor/ActionManager.cs index d9279745..f88f73e3 100644 --- a/Assets/Tools/ActionTool/Editor/ActionManager.cs +++ b/Assets/Tools/ActionTool/Editor/ActionManager.cs @@ -18,13 +18,9 @@ namespace ActionTool NPC,
}
- public static string s_Controller = "Assets/ActionTool/controller_temp.controller";
- static string s_SettingPath = "Assets/ActionTool/ActionTool Settings.asset";
- public static string scenePath { get { return "Assets/ActionTool/ActionToolScene.unity"; } }
-
- //public static string s_AnimFolder = "Assets/Art/Animations/";
- //public static string s_AnimationDataFolder = "Assets/Data/AnimationData/";
- //static string s_RootMotionDataFolder = "Assets/Data/RootMotionData/";
+ public static string s_Controller = "Assets/Tools/ActionTool/controller_temp.controller";
+ static string s_SettingPath = "Assets/Tools/ActionTool/ActionTool Settings.asset";
+ public static string scenePath { get { return "Assets/Tools/ActionTool/ActionToolScene.unity"; } }
public static ActionEditor AnimationWindow;
public static ActionPreviewEditor PreviewWindow;
|