Commit Graph
137 Commits
Author SHA1 Message Date
dingyuntian a41b4b85b9 Merge branch '卓亚0904' into 'develop'
第二天任务和书本接入,视觉表现修复

See merge request aibis-dream/aibis-dream!19
2024-09-05 17:37:36 +00:00
dingyuntian 7897d8a9a7 Merge branch 'develop' into '卓亚0904'
# Conflicts:
#   Assets/Resources/Yarn/PeipeiTalk2/PeipeiTalk2.yarn
2024-09-05 17:37:27 +00:00
dingyuntian 8fa32153fc Merge branch 'feature/9.5春晖开发' into 'develop'
修补缺漏

See merge request aibis-dream/aibis-dream!20
2024-09-05 17:19:34 +00:00
bottlefish 1c88b3eeae 修补缺漏
记忆图片替换
调整task层级
2024-09-06 01:14:15 +08:00
G0Done 974eb30a1a 第二天任务和书本接入,视觉表现修复
存在两个问题:1、在视觉内会看到任务栏;2、撬棍没有能吸附的地方
2024-09-06 00:48:45 +08:00
bottlefish 6d1ad2f3d3 完成colorview的状态初始化 2024-09-05 17:48:14 +08:00
bottlefish fcefe74152 调整book为全局,调整task的自适应,peipeitalk1变量改名 2024-09-05 17:43:53 +08:00
bottlefish 8e898820a5 将变量修改为局部的 2024-09-05 13:01:56 +08:00
bottlefish d8c6bf4333 配置场景talkso 2024-09-05 11:12:52 +08:00
dingyuntian dc398db6ed Update Persistence.unity 2024-09-05 03:01:47 +08:00
dingyuntian bdadfff1d2 Merge branch 'Bugfix/Peipeitalk' into 'develop'
修复PeipeiTalk2的问题

See merge request aibis-dream/aibis-dream!16
2024-09-04 18:52:27 +00:00
dingyuntian a1e932b917 Merge branch 'feature/character-config' into 'develop'
fade问题修改

See merge request aibis-dream/aibis-dream!17
2024-09-04 18:52:17 +00:00
bottlefish 3733dd6741 修复PeipeiTalk2的问题 2024-09-05 02:48:49 +08:00
dingyuntian 31a436a932 fade问题修改 2024-09-05 02:44:23 +08:00
dingyuntian 9c2f1c1615 Merge branch '卓亚0904' into 'develop'
去除DAY1尝试停止想象颜色的逻辑-from卓亚0904

See merge request aibis-dream/aibis-dream!15
2024-09-04 18:25:43 +00:00
G0Done 772fd0bf4c Merge branch '卓亚0904' of http://114.67.212.218:8011/aibis-dream/aibis-dream into 卓亚0904 2024-09-05 02:19:00 +08:00
G0Done bccfcd56b9 去除想象部分流程 2024-09-05 02:17:56 +08:00
dingyuntian fabbdb6b6d Merge branch '卓亚0904' into 'develop'
DAY1脚本配置,书籍图片,以及书籍在scene中的配置-from卓亚0904

See merge request aibis-dream/aibis-dream!14
2024-09-04 18:04:19 +00:00
dingyuntian 4cc3c0b39b Merge branch 'develop' into '卓亚0904'
# Conflicts:
#   Assets/Resources/Yarn/PeipeiTalk/PeipeiTalk1.yarn
2024-09-04 18:03:46 +00:00
G0Done 3aa9c537b7 修复eyemanager的问题 2024-09-05 01:50:36 +08:00
dingyuntian 32ef68687c Merge branch 'feature/character-config' into 'develop'
打包问题修改

See merge request aibis-dream/aibis-dream!13
2024-09-04 17:48:20 +00:00
G0Done 81f18b1d53 DAY1任务和书本配置 2024-09-05 01:45:47 +08:00
dingyuntian 5e34c61f3d 打包问题修改 2024-09-05 01:45:17 +08:00
dingyuntian 5310fd35a6 Merge branch '子钦0904' into 'develop'
更新DAY2,把DAY1的尝试停止想象挪到DAY2

See merge request aibis-dream/aibis-dream!12
2024-09-04 17:44:33 +00:00
dingyuntian dbe41c4829 Merge branch 'develop' into '子钦0904'
# Conflicts:
#   Assets/Resources/Yarn/PeipeiTalk/PeipeiTalk1.yarn
#   Assets/Resources/Yarn/PeipeiTalk2/PeipeiTalk2.yarn
2024-09-04 17:43:48 +00:00
Ovid 76236f591d 更新DAY2,把DAY1的尝试停止想象挪到DAY2
更新DAY2,把DAY1的尝试停止想象挪到DAY2
2024-09-05 01:36:59 +08:00
G0Done adbe7be87b Merge branch 'develop' into 卓亚0904 2024-09-05 00:52:07 +08:00
G0Done f308a9d61e 佩佩第一天功能内容调整 2024-09-05 00:51:01 +08:00
G0Done fac974e396 新增书籍的图片 2024-09-05 00:50:50 +08:00
dingyuntian 7e701b679b Merge branch 'feature/春晖9.4' into 'develop'
Feature/春晖9.4

See merge request aibis-dream/aibis-dream!11
2024-09-04 16:10:58 +00:00
bottlefish 2c2f27be88 新增task 2024-09-05 00:05:45 +08:00
bottlefish c2e31bd855 对各个脚本的色觉模块状态进行初始化 2024-09-04 17:06:53 +08:00
bottlefish f8028d9586 每次进入视图的时候初始化 2024-09-04 17:01:00 +08:00
dingyuntian 95418ec556 Merge branch 'feature/春晖9.3' into 'develop'
修复部分问题

See merge request aibis-dream/aibis-dream!10
2024-09-04 08:50:45 +00:00
bottlefish 8c094522fe 分离了设置颜色状态,设置目标和上色褪色,现在用起来最繁琐,但是最自由
给各个脚本把眼睛相关的控制都调了,加上了佩佩入场
2024-09-04 16:41:52 +08:00
bottlefish 91e84d53c2 修复部分问题
修改UF绘图的位置
修复第一次拿起来plug不顺畅的问题(取消了visual的raycast)
增加角色进入的示例
2024-09-04 13:43:55 +08:00
bottlefish 510d099410 调整了下导入分辨率,修复了下peipeitalk2的一个错误 2024-09-04 12:16:47 +08:00
bottlefish e89e116e2f 替换了UF模块和主场景的美术表现 2024-09-04 11:05:07 +08:00
bottlefish 7484455506 替换佩佩视觉场景 2024-09-03 23:40:24 +08:00
dingyuntian c1a0b89b39 Merge branch '春晖开发9.3' into 'develop'
春晖开发9.3

See merge request aibis-dream/aibis-dream!9
2024-09-03 12:00:02 +00:00
bottlefish b330be6118 修复脚本错误,将做好的核心表现加入
修改了更改饱和度的方法并加入脚本
修正了进入记忆视图时候的错误
增加了头部移动时线和插头的跟随
降低了记忆搜寻的时间
去掉了诊所场景固定的人物
2024-09-03 19:51:33 +08:00
dingyuntian c2ec66572c Merge branch 'feature/base' into 'develop'
Yarn文本更新

See merge request aibis-dream/aibis-dream!8
2024-09-02 17:54:51 +00:00
dingyuntian b6d54d5f04 yarn合并完成版 2024-09-03 01:49:57 +08:00
bottlefish 1413b434d9 Merge branch '佩佩功能流程分支' into develop 2024-09-02 23:16:15 +08:00
bottlefish b656f9a503 加入视觉修改时记忆的表现 2024-09-02 23:14:51 +08:00
dingyuntian e2b5c311a4 Merge branch 'feature/red-screen' into 'develop'
打包功能

See merge request aibis-dream/aibis-dream!7
2024-09-02 15:03:53 +00:00
dingyuntian 8d4b2895e0 打包功能 2024-09-02 23:02:16 +08:00
bottlefish 3fcefae065 增加褪色,震动等效果
处理各种屏幕效果
2024-09-02 22:12:48 +08:00
bottlefish 2491378506 新加入一些屏幕效果的脚本 2024-09-02 20:37:12 +08:00
bottlefish 41df565c03 修改messagebox显示
另外修改了一些因为之前愚蠢的方案而导致的bug
2024-09-02 18:40:56 +08:00