Commit Graph
665 Commits
Author SHA1 Message Date
dingyuntian 69a3c9c93c 层级改动 2025-01-04 20:46:40 +08:00
dingyuntian 654e10fdb7 Merge branch 'bugfix/问题修改' into 'develop'
Update Persistence.unity

See merge request aibis-dream/aibis-dream!194
release2025010301
2025-01-03 09:21:17 +00:00
dingyuntian 72a5d103d4 Update Persistence.unity 2025-01-03 17:20:13 +08:00
bottlefish 3220f9b77f Merge branch '去除clueboard的分支问题' into 'develop'
去除clueboard里两个无需关注的问题

See merge request aibis-dream/aibis-dream!193
2025-01-03 05:11:34 +00:00
bottlefish 361ca09573 去除clueboard里两个无需关注的问题 2025-01-03 13:07:37 +08:00
dingyuntian 472cacaa6f Merge branch 'bugfix/yarn' into 'develop'
问题修改

See merge request aibis-dream/aibis-dream!192
2025-01-01 18:16:03 +00:00
dingyuntian 61a48de3e7 问题修改 2025-01-02 02:15:35 +08:00
dingyuntian c0e0ae920e Merge branch 'bugfix/yarn' into 'develop'
Bugfix/yarn

See merge request aibis-dream/aibis-dream!191
2025-01-01 17:59:48 +00:00
dingyuntian 3bfa6c5d30 Update Plug.yarn 2025-01-02 01:57:56 +08:00
dingyuntian 41a0a071c3 从眼睛检查完出来也判断一下是否插完 2025-01-01 23:53:51 +08:00
dingyuntian 80e2ed05be Merge branch 'bugfix/yarn' into 'develop'
Update 佩佩.prefab

See merge request aibis-dream/aibis-dream!190
2025-01-01 15:06:31 +00:00
dingyuntian e0a4d14f9b Update 佩佩.prefab 2025-01-01 23:05:37 +08:00
dingyuntian 4a0ad477a7 Merge branch '表情震屏优化' into 'develop'
人名代号修改-新增

See merge request aibis-dream/aibis-dream!189
2025-01-01 11:36:06 +00:00
NeologismWu 97853dc03a 人名代号修改-新增 2025-01-01 19:33:57 +08:00
dingyuntian d10bd27b1a Merge branch 'bugfix/yarn' into 'develop'
Update Re_LTS_Peipeiday2.yarn

See merge request aibis-dream/aibis-dream!188
2025-01-01 11:24:07 +00:00
dingyuntian 7f39da14f3 Update Re_LTS_Peipeiday2.yarn 2025-01-01 19:23:32 +08:00
dingyuntian 083db6f020 Merge branch '台词冲刺day2' into 'develop'
表情和震屏增加

See merge request aibis-dream/aibis-dream!187
2025-01-01 11:19:34 +00:00
伍振彤 9a3724a914 Merge branch 'develop' into '台词冲刺day2'
# Conflicts:
#   Assets/Resources/Yarn/Re_LTS_Peipeiday1/Re_LTS_Peipeiday1.yarn
#   Assets/Resources/Yarn/Re_LTS_Peipeiday2/Re_LTS_Peipeiday2.yarn
2025-01-01 11:17:40 +00:00
NeologismWu 1648d36994 表情和震屏增加 2025-01-01 19:14:28 +08:00
dingyuntian 1c36a07f26 Merge branch 'bugfix/配置读取问题' into 'develop'
配置读取问题

See merge request aibis-dream/aibis-dream!186
2024-12-31 09:52:19 +00:00
dingyuntian 5a9de4d1fc 配置读取问题 2024-12-31 17:51:47 +08:00
dingyuntian 4bbd9edc52 Merge branch 'bugfix/打包问题' into 'develop'
Bugfix/打包问题

See merge request aibis-dream/aibis-dream!184
2024-12-31 08:44:00 +00:00
dingyuntian 3e00dd03be 音频更新 2024-12-31 16:43:07 +08:00
dingyuntian 22c0d4f742 打包过程出现的问题 2024-12-31 16:40:03 +08:00
dingyuntian 389a1bdde9 Merge branch 'bugfix/小问题' into 'develop'
Bugfix/小问题

See merge request aibis-dream/aibis-dream!182
2024-12-31 08:18:17 +00:00
dingyuntian ce553e32f3 Update Re_LTS_Peipeiday2.yarn 2024-12-31 16:17:55 +08:00
dingyuntian 7c16f59ac0 Merge branch 'develop' into bugfix/小问题 2024-12-31 15:38:26 +08:00
dingyuntian bd6dbd5448 佩佩Day2改动 2024-12-31 15:37:54 +08:00
chenziqin 4614a8920a Merge branch 'feature/yarn_subway' into 'develop'
Feature/yarn subway

See merge request aibis-dream/aibis-dream!181
2024-12-31 07:20:03 +00:00
Ovid 45c5c63cee 音频wrap多了一截无声,处理 2024-12-31 15:18:32 +08:00
Ovid 7ae885e142 石头加表情 2024-12-31 14:48:54 +08:00
dingyuntian aad158b05b 佩佩修改 2024-12-31 14:47:46 +08:00
dingyuntian e5bdfdc838 Merge branch '台词冲刺day2' into bugfix/小问题 2024-12-31 14:34:08 +08:00
dingyuntian 3e7dccea69 Merge branch 'bugfix/小问题' into 'develop'
提交

See merge request aibis-dream/aibis-dream!179
2024-12-31 06:31:53 +00:00
dingyuntian 3a91e50ea0 提交 2024-12-31 14:29:59 +08:00
dingyuntian d7977cc8b6 Merge branch 'bugfix/通流程' into 'develop'
全通

See merge request aibis-dream/aibis-dream!177
2024-12-31 05:32:23 +00:00
dingyuntian 02d5b573d1 全通 2024-12-31 13:31:45 +08:00
Ovid ee4e0ddbe4 Merge branch 'develop' into feature/yarn_subway 2024-12-31 12:18:57 +08:00
dingyuntian 15c0bb593f Merge branch 'bugfix/layer' into 'develop'
图层调整

See merge request aibis-dream/aibis-dream!176
2024-12-31 04:02:21 +00:00
dingyuntian df6c01e446 图层调整 2024-12-31 12:00:55 +08:00
NeologismWu 2b426c0131 Update Re_LTS_Peipeiday2.yarn 2024-12-31 11:57:24 +08:00
chenziqin 4f6caac8f3 Merge branch 'feature/yarn_subway' into 'develop'
Feature/yarn subway

See merge request aibis-dream/aibis-dream!174
2024-12-30 22:14:30 +00:00
Ovid 31b9ae7fb2 统一佩佩和石头的插线检查逻辑 2024-12-31 06:13:00 +08:00
Ovid 91e1215e61 串通调整-尽管调整得非常迷你 2024-12-31 05:39:06 +08:00
bottlefish 967a925abd Merge branch 'debug佩佩流程' into 'develop'
修复一些问题

See merge request aibis-dream/aibis-dream!173
2024-12-30 21:03:42 +00:00
bottlefish 9ca79850a3 修复一些问题 2024-12-31 05:02:21 +08:00
dingyuntian d1efc8c2d0 Merge branch 'feature/gear_sound' into 'develop'
Feature/gear sound

See merge request aibis-dream/aibis-dream!172
2024-12-30 20:48:30 +00:00
dingyuntian d9897366af 音频更新 2024-12-31 04:47:40 +08:00
dingyuntian 7b3b6369f2 Update CharacterViewer.cs 2024-12-31 04:44:15 +08:00
dingyuntian 2fcbea4056 齿轮音效 2024-12-31 04:38:47 +08:00