dingyuntian
|
ddeeeebf25
|
Merge branch 'feature/musfix' into 'develop'
Feature/musfix
See merge request aibis-dream/aibis-dream!814
|
2026-07-28 08:10:27 +00:00 |
|
dingyuntian
|
0466649aa4
|
Merge branch '7.28补充' into 'develop'
修复问题
See merge request aibis-dream/aibis-dream!813
|
2026-07-27 20:33:52 +00:00 |
|
dingyuntian
|
6a4401b3f7
|
Merge branch 'bugfix7.28' into 'develop'
sfx命令修复
See merge request aibis-dream/aibis-dream!812
|
2026-07-27 19:47:43 +00:00 |
|
dingyuntian
|
39ab86fd05
|
Merge branch 'feature/bnkFix' into 'develop'
Update Environment.bank
See merge request aibis-dream/aibis-dream!811
|
2026-07-27 19:46:49 +00:00 |
|
dingyuntian
|
008817269f
|
Merge branch 'feature/bnkFix' into 'develop'
rebd
See merge request aibis-dream/aibis-dream!810
|
2026-07-27 18:56:06 +00:00 |
|
dingyuntian
|
2fce9d4c8d
|
Merge branch '7.27night春晖优化' into 'develop'
feat(tarot): 添加悬停与选牌音效
See merge request aibis-dream/aibis-dream!807
|
2026-07-27 18:43:07 +00:00 |
|
dingyuntian
|
9bfa990e33
|
Merge branch 'bugfix/结尾' into 'develop'
fix: 结尾
See merge request aibis-dream/aibis-dream!808
|
2026-07-27 18:34:29 +00:00 |
|
dingyuntian
|
03d9631ce4
|
fix: 结尾
|
2026-07-28 02:34:06 +08:00 |
|
dingyuntian
|
7371848889
|
Merge branch 'feature/0727SFXdebug' into 'develop'
Feature/0727 sf xdebug
See merge request aibis-dream/aibis-dream!806
|
2026-07-27 18:28:21 +00:00 |
|
dingyuntian
|
71043c108c
|
Merge branch 'bugfix/存档功能过严' into 'develop'
art: 佩佩动画更新
See merge request aibis-dream/aibis-dream!805
|
2026-07-27 17:50:42 +00:00 |
|
dingyuntian
|
e803f9f8b6
|
art: 佩佩动画更新
|
2026-07-28 01:47:12 +08:00 |
|
dingyuntian
|
7961ebbd79
|
Merge branch 'bugfix/存档功能过严' into 'develop'
Bugfix/存档功能过严
See merge request aibis-dream/aibis-dream!804
|
2026-07-27 17:30:56 +00:00 |
|
dingyuntian
|
738f112a1d
|
yarn: 音效已合入Timeline
|
2026-07-28 01:29:49 +08:00 |
|
dingyuntian
|
9904e91145
|
art: 火山插孔排列
|
2026-07-28 01:28:12 +08:00 |
|
dingyuntian
|
e1c8ba4677
|
Merge branch 'bugfix/存档功能过严' into 'develop'
Bugfix/存档功能过严
See merge request aibis-dream/aibis-dream!803
|
2026-07-27 17:19:08 +00:00 |
|
dingyuntian
|
07bfd9020a
|
Merge branch 'develop' into bugfix/存档功能过严
|
2026-07-28 01:18:48 +08:00 |
|
dingyuntian
|
608d87725f
|
Merge branch '7.27night春晖优化' into 'develop'
fix(fix-system): 修正线盘松弛预判朝向与绷紧判定
See merge request aibis-dream/aibis-dream!801
|
2026-07-27 17:16:14 +00:00 |
|
dingyuntian
|
b013ced409
|
Merge branch 'feature/音频参数补全' into 'develop'
Feature/音频参数补全
See merge request aibis-dream/aibis-dream!802
|
2026-07-27 17:13:09 +00:00 |
|
dingyuntian
|
22a0d7377d
|
feat: 音频参数保存功能
|
2026-07-28 01:12:22 +08:00 |
|
dingyuntian
|
2902c554a6
|
feat: 修改存档和结果路径
|
2026-07-28 01:11:46 +08:00 |
|
dingyuntian
|
80e965b274
|
art: 色觉芯片更新
|
2026-07-28 01:02:24 +08:00 |
|
dingyuntian
|
8dc27144c6
|
art: 角色动画更新
|
2026-07-28 00:58:45 +08:00 |
|
dingyuntian
|
d1a332e9c8
|
fix: 火山插孔
|
2026-07-27 20:55:45 +08:00 |
|
dingyuntian
|
45fb678f39
|
Merge branch 'develop' into bugfix/存档功能过严
|
2026-07-27 20:24:37 +08:00 |
|
dingyuntian
|
9f509a2a66
|
fix: 设置和记录重叠问题
|
2026-07-27 20:05:42 +08:00 |
|
dingyuntian
|
f608fec8ca
|
fix: 扩大按钮选择范围
|
2026-07-27 19:50:08 +08:00 |
|
dingyuntian
|
1fb2e63866
|
audio: 彩带音频并入Timeline
|
2026-07-27 19:49:50 +08:00 |
|
dingyuntian
|
f8fc8bd597
|
art: 美术资源调整
|
2026-07-27 19:48:26 +08:00 |
|
dingyuntian
|
bc4475ae66
|
Merge branch 'bugfix7.27' into 'develop'
yarn(day1): 将塔罗描述卡牌改为卡面
See merge request aibis-dream/aibis-dream!799
|
2026-07-27 08:04:02 +00:00 |
|
dingyuntian
|
bb11478605
|
Merge branch 'bugfix/存档功能过严' into 'develop'
fix: 存档功能修理
See merge request aibis-dream/aibis-dream!800
|
2026-07-27 08:01:21 +00:00 |
|
dingyuntian
|
31e6ae87be
|
fix: 存档功能修理
|
2026-07-27 16:00:30 +08:00 |
|
dingyuntian
|
3e6fab9762
|
Merge branch '7.27早春晖bugfix' into 'develop'
yarn(peipei): 手术入口淡出后跳转到手术准备
See merge request aibis-dream/aibis-dream!797
|
2026-07-27 06:42:53 +00:00 |
|
dingyuntian
|
c0e7f2ddb4
|
Merge branch 'bugfix/美术问题调整' into 'develop'
fix: 跳转和位置修复
See merge request aibis-dream/aibis-dream!798
|
2026-07-27 06:42:42 +00:00 |
|
dingyuntian
|
05df341bcd
|
fix: 跳转和位置修复
|
2026-07-27 14:42:18 +08:00 |
|
dingyuntian
|
1b87f400ae
|
Merge branch '7.27早春晖bugfix' into 'develop'
yarn(huoshan): 将 Center 初始 gameStage 重置为 1
See merge request aibis-dream/aibis-dream!796
|
2026-07-27 06:23:30 +00:00 |
|
dingyuntian
|
7fe63f77f3
|
Merge branch 'feature/d2sSFX' into 'develop'
Feature/d2s sfx
See merge request aibis-dream/aibis-dream!795
|
2026-07-27 05:20:28 +00:00 |
|
dingyuntian
|
206018e8e6
|
Merge branch '7.27春fix' into 'develop'
art(clinic): 更新检索 Timeline 图集资源
See merge request aibis-dream/aibis-dream!794
|
2026-07-27 05:06:27 +00:00 |
|
dingyuntian
|
8b7a4b7bf2
|
Merge branch 'feature/增加结尾保存节点' into 'develop'
fix: 插孔问题修复
See merge request aibis-dream/aibis-dream!793
|
2026-07-26 17:05:44 +00:00 |
|
dingyuntian
|
bae1d0473b
|
fix: 插孔问题修复
|
2026-07-27 01:04:22 +08:00 |
|
dingyuntian
|
1e56201ce8
|
Merge branch 'feature/增加结尾保存节点' into 'develop'
yarn: 给维修过程打标签
See merge request aibis-dream/aibis-dream!792
|
2026-07-26 16:58:23 +00:00 |
|
dingyuntian
|
4b7887cd17
|
Merge branch 'develop' into feature/增加结尾保存节点
|
2026-07-27 00:57:05 +08:00 |
|
dingyuntian
|
784801b500
|
yarn: 给维修过程打标签
|
2026-07-27 00:49:59 +08:00 |
|
dingyuntian
|
ae5ba2c913
|
Merge branch 'feature/增加结尾保存节点' into 'develop'
art: 天桥佩佩更新
See merge request aibis-dream/aibis-dream!791
|
2026-07-26 16:03:52 +00:00 |
|
dingyuntian
|
d4673bf851
|
Merge branch 'develop' into 'feature/增加结尾保存节点'
# Conflicts:
# Assets/Yarn/FP/FP_Day2_night/FP_Day2_night.yarn
|
2026-07-26 16:03:46 +00:00 |
|
dingyuntian
|
f78da1de4d
|
fix: 冲突处理
|
2026-07-27 00:03:14 +08:00 |
|
dingyuntian
|
8c4c99aecf
|
art: 天桥佩佩更新
|
2026-07-27 00:01:02 +08:00 |
|
dingyuntian
|
71a771d56c
|
Merge branch '7.26春表现优化' into 'develop'
[ide-config] chore(配置): 添加 Yarn 文本审校命令
See merge request aibis-dream/aibis-dream!790
|
2026-07-26 15:50:57 +00:00 |
|
dingyuntian
|
6591001416
|
Merge branch 'develop' into '7.26春表现优化'
# Conflicts:
# Assets/Yarn/FP/FP_Peipei2/Stage6_分析.yarn
|
2026-07-26 15:50:44 +00:00 |
|
dingyuntian
|
5f83618c3a
|
Merge branch 'feature/增加结尾保存节点' into 'develop'
feat(save): 为存档锚点增加显式恢复标记并加固退出档
See merge request aibis-dream/aibis-dream!789
|
2026-07-26 15:39:41 +00:00 |
|
 dingyuntianandCursor
|
c57a2d2950
|
test: 隔离帧动画导入测试临时目录
Co-authored-by: Cursor <cursoragent@cursor.com>
|
2026-07-26 23:38:41 +08:00 |
|
 dingyuntianandCursor
|
cd3343457b
|
feat(dialog): 允许梦境选项提示语跨节点保留
Co-authored-by: Cursor <cursoragent@cursor.com>
|
2026-07-26 23:38:40 +08:00 |
|
 dingyuntianandCursor
|
efe9c5baaa
|
yarn: 添加 Day2 sleep 重构剧本草稿
Co-authored-by: Cursor <cursoragent@cursor.com>
|
2026-07-26 23:38:27 +08:00 |
|
 dingyuntianandCursor
|
d582e26a83
|
art: 添加天桥佩佩动作源文件
Co-authored-by: Cursor <cursoragent@cursor.com>
|
2026-07-26 23:38:27 +08:00 |
|
 dingyuntianandCursor
|
02967a5468
|
art(huoshan): 更新火山像素版动画并同步状态名
Co-authored-by: Cursor <cursoragent@cursor.com>
|
2026-07-26 23:38:14 +08:00 |
|
 dingyuntianandCursor
|
d06a67bcb1
|
yarn(peipei): 将维修入口改为 interaction 退出存档
Co-authored-by: Cursor <cursoragent@cursor.com>
|
2026-07-26 23:38:01 +08:00 |
|
 dingyuntianandCursor
|
a9bc442bc8
|
feat(save): 为存档锚点增加显式恢复标记并加固退出档
Co-authored-by: Cursor <cursoragent@cursor.com>
|
2026-07-26 23:37:47 +08:00 |
|
dingyuntian
|
a177fc8b16
|
Merge branch 'develop' into feature/增加结尾保存节点
|
2026-07-26 20:00:11 +08:00 |
|
dingyuntian
|
82c15e8f48
|
feat: 存档系统增加退出节点保存时机
|
2026-07-26 19:59:56 +08:00 |
|
dingyuntian
|
ee7cfaa1c1
|
Merge branch 'bugfix/问题修复' into 'develop'
fix: 任务面板重构
See merge request aibis-dream/aibis-dream!788
|
2026-07-26 10:09:09 +00:00 |
|
dingyuntian
|
bb207573b2
|
Merge branch '表现优化春' into 'develop'
fix(day2sleep): 修复大图虚焦清零后贴图变白
See merge request aibis-dream/aibis-dream!787
|
2026-07-26 10:08:12 +00:00 |
|
dingyuntian
|
3cdedb155c
|
fix: 任务面板重构
|
2026-07-26 18:07:34 +08:00 |
|
dingyuntian
|
4caf70b554
|
Merge branch 'bugfix/问题修复' into 'develop'
fix: 部分QA问题处理
See merge request aibis-dream/aibis-dream!786
|
2026-07-26 08:40:27 +00:00 |
|
dingyuntian
|
0a1adf1558
|
fix: 部分QA问题处理
1. 返回主菜单闪烁
2. 对话隐藏
3. 历史记录宽度调整
|
2026-07-26 16:36:51 +08:00 |
|
dingyuntian
|
cd63b44ed6
|
Merge branch 'feature/voUpdate' into 'develop'
更新VO和说话人
See merge request aibis-dream/aibis-dream!785
|
2026-07-25 13:58:46 +00:00 |
|
dingyuntian
|
3951e06bc1
|
Merge branch '7.25春优化' into 'develop'
art(open): 新增带不带记忆模块电击闪烁图
See merge request aibis-dream/aibis-dream!784
|
2026-07-25 12:03:16 +00:00 |
|
dingyuntian
|
2d0c45f2e7
|
Merge branch '火山log释放迭代' into 'develop'
art(huoshan): 添加记忆演出贴图与材质着色器
See merge request aibis-dream/aibis-dream!783
|
2026-07-25 10:41:45 +00:00 |
|
dingyuntian
|
0a489b1250
|
Merge branch 'bugfix/场景小问题微调' into 'develop'
fix: 场景微调
See merge request aibis-dream/aibis-dream!782
|
2026-07-25 08:23:18 +00:00 |
|
dingyuntian
|
2808535688
|
fix: 场景微调
|
2026-07-25 16:22:38 +08:00 |
|
dingyuntian
|
b315bf144b
|
Merge branch 'feature/音乐介入' into 'develop'
Feature/音乐介入
See merge request aibis-dream/aibis-dream!781
|
2026-07-24 17:12:58 +00:00 |
|
dingyuntian
|
da7821cde5
|
Merge branch 'bugfix/去除测试快捷键' into 'develop'
Bugfix/去除测试快捷键
See merge request aibis-dream/aibis-dream!780
|
2026-07-24 17:09:11 +00:00 |
|
dingyuntian
|
96796f6b80
|
fix: 动画错误
|
2026-07-25 01:04:49 +08:00 |
|
dingyuntian
|
9c30561ed8
|
fix: 配角色表
|
2026-07-25 00:21:25 +08:00 |
|
dingyuntian
|
ce8486c1eb
|
fix: 去掉语言测试相关功能
|
2026-07-25 00:13:27 +08:00 |
|
dingyuntian
|
f679985369
|
Merge branch 'feature/美术资源替换' into 'develop'
Feature/美术资源替换
See merge request aibis-dream/aibis-dream!779
|
2026-07-24 15:46:52 +00:00 |
|
dingyuntian
|
43bd3ece5b
|
art: 地铁微调
|
2026-07-24 23:43:06 +08:00 |
|
dingyuntian
|
4cf8febec2
|
art: 地铁美术和更新
|
2026-07-24 23:01:32 +08:00 |
|
dingyuntian
|
2384ef80f2
|
art: 插孔和按钮
|
2026-07-24 19:55:12 +08:00 |
|
dingyuntian
|
dcfd013db8
|
Merge branch 'feature/开发模式' into 'develop'
Feature/开发模式
See merge request aibis-dream/aibis-dream!778
|
2026-07-24 08:41:26 +00:00 |
|
dingyuntian
|
c6bcd0b798
|
yarn: 节点调整
|
2026-07-24 16:40:43 +08:00 |
|
dingyuntian
|
d0904efc20
|
fix: 部分存档问题修复
|
2026-07-24 16:40:20 +08:00 |
|
dingyuntian
|
1072b65a00
|
fix: 移除Timer
|
2026-07-24 16:39:39 +08:00 |
|
dingyuntian
|
7f087d89b6
|
fix: 开发模式调整
|
2026-07-24 16:39:15 +08:00 |
|
dingyuntian
|
590c1576e2
|
Merge branch 'develop' into feature/开发模式
|
2026-07-24 13:50:49 +08:00 |
|
dingyuntian
|
94e27b4d11
|
Merge branch '0723火山表情添加1' into 'develop'
上传
See merge request aibis-dream/aibis-dream!777
|
2026-07-24 05:24:27 +00:00 |
|
dingyuntian
|
f3cff824ce
|
fix: 解析时自动去前后空格
|
2026-07-24 13:23:16 +08:00 |
|
dingyuntian
|
e6ae903c03
|
feat: 测试存档功能
|
2026-07-24 13:16:03 +08:00 |
|
dingyuntian
|
2cec5dd66c
|
Merge branch 'bugfix/问题修复' into 'develop'
Bugfix/问题修复
See merge request aibis-dream/aibis-dream!776
|
2026-07-23 13:38:03 +00:00 |
|
dingyuntian
|
15f5c34db5
|
audio: 增加音频项
|
2026-07-23 21:36:37 +08:00 |
|
dingyuntian
|
13d7c305c8
|
art: 佩佩美术更新
|
2026-07-23 21:36:05 +08:00 |
|
dingyuntian
|
03a71b4ba3
|
fix: show_large_sprite闪烁问题
|
2026-07-23 20:46:13 +08:00 |
|
dingyuntian
|
2ef6db54da
|
feat: 开发面板调整
|
2026-07-23 16:57:58 +08:00 |
|
dingyuntian
|
4a9f487db9
|
fix: 处理一下编辑器编译错误
|
2026-07-23 16:57:34 +08:00 |
|
dingyuntian
|
360293941a
|
chore: 编辑器分类清理
|
2026-07-23 16:25:45 +08:00 |
|
dingyuntian
|
28e4214413
|
feat: 清除几个旧的混用测试存档功能
|
2026-07-23 15:42:21 +08:00 |
|
dingyuntian
|
33ec00ddb8
|
Merge branch 'feature/PPaseprite多余的删除' into 'develop'
删除多余资源
See merge request aibis-dream/aibis-dream!775
|
2026-07-23 06:34:09 +00:00 |
|
dingyuntian
|
cd2c7f6406
|
Merge branch 'develop' into feature/开发模式
|
2026-07-23 13:47:17 +08:00 |
|
dingyuntian
|
7e89b2cb3e
|
Merge branch 'feature/pp-aseprite修改' into 'develop'
Update 佩佩像素版-通用动画.aseprite
See merge request aibis-dream/aibis-dream!774
|
2026-07-23 04:50:44 +00:00 |
|
dingyuntian
|
5ef26b6259
|
Merge branch 'feature/demo脚本改动0722' into 'develop'
D2S开头去掉
See merge request aibis-dream/aibis-dream!773
|
2026-07-22 17:03:15 +00:00 |
|
dingyuntian
|
c254d39fd7
|
Merge branch 'feature/demo脚本改动0722' into 'develop'
Feature/demo脚本改动0722
See merge request aibis-dream/aibis-dream!772
|
2026-07-22 16:34:27 +00:00 |
|
dingyuntian
|
2c74e7d5e0
|
Merge branch 'feature/帧动画编辑器重构' into 'develop'
Feature/帧动画编辑器重构
See merge request aibis-dream/aibis-dream!771
|
2026-07-22 14:30:43 +00:00 |
|