Commit Graph
100 Commits
Author SHA1 Message Date
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
dingyuntian 9874a8b41f timeline 2025-02-17 11:34:51 +08:00
dingyuntian e5a6610637 Merge branch 'bugfix/old' into bugfix/timeline 2025-02-17 11:28:28 +08:00
dingyuntian 12baf16e53 timeline 2025-02-17 11:27:55 +08:00
dingyuntian c0e354856c Merge branch 'feature/screen' into 'develop'
Feature/screen

See merge request aibis-dream/aibis-dream!235
2025-02-15 08:00:18 +00:00
dingyuntian e0e103287e 新屏幕 2025-02-15 15:49:42 +08:00
dingyuntian 56c4d81539 Merge branch 'develop' into feature/screen 2025-02-15 15:29:43 +08:00
dingyuntian fbea809af3 Update Box.prefab 2025-02-15 15:25:43 +08:00
dingyuntian 5166b15b96 对话框 2025-02-15 14:15:33 +08:00
dingyuntian 496f538b9f 屏幕问题 2025-02-13 20:53:28 +08:00
dingyuntian 94e01a9baa screen 2025-02-12 15:12:00 +08:00
dingyuntian 564ccf6f81 Merge branch 'bugfix/talk_log' into 'develop'
Update Persistence.unity

See merge request aibis-dream/aibis-dream!225
2025-01-26 08:12:19 +00:00
dingyuntian ae8b4f0b16 对话回顾 2025-01-26 16:10:23 +08:00
dingyuntian bedce4143b Update Persistence.unity 2025-01-26 15:58:34 +08:00
dingyuntian a8fa7621ac Merge branch 'feature/stone-change' into 'develop'
Feature/stone change

See merge request aibis-dream/aibis-dream!222
2025-01-25 15:09:16 +00:00
dingyuntian 4b57236e0c 问题修复 2025-01-25 23:08:14 +08:00
dingyuntian ea689da0dd 变速箱修改 2025-01-25 19:08:00 +08:00
dingyuntian 0f6d95466e Merge branch 'bugfix/develop' into 'develop'
Bugfix/develop

See merge request aibis-dream/aibis-dream!220
2025-01-25 03:26:32 +00:00
dingyuntian 6fd85e6bca 石头串通 2025-01-24 23:21:54 +08:00
dingyuntian 499c85beea Merge branch 'bugfix/dialog' into 'develop'
Update CursorManager.cs

See merge request aibis-dream/aibis-dream!216
2025-01-24 03:06:55 +00:00
dingyuntian f0a7b63f32 Merge branch 'feature/dialogbox' into 'develop'
Feature/dialogbox

See merge request aibis-dream/aibis-dream!213
2025-01-23 11:36:25 +00:00
dingyuntian 083c39544e 问题修改 2025-01-23 19:22:03 +08:00
dingyuntian 2825fbef47 引擎修改 2025-01-23 18:32:25 +08:00
dingyuntian 17605e51ed Merge branch 'feature/cursor' into 'develop'
Feature/cursor

See merge request aibis-dream/aibis-dream!202
2025-01-17 13:22:32 +00:00
dingyuntian 247363a112 Merge branch 'develop' into feature/cursor 2025-01-17 21:21:58 +08:00
dingyuntian 27aaac02e0 提交 2025-01-17 21:21:37 +08:00
dingyuntian cdffaab7c9 Update FixSystemCenter.cs 2025-01-17 21:18:38 +08:00
dingyuntian 59dd5d67dc 引擎相关玩法 2025-01-17 21:17:52 +08:00
dingyuntian a1fd6fca67 引擎简单更新 2025-01-17 21:05:06 +08:00
dingyuntian 74025f3d5b 指针功能完成,齿轮未接入 2025-01-16 22:20:04 +08:00
dingyuntian b80d78ad23 Merge branch '重构佩佩的脚本来配合存档' into feature/cursor 2025-01-16 19:36:12 +08:00
dingyuntian 3592187b11 改回Overlay 2025-01-16 19:27:27 +08:00
dingyuntian 879f74b7bf EventSystem扩展 2025-01-16 19:21:33 +08:00
dingyuntian be558878ce 相机状态和维修状态解绑 2025-01-16 11:45:37 +08:00
dingyuntian cb3eff896d 事件系统扩展 2025-01-16 11:37:14 +08:00
dingyuntian 13bf57e84a 合并 2025-01-15 14:17:35 +08:00
dingyuntian b1167c81b1 Merge branch '重构佩佩的脚本来配合存档' into bugfix/merge 2025-01-15 14:01:07 +08:00
dingyuntian b891a2218d Camera修改 2025-01-15 13:06:40 +08:00
dingyuntian b2ff37ef2f 将Canvas添加到UICamera 2025-01-15 13:04:02 +08:00
dingyuntian e3f063866f 添加Camera 2025-01-15 12:39:08 +08:00
dingyuntian 045d6273f2 误删部分 2025-01-15 11:40:13 +08:00
dingyuntian 3fff01da93 指针 2025-01-15 11:30:04 +08:00
dingyuntian f4f0b4cf3d 指针更新 2025-01-14 22:51:44 +08:00
dingyuntian 636b735d94 Merge branch '重构佩佩的脚本来配合存档' of ssh://114.67.212.218:2222/aibis-dream/aibis-dream into 重构佩佩的脚本来配合存档 2025-01-14 20:42:45 +08:00
dingyuntian 95a64fa728 Update GameLoopManager.cs 2025-01-14 20:42:30 +08:00
dingyuntian c8a80e51a9 添加事件 2025-01-14 20:40:10 +08:00
dingyuntian ff05442c28 添加指针 2025-01-14 17:46:50 +08:00
dingyuntian e76840c5ce Fmod安装 2025-01-12 13:19:52 +08:00
dingyuntian 5c512d81e6 小改动 2025-01-12 11:43:02 +08:00