 bottlefish
|
470a930f3c
|
提交
|
2025-02-23 23:16:36 +08:00 |
|
|
bottlefish
|
ccc54eace9
|
修复bug 增加选关
|
2025-02-23 20:31:30 +08:00 |
|
|
bottlefish
|
480c5c33d1
|
修复
|
2025-02-23 17:16:27 +08:00 |
|
 dingyuntian
|
5927fc9c6e
|
Merge branch 'bugfix/dialog' into 'develop'
dialog问题修改
See merge request aibis-dream/aibis-dream!276
|
2025-02-22 19:06:38 +00:00 |
|
|
dingyuntian
|
898d6946ab
|
dialog问题修改
|
2025-02-23 03:06:14 +08:00 |
|
|
bottlefish
|
8d1fd34c46
|
Merge branch 'debug2.22.16' into 'develop'
提交
See merge request aibis-dream/aibis-dream!274
|
2025-02-22 08:41:34 +00:00 |
|
|
bottlefish
|
9233c0e428
|
提交
|
2025-02-22 16:38:33 +08:00 |
|
|
bottlefish
|
1f2e2eccb0
|
Merge branch 'debug2.22' into 'develop'
Debug2.22
See merge request aibis-dream/aibis-dream!273
|
2025-02-21 19:23:49 +00:00 |
|
|
bottlefish
|
b12be15e9b
|
提交
|
2025-02-22 03:21:06 +08:00 |
|
|
bottlefish
|
76d2b3775a
|
修复
|
2025-02-22 03:19:24 +08:00 |
|
|
dingyuntian
|
f47e7d6b99
|
Merge branch 'feature/bubble' into 'develop'
合并
See merge request aibis-dream/aibis-dream!272
|
2025-02-21 18:43:32 +00:00 |
|
|
dingyuntian
|
8cdf40a9ad
|
合并
|
2025-02-22 02:42:57 +08:00 |
|
 chenziqin
|
f2baa2c689
|
Merge branch 'feature/Yarn_0219' into 'develop'
Feature/yarn 0219
See merge request aibis-dream/aibis-dream!271
|
2025-02-21 18:27:00 +00:00 |
|
 Ovid
|
8ffac0c1a2
|
Merge branch 'develop' into feature/Yarn_0219
|
2025-02-22 02:26:06 +08:00 |
|
|
Ovid
|
3fb2622009
|
day2end、day3end
|
2025-02-22 02:21:03 +08:00 |
|
|
dingyuntian
|
508bcdc50b
|
Merge branch 'feature/bubble' into 'develop'
Feature/bubble
See merge request aibis-dream/aibis-dream!269
|
2025-02-21 17:43:46 +00:00 |
|
|
dingyuntian
|
1a38ae4572
|
meta
|
2025-02-22 01:39:33 +08:00 |
|
|
dingyuntian
|
a991b83d90
|
Merge branch 'develop' into feature/bubble
|
2025-02-22 01:39:22 +08:00 |
|
|
dingyuntian
|
30ca85748d
|
气泡
|
2025-02-22 01:37:30 +08:00 |
|
|
chenziqin
|
ed13e254ed
|
Merge branch 'develop' into 'feature/Yarn_0219'
Develop
See merge request aibis-dream/aibis-dream!268
|
2025-02-21 15:24:56 +00:00 |
|
|
bottlefish
|
c0c03608a6
|
Merge branch '2.21.21.54优化' into 'develop'
2.21.21.54优化
See merge request aibis-dream/aibis-dream!267
|
2025-02-21 14:47:26 +00:00 |
|
|
bottlefish
|
d09994888c
|
提交
|
2025-02-21 22:46:45 +08:00 |
|
|
bottlefish
|
a2f996ce28
|
提交
|
2025-02-21 22:39:52 +08:00 |
|
|
bottlefish
|
34367f433f
|
Merge branch '2.21.17.51优化' into 'develop'
各种修改
See merge request aibis-dream/aibis-dream!266
|
2025-02-21 11:43:05 +00:00 |
|
|
bottlefish
|
473902b2d9
|
Merge branch 'develop' into '2.21.17.51优化'
# Conflicts:
# Assets/Resources/Yarn/FP_Peipei2/Stage1_佩佩开场对话.yarn
|
2025-02-21 11:42:59 +00:00 |
|
|
bottlefish
|
881cb0d929
|
各种修改
|
2025-02-21 19:42:02 +08:00 |
|
|
chenziqin
|
0a14538047
|
Merge branch 'feature/Yarn_0219' into 'develop'
Feature/yarn 0219
See merge request aibis-dream/aibis-dream!265
|
2025-02-21 10:43:18 +00:00 |
|
|
Ovid
|
99f8aca174
|
最后小改，课间和peipei2开头对话
|
2025-02-21 18:42:51 +08:00 |
|
|
chenziqin
|
c30435ef7c
|
Merge branch 'develop' into 'feature/Yarn_0219'
Develop
See merge request aibis-dream/aibis-dream!264
|
2025-02-21 10:14:59 +00:00 |
|
|
bottlefish
|
2ebcf6ee49
|
Merge branch '2.21优化' into 'develop'
2.21优化
See merge request aibis-dream/aibis-dream!263
|
2025-02-21 09:47:15 +00:00 |
|
|
bottlefish
|
953f2fa852
|
各种提交
|
2025-02-21 17:46:01 +08:00 |
|
|
bottlefish
|
1af4418ac0
|
提交
|
2025-02-21 15:32:00 +08:00 |
|
|
dingyuntian
|
ae8a40229b
|
Merge branch 'bugfix/fadein' into 'develop'
timeline指令
See merge request aibis-dream/aibis-dream!261
|
2025-02-21 06:25:56 +00:00 |
|
|
dingyuntian
|
cc16f23a93
|
timeline指令
|
2025-02-21 14:23:42 +08:00 |
|
|
chenziqin
|
d6a3eb6997
|
Merge branch 'develop' into 'feature/Yarn_0219'
Develop
See merge request aibis-dream/aibis-dream!260
|
2025-02-21 06:13:42 +00:00 |
|
|
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 |
|