Commit Graph
100 Commits
Author SHA1 Message Date
dingyuntian 106fc165ba 0.3.1.2打包 2025-08-06 12:46:58 +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
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
dingyuntian 971904f1f3 Merge branch 'bugfix/clue' into 'develop'
生成器问题

See merge request aibis-dream/aibis-dream!498
2025-06-26 09:24:03 +00:00
dingyuntian c85e6a1895 Merge branch 'bugfix/clue' into 'develop'
Bugfix/clue

See merge request aibis-dream/aibis-dream!495
2025-06-26 04:27:41 +00:00
dingyuntian 226f56a860 Merge branch 'bugfix/624' into 'develop'
打包

See merge request aibis-dream/aibis-dream!493
2025-06-24 11:01:12 +00:00
dingyuntian f82e2cd105 打包 2025-06-24 19:00:33 +08:00
dingyuntian fadfd5a401 Merge branch 'bugfix/地铁资产替换' into 'develop'
Bugfix/地铁资产替换

See merge request aibis-dream/aibis-dream!492
2025-06-24 07:12:03 +00:00
dingyuntian 17134c1ae4 Update Center.yarn 2025-06-24 14:53:33 +08:00
dingyuntian 05a4f21133 问题修复 2025-06-24 14:28:18 +08:00
dingyuntian 33bba18691 美术素材更新 2025-06-23 17:33:25 +08:00
dingyuntian bf04f5ce82 Merge branch 'develop' into feature/佩佩表情替换 2025-06-20 17:21:48 +08:00
dingyuntian 8b058e5d8d 对话框微调 2025-06-20 17:18:21 +08:00
dingyuntian f6c7700a14 相机注册错误 2025-06-20 15:15:13 +08:00
dingyuntian 0ddf3478cf Merge branch 'bugfix/图太糊' into 'develop'
素材修改

See merge request aibis-dream/aibis-dream!490
2025-06-20 05:52:04 +00:00
dingyuntian af963efc61 素材修改 2025-06-20 13:47:07 +08:00
dingyuntian 1059a92147 佩佩 2025-06-19 15:48:19 +08:00
dingyuntian b6bb76bffe 佩佩动画 2025-06-19 14:34:17 +08:00
dingyuntian 2f7a68c4b3 Merge branch 'develop' into feature/佩佩表情替换 2025-06-18 22:06:52 +08:00
dingyuntian d605e7c36f Merge branch 'feature/佩佩表情替换' into 'develop'
Update SubwayCenter.cs

See merge request aibis-dream/aibis-dream!486
2025-06-18 14:06:48 +00:00
dingyuntian b2b980105d Update SubwayCenter.cs 2025-06-18 22:05:40 +08:00
dingyuntian 7f2bb57505 Merge branch 'feature/佩佩表情替换' into 'develop'
Update SubWay.unity

See merge request aibis-dream/aibis-dream!485
2025-06-18 14:05:01 +00:00
dingyuntian ac4a820ea4 Update SubWay.unity 2025-06-18 22:03:42 +08:00
dingyuntian 8de9cd5999 Merge branch 'bugfix/peipei2' into 'develop'
Bugfix/peipei2

See merge request aibis-dream/aibis-dream!475
2025-06-18 08:11:45 +00:00
dingyuntian 55952aa38c 诊疗记录问题 2025-06-18 14:51:51 +08:00
dingyuntian 60b08a5167 佩佩2问题修改 2025-06-16 20:53:23 +08:00
dingyuntian b3d75fe056 Merge branch 'bugfix/version' into 'develop'
Bugfix/version

See merge request aibis-dream/aibis-dream!472
2025-06-16 09:55:00 +00:00
dingyuntian 9b7d03e2d0 增加计时器功能 2025-06-16 17:54:16 +08:00
dingyuntian 8d74bb2f2b 版本号更新 2025-06-16 15:47:07 +08:00
dingyuntian eb41646e10 单空格变多空格 2025-06-16 15:31:53 +08:00
dingyuntian dade5622c0 Merge branch 'bugfix/version' into 'develop'
Bugfix/version

See merge request aibis-dream/aibis-dream!467
2025-06-15 14:21:48 +00:00
dingyuntian 08b5b03770 问题修改 2025-06-15 22:19:55 +08:00
dingyuntian fe314c2891 Merge branch 'develop' into bugfix/version 2025-06-15 21:46:51 +08:00
dingyuntian c7cb1a69d1 Merge branch 'develop' into bugfix/version 2025-06-15 21:28:50 +08:00
dingyuntian b68c99a485 Merge branch 'develop' into bugfix/version 2025-06-15 21:28:31 +08:00
dingyuntian 497a8447d8 美术资源替换 2025-06-15 21:26:55 +08:00
dingyuntian 7683f9fc64 Merge branch 'bugfix/version' into 'develop'
Update ProjectSettings.asset

See merge request aibis-dream/aibis-dream!464
2025-06-15 12:40:43 +00:00
dingyuntian 707051e066 Update ProjectSettings.asset 2025-06-15 20:38:29 +08:00
dingyuntian 53c6dd67b5 Merge branch 'vision' into 'develop'
Update ProjectSettings.asset

See merge request aibis-dream/aibis-dream!460
2025-06-15 09:44:03 +00:00
dingyuntian a7add8ba93 Update ProjectSettings.asset 2025-06-15 17:42:27 +08:00
dingyuntian 9cfaf979da Merge branch 'bugfix/小修改' into 'develop'
Bugfix/小修改

See merge request aibis-dream/aibis-dream!458
2025-06-15 08:46:30 +00:00
dingyuntian 89e331af5f Update 医生SMOKE.anim 2025-06-15 15:52:00 +08:00
dingyuntian 6c05a428b6 小修改 2025-06-15 15:51:27 +08:00
dingyuntian f7669e0e84 Merge branch 'bugfix/合并后测试' into 'develop'
美术资源替换

See merge request aibis-dream/aibis-dream!455
2025-06-14 15:02:12 +00:00
dingyuntian 36643009bb 美术资源替换 2025-06-14 22:59:52 +08:00
dingyuntian c36b36844f Merge branch 'bugfix/合并后测试' into 'develop'
合并

See merge request aibis-dream/aibis-dream!454
2025-06-14 13:50:34 +00:00
dingyuntian cde651f0ff 合并 2025-06-14 21:50:00 +08:00
dingyuntian 89b3d546f9 Merge branch 'feature/地铁' into 'develop'
版本号

See merge request aibis-dream/aibis-dream!453
2025-06-14 13:15:54 +00:00
dingyuntian a7e086a68a 版本号 2025-06-14 21:10:28 +08:00
dingyuntian 22c5af978e Merge branch 'feature/地铁' into 'develop'
Feature/地铁

See merge request aibis-dream/aibis-dream!451
2025-06-14 12:56:48 +00:00
dingyuntian 79f35c0f41 Merge branch 'develop' into feature/地铁 2025-06-14 20:56:14 +08:00
dingyuntian 3ac8f41e52 合并 2025-06-14 20:55:51 +08:00
dingyuntian 7118eb038b Merge branch 'feature/地铁' into 'develop'
Feature/地铁

See merge request aibis-dream/aibis-dream!450
2025-06-13 14:44:57 +00:00
dingyuntian 662000ab91 提交 2025-06-13 22:43:40 +08:00
dingyuntian 1b1ee53954 合并 2025-06-13 22:23:48 +08:00
dingyuntian deedb9aa5a Merge branch 'develop' into feature/地铁 2025-06-13 22:20:32 +08:00
dingyuntian 5475b9a34c 美术资源替换 2025-06-13 22:06:14 +08:00
dingyuntian ce8303cc87 Merge branch 'bugfix/小调整' into 'develop'
Bugfix/小调整

See merge request aibis-dream/aibis-dream!448
2025-06-13 08:28:03 +00:00
dingyuntian 63fa19266c Merge branch 'develop' into bugfix/小调整 2025-06-13 16:24:45 +08:00
dingyuntian 83d103871c 对话框调整 2025-06-13 16:24:38 +08:00
dingyuntian 10d964d3b0 地铁功能新增 2025-06-12 22:40:40 +08:00
dingyuntian 338e593c4d Merge branch 'bugfix/小调整' into 'develop'
Bugfix/小调整

See merge request aibis-dream/aibis-dream!446
2025-06-12 06:51:08 +00:00
dingyuntian 29b5a5779e 气泡丢失 2025-06-12 14:47:58 +08:00
dingyuntian 8c367b22fb Update Art Resources.asset 2025-06-12 14:40:42 +08:00
dingyuntian de0b708d06 Merge branch '6.11bug修复' into 'develop'
6.11bug修复

See merge request aibis-dream/aibis-dream!445
2025-06-12 06:37:24 +00:00
dingyuntian 2c00d8ecff Merge branch 'develop' into 6.11bug修复 2025-06-12 14:36:11 +08:00
dingyuntian 1461a7c796 层级修改 2025-06-12 14:36:04 +08:00
dingyuntian 2784ae99df 相机 2025-06-11 21:59:36 +08:00
dingyuntian 32ecdd1591 Merge branch 'bugfix/bubble' into 'develop'
问题修改

See merge request aibis-dream/aibis-dream!441
2025-06-11 11:15:52 +00:00
dingyuntian fe3b907d12 问题修改 2025-06-11 19:15:15 +08:00
dingyuntian 36ef851e15 Merge branch 'feature/地铁补正' into 'develop'
Feature/地铁补正

See merge request aibis-dream/aibis-dream!438
2025-06-11 09:54:58 +00:00
dingyuntian e6709e621d 选项修改 2025-06-11 17:54:19 +08:00
dingyuntian ae9ce6312b 气泡长度问题 2025-06-11 16:31:24 +08:00
dingyuntian 93e8ae09fa Merge branch 'feature/地铁补正' into 'develop'
提交

See merge request aibis-dream/aibis-dream!436
2025-06-11 08:17:12 +00:00
dingyuntian 5eb19999f9 提交 2025-06-11 16:16:44 +08:00
dingyuntian a0c4f25c44 Merge branch 'feature/地铁补正' into 'develop'
旧资源清理

See merge request aibis-dream/aibis-dream!435
2025-06-11 08:08:38 +00:00
dingyuntian fb0a3565cc 旧资源清理 2025-06-11 16:07:49 +08:00
dingyuntian 9b8b8b278c Merge branch 'feature/地铁补正' into 'develop'
Feature/地铁补正

See merge request aibis-dream/aibis-dream!434
2025-06-11 06:41:44 +00:00
dingyuntian 8ebcfb5188 问题修改 2025-06-11 14:41:06 +08:00
dingyuntian 2ead6c8241 对话框补回去 2025-06-11 14:07:15 +08:00
dingyuntian 5745883d40 Merge branch 'feature/海浪' into 'develop'
Feature/海浪

See merge request aibis-dream/aibis-dream!433
2025-06-11 05:53:18 +00:00
dingyuntian d2c897bc1f 问题修改 2025-06-11 13:52:30 +08:00
dingyuntian 12869ac835 Merge branch 'develop' into feature/海浪 2025-06-11 13:12:37 +08:00
dingyuntian 2610f6b3d5 修改 2025-06-11 13:12:04 +08:00
dingyuntian 8143e6c447 Merge branch 'feature/海浪' into 'develop'
问题修改

See merge request aibis-dream/aibis-dream!429
2025-06-10 14:58:00 +00:00
dingyuntian f0bd5920e5 问题修改 2025-06-10 22:57:10 +08:00
dingyuntian 96171407dc Merge branch 'feature/海浪' into 'develop'
Feature/海浪

See merge request aibis-dream/aibis-dream!428
2025-06-10 14:27:51 +00:00
dingyuntian 6e5d68a18d Merge remote-tracking branch 'origin/优化6.10.21' into feature/海浪 2025-06-10 22:26:08 +08:00
dingyuntian 6866723746 2025-06-10 22:25:35 +08:00
dingyuntian f80e3823b6 Merge branch 'feature/海浪' into 'develop'
Feature/海浪

See merge request aibis-dream/aibis-dream!427
2025-06-10 14:21:28 +00:00
dingyuntian d00c668681 Merge branch 'develop' into feature/海浪 2025-06-10 22:20:49 +08:00
dingyuntian 83d606cf1f 问题调整 2025-06-10 22:19:48 +08:00
dingyuntian 9ef261b8c1 Merge branch 'develop' into feature/海浪 2025-06-10 18:53:52 +08:00
dingyuntian 95c25a0f85 Merge branch '全流程6.10.15' into 'develop'
气泡

See merge request aibis-dream/aibis-dream!424
2025-06-10 10:52:14 +00:00
dingyuntian 2ab6004d8f 气泡 2025-06-10 18:49:40 +08:00
dingyuntian 890d06d66d Merge branch '全流程6.10.15' into 'develop'
全流程6.10.15

See merge request aibis-dream/aibis-dream!423
2025-06-10 09:35:01 +00:00
dingyuntian 38f93d5695 Update Stage2-5_切割.yarn 2025-06-10 17:33:29 +08:00