Commit Graph
100 Commits
Author SHA1 Message Date
dingyuntian c7ce9f8e86 Merge branch 'develop' into 'master'
区域性调整

See merge request aibis-dream/aibis-dream!556
2025-09-23 07:52:48 +00:00
dingyuntian 3e343f61fa Merge branch 'feature/scroll' into 'develop'
Feature/scroll

See merge request aibis-dream/aibis-dream!555
2025-09-23 07:51:34 +00:00
dingyuntian 7f36a9e28f Ver.0.3.2.23 2025-09-23 15:50:54 +08:00
dingyuntian efcc1aea6c 设置界面和记录界面修复 2025-09-22 19:45:38 +08:00
dingyuntian 8512be13b2 Merge branch 'develop' into feature/scroll 2025-09-22 19:41:39 +08:00
dingyuntian 541dfdc6b2 新对话记录 2025-09-19 20:50:09 +08:00
dingyuntian 644f530304 Merge branch 'bugfix/setting' into feature/scroll 2025-09-16 17:22:16 +08:00
dingyuntian bd1cf171c2 Merge branch 'bugfix/setting' into 'develop'
区域性调整

See merge request aibis-dream/aibis-dream!554
2025-09-16 09:19:45 +00:00
dingyuntian 7bd0ac998e 区域性调整
解决在德语法语等区设置不可用的问题
2025-09-16 17:18:46 +08:00
dingyuntian 60e1b72edc 滚动列表 2025-09-16 17:13:21 +08:00
dingyuntian 2558cdb560 Merge branch 'bugfi/resource_clean' into 'develop'
Bugfi/resource clean

See merge request aibis-dream/aibis-dream!553
2025-09-08 13:30:10 +00:00
dingyuntian e94f66f205 Ver.0.3.2.19 2025-09-08 21:29:16 +08:00
dingyuntian 58862136ed Merge remote-tracking branch 'origin/develop' into bugfi/resource_clean 2025-09-08 18:55:52 +08:00
dingyuntian b07a2efc25 分辨率和UI问题修复 2025-09-08 18:00:46 +08:00
dingyuntian be91190c47 废弃资源 2025-09-04 17:39:09 +08:00
dingyuntian 14e12b55a5 Merge branch 'develop' into 'master'
Develop

See merge request aibis-dream/aibis-dream!551
2025-09-04 07:32:17 +00:00
dingyuntian 53cf454294 Merge branch 'bugfix/黑边' into 'develop'
Bugfix/黑边

See merge request aibis-dream/aibis-dream!550
2025-09-04 07:31:24 +00:00
dingyuntian 178338af66 问题修复 2025-09-04 15:29:44 +08:00
dingyuntian 056f739a61 Merge branch 'develop' into bugfix/黑边 2025-09-04 15:04:11 +08:00
dingyuntian 3eb30d6aec 黑边修复 2025-09-03 20:01:54 +08:00
dingyuntian 2f13e68968 Merge branch 'bugfix/动画替换时保留loop选项' into 'develop'
Bugfix/动画替换时保留loop选项

See merge request aibis-dream/aibis-dream!547
2025-09-03 10:04:33 +00:00
dingyuntian ecc699564f Merge branch 'develop' into bugfix/动画替换时保留loop选项 2025-09-03 18:03:14 +08:00
dingyuntian 1e3c42b974 动画替换时保留LoopTime 2025-09-03 18:02:22 +08:00
dingyuntian 1d3cdb2fca Update StorageSystem.cs 2025-09-02 17:53:29 +08:00
dingyuntian b956cffdff Merge branch 'bugfix/为playtest小修' into 'develop'
Bugfix/为playtest小修

See merge request aibis-dream/aibis-dream!545
2025-09-02 08:01:41 +00:00
dingyuntian 62d3ebf6ae 问题修复 2025-09-02 15:56:53 +08:00
dingyuntian 8dfe4f9614 Merge branch 'bugfix/level' into 'develop'
Bugfix/level

See merge request aibis-dream/aibis-dream!543
2025-09-01 18:15:59 +00:00
dingyuntian 42c7a9e9d8 Merge branch 'feature/存档功能更新' into 'develop'
Feature/存档功能更新

See merge request aibis-dream/aibis-dream!541
2025-09-01 14:03:42 +00:00
dingyuntian 0b9ca103a8 Merge branch 'develop' into feature/存档功能更新 2025-09-01 22:01:53 +08:00
dingyuntian 1f6d573b13 合并 2025-09-01 21:58:50 +08:00
dingyuntian f1d06949ca Merge branch 'bugfix/打地鼠回调' into 'develop'
打地鼠回调

See merge request aibis-dream/aibis-dream!538
2025-08-20 12:47:18 +00:00
dingyuntian 00c7124b93 打地鼠回调 2025-08-20 20:46:18 +08:00
dingyuntian e71ea15242 存档 2025-08-20 20:32:04 +08:00
dingyuntian 724efb883f Merge branch 'bugfix/UI小修改' into 'develop'
Bugfix/ui小修改

See merge request aibis-dream/aibis-dream!537
2025-08-20 06:05:55 +00:00
dingyuntian ded24da791 石头美术资源替换 2025-08-20 14:04:32 +08:00
dingyuntian f1fa0a5a33 石头功能重置 2025-08-19 20:45:12 +08:00
dingyuntian 2dda5e9e6b Merge branch 'bugfix/UI小修改' into 'develop'
本地化问题修复

See merge request aibis-dream/aibis-dream!536
2025-08-13 09:09:17 +00:00
dingyuntian b458219336 本地化问题修复 2025-08-13 16:59:51 +08:00
dingyuntian f51b4f31c6 Merge branch 'feature/yingli' into 'develop'
Feature/yingli

See merge request aibis-dream/aibis-dream!535
2025-08-13 07:01:27 +00:00
dingyuntian fca58603f0 其他变化 2025-08-13 14:59:33 +08:00
dingyuntian 1ed9ef5595 Merge branch 'develop' into feature/yingli 2025-08-13 14:57:13 +08:00
dingyuntian 0e41999c54 英理玩法 2025-08-13 14:54:13 +08:00
dingyuntian 7f7283a1d6 Merge branch 'bugfiox/options' into 'develop'
选项不可用时UI界面不呈现

See merge request aibis-dream/aibis-dream!534
2025-08-12 09:44:12 +00:00
dingyuntian 47ab1014e5 可选 2025-08-12 17:42:37 +08:00
dingyuntian 4d5abff7d8 英理问题 2025-08-12 17:33:05 +08:00
dingyuntian be809b9f8b Merge branch 'bugfix/actor' into 'develop'
actormanager修改

See merge request aibis-dream/aibis-dream!533
2025-08-12 07:24:51 +00:00
dingyuntian 54084d6277 actormanager修改 2025-08-12 15:22:33 +08:00
dingyuntian 9369c1a369 Update SubWay.unity 2025-08-11 19:51:33 +08:00
dingyuntian d2210e5387 右上角游戏 2025-08-11 19:34:53 +08:00
dingyuntian f1aeeb6bf3 验证码功能 2025-08-08 12:36:25 +08:00
dingyuntian a9b64e7d9d Merge branch 'bugfix/master' into 'develop'
Bugfix/master

See merge request aibis-dream/aibis-dream!531
2025-08-06 08:10:59 +00:00
dingyuntian 4b64c1adb9 Merge branch 'develop' into bugfix/master 2025-08-06 16:10:09 +08:00
dingyuntian a9b98e388e Ver.0.3.1.3 2025-08-06 16:00:26 +08:00
dingyuntian c07242fb6a 验证码 2025-08-06 14:59:33 +08:00
dingyuntian 106fc165ba 0.3.1.2打包 2025-08-06 12:46:58 +08:00
dingyuntian 910242abd2 齿轮控制 2025-08-05 21:06:40 +08:00
dingyuntian 18d95f855e 英理 2025-08-05 14:36:28 +08:00
dingyuntian 3923cb0e9a Merge branch 'bugfix/shitou' into 'develop'
Update ExpressFixScene.unity

See merge request aibis-dream/aibis-dream!522
2025-08-04 06:27:14 +00:00
dingyuntian 14ca1bf8d8 Update ExpressFixScene.unity 2025-08-04 14:23:36 +08:00
dingyuntian bc3108867b 合并 2025-08-04 13:20:22 +08:00
dingyuntian 4a881b2a53 Update CameraKit.cs 2025-08-01 17:33:06 +08:00
dingyuntian 336a909b7c 分拣 2025-08-01 17:11:10 +08:00
dingyuntian 01c5b1fda3 Merge branch 'feature/yingli' into 'develop'
英理打地鼠功能

See merge request aibis-dream/aibis-dream!521
2025-08-01 07:26:53 +00:00
dingyuntian 11ab2d04bd Merge branch 'develop' into feature/yingli 2025-08-01 15:26:16 +08:00
dingyuntian 171bae4663 打地鼠重置 2025-08-01 15:18:12 +08:00
dingyuntian 3c2128f709 Merge branch 'bugfix/merge' into 'develop'
Bugfix/merge

See merge request aibis-dream/aibis-dream!518
2025-07-24 09:15:54 +00:00
dingyuntian e13988d4c9 合并 2025-07-24 17:13:35 +08:00
dingyuntian fe63f99d02 Merge remote-tracking branch 'origin/保底全流程包' into develop 2025-07-24 17:12:36 +08:00
dingyuntian f883c502f7 随机触发 2025-07-24 17:10:39 +08:00
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
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
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
dingyuntian d235885235 打地鼠 序列配置 2025-07-11 16:04:51 +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