Commit Graph
702 Commits
Author SHA1 Message Date
dingyuntian 4a63249e0c 选项选择后隐藏 2025-05-28 16:19:03 +08:00
dingyuntian 26e48ec37f 对话框优化 2025-05-28 15:58:50 +08:00
dingyuntian 68f50dd1b2 Merge branch 'develop' into feature/actorManager 2025-05-26 15:44:42 +08:00
dingyuntian 24ce8bd05e yarn 2025-05-26 15:38:03 +08:00
dingyuntian f6a0a87fda 动画系统 2025-05-26 14:59:42 +08:00
bottlefish 8c3ae43975 Merge branch 'develop' into 开头优化5.16.15.51 2025-05-26 13:06:36 +08:00
bottlefish aeca4b7ee6 提交 2025-05-23 22:57:35 +08:00
bottlefish 75ba953134 提交 2025-05-23 22:07:20 +08:00
dingyuntian 250dda0436 插线系统更新 2025-05-21 21:03:52 +08:00
dingyuntian 5367fe9d74 字体订正 2025-05-21 17:04:58 +08:00
Ovid 7ac52ca4e2 Merge branch 'develop' into FP_Prologue 2025-05-20 19:37:10 +08:00
Ovid b068a882ee peipei1情绪部分优化 2025-05-20 19:30:42 +08:00
Ovid a4f478ab82 +peipei1music 2025-05-19 20:06:16 +08:00
dingyuntian f2fa277a56 本地化 2025-05-19 19:00:23 +08:00
Ovid 1be2dea70d D0D1串通 2025-05-17 20:17:31 +08:00
Ovid 86d3be64fb Merge branch 'develop' into FP_Prologue 2025-05-17 19:27:53 +08:00
Ovid 8e8fa431a6 d0d1串通 2025-05-17 19:26:45 +08:00
dingyuntian ce6b3b9803 Merge branch 'develop' into feature/dialog 2025-05-16 21:51:24 +08:00
dingyuntian 851070f3cf 本地化问题修改 2025-05-16 21:47:35 +08:00
bottlefish 7be5180ac1 存个档 2025-05-16 19:23:56 +08:00
Ovid 52ae98018e 本地化问题修复 2025-05-16 19:15:27 +08:00
bottlefish 45acd0d93a 新增切割状态 2025-05-16 16:58:45 +08:00
bottlefish e3c5436b37 修复一些合并导致的问题 2025-05-16 15:34:13 +08:00
Ovid 77be2a94c0 提交FICTION_DAY1_BEGIN/MID/END待debug(本地化报错 2025-05-16 15:24:21 +08: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
Ovid 39e2c1dae4 Merge branch 'develop' into FP_Prologue 2025-05-16 13:51:47 +08:00
bottlefish dab5c97b11 Merge branch '开头优化' into 'develop'
开头优化

See merge request aibis-dream/aibis-dream!387
2025-05-16 05:30:49 +00:00
bottlefish 0f3e781a6e 提交 2025-05-16 12:37:26 +08:00
Ovid d3f6094b3e 串通D0D1 2025-05-15 22:12:46 +08:00
dingyuntian 0915763ef6 Merge branch 'feature/open' into 'develop'
Feature/open

See merge request aibis-dream/aibis-dream!385
2025-05-15 13:32:34 +00:00
dingyuntian 720c6933b0 字体替换 2025-05-15 21:32:07 +08:00
Ovid 42f4216224 Merge branch 'develop' into FP_Prologue 2025-05-15 21:30:07 +08:00
dingyuntian 3a477eec75 字体更新 2025-05-15 21:27:13 +08:00
dingyuntian 89829f1c1a Merge branch 'feature/open' into 'develop'
Feature/open

See merge request aibis-dream/aibis-dream!384
2025-05-15 12:59:42 +00:00
dingyuntian 874b2d5ef2 酒吧 2025-05-15 20:51:47 +08:00
bottlefish 843bb4f0e9 Merge branch 'develop' into 情绪分支测试 2025-05-15 17:52:54 +08:00
bottlefish 5c13601fcb Merge branch 'develop' into 情绪分支测试 2025-05-15 17:51:09 +08:00
bottlefish 9ae7520a28 Merge branch 'develop' into FP_Prologue 2025-05-15 17:47:10 +08:00
dingyuntian 0eb77750fb Merge branch 'develop' into feature/open 2025-05-14 21:21:10 +08:00
dingyuntian b68122f7d4 惊醒 2025-05-14 21:17:26 +08:00
bottlefish 5f8af70d0a 本地化问题修复 2025-05-14 21:12:49 +08:00
Ovid 29b5e0a6f9 FP_PROLOGUE 2025-05-14 20:59:26 +08: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
Ovid 27e62dc6b4 上传一些东西 2025-05-14 15:52:33 +08:00
bottlefish 6dc1abc958 接入火山情绪模块深入 2025-05-14 15:35:28 +08:00
dingyuntian 1a34865c75 结束事件 2025-05-14 14:54:36 +08:00
dingyuntian a8babd0faf 开头拼起 2025-05-14 14:51:54 +08:00
bottlefish 82c33b995c Merge branch 'develop' into 火山表达模块交互优化 2025-05-13 14:00:56 +08:00
bottlefish d9b17441b2 存档 2025-05-13 13:46:38 +08:00
dingyuntian af7c11a635 修复 2025-05-12 18:25:19 +08:00