saipo/Warcorrespondents
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
79 Commits 3 Branches 0 Tags
Commit Graph

79 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SAIPO
7115ebf6e7 Accept Merge Request #51: (SaipoVersion -> master) 
Merge Request: 上传修改

Created By: @SAIPO
Accepted By: @SAIPO
URL: https://gensokyogroup.coding.net/p/RedGame/d/Warcorrespondents/git/merge/51
 2021-07-26 05:08:47 +08:00
SAIPO
68e2b26553 1.加入了战场场景的硝烟感和回忆感的shader 
使用方式：更改shader/回忆/Dream 材质里的参数即可调节屏幕Shader强度
2.完善了家中场景的水缸和与父亲对话的内容
 2021-07-26 05:07:14 +08:00
SAIPO
d6b78ec9d1 Merge branch 'master' into SaipoVersion 2021-07-26 02:57:28 +08:00
SAIPO
f33059f896 Merge branch 'master' of https://e.coding.net/gensokyogroup/RedGame/Warcorrespondents 2021-07-26 02:57:00 +08:00
Roman
f8cddd247c Accept Merge Request #50: (RomanVersion -> master) 
Merge Request: 合就完了

Created By: @Roman
Accepted By: @Roman
URL: https://gensokyogroup.coding.net/p/RedGame/d/Warcorrespondents/git/merge/50
 2021-07-26 01:00:25 +08:00
Roman
731c080a0c 1.完成序章的流程化 
a.新建场景：“各种系统测试与陈列”，用来保存、测试和开发游戏的各种系统。
  b.修改场景“序章-家中”，使其变为可以游玩的流程化状态
    1.删除此场景不需要的游戏物体
    2.调整相机的可移动范围
    3.修改了“地面”的碰撞盒至合理
    4.修改了“水缸”的碰撞盒至合理
    5.修改了“电报机”的碰撞盒至合理
    6.给“远处”添加了视差运动组件
  c.添加对话“当完成父亲的电码后”
  d.完成对话“当完成父亲的电码后”后，载入战场场景
 2021-07-26 00:59:03 +08:00
SAIPO
aaee45fe19 同步master 2021-07-25 23:47:57 +08:00
SAIPO
ea2126dbdd Merge branch 'master' of https://e.coding.net/gensokyogroup/RedGame/Warcorrespondents 2021-07-25 23:42:39 +08:00
SAIPO
a647337758 update 2021-07-25 23:41:30 +08:00
Roman
0c7f53cc79 Accept Merge Request #49: (RomanVersion -> master) 
？傻逼coding
 2021-07-25 20:16:31 +08:00
Roman
fd3fd4a1a5 ？ 2021-07-25 20:13:30 +08:00
Roman
b45611b41d Merge branch 'RomanVersion' of https://e.coding.net/gensokyogroup/RedGame/Warcorrespondents into RomanVersion 
# Conflicts:
#	UserSettings/EditorUserSettings.asset
 2021-07-25 01:05:39 +08:00
Roman
5bb8086078 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
 2021-07-25 01:05:07 +08:00
Roman
96ab2dd61b ？？ 2021-07-25 00:59:49 +08:00
Roman
5d812753da 自动解决冲突 
改他妈的批
 2021-07-25 00:01:19 +08:00
Roman
ccdd7a0d68 1.优化项目结构 
2.删除没用的场景
3.将各种系统都保存为预制体
4.分好了场景内的游戏物体分级
 2021-07-24 23:57:48 +08:00
SAIPO
ab8a4c2dd7 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
 2021-07-24 08:29:18 +08:00
SAIPO
d3f9ad1a5c 1.增加了老爹的回忆场景，但是人物还没有加入移动，我不大会使呜呜。 
2.增加了视觉差parallax的代码，并在第一个场景的背景加入了视差。
3.第一个场景的可交互物品加入了提示灯光（暂定效果）
4.战场加入了硝烟粒子特效
 2021-07-24 08:26:28 +08:00
SAIPO
7f64187c3a 1 2021-07-24 08:00:40 +08:00
Roman
7143da0898 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
 2021-07-24 00:37:00 +08:00
Roman
65f88fd984 Squashed commit of the following: 
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的最新提交
 2021-07-24 00:36:10 +08:00
Roman
3acde21796 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
 2021-07-24 00:32:50 +08:00
Roman
f5f01f4fad 1.修改了脚本目录，使得脚本分类合理 
2.完成投掷系统
3.完成抛物线绘制系统
4.完成地雷的触发和销毁系统
 2021-07-24 00:31:11 +08:00
Roman
1555869116 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
 2021-07-23 01:22:24 +08:00
Roman
fb66487ff4 1.基本完成了投掷框架 
2.明天写画抛物线
 2021-07-23 01:21:25 +08:00
Roman
2ed4c0d161 Accept Merge Request #42: (RomanVersion -> master) 
1.基本完成了句子系统
2.合理化了场景物体分层结构
 2021-07-20 00:36:16 +08:00
Roman
40fabeca5e 1.基本完成了句子系统 
2.合理化了场景物体分层结构
 2021-07-20 00:35:19 +08:00
Roman
de8b0b7453 Accept Merge Request #32: (RomanVersion -> master) 
详情见RomanVersion的最新提交
 2021-07-18 23:59:59 +08:00
Roman
e6f51b11d9 1.更改和完善了打电码系统，目前是5码一数字，。-。-。代表全部清除。 
2.完成了电码的句子系统和输入完成检测系统。
3.初步攥写了事件系统，目前可以自定义事件。目前已经开始写的事件是打完父亲的电码的事件。
 2021-07-18 23:58:09 +08:00
Roman
87be157084 Accept Merge Request #31: (RomanVersion -> master) 
1.备份合并
 2021-07-11 23:05:17 +08:00
Roman
60879e1a68 1.我需要拆机清理机器内部，故上传此版本，内容有一些蜜汁更改，具体内容我忘了 2021-07-11 23:04:26 +08:00
Roman
c72ea1ac8c Accept Merge Request #30: (RomanVersion -> master) 
Merge Request: 合并SaipoVersion

Created By: @Roman
Accepted By: @Roman
URL: https://gensokyogroup.coding.net/p/RedGame/d/Warcorrespondents/git/merge/30
 2021-07-08 23:10:16 +08:00
Roman
befe4a08a5 1.合并了SaipoVersion 2021-07-08 23:09:12 +08:00
SAIPO
91b1a60e79 删除 .idea.wuqiang 2021-07-08 23:03:54 +08:00
SAIPO
d528d8949e Accept Merge Request #29: (SaipoVersion -> master) 
Merge Request: 添加了一系列shader

Created By: @SAIPO
Accepted By: @SAIPO
URL: https://gensokyogroup.coding.net/p/RedGame/d/Warcorrespondents/git/merge/29
 2021-07-08 23:02:30 +08:00
SAIPO
1aac374103 1.添加了一系列shader 
a.镜面反射
   b.水面反射
   c.炸弹冲击波
 2021-07-08 22:58:46 +08:00
SAIPO
9a601e72b5 1 2021-07-08 21:02:05 +08:00
SAIPO
5f2569b96b 1 2021-07-08 21:00:26 +08:00
Roman
bbbce686ed Accept Merge Request #28: (RomanVersion -> master) 
Merge Request: 1.添加轰炸功能

Created By: @Roman
Accepted By: @Roman
URL: https://gensokyogroup.coding.net/p/RedGame/d/Warcorrespondents/git/merge/28
 2021-07-08 19:53:27 +08:00
Roman
847dbe100c 1.添加轰炸功能 2021-07-08 19:52:46 +08:00
Roman
51182131c1 Accept Merge Request #27: (RomanVersion -> master) 
7.8 更改
 2021-07-08 00:11:24 +08:00
Roman
d498e5cc11 1.完善了场景内交互物品 
2.添加了父子对话，其后的事件还需要后续攥写
3.需要添加Stage演出来增强对话的效果。明天再研究。
 2021-07-08 00:10:32 +08:00
Roman
dbfebc1d2f 1.引入了cinemaMachine包 
2.设置好了虚拟相机
3.完成了场景图片的切换
 2021-07-07 11:00:08 +08:00
Roman
a13eda5e9d Accept Merge Request #22: (RomanVersion -> master) 
Merge Request: Romen最新操作

Created By: @Roman
Accepted By: @Roman
URL: https://gensokyogroup.coding.net/p/RedGame/d/Warcorrespondents/git/merge/22
 2021-07-07 00:33:54 +08:00
Roman
78c7a17509 1.我修改了Fungus内部脚本，使得游戏可以监听手柄按键A或者键盘J键来经行下一句。 
2.我发现了Fungus的外部接入接口，使得我可以自定义对话结束后的操作。位置在Block内部
 2021-07-07 00:33:07 +08:00
Roman
8c457c2d03 Accept Merge Request #11: (RomanVersion -> master) 
Merge Request: 1.合并test

Created By: @Roman
Accepted By: @Roman
URL: https://gensokyogroup.coding.net/p/RedGame/d/Warcorrespondents/git/merge/11
 2021-07-06 08:36:32 +08:00
Roman
9f8a25379e 1.合并test 2021-07-06 08:34:08 +08:00
Roman
10dd184e01 1.合并后test 2021-07-06 00:01:37 +08:00
SAIPO
c9c9095ed3 1 2021-07-05 23:17:05 +08:00
SAIPO
e7570096f0 加入了镜面与水面的Shader 2021-07-05 23:15:29 +08:00