Commit Graph
100 Commits
Author SHA1 Message Date
chenziqin 76cfecc0a4 Merge branch 'feature/DEMO-FP优化' into 'develop'
Feature/demo fp优化

See merge request aibis-dream/aibis-dream!691
2026-04-20 09:30:28 +00:00
chenziqin e948d08573 Merge branch 'feature/DEMO-FP优化' into 'develop'
Feature/demo fp优化

See merge request aibis-dream/aibis-dream!688
2026-04-19 06:57:11 +00:00
chenziqin a22461d481 Merge branch 'feature/DEMO-FP优化' into 'develop'
D1N台词节奏优化

See merge request aibis-dream/aibis-dream!686
2026-04-16 08:16:28 +00:00
chenziqin a33fcf28cb Merge branch 'feature/DEMO-FP优化' into 'develop'
把新闻短接成只有1个,把新闻图加上

See merge request aibis-dream/aibis-dream!681
2026-04-15 16:35:49 +00:00
chenziqin 4fe36c11a5 Merge branch 'feature/DEMO-FP优化' into 'develop'
Feature/demo fp优化

See merge request aibis-dream/aibis-dream!677
2026-04-15 15:50:38 +00:00
chenziqin 146ea1e1ac Merge branch 'feature/DEMO-FP优化' into 'develop'
bug修正

See merge request aibis-dream/aibis-dream!674
2026-04-15 11:53:53 +00:00
chenziqin 259ea6eaff Merge branch 'feature/全流程拉通' into 'develop'
Feature/全流程拉通

See merge request aibis-dream/aibis-dream!653
2026-03-27 08:57:23 +00:00
chenziqin 353acfc4a1 Merge branch 'feature/pp.aseprite合成一个' into 'develop'
OK这是啥几把东西啊discard不掉overwrite不掉stash不了只能提交提交了会不会额外出问题啊我不知道但是除了提交我还能做什么不知道总之似乎不会...

See merge request aibis-dream/aibis-dream!651
2026-03-26 10:19:53 +00:00
chenziqin 74ba32a38c Merge branch 'feature/全流程拉通' into 'develop'
拉通,现在能到PP2(PP2表情指令有问题),跳过PP2的话能到fic_day2_s(似乎还有工作残余需要解决)

See merge request aibis-dream/aibis-dream!650
2026-03-25 09:13:27 +00:00
chenziqin 0d72d747e8 Merge branch 'feature/全流程拉通' into 'develop'
Feature/全流程拉通

See merge request aibis-dream/aibis-dream!648
2026-03-24 08:12:14 +00:00
chenziqin 017c1fe595 Merge branch 'develop' into 'feature/全流程拉通'
Develop

See merge request aibis-dream/aibis-dream!645
2026-03-24 06:45:43 +00:00
chenziqin 3812f85b1a Merge branch 'feature/全流程拉通' into 'develop'
debug(注:D1S目前仍报错)

See merge request aibis-dream/aibis-dream!643
2026-03-16 15:47:20 +00:00
chenziqin 2fa9421d27 Merge branch 'feature/全流程拉通' into 'develop'
Feature/全流程拉通

See merge request aibis-dream/aibis-dream!642
2026-03-14 16:30:56 +00:00
chenziqin 67ca0234df Merge branch 'feature/d1s&d1n更新' into 'develop'
D1N更新

See merge request aibis-dream/aibis-dream!638
2026-03-12 10:26:11 +00:00
chenziqin 0f1c2fec51 Merge branch 'feature/PP1&2文本更新' into 'develop'
文本更新(解决海存在矛盾)

See merge request aibis-dream/aibis-dream!632
2026-03-05 07:44:56 +00:00
chenziqin c973a5fc41 Merge branch 'feature/Fic_D2S' into 'develop'
D2S更新

See merge request aibis-dream/aibis-dream!628
2026-02-26 08:08:19 +00:00
chenziqin d306675fed Merge branch 'feature/new_d2s' into 'develop'
上传新D2S

See merge request aibis-dream/aibis-dream!623
2026-02-09 12:31:00 +00:00
chenziqin 3eb56900ce Merge branch 'feature/d2s' into 'develop'
开头加fadeout

See merge request aibis-dream/aibis-dream!619
2026-01-13 09:50:49 +00:00
chenziqin 00cd21478e Merge branch 'feature/d2s' into 'develop'
Feature/d2s

See merge request aibis-dream/aibis-dream!618
2026-01-13 09:34:42 +00:00
chenziqin 1c57e78ff6 Merge branch 'feature/d2s' into 'develop'
d2s update

See merge request aibis-dream/aibis-dream!616
2026-01-11 20:02:20 +00:00
chenziqin c4790923ec Merge branch 'feature/text_adj' into 'develop'
text adj

See merge request aibis-dream/aibis-dream!613
2026-01-04 12:00:08 +00:00
chenziqin ad9d875e65 Merge branch 'd1s-debug' into 'develop'
bugfix

See merge request aibis-dream/aibis-dream!611
2026-01-03 11:00:27 +00:00
chenziqin c5ce1e1e58 Merge branch 'd1s-debug' into 'develop'
星空到海浪

See merge request aibis-dream/aibis-dream!610
2026-01-03 10:12:05 +00:00
chenziqin 1ff03076bc Merge branch 'd1s-debug' into 'develop'
bugfix

See merge request aibis-dream/aibis-dream!609
2026-01-03 09:48:45 +00:00
chenziqin c6bbf09175 Merge branch 'feature/d1dream_obj' into 'develop'
d1s obj 添加

See merge request aibis-dream/aibis-dream!607
2026-01-02 21:40:19 +00:00
chenziqin dc4e640595 Merge branch 'feature/fic_adj' into 'develop'
Feature/fic adj

See merge request aibis-dream/aibis-dream!606
2026-01-02 17:01:44 +00:00
chenziqin 6b437918fc Merge branch 'feature/fic_adj' into 'develop'
bugfix

See merge request aibis-dream/aibis-dream!604
2026-01-02 07:46:06 +00:00
chenziqin 5da97b9bdf Merge branch 'feature/fic_adj' into 'develop'
Feature/fic adj

See merge request aibis-dream/aibis-dream!603
2025-12-31 09:32:10 +00:00
chenziqin d7be004dd6 Merge branch 'feature/1211build' into 'develop'
Feature/1211build

See merge request aibis-dream/aibis-dream!587
2025-12-15 10:06:52 +00:00
chenziqin 99bb904bc4 Merge branch 'feature/1211build' into 'develop'
huoshan text

See merge request aibis-dream/aibis-dream!585
2025-12-15 08:08:30 +00:00
chenziqin 990463db83 Merge branch 'feature/1211build' into 'develop'
Feature/1211build

See merge request aibis-dream/aibis-dream!583
2025-12-12 19:51:46 +00:00
chenziqin fbdec8a12e Merge branch 'feature/1201build' into 'develop'
Feature/1201build

See merge request aibis-dream/aibis-dream!582
2025-12-12 07:18:56 +00:00
chenziqin b8d08733d0 Merge branch 'feature/fic_gts1' into 'build/11.19'
Feature/fic gts1

See merge request aibis-dream/aibis-dream!568
2025-11-19 13:06:22 +00:00
chenziqin 658ee2e9c6 Merge branch 'feature/volume调整' into 'develop'
Feature/volume调整

See merge request aibis-dream/aibis-dream!564
2025-11-18 07:10:40 +00:00
chenziqin 7f68e6822f Merge branch 'bugfix/ppemo' into 'develop'
Bugfix/ppemo

See merge request aibis-dream/aibis-dream!546
2025-09-03 09:58:32 +00:00
chenziqin 111c143fdf Merge branch 'feature/临时音乐替换' into 'develop'
PP音乐替换临时

See merge request aibis-dream/aibis-dream!544
2025-09-01 18:19:53 +00:00
chenziqin f9c8bba4b2 Merge branch 'feature/yingli1fp' into 'develop'
Feature/yingli1fp

See merge request aibis-dream/aibis-dream!539
2025-08-25 00:47:53 +00:00
chenziqin 39c6dc9bf1 Merge branch 'feature/重刷81包本地化' into 'develop'
重刷81包新增yarn本地化

See merge request aibis-dream/aibis-dream!530
2025-08-05 13:25:08 +00:00
chenziqin 20ec008568 Merge branch 'feature/yingli1fic' into 'develop'
Feature/yingli1fic

See merge request aibis-dream/aibis-dream!528
2025-08-04 11:31:22 +00:00
chenziqin f85c73c57f Merge branch 'feature/huoshan1fic' into 'develop'
debugdebugdebugdebug

See merge request aibis-dream/aibis-dream!515
2025-07-18 14:56:20 +00:00
chenziqin b4ac76355e Merge branch 'feature/huoshan1fic' into 'develop'
+localization

See merge request aibis-dream/aibis-dream!514
2025-07-18 13:55:24 +00:00
chenziqin 343ffe8283 Merge branch 'feature/huoshan1fic' into 'develop'
debug

See merge request aibis-dream/aibis-dream!513
2025-07-18 13:41:31 +00:00
chenziqin 6675fff982 Merge branch 'feature/huoshan1fic' into 'develop'
Feature/huoshan1fic

See merge request aibis-dream/aibis-dream!512
2025-07-18 13:27:23 +00:00
chenziqin 88572dd62d Merge branch 'develop' into 'feature/huoshan1fic'
Develop

See merge request aibis-dream/aibis-dream!511
2025-07-18 11:34:55 +00:00
chenziqin 22cf6a1622 Merge branch 'huoshan1打包成通用模板' into 'develop'
Huoshan1打包成通用模板

See merge request aibis-dream/aibis-dream!507
2025-07-08 12:10:22 +00:00
chenziqin 852b73049b Merge branch 'bugfix/emobugs' into 'develop'
Bugfix/emobugs

See merge request aibis-dream/aibis-dream!502
2025-06-26 11:35:43 +00:00
chenziqin 7d3e152815 Merge branch 'bugfix/emergencyLevel' into 'develop'
peipei1设置emergencyLevel=0

See merge request aibis-dream/aibis-dream!499
2025-06-26 10:00:20 +00:00
chenziqin fd1df3e812 Merge branch 'feature/text_bugfixes' into 'develop'
bugfixes

See merge request aibis-dream/aibis-dream!497
2025-06-26 09:09:09 +00:00
chenziqin 0344c1c5c4 Merge branch 'feature/佩佩表情替换' into 'develop'
Feature/佩佩表情替换

See merge request aibis-dream/aibis-dream!494
2025-06-25 12:17:55 +00:00
chenziqin 001b4056ee Merge branch 'feature/czq_0617' into 'develop'
prologueEnding上传

See merge request aibis-dream/aibis-dream!488
2025-06-18 17:51:41 +00:00
chenziqin 5abbdf4bf5 Merge branch 'feature/czq_0617' into 'develop'
Feature/czq 0617

See merge request aibis-dream/aibis-dream!487
2025-06-18 14:11:51 +00:00
chenziqin 0c0a5ea0cb Merge branch 'feature/czq_0617' into 'develop'
上传地铁进站音效(已配置

See merge request aibis-dream/aibis-dream!484
2025-06-18 12:33:57 +00:00
chenziqin ce614d7ae4 Merge branch 'feature/czq_0617' into 'develop'
drill声音不正常修复

See merge request aibis-dream/aibis-dream!482
2025-06-18 11:07:27 +00:00
chenziqin ce1364c5e3 Merge branch 'feature/czq_0617' into 'develop'
sfx优化(忘了做了啥,好像是event:/ActionFB/mod_cutout

See merge request aibis-dream/aibis-dream!481
2025-06-18 10:48:14 +00:00
chenziqin 414d6ec10f Merge branch 'feature/czq_0617' into 'develop'
再试着修下drill,现在只要拿起drill就开始播,开始切就设置is_drill_cutting为1,停设0

See merge request aibis-dream/aibis-dream!480
2025-06-18 10:16:19 +00:00
chenziqin 9eeb9a8f3b Merge branch 'feature/czq_0617' into 'develop'
修复drill,把is_drill_cutting初始值改为1

See merge request aibis-dream/aibis-dream!479
2025-06-18 09:55:48 +00:00
chenziqin cb0737d11b Merge branch 'feature/czq_0617' into 'develop'
Merge branch 'develop' into feature/czq_0617

See merge request aibis-dream/aibis-dream!478
2025-06-18 09:03:20 +00:00
chenziqin 1072f22d9a Merge branch 'feature/czq_0617' into 'develop'
Feature/czq 0617

See merge request aibis-dream/aibis-dream!477
2025-06-18 08:55:46 +00:00
chenziqin 938b420197 Merge branch 'feature/czq_0617' into 'develop'
Feature/czq 0617

See merge request aibis-dream/aibis-dream!476
2025-06-18 08:43:10 +00:00
chenziqin 421ba89470 Merge branch 'feature/czq_0617' into 'develop'
开头音频优化

See merge request aibis-dream/aibis-dream!474
2025-06-17 16:52:03 +00:00
chenziqin 7650e286a7 Merge branch 'feature/czq_0610' into 'develop'
Feature/czq 0610

See merge request aibis-dream/aibis-dream!470
2025-06-15 15:59:11 +00:00
chenziqin 95cfc58207 Merge branch 'feature/czq_0610' into 'develop'
Feature/czq 0610

See merge request aibis-dream/aibis-dream!447
2025-06-12 10:32:05 +00:00
chenziqin f2d2d8bf41 Merge branch 'feature/czq_0610' into 'develop'
开头(双关)音频上传

See merge request aibis-dream/aibis-dream!444
2025-06-11 19:53:35 +00:00
chenziqin 61c31a318a Merge branch 'feature/czq_0610' into 'develop'
Feature/czq 0610

See merge request aibis-dream/aibis-dream!440
2025-06-11 10:50:31 +00:00
chenziqin df1410c230 Merge branch 'feature/czq_0610' into 'develop'
序章优化

See merge request aibis-dream/aibis-dream!431
2025-06-10 16:37:15 +00:00
chenziqin d64d70bd95 Merge branch 'feature/czq_0610' into 'develop'
Feature/czq 0610

See merge request aibis-dream/aibis-dream!430
2025-06-10 16:32:50 +00:00
chenziqin 47ca2dcebb Merge branch 'feature/czq_0610' into 'develop'
上传drill音效

See merge request aibis-dream/aibis-dream!426
2025-06-10 13:49:20 +00:00
chenziqin f30c0de856 Merge branch 'feature/czq_0610' into 'develop'
Feature/czq 0610

See merge request aibis-dream/aibis-dream!425
2025-06-10 13:43:19 +00:00
chenziqin 9a91edd55e Merge branch 'feature/day0&1_dream' into 'develop'
update day0 day1两个梦

See merge request aibis-dream/aibis-dream!412
2025-06-10 06:48:51 +00:00
chenziqin dbab7fcedb Merge branch 'feature/day0_night' into 'develop'
day0night

See merge request aibis-dream/aibis-dream!416
2025-06-09 15:50:49 +00:00
chenziqin 666e94ed43 Merge branch 'feature/DAY1_text_update' into 'develop'
Feature/day1 text update

See merge request aibis-dream/aibis-dream!414
2025-06-09 10:04:10 +00:00
chenziqin e22d9baff7 Merge branch 'feature/DAY1_text_update' into 'develop'
day0day1台本更新

See merge request aibis-dream/aibis-dream!413
2025-06-08 15:45:21 +00:00
chenziqin 6d96508132 Merge branch 'feature/audio-dash_0610' into 'develop'
Feature/audio dash 0610

See merge request aibis-dream/aibis-dream!411
2025-06-05 12:13:59 +00:00
chenziqin 0432545274 Merge branch 'feature/audio-dash_0610' into 'develop'
更新一些音效

See merge request aibis-dream/aibis-dream!409
2025-05-29 11:57:31 +00:00
chenziqin 5c261608a3 Merge branch 'feature/audio-dash_0610' into 'develop'
音频优化:打孔带相关、记忆相关

See merge request aibis-dream/aibis-dream!408
2025-05-28 13:04:02 +00:00
chenziqin 3dcc51706f Merge branch 'FP_Prologue' into 'develop'
Fp prologue

See merge request aibis-dream/aibis-dream!398
2025-05-20 11:37:41 +00:00
chenziqin 0540b3748d Merge branch 'develop' into 'FP_Prologue'
Develop

See merge request aibis-dream/aibis-dream!388
2025-05-16 05:57:14 +00:00
chenziqin d1482298cb Merge branch 'develop' into 'FP_Prologue'
Develop

See merge request aibis-dream/aibis-dream!376
2025-05-14 08:08:57 +00:00
chenziqin fe8830db79 Merge branch 'feature/fiction_day1-day3' into 'develop'
Feature/fiction day1 day3

See merge request aibis-dream/aibis-dream!368
2025-04-30 09:18:05 +00:00
chenziqin febe29f953 Merge branch 'prologue_temp' into 'develop'
序章没上传完

See merge request aibis-dream/aibis-dream!363
2025-04-23 08:59:11 +00:00
chenziqin 83a21337e2 Merge branch 'feature/prologue_yarn' into 'develop'
Feature/prologue yarn

See merge request aibis-dream/aibis-dream!362
2025-04-23 08:37:54 +00:00
chenziqin 6c72fd74d3 Merge branch 'peipei-a-lil-bit-to-the-left' into 'develop'
佩佩往左挪一点点

See merge request aibis-dream/aibis-dream!349
2025-03-19 03:46:47 +00:00
chenziqin b0d8733c3b Merge branch 'feature/font_adjust' into 'develop'
Feature/font adjust

See merge request aibis-dream/aibis-dream!346
2025-03-18 13:10:53 +00:00
chenziqin 289cfe68c0 Merge branch 'peipei2+be_emo' into 'develop'
peipei2+be_emo

See merge request aibis-dream/aibis-dream!345
2025-03-18 10:04:33 +00:00
chenziqin 5e83999be8 Merge branch 'fmod_amb_crash_when_switch_to_main_bugfix' into 'develop'
Fmod amb crash when switch to main bugfix

See merge request aibis-dream/aibis-dream!343
2025-03-18 06:29:12 +00:00
chenziqin 2023969370 Merge branch 'simc' into 'develop'
Simc

See merge request aibis-dream/aibis-dream!338
2025-03-17 10:16:12 +00:00
chenziqin 86beb773c3 Merge branch 'simc' into 'develop'
delete x

See merge request aibis-dream/aibis-dream!334
2025-03-12 09:07:51 +00:00
chenziqin f8ed695cbf Merge branch 'simc' into 'develop'
typo fix

See merge request aibis-dream/aibis-dream!333
2025-03-12 09:04:14 +00:00
chenziqin 939e1595b5 Merge branch 'simc' into 'develop'
mem_insert change to punchtape's asset

See merge request aibis-dream/aibis-dream!330
2025-03-11 16:23:44 +00:00
chenziqin 717f92ba84 Merge branch 'simc' into 'develop'
final fix

See merge request aibis-dream/aibis-dream!328
2025-03-11 15:49:08 +00:00
chenziqin 3c35666aeb Merge branch 'ui' into 'develop'
reupload sfx & music param fix

See merge request aibis-dream/aibis-dream!324
2025-03-11 15:11:03 +00:00
chenziqin 34519c76ef Merge branch 'feature/yarn_0310' into 'develop'
peipei2beendtalk凑合

See merge request aibis-dream/aibis-dream!323
2025-03-11 13:55:17 +00:00
chenziqin 4dc0ad683f Merge branch 'feature/yarn_0310' into 'develop'
Feature/yarn 0310

See merge request aibis-dream/aibis-dream!320
2025-03-11 13:48:04 +00:00
chenziqin 04e210a8e3 Merge branch 'feature/yarn_0310' into 'develop'
Feature/yarn 0310

See merge request aibis-dream/aibis-dream!311
2025-03-11 07:27:48 +00:00
chenziqin 7b78f01882 Merge branch 'develop' into 'feature/yarn_0310'
Develop

See merge request aibis-dream/aibis-dream!310
2025-03-11 06:21:41 +00:00
chenziqin 055f32ba60 Merge branch 'develop' into 'feature/yarn_0310'
Develop

See merge request aibis-dream/aibis-dream!307
2025-03-10 17:03:51 +00:00
chenziqin 7ac4ec0e87 Merge branch 'feature/yarn_0310' into 'develop'
Feature/yarn 0310

See merge request aibis-dream/aibis-dream!306
2025-03-10 17:02:51 +00:00
chenziqin b7356fa64b Merge branch 'develop' into 'feature/yarn_0310'
Develop

See merge request aibis-dream/aibis-dream!301
2025-03-10 07:59:01 +00:00
chenziqin 8d4816ae9c Merge branch 'develop' into 'feature/yarn_0310'
Develop

See merge request aibis-dream/aibis-dream!296
2025-03-09 11:49:30 +00:00
chenziqin ea4225cc9a Merge branch 'feature/yarn_0310' into 'develop'
Feature/yarn 0310

See merge request aibis-dream/aibis-dream!295
2025-03-09 11:49:07 +00:00