summaryrefslogtreecommitdiff
path: root/Assets/Bundle
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2021-09-20 00:42:33 +0800
committerchai <chaifix@163.com>2021-09-20 00:42:33 +0800
commit02b44c07adfcf921da594120b4cd8fc18b982725 (patch)
tree723e001ed8c5f7c39419cc4a50a3202a0cf59961 /Assets/Bundle
parentd4581317f904b870c482a3274e7cc47d1732a673 (diff)
+command buffer
Diffstat (limited to 'Assets/Bundle')
-rw-r--r--Assets/Bundle/Materials/Common.meta (renamed from Assets/Bundle/Prefabs.meta)2
-rw-r--r--Assets/Bundle/Materials/Unit/ImageEffect/unit_img_motion_blur.mat (renamed from Assets/Bundle/Materials/Unit/ImageEffect/unit_img_motionBlur.mat)3
-rw-r--r--Assets/Bundle/Materials/Unit/ImageEffect/unit_img_motion_blur.mat.meta (renamed from Assets/Bundle/Materials/Unit/ImageEffect/unit_img_motionBlur.mat.meta)0
-rw-r--r--Assets/Bundle/Scenes/Demo/AnimationEditScene.unity129
-rw-r--r--Assets/Bundle/Shaders/Common.meta (renamed from Assets/Bundle/Shaders/Unit/Effect.meta)2
-rw-r--r--Assets/Bundle/Shaders/Common/Image.meta (renamed from Assets/Bundle/Models.meta)2
-rw-r--r--Assets/Bundle/Shaders/Common/Image/common_img_bloom.cs18
-rw-r--r--Assets/Bundle/Shaders/Common/Image/common_img_bloom.cs.meta11
-rw-r--r--Assets/Bundle/Shaders/Common/Image/common_img_blur.shader79
-rw-r--r--Assets/Bundle/Shaders/Common/Image/common_img_blur.shader.meta9
-rw-r--r--Assets/Bundle/Shaders/Common/common_solid_color.shader81
-rw-r--r--Assets/Bundle/Shaders/Common/common_solid_color.shader.meta9
-rw-r--r--Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_color_drift.shader (renamed from Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_colorDrift.shader)116
-rw-r--r--Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_color_drift.shader.meta (renamed from Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_colorDrift.shader.meta)0
-rw-r--r--Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_motion_blur.shader (renamed from Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_motionBlur.shader)31
-rw-r--r--Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_motion_blur.shader.meta (renamed from Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_motionBlur.shader.meta)0
-rw-r--r--Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_speed_line.shader (renamed from Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_speedLine.shader)116
-rw-r--r--Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_speed_line.shader.meta (renamed from Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_speedLine.shader.meta)0
-rw-r--r--Assets/Bundle/Shaders/Unit/LensEffect.meta8
-rw-r--r--Assets/Bundle/Shaders/Unit/LensEffect/unit_lens_motion_blur.shader62
-rw-r--r--Assets/Bundle/Shaders/Unit/LensEffect/unit_lens_motion_blur.shader.meta9
-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/Models/Materials/Robots_Prowel_Color 1.mat77
-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/Run.asset13
-rw-r--r--Assets/Bundle/Unit/PC/Erika/Materials/Effect.meta (renamed from Assets/Bundle/Materials/Unit/Effect.meta)2
-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/Prefabs/Erika_Robot.prefab9
-rw-r--r--Assets/Bundle/Unit/PC/Erika/UnitData.meta8
-rw-r--r--Assets/Bundle/Unit/PC/Erika/Weapons/Materials.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
43 files changed, 639 insertions, 293 deletions
diff --git a/Assets/Bundle/Prefabs.meta b/Assets/Bundle/Materials/Common.meta
index 82588fb1..2dc8c0c1 100644
--- a/Assets/Bundle/Prefabs.meta
+++ b/Assets/Bundle/Materials/Common.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: dac6442cad7539149a7527510665d510
+guid: ad166fa278dd3ad41a25aaeec66d37ab
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/Bundle/Materials/Unit/ImageEffect/unit_img_motionBlur.mat b/Assets/Bundle/Materials/Unit/ImageEffect/unit_img_motion_blur.mat
index 48d884ad..20c6e1f9 100644
--- a/Assets/Bundle/Materials/Unit/ImageEffect/unit_img_motionBlur.mat
+++ b/Assets/Bundle/Materials/Unit/ImageEffect/unit_img_motion_blur.mat
@@ -7,7 +7,7 @@ Material:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: unit_img_motionBlur
+ m_Name: unit_img_motion_blur
m_Shader: {fileID: 4800000, guid: f0e5d0965cb119045abf4f057a692835, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
@@ -64,6 +64,7 @@ Material:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
+ - _Distance: 0
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
diff --git a/Assets/Bundle/Materials/Unit/ImageEffect/unit_img_motionBlur.mat.meta b/Assets/Bundle/Materials/Unit/ImageEffect/unit_img_motion_blur.mat.meta
index f5ce25ff..f5ce25ff 100644
--- a/Assets/Bundle/Materials/Unit/ImageEffect/unit_img_motionBlur.mat.meta
+++ b/Assets/Bundle/Materials/Unit/ImageEffect/unit_img_motion_blur.mat.meta
diff --git a/Assets/Bundle/Scenes/Demo/AnimationEditScene.unity b/Assets/Bundle/Scenes/Demo/AnimationEditScene.unity
index efcb5238..290f59bd 100644
--- a/Assets/Bundle/Scenes/Demo/AnimationEditScene.unity
+++ b/Assets/Bundle/Scenes/Demo/AnimationEditScene.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
- m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1}
+ m_IndirectSpecularColor: {r: 0.18028334, g: 0.22571328, b: 0.3069217, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -67385,6 +67385,7 @@ GameObject:
- component: {fileID: 861741898}
- component: {fileID: 861741901}
- component: {fileID: 861741903}
+ - component: {fileID: 861741902}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
@@ -67431,7 +67432,7 @@ Camera:
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
- m_RenderingPath: -1
+ m_RenderingPath: 1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 3
@@ -67455,7 +67456,7 @@ Transform:
m_Children: []
m_Father: {fileID: 278122007}
m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_LocalEulerAnglesHint: {x: -14.21, y: 54.71, z: 0}
--- !u!114 &861741901
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -67516,6 +67517,18 @@ MonoBehaviour:
m_BeforeTransparentBundles: []
m_BeforeStackBundles: []
m_AfterStackBundles: []
+--- !u!114 &861741902
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 861741897}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 058dffdf2041d7d43902a7c301296bb2, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!114 &861741903
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -67529,6 +67542,47 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
offset: {x: 0, y: 1.2, z: 0}
+ z: -7.5
+ region:
+ l: -0.1
+ r: 0.1
+ t: 0.1
+ b: -0.1
+ moveSpeed: 30
+ speedCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: -0.053573478
+ outSlope: -0.053573478
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0.1677485
+ - serializedVersion: 3
+ time: 0.5793689
+ value: 0.73886395
+ inSlope: -1.0201879
+ outSlope: -1.0201879
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.15874855
+ outWeight: 0.12042392
+ - serializedVersion: 3
+ time: 1
+ value: 0
+ inSlope: -1.7565603
+ outSlope: -1.7565603
+ tangentMode: 34
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ threshold: 1
--- !u!1 &998301198
GameObject:
m_ObjectHideFlags: 0
@@ -201725,3 +201779,72 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: -137.82199, y: -87.41101, z: 86.146996}
+--- !u!1001 &7723662135624581893
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 6928033330946439154, guid: 0b08ee7afb9df4649b0dd2cd0a3eeac7,
+ type: 3}
+ propertyPath: m_Name
+ value: Erika_Robot
+ objectReference: {fileID: 0}
+ - target: {fileID: 6930345995811640846, guid: 0b08ee7afb9df4649b0dd2cd0a3eeac7,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 3.54
+ objectReference: {fileID: 0}
+ - target: {fileID: 6930345995811640846, guid: 0b08ee7afb9df4649b0dd2cd0a3eeac7,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 3.34
+ objectReference: {fileID: 0}
+ - target: {fileID: 6930345995811640846, guid: 0b08ee7afb9df4649b0dd2cd0a3eeac7,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -12.52
+ objectReference: {fileID: 0}
+ - target: {fileID: 6930345995811640846, guid: 0b08ee7afb9df4649b0dd2cd0a3eeac7,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6930345995811640846, guid: 0b08ee7afb9df4649b0dd2cd0a3eeac7,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6930345995811640846, guid: 0b08ee7afb9df4649b0dd2cd0a3eeac7,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6930345995811640846, guid: 0b08ee7afb9df4649b0dd2cd0a3eeac7,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6930345995811640846, guid: 0b08ee7afb9df4649b0dd2cd0a3eeac7,
+ type: 3}
+ propertyPath: m_RootOrder
+ value: 11
+ objectReference: {fileID: 0}
+ - target: {fileID: 6930345995811640846, guid: 0b08ee7afb9df4649b0dd2cd0a3eeac7,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6930345995811640846, guid: 0b08ee7afb9df4649b0dd2cd0a3eeac7,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6930345995811640846, guid: 0b08ee7afb9df4649b0dd2cd0a3eeac7,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 0b08ee7afb9df4649b0dd2cd0a3eeac7, type: 3}
diff --git a/Assets/Bundle/Shaders/Unit/Effect.meta b/Assets/Bundle/Shaders/Common.meta
index 7df9a033..bb87a51a 100644
--- a/Assets/Bundle/Shaders/Unit/Effect.meta
+++ b/Assets/Bundle/Shaders/Common.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 9cc4684b9f432f149b16a51f148c9490
+guid: 174b504a5d32cf84daeee290b8470ff1
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/Bundle/Models.meta b/Assets/Bundle/Shaders/Common/Image.meta
index c9b5bf44..abeda856 100644
--- a/Assets/Bundle/Models.meta
+++ b/Assets/Bundle/Shaders/Common/Image.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: adab1ca5f61452c4c90f19e7c11adf0e
+guid: c4f83cfe782b4d6408644387c887b5f9
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/Bundle/Shaders/Common/Image/common_img_bloom.cs b/Assets/Bundle/Shaders/Common/Image/common_img_bloom.cs
new file mode 100644
index 00000000..a5603324
--- /dev/null
+++ b/Assets/Bundle/Shaders/Common/Image/common_img_bloom.cs
@@ -0,0 +1,18 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class common_img_bloom : MonoBehaviour
+{
+ // Start is called before the first frame update
+ void Start()
+ {
+
+ }
+
+ // Update is called once per frame
+ void Update()
+ {
+
+ }
+}
diff --git a/Assets/Bundle/Shaders/Common/Image/common_img_bloom.cs.meta b/Assets/Bundle/Shaders/Common/Image/common_img_bloom.cs.meta
new file mode 100644
index 00000000..a94e86e5
--- /dev/null
+++ b/Assets/Bundle/Shaders/Common/Image/common_img_bloom.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 31492de5533444b49bab8c503b8c6d0f
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Bundle/Shaders/Common/Image/common_img_blur.shader b/Assets/Bundle/Shaders/Common/Image/common_img_blur.shader
new file mode 100644
index 00000000..2cebb028
--- /dev/null
+++ b/Assets/Bundle/Shaders/Common/Image/common_img_blur.shader
@@ -0,0 +1,79 @@
+Shader "Erika/Common/Image/Blur"
+{
+ Properties
+ {
+ _MainTex("Texture", 2D) = "white" {}
+ _Angle("Angle", float) = 0
+ _Distance("Distance", float) = 0
+ }
+
+ SubShader
+ {
+ Tags { "RenderType" = "Opaque" "Queue" = "Transparent-1"}
+ LOD 100
+
+ ZWrite Off
+ ZTest LEqual
+
+ Blend SrcAlpha OneMinusSrcAlpha
+
+ Pass
+ {
+ CGPROGRAM
+ #pragma vertex vert
+ #pragma fragment frag
+
+ #include "UnityCG.cginc"
+
+ struct appdata
+ {
+ float4 vertex : POSITION;
+ float2 uv : TEXCOORD0;
+ };
+
+ struct v2f
+ {
+ float2 uv : TEXCOORD0;
+ float4 vertex : SV_POSITION;
+ };
+
+ sampler2D _MainTex;
+ float4 _MainTex_ST;
+
+ float _Angle;
+
+ fixed _Distance;
+
+ v2f vert(appdata v)
+ {
+ v2f o;
+ o.vertex = UnityObjectToClipPos(v.vertex);
+ o.uv = TRANSFORM_TEX(v.uv, _MainTex);
+ return o;
+ }
+
+ fixed4 frag(v2f i) : SV_Target
+ {
+ _Angle = 0;
+ _Distance = 0.02f;
+
+ fixed2 uv = i.uv;
+ fixed2 offset = fixed2(0.05, 0.05);
+ const float sampleCount = 30;
+ fixed4 color = fixed4(0,0,0,0);
+ float radian = radians(_Angle);
+ float distance = _Distance;
+ for (int i = 0; i < sampleCount; i++)
+ {
+ float dx = distance * cos(radian) / sampleCount * i;
+ float dy = distance * sin(radian) / sampleCount * i;
+ color += tex2D(_MainTex,float2(uv.x + dx,uv.y + dy)) * (1 / sampleCount);
+ }
+ //color = tex2D(_MainTex, uv);
+ return color;
+ }
+ ENDCG
+ }
+ }
+
+} // shader
diff --git a/Assets/Bundle/Shaders/Common/Image/common_img_blur.shader.meta b/Assets/Bundle/Shaders/Common/Image/common_img_blur.shader.meta
new file mode 100644
index 00000000..8053135d
--- /dev/null
+++ b/Assets/Bundle/Shaders/Common/Image/common_img_blur.shader.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 582d2065809e3814c98b6f0806996415
+ShaderImporter:
+ externalObjects: {}
+ defaultTextures: []
+ nonModifiableTextures: []
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Bundle/Shaders/Common/common_solid_color.shader b/Assets/Bundle/Shaders/Common/common_solid_color.shader
new file mode 100644
index 00000000..031d4b69
--- /dev/null
+++ b/Assets/Bundle/Shaders/Common/common_solid_color.shader
@@ -0,0 +1,81 @@
+Shader "Erika/Common/SolidColor"
+{
+ Properties
+ {
+ _MainTex("Texture", 2D) = "white" {}
+ _Color("Color", Color) = (1,1,1,1)
+ }
+ SubShader
+ {
+ Tags { "RenderType"="Opaque" }
+ LOD 100
+
+ ZTest LEqual
+
+ Pass
+ {
+ CGPROGRAM
+ #pragma vertex vert
+ #pragma fragment frag
+
+ #include "UnityCG.cginc"
+
+ struct appdata
+ {
+ float4 vertex : POSITION;
+ float2 uv : TEXCOORD0;
+ };
+
+ struct v2f
+ {
+ float2 uv : TEXCOORD0;
+ float4 vertex : SV_POSITION;
+ float4 screenPos : TEXCOORD2;
+ };
+
+ fixed4 _Color;
+
+ sampler2D_float _CameraDepthTexture;
+
+ float4x4 _ObjectToWorld;
+
+ sampler2D _MainTex;
+ float4 _MainTex_ST;
+
+ v2f vert (appdata v)
+ {
+ v2f o;
+ o.vertex = UnityWorldToClipPos(mul(_ObjectToWorld, v.vertex));
+ //o.vertex = UnityWorldToClipPos(mul(unity_ObjectToWorld, v.vertex));
+ o.screenPos = ComputeScreenPos(o.vertex);
+ o.uv = TRANSFORM_TEX(v.uv, _MainTex);
+ return o;
+ }
+
+ fixed4 frag (v2f i) : SV_Target
+ {
+ float4 c = float4(0, 0, 0, 0);
+
+ float2 uv = i.screenPos.xy / i.screenPos.w; // normalized screen-space pos
+ float camDepth = SAMPLE_DEPTH_TEXTURE(_CameraDepthTexture, uv);
+ camDepth = Linear01Depth(camDepth); // converts z buffer value to depth value from 0..1
+
+ float depth = i.screenPos.z / i.screenPos.w;
+#if !UNITY_UV_STARTS_AT_TOP//OpenGL平台需要手动将[-1,1]映射到[0,1]模拟glDepthRange(0,1)
+ depth = (depth + 1) / 2;
+#endif
+ depth = Linear01Depth(depth);
+
+ float diff = saturate(depth - camDepth);
+ if (diff < 0.0001)
+ {
+ // c = _Color;
+ c = tex2D(_MainTex, i.uv);
+ }
+
+ return c;
+ }
+ ENDCG
+ }
+ }
+}
diff --git a/Assets/Bundle/Shaders/Common/common_solid_color.shader.meta b/Assets/Bundle/Shaders/Common/common_solid_color.shader.meta
new file mode 100644
index 00000000..c0777cb0
--- /dev/null
+++ b/Assets/Bundle/Shaders/Common/common_solid_color.shader.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: e7ee93f26e570c24cbdef0b6ad1f461d
+ShaderImporter:
+ externalObjects: {}
+ defaultTextures: []
+ nonModifiableTextures: []
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_colorDrift.shader b/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_color_drift.shader
index 63e98344..f76b0a91 100644
--- a/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_colorDrift.shader
+++ b/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_color_drift.shader
@@ -1,58 +1,58 @@
-Shader "Unlit/unit_effect_colorDrift"
-{
- Properties
- {
- _MainTex ("Texture", 2D) = "white" {}
- }
- SubShader
- {
- Tags { "RenderType"="Opaque" }
- LOD 100
-
- Pass
- {
- CGPROGRAM
- #pragma vertex vert
- #pragma fragment frag
- // make fog work
- #pragma multi_compile_fog
-
- #include "UnityCG.cginc"
-
- struct appdata
- {
- float4 vertex : POSITION;
- float2 uv : TEXCOORD0;
- };
-
- struct v2f
- {
- float2 uv : TEXCOORD0;
- UNITY_FOG_COORDS(1)
- float4 vertex : SV_POSITION;
- };
-
- sampler2D _MainTex;
- float4 _MainTex_ST;
-
- v2f vert (appdata v)
- {
- v2f o;
- o.vertex = UnityObjectToClipPos(v.vertex);
- o.uv = TRANSFORM_TEX(v.uv, _MainTex);
- UNITY_TRANSFER_FOG(o,o.vertex);
- return o;
- }
-
- fixed4 frag (v2f i) : SV_Target
- {
- // sample the texture
- fixed4 col = tex2D(_MainTex, i.uv);
- // apply fog
- UNITY_APPLY_FOG(i.fogCoord, col);
- return col;
- }
- ENDCG
- }
- }
-}
+Shader "Unlit/unit_effect_colorDrift"
+{
+ Properties
+ {
+ _MainTex ("Texture", 2D) = "white" {}
+ }
+ SubShader
+ {
+ Tags { "RenderType"="Opaque" }
+ LOD 100
+
+ Pass
+ {
+ CGPROGRAM
+ #pragma vertex vert
+ #pragma fragment frag
+ // make fog work
+ #pragma multi_compile_fog
+
+ #include "UnityCG.cginc"
+
+ struct appdata
+ {
+ float4 vertex : POSITION;
+ float2 uv : TEXCOORD0;
+ };
+
+ struct v2f
+ {
+ float2 uv : TEXCOORD0;
+ UNITY_FOG_COORDS(1)
+ float4 vertex : SV_POSITION;
+ };
+
+ sampler2D _MainTex;
+ float4 _MainTex_ST;
+
+ v2f vert (appdata v)
+ {
+ v2f o;
+ o.vertex = UnityObjectToClipPos(v.vertex);
+ o.uv = TRANSFORM_TEX(v.uv, _MainTex);
+ UNITY_TRANSFER_FOG(o,o.vertex);
+ return o;
+ }
+
+ fixed4 frag (v2f i) : SV_Target
+ {
+ // sample the texture
+ fixed4 col = tex2D(_MainTex, i.uv);
+ // apply fog
+ UNITY_APPLY_FOG(i.fogCoord, col);
+ return col;
+ }
+ ENDCG
+ }
+ }
+}
diff --git a/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_colorDrift.shader.meta b/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_color_drift.shader.meta
index d42d528f..d42d528f 100644
--- a/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_colorDrift.shader.meta
+++ b/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_color_drift.shader.meta
diff --git a/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_motionBlur.shader b/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_motion_blur.shader
index c5cfcf26..3111369a 100644
--- a/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_motionBlur.shader
+++ b/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_motion_blur.shader
@@ -4,8 +4,6 @@ Shader "Erika/Unit/ImageEffect/unit_img_motionBlur"
Properties
{
_MainTex("Texture", 2D) = "white" {}
- _BlurTex("Texture", 2D) = "black" {}
- _MaskColor ("Mask Color", Color) = (1,1,1,1)
_Angle("Angle", float) = 0
_Distance("Distance", float) = 0
}
@@ -42,11 +40,6 @@ Shader "Erika/Unit/ImageEffect/unit_img_motionBlur"
sampler2D _MainTex;
float4 _MainTex_ST;
- sampler2D _BlurTex;
- float4 _BlurTex_ST;
-
- fixed4 _MaskColor;
-
float _Angle;
fixed _Distance;
@@ -62,18 +55,18 @@ Shader "Erika/Unit/ImageEffect/unit_img_motionBlur"
fixed4 frag (v2f i) : SV_Target
{
fixed2 uv = i.uv;
- fixed2 offset = fixed2(0.05, 0.05);
- const float sampleCount = 30;
- fixed4 color = fixed4(0,0,0,0);
- float radian = radians(_Angle);
- float distance = _Distance;
- for(int i = 0; i < sampleCount; i++)
- {
- float dx = distance * cos(radian) / sampleCount * i;
- float dy = distance * sin(radian) / sampleCount * i;
- color += tex2D(_MainTex,float2(uv.x + dx,uv.y + dy)) * (1 / sampleCount);
- }
- //color.rgb *= 0.5f;
+ fixed2 offset = fixed2(0.05, 0.05);
+ const float sampleCount = 30;
+ fixed4 color = fixed4(0,0,0,0);
+ float radian = radians(_Angle);
+ float distance = _Distance;
+ for(int i = 0; i < sampleCount; i++)
+ {
+ float dx = distance * cos(radian) / sampleCount * i;
+ float dy = distance * sin(radian) / sampleCount * i;
+ color += tex2D(_MainTex,float2(uv.x + dx,uv.y + dy)) * (1 / sampleCount);
+ }
+ //color.rgb *= 0.5f;
return color;
}
ENDCG
diff --git a/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_motionBlur.shader.meta b/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_motion_blur.shader.meta
index 4afe3c18..4afe3c18 100644
--- a/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_motionBlur.shader.meta
+++ b/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_motion_blur.shader.meta
diff --git a/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_speedLine.shader b/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_speed_line.shader
index fbc32eb5..b00673eb 100644
--- a/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_speedLine.shader
+++ b/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_speed_line.shader
@@ -1,58 +1,58 @@
-Shader "Unlit/unit_effect_speedLine"
-{
- Properties
- {
- _MainTex ("Texture", 2D) = "white" {}
- }
- SubShader
- {
- Tags { "RenderType"="Opaque" }
- LOD 100
-
- Pass
- {
- CGPROGRAM
- #pragma vertex vert
- #pragma fragment frag
- // make fog work
- #pragma multi_compile_fog
-
- #include "UnityCG.cginc"
-
- struct appdata
- {
- float4 vertex : POSITION;
- float2 uv : TEXCOORD0;
- };
-
- struct v2f
- {
- float2 uv : TEXCOORD0;
- UNITY_FOG_COORDS(1)
- float4 vertex : SV_POSITION;
- };
-
- sampler2D _MainTex;
- float4 _MainTex_ST;
-
- v2f vert (appdata v)
- {
- v2f o;
- o.vertex = UnityObjectToClipPos(v.vertex);
- o.uv = TRANSFORM_TEX(v.uv, _MainTex);
- UNITY_TRANSFER_FOG(o,o.vertex);
- return o;
- }
-
- fixed4 frag (v2f i) : SV_Target
- {
- // sample the texture
- fixed4 col = tex2D(_MainTex, i.uv);
- // apply fog
- UNITY_APPLY_FOG(i.fogCoord, col);
- return col;
- }
- ENDCG
- }
- }
-}
+Shader "Unlit/unit_effect_speedLine"
+{
+ Properties
+ {
+ _MainTex ("Texture", 2D) = "white" {}
+ }
+ SubShader
+ {
+ Tags { "RenderType"="Opaque" }
+ LOD 100
+
+ Pass
+ {
+ CGPROGRAM
+ #pragma vertex vert
+ #pragma fragment frag
+ // make fog work
+ #pragma multi_compile_fog
+
+ #include "UnityCG.cginc"
+
+ struct appdata
+ {
+ float4 vertex : POSITION;
+ float2 uv : TEXCOORD0;
+ };
+
+ struct v2f
+ {
+ float2 uv : TEXCOORD0;
+ UNITY_FOG_COORDS(1)
+ float4 vertex : SV_POSITION;
+ };
+
+ sampler2D _MainTex;
+ float4 _MainTex_ST;
+
+ v2f vert (appdata v)
+ {
+ v2f o;
+ o.vertex = UnityObjectToClipPos(v.vertex);
+ o.uv = TRANSFORM_TEX(v.uv, _MainTex);
+ UNITY_TRANSFER_FOG(o,o.vertex);
+ return o;
+ }
+
+ fixed4 frag (v2f i) : SV_Target
+ {
+ // sample the texture
+ fixed4 col = tex2D(_MainTex, i.uv);
+ // apply fog
+ UNITY_APPLY_FOG(i.fogCoord, col);
+ return col;
+ }
+ ENDCG
+ }
+ }
+}
diff --git a/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_speedLine.shader.meta b/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_speed_line.shader.meta
index 37726c12..37726c12 100644
--- a/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_speedLine.shader.meta
+++ b/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_speed_line.shader.meta
diff --git a/Assets/Bundle/Shaders/Unit/LensEffect.meta b/Assets/Bundle/Shaders/Unit/LensEffect.meta
new file mode 100644
index 00000000..8870549b
--- /dev/null
+++ b/Assets/Bundle/Shaders/Unit/LensEffect.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8ea8530ead06b5646968d268799393e0
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Bundle/Shaders/Unit/LensEffect/unit_lens_motion_blur.shader b/Assets/Bundle/Shaders/Unit/LensEffect/unit_lens_motion_blur.shader
new file mode 100644
index 00000000..9b8bec4c
--- /dev/null
+++ b/Assets/Bundle/Shaders/Unit/LensEffect/unit_lens_motion_blur.shader
@@ -0,0 +1,62 @@
+//给RT做运动模糊
+
+Shader "Unlit/unit_lens_motion_blur"
+{
+ Properties
+ {
+ _MainTex ("Texture", 2D) = "white" {}
+ }
+ SubShader
+ {
+ Tags { "RenderType"="Opaque" }
+ LOD 100
+
+ Pass
+ {
+ CGPROGRAM
+ #pragma vertex vert
+ #pragma fragment frag
+ // make fog work
+ #pragma multi_compile_fog
+
+ #include "UnityCG.cginc"
+
+ struct appdata
+ {
+ float4 vertex : POSITION;
+ float2 uv : TEXCOORD0;
+ };
+
+ struct v2f
+ {
+ float2 uv : TEXCOORD0;
+ UNITY_FOG_COORDS(1)
+ float4 vertex : SV_POSITION;
+ };
+
+ sampler2D _MainTex;
+ float4 _MainTex_ST;
+
+ float4 _ScaleOffset; // 角色在RT中的位置
+
+ v2f vert (appdata v)
+ {
+ v2f o;
+ o.vertex = UnityObjectToClipPos(v.vertex);
+ o.uv = TRANSFORM_TEX(v.uv, _MainTex);
+ UNITY_TRANSFER_FOG(o,o.vertex);
+ return o;
+ }
+
+ fixed4 frag (v2f i) : SV_Target
+ {
+ // sample the texture
+ fixed4 col = tex2D(_MainTex, i.uv);
+ // apply fog
+ UNITY_APPLY_FOG(i.fogCoord, col);
+ return col;
+ }
+ ENDCG
+ }
+ }
+}
diff --git a/Assets/Bundle/Shaders/Unit/LensEffect/unit_lens_motion_blur.shader.meta b/Assets/Bundle/Shaders/Unit/LensEffect/unit_lens_motion_blur.shader.meta
new file mode 100644
index 00000000..896045f9
--- /dev/null
+++ b/Assets/Bundle/Shaders/Unit/LensEffect/unit_lens_motion_blur.shader.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 7e03081c3480da045a4e3fd8050068ea
+ShaderImporter:
+ externalObjects: {}
+ defaultTextures: []
+ nonModifiableTextures: []
+ 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/Models/Materials/Robots_Prowel_Color 1.mat b/Assets/Bundle/Unit/Monster/Robots_Prowler/Models/Materials/Robots_Prowel_Color 1.mat
index 02a9e7fb..0938b267 100644
--- a/Assets/Bundle/Unit/Monster/Robots_Prowler/Models/Materials/Robots_Prowel_Color 1.mat
+++ b/Assets/Bundle/Unit/Monster/Robots_Prowler/Models/Materials/Robots_Prowel_Color 1.mat
@@ -8,21 +8,90 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Robots_Prowel_Color 1
- m_Shader: {fileID: 10703, guid: 0000000000000000f000000000000000, type: 0}
+ m_Shader: {fileID: 4800000, guid: 1a97144e4ad27a04aafd70f7b915cedb, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
- m_CustomRenderQueue: 3000
- stringTagMap: {}
+ m_CustomRenderQueue: -1
+ stringTagMap:
+ RenderType: Opaque
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: ae6a0b7aee66e0b4cb826ec035ea55ec, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- m_Floats: []
+ - _OutlineWidthTexture:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ReceiveShadowTexture:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _RimTexture:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ShadeTexture:
+ m_Texture: {fileID: 2800000, guid: ae6a0b7aee66e0b4cb826ec035ea55ec, type: 3}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ShadingGradeTexture:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _SphereAdd:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _UvAnimMaskTexture:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Floats:
+ - _AlphaToMask: 0
+ - _BlendMode: 0
+ - _BumpScale: 1
+ - _CullMode: 2
+ - _Cutoff: 0.5
+ - _DebugMode: 0
+ - _DstBlend: 0
+ - _IndirectLightIntensity: 0.1
+ - _LightColorAttenuation: 0
+ - _MToonVersion: 34
+ - _OutlineColorMode: 0
+ - _OutlineCullMode: 1
+ - _OutlineLightingMix: 1
+ - _OutlineScaledMaxDistance: 1
+ - _OutlineWidth: 0.5
+ - _OutlineWidthMode: 0
+ - _ReceiveShadowRate: 1
+ - _RimFresnelPower: 1
+ - _RimLift: 0
+ - _RimLightingMix: 0
+ - _ShadeShift: 0
+ - _ShadeToony: 0.9
+ - _ShadingGradeRate: 1
+ - _SrcBlend: 1
+ - _UvAnimRotation: 0
+ - _UvAnimScrollX: 0
+ - _UvAnimScrollY: 0
+ - _ZWrite: 1
m_Colors:
- _Color: {r: 0.5882353, g: 0.5882353, b: 0.5882353, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ - _OutlineColor: {r: 0, g: 0, b: 0, a: 1}
+ - _RimColor: {r: 0, g: 0, b: 0, a: 1}
+ - _ShadeColor: {r: 0.96999997, g: 0.81, b: 0.86, a: 1}
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/Run.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Run.asset
index 4b218c2a..0e7e544f 100644
--- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Run.asset
+++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Run.asset
@@ -14,6 +14,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
animationName: Run
animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/Run.anim
+ note:
animationEvents: []
hurtBoxes:
- collider:
@@ -74,21 +75,21 @@ MonoBehaviour:
m_Curve:
- serializedVersion: 3
time: 0
- value: 1.2
+ value: 1.1
inSlope: 0
outSlope: 0
- tangentMode: 0
+ tangentMode: 34
weightedMode: 0
inWeight: 0
- outWeight: 0
+ outWeight: 0.33333334
- serializedVersion: 3
time: 1
- value: 1.2
+ value: 1.1
inSlope: 0
outSlope: 0
- tangentMode: 0
+ tangentMode: 34
weightedMode: 0
- inWeight: 0
+ inWeight: 0.33333334
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
diff --git a/Assets/Bundle/Materials/Unit/Effect.meta b/Assets/Bundle/Unit/PC/Erika/Materials/Effect.meta
index fdf8c1db..855459bb 100644
--- a/Assets/Bundle/Materials/Unit/Effect.meta
+++ b/Assets/Bundle/Unit/PC/Erika/Materials/Effect.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 0525fec1eb7cc94458170e9e106955d5
+guid: 3ab09dc0a18f20b4ea29507887e11428
folderAsset: yes
DefaultImporter:
externalObjects: {}
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/Prefabs/Erika_Robot.prefab b/Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot.prefab
index e6332658..75d3780d 100644
--- a/Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot.prefab
+++ b/Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot.prefab
@@ -649,8 +649,9 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
showGizmos: 1
+ root: {fileID: 6930221487356679114}
afterImageAvatarPath: Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot_AfterImage.prefab
- bones:
+ m_Bones:
m_keys: 0000000001000000020000000300000004000000050000000600000007000000080000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f0000002000000021000000220000002300000024000000250000002600000028000000290000002a0000002b0000002c0000002d0000002e0000002f000000300000003100000032000000330000003400000035000000360000003700000038000000390000003a0000003c0000003d0000003e0000003f00000050000000510000005200000053000000
m_values:
- {fileID: 6931910881339740176}
@@ -708,16 +709,16 @@ MonoBehaviour:
- {fileID: 6930399342477815872}
- {fileID: 6931776861846272074}
- {fileID: 6929941362883253820}
- referencePoints:
+ m_ReferencePoints:
m_keys: 0100000014000000
m_values:
- {fileID: 0}
- {fileID: 0}
snapshotBound: 5
- mainRenderer:
+ m_MainRenderer:
tag: 0
renderer: {fileID: 7046772783541976850}
- renderers:
+ m_Renderers:
- tag: 0
renderer: {fileID: 7046772783541976850}
--- !u!1 &6928056367075676882
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/Unit/PC/Erika/Weapons/Materials.meta b/Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta
new file mode 100644
index 00000000..be6badd6
--- /dev/null
+++ b/Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta
@@ -0,0 +1,8 @@
+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
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: