summaryrefslogtreecommitdiff
path: root/Assets/Bundle
diff options
context:
space:
mode:
Diffstat (limited to 'Assets/Bundle')
-rw-r--r--Assets/Bundle/Materials/Unit/Effect.meta (renamed from Assets/Bundle/Unit/PC/Erika/Materials/Effect.meta)2
-rw-r--r--Assets/Bundle/Models.meta (renamed from Assets/Bundle/Materials/Unit/Common.meta)2
-rw-r--r--Assets/Bundle/Prefabs.meta (renamed from Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta)2
-rw-r--r--Assets/Bundle/Shaders/Common/Image/ImageEffect.cginc5
-rw-r--r--Assets/Bundle/Shaders/Include.meta8
-rw-r--r--Assets/Bundle/Shaders/Unit/Effect.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/Attack_Jump_to_Air.asset32
-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/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
24 files changed, 187 insertions, 8 deletions
diff --git a/Assets/Bundle/Unit/PC/Erika/Materials/Effect.meta b/Assets/Bundle/Materials/Unit/Effect.meta
index 855459bb..fdf8c1db 100644
--- a/Assets/Bundle/Unit/PC/Erika/Materials/Effect.meta
+++ b/Assets/Bundle/Materials/Unit/Effect.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 3ab09dc0a18f20b4ea29507887e11428
+guid: 0525fec1eb7cc94458170e9e106955d5
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/Bundle/Materials/Unit/Common.meta b/Assets/Bundle/Models.meta
index c93b1f88..c9b5bf44 100644
--- a/Assets/Bundle/Materials/Unit/Common.meta
+++ b/Assets/Bundle/Models.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: f56fd8c608849b44b9364a3469655444
+guid: adab1ca5f61452c4c90f19e7c11adf0e
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta b/Assets/Bundle/Prefabs.meta
index be6badd6..82588fb1 100644
--- a/Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta
+++ b/Assets/Bundle/Prefabs.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 2c46a5a23283c7d428ae8bb13663ab6a
+guid: dac6442cad7539149a7527510665d510
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/Bundle/Shaders/Common/Image/ImageEffect.cginc b/Assets/Bundle/Shaders/Common/Image/ImageEffect.cginc
index de9dccdd..ede53e55 100644
--- a/Assets/Bundle/Shaders/Common/Image/ImageEffect.cginc
+++ b/Assets/Bundle/Shaders/Common/Image/ImageEffect.cginc
@@ -17,9 +17,6 @@ float4 _UnitMotionVectorTexture_ST;
float4 _UnitTileOffset;
-
-// functions
-
// 只对一小部分进行后处理
float4 CalculateUnitTillOfssetVertex(float4 vert)
{
@@ -45,4 +42,4 @@ image_v2f image_vert(appdata_img v)
o.vertex = CalculateUnitTillOfssetVertex(v.vertex);
o.uv = CalculateUnitTillOfssetUV(TRANSFORM_TEX(v.texcoord, _MainTex));
return o;
-} \ No newline at end of file
+}
diff --git a/Assets/Bundle/Shaders/Include.meta b/Assets/Bundle/Shaders/Include.meta
new file mode 100644
index 00000000..2666365a
--- /dev/null
+++ b/Assets/Bundle/Shaders/Include.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: dc32af12c5122994d8791378227adeb6
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Bundle/Shaders/Unit/Effect.meta b/Assets/Bundle/Shaders/Unit/Effect.meta
new file mode 100644
index 00000000..7df9a033
--- /dev/null
+++ b/Assets/Bundle/Shaders/Unit/Effect.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9cc4684b9f432f149b16a51f148c9490
+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/Attack_Jump_to_Air.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Attack_Jump_to_Air.asset
index 0ab2f031..49449ede 100644
--- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Attack_Jump_to_Air.asset
+++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Attack_Jump_to_Air.asset
@@ -10,7 +10,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: cab6406109041434e890f22d6455172f, type: 3}
- m_Name: Attack_Jump_to_Air
+ m_Name: Attack_Jump_to_Air(Clone)
m_EditorClassIdentifier:
animationName: Attack_Jump_to_Air
animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/Attack_Jump_to_Air.anim
@@ -110,6 +110,21 @@ MonoBehaviour:
m_keys: 07000000
m_values:
- 0.55
+--- !u!114 &114007163926413818
+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: d52092c3bed6f524ead14801bb72e1c3, type: 3}
+ m_Name: EventMesh_LensEffect_Dash
+ m_EditorClassIdentifier:
+ startFrame: 9
+ lifeTime: 0.1
+ angle: -90
--- !u!114 &114282673544850798
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -132,3 +147,18 @@ MonoBehaviour:
position: {x: 0, y: 2, z: 0.5}
rotation: {x: 190, y: -87.41101, z: 86.147}
scale: {x: 0.8, y: 0.8, z: -0.8}
+--- !u!114 &114349440562429678
+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: d52092c3bed6f524ead14801bb72e1c3, type: 3}
+ m_Name: EventMesh_LensEffect_Dash
+ m_EditorClassIdentifier:
+ startFrame: 10
+ lifeTime: 0.1
+ angle: -90
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/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: