religion/UserSettings/EditorUserSettings.asset
Roman 97c56e1892 Squashed commit of the following:
commit bf213bea549de72d8545a79c04e46b25d5a37b26
Author: SAIPO <grasste0403@hotmail.com>
Date:   Tue Dec 28 05:01:18 2021 +0800

    优化游戏特效及制作游戏音效

    优化:
    1.基督小怪的shader添加完毕,但是小怪的闪电似乎有bug,见末尾bug集合
    2.给炸弹爆炸加入了粒子特效
    3.优化了死亡的屏幕后特效,现在做到了只有黑白区域才会渲染死亡鬼魂的效果

    音效:
    1.制作了地藏的全部音效
    2.制作了特洛伊木马的全部音效
    3.制作了以撒的全部音效
    4.制作了玩家 跳跃,挥锤子,扔镰刀,受击,死亡,与击中敌人的音效,目前还缺少交互音效
    5.制作了爱欲品的抱人音效
    6.制作了所有与爆炸相关的音效

    音效大体上已经制作完毕,逻辑也已经写完了
    如果有不合适的音效改起来还算容易

    问题:
    1.目前在交互时(对话,看牌子),玩家可以进行挥砍和跳跃
    2.基督石像的雷击效果只有一半不知道是不是bug
    3.基督石像我没有找到他的受击函数,所以他的受击音效我没有制作

    下班,绷不住了,真就干了后半夜。

commit 0d7446d2e7a625f033cda6acc496c6cddfe2d75f
Author: SAIPO <grasste0403@hotmail.com>
Date:   Sat Dec 25 22:53:32 2021 +0800

    修改建议及完善特效

    修改建议:
    1.添加了击中的粒子特效,但是还需要迭代
    2.修复马死后灰尘不会消失的bug

    完善特效
    1.制作了死亡时的阴间特效,已经在全场景实装
    2.制作了闪电的辉光特效。
    3.调整了所有场景的全局shader以适配死亡阴间特效

# Conflicts:
#	Assets/Prefabs/基督闪电攻击器.prefab
#	Assets/Prefabs/死亡玩家.prefab
#	Assets/Scenes/DiZangStageTest.unity
#	Assets/Scenes/Fo.unity
#	Assets/Scenes/Ji.unity
#	Assets/Scenes/TeLuoYiStageTest.unity
#	Assets/Scenes/Yi.unity
#	Assets/Scenes/YiSaStageTest.unity
#	Assets/Scenes/cun.unity
#	Assets/Scripts/Boss/木马/TrojanHorse.cs
#	Assets/Scripts/演出/以撒/YiSaOpeningStage.cs
#	Assets/Scripts/玩家/MyPlayer.cs
#	Assets/Shader/大落雷/Shader Graphs_大落雷.mat
#	Assets/Shader/阴间/Shader Graphs_阴间.mat
#	Assets/Shader/阴间/阴间.shadergraph
#	UserSettings/EditorUserSettings.asset
2021-12-28 14:04:09 +08:00

61 lines
2.5 KiB
Plaintext

%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!162 &1
EditorUserSettings:
m_ObjectHideFlags: 0
serializedVersion: 4
m_ConfigSettings:
RecentlyUsedScenePath-0:
value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
flags: 0
RecentlyUsedScenePath-1:
value: 22424703114646680e0b0227036c5c0518590d24253c3f
flags: 0
RecentlyUsedScenePath-2:
value: 22424703114646680e0b0227036c791f580216233831
flags: 0
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c7000131911242b66333e243d04
flags: 0
RecentlyUsedScenePath-4:
value: 22424703114646680e0b0227036c7b192c16162d1f3c2737281d1820f6ae2136ebf32f
flags: 0
RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036c661925162b3e2d2f2304283a097df7ee3d2cfb
flags: 0
RecentlyUsedScenePath-6:
value: 22424703114646680e0b0227036c6619580216233831
flags: 0
RecentlyUsedScenePath-7:
value: 22424703114646680e0b0227036c4b150503563f22213229
flags: 0
RecentlyUsedScenePath-8:
value: 22424703114646680e0b0227036c7519580216233831
flags: 0
RecentlyUsedScenePath-9:
value: 22424703114646680e0b0227036c6b153a021713251b32312a2c2936f1f47a2decee22f0
flags: 0
UnityEditor.ShaderGraph.Blackboard:
value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4baf5e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1b7968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af8ffaeffff8e85dd8390e3949c8899daa7
flags: 0
UnityEditor.ShaderGraph.FloatingWindowsLayout2:
value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b98d9884a69ae6d8f0d1cda9e8fbfefaf9f9dea3fdb9ade882f0f7b0e1e380cafbf2c3adc18e9cd285a2908b82ec869c8395949c9483d68a8e97ddbd90bf
flags: 0
UnityEditor.ShaderGraph.InspectorWindow:
value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a5602b2e2c07a37e0901373ae01e0008f707250d171df81a53a5475d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd80908fecb0f9cfddf1eff4e7a1b1eae482f0fcaee1e1928b86d888ed969b938797a7cf
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650
flags: 0
m_VCAutomaticAdd: 1
m_VCDebugCom: 0
m_VCDebugCmd: 0
m_VCDebugOut: 0
m_SemanticMergeMode: 2
m_VCShowFailedCheckout: 1
m_VCOverwriteFailedCheckoutAssets: 1
m_VCProjectOverlayIcons: 1
m_VCHierarchyOverlayIcons: 1
m_VCOtherOverlayIcons: 1
m_VCAllowAsyncUpdate: 1