tinbird/aibis-dream
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,076 Commits 21 Branches 14 Tags
8dbb14ca075f8d6bc5316c86d253e22609c0d6ab
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
bottlefish 5329d5e488 Merge branch '修复视觉模块阻碍bug' into 'develop' 
修复视觉模块阻碍bug

See merge request aibis-dream/aibis-dream!339
 2025-03-17 11:53:05 +00:00
bottlefish bf292a311d 替换UF中错误的佩佩图片 2025-03-17 19:47:53 +08:00
bottlefish 4cef93e064 提交 2025-03-17 19:24:00 +08:00
bottlefish 76a6501170 Merge branch 'bugfxi' into 'develop' 
提交

See merge request aibis-dream/aibis-dream!335
 2025-03-12 13:21:15 +00:00
bottlefish 03aa629dfc 提交 2025-03-12 21:19:40 +08:00
bottlefish 01a498c2fd Merge branch '补资源' into 'develop' 
修复

See merge request aibis-dream/aibis-dream!331
 2025-03-11 16:25:20 +00:00
bottlefish cca5b5a163 修复 2025-03-12 00:24:33 +08:00
bottlefish 49b20a52b9 Merge branch 'bugfixfinal' into 'develop' 
修复轮子

See merge request aibis-dream/aibis-dream!329
 2025-03-11 16:04:48 +00:00
bottlefish ed0f009f28 修复轮子 2025-03-12 00:03:39 +08:00
bottlefish a55135c27f Merge branch 'bugfix春' into 'develop' 
修复

See merge request aibis-dream/aibis-dream!327
 2025-03-11 15:50:51 +00:00
bottlefish 15769c7b5d Merge branch 'develop' into bugfix春 2025-03-11 23:48:55 +08:00
bottlefish e9eac8829a 修复 2025-03-11 23:46:58 +08:00
bottlefish 5fdd7a836b Merge branch '主场景动态合入' into 'develop' 
提交

See merge request aibis-dream/aibis-dream!319
 2025-03-11 13:33:34 +00:00
bottlefish 5826d8b4bd 提交 2025-03-11 21:32:15 +08:00
bottlefish cf0b7e587a Merge branch '修复弹窗美术' into 'develop' 
提交

See merge request aibis-dream/aibis-dream!317
 2025-03-11 12:42:36 +00:00
bottlefish 95e0d14f94 提交 2025-03-11 19:36:48 +08:00
bottlefish 0586739176 Merge branch '修复后处理问题' into 'develop' 
提交

See merge request aibis-dream/aibis-dream!315
 2025-03-11 11:08:33 +00:00
bottlefish 5ac553d0d9 提交 2025-03-11 19:07:24 +08:00
bottlefish 084a23789a Merge branch '3.11美术合入' into 'develop' 
3.11美术合入

See merge request aibis-dream/aibis-dream!313
 2025-03-11 10:25:03 +00:00
bottlefish 903f59144c Merge branch 'develop' into 3.11美术合入 2025-03-11 18:23:12 +08:00
bottlefish 7e318b9467 美术合入以及bug修复 2025-03-11 18:19:35 +08:00
bottlefish ebbec8383a 外出动画以及动画系统 2025-03-11 17:08:25 +08:00
bottlefish da25700a95 美术替换 2025-03-11 14:45:43 +08:00
bottlefish 98ef60ae88 Merge branch '美术优化3.10晚上春' into 'develop' 
美术优化3.10晚上春

See merge request aibis-dream/aibis-dream!308
 2025-03-11 05:26:03 +00:00
bottlefish 533b94fc22 提交 2025-03-11 13:24:28 +08:00
bottlefish 86cab80568 提交，还有bug在修 2025-03-11 12:26:41 +08:00
bottlefish 306fe88bee 美术合入 2025-03-10 23:19:28 +08:00
bottlefish 0e58ab3dcf Merge branch '3.10美术优化' into 'develop' 
3.10美术优化

See merge request aibis-dream/aibis-dream!304
 2025-03-10 13:52:41 +00:00
bottlefish 94178c1b4d 漏提资源 2025-03-10 21:51:23 +08:00
bottlefish 41b032e131 天桥动态 2025-03-10 21:50:39 +08:00
bottlefish 09e54d3a86 外出美术添加 2025-03-10 20:06:32 +08:00
bottlefish 72eda49ebb Merge branch '修复虚拟相机优先级问题' into 'develop' 
修复虚拟相机优先级问题

See merge request aibis-dream/aibis-dream!299
 2025-03-10 07:34:35 +00:00
bottlefish bafe8b9f24 修复虚拟相机优先级问题 2025-03-10 15:33:12 +08:00
bottlefish bd21d6b454 Merge branch '3.9美术优化' into 'develop' 
修复bug

See merge request aibis-dream/aibis-dream!297
 2025-03-09 13:44:14 +00:00
bottlefish 68e9d79653 修复bug 2025-03-09 21:42:08 +08:00
bottlefish c6f90ec711 Merge branch '修复视觉indicator全屏问题' into 'develop' 
UI切换为worldcanvas，确保全分辨率可以用

See merge request aibis-dream/aibis-dream!294
 2025-03-09 09:53:57 +00:00
bottlefish 942881423e UI切换为worldcanvas，确保全分辨率可以用 2025-03-09 17:44:01 +08:00
bottlefish 41a55307c0 Merge branch 'bugfix2.28' into 'develop' 
Bugfix2.28

See merge request aibis-dream/aibis-dream!279
 2025-03-01 13:32:21 +00:00
bottlefish e91e8072f4 bug修复 2025-03-01 21:31:24 +08:00
bottlefish 4a7962dcde 提交 2025-03-01 16:05:51 +08:00
bottlefish b7c1885815 修改 2025-03-01 02:36:59 +08:00
bottlefish 30ac2ceb54 修复bug 2025-03-01 01:34:42 +08:00
bottlefish 40a76cffef 修bug 2025-03-01 00:53:47 +08:00
bottlefish 3f3d4b2d36 佩佩的bug应该差不多了 2025-03-01 00:38:25 +08:00
bottlefish c768974c67 提交 2025-02-28 23:41:58 +08:00
bottlefish c640f79c09 Merge branch 'bugfix2.26' into 'develop' 
Bugfix2.26

See merge request aibis-dream/aibis-dream!278
 2025-02-26 17:11:10 +00:00
bottlefish 5dc98da5ca 修复bug 但还有很多bug没修 2025-02-27 01:10:27 +08:00
bottlefish f364b1b347 修复部分bug 2025-02-26 19:46:21 +08:00
bottlefish f2176441b9 Merge branch 'bugfix2.23' into 'develop' 
Bugfix2.23

See merge request aibis-dream/aibis-dream!277
 2025-02-23 16:49:28 +00:00
bottlefish d671f5b79f 跳转开始界面 2025-02-24 00:48:34 +08:00
bottlefish 470a930f3c 提交 2025-02-23 23:16:36 +08:00
bottlefish ccc54eace9 修复bug 增加选关 2025-02-23 20:31:30 +08:00
bottlefish 480c5c33d1 修复 2025-02-23 17:16:27 +08:00
bottlefish 8d1fd34c46 Merge branch 'debug2.22.16' into 'develop' 
提交

See merge request aibis-dream/aibis-dream!274
 2025-02-22 08:41:34 +00:00
bottlefish 9233c0e428 提交 2025-02-22 16:38:33 +08:00
bottlefish 1f2e2eccb0 Merge branch 'debug2.22' into 'develop' 
Debug2.22

See merge request aibis-dream/aibis-dream!273
 2025-02-21 19:23:49 +00:00
bottlefish b12be15e9b 提交 2025-02-22 03:21:06 +08:00
bottlefish 76d2b3775a 修复 2025-02-22 03:19:24 +08:00
bottlefish c0c03608a6 Merge branch '2.21.21.54优化' into 'develop' 
2.21.21.54优化

See merge request aibis-dream/aibis-dream!267
 2025-02-21 14:47:26 +00:00
bottlefish d09994888c 提交 2025-02-21 22:46:45 +08:00
bottlefish a2f996ce28 提交 2025-02-21 22:39:52 +08:00
bottlefish 34367f433f Merge branch '2.21.17.51优化' into 'develop' 
各种修改

See merge request aibis-dream/aibis-dream!266
 2025-02-21 11:43:05 +00:00
bottlefish 473902b2d9 Merge branch 'develop' into '2.21.17.51优化' 
# Conflicts:
#   Assets/Resources/Yarn/FP_Peipei2/Stage1_佩佩开场对话.yarn
 2025-02-21 11:42:59 +00:00
bottlefish 881cb0d929 各种修改 2025-02-21 19:42:02 +08:00
bottlefish 2ebcf6ee49 Merge branch '2.21优化' into 'develop' 
2.21优化

See merge request aibis-dream/aibis-dream!263
 2025-02-21 09:47:15 +00:00
bottlefish 953f2fa852 各种提交 2025-02-21 17:46:01 +08:00
bottlefish 1af4418ac0 提交 2025-02-21 15:32:00 +08:00
bottlefish 88b4863a4f Merge branch '2.20春修改' into 'develop' 
2.20春修改

See merge request aibis-dream/aibis-dream!256
 2025-02-20 17:50:07 +00:00
bottlefish 0d9a9eba24 Merge branch 'develop' into 2.20春修改 2025-02-21 01:49:17 +08:00
bottlefish 472be7b042 Merge branch '回退timeline' into 'develop' 
回退timeline

See merge request aibis-dream/aibis-dream!253
 2025-02-20 17:14:34 +00:00
bottlefish 713fba16ee 回退timeline 2025-02-21 01:14:05 +08:00
bottlefish 5f40a69044 Merge branch '补资产' into 'develop' 
补资产

See merge request aibis-dream/aibis-dream!252
 2025-02-20 17:03:15 +00:00
bottlefish cbcdd3b573 补资产 2025-02-21 01:00:01 +08:00
bottlefish 58bf374958 Merge branch 'bugfix2.20' into 'develop' 
修复

See merge request aibis-dream/aibis-dream!244
 2025-02-20 08:33:43 +00:00
bottlefish 7b7933e9b2 修复 2025-02-20 16:12:23 +08:00
bottlefish 12c80a44d4 Merge branch 'develop' into '2.20春修改' 
# Conflicts:
#   Assets/Resources/Yarn/FP_Peipei2/Stage11_手术.yarn
#   Assets/Resources/Yarn/FP_Peipei2/Stage3_身体检查.yarn
#   Assets/Resources/Yarn/FP_Peipei2/Stage8_停止想象.yarn
 2025-02-20 07:21:34 +00:00
bottlefish de1ac68f99 各种问题修复 2025-02-20 13:02:35 +08:00
bottlefish be2fb7d992 Merge branch '视觉UF检查RGB值' into 'develop' 
增加RGB值

See merge request aibis-dream/aibis-dream!240
 2025-02-19 13:20:51 +00:00
bottlefish 20893f337c 增加RGB值 2025-02-19 17:48:17 +08:00
bottlefish 33c28c7469 Merge branch 'feature/插线相关调整' into 'develop' 
Feature/插线相关调整

See merge request aibis-dream/aibis-dream!238
 2025-02-19 09:27:41 +00:00
bottlefish 430ab63f5c 插头修改提交 2025-02-19 17:25:37 +08:00
bottlefish 722a3013ab Merge branch 'develop' into feature/插线相关调整 2025-02-19 14:30:43 +08:00
bottlefish 10455608af 提交 2025-02-19 14:30:13 +08:00
bottlefish 57a6b4ba9d Merge branch 'bugfix2.17' into 'develop' 
暂时修复阻碍bug

See merge request aibis-dream/aibis-dream!236
 2025-02-17 02:07:09 +00:00
bottlefish 3e59ccc71e 暂时修复阻碍bug 2025-02-17 10:06:06 +08:00
bottlefish ed147bc526 Merge branch '表现优化2.13' into 'develop' 
表现优化2.13

See merge request aibis-dream/aibis-dream!232
 2025-02-14 16:06:39 +00:00
bottlefish 382687055f clinic到bodymodule才触发timeline，加一些镜头转换设定，修复佩佩场景bug 2025-02-15 00:04:44 +08:00
bottlefish 877ec0627f 冷却器表现添加，进入手术室timeline添加，其他表现优化 2025-02-14 18:16:22 +08:00
bottlefish e07cbb7a64 Merge branch '视觉优化2.8' into 'develop' 
视觉优化2.8

See merge request aibis-dream/aibis-dream!231
 2025-02-13 10:19:38 +00:00
bottlefish d97bd05bfb Merge branch '剪线操作&蒙太奇' into 'develop' 
剪线操作&蒙太奇

See merge request aibis-dream/aibis-dream!230
 2025-02-13 10:18:56 +00:00
bottlefish faa18861ee UF模块美术替换 2025-02-13 18:15:45 +08:00
bottlefish 03141e8a26 记忆美术效果添加和素材替换 2025-02-13 17:45:22 +08:00
bottlefish 38be876a74 剪线蒙太奇替换完成 2025-02-13 16:31:09 +08:00
bottlefish f21d2d39a6 timeline调整 2025-02-11 15:47:06 +08:00
bottlefish d52124d2a1 Merge branch 'bugfix2.10' into 'develop' 
默认关闭UF特效

See merge request aibis-dream/aibis-dream!229
 2025-02-10 05:58:49 +00:00
bottlefish cc84d65e31 默认关闭UF特效 2025-02-10 13:58:06 +08:00
bottlefish 8087121b95 提交 2025-02-10 11:45:40 +08:00
bottlefish 7f4050ab64 提一个版本 2025-02-09 17:46:55 +08:00
bottlefish 5c608a1d15 Merge branch '流程优化_佩佩UF部分' into 'develop' 
流程优化 佩佩uf部分

See merge request aibis-dream/aibis-dream!228
 2025-02-08 09:43:06 +00:00
bottlefish ddb368c1bc 完成一版本UF想象和UF检查 2025-02-08 17:25:05 +08:00