 dingyuntian
|
bfe7db351c
|
Merge branch 'bugfix/fadein' into 'develop'
Bugfix/fadein
See merge request aibis-dream/aibis-dream!259
|
2025-02-21 03:15:03 +00:00 |
|
|
dingyuntian
|
91263a98bc
|
唱针
|
2025-02-21 11:14:17 +08:00 |
|
|
dingyuntian
|
9ecc5191b1
|
问题修改
|
2025-02-21 11:12:02 +08:00 |
|
|
dingyuntian
|
6cf743afc7
|
Merge branch 'feature/spritegroup' into 'develop'
Feature/spritegroup
See merge request aibis-dream/aibis-dream!258
|
2025-02-21 02:50:11 +00:00 |
|
 chenziqin
|
9943da8d37
|
Merge branch 'feature/Yarn_0219' into 'develop'
Feature/yarn 0219
See merge request aibis-dream/aibis-dream!257
|
2025-02-20 20:25:34 +00:00 |
|
 Ovid
|
ba88ee5c1a
|
丢失更改恢复
|
2025-02-21 04:22:10 +08:00 |
|
|
Ovid
|
459e72f5e5
|
+emotion
|
2025-02-21 03:58:22 +08:00 |
|
|
dingyuntian
|
eae34b7d6e
|
合并
|
2025-02-21 02:01:39 +08:00 |
|
|
chenziqin
|
0a005ea3c9
|
Merge branch 'develop' into 'feature/Yarn_0219'
Develop
See merge request aibis-dream/aibis-dream!255
|
2025-02-20 17:57:05 +00:00 |
|
 bottlefish
|
88b4863a4f
|
Merge branch '2.20春修改' into 'develop'
2.20春修改
See merge request aibis-dream/aibis-dream!256
|
2025-02-20 17:50:07 +00:00 |
|
|
bottlefish
|
0d9a9eba24
|
Merge branch 'develop' into 2.20春修改
|
2025-02-21 01:49:17 +08:00 |
|
|
chenziqin
|
76d20def01
|
Merge branch 'develop' into 'feature/Yarn_0219'
Develop
See merge request aibis-dream/aibis-dream!254
|
2025-02-20 17:31:07 +00:00 |
|
|
bottlefish
|
472be7b042
|
Merge branch '回退timeline' into 'develop'
回退timeline
See merge request aibis-dream/aibis-dream!253
|
2025-02-20 17:14:34 +00:00 |
|
|
bottlefish
|
713fba16ee
|
回退timeline
|
2025-02-21 01:14:05 +08:00 |
|
|
bottlefish
|
5f40a69044
|
Merge branch '补资产' into 'develop'
补资产
See merge request aibis-dream/aibis-dream!252
|
2025-02-20 17:03:15 +00:00 |
|
|
bottlefish
|
cbcdd3b573
|
补资产
|
2025-02-21 01:00:01 +08:00 |
|
|
dingyuntian
|
934c1d96df
|
Merge branch 'develop' into feature/spritegroup
|
2025-02-21 00:37:05 +08:00 |
|
|
dingyuntian
|
76d2332c2c
|
自动生成
|
2025-02-21 00:37:00 +08:00 |
|
|
chenziqin
|
24a890e577
|
Merge branch 'feature/Yarn_0219' into 'develop'
Feature/yarn 0219
See merge request aibis-dream/aibis-dream!251
|
2025-02-20 16:36:25 +00:00 |
|
|
Ovid
|
7c1df6cda9
|
Merge branch 'develop' into feature/Yarn_0219
|
2025-02-21 00:35:15 +08:00 |
|
|
Ovid
|
990c53389f
|
shitou2_eyetext_fix
|
2025-02-21 00:33:10 +08:00 |
|
|
dingyuntian
|
13e0db49fd
|
Merge branch 'develop' into feature/spritegroup
|
2025-02-21 00:31:29 +08:00 |
|
|
Ovid
|
adeea6cfda
|
music fix
|
2025-02-21 00:31:05 +08:00 |
|
|
dingyuntian
|
e199a98666
|
Merge branch 'bugfix/shitouscene' into 'develop'
Bugfix/shitouscene
See merge request aibis-dream/aibis-dream!249
|
2025-02-20 16:24:29 +00:00 |
|
|
dingyuntian
|
65c5c6d32d
|
全屏展示图片
|
2025-02-21 00:23:55 +08:00 |
|
|
dingyuntian
|
6cedae4d07
|
scene
|
2025-02-21 00:14:59 +08:00 |
|
|
dingyuntian
|
9ee1c48083
|
Kit
|
2025-02-21 00:06:45 +08:00 |
|
|
chenziqin
|
8f3d205016
|
Merge branch 'feature/Yarn_0219' into 'develop'
+music
See merge request aibis-dream/aibis-dream!248
|
2025-02-20 14:23:30 +00:00 |
|
|
Ovid
|
fc1ca9543e
|
+music
|
2025-02-20 22:22:53 +08:00 |
|
|
chenziqin
|
4ac53dd89d
|
Merge branch 'feature/Yarn_0219' into 'develop'
+peipei2analyze
See merge request aibis-dream/aibis-dream!247
|
2025-02-20 12:31:57 +00:00 |
|
|
Ovid
|
ba2c675f6b
|
+peipei2analyze
|
2025-02-20 20:31:17 +08:00 |
|
|
dingyuntian
|
a70b05737c
|
Merge branch 'bugfix/timeline' into 'develop'
修改
See merge request aibis-dream/aibis-dream!246
|
2025-02-20 11:54:59 +00:00 |
|
|
dingyuntian
|
9b04f250e4
|
修改
|
2025-02-20 19:52:00 +08:00 |
|
|
chenziqin
|
40a76d7b52
|
Merge branch 'feature/Yarn_0219' into 'develop'
+peipei1analyze
See merge request aibis-dream/aibis-dream!245
|
2025-02-20 10:56:13 +00:00 |
|
|
Ovid
|
fb0a075d94
|
+peipei1analyze
|
2025-02-20 18:55:09 +08:00 |
|
|
bottlefish
|
58bf374958
|
Merge branch 'bugfix2.20' into 'develop'
修复
See merge request aibis-dream/aibis-dream!244
|
2025-02-20 08:33:43 +00:00 |
|
|
bottlefish
|
7b7933e9b2
|
修复
|
2025-02-20 16:12:23 +08:00 |
|
|
bottlefish
|
12c80a44d4
|
Merge branch 'develop' into '2.20春修改'
# Conflicts:
# Assets/Resources/Yarn/FP_Peipei2/Stage11_手术.yarn
# Assets/Resources/Yarn/FP_Peipei2/Stage3_身体检查.yarn
# Assets/Resources/Yarn/FP_Peipei2/Stage8_停止想象.yarn
|
2025-02-20 07:21:34 +00:00 |
|
|
bottlefish
|
de1ac68f99
|
各种问题修复
|
2025-02-20 13:02:35 +08:00 |
|
|
chenziqin
|
113526aaba
|
Merge branch 'feature/Yarn_0219' into 'develop'
+task
See merge request aibis-dream/aibis-dream!242
|
2025-02-19 18:17:05 +00:00 |
|
|
Ovid
|
9d2e4247a0
|
+task
|
2025-02-20 02:15:34 +08:00 |
|
|
dingyuntian
|
4edffabe0e
|
Merge branch 'bugfix/timeline' into 'develop'
Bugfix/timeline
See merge request aibis-dream/aibis-dream!241
|
2025-02-19 17:40:39 +00:00 |
|
|
dingyuntian
|
9b4c0ddfeb
|
美术替换
|
2025-02-20 01:40:04 +08:00 |
|
|
dingyuntian
|
7c27fbc7b4
|
Merge branch 'develop' into bugfix/timeline
|
2025-02-20 00:55:56 +08:00 |
|
|
dingyuntian
|
543ecf49b1
|
美术资源替换
|
2025-02-20 00:55:14 +08:00 |
|
|
bottlefish
|
be2fb7d992
|
Merge branch '视觉UF检查RGB值' into 'develop'
增加RGB值
See merge request aibis-dream/aibis-dream!240
|
2025-02-19 13:20:51 +00:00 |
|
|
chenziqin
|
b7d6a9f35e
|
Merge branch 'feature/yarn_0219' into 'develop'
自测yarn
See merge request aibis-dream/aibis-dream!239
|
2025-02-19 13:19:23 +00:00 |
|
|
Ovid
|
b5db9b8b44
|
自测yarn
|
2025-02-19 21:18:13 +08:00 |
|
|
bottlefish
|
20893f337c
|
增加RGB值
|
2025-02-19 17:48:17 +08:00 |
|
|
bottlefish
|
33c28c7469
|
Merge branch 'feature/插线相关调整' into 'develop'
Feature/插线相关调整
See merge request aibis-dream/aibis-dream!238
|
2025-02-19 09:27:41 +00:00 |
|