Commit Graph
1730 Commits
Author SHA1 Message Date
dingyuntian 7eda71e153 Merge branch 'feature/yingli' into 'develop'
结果

See merge request aibis-dream/aibis-dream!517
2025-07-23 11:44:14 +00:00
dingyuntian 085366f836 结果 2025-07-23 19:43:45 +08:00
dingyuntian eb73b38110 Merge branch 'feature/yingli' into 'develop'
Feature/yingli

See merge request aibis-dream/aibis-dream!516
2025-07-23 11:40:06 +00:00
dingyuntian ec7c7a8356 英理功能增加 2025-07-23 19:37:24 +08:00
dingyuntian 37d6dbf254 英理测试 2025-07-23 15:37:07 +08:00
chenziqin f85c73c57f Merge branch 'feature/huoshan1fic' into 'develop'
debugdebugdebugdebug

See merge request aibis-dream/aibis-dream!515
2025-07-18 14:56:20 +00:00
Ovid d5258c8315 debugdebugdebugdebug 2025-07-18 22:53:21 +08:00
chenziqin b4ac76355e Merge branch 'feature/huoshan1fic' into 'develop'
+localization

See merge request aibis-dream/aibis-dream!514
2025-07-18 13:55:24 +00:00
Ovid 79eee45019 +localization 2025-07-18 21:54:15 +08:00
chenziqin 343ffe8283 Merge branch 'feature/huoshan1fic' into 'develop'
debug

See merge request aibis-dream/aibis-dream!513
2025-07-18 13:41:31 +00:00
Ovid ef38d5aaa9 debug 2025-07-18 21:39:53 +08:00
chenziqin 6675fff982 Merge branch 'feature/huoshan1fic' into 'develop'
Feature/huoshan1fic

See merge request aibis-dream/aibis-dream!512
2025-07-18 13:27:23 +00:00
Ovid eec76cb0b1 +表情,debug 2025-07-18 21:26:21 +08:00
chenziqin 88572dd62d Merge branch 'develop' into 'feature/huoshan1fic'
Develop

See merge request aibis-dream/aibis-dream!511
2025-07-18 11:34:55 +00:00
dingyuntian d2c644fa6e Merge branch 'feature/yingli' into 'develop'
Feature/yingli

See merge request aibis-dream/aibis-dream!510
2025-07-18 11:33:48 +00:00
dingyuntian 23e2a5c741 火山临时 2025-07-18 19:32:27 +08:00
Ovid 8463d9caa8 huoshan1fic 2025-07-18 19:32:14 +08:00
dingyuntian 27eec345f6 添加火山PSB版 2025-07-18 19:23:53 +08:00
dingyuntian 6ecde1fa8a Merge branch 'develop' into feature/yingli 2025-07-18 19:18:51 +08:00
Ovid 65d79d8b8e 提交火山fic 2025-07-18 18:44:53 +08:00
dingyuntian d235885235 打地鼠 序列配置 2025-07-11 16:04:51 +08:00
bottlefish 15f90e2e73 Merge branch '火山适配最新系统' into 'develop'
修复火山的系统

See merge request aibis-dream/aibis-dream!509
2025-07-10 09:09:37 +00:00
bottlefish cd928081d2 修复火山的系统 2025-07-09 18:30:14 +08:00
bottlefish 0bcc682c3c Merge branch '补充必要的本地化' into 'develop'
提交

See merge request aibis-dream/aibis-dream!508
2025-07-09 07:56:08 +00:00
bottlefish 91520974e5 提交 2025-07-09 15:42:45 +08:00
chenziqin 22cf6a1622 Merge branch 'huoshan1打包成通用模板' into 'develop'
Huoshan1打包成通用模板

See merge request aibis-dream/aibis-dream!507
2025-07-08 12:10:22 +00:00
Ovid 59b605ae45 huoshan1fiction未完成但是打了模板 2025-07-08 20:09:40 +08:00
dingyuntian 491a9980cf Merge branch 'feature/animator' into 'develop'
动画片段匹配工具

See merge request aibis-dream/aibis-dream!504
2025-07-08 07:23:27 +00:00
dingyuntian 2fcb97d1bc 合并 2025-07-08 15:22:34 +08:00
dingyuntian 66930dbe17 Merge branch 'develop' into feature/animator 2025-07-08 15:18:21 +08:00
dingyuntian 637d9de6d2 动画片段匹配工具 2025-07-08 15:16:31 +08:00
bottlefish d4fd1f3d65 Merge branch '修复本地化问题' into 'develop'
修复本地化问题

See merge request aibis-dream/aibis-dream!503
2025-06-26 13:02:58 +00:00
bottlefish 14089f66be 提交 2025-06-26 21:02:29 +08:00
bottlefish 578387269a Merge branch 'develop' into 修复本地化问题 2025-06-26 19:36:47 +08:00
chenziqin 852b73049b Merge branch 'bugfix/emobugs' into 'develop'
Bugfix/emobugs

See merge request aibis-dream/aibis-dream!502
2025-06-26 11:35:43 +00:00
Ovid 7a6f633804 bugfix: 通用动画的结束时间看起来过长 2025-06-26 19:34:23 +08:00
Ovid 51b11f2ef6 bugfix: 通用动画的结束时间看起来过长 2025-06-26 19:34:03 +08:00
Ovid ad515f1db9 bugfix: 表情错乱、同时有多个呼吸机声音、peipei1结尾海浪收的太突兀 2025-06-26 19:26:59 +08:00
bottlefish c08aedd573 Merge branch 'develop' into 修复本地化问题 2025-06-26 19:21:30 +08:00
dingyuntian 3c0fc60391 Merge branch 'bugfix/screen' into 'develop'
Update GameManager.cs

See merge request aibis-dream/aibis-dream!501
2025-06-26 11:20:14 +00:00
Yuntien ce2ad56255 Update GameManager.cs 2025-06-26 19:18:12 +08:00
bottlefish 4d5295e057 上传diymid修复 2025-06-26 19:14:58 +08:00
bottlefish aedba82e69 Merge branch '打包6.26' into 'develop'
打包6.26

See merge request aibis-dream/aibis-dream!500
2025-06-26 10:16:49 +00:00
bottlefish dead40d875 提交打包信息 2025-06-26 18:16:04 +08:00
bottlefish cbc08105da Merge branch 'develop' into 打包6.26 2025-06-26 18:04:11 +08:00
bottlefish 3df0365d10 提交打包信息和bug修复 2025-06-26 18:03:18 +08:00
chenziqin 7d3e152815 Merge branch 'bugfix/emergencyLevel' into 'develop'
peipei1设置emergencyLevel=0

See merge request aibis-dream/aibis-dream!499
2025-06-26 10:00:20 +00:00
Ovid da2b439b37 peipei1设置emergencyLevel=0 2025-06-26 17:57:41 +08:00
dingyuntian 971904f1f3 Merge branch 'bugfix/clue' into 'develop'
生成器问题

See merge request aibis-dream/aibis-dream!498
2025-06-26 09:24:03 +00:00
Yuntien 6334b9406d 生成器问题 2025-06-26 17:22:18 +08:00