summaryrefslogtreecommitdiff
path: root/Assets/Bundle
diff options
context:
space:
mode:
Diffstat (limited to 'Assets/Bundle')
-rw-r--r--Assets/Bundle/Scenes/Demo/AnimationEditScene.unity159
-rw-r--r--Assets/Bundle/Shaders/Common/Image/common_img_blur.shader4
-rw-r--r--Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot.prefab4
3 files changed, 96 insertions, 71 deletions
diff --git a/Assets/Bundle/Scenes/Demo/AnimationEditScene.unity b/Assets/Bundle/Scenes/Demo/AnimationEditScene.unity
index 290f59bd..0b7a7e01 100644
--- a/Assets/Bundle/Scenes/Demo/AnimationEditScene.unity
+++ b/Assets/Bundle/Scenes/Demo/AnimationEditScene.unity
@@ -19263,6 +19263,96 @@ ParticleSystem:
m_PostInfinity: 2
m_RotationOrder: 4
vectorLabel1_3: W
+--- !u!1001 &276673123
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 5512425670061407962, guid: 0b08ee7afb9df4649b0dd2cd0a3eeac7,
+ type: 3}
+ propertyPath: m_Renderers.Array.size
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 5512425670061407962, guid: 0b08ee7afb9df4649b0dd2cd0a3eeac7,
+ type: 3}
+ propertyPath: m_Renderers.Array.data[1].renderer
+ value:
+ objectReference: {fileID: 276673124}
+ - target: {fileID: 5512425670061407962, guid: 0b08ee7afb9df4649b0dd2cd0a3eeac7,
+ type: 3}
+ propertyPath: m_Renderers.Array.data[1].tag
+ value: 1
+ objectReference: {fileID: 0}
+ - 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}
+--- !u!23 &276673124 stripped
+MeshRenderer:
+ m_CorrespondingSourceObject: {fileID: 1357685699, guid: 0b08ee7afb9df4649b0dd2cd0a3eeac7,
+ type: 3}
+ m_PrefabInstance: {fileID: 276673123}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &278122006
GameObject:
m_ObjectHideFlags: 0
@@ -201779,72 +201869,3 @@ 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/Common/Image/common_img_blur.shader b/Assets/Bundle/Shaders/Common/Image/common_img_blur.shader
index 2cebb028..c7e3891d 100644
--- a/Assets/Bundle/Shaders/Common/Image/common_img_blur.shader
+++ b/Assets/Bundle/Shaders/Common/Image/common_img_blur.shader
@@ -42,6 +42,8 @@
float _Angle;
+ float4 _ScaleOffset; // 角色的范围
+
fixed _Distance;
v2f vert(appdata v)
@@ -55,7 +57,7 @@
fixed4 frag(v2f i) : SV_Target
{
_Angle = 0;
- _Distance = 0.02f;
+ _Distance = 0.05f;
fixed2 uv = i.uv;
fixed2 offset = fixed2(0.05, 0.05);
diff --git a/Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot.prefab b/Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot.prefab
index 75d3780d..8e5e4bfc 100644
--- a/Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot.prefab
+++ b/Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot.prefab
@@ -649,7 +649,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
showGizmos: 1
- root: {fileID: 6930221487356679114}
+ rootBone: {fileID: 6930221487356679114}
afterImageAvatarPath: Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot_AfterImage.prefab
m_Bones:
m_keys: 0000000001000000020000000300000004000000050000000600000007000000080000001400000015000000160000001700000018000000190000001a0000001b0000001c0000001d0000001e0000001f0000002000000021000000220000002300000024000000250000002600000028000000290000002a0000002b0000002c0000002d0000002e0000002f000000300000003100000032000000330000003400000035000000360000003700000038000000390000003a0000003c0000003d0000003e0000003f00000050000000510000005200000053000000
@@ -721,6 +721,8 @@ MonoBehaviour:
m_Renderers:
- tag: 0
renderer: {fileID: 7046772783541976850}
+ - tag: 1
+ renderer: {fileID: 1357685699}
--- !u!1 &6928056367075676882
GameObject:
m_ObjectHideFlags: 0
generated by cgit v1.1-26-g67d0 at 2025-05-30 08:22:24 +0000