Commit Graph
941 Commits
Author SHA1 Message Date
dingyuntian dad6c087fd FMOD功能迁移 2025-03-07 22:28:12 +08: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
chenziqin 56125cbc47 Merge branch 'feature/FMOD_integration_0310' into 'develop'
Feature/fmod integration 0310

See merge request aibis-dream/aibis-dream!285
2025-03-06 11:18:18 +00:00
Ovid 9716c2de52 fmod integration finished 2025-03-06 19:13:47 +08:00
Ovid 7533eabc0a fmod integration 2025-03-06 18:36:47 +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
chenziqin 87e73fd1c7 Merge branch 'feature/FMOD_integration_0310' into 'develop'
change fmod version to 2.02.25

See merge request aibis-dream/aibis-dream!284
2025-03-05 10:05:55 +00:00
Ovid 731da2f979 change fmod version to 2.02.25 2025-03-05 18:05:13 +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
chenziqin 7fd54f352d Merge branch 'feature/FMOD_integration_0310' into 'develop'
创建首个fmod bnk

See merge request aibis-dream/aibis-dream!281
2025-03-04 11:52:01 +00:00
Ovid 27e310d4ec 创建首个fmod bnk 2025-03-04 19:51:13 +08:00
bottlefish 41a55307c0 Merge branch 'bugfix2.28' into 'develop'
Bugfix2.28

See merge request aibis-dream/aibis-dream!279
2025-03-01 13:32:21 +00:00
bottlefish e91e8072f4 bug修复 2025-03-01 21:31:24 +08:00
bottlefish 4a7962dcde 提交 2025-03-01 16:05:51 +08:00
bottlefish b7c1885815 修改 2025-03-01 02:36:59 +08:00
bottlefish 30ac2ceb54 修复bug 2025-03-01 01:34:42 +08:00
bottlefish 40a76cffef 修bug 2025-03-01 00:53:47 +08:00
bottlefish 3f3d4b2d36 佩佩的bug应该差不多了 2025-03-01 00:38:25 +08:00
bottlefish c768974c67 提交 2025-02-28 23:41:58 +08:00
bottlefish c640f79c09 Merge branch 'bugfix2.26' into 'develop'
Bugfix2.26

See merge request aibis-dream/aibis-dream!278
2025-02-26 17:11:10 +00:00
bottlefish 5dc98da5ca 修复bug 但还有很多bug没修 2025-02-27 01:10:27 +08:00
bottlefish f364b1b347 修复部分bug 2025-02-26 19:46:21 +08:00
bottlefish f2176441b9 Merge branch 'bugfix2.23' into 'develop'
Bugfix2.23

See merge request aibis-dream/aibis-dream!277
2025-02-23 16:49:28 +00:00
bottlefish d671f5b79f 跳转开始界面 2025-02-24 00:48:34 +08:00
dingyuntian 5edb93bd35 Update SceneLoader.cs 2025-02-23 23:41:06 +08:00
bottlefish 470a930f3c 提交 2025-02-23 23:16:36 +08:00
bottlefish ccc54eace9 修复bug 增加选关 2025-02-23 20:31:30 +08:00
bottlefish 480c5c33d1 修复 2025-02-23 17:16:27 +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
bottlefish 8d1fd34c46 Merge branch 'debug2.22.16' into 'develop'
提交

See merge request aibis-dream/aibis-dream!274
2025-02-22 08:41:34 +00:00
bottlefish 9233c0e428 提交 2025-02-22 16:38:33 +08:00
bottlefish 1f2e2eccb0 Merge branch 'debug2.22' into 'develop'
Debug2.22

See merge request aibis-dream/aibis-dream!273
2025-02-21 19:23:49 +00:00
bottlefish b12be15e9b 提交 2025-02-22 03:21:06 +08:00
bottlefish 76d2b3775a 修复 2025-02-22 03:19:24 +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
chenziqin f2baa2c689 Merge branch 'feature/Yarn_0219' into 'develop'
Feature/yarn 0219

See merge request aibis-dream/aibis-dream!271
2025-02-21 18:27:00 +00:00
Ovid 8ffac0c1a2 Merge branch 'develop' into feature/Yarn_0219 2025-02-22 02:26:06 +08:00