summaryrefslogtreecommitdiff
path: root/Assets/Bundle
diff options
context:
space:
mode:
Diffstat (limited to 'Assets/Bundle')
-rw-r--r--Assets/Bundle/Projectile.meta8
-rw-r--r--Assets/Bundle/Shader.meta8
-rw-r--r--Assets/Bundle/UI.meta8
-rw-r--r--Assets/Bundle/Unit/Monster/Robots_Prowler/ActionData.meta8
-rw-r--r--Assets/Bundle/Unit/Monster/Robots_Prowler/UnitData.meta8
-rw-r--r--Assets/Bundle/Unit/NPC.meta8
-rw-r--r--Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_1.asset22
-rw-r--r--Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_2.asset29
-rw-r--r--Assets/Bundle/Unit/PC/Erika/Materials/AfterImage.meta8
-rw-r--r--Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta8
-rw-r--r--Assets/Bundle/Unit/PC/Erika/Models.meta8
-rw-r--r--Assets/Bundle/Unit/PC/Erika/UnitData.meta8
-rw-r--r--Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta (renamed from Assets/Bundle/Material.meta)2
-rw-r--r--Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta8
-rw-r--r--Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta8
-rw-r--r--Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta8
-rw-r--r--Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta8
-rw-r--r--Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta8
-rw-r--r--Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta8
-rw-r--r--Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta8
-rw-r--r--Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta8
-rw-r--r--Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta8
-rw-r--r--Assets/Bundle/Unit/Prop.meta8
23 files changed, 29 insertions, 184 deletions
diff --git a/Assets/Bundle/Projectile.meta b/Assets/Bundle/Projectile.meta
deleted file mode 100644
index b01252f1..00000000
--- a/Assets/Bundle/Projectile.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 370f39b2edf043241a00acd3f6844aa6
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Bundle/Shader.meta b/Assets/Bundle/Shader.meta
deleted file mode 100644
index 92ded933..00000000
--- a/Assets/Bundle/Shader.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 5a8ba4f43d9a7b24d855cadccb986b60
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Bundle/UI.meta b/Assets/Bundle/UI.meta
deleted file mode 100644
index 0914914c..00000000
--- a/Assets/Bundle/UI.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 4392471259b05a74a82a4bc72b510eb1
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Bundle/Unit/Monster/Robots_Prowler/ActionData.meta b/Assets/Bundle/Unit/Monster/Robots_Prowler/ActionData.meta
deleted file mode 100644
index ca7266b0..00000000
--- a/Assets/Bundle/Unit/Monster/Robots_Prowler/ActionData.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644
index 142f5872..00000000
--- a/Assets/Bundle/Unit/Monster/Robots_Prowler/UnitData.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-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
deleted file mode 100644
index eeea13e1..00000000
--- a/Assets/Bundle/Unit/NPC.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 8ced034d375cdfa488814663ea17a79b
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_1.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_1.asset
index 8a96d3d8..364b9dc3 100644
--- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_1.asset
+++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_1.asset
@@ -29,7 +29,8 @@ MonoBehaviour:
freezeFramesOther: 0
sparkPath: Assets/Art/Vfx/Hit & Slashes Vol.3/Prefabs/hit-white-3.prefab
sparkAnchor: 1
- sparkOffset: {x: 0, y: 0, z: 0}
+ sparkOffset: {x: 0, y: 0, z: -0.5}
+ sparkScale: {x: 0.8, y: 0.8, z: 0.8}
multiSparks: 0
spark2Path:
spark2Anchor: 0
@@ -51,12 +52,12 @@ MonoBehaviour:
frames:
- frame: 7
active: 1
- position: {x: 1.37, y: 0.97, z: 0}
- size: {x: 1.58, y: 1.69, z: 1}
+ position: {x: 0.28, y: 0.97, z: 0}
+ size: {x: 4.02, y: 1.69, z: 1}
- frame: 9
active: 1
- position: {x: 1.22, y: 0.92, z: 0}
- size: {x: 1.1, y: 1.56, z: 1}
+ position: {x: 0.34, y: 0.92, z: 0}
+ size: {x: 3.54, y: 1.56, z: 1}
- collider:
type: 0
pivot: 1
@@ -67,7 +68,8 @@ MonoBehaviour:
freezeFramesOther: 0
sparkPath: Assets/Art/Vfx/Hit & Slashes Vol.3/Prefabs/hit-blue-1.prefab
sparkAnchor: 1
- sparkOffset: {x: 0, y: 0, z: 0}
+ sparkOffset: {x: 0, y: 0, z: -0.5}
+ sparkScale: {x: 0.8, y: 0.8, z: 0.8}
multiSparks: 0
spark2Path:
spark2Anchor: 0
@@ -89,12 +91,12 @@ MonoBehaviour:
frames:
- frame: 10
active: 1
- position: {x: 1.2, y: 0.91, z: 0}
- size: {x: 1.11, y: 1.71, z: 1}
+ position: {x: 0.09, y: 0.91, z: 0}
+ size: {x: 3.55, y: 1.71, z: 1}
- frame: 13
active: 1
- position: {x: 1.21, y: 0.83, z: 0}
- size: {x: 0.91, y: 1.54, z: 1}
+ position: {x: 0.08, y: 0.83, z: 0}
+ size: {x: 3.38, y: 1.54, z: 1}
throwBoxes: []
blockBoxes: []
defendBoxes: []
diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_2.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_2.asset
index 7527688f..d9807c15 100644
--- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_2.asset
+++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_2.asset
@@ -10,7 +10,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: cab6406109041434e890f22d6455172f, type: 3}
- m_Name: Frank_RPG_Assassin_Combo02_2
+ m_Name: Frank_RPG_Assassin_Combo02_2(Clone)
m_EditorClassIdentifier:
animationName: Frank_RPG_Assassin_Combo02_2
animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/Frank_RPG_Assassin_Combo02_2.anim
@@ -31,6 +31,7 @@ MonoBehaviour:
sparkPath: Assets/Art/Vfx/Hit & Slashes Vol.3/Prefabs/hit-blue-1.prefab
sparkAnchor: 1
sparkOffset: {x: 0, y: 0, z: 0}
+ sparkScale: {x: 0.8, y: 0.8, z: 0.8}
multiSparks: 0
spark2Path:
spark2Anchor: 0
@@ -52,12 +53,12 @@ MonoBehaviour:
frames:
- frame: 3
active: 1
- position: {x: 1.08, y: 0.86, z: 0}
- size: {x: 1.21, y: 1.55, z: 1}
+ position: {x: 0.15, y: 0.86, z: 0}
+ size: {x: 3.15, y: 1.55, z: 1}
- frame: 6
active: 1
- position: {x: 0.84, y: 0.76, z: 0}
- size: {x: 0.66, y: 1.36, z: 1}
+ position: {x: -0.32, y: 0.76, z: 0}
+ size: {x: 3.03, y: 1.36, z: 1}
- collider:
type: 0
pivot: 1
@@ -69,6 +70,7 @@ MonoBehaviour:
sparkPath: Assets/Art/Vfx/Hit & Slashes Vol.3/Prefabs/hit-blue-1.prefab
sparkAnchor: 1
sparkOffset: {x: 0, y: 0, z: 0}
+ sparkScale: {x: 0.8, y: 0.8, z: 0.8}
multiSparks: 0
spark2Path:
spark2Anchor: 0
@@ -90,12 +92,12 @@ MonoBehaviour:
frames:
- frame: 7
active: 1
- position: {x: 0.89, y: 0.6, z: 0}
- size: {x: 1.68, y: 1.3, z: 1}
+ position: {x: 0.54, y: 0.6, z: 0}
+ size: {x: 3.04, y: 1.3, z: 1}
- frame: 10
active: 1
- position: {x: 1.02, y: 0.73, z: 0}
- size: {x: 1.01, y: 1.19, z: 1}
+ position: {x: 0.3, y: 0.73, z: 0}
+ size: {x: 2.37, y: 1.19, z: 1}
- collider:
type: 0
pivot: 1
@@ -107,6 +109,7 @@ MonoBehaviour:
sparkPath: Assets/Art/Vfx/Hit & Slashes Vol.3/Prefabs/hit-blue-1.prefab
sparkAnchor: 1
sparkOffset: {x: 0, y: 0, z: 0}
+ sparkScale: {x: 0.8, y: 0.8, z: 0.8}
multiSparks: 0
spark2Path:
spark2Anchor: 0
@@ -128,12 +131,12 @@ MonoBehaviour:
frames:
- frame: 12
active: 1
- position: {x: 1.07, y: 0.74, z: 0}
- size: {x: 1, y: 1.41, z: 1}
+ position: {x: 0.46, y: 0.74, z: 0}
+ size: {x: 2.76, y: 1.78, z: 1}
- frame: 15
active: 1
- position: {x: 0.77, y: 0.65, z: 0}
- size: {x: 0.5, y: 1, z: 1}
+ position: {x: 0.29, y: 0.65, z: 0}
+ size: {x: 2.52, y: 1.56, z: 1}
throwBoxes: []
blockBoxes: []
defendBoxes: []
diff --git a/Assets/Bundle/Unit/PC/Erika/Materials/AfterImage.meta b/Assets/Bundle/Unit/PC/Erika/Materials/AfterImage.meta
deleted file mode 100644
index 1d22d5d2..00000000
--- a/Assets/Bundle/Unit/PC/Erika/Materials/AfterImage.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: e777b7b5be18d4e4092e116011158c68
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta b/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta
deleted file mode 100644
index 8c41a6b2..00000000
--- a/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 5dc1b71affc68b54594096a1b96a5c00
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Bundle/Unit/PC/Erika/Models.meta b/Assets/Bundle/Unit/PC/Erika/Models.meta
deleted file mode 100644
index 11148d17..00000000
--- a/Assets/Bundle/Unit/PC/Erika/Models.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 0d712421d808a43438a43d8a5d34effe
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Bundle/Unit/PC/Erika/UnitData.meta b/Assets/Bundle/Unit/PC/Erika/UnitData.meta
deleted file mode 100644
index 7d4b13eb..00000000
--- a/Assets/Bundle/Unit/PC/Erika/UnitData.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 922befa8a94692845b88500a23229d7f
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Bundle/Material.meta b/Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta
index 85215e86..be6badd6 100644
--- a/Assets/Bundle/Material.meta
+++ b/Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 8641bb4d4eee8b1419a1c8316ff9aee5
+guid: 2c46a5a23283c7d428ae8bb13663ab6a
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta
deleted file mode 100644
index f5434a00..00000000
--- a/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 07c3b2bf6cb8cc2498422bbb105cbad8
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta
deleted file mode 100644
index 4ed2c938..00000000
--- a/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 827d77abe87680a47ae2d71a9e953a18
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta
deleted file mode 100644
index 43a52cd1..00000000
--- a/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 7a2b72fbb41383047ac45e6c22ea9663
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta
deleted file mode 100644
index 85d58a8c..00000000
--- a/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: b2b0838fb0603964e99904eefe81ad7f
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta
deleted file mode 100644
index dd867045..00000000
--- a/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 1c8a678ea9e801f439a1003d04f33cf5
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta
deleted file mode 100644
index dc530723..00000000
--- a/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: ebf636c7cf7b1934b885298ce1f5f42e
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta
deleted file mode 100644
index b28b6f04..00000000
--- a/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 2022e8298d3a8624992143eb57c0f8ac
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta
deleted file mode 100644
index eeca0d3b..00000000
--- a/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f6aa859c834c51f498ef0b3c3b83a0f5
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta
deleted file mode 100644
index 7f91da28..00000000
--- a/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: df69962f5b01e444a8bea87e31c7d0a4
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Bundle/Unit/Prop.meta b/Assets/Bundle/Unit/Prop.meta
deleted file mode 100644
index affd6eed..00000000
--- a/Assets/Bundle/Unit/Prop.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: dafc173db1ebeab4c80641cc3d4fa528
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant: