Squashed commit of the following:

commit 5d812753da2f9af3c5b8640dd11b561df5989be2
Merge: ccdd7a0 ab8a4c2
Author: Roman <1325980292@qq.com>
Date:   Sun Jul 25 00:01:19 2021 +0800

    自动解决冲突
    改他妈的批

commit ab8a4c2dd7eed5b8e9c72bc69ea8b4cb925218e6
Merge: 7143da0 d3f9ad1
Author: SAIPO <grasste0403@hotmail.com>
Date:   Sat Jul 24 08:29:18 2021 +0800

    Accept Merge Request #47: (SaipoVersion -> master)
    Merge Request: 2021.7.24合并

    Created By: @SAIPO
    Accepted By: @SAIPO
    URL: https://gensokyogroup.coding.net/p/RedGame/d/Warcorrespondents/git/merge/47

commit d3f9ad1a5cddf188ce9712d34f38824e0c8a7b94
Author: SAIPO <grasste0403@hotmail.com>
Date:   Sat Jul 24 08:26:28 2021 +0800

    1.增加了老爹的回忆场景，但是人物还没有加入移动，我不大会使呜呜。
    2.增加了视觉差parallax的代码，并在第一个场景的背景加入了视差。
    3.第一个场景的可交互物品加入了提示灯光（暂定效果）
    4.战场加入了硝烟粒子特效

commit 7143da089892804b035ba29538cedcb63d5ed56d
Merge: 3acde21 65f88fd
Author: Roman <1325980292@qq.com>
Date:   Sat Jul 24 00:37:00 2021 +0800

    Accept Merge Request #46: (RomanVersion -> master)
    Merge Request: 试图消除缺少的提交

    Created By: @Roman
    Accepted By: @Roman
    URL: https://gensokyogroup.coding.net/p/RedGame/d/Warcorrespondents/git/merge/46

commit 3acde21796f2c88004622004861bb7a1cf270ce5
Merge: 1555869 f5f01f4
Author: Roman <1325980292@qq.com>
Date:   Sat Jul 24 00:32:50 2021 +0800

    Accept Merge Request #45: (RomanVersion -> master)
    Merge Request: 详情见RomanVersion最新提交

    Created By: @Roman
    Accepted By: @Roman
    URL: https://gensokyogroup.coding.net/p/RedGame/d/Warcorrespondents/git/merge/45

commit 155586911671e10c0f227fadd163f6eeab840b1f
Merge: 2ed4c0d fb66487
Author: Roman <1325980292@qq.com>
Date:   Fri Jul 23 01:22:24 2021 +0800

    Accept Merge Request #44: (RomanVersion -> master)
    Merge Request: 基本完成投掷框架

    Created By: @Roman
    Accepted By: @Roman
    URL: https://gensokyogroup.coding.net/p/RedGame/d/Warcorrespondents/git/merge/44

commit 2ed4c0d161bbb12fd98aa1d7d369d2ba97a52d92
Merge: de8b0b7 40fabec
Author: Roman <1325980292@qq.com>
Date:   Tue Jul 20 00:36:16 2021 +0800

    Accept Merge Request #42: (RomanVersion -> master)
    1.基本完成了句子系统
    2.合理化了场景物体分层结构

commit de8b0b745393539c01ea98527475a09bcdb26af3
Merge: 87be157 e6f51b1
Author: Roman <1325980292@qq.com>
Date:   Sun Jul 18 23:59:59 2021 +0800

    Accept Merge Request #32: (RomanVersion -> master)
    详情见RomanVersion的最新提交

# Conflicts:
#	UserSettings/EditorUserSettings.asset

Assets/Fungus/Integrations/Playmaker/Fungus-PlayMaker.unitypackage.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 81dbcde0f90df4e9ba9ca2794490e57a
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Fungus/Integrations/Spine/Fungus-Spine.unitypackage.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: fd02c799f3f5c4c83b2fc26c105a3821
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat

@@ -44,6 +44,10 @@ Material:
     - WaveIntensity_2: 1
     - WaveSpread_Value: 0
     m_Colors:
+<<<<<<< HEAD
     - Center: {r: -0.8587479, g: 0.28933427, b: 0, a: 0}
+=======
+    - Center: {r: -0.5109203, g: 0.27735838, b: 0, a: 0}
+>>>>>>> ab8a4c2dd7eed5b8e9c72bc69ea8b4cb925218e6
     - Vector2_d2d098295fc146f08b921b231b2e5199: {r: 1.6, g: 0.9, b: 0, a: 0}
   m_BuildTextureStacks: []