Commit Graph
100 Commits
Author SHA1 Message Date
dingyuntian 8dbb14ca07 Merge branch 'develop' into 'master'
3月问题修复

See merge request aibis-dream/aibis-dream!355
2025-03-21 12:51:27 +00:00
dingyuntian 1272dff2c3 3月问题修复 2025-03-21 12:51:27 +00:00
dingyuntian b87606a018 Merge branch 'version' into 'develop'
Update ProjectSettings.asset

See merge request aibis-dream/aibis-dream!342
2025-03-17 12:26:01 +00:00
dingyuntian e6b3185f18 Update ProjectSettings.asset 2025-03-17 20:25:01 +08:00
dingyuntian e56804f5ce Merge branch 'bugfix/QATools' into 'develop'
Bugfix/qa tools

See merge request aibis-dream/aibis-dream!340
2025-03-17 11:55:40 +00:00
dingyuntian fd7d842070 Merge branch 'develop' into bugfix/QATools 2025-03-17 19:53:24 +08:00
dingyuntian 778641edd7 Update ProjectSettings.asset 2025-03-17 19:51:30 +08:00
dingyuntian 1d1c99bdd1 版本号调整 2025-03-17 19:50:38 +08:00
dingyuntian f7c396c7af 版本号 2025-03-17 17:26:31 +08:00
dingyuntian 08a55a4d04 存档功能 2025-03-17 16:04:13 +08:00
dingyuntian d60dfb527c Merge branch 'feature/退出游戏' into 'develop'
存档修复

See merge request aibis-dream/aibis-dream!336
2025-03-12 13:22:14 +00:00
dingyuntian 395d159f01 存档修复 2025-03-12 21:07:15 +08:00
dingyuntian 419b120b9a Merge branch 'feature/退出游戏' into 'develop'
退出游戏

See merge request aibis-dream/aibis-dream!332
2025-03-11 17:10:05 +00:00
dingyuntian 9e27272d03 退出游戏 2025-03-12 01:09:22 +08:00
dingyuntian cb190e7ddd Merge branch 'feature/test' into 'develop'
存档修改

See merge request aibis-dream/aibis-dream!326
2025-03-11 15:39:45 +00:00
dingyuntian 7cf396e1a7 存档修改 2025-03-11 23:31:52 +08:00
dingyuntian 3b97cf8050 Merge branch 'bugfix/clinic' into 'develop'
Bugfix/clinic

See merge request aibis-dream/aibis-dream!325
2025-03-11 15:13:32 +00:00
dingyuntian af4d48121c 添加测试存档 2025-03-11 23:09:12 +08:00
dingyuntian c9306ad883 fix 2025-03-11 22:42:20 +08:00
dingyuntian 69ba70d4c9 Merge branch 'feature/clinic' into 'develop'
文件相关

See merge request aibis-dream/aibis-dream!322
2025-03-11 13:51:48 +00:00
dingyuntian 193f8122e0 Merge branch 'bugfix/art' into 'develop'
场景替换

See merge request aibis-dream/aibis-dream!321
2025-03-11 13:49:58 +00:00
dingyuntian 99bbcdf7bb 场景替换 2025-03-11 21:47:39 +08:00
dingyuntian 9d4daa4fc0 文件相关 2025-03-11 20:50:51 +08:00
dingyuntian df162c5ac1 Merge branch 'feature/clinic' into 'develop'
Feature/clinic

See merge request aibis-dream/aibis-dream!318
2025-03-11 12:46:47 +00:00
dingyuntian 96a472b3d8 FadeIn问题 2025-03-11 19:19:45 +08:00
dingyuntian 85cf41c359 Update Stage11_手术.yarn 2025-03-11 19:17:51 +08:00
dingyuntian a540b16d4f Clinic前景更新 2025-03-11 19:13:31 +08:00
dingyuntian 5c6ebfe5bd Merge branch 'bugfix/load' into 'develop'
Update GameLoopManager.cs

See merge request aibis-dream/aibis-dream!314
2025-03-11 11:07:55 +00:00
dingyuntian e7f629a399 Update GameLoopManager.cs 2025-03-11 17:27:57 +08:00
dingyuntian 1f527c112b Merge branch 'bugfix/test' into 'develop'
fadein

See merge request aibis-dream/aibis-dream!312
2025-03-11 08:16:11 +00:00
dingyuntian 0c019524a7 fadein 2025-03-11 16:14:40 +08:00
dingyuntian 67ae5fee18 Merge branch 'bugfix/art' into 'develop'
部分问题修改

See merge request aibis-dream/aibis-dream!309
2025-03-11 05:31:02 +00:00
dingyuntian 85cc345e26 部分问题修改 2025-03-11 13:29:57 +08:00
dingyuntian 7130bd099d Merge branch 'bugfix/art-replace' into 'develop'
Bugfix/art replace

See merge request aibis-dream/aibis-dream!305
2025-03-10 14:22:23 +00:00
dingyuntian 8d0763c01a 屏幕显示线框图 2025-03-10 22:21:21 +08:00
dingyuntian 7c5295d450 石头维修资源替换 2025-03-10 21:55:18 +08:00
dingyuntian 8fe8d7e280 Merge branch 'bugfix/art-replace' into 'develop'
合并

See merge request aibis-dream/aibis-dream!303
2025-03-10 10:33:01 +00:00
dingyuntian 85036ce05c 合并 2025-03-10 18:30:40 +08:00
dingyuntian 25f55d3901 Merge branch 'bugfix/art-replace' into 'develop'
石头美术替换

See merge request aibis-dream/aibis-dream!302
2025-03-10 09:23:31 +00:00
dingyuntian e5db096e09 石头美术替换 2025-03-10 17:21:58 +08:00
dingyuntian 306d0976cd Merge branch 'bugfix/art-replace' into 'develop'
对话修复

See merge request aibis-dream/aibis-dream!300
2025-03-10 07:50:28 +00:00
dingyuntian d93f8463b4 对话修复 2025-03-10 15:49:52 +08:00
dingyuntian 44ecc59606 Merge branch 'feature/asp_anime' into 'develop'
开发者工具

See merge request aibis-dream/aibis-dream!293
2025-03-08 14:59:00 +00:00
dingyuntian 9cd1a832c3 开发者工具 2025-03-08 22:57:59 +08:00
dingyuntian f19a6018bc Merge branch 'feature/bubble' into 'develop'
Feature/bubble

See merge request aibis-dream/aibis-dream!292
2025-03-08 13:48:32 +00:00
dingyuntian 0d7ef2fe4e 气泡配置 2025-03-08 21:48:09 +08:00
dingyuntian 7ac013554d Update Persistence.unity 2025-03-08 21:34:08 +08:00
dingyuntian edc8f5525f Update YarnUtil.cs 2025-03-08 21:33:29 +08:00
dingyuntian 92fd486d69 Merge branch 'feature/bubble' into 'develop'
Feature/bubble

See merge request aibis-dream/aibis-dream!290
2025-03-08 12:56:12 +00:00
dingyuntian 77130baab3 表情 2025-03-08 20:54:44 +08:00
dingyuntian 3e2a606b87 bubble 2025-03-08 19:13:57 +08:00
dingyuntian 6b615454df fmod微调 2025-03-08 15:43:37 +08:00
dingyuntian d0dc00f68f Merge branch 'feature/fmod' into 'develop'
Feature/fmod

See merge request aibis-dream/aibis-dream!288
2025-03-08 04:11:57 +00:00
dingyuntian 0dc74815ce FMOD调通 2025-03-08 12:07:35 +08:00
dingyuntian dad6c087fd FMOD功能迁移 2025-03-07 22:28:12 +08:00
dingyuntian 46e513c4ff Merge branch 'feature/fmod' into 'develop'
Feature/fmod

See merge request aibis-dream/aibis-dream!286
2025-03-07 07:40:49 +00:00
dingyuntian 99a2e78466 Merge branch 'develop' into feature/fmod 2025-03-07 15:39:56 +08:00
dingyuntian 7c2ee518f5 Update .gitignore 2025-03-07 15:21:40 +08:00
dingyuntian de883c006c FMod 2025-03-07 15:11:58 +08:00
dingyuntian 49f07c79d7 Merge branch 'develop' into feature/fmod 2025-03-05 18:07:26 +08:00
dingyuntian d2bc229031 Update FMODStudioSettings.asset 2025-03-05 18:07:09 +08:00
dingyuntian 49e5e038bc fmod 2025-03-05 18:06:59 +08:00
dingyuntian 30cb682ad1 Merge branch 'feature/fmod' into 'develop'
Feature/fmod

See merge request aibis-dream/aibis-dream!283
2025-03-05 07:58:57 +00:00
dingyuntian 49b0156eb6 Update SpriteGroupKit.cs 2025-03-05 15:58:31 +08:00
dingyuntian 8953f7af3a 图集编辑功能指令 2025-03-05 15:57:27 +08:00
dingyuntian 21c7d039a1 Merge branch 'develop' into feature/fmod 2025-03-05 15:11:51 +08:00
dingyuntian 8ac2d3213e Merge branch 'feature/sprite-group' into 'develop'
Feature/sprite group

See merge request aibis-dream/aibis-dream!282
2025-03-05 07:11:33 +00:00
dingyuntian 6bff29f71f 更新 2025-03-05 15:06:41 +08:00
dingyuntian 75d8d03275 图集 2025-03-05 15:02:30 +08:00
dingyuntian 49bfc8e3de Sprite群组编辑器 2025-03-05 14:13:33 +08:00
dingyuntian 5edb93bd35 Update SceneLoader.cs 2025-02-23 23:41:06 +08:00
dingyuntian 5927fc9c6e Merge branch 'bugfix/dialog' into 'develop'
dialog问题修改

See merge request aibis-dream/aibis-dream!276
2025-02-22 19:06:38 +00:00
dingyuntian 898d6946ab dialog问题修改 2025-02-23 03:06:14 +08:00
dingyuntian f47e7d6b99 Merge branch 'feature/bubble' into 'develop'
合并

See merge request aibis-dream/aibis-dream!272
2025-02-21 18:43:32 +00:00
dingyuntian 8cdf40a9ad 合并 2025-02-22 02:42:57 +08:00
dingyuntian 508bcdc50b Merge branch 'feature/bubble' into 'develop'
Feature/bubble

See merge request aibis-dream/aibis-dream!269
2025-02-21 17:43:46 +00:00
dingyuntian 1a38ae4572 meta 2025-02-22 01:39:33 +08:00
dingyuntian a991b83d90 Merge branch 'develop' into feature/bubble 2025-02-22 01:39:22 +08:00
dingyuntian 30ca85748d 气泡 2025-02-22 01:37:30 +08:00
dingyuntian ae8a40229b Merge branch 'bugfix/fadein' into 'develop'
timeline指令

See merge request aibis-dream/aibis-dream!261
2025-02-21 06:25:56 +00:00
dingyuntian cc16f23a93 timeline指令 2025-02-21 14:23:42 +08:00
dingyuntian bfe7db351c Merge branch 'bugfix/fadein' into 'develop'
Bugfix/fadein

See merge request aibis-dream/aibis-dream!259
2025-02-21 03:15:03 +00:00
dingyuntian 91263a98bc 唱针 2025-02-21 11:14:17 +08:00
dingyuntian 9ecc5191b1 问题修改 2025-02-21 11:12:02 +08:00
dingyuntian 6cf743afc7 Merge branch 'feature/spritegroup' into 'develop'
Feature/spritegroup

See merge request aibis-dream/aibis-dream!258
2025-02-21 02:50:11 +00:00
dingyuntian eae34b7d6e 合并 2025-02-21 02:01:39 +08:00
dingyuntian 934c1d96df Merge branch 'develop' into feature/spritegroup 2025-02-21 00:37:05 +08:00
dingyuntian 76d2332c2c 自动生成 2025-02-21 00:37:00 +08:00
dingyuntian 13e0db49fd Merge branch 'develop' into feature/spritegroup 2025-02-21 00:31:29 +08:00
dingyuntian e199a98666 Merge branch 'bugfix/shitouscene' into 'develop'
Bugfix/shitouscene

See merge request aibis-dream/aibis-dream!249
2025-02-20 16:24:29 +00:00
dingyuntian 65c5c6d32d 全屏展示图片 2025-02-21 00:23:55 +08:00
dingyuntian 6cedae4d07 scene 2025-02-21 00:14:59 +08:00
dingyuntian 9ee1c48083 Kit 2025-02-21 00:06:45 +08:00
dingyuntian a70b05737c Merge branch 'bugfix/timeline' into 'develop'
修改

See merge request aibis-dream/aibis-dream!246
2025-02-20 11:54:59 +00:00
dingyuntian 9b04f250e4 修改 2025-02-20 19:52:00 +08:00
dingyuntian 4edffabe0e Merge branch 'bugfix/timeline' into 'develop'
Bugfix/timeline

See merge request aibis-dream/aibis-dream!241
2025-02-19 17:40:39 +00:00
dingyuntian 9b4c0ddfeb 美术替换 2025-02-20 01:40:04 +08:00
dingyuntian 7c27fbc7b4 Merge branch 'develop' into bugfix/timeline 2025-02-20 00:55:56 +08:00
dingyuntian 543ecf49b1 美术资源替换 2025-02-20 00:55:14 +08:00
dingyuntian e8cfa0fce4 Merge branch 'bugfix/timeline' into 'develop'
Bugfix/timeline

See merge request aibis-dream/aibis-dream!237
2025-02-17 03:35:47 +00:00