saipo/religion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Squashed commit of the following:

Browse Source 
commit 9b1756077de6fd5005c6d7300b470e2bfa223f97
Author: SAIPO <grasste0403@hotmail.com>
Date:   Thu Dec 2 16:10:18 2021 +0800

    任务：编写屏幕后特效的渲染框架
    1.合并分支
    2.完成框架编写，代码文件在URP文件夹里

commit 994279b09e8676155176aecbcd43f13ab90f2c92
Author: SAIPO <grasste0403@hotmail.com>
Date:   Mon Nov 29 23:59:44 2021 +0800

    任务：编写效果Shader
    1.增加了通过高斯模糊公式实现的高斯模糊shader（建议用在背景层，让画面有一些景深感觉）
    2.增加了像素化的shader，通过在片元着色器上的uv合并，可以使贴图变为像素风格
    3.增加了闪光划过的shader

commit 271e45aeb97212640573a9faf71483cece293043
Author: SAIPO <grasste0403@hotmail.com>
Date:   Mon Nov 29 23:09:30 2021 +0800

    11.29合并分支

commit dfa618fabaf36626e1b92e7ab34c87d497bcdeb3
Author: SAIPO <grasste0403@hotmail.com>
Date:   Sat Nov 27 13:42:16 2021 +0800

    合并分支

commit de8d79b73e560814ff9fc8a0c3418009682c5ef8
Author: SAIPO <grasste0403@hotmail.com>
Date:   Tue Nov 23 21:25:44 2021 +0800

    任务：搭建Mysql数据库相关框架
    1.完成Mysql动态链接库的导入
    2.实现基本的服务器连接数据框架
    3.实现Sql语句查询框架

# Conflicts:
#	.merge_file_a14904
#	.merge_file_a17704
#	Assets/Behavior Designer/Resources.meta
#	Assets/Demigiant/DOTween.meta
#	Assets/Demigiant/DOTween/Editor.meta
#	Assets/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb.meta
#	Assets/Demigiant/DOTween/Modules.meta
#	Assets/Plugins/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb.meta
#	Assets/Prefabs/镰刀.prefab.meta
#	Assets/Scenes/test.unity
#	Assets/Shader.meta
#	Logs/ApiUpdaterCheck.txt
This commit is contained in:
Roman 2021-12-02 20:21:03 +08:00
parent 1802f8ee83
commit 5105e892f9
15 changed files with 384 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Behavior Designer/Resources.meta
View File

@ -1,5 +1,9 @@
fileFormatVersion: 2
<<<<<<< HEAD:.merge_file_a17704
guid: 05f8a23aa702c8a47b2947a3e1f64d03
=======
guid: 337e117eb0d8e62418b33a654ac7f725
>>>>>>> 9b1756077de6fd5005c6d7300b470e2bfa223f97:Assets/Behavior Designer/Resources.meta
folderAsset: yes
DefaultImporter:
externalObjects: {}

6
Assets/Plugins/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb.meta
View File

@ -1,4 +1,10 @@
fileFormatVersion: 2
<<<<<<< HEAD:Assets/Prefabs/镰刀.prefab.meta
guid: e1dcbbca45563504085bc3b1137ded77
PrefabImporter:
externalObjects: {}
=======
guid: 8f46310a8b0a8f04a92993c37c713243
DefaultImporter:
>>>>>>> 9b1756077de6fd5005c6d7300b470e2bfa223f97:Assets/Plugins/Demigiant/DOTween/Editor/DOTweenEditor.dll.mdb.meta
userData:

2
Assets/Prefabs/镰刀.prefab.meta
View File

@ -3,5 +3,3 @@ guid: 2e2fb120ae20d5e4faaad5a2a2fcca30
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

115
Assets/Scenes/test.unity
View File

@ -232,6 +232,113 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &189736994
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 189736997}
- component: {fileID: 189736995}
- component: {fileID: 189736996}
m_Layer: 0
m_Name: "\u540E\u7279\u6548\u6E32\u67D3\u6444\u50CF\u673A"
m_TagString: "\u7279\u6548\u6444\u50CF\u673A"
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!20 &189736995
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 189736994}
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_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_FocalLength: 50
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.3
far clip plane: 1000
field of view: 26.991467
orthographic: 0
orthographic size: 5
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 0
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!114 &189736996
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 189736994}
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: 1
m_Cameras: []
m_RendererIndex: 1
m_VolumeLayerMask:
serializedVersion: 2
m_Bits: 1
m_VolumeTrigger: {fileID: 0}
m_RenderPostProcessing: 0
m_Antialiasing: 0
m_AntialiasingQuality: 2
m_StopNaN: 0
m_Dithering: 0
m_ClearDepth: 1
m_AllowXRRendering: 1
m_RequiresDepthTexture: 0
m_RequiresColorTexture: 0
m_Version: 2
--- !u!4 &189736997
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 189736994}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 13.921112, y: 1.5414519, z: 7.956176}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 519420032}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &321454205
GameObject:
m_ObjectHideFlags: 0
@ -703,8 +810,9 @@ MonoBehaviour:
m_RequiresDepthTextureOption: 2
m_RequiresOpaqueTextureOption: 2
m_CameraType: 0
m_Cameras: []
m_RendererIndex: -1
m_Cameras:
- {fileID: 189736995}
m_RendererIndex: 0
m_VolumeLayerMask:
serializedVersion: 2
m_Bits: 1
@ -772,7 +880,8 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -5.522, y: 1.231, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Children:
- {fileID: 189736997}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

4
Assets/Shader.meta
View File

@ -1,5 +1,9 @@
fileFormatVersion: 2
<<<<<<< HEAD:Assets/Behavior Designer/Resources.meta
guid: 337e117eb0d8e62418b33a654ac7f725
=======
guid: 878be257ea938f4458e2d2578a5cc191
>>>>>>> 9b1756077de6fd5005c6d7300b470e2bfa223f97:Assets/Shader.meta
folderAsset: yes
DefaultImporter:
externalObjects: {}

44
Assets/URP/De.mat Normal file
View File

@ -0,0 +1,44 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: De
m_Shader: {fileID: 4800000, guid: e260cfa7296ee7642b167f1eb5be5023, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _AlphaTex:
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}
- _MaskTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _NormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _EnableExternalAlpha: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _Flip: {r: 1, g: 1, b: 1, a: 1}
- _RendererColor: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []

6
.merge_file_a14904 → Assets/URP/De.mat.meta
View File

@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: 05f8a23aa702c8a47b2947a3e1f64d03
folderAsset: yes
DefaultImporter:
guid: 9415f6c970c0800499cd4a676f061f8e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

53
Assets/URP/HLRenderPass.cs Normal file
View File

@ -0,0 +1,53 @@
using UnityEngine;
using UnityEngine.Rendering;
using UnityEngine.Rendering.Universal;
public class HLRenderPass : ScriptableRenderPass
{
public Material mMat;
public int blitShaderPassIndex = 0;
public FilterMode filterMode { get; set; }
private RenderTargetIdentifier source { get; set; }
private RenderTargetHandle destination { get; set; }
RenderTargetHandle m_temporaryColorTexture;
string m_ProfilerTag;
public HLRenderPass(string passname, RenderPassEvent _event, Material _mat,float contrast)
{
m_ProfilerTag = passname;
this.renderPassEvent = _event;
mMat = _mat;
mMat.SetFloat("_Contrast", contrast);
m_temporaryColorTexture.Init("temporaryColorTexture");
}
public void Setup(RenderTargetIdentifier src, RenderTargetHandle dest)
{
this.source = src;
this.destination = dest;
}
public override void Execute(ScriptableRenderContext context, ref RenderingData renderingData)
{
CommandBuffer cmd = CommandBufferPool.Get(m_ProfilerTag);
RenderTextureDescriptor opaqueDesc = renderingData.cameraData.cameraTargetDescriptor;
opaqueDesc.depthBufferBits = 0;
if (destination == RenderTargetHandle.CameraTarget)
{
cmd.GetTemporaryRT(m_temporaryColorTexture.id, opaqueDesc, filterMode);
Blit(cmd, source, m_temporaryColorTexture.Identifier(), mMat, blitShaderPassIndex);
Blit(cmd, m_temporaryColorTexture.Identifier(), source);
}
else
{
Blit(cmd, source, destination.Identifier(), mMat, blitShaderPassIndex);
}
context.ExecuteCommandBuffer(cmd);
CommandBufferPool.Release(cmd);
}
public override void FrameCleanup(CommandBuffer cmd)
{
if (destination == RenderTargetHandle.CameraTarget)
cmd.ReleaseTemporaryRT(m_temporaryColorTexture.id);
}
}

11
Assets/URP/HLRenderPass.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: d042b1be97dc9fd47a538bd431d79c04
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

51
Assets/URP/RenderPassFeature.cs Normal file
View File

@ -0,0 +1,51 @@
using UnityEngine;
using UnityEngine.Rendering;
using UnityEngine.Rendering.Universal;
public class RenderPassFeature : ScriptableRendererFeature
{
public enum Target
{
Color,
Texture
}
[System.Serializable]
public class HLSettings
{
public RenderPassEvent renderPassEvent = RenderPassEvent.AfterRenderingSkybox;
public Material mMat;
public Target destination = Target.Color;
public int blitMaterialPassIndex = -1;
public string textureId = "_ScreenTexture";
public float contrast = 0.5f;
}
public HLSettings settings = new HLSettings();
RenderTargetHandle m_renderTargetHandle;
HLRenderPass m_ScriptablePass;
public override void Create()
{
int passIndex = settings.mMat != null ? settings.mMat.passCount - 1 : 1;
settings.blitMaterialPassIndex = Mathf.Clamp(settings.blitMaterialPassIndex, -1, passIndex);
m_ScriptablePass = new HLRenderPass("HLPostEffectRender", settings.renderPassEvent, settings.mMat, settings.contrast);
m_renderTargetHandle.Init(settings.textureId);
}
public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingData renderingData)
{
var src = renderer.cameraColorTarget;
var dest = (settings.destination == Target.Color) ? RenderTargetHandle.CameraTarget : m_renderTargetHandle;
if (settings.mMat == null)
{
Debug.LogWarningFormat("丢失blit材质");
return;
}
m_ScriptablePass.Setup(src,dest);
renderer.EnqueuePass(m_ScriptablePass);
}
}

11
Assets/URP/RenderPassFeature.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 4524f163cccaa484090b17cc664cbc08
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

1
Assets/URP/UniversalRenderPipelineAsset.asset
View File

@ -18,6 +18,7 @@ MonoBehaviour:
m_RendererData: {fileID: 0}
m_RendererDataList:
- {fileID: 11400000, guid: 36a81dc5e30473f4ea5a9dc65b2195a5, type: 2}
- {fileID: 11400000, guid: 1280ad6bf65cf164b917b87e5e93c019, type: 2}
m_DefaultRendererIndex: 0
m_RequireDepthTexture: 0
m_RequireOpaqueTexture: 0

25
Assets/URP/UniversalRenderPipelineAsset_Renderer.asset
View File

@ -12,8 +12,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: de640fe3d0db1804a85f9fc8f5cadab6, type: 3}
m_Name: UniversalRenderPipelineAsset_Renderer
m_EditorClassIdentifier:
m_RendererFeatures: []
m_RendererFeatureMap:
m_RendererFeatures:
- {fileID: 1762836506932967278}
m_RendererFeatureMap: 6e77d49076da7618
postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2}
shaders:
@ -42,3 +43,23 @@ MonoBehaviour:
m_ShadowTransparentReceive: 1
m_RenderingMode: 0
m_AccurateGbufferNormals: 0
--- !u!114 &1762836506932967278
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: 4524f163cccaa484090b17cc664cbc08, type: 3}
m_Name: NewRenderPassFeature
m_EditorClassIdentifier:
m_Active: 1
settings:
renderPassEvent: 400
mMat: {fileID: 2100000, guid: 9415f6c970c0800499cd4a676f061f8e, type: 2}
destination: 0
blitMaterialPassIndex: -1
textureId: _ScreenTexture
contrast: 0.5

60
Logs/ApiUpdaterCheck.txt
View File

@ -75,3 +75,63 @@ C# parse time : 218ms
candidates check time : 79ms
console write time : 0ms
[api-updater (non-obsolete-error-filter)] 2021/12/2 15:28:38 : Starting E:/unity/2020.3.20f1c1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
[api-updater (non-obsolete-error-filter)]
----------------------------------
jit/startup time : 861.2925ms
moved types parse time: 85ms
candidates parse time : 1ms
C# parse time : 334ms
candidates check time : 45ms
console write time : 0ms
[api-updater (non-obsolete-error-filter)] 2021/12/2 15:29:39 : Starting E:/unity/2020.3.20f1c1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
[api-updater (non-obsolete-error-filter)]
----------------------------------
jit/startup time : 54.8526ms
moved types parse time: 51ms
candidates parse time : 1ms
C# parse time : 192ms
candidates check time : 40ms
console write time : 0ms
[api-updater (non-obsolete-error-filter)] 2021/12/2 15:38:30 : Starting E:/unity/2020.3.20f1c1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
[api-updater (non-obsolete-error-filter)]
----------------------------------
jit/startup time : 54.8282ms
moved types parse time: 50ms
candidates parse time : 1ms
C# parse time : 196ms
candidates check time : 43ms
console write time : 0ms
[api-updater (non-obsolete-error-filter)] 2021/12/2 15:38:46 : Starting E:/unity/2020.3.20f1c1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
[api-updater (non-obsolete-error-filter)]
----------------------------------
jit/startup time : 52.8573ms
moved types parse time: 50ms
candidates parse time : 1ms
C# parse time : 197ms
candidates check time : 43ms
console write time : 0ms
[api-updater (non-obsolete-error-filter)] 2021/12/2 15:43:06 : Starting E:/unity/2020.3.20f1c1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
[api-updater (non-obsolete-error-filter)]
----------------------------------
jit/startup time : 53.8276ms
moved types parse time: 50ms
candidates parse time : 1ms
C# parse time : 192ms
candidates check time : 50ms
console write time : 0ms
[api-updater (non-obsolete-error-filter)] 2021/12/2 15:43:32 : Starting E:/unity/2020.3.20f1c1/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
[api-updater (non-obsolete-error-filter)]
----------------------------------
jit/startup time : 55.822ms
moved types parse time: 51ms
candidates parse time : 1ms
C# parse time : 185ms
candidates check time : 34ms
console write time : 0ms

1
ProjectSettings/TagManager.asset
View File

@ -5,6 +5,7 @@ TagManager:
serializedVersion: 2
tags:
- "\u5730\u9762"
- "\u7279\u6548\u6444\u50CF\u673A"
layers:
- Default
- TransparentFX