 dingyuntian
|
33ec00ddb8
|
Merge branch 'feature/PPaseprite多余的删除' into 'develop'
删除多余资源
See merge request aibis-dream/aibis-dream!775
|
2026-07-23 06:34:09 +00:00 |
|
 Ovid
|
07f60c29c4
|
删除多余资源
|
2026-07-23 14:24:00 +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 |
|
 zhouziqian
|
1ba1a007a8
|
Update 佩佩像素版-通用动画.aseprite
|
2026-07-23 12:47:59 +08: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 |
|
|
Ovid
|
a4fec41afb
|
D2S开头去掉
|
2026-07-23 01:00:47 +08: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 |
|
|
Ovid
|
d7e2e8e690
|
乌鸦改金色背景
|
2026-07-23 00:31:19 +08:00 |
|
|
Ovid
|
e4697e2462
|
Merge branch 'develop' into feature/demo脚本改动0722
|
2026-07-23 00:27:00 +08:00 |
|
|
Ovid
|
9a3cb3f054
|
结尾！
|
2026-07-23 00:26:47 +08: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 |
|
|
dingyuntian
|
8722c92706
|
feat: 帧动画编辑器及相关文档
|
2026-07-22 22:30:10 +08:00 |
|
|
dingyuntian
|
1fdca74bfb
|
Merge branch 'develop' into feature/帧动画编辑器重构
|
2026-07-22 21:59:35 +08:00 |
|
|
dingyuntian
|
d82a4a3606
|
Merge branch 'bugfix/美术素材填充' into 'develop'
Bugfix/美术素材填充
See merge request aibis-dream/aibis-dream!770
|
2026-07-22 13:57:49 +00:00 |
|
|
dingyuntian
|
0825204666
|
Merge branch 'develop' into bugfix/美术素材填充
|
2026-07-22 21:55:45 +08:00 |
|
|
dingyuntian
|
1af6f0b47d
|
yarn: 改错别字
|
2026-07-22 21:50:44 +08:00 |
|
|
dingyuntian
|
0e0ed2ff7a
|
art: 素材修改
|
2026-07-22 21:19:10 +08:00 |
|
|
dingyuntian
|
2ae6f712a4
|
fix: 修正文字速度修改不生效的问题
|
2026-07-22 21:17:16 +08:00 |
|
|
dingyuntian
|
b20b936966
|
Merge branch 'feature/demo脚本改动0722' into 'develop'
Feature/demo脚本改动0722
See merge request aibis-dream/aibis-dream!769
|
2026-07-22 12:19:02 +00:00 |
|
|
Ovid
|
4a0e3ba0b9
|
debug
|
2026-07-22 20:18:29 +08:00 |
|
|
dingyuntian
|
2a1cfbc208
|
Merge branch 'feature/demo脚本改动0722' into 'develop'
Feature/demo脚本改动0722
See merge request aibis-dream/aibis-dream!768
|
2026-07-22 10:40:12 +00:00 |
|
|
Ovid
|
e3762e5462
|
Merge branch 'develop' into feature/demo脚本改动0722
|
2026-07-22 17:55:35 +08:00 |
|
|
dingyuntian
|
5029a4b9b5
|
Merge branch '7.22春优化' into 'develop'
fix(fixsystem): 修复线缆收放状态与阶段切换竞态
See merge request aibis-dream/aibis-dream!767
|
2026-07-22 08:33:58 +00:00 |
|
 bottlefishandCursor
|
3debdb39e4
|
merge: 合并 develop 到 7.22春优化
保留 PullUpCable 线缆收起逻辑，并接入 develop 的 BodyModule 退出清屏。
Co-authored-by: Cursor <cursoragent@cursor.com>
|
2026-07-22 16:30:10 +08:00 |
|
|
bottlefishandCursor
|
04edf9b355
|
chore(devsave): 清理 Huoshan1 开发存档快照
Co-authored-by: Cursor <cursoragent@cursor.com>
|
2026-07-22 16:26:01 +08:00 |
|
|
bottlefishandCursor
|
6854679bcb
|
yarn(peipei): 补充阶段切换时的放线指令
Co-authored-by: Cursor <cursoragent@cursor.com>
|
2026-07-22 16:25:50 +08:00 |
|
|
bottlefishandCursor
|
515f57e28c
|
yarn(huoshan): 重构任务面板流程并移除 Stage7 插线检查
Co-authored-by: Cursor <cursoragent@cursor.com>
|
2026-07-22 16:25:36 +08:00 |
|
|
bottlefishandCursor
|
97ef0972fd
|
art(fixsystem): 调整物理线缆色阶与高光参数
Co-authored-by: Cursor <cursoragent@cursor.com>
|
2026-07-22 16:25:17 +08:00 |
|
|
bottlefishandCursor
|
2fb32c44e8
|
fix(fixsystem): 修复发条归零时充能状态未重置
Co-authored-by: Cursor <cursoragent@cursor.com>
|
2026-07-22 16:25:05 +08:00 |
|
|
bottlefishandCursor
|
3d65941b03
|
fix(fixsystem): 修复线缆收放状态与阶段切换竞态
Co-authored-by: Cursor <cursoragent@cursor.com>
|
2026-07-22 16:24:52 +08:00 |
|
|
Ovid
|
5091851ead
|
结尾调整进行中
|
2026-07-22 04:23:37 +08:00 |
|
|
dingyuntian
|
34d2ac40eb
|
fix: 修复初次show_obj的延迟
|
2026-07-22 04:16:10 +08:00 |
|
|
dingyuntian
|
4411bfa4b6
|
Merge branch 'bugfix/美术素材填充' into 'develop'
fix: 保证离开BodyModule一定清屏
See merge request aibis-dream/aibis-dream!766
|
2026-07-21 20:06:30 +00:00 |
|
|
dingyuntian
|
02d3fc04e6
|
fix: 保证离开BodyModule一定清屏
|
2026-07-22 04:05:46 +08:00 |
|
|
dingyuntian
|
ef3c14d3de
|
Merge branch 'bugfix/美术素材填充' into 'develop'
Bugfix/美术素材填充
See merge request aibis-dream/aibis-dream!765
|
2026-07-21 20:02:51 +00:00 |
|
|
dingyuntian
|
b7fdcf97fe
|
fix: 插头不拔出屏幕不刷新
|
2026-07-22 04:01:52 +08:00 |
|
|
dingyuntian
|
ba0ce38c11
|
art: 美术素材问题
|
2026-07-22 03:17:40 +08:00 |
|
|
dingyuntian
|
3b5d05260e
|
Merge branch 'bugfix/已知问题修复' into 'develop'
Bugfix/已知问题修复
See merge request aibis-dream/aibis-dream!764
|
2026-07-21 18:33:48 +00:00 |
|
|
dingyuntian
|
f4488a68d0
|
feat: 检索及彩带Timeline
|
2026-07-22 02:32:42 +08:00 |
|
|
dingyuntian
|
c6c76666ef
|
feat: 帧动画系统Timeline兼容
|
2026-07-22 02:32:04 +08:00 |
|
|
Ovid
|
d655887a02
|
debug一些
|
2026-07-22 02:25:43 +08:00 |
|
|
Ovid
|
adbcd89918
|
Merge branch 'develop' into feature/demo脚本改动0722
|
2026-07-22 02:10:50 +08:00 |
|
|
dingyuntian
|
9b2caf64c9
|
art: 部分图像配置与按钮更新
|
2026-07-22 01:53:07 +08:00 |
|
|
dingyuntian
|
82b20a8fab
|
art: 火山彩带资源
|
2026-07-22 01:46:39 +08:00 |
|
|
dingyuntian
|
0f06041fa2
|
Merge branch '0720-振彤火山文本迭代' into 'develop'
火山stage8和第二天中午文本
See merge request aibis-dream/aibis-dream!763
|
2026-07-21 17:26:30 +00:00 |
|
|
dingyuntian
|
8a5d83d888
|
Merge branch 'develop' into '0720-振彤火山文本迭代'
# Conflicts:
# Assets/Yarn/FP/FP_Day2_mid/Day2_mid.yarn
|
2026-07-21 17:26:22 +00:00 |
|
|
Ovid
|
71a803fd72
|
Merge branch 'develop' into feature/demo脚本改动0722
|
2026-07-22 01:25:08 +08:00 |
|
|
Ovid
|
672d554b40
|
PP2调整上传
|
2026-07-22 01:23:01 +08:00 |
|
|
NeologismWu
|
4259306e1f
|
0722提交
0722提交
|
2026-07-22 01:21:10 +08:00 |
|
|
dingyuntian
|
8b16aebc6b
|
Merge branch '7.21春优化' into 'develop'
7.21春优化
See merge request aibis-dream/aibis-dream!762
|
2026-07-21 16:56:47 +00:00 |
|