religion/Assets/Shader.meta

fileFormatVersion: 2
<<<<<<< HEAD:Assets/Behavior Designer/Resources.meta
guid: 337e117eb0d8e62418b33a654ac7f725
=======
guid: 878be257ea938f4458e2d2578a5cc191
>>>>>>> 9b1756077de6fd5005c6d7300b470e2bfa223f97:Assets/Shader.meta
folderAsset: yes
DefaultImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant:
任务：搭建基本的系统 1.实装部分前期美术素材（1.放置了一个临时背景 2.编写玩家状态机器雏形（1.创建待机动画（2.创建跑步动画（3.将上述动画写入状态机，并编写脚本呼出动画明天整，睡大觉，欧亚嘲哳难为听 🥱 2021-11-30 23:08:26 +08:00			`fileFormatVersion: 2`
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			`<<<<<<< HEAD:Assets/Behavior Designer/Resources.meta`
			`guid: 337e117eb0d8e62418b33a654ac7f725`
			`=======`
任务：搭建基本的系统 1.实装部分前期美术素材（1.放置了一个临时背景 2.编写玩家状态机器雏形（1.创建待机动画（2.创建跑步动画（3.将上述动画写入状态机，并编写脚本呼出动画明天整，睡大觉，欧亚嘲哳难为听 🥱 2021-11-30 23:08:26 +08:00			`guid: 878be257ea938f4458e2d2578a5cc191`
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			`>>>>>>> 9b1756077de6fd5005c6d7300b470e2bfa223f97:Assets/Shader.meta`
任务：搭建基本的系统 1.实装部分前期美术素材（1.放置了一个临时背景 2.编写玩家状态机器雏形（1.创建待机动画（2.创建跑步动画（3.将上述动画写入状态机，并编写脚本呼出动画明天整，睡大觉，欧亚嘲哳难为听 🥱 2021-11-30 23:08:26 +08:00			`folderAsset: yes`
			`DefaultImporter:`
			`externalObjects: {}`
			`userData:`
			`assetBundleName:`
			`assetBundleVariant:`