45 lines
1.2 KiB
Plaintext
Raw Permalink Normal View History

Squashed commit of the following: 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
2021-12-02 20:21:03 +08:00
%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: []