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
..

Playmaker
============
Playmaker is a Finite State Machine plugin for Unity that allows developers to create games using a visual scripting methodology that does away with writing code in a manner similar to Fungus.
The FSM allows the creation of various states and events for a given object that allows for the wuick and easy creation of object behaviours and AI for NPCs and enemies.
By combining the Playmaker FSM with Fungus' ability to create engaging, character driven story based games, it is hoped that developers will be able to create games that combine the best features of both.

Installation
============

1. Download and install the Playmaker runtime unitypackage in your Unity project
http://sites.fastspring.com/hutonggames/product/playmaker
https://www.assetstore.unity3d.com/en/#!/content/368

2. Install the Fungus-PlayMaker.unitypackage in your Unity project. This file is located in the same folder as this text file.

3. Open the Fungus-PlayMaker/Scenes/Fungus Playmaker Example Scene for an example of how to use the Spine commands

Usage
============

To write Playmaker variable values to Fungus Variables, use the Action Browser > ScriptControl > Write To Fungus command.
To execute a block in a Fungus flowchart from , use the Action Browser > ScriptControl > Playmaker Execute Block command.
To trigger a global state transition in Playmaker from Fungus, use the Playmaker > Global State Transition command.
To read Fungus variable values into Playmaker Variables, use the Action Browser > ScriptControl > Receive Fungus Variable command.
To write Fungus variable values from the inspector into Playmaker global variables, use the Playmaker > Write To Playmaker command.