dingyuntian
|
63fa19266c
|
Merge branch 'develop' into bugfix/小调整
|
2025-06-13 16:24:45 +08:00 |
|
dingyuntian
|
83d103871c
|
对话框调整
|
2025-06-13 16:24:38 +08:00 |
|
dingyuntian
|
10d964d3b0
|
地铁功能新增
|
2025-06-12 22:40:40 +08:00 |
|
dingyuntian
|
338e593c4d
|
Merge branch 'bugfix/小调整' into 'develop'
Bugfix/小调整
See merge request aibis-dream/aibis-dream!446
|
2025-06-12 06:51:08 +00:00 |
|
dingyuntian
|
29b5a5779e
|
气泡丢失
|
2025-06-12 14:47:58 +08:00 |
|
dingyuntian
|
8c367b22fb
|
Update Art Resources.asset
|
2025-06-12 14:40:42 +08:00 |
|
dingyuntian
|
de0b708d06
|
Merge branch '6.11bug修复' into 'develop'
6.11bug修复
See merge request aibis-dream/aibis-dream!445
|
2025-06-12 06:37:24 +00:00 |
|
dingyuntian
|
2c00d8ecff
|
Merge branch 'develop' into 6.11bug修复
|
2025-06-12 14:36:11 +08:00 |
|
dingyuntian
|
1461a7c796
|
层级修改
|
2025-06-12 14:36:04 +08:00 |
|
dingyuntian
|
2784ae99df
|
相机
|
2025-06-11 21:59:36 +08:00 |
|
dingyuntian
|
32ecdd1591
|
Merge branch 'bugfix/bubble' into 'develop'
问题修改
See merge request aibis-dream/aibis-dream!441
|
2025-06-11 11:15:52 +00:00 |
|
dingyuntian
|
fe3b907d12
|
问题修改
|
2025-06-11 19:15:15 +08:00 |
|
dingyuntian
|
36ef851e15
|
Merge branch 'feature/地铁补正' into 'develop'
Feature/地铁补正
See merge request aibis-dream/aibis-dream!438
|
2025-06-11 09:54:58 +00:00 |
|
dingyuntian
|
e6709e621d
|
选项修改
|
2025-06-11 17:54:19 +08:00 |
|
dingyuntian
|
ae9ce6312b
|
气泡长度问题
|
2025-06-11 16:31:24 +08:00 |
|
dingyuntian
|
93e8ae09fa
|
Merge branch 'feature/地铁补正' into 'develop'
提交
See merge request aibis-dream/aibis-dream!436
|
2025-06-11 08:17:12 +00:00 |
|
dingyuntian
|
5eb19999f9
|
提交
|
2025-06-11 16:16:44 +08:00 |
|
dingyuntian
|
a0c4f25c44
|
Merge branch 'feature/地铁补正' into 'develop'
旧资源清理
See merge request aibis-dream/aibis-dream!435
|
2025-06-11 08:08:38 +00:00 |
|
dingyuntian
|
fb0a3565cc
|
旧资源清理
|
2025-06-11 16:07:49 +08:00 |
|
dingyuntian
|
9b8b8b278c
|
Merge branch 'feature/地铁补正' into 'develop'
Feature/地铁补正
See merge request aibis-dream/aibis-dream!434
|
2025-06-11 06:41:44 +00:00 |
|
dingyuntian
|
8ebcfb5188
|
问题修改
|
2025-06-11 14:41:06 +08:00 |
|
dingyuntian
|
2ead6c8241
|
对话框补回去
|
2025-06-11 14:07:15 +08:00 |
|
dingyuntian
|
5745883d40
|
Merge branch 'feature/海浪' into 'develop'
Feature/海浪
See merge request aibis-dream/aibis-dream!433
|
2025-06-11 05:53:18 +00:00 |
|
dingyuntian
|
d2c897bc1f
|
问题修改
|
2025-06-11 13:52:30 +08:00 |
|
dingyuntian
|
12869ac835
|
Merge branch 'develop' into feature/海浪
|
2025-06-11 13:12:37 +08:00 |
|
dingyuntian
|
2610f6b3d5
|
修改
|
2025-06-11 13:12:04 +08:00 |
|
dingyuntian
|
8143e6c447
|
Merge branch 'feature/海浪' into 'develop'
问题修改
See merge request aibis-dream/aibis-dream!429
|
2025-06-10 14:58:00 +00:00 |
|
dingyuntian
|
f0bd5920e5
|
问题修改
|
2025-06-10 22:57:10 +08:00 |
|
dingyuntian
|
96171407dc
|
Merge branch 'feature/海浪' into 'develop'
Feature/海浪
See merge request aibis-dream/aibis-dream!428
|
2025-06-10 14:27:51 +00:00 |
|
dingyuntian
|
6e5d68a18d
|
Merge remote-tracking branch 'origin/优化6.10.21' into feature/海浪
|
2025-06-10 22:26:08 +08:00 |
|
dingyuntian
|
6866723746
|
表
|
2025-06-10 22:25:35 +08:00 |
|
dingyuntian
|
f80e3823b6
|
Merge branch 'feature/海浪' into 'develop'
Feature/海浪
See merge request aibis-dream/aibis-dream!427
|
2025-06-10 14:21:28 +00:00 |
|
dingyuntian
|
d00c668681
|
Merge branch 'develop' into feature/海浪
|
2025-06-10 22:20:49 +08:00 |
|
dingyuntian
|
83d606cf1f
|
问题调整
|
2025-06-10 22:19:48 +08:00 |
|
dingyuntian
|
9ef261b8c1
|
Merge branch 'develop' into feature/海浪
|
2025-06-10 18:53:52 +08:00 |
|
dingyuntian
|
95c25a0f85
|
Merge branch '全流程6.10.15' into 'develop'
气泡
See merge request aibis-dream/aibis-dream!424
|
2025-06-10 10:52:14 +00:00 |
|
dingyuntian
|
2ab6004d8f
|
气泡
|
2025-06-10 18:49:40 +08:00 |
|
dingyuntian
|
890d06d66d
|
Merge branch '全流程6.10.15' into 'develop'
全流程6.10.15
See merge request aibis-dream/aibis-dream!423
|
2025-06-10 09:35:01 +00:00 |
|
dingyuntian
|
38f93d5695
|
Update Stage2-5_切割.yarn
|
2025-06-10 17:33:29 +08:00 |
|
dingyuntian
|
7d76a275e5
|
新Dialog
|
2025-06-10 17:11:10 +08:00 |
|
dingyuntian
|
37f0d93c28
|
Merge branch 'feature/海浪' into 'develop'
海浪
See merge request aibis-dream/aibis-dream!422
|
2025-06-10 08:32:47 +00:00 |
|
dingyuntian
|
2cab2c3b64
|
海浪
|
2025-06-10 16:30:26 +08:00 |
|
dingyuntian
|
c047a6132b
|
Merge branch 'feature/海浪' into 'develop'
复原
See merge request aibis-dream/aibis-dream!421
|
2025-06-10 08:03:07 +00:00 |
|
dingyuntian
|
040ffdc497
|
复原
|
2025-06-10 16:01:48 +08:00 |
|
dingyuntian
|
a344d8c701
|
Merge branch 'feature/海浪' into 'develop'
rebuild fmod
See merge request aibis-dream/aibis-dream!420
|
2025-06-10 07:40:36 +00:00 |
|
dingyuntian
|
775a57d00d
|
Merge branch 'bugfix/merge' into 'develop'
Bugfix/merge
See merge request aibis-dream/aibis-dream!419
|
2025-06-10 07:11:23 +00:00 |
|
dingyuntian
|
745fa81f14
|
Merge branch 'develop' into bugfix/merge
|
2025-06-10 15:10:27 +08:00 |
|
dingyuntian
|
965500f408
|
Merge branch '6.4.20全流程优化' into bugfix/merge
|
2025-06-10 15:09:42 +08:00 |
|
dingyuntian
|
4a9b842d91
|
Merge branch 'feature/新对话框' into 'develop'
Feature/新对话框
See merge request aibis-dream/aibis-dream!417
|
2025-06-10 06:11:24 +00:00 |
|
dingyuntian
|
b9978e96b7
|
相机
|
2025-06-10 14:10:58 +08:00 |
|
dingyuntian
|
cf090fa347
|
Merge branch 'develop' into feature/新对话框
|
2025-06-10 13:59:32 +08:00 |
|
dingyuntian
|
4686f42a01
|
指针切换
|
2025-06-09 23:40:22 +08:00 |
|
dingyuntian
|
e87c1f4ad2
|
Merge branch 'feature/新对话框' into 'develop'
Feature/新对话框
See merge request aibis-dream/aibis-dream!415
|
2025-06-09 14:12:17 +00:00 |
|
dingyuntian
|
9b54b16b23
|
开头调通
|
2025-06-09 22:11:19 +08:00 |
|
dingyuntian
|
f815c36936
|
Merge branch 'develop' into feature/新对话框
|
2025-06-09 18:14:05 +08:00 |
|
dingyuntian
|
43c375ff89
|
对话框调整
|
2025-06-09 18:12:56 +08:00 |
|
dingyuntian
|
20b580d675
|
Merge branch 'develop' into feature/新对话框
|
2025-06-09 14:46:27 +08:00 |
|
dingyuntian
|
0e2d2cee07
|
对话框
|
2025-06-09 14:43:58 +08:00 |
|
dingyuntian
|
9ae715c71a
|
地铁
|
2025-06-08 23:46:23 +08:00 |
|
dingyuntian
|
e194fb9fbc
|
对话框配置
|
2025-06-06 22:58:50 +08:00 |
|
dingyuntian
|
0589ce17e1
|
对话框风格设置
|
2025-06-06 14:04:26 +08:00 |
|
dingyuntian
|
c195a3bb15
|
Merge branch 'develop' into feature/新对话框
|
2025-06-05 22:24:43 +08:00 |
|
dingyuntian
|
3a46dc1142
|
删除部分图片
|
2025-06-05 22:20:30 +08:00 |
|
dingyuntian
|
66e5e48876
|
对话系统
|
2025-06-05 22:02:26 +08:00 |
|
dingyuntian
|
c839eb4c12
|
Merge branch '6.4.20全流程优化' of ssh://114.67.212.218:2222/aibis-dream/aibis-dream into 6.4.20全流程优化
|
2025-06-05 16:12:56 +08:00 |
|
dingyuntian
|
9243f4afc6
|
对话框
|
2025-06-05 16:12:17 +08:00 |
|
dingyuntian
|
4c031bfa3e
|
一些本地化修改
|
2025-06-05 14:34:32 +08:00 |
|
dingyuntian
|
f14cdf90f6
|
对话框
|
2025-06-04 21:45:50 +08:00 |
|
dingyuntian
|
c468c8b070
|
批量生成点
|
2025-06-04 14:53:27 +08:00 |
|
dingyuntian
|
23e665f34c
|
一些修改
|
2025-06-04 12:11:21 +08:00 |
|
dingyuntian
|
d99bfe5c30
|
更新
|
2025-05-30 19:00:55 +08:00 |
|
dingyuntian
|
d364ab8d36
|
小修正
|
2025-05-30 18:41:41 +08:00 |
|
dingyuntian
|
00d10fe0ad
|
Yarn命令变化
|
2025-05-30 18:38:00 +08:00 |
|
dingyuntian
|
beba63b987
|
Merge branch 'develop' into feature/environment
|
2025-05-30 17:58:30 +08:00 |
|
dingyuntian
|
71f71aee36
|
人物工具,环境工具,生成器
|
2025-05-30 17:58:07 +08:00 |
|
dingyuntian
|
1dd27a51b9
|
Update CameraKit.cs
|
2025-05-29 15:31:02 +08:00 |
|
dingyuntian
|
b23af0626f
|
物体生成
|
2025-05-29 15:27:58 +08:00 |
|
dingyuntian
|
0777f4810a
|
Update CameraKit.cs
|
2025-05-29 15:27:15 +08:00 |
|
dingyuntian
|
a3d9d07a27
|
Merge branch 'develop' into feature/environment
|
2025-05-29 15:11:22 +08:00 |
|
dingyuntian
|
fb0c39ccbf
|
场景和角色管理替换
|
2025-05-28 21:48:33 +08:00 |
|
dingyuntian
|
08e777a9ce
|
Merge branch 'feature/dialog' into 'develop'
Feature/dialog
See merge request aibis-dream/aibis-dream!406
|
2025-05-28 08:22:51 +00:00 |
|
dingyuntian
|
a9d05f69fb
|
按钮
|
2025-05-28 16:22:11 +08:00 |
|
dingyuntian
|
4a63249e0c
|
选项选择后隐藏
|
2025-05-28 16:19:03 +08:00 |
|
dingyuntian
|
26e48ec37f
|
对话框优化
|
2025-05-28 15:58:50 +08:00 |
|
dingyuntian
|
34f6aac9a1
|
Merge branch 'feature/scene' into 'develop'
人物
See merge request aibis-dream/aibis-dream!405
|
2025-05-26 09:14:20 +00:00 |
|
dingyuntian
|
b14eb20e9f
|
人物
|
2025-05-26 17:13:37 +08:00 |
|
dingyuntian
|
8f46e75e52
|
Merge branch 'feature/actorManager' into 'develop'
Feature/actor manager
See merge request aibis-dream/aibis-dream!404
|
2025-05-26 07:47:51 +00: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 |
|
dingyuntian
|
d6fd171720
|
Merge branch 'feature/screen' into 'develop'
Feature/screen
See merge request aibis-dream/aibis-dream!402
|
2025-05-21 13:04:38 +00:00 |
|
dingyuntian
|
250dda0436
|
插线系统更新
|
2025-05-21 21:03:52 +08:00 |
|
dingyuntian
|
576de0c719
|
Update ChillBitmap_16px SDF.asset
|
2025-05-21 17:58:53 +08:00 |
|
dingyuntian
|
cae274f271
|
Merge branch 'develop' into feature/dialogUI
|
2025-05-21 17:49:50 +08:00 |
|
dingyuntian
|
386bb2f2f1
|
Merge branch 'bugfix/font' into 'develop'
字体订正
See merge request aibis-dream/aibis-dream!401
|
2025-05-21 09:07:06 +00:00 |
|
dingyuntian
|
5367fe9d74
|
字体订正
|
2025-05-21 17:04:58 +08:00 |
|
dingyuntian
|
dba10f8c0b
|
Merge branch 'bugfix/font' into 'develop'
字体变化
See merge request aibis-dream/aibis-dream!400
|
2025-05-21 08:52:55 +00:00 |
|
dingyuntian
|
75a4d9cb74
|
字体变化
|
2025-05-21 16:52:17 +08:00 |
|
dingyuntian
|
aec424fcd5
|
修改
|
2025-05-21 16:47:17 +08:00 |
|
dingyuntian
|
1881cdf686
|
Merge branch 'develop' into feature/dialogUI
|
2025-05-20 20:26:52 +08:00 |
|