tinbird/aibis-dream
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176 Commits 21 Branches 14 Tags
48ecdf95c448d533c8d813639b48ebdc16adea9d
Commit Graph
176 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Ovid 48ecdf95c4 修改首日电视对话，修改DAY2UF提词对话 
修改首日电视内容，修改DAY2UF提词对话
 2024-09-09 17:05:26 +08:00
dingyuntian b407367818 Merge branch 'feature/cover' into 'develop' 
遮罩问题

See merge request aibis-dream/aibis-dream!37
 2024-09-08 17:56:42 +00:00
dingyuntian 461c117447 遮罩问题 2024-09-09 01:56:08 +08:00
dingyuntian 1503b7ac45 Merge branch 'feature/春晖9.8.20' into 'develop' 
Feature/春晖9.8.20

See merge request aibis-dream/aibis-dream!36
 2024-09-08 17:18:28 +00:00
bottlefish e4a6aa55d7 涉及资源替换的修改 2024-09-09 01:15:26 +08:00
chenziqin 46a5d69767 Merge branch 'CZQ0908' into 'develop' 
Czq0908修改合并

See merge request aibis-dream/aibis-dream!35
 2024-09-08 17:02:55 +00:00
Ovid 5a29e1579a 去掉DAY1UF判断的临时修正 2024-09-09 01:00:00 +08:00
Ovid 27e312e02a 整体文本调修 2024-09-09 00:55:28 +08:00
bottlefish 14b830c75d 替换资源并且修改对应材质参数 2024-09-09 00:53:33 +08:00
江卓亚 b20977f662 Merge branch '卓亚0904' into 'develop' 
手册相关配置-from卓亚0904

See merge request aibis-dream/aibis-dream!34
 2024-09-08 15:59:53 +00:00
G0Done 84f40e2a33 手册图片配置调整 2024-09-08 23:37:34 +08:00
G0Done 4483d3653a 手册图片素材调整 2024-09-08 23:37:11 +08:00
dingyuntian cded3066dd Merge branch 'bugfix/cover' into 'develop' 
Bugfix/cover

See merge request aibis-dream/aibis-dream!33
 2024-09-08 15:05:26 +00:00
dingyuntian cd31e8a1ab Update Persistence.unity 2024-09-08 23:03:39 +08:00
dingyuntian 7274590e10 展示物品 2024-09-08 23:01:11 +08:00
dingyuntian 963ffaaaae 遮罩问题 2024-09-08 22:29:33 +08:00
chenziqin bf7a35a1a6 Merge branch 'develop' into 'CZQ0908' 
Develop

See merge request aibis-dream/aibis-dream!32
 2024-09-08 14:13:26 +00:00
江卓亚 fd9e1b17a8 Merge branch '卓亚0904' into 'develop' 
调整第一次插线的报错内容表现，调整D1的任务配置

See merge request aibis-dream/aibis-dream!31
 2024-09-08 13:10:36 +00:00
G0Done 0af1a37bbc 调整第一次插线的报错内容表现，调整D1的任务配置 2024-09-08 20:50:34 +08:00
chenziqin 5e2ba52471 Merge branch 'feature/春晖9.8' into 'develop' 
Feature/春晖9.8

See merge request aibis-dream/aibis-dream!30
 2024-09-08 08:33:50 +00:00
bottlefish 8e526807da 提交day1修改 2024-09-08 15:28:24 +08:00
bottlefish 8f8a715e8e 对day1做了一些修改 2024-09-08 14:37:56 +08:00
chenziqin 88af5d19d1 Merge branch 'CZQ0907' into 'develop' 
整体文本调整

See merge request aibis-dream/aibis-dream!29
 2024-09-07 23:36:43 +00:00
Ovid 1746472e5d 整体文本调整 
现在还差的内容：
 2024-09-08 07:30:32 +08:00
chenziqin cd42559c66 Merge branch 'develop' into 'CZQ0907' 
D3任务、书籍接入，颜色消失的节奏调整

See merge request aibis-dream/aibis-dream!28
 2024-09-07 18:05:35 +00:00
G0Done 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
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