Squashed commit of the following:

commit 6cd35e51c4a8a4ccf91902659d62c9e843b52aea
Author: SAIPO <grasste0403@hotmail.com>
Date:   Sun Aug 29 18:53:40 2021 +0800

    *.合并了分支
    1.完善了场景的图层分配（请不要都放一个图层，然后搞一堆Layer编号好嘛）
    2.修改了玩家家中的右侧煤油灯光照范围的影响
    3.增加了电火花的粒子Shader
    4.修改了修理电线的代码文件，使修好电线后关闭电火花粒子Shader

commit 9f1096345c72aeb1b061602f35fdcd661ad19cf1
Author: SAIPO <grasste0403@hotmail.com>
Date:   Sat Aug 28 18:21:24 2021 +0800

    1.更新了序章的战场场景中的Shader
    2.更新了序章的战场场景中的两个粒子发射器，以此来模拟连续的硝烟
    3.在第一关加入了氛围Shader

commit b2873f763f3f7bf7166ed59bef89e4c6e8eec2b7
Author: SAIPO <grasste0403@hotmail.com>
Date:   Sat Aug 28 17:14:01 2021 +0800

    8.28合并

commit 1c453c2d30b5ac284655a5b41ca5f7d093b2f551
Author: SAIPO <grasste0403@hotmail.com>
Date:   Sat Aug 28 01:26:21 2021 +0800

    合并分支

commit 56a429d1e91e26443dfedc470266b21f3946b73c
Author: SAIPO <grasste0403@hotmail.com>
Date:   Sat Aug 28 00:52:22 2021 +0800

    1

commit 2d1710636db7d3cb4b12bba59fbd8340d5b44768
Author: SAIPO <grasste0403@hotmail.com>
Date:   Tue Aug 24 16:20:17 2021 +0800

    增加窗外月光效果

commit de523e20ce8c91c28b583152e42dccac4ecf93c6
Author: SAIPO <grasste0403@hotmail.com>
Date:   Tue Aug 24 16:16:37 2021 +0800

    1.修改了序章场景的主Shader 营造了被煤油灯照亮的效果
    2.增加了一盏煤油灯在桌子上，充当左方间的光源
    3.修改了煤油灯的Shader设置，使其更加真实

commit 4a7127e2049cdec0dfa946f099fdc068b4c207bd
Author: SAIPO <grasste0403@hotmail.com>
Date:   Tue Aug 24 12:20:35 2021 +0800

    8.24更新了探照灯动画

commit 3945138928aff5734004b5b5e67aeaefa588d112
Author: SAIPO <grasste0403@hotmail.com>
Date:   Tue Aug 24 11:18:12 2021 +0800

    8.24合并分支

commit 2eadf268864bf27cd68e45b9406be9695b77871a
Author: SAIPO <grasste0403@hotmail.com>
Date:   Tue Aug 24 11:08:15 2021 +0800

    1

commit 4e1d9fbdc15bd87e07144fd97e11874874b6108e
Author: SAIPO <grasste0403@hotmail.com>
Date:   Sun Aug 22 17:06:39 2021 +0800

    提交了夜晚效果Shader和探照灯光源

commit f1069605a261b80f75ad1b27b99c5b66c807fc8c
Author: SAIPO <grasste0403@hotmail.com>
Date:   Sun Aug 22 14:34:46 2021 +0800

    1

commit e2d0423a3b93373ffcd5b9656568715d975077ce
Merge: ca4294b 35d0d80
Author: SAIPO <grasste0403@hotmail.com>
Date:   Sat Aug 14 07:57:06 2021 +0800

    1

commit ca4294b0bf0a685874be344dbeaa22905f0247b0
Author: SAIPO <grasste0403@hotmail.com>
Date:   Sat Aug 14 07:43:34 2021 +0800

    1.完善了对话内容，使对话内容更加口语化和方言化。
    2.添加了Shader的框架（与屏幕后特效相关）
     1）加入了LightController的代码文件，主要控制烛光等灯光的空气扰动现象
     2）加入了VolumeController的代码文件，主要与屏幕后特效的控制变量相关
     3）在场景中加入了Volume的对象，控制屏幕后特效Shader的运行
    3.挪动了场景中煤油灯的位置，并且为煤油灯添加了会产生空气扰动使光范围发生变化的功能
    4.为测试场景中的镜子添加了临时提示光边Shader

commit 0e3f372bcfe4695fe4bbe0e1e829bca2a8bb8ebf
Author: SAIPO <grasste0403@hotmail.com>
Date:   Sat Aug 14 04:44:23 2021 +0800

    1

commit 35d0d808083b71b86483a46024610dc17111d43b
Merge: c8c9c89 bfe6054
Author: Roman <1325980292@qq.com>
Date:   Sat Aug 14 01:43:42 2021 +0800

    详情见最新RomanVersion
    Merge Request: 详情见最新RomanVersion

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

commit c8c9c895f8aa5f914d4384524dbeedc9d364cecc
Merge: 717b2a1 e28e55e
Author: Roman <1325980292@qq.com>
Date:   Fri Aug 13 00:32:23 2021 +0800

    详情见最新RomanVersion
    Merge Request: 详情见最新RomanVersion

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

commit 717b2a11cc04dfa3d34650026dc9a0bcd99d450b
Merge: a01fcd5 dc14472
Author: Roman <1325980292@qq.com>
Date:   Thu Aug 12 00:54:29 2021 +0800

    详情见最新RomanVersion
    Merge Request: 详情见最新RomanVersion

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

commit a01fcd5c0b85c58193efec4715a7d7280544de63
Merge: 454b038 c9a4456
Author: Roman <1325980292@qq.com>
Date:   Wed Aug 11 02:18:50 2021 +0800

    详情见最新RomanVersion
    Merge Request: 详情见最新RomanVersion

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

commit 454b038d552cf0ab296b2a6461f964de41ac498f
Merge: 2781f7f cc0ed5b
Author: Roman <1325980292@qq.com>
Date:   Wed Aug 11 00:08:10 2021 +0800

    详情见最新RomanVersion
    Merge Request: 详情见最新RomanVersion

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

commit dac3a2a444a88c074f17f22137e978186aad34da
Author: SAIPO <grasste0403@hotmail.com>
Date:   Mon Aug 9 23:45:01 2021 +0800

    Squashed commit of the following:

    commit 2781f7f874d8b595397c9bc5108186d845fe6bb0
    Merge: 2faf844 b262e57
    Author: Roman <1325980292@qq.com>
    Date:   Mon Aug 9 23:15:43 2021 +0800

        详情见最新RomanVers
        Merge Request: ？

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

    commit b262e579b24c8ffba6f08a5b79b9577b6d850d8b
    Author: Roman <1325980292@qq.com>
    Date:   Mon Aug 9 23:14:55 2021 +0800

        任务：以动画实现移动
        *：实验场景：【各种系统测试与陈列】

        1.创建测试小孩游戏物体
        2.创建新的AC
        3.编写步行动画逻辑
        *：遇到问题，动画似乎不行，移动方式暂时换回原来的。
        *：其余场景没有受到影响

    commit 2faf844f461da8740a63e25413657b264e4eec22
    Merge: 7749e35 0bc1c97
    Author: Roman <1325980292@qq.com>
    Date:   Mon Aug 9 21:24:20 2021 +0800

        合并了麒哥的动画包2
        Merge Request: ？？

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

    commit 0bc1c970e5ec4d993a0c81c7149901408664df76
    Author: Roman <1325980292@qq.com>
    Date:   Mon Aug 9 21:23:33 2021 +0800

        合并了麒哥的动画包2

    commit 7749e35c85f697a28234892cef01b369ef1b8c9c
    Merge: a4d3c53 9b7dbdf
    Author: Roman <1325980292@qq.com>
    Date:   Sat Aug 7 01:32:57 2021 +0800

        详情见RomanVersion最新提交

    commit 9b7dbdf941327c1c891d19e82dc0460abfdb39c4
    Author: Roman <1325980292@qq.com>
    Date:   Sat Aug 7 01:31:29 2021 +0800

        任务：搭建“序章-战场”的整体流程框架
        1.创建可交互电报机这个逻辑物体
        *.在所有脚本首行添加说明方便查看
        2.编写假电报机类，因为这个电报机没有电报机功能，而是一个类似事件的物体。
        3.使假电报机可以分清场景中电话线断裂和修复的情况，并对其做出不同反应。
        4.没修完电报机的反馈等待策划，修完了的等待我明天编写场景的多态系统
        5.均通过了程序简单测试，请各位尽快拉取寻找问题

        下班，别摸了，兄弟们

    commit a4d3c53f64887ad36dd7cdfce6ca8dda59471e8f
    Merge: 2dd6b3a b1dc321
    Author: Roman <1325980292@qq.com>
    Date:   Mon Jul 26 19:31:18 2021 +0800

        傻逼coding，草你妈
        Merge Request: 傻逼coding，草你妈

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

    commit b1dc32196aedf51326078a004361078fde8589ca
    Author: Roman <1325980292@qq.com>
    Date:   Mon Jul 26 19:30:24 2021 +0800

        傻逼coding

    commit d816886a9d13de83ff96d0e96358433b95dbcc17
    Author: Roman <1325980292@qq.com>
    Date:   Mon Jul 26 19:28:51 2021 +0800

        ？

    commit 86f446eb05a5150a3933f47f77c28099179a7291
    Author: Roman <1325980292@qq.com>
    Date:   Mon Jul 26 19:26:14 2021 +0800

        测试

    # Conflicts:
    #	UserSettings/EditorUserSettings.asset

commit 2781f7f874d8b595397c9bc5108186d845fe6bb0
Merge: 2faf844 b262e57
Author: Roman <1325980292@qq.com>
Date:   Mon Aug 9 23:15:43 2021 +0800

    详情见最新RomanVers
    Merge Request: ？

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

commit 2faf844f461da8740a63e25413657b264e4eec22
Merge: 7749e35 0bc1c97
Author: Roman <1325980292@qq.com>
Date:   Mon Aug 9 21:24:20 2021 +0800

    合并了麒哥的动画包2
    Merge Request: ？？

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

commit 7749e35c85f697a28234892cef01b369ef1b8c9c
Merge: a4d3c53 9b7dbdf
Author: Roman <1325980292@qq.com>
Date:   Sat Aug 7 01:32:57 2021 +0800

    详情见RomanVersion最新提交

commit a4d3c53f64887ad36dd7cdfce6ca8dda59471e8f
Merge: 2dd6b3a b1dc321
Author: Roman <1325980292@qq.com>
Date:   Mon Jul 26 19:31:18 2021 +0800

    傻逼coding，草你妈
    Merge Request: 傻逼coding，草你妈

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

commit 86fc77f246a3d1b76e7ee01539203659b60d4cdd
Author: SAIPO <grasste0403@hotmail.com>
Date:   Mon Jul 26 19:02:49 2021 +0800

    修改bug
This commit is contained in:
Roman
2021-08-29 22:25:24 +08:00
parent 6c60eb109b
commit 5b661c128a
Squashed commit of the following:

Diff Content Not Available
