diff options
57 files changed, 674 insertions, 76 deletions
diff --git a/Assets/Bundle/Materials/Unit/Common.meta b/Assets/Art/Models/Characters/Default.meta index c93b1f88..43499fc7 100644 --- a/Assets/Bundle/Materials/Unit/Common.meta +++ b/Assets/Art/Models/Characters/Default.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f56fd8c608849b44b9364a3469655444 +guid: e8a40298dd4efd14c9f90a63734ca39b folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta b/Assets/Art/Models/Characters/Erika2.meta index be6badd6..fd7369d9 100644 --- a/Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta +++ b/Assets/Art/Models/Characters/Erika2.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2c46a5a23283c7d428ae8bb13663ab6a +guid: 077f81003f9fc564791cce182048c2b0 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Data/RootMotionData.meta b/Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta index 14abf402..b76e98a5 100644 --- a/Assets/Data/RootMotionData.meta +++ b/Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5cfee9bde9754254f83510f88dd2a19b +guid: 20381b3eecfbfe34a9d9222868969d29 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta b/Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta new file mode 100644 index 00000000..41200932 --- /dev/null +++ b/Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: abff7cb61c760094f8ab9437379e0f2c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta b/Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta new file mode 100644 index 00000000..fa9e76cd --- /dev/null +++ b/Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e38cb65072bb4a64cbe162792de9bec2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: 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/Models.meta b/Assets/Bundle/Models.meta new file mode 100644 index 00000000..c9b5bf44 --- /dev/null +++ b/Assets/Bundle/Models.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: adab1ca5f61452c4c90f19e7c11adf0e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Prefabs.meta b/Assets/Bundle/Prefabs.meta new file mode 100644 index 00000000..82588fb1 --- /dev/null +++ b/Assets/Bundle/Prefabs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dac6442cad7539149a7527510665d510 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Scenes/Demo/AnimationEditScene.unity b/Assets/Bundle/Scenes/Demo/AnimationEditScene.unity index 3341759e..17a56174 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.18028334, g: 0.22571328, b: 0.3069217, a: 1} + m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -19307,6 +19307,7 @@ GameObject: - component: {fileID: 340202963} - component: {fileID: 340202962} - component: {fileID: 340202961} + - component: {fileID: 340202964} m_Layer: 0 m_Name: Cube (2) m_TagString: Untagged @@ -19322,7 +19323,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 340202959} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 32.49, y: 0.55, z: 4.37} + m_LocalPosition: {x: 15.8, y: 0.55, z: 4.37} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 533536617} @@ -19386,6 +19387,18 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 340202959} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &340202964 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 340202959} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c37c88af4ec59ad47ab867ec63cd0d76, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &361974703 GameObject: m_ObjectHideFlags: 0 @@ -47975,7 +47988,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &533536617 Transform: m_ObjectHideFlags: 0 @@ -47992,6 +48005,7 @@ Transform: - {fileID: 340202960} - {fileID: 1418860026} - {fileID: 1920593271} + - {fileID: 1994169206} m_Father: {fileID: 1765961530} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -62490,6 +62504,7 @@ GameObject: - component: {fileID: 729227981} - component: {fileID: 729227980} - component: {fileID: 729227979} + - component: {fileID: 729227982} m_Layer: 0 m_Name: Cube (1) m_TagString: Untagged @@ -62505,7 +62520,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 729227977} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 15.54, y: 0.55, z: 4.37} + m_LocalPosition: {x: 5.5, y: 0.55, z: 4.37} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 533536617} @@ -62569,6 +62584,18 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 729227977} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &729227982 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 729227977} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c37c88af4ec59ad47ab867ec63cd0d76, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &771299854 GameObject: m_ObjectHideFlags: 0 @@ -67529,6 +67556,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: aaca34c56e4ce4f41a13d30db14959aa, type: 3} m_Name: m_EditorClassIdentifier: + enableDeferredRender: 1 --- !u!114 &861741903 MonoBehaviour: m_ObjectHideFlags: 0 @@ -120102,6 +120130,7 @@ GameObject: - component: {fileID: 1418860029} - component: {fileID: 1418860028} - component: {fileID: 1418860027} + - component: {fileID: 1418860030} m_Layer: 0 m_Name: Cube (3) m_TagString: Untagged @@ -120181,6 +120210,18 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1418860025} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &1418860030 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1418860025} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c37c88af4ec59ad47ab867ec63cd0d76, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1468232990 GameObject: m_ObjectHideFlags: 0 @@ -163213,6 +163254,7 @@ GameObject: - component: {fileID: 1740894746} - component: {fileID: 1740894745} - component: {fileID: 1740894744} + - component: {fileID: 1740894747} m_Layer: 0 m_Name: Cube m_TagString: Untagged @@ -163292,6 +163334,18 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1740894742} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &1740894747 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1740894742} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c37c88af4ec59ad47ab867ec63cd0d76, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1765961529 GameObject: m_ObjectHideFlags: 0 @@ -187168,6 +187222,7 @@ GameObject: - component: {fileID: 1920593274} - component: {fileID: 1920593273} - component: {fileID: 1920593272} + - component: {fileID: 1920593275} m_Layer: 0 m_Name: Cube (4) m_TagString: Untagged @@ -187247,6 +187302,18 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1920593270} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &1920593275 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1920593270} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c37c88af4ec59ad47ab867ec63cd0d76, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1963377758 GameObject: m_ObjectHideFlags: 0 @@ -201520,6 +201587,110 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W +--- !u!1 &1994169205 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1994169206} + - component: {fileID: 1994169209} + - component: {fileID: 1994169208} + - component: {fileID: 1994169207} + - component: {fileID: 1994169210} + m_Layer: 0 + m_Name: Cube (5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1994169206 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1994169205} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 24.4, y: 0.55, z: 4.37} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 533536617} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1994169207 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1994169205} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1994169208 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1994169205} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &1994169209 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1994169205} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &1994169210 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1994169205} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c37c88af4ec59ad47ab867ec63cd0d76, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2098653157 GameObject: m_ObjectHideFlags: 0 @@ -201532,6 +201703,7 @@ GameObject: - component: {fileID: 2098653160} - component: {fileID: 2098653159} - component: {fileID: 2098653158} + - component: {fileID: 2098653162} m_Layer: 0 m_Name: Plane m_TagString: Untagged @@ -201612,6 +201784,18 @@ Transform: m_Father: {fileID: 1765961530} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} +--- !u!114 &2098653162 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2098653157} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c37c88af4ec59ad47ab867ec63cd0d76, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2109239495 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Bundle/Scenes/Demo/AnimationEditScene_Profiles/GameObject Profile.asset b/Assets/Bundle/Scenes/Demo/AnimationEditScene_Profiles/GameObject Profile.asset index 3dfca419..0b6d5d6b 100644 --- a/Assets/Bundle/Scenes/Demo/AnimationEditScene_Profiles/GameObject Profile.asset +++ b/Assets/Bundle/Scenes/Demo/AnimationEditScene_Profiles/GameObject Profile.asset @@ -75,7 +75,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b94fcd11afffcb142908bfcb1e261fba, type: 3} m_Name: MotionBlur m_EditorClassIdentifier: - active: 1 + active: 0 enabled: overrideState: 1 value: 1 diff --git a/Assets/Bundle/Shaders/Common/Image/ImageEffect.cginc b/Assets/Bundle/Shaders/Common/Image/ImageEffect.cginc new file mode 100644 index 00000000..04334ee4 --- /dev/null +++ b/Assets/Bundle/Shaders/Common/Image/ImageEffect.cginc @@ -0,0 +1,18 @@ +// UnitLensEffect效果 + +sampler2D _MainTex; +float4 _MainTex_ST; + +sampler2D _CameraDepthTexture; +float4 _CameraDepthTexture_ST; + +sampler2D _UnitDepthTexture; // 配合_CameraDepthTexture定位角色 +float4 _UnitDepthTexture_ST; + +sampler2D _UnitWorldNormalTexture; +float4 _UnitWorldNormalTexture_ST; + +sampler2D _UnitMotionVectorTexture; +float4 _UnitMotionVectorTexture_ST; + +float4 _UnitTileOffset; diff --git a/Assets/Bundle/Shaders/Include/ImageEffect.cginc.meta b/Assets/Bundle/Shaders/Common/Image/ImageEffect.cginc.meta index 8a4c56b7..8a4c56b7 100644 --- a/Assets/Bundle/Shaders/Include/ImageEffect.cginc.meta +++ b/Assets/Bundle/Shaders/Common/Image/ImageEffect.cginc.meta diff --git a/Assets/Bundle/Shaders/Include/ImageEffect.cginc b/Assets/Bundle/Shaders/Common/Image/ImageHelper.cginc index ffe5bc11..ffe5bc11 100644 --- a/Assets/Bundle/Shaders/Include/ImageEffect.cginc +++ b/Assets/Bundle/Shaders/Common/Image/ImageHelper.cginc diff --git a/Assets/Bundle/Shaders/Include/ImageHelper.cginc.meta b/Assets/Bundle/Shaders/Common/Image/ImageHelper.cginc.meta index d5b4db71..d5b4db71 100644 --- a/Assets/Bundle/Shaders/Include/ImageHelper.cginc.meta +++ b/Assets/Bundle/Shaders/Common/Image/ImageHelper.cginc.meta diff --git a/Assets/Bundle/Shaders/Common/Image/common_img_blur.shader b/Assets/Bundle/Shaders/Common/Image/common_img_blur.shader index d1e00953..89102da7 100644 --- a/Assets/Bundle/Shaders/Common/Image/common_img_blur.shader +++ b/Assets/Bundle/Shaders/Common/Image/common_img_blur.shader @@ -7,7 +7,7 @@ Shader "Erika/Common/Image/Blur" _MainTex("Texture", 2D) = "white" {} _Angle("Angle", float) = 0 _Distance("Distance", float) = 0 - _TileOffset("TileOffset", Vector) = (1,1,0,0) + _UnitTileOffset("TileOffset", Vector) = (1,1,0,0) _Iterate("Iterate Count", float) = 1 } @@ -29,7 +29,8 @@ Shader "Erika/Common/Image/Blur" #include "UnityCG.cginc" - #include "Assets/Bundle/Shaders/Include/ImageEffect.cginc" + #include "./ImageEffect.cginc" + #include "./ImageHelper.cginc" struct v2f { @@ -37,16 +38,11 @@ Shader "Erika/Common/Image/Blur" float4 vertex : SV_POSITION; }; - sampler2D _MainTex; - float4 _MainTex_ST; - float _Angle; - float4 _TileOffset; // 瑙掕壊鐨勮寖鍥 - fixed _Distance; - float _Iterate; // 杩唬娆℃暟 + float _Iterate; v2f vert(appdata_img v) { diff --git a/Assets/Bundle/Shaders/Common/Image/common_img_buzz.shader b/Assets/Bundle/Shaders/Common/Image/common_img_buzz.shader index 467733f9..929a57b7 100644 --- a/Assets/Bundle/Shaders/Common/Image/common_img_buzz.shader +++ b/Assets/Bundle/Shaders/Common/Image/common_img_buzz.shader @@ -5,7 +5,7 @@ Shader "Erika/Common/Image/Buzz" Properties { _MainTex("Texture", 2D) = "white" {} - _TileOffset("TileOffset", Vector) = (1,1,0,0) + _UnitTileOffset("TileOffset", Vector) = (1,1,0,0) } SubShader @@ -26,7 +26,8 @@ Shader "Erika/Common/Image/Buzz" #include "UnityCG.cginc" - #include "Assets/Bundle/Shaders/Include/ImageEffect.cginc" + #include "./ImageEffect.cginc" + #include "./ImageHelper.cginc" struct v2f { @@ -34,17 +35,6 @@ Shader "Erika/Common/Image/Buzz" float4 vertex : SV_POSITION; }; - sampler2D _MainTex; - float4 _MainTex_ST; - - sampler2D _CameraDepthTexture; - float4 _CameraDepthTexture_ST; - - sampler2D _UnitDepthTexture; - float4 _UnitDepthTexture_ST; - - float4 _TileOffset; // 瑙掕壊鐨勮寖鍥 - v2f vert(appdata_img v) { v2f o; diff --git a/Assets/Bundle/Shaders/Common/Image/common_img_motionblur.shader b/Assets/Bundle/Shaders/Common/Image/common_img_motionblur.shader index 418d7347..2246fda2 100644 --- a/Assets/Bundle/Shaders/Common/Image/common_img_motionblur.shader +++ b/Assets/Bundle/Shaders/Common/Image/common_img_motionblur.shader @@ -7,7 +7,7 @@ Shader "Erika/Common/Image/MotionBlur" _MainTex("Texture", 2D) = "white" {} _Angle("Angle", float) = 0 _Distance("Distance", float) = 0 - _TileOffset("TileOffset", Vector) = (1,1,0,0) + _UnitTileOffset("TileOffset", Vector) = (1,1,0,0) _Iterate("Iterate Count", float) = 1 } @@ -29,7 +29,7 @@ Shader "Erika/Common/Image/MotionBlur" #include "UnityCG.cginc" - #include "Assets/Bundle/Shaders/Include/ImageEffect.cginc" + #include "./ImageEffect.cginc" struct v2f { @@ -37,13 +37,8 @@ Shader "Erika/Common/Image/MotionBlur" float4 vertex : SV_POSITION; }; - sampler2D _MainTex; - float4 _MainTex_ST; - float _Angle; - float4 _TileOffset; // 瑙掕壊鐨勮寖鍥 - fixed _Distance; float _Iterate; // 杩唬娆℃暟 @@ -67,7 +62,7 @@ Shader "Erika/Common/Image/MotionBlur" fixed4 color = fixed4(0,0,0,0); const float count = 20; float step = _Distance / count; - float amount = 0.15; + float amount = 0.2f; for(int i = 0; i < count; ++i) { fixed2 uv = uv0 + step * i * fixed2(cos(radians(_Angle)), sin(radians(_Angle))); diff --git a/Assets/Bundle/Shaders/Common/common_gbuffer.shader b/Assets/Bundle/Shaders/Common/common_gbuffer.shader new file mode 100644 index 00000000..485a52c1 --- /dev/null +++ b/Assets/Bundle/Shaders/Common/common_gbuffer.shader @@ -0,0 +1,68 @@ +锘縎hader "Erika/Common/GBuffer"
+{
+ Properties
+ {
+ _MainTex ("Texture", 2D) = "white" {}
+ }
+ SubShader
+ {
+ Tags { "RenderType"="Opaque" }
+ LOD 100
+
+ Pass
+ {
+ CGPROGRAM
+ #pragma vertex vert
+ #pragma fragment frag
+
+ #include "UnityCG.cginc"
+
+ struct appdata
+ {
+ float3 vertex : POSITION;
+ float3 normal : NORMAL;
+ float3 tangent : TANGENT;
+ float2 uv : TEXCOORD0;
+ };
+
+ struct v2f
+ {
+ float2 uv : TEXCOORD0;
+ float3 normal : TEXCOORD1;
+ float3 worldPos : TEXCOORD2;
+ float4 vertex : SV_POSITION;
+ };
+
+ struct Output
+ {
+ float4 diffuse : SV_Target0;
+ float4 normal : SV_Target1;
+ float4 position : SV_Target2;
+ float4 texCoord : SV_Target3;
+ };
+
+ sampler2D _MainTex;
+ float4 _MainTex_ST;
+
+ v2f vert (appdata v)
+ {
+ v2f o;
+ o.vertex = UnityObjectToClipPos(v.vertex);
+ o.uv = TRANSFORM_TEX(v.uv, _MainTex);
+ o.worldPos = mul(unity_ObjectToWorld, float4(v.vertex, 1)).xyz;
+ return o;
+ }
+
+ Output frag (v2f i)
+ {
+ Output o;
+ fixed4 col = tex2D(_MainTex, i.uv);
+ o.diffuse = fixed4(1,0,0,1);
+ o.normal = fixed4(1,1,0,1);
+ o.position = fixed4(i.worldPos, 1);
+ return o;
+ }
+ ENDCG
+ }
+ }
+}
diff --git a/Assets/Bundle/Shaders/Common/common_gbuffer.shader.meta b/Assets/Bundle/Shaders/Common/common_gbuffer.shader.meta new file mode 100644 index 00000000..b40b2f5a --- /dev/null +++ b/Assets/Bundle/Shaders/Common/common_gbuffer.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 1bb32fe6a2152fc45b9badd5cf9ed7ed +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Shaders/Include/ImageHelper.cginc b/Assets/Bundle/Shaders/Include/ImageHelper.cginc deleted file mode 100644 index 57822700..00000000 --- a/Assets/Bundle/Shaders/Include/ImageHelper.cginc +++ /dev/null @@ -1,4 +0,0 @@ - -// 边缘检测 - - 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/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: diff --git a/Assets/Scripts/Curve3D.meta b/Assets/Scripts/Curve3D.meta new file mode 100644 index 00000000..fef1c5e7 --- /dev/null +++ b/Assets/Scripts/Curve3D.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ad8b718b6b700d8419838dad07158567 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Data/EnumDefine.cs b/Assets/Scripts/Data/EnumDefine.cs index 50e0baf5..77519c60 100644 --- a/Assets/Scripts/Data/EnumDefine.cs +++ b/Assets/Scripts/Data/EnumDefine.cs @@ -18,6 +18,7 @@ public enum EShader Buzz, SolidColor, + GBuffer, UnitDepth, diff --git a/Assets/Scripts/Data/StaticDefine.cs b/Assets/Scripts/Data/StaticDefine.cs index ae06f364..dcfb19e1 100644 --- a/Assets/Scripts/Data/StaticDefine.cs +++ b/Assets/Scripts/Data/StaticDefine.cs @@ -22,7 +22,8 @@ public static class StaticDefine { EShader.MotionBlur, new ShaderDefine("Erika/Common/Image/MotionBlur", "")},
{ EShader.SolidColor, new ShaderDefine("Erika/Common/SolidColor", "") },
{ EShader.UnitDepth, new ShaderDefine("Erika/Unit/Common/Depth", "") },
- { EShader.Buzz, new ShaderDefine("Erika/Common/Image/Buzz", "") },
+ { EShader.Buzz, new ShaderDefine("Erika/Common/Image/Buzz", "") },
+ { EShader.GBuffer, new ShaderDefine("Erika/Common/GBuffer", "") },
};
public static string bundleManifest = "bundles"; // Assets/Resources/bundles.json
diff --git a/Assets/Scripts/Drone.meta b/Assets/Scripts/Drone.meta new file mode 100644 index 00000000..694cff70 --- /dev/null +++ b/Assets/Scripts/Drone.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ec3412151f8a72a41b2ed21316763399 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Managers/Physics.meta b/Assets/Scripts/Managers/Physics.meta new file mode 100644 index 00000000..2296b3f8 --- /dev/null +++ b/Assets/Scripts/Managers/Physics.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 603d4624aaedd794cb89497954a83f4a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Props.meta b/Assets/Scripts/Props.meta new file mode 100644 index 00000000..bb96602e --- /dev/null +++ b/Assets/Scripts/Props.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f299520ed9fcf4a45858ad4ef5a8d5d1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Rendering/CustomRenderer.cs b/Assets/Scripts/Rendering/CustomRenderer.cs new file mode 100644 index 00000000..07c6ec7f --- /dev/null +++ b/Assets/Scripts/Rendering/CustomRenderer.cs @@ -0,0 +1,50 @@ +锘縰sing System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+[RequireComponent(typeof(Renderer))]
+public class CustomRenderer : MonoBehaviour
+{
+ public new Renderer renderer { get; private set; }
+
+ void OnEnable()
+ {
+ renderer = GetComponent<Renderer>();
+
+ CustomRendererRegistry.Instance.Register(this);
+ }
+
+ void OnDisable()
+ {
+ CustomRendererRegistry.Instance.Unregister(this);
+ }
+
+}
+
+public class CustomRendererRegistry : Singleton<CustomRendererRegistry>
+{
+ private List<CustomRenderer> m_Renderers;
+ public List<CustomRenderer> renderers
+ {
+ get
+ {
+ if (m_Renderers == null)
+ m_Renderers = new List<CustomRenderer>();
+ return m_Renderers;
+ }
+ }
+
+ public void Register(CustomRenderer renderer)
+ {
+ if(!renderers.Contains(renderer))
+ {
+ renderers.Add(renderer);
+ }
+ }
+
+ public void Unregister(CustomRenderer renderer)
+ {
+ renderers.Remove(renderer);
+ }
+
+}
diff --git a/Assets/Scripts/Rendering/CustomRenderer.cs.meta b/Assets/Scripts/Rendering/CustomRenderer.cs.meta new file mode 100644 index 00000000..b9742494 --- /dev/null +++ b/Assets/Scripts/Rendering/CustomRenderer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c37c88af4ec59ad47ab867ec63cd0d76 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Rendering/CustomRenderingPipeline.cs b/Assets/Scripts/Rendering/CustomRenderingPipeline.cs index af70e760..9387cf52 100644 --- a/Assets/Scripts/Rendering/CustomRenderingPipeline.cs +++ b/Assets/Scripts/Rendering/CustomRenderingPipeline.cs @@ -4,43 +4,91 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.Rendering; +// 鐩告満鐨勮嚜瀹氫箟绠＄嚎 [RequireComponent(typeof(MainCamera))] public class CustomRenderingPipeline : MonoBehaviour {
+ [Tooltip("寮鍚嚜瀹氫箟寤惰繜娓叉煋")]
+ public bool enableDeferredRender;
public delegate void RenderEventHandler();
+ // UnitPreprocessing, UnitLensEffect, etc
public event RenderEventHandler onPreCull;
public event RenderEventHandler onPreRender;
public event RenderEventHandler onPostRender;
- #region 鍏叡璐村浘
+ Camera m_Camera;
- #endregion
+ // command buffers
+ CommandBuffer m_CommandBufferAfterDepth;
- Camera m_Camera;
+ RenderTargetIdentifier[] m_GBuffer = new RenderTargetIdentifier[4];
+ RenderTargetIdentifier m_DepthBuffer;
+ RenderTexture m_GBufferTextureDiffuse;
+ RenderTexture m_GBufferTextureNormal;
+ RenderTexture m_GBufferTexturePosition;
+ RenderTexture m_GBufferTextureTexCoord;
- private void OnEable()
+ void OnEnable()
{
m_Camera = GetComponent<Camera>();
+
+ // command buffers
+ m_CommandBufferAfterDepth = new CommandBuffer();
+ m_Camera.AddCommandBuffer(CameraEvent.AfterDepthTexture, m_CommandBufferAfterDepth);
+
+ // render targets
+ int width = m_Camera.pixelWidth, height = m_Camera.pixelHeight;
+ m_GBufferTextureDiffuse = RenderTexture.GetTemporary(width, height, 24, RenderTextureFormat.ARGB32, RenderTextureReadWrite.Linear);
+ m_GBufferTextureNormal = RenderTexture.GetTemporary(width, height, 24, RenderTextureFormat.ARGB32, RenderTextureReadWrite.Linear);
+ m_GBufferTexturePosition = RenderTexture.GetTemporary(width, height, 24, RenderTextureFormat.ARGBHalf, RenderTextureReadWrite.Linear);
+ m_GBufferTextureTexCoord = RenderTexture.GetTemporary(width, height, 24, RenderTextureFormat.ARGB32, RenderTextureReadWrite.Linear);
+ m_GBuffer[0] = m_GBufferTextureDiffuse.colorBuffer;
+ m_GBuffer[1] = m_GBufferTextureNormal.colorBuffer;
+ m_GBuffer[2] = m_GBufferTexturePosition.colorBuffer;
+ m_GBuffer[3] = m_GBufferTextureTexCoord.colorBuffer;
+ m_DepthBuffer = m_GBufferTextureDiffuse.depthBuffer;
+
} - private void Start()
+ void OnDisable()
{
- }
+ m_Camera.RemoveAllCommandBuffers();
+ } - private void OnPreCull()
+ void OnPreCull()
{
+ m_CommandBufferAfterDepth.Clear();
+
+ RenderGBuffer();
+
onPreCull?.Invoke();
}
- private void OnPreRender()
+ void OnPreRender()
{
onPreRender?.Invoke();
}
- private void OnPostRender()
+ void OnPostRender()
{
onPostRender?.Invoke();
}
+ void RenderGBuffer()
+ {
+ CommandBuffer cb = m_CommandBufferAfterDepth;
+ cb.SetRenderTarget(m_GBuffer, m_DepthBuffer);
+ cb.ClearRenderTarget(true, true, new Color(0, 0, 0, 0));
+ List<CustomRenderer> renderers = CustomRendererRegistry.Instance.renderers;
+ Material mat = new Material(Shader.Find(StaticDefine.shaders[EShader.GBuffer].name));
+ for(int i = 0; i < renderers.Count; ++i)
+ {
+ CustomRenderer renderer = renderers[i];
+ if (renderer == null)
+ continue;
+ cb.DrawRenderer(renderer.renderer, mat);
+ }
+ } +
}
\ No newline at end of file diff --git a/Assets/Scripts/Robot.meta b/Assets/Scripts/Robot.meta new file mode 100644 index 00000000..0b5a087e --- /dev/null +++ b/Assets/Scripts/Robot.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7c09ca1609552d24bbe697d1516f8aa9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Scene.meta b/Assets/Scripts/Scene.meta deleted file mode 100644 index eb7a8716..00000000 --- a/Assets/Scripts/Scene.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: eaee2d0f48cff9b40baf0686a8105600 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Unit/AI/Actions.meta b/Assets/Scripts/Unit/AI/Actions.meta new file mode 100644 index 00000000..9b4ad463 --- /dev/null +++ b/Assets/Scripts/Unit/AI/Actions.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 971e9d55b8bc0894eb6a110fb962000b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Unit/AI/Conditionals.meta b/Assets/Scripts/Unit/AI/Conditionals.meta new file mode 100644 index 00000000..70a86da5 --- /dev/null +++ b/Assets/Scripts/Unit/AI/Conditionals.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 85b7e0c7ed1d12f42a5178bfbf3d934c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Unit/Components/UnitLensEffect.cs b/Assets/Scripts/Unit/Components/UnitLensEffect.cs index ef8e6ee6..ff5af87d 100644 --- a/Assets/Scripts/Unit/Components/UnitLensEffect.cs +++ b/Assets/Scripts/Unit/Components/UnitLensEffect.cs @@ -65,7 +65,7 @@ public class UnitLensEffect : UnitComponent /////
//m_Effects.Add(new LensEffect_MotionBlur());
//m_Effects.Add(new LensEffect_BlurRim(Color.blue));
- m_Effects.Add(new LensEffect_Buzz());
+ //m_Effects.Add(new LensEffect_Buzz());
} public override void Release() diff --git a/Assets/Scripts/Unit/Components/UnitPreprocessing.cs b/Assets/Scripts/Unit/Components/UnitPreprocessing.cs index 30357615..44ab73b7 100644 --- a/Assets/Scripts/Unit/Components/UnitPreprocessing.cs +++ b/Assets/Scripts/Unit/Components/UnitPreprocessing.cs @@ -15,12 +15,15 @@ public class UnitPreprocessing : UnitComponent WorldNormalTexture, // Unit World Normal Texture } - public EUnitPreprocessing preprocessing; - - public RenderTexture unitDepthTexture { get; private set; } - public RenderTexture unitWorldNormalTexture { get; private set; } - - private CommandBuffer m_CBBeforeDepthTexture; + public EUnitPreprocessing preprocessing;
+
+ #region render textures + public RenderTexture unitDepthTexture { get; private set; } + public RenderTexture unitWorldNormalTexture { get; private set; }
+ public RenderTexture unitMotionVectorTexture { get; private set; }
+ #endregion +
+ private CommandBuffer m_CBBeforeDepthTexture; private Material m_MaterialDepth; @@ -72,11 +75,11 @@ public class UnitPreprocessing : UnitComponent private void OnWillRenderUnit() { - RenderDepthTexture(); - //RenderWorldNormal(); - - MainCamera.Instance.camera.AddCommandBuffer(CameraEvent.BeforeDepthTexture, m_CBBeforeDepthTexture); - } + RenderDepthTexture();
+ //RenderWorldNormal();
+ RenderMotionVector();
+ MainCamera.Instance.camera.AddCommandBuffer(CameraEvent.BeforeDepthTexture, m_CBBeforeDepthTexture); + } void RenderDepthTexture() { @@ -99,6 +102,10 @@ public class UnitPreprocessing : UnitComponent } } + void RenderMotionVector()
+ {
+ } + //void RenderWorldNormal() //{ // var cb = m_CBBeforeDepthTexture; diff --git a/Assets/Scripts/Unit/Components/UnitState/PCState.cs b/Assets/Scripts/Unit/Components/UnitState/PCState.cs index 1bdd355f..7e766455 100644 --- a/Assets/Scripts/Unit/Components/UnitState/PCState.cs +++ b/Assets/Scripts/Unit/Components/UnitState/PCState.cs @@ -144,7 +144,7 @@ public partial class PCState : UnitState UnitSnapshotInfo info = owner.TakeSnapshot();
Vector2 dir = TestErika.Instance.monster.owner.center + new Vector3(offset, -0.5f, 0) - owner.center;
- LensEffect_Dash dash = new LensEffect_Dash(Color.white, 0.1f, Mathf.Atan2(dir.y, dir.x), info);
+ LensEffect_Dash dash = new LensEffect_Dash(Color.white, 0.05f, Mathf.Atan2(dir.y, dir.x), info);
owner.unitLensEffect.AddEffect(dash);
owner.center = TestErika.Instance.monster.owner.center + new Vector3(offset, -0.5f, 0);
diff --git a/Assets/Scripts/Unit/LensEffect/LensEffect_BlurRim.cs b/Assets/Scripts/Unit/LensEffect/LensEffect_BlurRim.cs index 6c61f2e7..5260a751 100644 --- a/Assets/Scripts/Unit/LensEffect/LensEffect_BlurRim.cs +++ b/Assets/Scripts/Unit/LensEffect/LensEffect_BlurRim.cs @@ -77,7 +77,7 @@ public class LensEffect_BlurRim : LensEffectBase MaterialEntry blur = ClaimMaterial(StaticDefine.shaders[EShader.Blur].name);
Vector4 tileOffset = RenderingUtility.GetTillingOffset(MainCamera.Instance.camera, owner.center, owner.unitDetail.snapshotBound);
- blur.material.SetVector("_TileOffset", tileOffset);
+ blur.material.SetVector("_UnitTileOffset", tileOffset);
cb.Blit(tempID, BuiltinRenderTextureType.CameraTarget, blur.material);
cb.ReleaseTemporaryRT(tempID);
diff --git a/Assets/Scripts/Unit/LensEffect/LensEffect_Dash.cs b/Assets/Scripts/Unit/LensEffect/LensEffect_Dash.cs index 61bb08fa..6cce6b4c 100644 --- a/Assets/Scripts/Unit/LensEffect/LensEffect_Dash.cs +++ b/Assets/Scripts/Unit/LensEffect/LensEffect_Dash.cs @@ -73,7 +73,7 @@ public class LensEffect_Dash : LensEffectBase MaterialEntry blur = ClaimMaterial(StaticDefine.shaders[EShader.MotionBlur].name); Vector4 tileOffset = RenderingUtility.GetTillingOffset(MainCamera.Instance.camera, owner.center, owner.unitDetail.snapshotBound);
- blur.material.SetVector("_TileOffset", tileOffset);
+ blur.material.SetVector("_UnitTileOffset", tileOffset);
blur.material.SetFloat("_Angle", Mathf.Rad2Deg * angle);
blur.material.SetFloat("_AlphaMultiplier", Mathf.Clamp(1 - curTime / lifeTime, 0, 1));
diff --git a/Assets/Scripts/Unit/LensEffect/LensEffect_MotionBlur.cs b/Assets/Scripts/Unit/LensEffect/LensEffect_MotionBlur.cs index 3e5ee4f1..b76666ff 100644 --- a/Assets/Scripts/Unit/LensEffect/LensEffect_MotionBlur.cs +++ b/Assets/Scripts/Unit/LensEffect/LensEffect_MotionBlur.cs @@ -55,7 +55,7 @@ public class LensEffect_MotionBlur : LensEffectBase MaterialEntry blur = ClaimMaterial(StaticDefine.shaders[EShader.Blur].name);
Vector4 tileOffset = RenderingUtility.GetTillingOffset(MainCamera.Instance.camera, owner.center, owner.unitDetail.snapshotBound);
- blur.material.SetVector("_TileOffset", tileOffset);
+ blur.material.SetVector("_UnitTileOffset", tileOffset);
cb.Blit(tempID, BuiltinRenderTextureType.CameraTarget, blur.material);
tempID = Shader.PropertyToID("_Temp1");
|