Warcorrespondents/UserSettings/EditorUserSettings.asset

46 lines
2.0 KiB
Plaintext
Raw Normal View History

2021-07-01 03:08:38 +08:00
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!162 &1
EditorUserSettings:
m_ObjectHideFlags: 0
serializedVersion: 4
m_ConfigSettings:
2021-07-05 23:15:29 +08:00
RecentlyUsedScenePath-0:
value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
flags: 0
2021-08-22 19:31:00 +08:00
RecentlyUsedScenePath-1:
任务:制作引导系统、修复疑难杂症 1.修复开门演出开幕对话出字音效问题 2.修复序章-家中 角色长大后骨骼同时出现两只手的问题 3.修复第一关 无人说话出字音效错误的问题 4.修复了顺序下来导弹下落速度错误的问题 5.增大地雷音量并加入镜头震动以彰显其威力 6.更换任务书美术素材 7.更换密码本美术素材 8.加入移动操作引导 9.加入交互操作引导 10.加入打码操作引导 11.删除了序章打码关中的句子【八路军】 12.替换对话框下一句按钮 13.加入了奔跑操作引导 (*:第二关的炮火已经越来越好了,但是目前只有炮火,晚上肯定也会开枪吧?希望增加一些随机快速闪烁的光源表示晚上的枪。 (*:建议给倒地后的机枪手也加上调查对话 (*:建议更换【序章-家中】的远处的天空,并加上视差 (*:建议增加机枪手处石堆被击动画,可以是抖动,也可以是扬起一些灰尘之类的 xx:人声问题请待定,加上音乐后好像又不是很违和了 (*:碉堡警告音效系统做完了,但是人声感觉上非常奇怪,建议修改 (*:敌人被石头吸引系统实装完成,但是很突兀,建议还是不要出现语言了 接下来的任务: 1.完成按键引导系统 2.更换投掷物堆系统为火堆系统 3.实装第二关最后追逐关卡 4.制作开始界面 5.制作Thanks 4 Play 6.电报系统、打完划掉、显示翻译数字序列
2021-09-13 00:34:06 +08:00
value: 22424703114646680e0b0227036cdacaf990d3ea61ade8e6a9f1d07df7ee3d2cfb
2021-08-14 12:23:34 +08:00
flags: 0
2021-08-22 19:31:00 +08:00
RecentlyUsedScenePath-2:
任务:实装和完善部分音效,修复场景问题 1.修复文字提示在其他幕也会出现的问题 2.给任务书界面加上退出按钮提示 3.减少导弹下落时间,如果太长,会导致玩家被巨石堵住,随后不明不白就被炸死 4.实装首次遇见投掷系统时的按键提示 5.替换第一关的云 6.修复第二关无法和电报机互动的问题 7.增加了第一关云层的视差 8.增加了场景部分美术素材的灰度,营造阴天的感觉 9.增加功能:当玩家走到能互动的东西附近时,头顶飘一个【F/X】的按键提示 10.将修电报线动作的过度做得更加平滑 11.修改碉堡动画,解决一部分子弹的穿模问题 12.将机枪手处的投掷物堆改为火堆 (*做不到让火把跟随手部,果咩QAQ (*:第二关的炮火已经越来越好了,但是目前只有炮火,晚上肯定也会开枪吧?希望增加一些随机快速闪烁的光源表示晚上的枪。 (*:建议把倒地后的机枪手也加上调查对话 xx:人声问题请待定,加上音乐后好像又不是很违和了 (*:碉堡警告音效系统做完了,但是人声感觉上非常奇怪,建议修改 (*:敌人被石头吸引系统实装完成,但是很突兀,建议还是不要出现语言了 (*:建议更换【序章-家中】的远处的天空,并加上视差 (*:建议增加机枪手处石堆被击动画,可以是抖动,也可以是扬起一些灰尘之类的 (*:建议在序章家中第一次与父亲的对话中加入对电报机制的讲解 接下来的任务: 3.实装第二关最后追逐关卡 4.制作开始界面 5.制作Thanks 4 Play 6.电报系统、打完划掉、显示翻译数字序列 7.实装死亡和自动重新开始
2021-09-14 02:01:25 +08:00
value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb
Squashed commit of the following: 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 # Conflicts: # Assets/Prefabs/敌人.meta # Assets/Prefabs/敌人/机枪手.prefab.meta # Assets/Scenes/第二关.unity # Assets/图/动画包2.unitypackage.meta # UserSettings/EditorUserSettings.asset
2021-08-22 19:40:11 +08:00
flags: 0
RecentlyUsedScenePath-3:
任务:制作引导系统、修复疑难杂症 1.修复开门演出开幕对话出字音效问题 2.修复序章-家中 角色长大后骨骼同时出现两只手的问题 3.修复第一关 无人说话出字音效错误的问题 4.修复了顺序下来导弹下落速度错误的问题 5.增大地雷音量并加入镜头震动以彰显其威力 6.更换任务书美术素材 7.更换密码本美术素材 8.加入移动操作引导 9.加入交互操作引导 10.加入打码操作引导 11.删除了序章打码关中的句子【八路军】 12.替换对话框下一句按钮 13.加入了奔跑操作引导 (*:第二关的炮火已经越来越好了,但是目前只有炮火,晚上肯定也会开枪吧?希望增加一些随机快速闪烁的光源表示晚上的枪。 (*:建议给倒地后的机枪手也加上调查对话 (*:建议更换【序章-家中】的远处的天空,并加上视差 (*:建议增加机枪手处石堆被击动画,可以是抖动,也可以是扬起一些灰尘之类的 xx:人声问题请待定,加上音乐后好像又不是很违和了 (*:碉堡警告音效系统做完了,但是人声感觉上非常奇怪,建议修改 (*:敌人被石头吸引系统实装完成,但是很突兀,建议还是不要出现语言了 接下来的任务: 1.完成按键引导系统 2.更换投掷物堆系统为火堆系统 3.实装第二关最后追逐关卡 4.制作开始界面 5.制作Thanks 4 Play 6.电报系统、打完划掉、显示翻译数字序列
2021-09-13 00:34:06 +08:00
value: 22424703114646680e0b0227036cd8dcda93c0caa9cdf57e38271427fb
Squashed commit of the following: 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 # Conflicts: # Assets/Prefabs/敌人.meta # Assets/Prefabs/敌人/机枪手.prefab.meta # Assets/Scenes/第二关.unity # Assets/图/动画包2.unitypackage.meta # UserSettings/EditorUserSettings.asset
2021-08-22 19:40:11 +08:00
flags: 0
RecentlyUsedScenePath-4:
任务:实装和完善部分音效,修复场景问题 1.修复文字提示在其他幕也会出现的问题 2.给任务书界面加上退出按钮提示 3.减少导弹下落时间,如果太长,会导致玩家被巨石堵住,随后不明不白就被炸死 4.实装首次遇见投掷系统时的按键提示 5.替换第一关的云 6.修复第二关无法和电报机互动的问题 7.增加了第一关云层的视差 8.增加了场景部分美术素材的灰度,营造阴天的感觉 9.增加功能:当玩家走到能互动的东西附近时,头顶飘一个【F/X】的按键提示 10.将修电报线动作的过度做得更加平滑 11.修改碉堡动画,解决一部分子弹的穿模问题 12.将机枪手处的投掷物堆改为火堆 (*做不到让火把跟随手部,果咩QAQ (*:第二关的炮火已经越来越好了,但是目前只有炮火,晚上肯定也会开枪吧?希望增加一些随机快速闪烁的光源表示晚上的枪。 (*:建议把倒地后的机枪手也加上调查对话 xx:人声问题请待定,加上音乐后好像又不是很违和了 (*:碉堡警告音效系统做完了,但是人声感觉上非常奇怪,建议修改 (*:敌人被石头吸引系统实装完成,但是很突兀,建议还是不要出现语言了 (*:建议更换【序章-家中】的远处的天空,并加上视差 (*:建议增加机枪手处石堆被击动画,可以是抖动,也可以是扬起一些灰尘之类的 (*:建议在序章家中第一次与父亲的对话中加入对电报机制的讲解 接下来的任务: 3.实装第二关最后追逐关卡 4.制作开始界面 5.制作Thanks 4 Play 6.电报系统、打完划掉、显示翻译数字序列 7.实装死亡和自动重新开始
2021-09-14 02:01:25 +08:00
value: 22424703114646680e0b0227036cd8dcda93c2c6a9cdf57e38271427fb
Squashed commit of the following: 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 # Conflicts: # Assets/Prefabs/敌人.meta # Assets/Prefabs/敌人/机枪手.prefab.meta # Assets/Scenes/第二关.unity # Assets/图/动画包2.unitypackage.meta # UserSettings/EditorUserSettings.asset
2021-08-22 19:40:11 +08:00
flags: 0
UnityEditor.ShaderGraph.Blackboard:
value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4bae495d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd898d91f0beb6fdd1cbfceba0b9f0b3bed8e8f5ace1ff8c978883d3f59e98969989eacfcc
Squashed commit of the following: 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 # Conflicts: # Assets/Prefabs/敌人.meta # Assets/Prefabs/敌人/机枪手.prefab.meta # Assets/Scenes/第二关.unity # Assets/图/动画包2.unitypackage.meta # UserSettings/EditorUserSettings.asset
2021-08-22 19:40:11 +08:00
flags: 0
UnityEditor.ShaderGraph.FloatingWindowsLayout2:
value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b98d9884a69ae6d8f0d1cda9e8fbfefaf9f9dea3fdb9ade882f0f7b0e1e380cafbf2c3adc18e9cd285a2908b82ec869c8395949c9483d68a8e97ddbd90bf
flags: 0
UnityEditor.ShaderGraph.InspectorWindow:
value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a5602b2e2c07a37e0901373ae01e0008f707250d171df81a53a5485d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd80908fecb0f9cfddf1eff4e7a1b1eae482f0fcaee1e1928b86d888ed969b938797a7cf
Squashed commit of the following: 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 # Conflicts: # Assets/Prefabs/敌人.meta # Assets/Prefabs/敌人/机枪手.prefab.meta # Assets/Scenes/第二关.unity # Assets/图/动画包2.unitypackage.meta # UserSettings/EditorUserSettings.asset
2021-08-22 19:40:11 +08:00
flags: 0
2021-07-01 03:08:38 +08:00
vcSharedLogLevel:
value: 0d5e400f0650
flags: 0
m_VCAutomaticAdd: 1
m_VCDebugCom: 0
m_VCDebugCmd: 0
m_VCDebugOut: 0
m_SemanticMergeMode: 2
m_VCShowFailedCheckout: 1
m_VCOverwriteFailedCheckoutAssets: 1
m_VCProjectOverlayIcons: 1
m_VCHierarchyOverlayIcons: 1
m_VCOtherOverlayIcons: 1
m_VCAllowAsyncUpdate: 1