tinbird/aibis-dream
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,351 Commits 21 Branches 14 Tags
a9d05f69fb9a4c4a68be0a1b0fda2c64d94de4b8
Commit Graph
1351 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
jiangzhuoya 4df7e5ecf6 D3任务、书籍接入，颜色消失的节奏调整 2024-09-08 01:38:22 +08:00
bottlefish 8c935c4212 修复部分问题 2024-09-07 16:02:42 +08:00
dingyuntian a045735980 Merge branch 'feature/春晖9.7开发' into 'develop' 
Feature/春晖9.7开发

See merge request aibis-dream/aibis-dream!26
 2024-09-07 06:48:12 +00:00
bottlefish 66b861b249 修改部分day3逻辑和内容，day2加入placeholder 2024-09-07 14:44:42 +08:00
dingyuntian 9d8c93ccb5 Merge branch 'feature/click' into 'develop' 
Update Persistence.unity

See merge request aibis-dream/aibis-dream!25
 2024-09-07 05:15:33 +00:00
dingyuntian 162b3943fc Update Persistence.unity 2024-09-07 13:14:07 +08:00
bottlefish d6007b6919 增加占位 2024-09-07 12:59:56 +08:00
bottlefish 7abd116242 黑屏过度由于初始化的需要先放脚本里 2024-09-07 11:06:53 +08:00
chenziqin 5a6c2a758d Merge branch '子钦0906' into 'develop' 
根据周四设计会讨论修改DAY1DAY2逻辑

See merge request aibis-dream/aibis-dream!24
 2024-09-06 19:03:19 +00:00
Ovid a5dfc09088 根据周四设计会讨论修改DAY1DAY2逻辑 
DAY1：有一条线有数据在走，让UF不够用；
DAY2：线不是根本问题，一直没注意的神秘进程才是，那其实就是想象力，而想象力是杀不死的
https://oq3ztwk0b7k.feishu.cn/docx/LYQAd5Kfoo8yzCxNaEEcD6Lsn6g?openbrd=1&doc_app_id=501&blockId=doxcny0t5YENNdjHO4yRdYHsY3f&blockType=whiteboard&blockToken=SzwQwnP06hOG90bW83oc60t7nzc#doxcny0t5YENNdjHO4yRdYHsY3f
 2024-09-07 02:58:11 +08:00
dingyuntian 05c17b0147 Merge branch 'feature/9.6春晖开发' into 'develop' 
Feature/9.6春晖开发

See merge request aibis-dream/aibis-dream!21
 2024-09-06 13:59:19 +00:00
bottlefish 63b54a27d1 修改颜色 2024-09-06 18:03:04 +08:00
bottlefish 055b2099c5 修复一些bug 2024-09-06 17:14:09 +08:00
bottlefish ceffbd0bfc 给变量加后缀 2024-09-06 01:42:35 +08:00
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
jiangzhuoya 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
jiangzhuoya 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
jiangzhuoya 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
jiangzhuoya 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
jiangzhuoya 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
jiangzhuoya adbe7be87b Merge branch 'develop' into 卓亚0904 2024-09-05 00:52:07 +08:00
jiangzhuoya f308a9d61e 佩佩第一天功能内容调整 2024-09-05 00:51:01 +08:00
jiangzhuoya 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