diff --git a/Assets/HighlightPlus/Pipelines/URP/HighlightPlusForwardRenderer.asset b/Assets/HighlightPlus/Pipelines/URP/HighlightPlusForwardRenderer.asset index 7ff1b0ee..85160a9e 100644 --- a/Assets/HighlightPlus/Pipelines/URP/HighlightPlusForwardRenderer.asset +++ b/Assets/HighlightPlus/Pipelines/URP/HighlightPlusForwardRenderer.asset @@ -68,9 +68,8 @@ MonoBehaviour: m_RendererFeatures: - {fileID: -7137549924450841197} - {fileID: -5495197892346423927} - - {fileID: 8296014883114773924} - {fileID: 1152416951244741881} - m_RendererFeatureMap: 895537b8a122bdb3a4ed68ff945d2173f9dc14841c35fe0f + m_RendererFeatureMap: 93cd7dfa2854f29c895537b8a122bdb3f9dc14841c35fe0f m_UseNativeRenderPass: 0 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} @@ -152,17 +151,3 @@ MonoBehaviour: restoreCamera: 1 offset: {x: 0, y: 0, z: 0, w: 0} cameraFieldOfView: 60 ---- !u!114 &8296014883114773924 -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: b2175cb1f6f57794ea63d290dbaf906d, type: 3} - m_Name: BurRenderPassFeature - m_EditorClassIdentifier: - m_Active: 1 - Value: 1 diff --git a/Assets/HighlightPlus/Pipelines/URP/HighlightPlusForwardRenderer_XuHua.asset b/Assets/HighlightPlus/Pipelines/URP/HighlightPlusForwardRenderer_XuHua.asset new file mode 100644 index 00000000..7ea59947 --- /dev/null +++ b/Assets/HighlightPlus/Pipelines/URP/HighlightPlusForwardRenderer_XuHua.asset @@ -0,0 +1,168 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7137549924450841197 +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: 473a86c9e274347dfbdde619584cebe9, type: 3} + m_Name: NewHighlightPlusRenderPassFeature + m_EditorClassIdentifier: + m_Active: 1 + renderPassEvent: 500 + clearStencil: 0 +--- !u!114 &-5495197892346423927 +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: f62c9c65cf3354c93be831c8bc075510, type: 3} + m_Name: ScreenSpaceAmbientOcclusion + m_EditorClassIdentifier: + m_Active: 1 + m_Settings: + AOMethod: 1 + Downsample: 0 + AfterOpaque: 0 + Source: 1 + NormalSamples: 1 + Intensity: 1 + DirectLightingStrength: 0.423 + Radius: 0.012 + Samples: 0 + BlurQuality: 0 + Falloff: 100 + SampleCount: -1 + m_BlueNoise256Textures: + - {fileID: 2800000, guid: 36f118343fc974119bee3d09e2111500, type: 3} + - {fileID: 2800000, guid: 4b7b083e6b6734e8bb2838b0b50a0bc8, type: 3} + - {fileID: 2800000, guid: c06cc21c692f94f5fb5206247191eeee, type: 3} + - {fileID: 2800000, guid: cb76dd40fa7654f9587f6a344f125c9a, type: 3} + - {fileID: 2800000, guid: e32226222ff144b24bf3a5a451de54bc, type: 3} + - {fileID: 2800000, guid: 3302065f671a8450b82c9ddf07426f3a, type: 3} + - {fileID: 2800000, guid: 56a77a3e8d64f47b6afe9e3c95cb57d5, type: 3} + m_Shader: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3} +--- !u!114 &11400000 +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: de640fe3d0db1804a85f9fc8f5cadab6, type: 3} + m_Name: HighlightPlusForwardRenderer_XuHua + m_EditorClassIdentifier: + debugShaders: + debugReplacementPS: {fileID: 4800000, guid: cf852408f2e174538bcd9b7fda1c5ae7, type: 3} + hdrDebugViewPS: {fileID: 4800000, guid: 573620ae32aec764abd4d728906d2587, type: 3} + m_RendererFeatures: + - {fileID: -7137549924450841197} + - {fileID: -5495197892346423927} + - {fileID: 8296014883114773924} + - {fileID: 1152416951244741881} + m_RendererFeatureMap: 895537b8a122bdb3a4ed68ff945d2173f9dc14841c35fe0f + m_UseNativeRenderPass: 0 + postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} + xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} + shaders: + blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3} + copyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} + screenSpaceShadowPS: {fileID: 4800000, guid: 0f854b35a0cf61a429bd5dcfea30eddd, type: 3} + samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3} + stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} + fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3} + fallbackLoadingPS: {fileID: 4800000, guid: 7f888aff2ac86494babad1c2c5daeee2, type: 3} + materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3} + coreBlitPS: {fileID: 4800000, guid: 93446b5c5339d4f00b85c159e1159b7c, type: 3} + coreBlitColorAndDepthPS: {fileID: 4800000, guid: d104b2fc1ca6445babb8e90b0758136b, type: 3} + blitHDROverlay: {fileID: 4800000, guid: a89bee29cffa951418fc1e2da94d1959, type: 3} + cameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, type: 3} + objectMotionVector: {fileID: 4800000, guid: 7b3ede40266cd49a395def176e1bc486, type: 3} + dataDrivenLensFlare: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92, type: 3} + m_AssetVersion: 2 + m_OpaqueLayerMask: + serializedVersion: 2 + m_Bits: 151 + m_TransparentLayerMask: + serializedVersion: 2 + m_Bits: 151 + m_DefaultStencilState: + overrideStencilState: 0 + stencilReference: 0 + stencilCompareFunction: 8 + passOperation: 0 + failOperation: 0 + zFailOperation: 0 + m_ShadowTransparentReceive: 1 + m_RenderingMode: 0 + m_DepthPrimingMode: 0 + m_CopyDepthMode: 0 + m_AccurateGbufferNormals: 0 + m_IntermediateTextureMode: 1 +--- !u!114 &1152416951244741881 +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: 6b3d386ba5cd94485973aee1479b272e, type: 3} + m_Name: RenderObjects + m_EditorClassIdentifier: + m_Active: 1 + settings: + passTag: RenderObjects + Event: 550 + filterSettings: + RenderQueueType: 1 + LayerMask: + serializedVersion: 2 + m_Bits: 32 + PassNames: + - SRPDefaultUnlit + overrideMaterial: {fileID: 0} + overrideMaterialPassIndex: 0 + overrideShader: {fileID: 0} + overrideShaderPassIndex: 0 + overrideMode: 1 + overrideDepthState: 0 + depthCompareFunction: 4 + enableWrite: 1 + stencilSettings: + overrideStencilState: 0 + stencilReference: 0 + stencilCompareFunction: 8 + passOperation: 0 + failOperation: 0 + zFailOperation: 0 + cameraSettings: + overrideCamera: 0 + restoreCamera: 1 + offset: {x: 0, y: 0, z: 0, w: 0} + cameraFieldOfView: 60 +--- !u!114 &8296014883114773924 +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: b2175cb1f6f57794ea63d290dbaf906d, type: 3} + m_Name: BurRenderPassFeature + m_EditorClassIdentifier: + m_Active: 1 + Value: 1 diff --git a/Assets/Render/SpecialMaterials/JingTi/Bur/Unlit URP Shader_Bur.mat.meta b/Assets/HighlightPlus/Pipelines/URP/HighlightPlusForwardRenderer_XuHua.asset.meta similarity index 64% rename from Assets/Render/SpecialMaterials/JingTi/Bur/Unlit URP Shader_Bur.mat.meta rename to Assets/HighlightPlus/Pipelines/URP/HighlightPlusForwardRenderer_XuHua.asset.meta index f99bfb20..e8092ae1 100644 --- a/Assets/Render/SpecialMaterials/JingTi/Bur/Unlit URP Shader_Bur.mat.meta +++ b/Assets/HighlightPlus/Pipelines/URP/HighlightPlusForwardRenderer_XuHua.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: fd2f45cd438ef0140948cb4f8fdafd36 +guid: 16b30d850807fab4990682ec81fe7800 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 2100000 + mainObjectFileID: 11400000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe.unity b/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe.unity index 2b10d73d..8b305655 100644 --- a/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe.unity +++ b/Assets/Projects/AnHuiSheYing/Scenes/03_ChangJingXuNiPaiShe.unity @@ -3710,7 +3710,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &255585954 RectTransform: m_ObjectHideFlags: 0 @@ -8474,7 +8474,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &546267996 RectTransform: m_ObjectHideFlags: 0 @@ -12427,13 +12427,13 @@ MonoBehaviour: m_RequiresOpaqueTextureOption: 2 m_CameraType: 0 m_Cameras: [] - m_RendererIndex: -1 + m_RendererIndex: 2 m_VolumeLayerMask: serializedVersion: 2 m_Bits: 1 m_VolumeTrigger: {fileID: 0} m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 0 + m_RenderPostProcessing: 1 m_Antialiasing: 0 m_AntialiasingQuality: 2 m_StopNaN: 0 @@ -13322,117 +13322,6 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 ---- !u!1 &865001443 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 865001444} - - component: {fileID: 865001448} - - component: {fileID: 865001447} - - component: {fileID: 865001446} - - component: {fileID: 865001445} - m_Layer: 5 - m_Name: MoHu_DanFan - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &865001444 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 865001443} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1044465924} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!95 &865001445 -Animator: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 865001443} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 0} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &865001446 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 865001443} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1a875baee8e85d24a8addec970f2485a, type: 3} - m_Name: - m_EditorClassIdentifier: - Value: 3.47 ---- !u!114 &865001447 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 865001443} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 86d5d03bace9c3546a904063a2ded222, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &865001448 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 865001443} - m_CullTransparentMesh: 1 --- !u!1 &874819495 GameObject: m_ObjectHideFlags: 0 @@ -14250,7 +14139,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &914846674 RectTransform: m_ObjectHideFlags: 0 @@ -14303,7 +14192,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1a875baee8e85d24a8addec970f2485a, type: 3} m_Name: m_EditorClassIdentifier: - Value: 3.47 + Value: 0 --- !u!114 &914846677 MonoBehaviour: m_ObjectHideFlags: 0 @@ -14317,7 +14206,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 86d5d03bace9c3546a904063a2ded222, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -15262,7 +15151,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 900732043} - - {fileID: 1846671336} - {fileID: 2066338424} - {fileID: 18566204} m_Father: {fileID: 892345881} @@ -16572,7 +16460,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 222601866} - - {fileID: 865001444} - {fileID: 398612549} - {fileID: 184937891} - {fileID: 30222685} @@ -18894,7 +18781,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 26af510268283e447ba7788541dedea0, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8116780258523087049, guid: 26af510268283e447ba7788541dedea0, type: 3} propertyPath: m_Enabled @@ -19652,7 +19539,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1273645206 RectTransform: m_ObjectHideFlags: 0 @@ -19857,143 +19744,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1276013418} m_CullTransparentMesh: 1 ---- !u!1 &1280548363 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1280548367} - - component: {fileID: 1280548366} - - component: {fileID: 1280548365} - - component: {fileID: 1280548364} - m_Layer: 0 - m_Name: Camera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!114 &1280548364 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1280548363} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_RenderShadows: 1 - m_RequiresDepthTextureOption: 2 - m_RequiresOpaqueTextureOption: 2 - m_CameraType: 0 - m_Cameras: [] - m_RendererIndex: -1 - m_VolumeLayerMask: - serializedVersion: 2 - m_Bits: 1 - m_VolumeTrigger: {fileID: 0} - m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 0 - m_Antialiasing: 0 - m_AntialiasingQuality: 2 - m_StopNaN: 0 - m_Dithering: 0 - m_ClearDepth: 1 - m_AllowXRRendering: 1 - m_AllowHDROutput: 1 - m_UseScreenCoordOverride: 0 - m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} - m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} - m_RequiresDepthTexture: 0 - m_RequiresColorTexture: 0 - m_Version: 2 - m_TaaSettings: - quality: 3 - frameInfluence: 0.1 - jitterScale: 1 - mipBias: 0 - varianceClampScale: 0.9 - contrastAdaptiveSharpening: 0 ---- !u!81 &1280548365 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1280548363} - m_Enabled: 1 ---- !u!20 &1280548366 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1280548363} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &1280548367 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1280548363} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1919.8684, y: 1079.9817, z: -0.004371502} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1290411613 PrefabInstance: m_ObjectHideFlags: 0 @@ -31908,117 +31658,6 @@ MeshCollider: m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: 4344788843934612036, guid: 742e8fc845d051f4a9c39d0b129c4cbf, type: 3} ---- !u!1 &1846671335 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1846671336} - - component: {fileID: 1846671340} - - component: {fileID: 1846671339} - - component: {fileID: 1846671338} - - component: {fileID: 1846671337} - m_Layer: 5 - m_Name: MoHu - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &1846671336 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1846671335} - m_LocalRotation: {x: -0, y: -0.000000029802322, z: -0.000000007450581, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.00050326134} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 958765592} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -20, y: -20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!95 &1846671337 -Animator: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1846671335} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 0} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &1846671338 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1846671335} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1a875baee8e85d24a8addec970f2485a, type: 3} - m_Name: - m_EditorClassIdentifier: - Value: 6.99 ---- !u!114 &1846671339 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1846671335} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 86d5d03bace9c3546a904063a2ded222, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1846671340 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1846671335} - m_CullTransparentMesh: 1 --- !u!1 &1864737259 GameObject: m_ObjectHideFlags: 0 @@ -33335,7 +32974,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1950853183 RectTransform: m_ObjectHideFlags: 0 @@ -33595,7 +33234,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1958087610 RectTransform: m_ObjectHideFlags: 0 @@ -35285,7 +34924,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 86d5d03bace9c3546a904063a2ded222, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -35322,7 +34961,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1a875baee8e85d24a8addec970f2485a, type: 3} m_Name: m_EditorClassIdentifier: - Value: 6.99 + Value: 0 --- !u!95 &2026210949 Animator: serializedVersion: 5 @@ -36160,7 +35799,7 @@ MonoBehaviour: m_RequiresOpaqueTextureOption: 2 m_CameraType: 0 m_Cameras: [] - m_RendererIndex: -1 + m_RendererIndex: 2 m_VolumeLayerMask: serializedVersion: 2 m_Bits: 1 @@ -37452,4 +37091,3 @@ SceneRoots: - {fileID: 673520163} - {fileID: 892345881} - {fileID: 1425832206} - - {fileID: 1280548367} diff --git a/Assets/Render/SpecialMaterials/JingTi/Bur/NEW.mat b/Assets/Render/SpecialMaterials/JingTi/Bur/NEW.mat deleted file mode 100644 index 8bf23076..00000000 --- a/Assets/Render/SpecialMaterials/JingTi/Bur/NEW.mat +++ /dev/null @@ -1,133 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: NEW - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BaseMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - 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: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _SpecGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _AlphaClip: 0 - - _AlphaToMask: 0 - - _Blend: 0 - - _BlendModePreserveSpecular: 1 - - _BumpScale: 1 - - _ClearCoatMask: 0 - - _ClearCoatSmoothness: 0 - - _Cull: 2 - - _Cutoff: 0.5 - - _DetailAlbedoMapScale: 1 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _DstBlendAlpha: 0 - - _EnvironmentReflections: 1 - - _GlossMapScale: 0 - - _Glossiness: 0 - - _GlossyReflections: 0 - - _Metallic: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.005 - - _QueueOffset: 0 - - _ReceiveShadows: 1 - - _Smoothness: 0.5 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - - _Surface: 0 - - _WorkflowMode: 1 - - _ZWrite: 1 - m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} - m_BuildTextureStacks: [] ---- !u!114 &2644473270325663357 -MonoBehaviour: - m_ObjectHideFlags: 11 - 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} - m_Name: - m_EditorClassIdentifier: - version: 7 diff --git a/Assets/Render/SpecialMaterials/JingTi/Bur/NEW.mat.meta b/Assets/Render/SpecialMaterials/JingTi/Bur/NEW.mat.meta deleted file mode 100644 index e38836a1..00000000 --- a/Assets/Render/SpecialMaterials/JingTi/Bur/NEW.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2ee56f9150d7bbd4aa49bde0b2287e4c -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Render/SpecialMaterials/JingTi/Bur/Shaders.meta b/Assets/Render/SpecialMaterials/JingTi/Bur/Resources.meta similarity index 77% rename from Assets/Render/SpecialMaterials/JingTi/Bur/Shaders.meta rename to Assets/Render/SpecialMaterials/JingTi/Bur/Resources.meta index 8e31f004..dd9d96a0 100644 --- a/Assets/Render/SpecialMaterials/JingTi/Bur/Shaders.meta +++ b/Assets/Render/SpecialMaterials/JingTi/Bur/Resources.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 672a6af357a2d4345a1912c1d48fd8fd +guid: 9ed60b8e0cc9b5c4e871a36512a9bc50 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Render/SpecialMaterials/JingTi/Bur/Bur.shader b/Assets/Render/SpecialMaterials/JingTi/Bur/Resources/Bur.shader similarity index 95% rename from Assets/Render/SpecialMaterials/JingTi/Bur/Bur.shader rename to Assets/Render/SpecialMaterials/JingTi/Bur/Resources/Bur.shader index 943ad864..692da026 100644 --- a/Assets/Render/SpecialMaterials/JingTi/Bur/Bur.shader +++ b/Assets/Render/SpecialMaterials/JingTi/Bur/Resources/Bur.shader @@ -51,7 +51,7 @@ Shader "Unlit URP Shader/Bur" Varyings o = (Varyings)0; o.positionCS = TransformObjectToHClip(v.positionOS.xyz); - o.uv = TRANSFORM_TEX(v.uv, _BaseMap); + o.uv = v.uv;//TRANSFORM_TEX(v.uv, _BaseMap); o.Wpos = TransformObjectToWorld(v.positionOS); o.Wnormal=TransformObjectToWorldNormal(v.normal); @@ -62,7 +62,7 @@ Shader "Unlit URP Shader/Bur" { float2 offset=_MainTex_TexelSize.xy; half4 c; - float2 uv=i.positionCS.xy/_ScreenParams.xy*2; + float2 uv=i.uv;//i.positionCS.xy/_ScreenParams.xy*2; half4 baseMap = 0.4*SAMPLE_TEXTURE2D(_MainTex, sampler_MainTex,uv); c = baseMap ;//* _BaseColor; { @@ -83,7 +83,7 @@ Shader "Unlit URP Shader/Bur" float2 offset=_MainTex_TexelSize.xy; half4 c=half4(0,0,0,0); - float2 uv=i.positionCS.xy/_ScreenParams.xy*2; + float2 uv=i.uv;//i.positionCS.xy/_ScreenParams.xy*2; //c = baseMap ;//* _BaseColor; { float f=0.4; diff --git a/Assets/Render/SpecialMaterials/JingTi/Bur/Bur.shader.meta b/Assets/Render/SpecialMaterials/JingTi/Bur/Resources/Bur.shader.meta similarity index 100% rename from Assets/Render/SpecialMaterials/JingTi/Bur/Bur.shader.meta rename to Assets/Render/SpecialMaterials/JingTi/Bur/Resources/Bur.shader.meta diff --git a/Assets/Render/SpecialMaterials/JingTi/Bur/BurRenderPassFeature.cs b/Assets/Render/SpecialMaterials/JingTi/Bur/Resources/BurRenderPassFeature.cs similarity index 83% rename from Assets/Render/SpecialMaterials/JingTi/Bur/BurRenderPassFeature.cs rename to Assets/Render/SpecialMaterials/JingTi/Bur/Resources/BurRenderPassFeature.cs index aacdccde..c8cb272f 100644 --- a/Assets/Render/SpecialMaterials/JingTi/Bur/BurRenderPassFeature.cs +++ b/Assets/Render/SpecialMaterials/JingTi/Bur/Resources/BurRenderPassFeature.cs @@ -46,7 +46,7 @@ public class BurRenderPassFeature : ScriptableRendererFeature cmd.GetTemporaryRT(BurTexture, dp); //cmd.DisableShaderKeyword("UNITY_SHADER_EDITOR"); cmd.Blit(renderingData.cameraData.renderer.cameraColorTarget,BurTemp); - //mat.SetFloat("_Value",Value); + // mat.SetFloat("_Value",3); cmd.SetGlobalVector("HorV",H); //cmd.SetRenderTarget(BurTexture); //cmd.ClearRenderTarget(false,true,Color.black); @@ -55,8 +55,8 @@ public class BurRenderPassFeature : ScriptableRendererFeature cmd.Blit(BurTexture,BurTemp,mat,0); cmd.Blit(BurTemp,BurTexture,mat,1); cmd.Blit(BurTexture,BurTemp,mat,1); - cmd.Blit(BurTemp,BurTexture,mat,1); - cmd.SetRenderTarget(renderingData.cameraData.renderer.cameraColorTarget); + cmd.Blit(BurTemp,renderingData.cameraData.renderer.cameraColorTarget,mat,1); + //cmd.SetRenderTarget(renderingData.cameraData.renderer.cameraColorTarget); cmd.ReleaseTemporaryRT(BurTemp); cmd.ReleaseTemporaryRT(BurTexture); @@ -91,20 +91,20 @@ public class BurRenderPassFeature : ScriptableRendererFeature // This method is called when setting up the renderer once per-camera. public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingData renderingData) { - if (renderingData.cameraData.camera.cameraType != CameraType.SceneView) - { - m_ScriptablePass.renderPassEvent = RenderPassEvent.BeforeRenderingTransparents; - Shader.EnableKeyword("UNITY_SHADER_EDITOR"); - } - else - { + // if (renderingData.cameraData.camera.cameraType != CameraType.SceneView) + // { + // m_ScriptablePass.renderPassEvent = RenderPassEvent.BeforeRenderingTransparents; + // Shader.EnableKeyword("UNITY_SHADER_EDITOR"); + // } + // else + // { m_ScriptablePass.renderPassEvent = RenderPassEvent.BeforeRenderingPostProcessing; - Shader.DisableKeyword("UNITY_SHADER_EDITOR"); - } + // Shader.DisableKeyword("UNITY_SHADER_EDITOR"); + // } m_ScriptablePass.Value = Value; - if (renderingData.cameraData.camera.cameraType != CameraType.SceneView &&( - renderingData.cameraData.camera.name == "camera1" || renderingData.cameraData.camera.name == "camera2")) + //if (renderingData.cameraData.camera.cameraType != CameraType.SceneView &&( + // renderingData.cameraData.camera.name == "camera1" || renderingData.cameraData.camera.name == "camera2")) { renderer.EnqueuePass(m_ScriptablePass); } diff --git a/Assets/Render/SpecialMaterials/JingTi/Bur/BurRenderPassFeature.cs.meta b/Assets/Render/SpecialMaterials/JingTi/Bur/Resources/BurRenderPassFeature.cs.meta similarity index 100% rename from Assets/Render/SpecialMaterials/JingTi/Bur/BurRenderPassFeature.cs.meta rename to Assets/Render/SpecialMaterials/JingTi/Bur/Resources/BurRenderPassFeature.cs.meta diff --git a/Assets/Render/SpecialMaterials/JingTi/Bur/BurValue.cs b/Assets/Render/SpecialMaterials/JingTi/Bur/Resources/BurValue.cs similarity index 100% rename from Assets/Render/SpecialMaterials/JingTi/Bur/BurValue.cs rename to Assets/Render/SpecialMaterials/JingTi/Bur/Resources/BurValue.cs diff --git a/Assets/Render/SpecialMaterials/JingTi/Bur/BurValue.cs.meta b/Assets/Render/SpecialMaterials/JingTi/Bur/Resources/BurValue.cs.meta similarity index 100% rename from Assets/Render/SpecialMaterials/JingTi/Bur/BurValue.cs.meta rename to Assets/Render/SpecialMaterials/JingTi/Bur/Resources/BurValue.cs.meta diff --git a/Assets/Render/SpecialMaterials/JingTi/Bur/Shaders/UIBlur.shader b/Assets/Render/SpecialMaterials/JingTi/Bur/Shaders/UIBlur.shader deleted file mode 100644 index a3f39ee4..00000000 --- a/Assets/Render/SpecialMaterials/JingTi/Bur/Shaders/UIBlur.shader +++ /dev/null @@ -1,91 +0,0 @@ -Shader "UI/UIBlur" -{ - Properties - { - [PerRendererData] _MainTex ("Texture", 2D) = "white" {} - // 模板测试属性 和 ColorMask 一般不控制，所以在属性面板上隐藏 - [HideInInspector]_StencilComp ("Stencil Comparison", Float) = 8 - [HideInInspector]_Stencil ("Stencil ID", Float) = 0 - [HideInInspector]_StencilOp ("Stencil Operation", Float) = 0 - [HideInInspector]_StencilWriteMask ("Stencil Write Mask", Float) = 255 - [HideInInspector]_StencilReadMask ("Stencil Read Mask", Float) = 255 - } - SubShader - { - Tags - { - "Queue"="Transparent" - "IgnoreProjector"="True" - "RenderType"="Transparent" - "PreviewType"="Plane" - "CanUseSpriteAtlas"="True" - } - Stencil - { - Ref [_Stencil] - Comp [_StencilComp] - Pass [_StencilOp] - ReadMask [_StencilReadMask] - WriteMask [_StencilWriteMask] - } - Cull Off - Lighting Off - ZWrite Off - ZTest [unity_GUIZTestMode] - Blend SrcAlpha OneMinusSrcAlpha - //ColorMask [_ColorMask] - - Pass - { - CGPROGRAM - #pragma vertex vert - #pragma fragment frag - #pragma multi_compile _ UNITY_UI_ALPHACLIP - #pragma multi_compile _ UNITY_SHADER_EDITOR - #include "UnityUI.cginc" - #include "UnityCG.cginc" - - fixed4 _TextureSampleAdd; // Unity管理：图片格式用Alpha8 - float4 _ClipRect;// Unity管理：2D剪裁使用 - sampler2D _MainTex; - sampler2D _BurTexture; - struct a2v{ - float4 vertex : POSITION; - float4 color : COLOR; - float2 texcoord : TEXCOORD0; - UNITY_VERTEX_INPUT_INSTANCE_ID - }; - struct v2f{ - float4 vertex : SV_POSITION; - float4 color : COLOR; - float2 texcoord : TEXCOORD0; - UNITY_VERTEX_OUTPUT_STEREO - }; - v2f vert(a2v IN){ - v2f OUT; - UNITY_SETUP_INSTANCE_ID(IN); - UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(OUT);// 实例化处理 - OUT.vertex = UnityObjectToClipPos(IN.vertex);// 模型空间到裁剪空间 - OUT.color = IN.color; - OUT.texcoord = IN.texcoord; - return OUT; - } - fixed4 frag(v2f IN):SV_Target{ - // 直接读取纹理颜色 并且乘上 ImageColor - //half4 color = tex2D(_MainTex,IN.texcoord) ;//* IN.color; - float2 uv=IN.vertex.xy/_ScreenParams.xy; - - //#ifndef UNITY_SHADER_EDITOR - //uv=float2(uv.x,1-uv.y); - //#endif - IN.texcoord=float2(IN.texcoord.x,1-IN.texcoord.y); - half4 brackground = tex2D(_BurTexture,IN.texcoord);//* IN.color; - //float alpha= color.a*IN.color.a; - //color.rgb=color.rgb*alpha+brackground.rgb*(1-alpha); - //alpha=smoothstep(0,0.2,color.a); - return float4(brackground.rgb,1); - } - ENDCG - } - } -} \ No newline at end of file diff --git a/Assets/Render/SpecialMaterials/JingTi/Bur/Shaders/UIBlur.shader.meta b/Assets/Render/SpecialMaterials/JingTi/Bur/Shaders/UIBlur.shader.meta deleted file mode 100644 index 0f1765df..00000000 --- a/Assets/Render/SpecialMaterials/JingTi/Bur/Shaders/UIBlur.shader.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 95fc8338e64f9f5489987d155c13f9c9 -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - preprocessorOverride: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Render/SpecialMaterials/JingTi/Bur/UI_UIBlur.mat b/Assets/Render/SpecialMaterials/JingTi/Bur/UI_UIBlur.mat deleted file mode 100644 index 812806d7..00000000 --- a/Assets/Render/SpecialMaterials/JingTi/Bur/UI_UIBlur.mat +++ /dev/null @@ -1,35 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI_UIBlur - m_Shader: {fileID: 4800000, guid: 95fc8338e64f9f5489987d155c13f9c9, type: 3} - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - m_Colors: [] - m_BuildTextureStacks: [] diff --git a/Assets/Render/SpecialMaterials/JingTi/Bur/UI_UIBlur.mat.meta b/Assets/Render/SpecialMaterials/JingTi/Bur/UI_UIBlur.mat.meta deleted file mode 100644 index a0fc349d..00000000 --- a/Assets/Render/SpecialMaterials/JingTi/Bur/UI_UIBlur.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 86d5d03bace9c3546a904063a2ded222 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Render/SpecialMaterials/JingTi/Bur/Unlit URP Shader_Bur.mat b/Assets/Render/SpecialMaterials/JingTi/Bur/Unlit URP Shader_Bur.mat deleted file mode 100644 index 90a22130..00000000 --- a/Assets/Render/SpecialMaterials/JingTi/Bur/Unlit URP Shader_Bur.mat +++ /dev/null @@ -1,34 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Unlit URP Shader_Bur - m_Shader: {fileID: 4800000, guid: ab89475eab71d344eb252d7e2828add6, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: [] - m_Colors: - - _BaseColor: {r: 0.09669447, g: 1, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Render/SpecialMaterials/JingTi/Bur/Unlit URP Shader_sampbur.mat b/Assets/Render/SpecialMaterials/JingTi/Bur/Unlit URP Shader_sampbur.mat deleted file mode 100644 index 6cd247a8..00000000 --- a/Assets/Render/SpecialMaterials/JingTi/Bur/Unlit URP Shader_sampbur.mat +++ /dev/null @@ -1,34 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Unlit URP Shader_sampbur - m_Shader: {fileID: 4800000, guid: dedbc0fc0ecaf744fb075c715a940c87, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 0 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BaseMap: - m_Texture: {fileID: 2800000, guid: 57bbea1bc13be6e4b84f00dfa7b6024d, type: 3} - m_Scale: {x: 0.75, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: [] - m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/Render/SpecialMaterials/JingTi/Bur/Unlit URP Shader_sampbur.mat.meta b/Assets/Render/SpecialMaterials/JingTi/Bur/Unlit URP Shader_sampbur.mat.meta deleted file mode 100644 index 885ea1b7..00000000 --- a/Assets/Render/SpecialMaterials/JingTi/Bur/Unlit URP Shader_sampbur.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f7336ae76112887468c35a66492667c3 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Render/SpecialMaterials/JingTi/Bur/sampbur.shader b/Assets/Render/SpecialMaterials/JingTi/Bur/sampbur.shader deleted file mode 100644 index 22c496af..00000000 --- a/Assets/Render/SpecialMaterials/JingTi/Bur/sampbur.shader +++ /dev/null @@ -1,95 +0,0 @@ -Shader "Unlit URP Shader/sampbur" -{ - Properties - { - _BaseColor("Base Color",color) = (1,1,1,1) - _BaseMap("BaseMap", 2D) = "white" {} - } - - SubShader - { - Tags { "Queue"="Geometry" "RenderType" = "Opaque" "RenderPipeline" = "UniversalPipeline" } - LOD 100 - - Pass - { - Tags {"LightMode" = "UniversalForward"} - HLSLPROGRAM - // Required to compile gles 2.0 with standard srp library - #pragma prefer_hlslcc gles - #pragma exclude_renderers d3d11_9x - - #pragma multi_compile _ LIGHTMAP_ON - #pragma multi_compile _ _MAIN_LIGHT_SHADOWS //接受主光源阴影 - #pragma multi_compile _ _MAIN_LIGHT_SHADOWS_CASCADE //投射主光源的阴影 - #pragma multi_compile _ _SHADOWS_SOFT //软阴影 - #pragma multi_compile _ _ADDITIONAL_LIGHTS //附加光源 - - #pragma vertex vert - #pragma fragment frag - - #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Core.hlsl" - #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Lighting.hlsl" - - - - struct Attributes - { - float4 positionOS : POSITION; - float2 uv : TEXCOORD0; - float3 normal:NORMAL; - }; - - struct Varyings - { - float4 positionCS : SV_POSITION; - float2 uv : TEXCOORD0; - float3 Wnormal : TEXCOORD1; - float3 Wpos:TEXCOORD2; - }; - - CBUFFER_START(UnityPerMaterial) - half4 _BaseColor; - float4 _BaseMap_ST; - CBUFFER_END - TEXTURE2D (_BurTexture);SAMPLER(sampler_BurTexture); - - - Varyings vert(Attributes v) - { - Varyings o = (Varyings)0; - - o.positionCS = TransformObjectToHClip(v.positionOS.xyz); - o.uv = TRANSFORM_TEX(v.uv, _BaseMap); - o.Wpos = TransformObjectToWorld(v.positionOS); - o.Wnormal=TransformObjectToWorldNormal(v.normal); - - return o; - } - - half4 frag(Varyings i) : SV_Target - { - float3 N=normalize(i.Wnormal); - float3 V=normalize(_WorldSpaceCameraPos.xyz-i.Wpos.xyz); - float2 uv=i.positionCS.xy/_ScreenParams.xy; - half4 c; - half4 baseMap = SAMPLE_TEXTURE2D(_BurTexture, sampler_BurTexture, uv); - c = baseMap * _BaseColor; - //c.rgb = MixFog(c.rgb, i.fogCoord); - //float _Me=0.6;//干净的透明玻璃漫反射少，所以金属度直接拉满 - - //间接高光和漫反射 - // float aa=1; - // BRDFData brdfData; - // InitializeBRDFData(c,_Me,1,1,aa, brdfData); - // half3 ambient_contrib = SampleSH(float4(N, 1)); - // float3 ambient = 0.3 * c;// 随便乘个暗的系数 - // float3 iblDiffuse = max(half3(0, 0, 0), ambient.rgb + ambient_contrib); - // float3 inssp= GlobalIllumination(brdfData,iblDiffuse,1,i.Wpos,N,V); - // c.rgb+=inssp*0.5; - return c; - } - ENDHLSL - } - } -} \ No newline at end of file diff --git a/Assets/Render/SpecialMaterials/JingTi/Bur/sampbur.shader.meta b/Assets/Render/SpecialMaterials/JingTi/Bur/sampbur.shader.meta deleted file mode 100644 index 9bb1a817..00000000 --- a/Assets/Render/SpecialMaterials/JingTi/Bur/sampbur.shader.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: dedbc0fc0ecaf744fb075c715a940c87 -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - preprocessorOverride: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Settings/UniversalRP-HighQuality.asset b/Assets/Settings/UniversalRP-HighQuality.asset index 708146af..560d9c51 100644 --- a/Assets/Settings/UniversalRP-HighQuality.asset +++ b/Assets/Settings/UniversalRP-HighQuality.asset @@ -19,6 +19,7 @@ MonoBehaviour: m_RendererDataList: - {fileID: 11400000, guid: 47db18f3169384f6b87445e6447e189e, type: 2} - {fileID: 11400000, guid: 4a8e21d5c33334b11b34a596161b9360, type: 2} + - {fileID: 11400000, guid: 16b30d850807fab4990682ec81fe7800, type: 2} m_DefaultRendererIndex: 0 m_RequireDepthTexture: 0 m_RequireOpaqueTexture: 0 diff --git a/Assets/sound_27.mp3 b/Assets/sound_27.mp3 deleted file mode 100644 index cbfad76a..00000000 Binary files a/Assets/sound_27.mp3 and /dev/null differ diff --git a/Assets/sound_27.mp3.meta b/Assets/sound_27.mp3.meta deleted file mode 100644 index 1597f0a2..00000000 --- a/Assets/sound_27.mp3.meta +++ /dev/null @@ -1,41 +0,0 @@ -fileFormatVersion: 2 -guid: faa5d1d1a25705543b59d337e719a44b -AudioImporter: - externalObjects: {} - serializedVersion: 7 - defaultSettings: - serializedVersion: 2 - loadType: 2 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 0 - quality: 1 - conversionMode: 0 - preloadAudioData: 0 - platformSettingOverrides: - 4: - serializedVersion: 2 - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 3 - quality: 1 - conversionMode: 0 - preloadAudioData: 0 - 7: - serializedVersion: 2 - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - preloadAudioData: 0 - forceToMono: 0 - normalize: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/sound_27.wav b/Assets/sound_27.wav deleted file mode 100644 index eb42c8c0..00000000 Binary files a/Assets/sound_27.wav and /dev/null differ diff --git a/Assets/sound_27.wav.meta b/Assets/sound_27.wav.meta deleted file mode 100644 index 00238699..00000000 --- a/Assets/sound_27.wav.meta +++ /dev/null @@ -1,41 +0,0 @@ -fileFormatVersion: 2 -guid: 09e3c44911c9d584f8ddcd8977782b47 -AudioImporter: - externalObjects: {} - serializedVersion: 7 - defaultSettings: - serializedVersion: 2 - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 0 - quality: 1 - conversionMode: 0 - preloadAudioData: 0 - platformSettingOverrides: - 4: - serializedVersion: 2 - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 3 - quality: 1 - conversionMode: 0 - preloadAudioData: 0 - 7: - serializedVersion: 2 - loadType: 0 - sampleRateSetting: 0 - sampleRateOverride: 44100 - compressionFormat: 1 - quality: 1 - conversionMode: 0 - preloadAudioData: 0 - forceToMono: 0 - normalize: 1 - loadInBackground: 0 - ambisonic: 0 - 3D: 1 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Data/Xml/03_ChangJingXuNiPaiShe.xml b/Data/Xml/03_ChangJingXuNiPaiShe.xml index d918c3ef..c948df54 100644 --- a/Data/Xml/03_ChangJingXuNiPaiShe.xml +++ b/Data/Xml/03_ChangJingXuNiPaiShe.xml @@ -101,9 +101,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -455,6 +502,13 @@ + + + + + + + @@ -493,6 +547,15 @@ + + + + + + + + + @@ -767,6 +830,11 @@ + + + + + @@ -780,6 +848,13 @@ + + + + + + + diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 3b9fda21..463f24c8 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -159,7 +159,7 @@ PlayerSettings: androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: - Standalone: com.DefaultCompany.VirtualFramwork + Standalone: com.DefaultCompany.--------------------------------------------------- buildNumber: Standalone: 0 VisionOS: 0