religion/Assets/Prefabs/死亡渲染.prefab
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

145 lines
3.7 KiB
Plaintext

%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &6335753601452093230
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6335753601452093235}
- component: {fileID: 6335753601452093228}
- component: {fileID: 6335753601452093229}
- component: {fileID: 8040209264344558499}
m_Layer: 0
m_Name: "\u6B7B\u4EA1\u6E32\u67D3"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6335753601452093235
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6335753601452093230}
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_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!20 &6335753601452093228
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6335753601452093230}
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: 60
orthographic: 1
orthographic size: 3.19
m_Depth: -1
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingPath: -1
m_TargetTexture: {fileID: 8400000, guid: 394bfc912eff66a4c8af8e4c8ad2198b, type: 2}
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 &6335753601452093229
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6335753601452093230}
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_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!114 &8040209264344558499
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6335753601452093230}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 72ece51f2901e7445ab60da3685d6b5f, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ShowDebugText: 0
m_ShowCameraFrustum: 1
m_IgnoreTimeScale: 0
m_WorldUpOverride: {fileID: 0}
m_UpdateMethod: 2
m_BlendUpdateMethod: 1
m_DefaultBlend:
m_Style: 1
m_Time: 2
m_CustomCurve:
serializedVersion: 2
m_Curve: []
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_CustomBlends: {fileID: 0}
m_CameraCutEvent:
m_PersistentCalls:
m_Calls: []
m_CameraActivatedEvent:
m_PersistentCalls:
m_Calls: []