 dingyuntian
|
e12d6de149
|
Update ClueBoardDay2.yarn
|
2024-11-15 06:09:31 +08:00 |
|
|
dingyuntian
|
aafdf20b01
|
yarn格式问题
|
2024-11-15 05:45:54 +08:00 |
|
|
dingyuntian
|
52695800c2
|
Merge branch 'feature/bugfix_clueboard' into 'develop'
Feature/bugfix clueboard
See merge request aibis-dream/aibis-dream!88
|
2024-11-14 21:18:27 +00:00 |
|
|
dingyuntian
|
174df7be35
|
Merge branch 'develop' into feature/bugfix_clueboard
|
2024-11-15 05:17:56 +08:00 |
|
|
dingyuntian
|
06f5926593
|
调整clueboard节点后，忘了把他们的flag都去掉
|
2024-11-15 05:07:37 +08:00 |
|
 bottlefish
|
39bc36347e
|
Merge branch '春晖11.15.03.02' into 'develop'
打包修改，包跑通了
See merge request aibis-dream/aibis-dream!87
|
2024-11-14 20:51:58 +00:00 |
|
|
bottlefish
|
29ba894569
|
Merge branch 'develop' into '春晖11.15.03.02'
# Conflicts:
# Assets/Resources/Yarn/PeipeiNew2/ClueBoardDay2.yarn
|
2024-11-14 20:51:31 +00:00 |
|
|
bottlefish
|
a23e37dbfd
|
打包修改，包跑通了
|
2024-11-15 04:50:13 +08:00 |
|
|
dingyuntian
|
49144ea438
|
调整clueboard位置{day2}和描述{12都有}
|
2024-11-15 04:47:10 +08:00 |
|
|
dingyuntian
|
7ae7a808fb
|
Merge branch 'develop' into 'feature/bugfix_clueboard'
Develop
See merge request aibis-dream/aibis-dream!86
|
2024-11-14 20:16:06 +00:00 |
|
|
bottlefish
|
0036d6108d
|
Merge branch '春晖11.15.03.02' into 'develop'
春晖11.15.03.02
See merge request aibis-dream/aibis-dream!85
|
2024-11-14 20:15:13 +00:00 |
|
|
bottlefish
|
9889c8a90f
|
一些修复
|
2024-11-15 04:14:31 +08:00 |
|
|
dingyuntian
|
d86aa3831a
|
Merge branch 'develop' into 'feature/bugfix_clueboard'
Develop
See merge request aibis-dream/aibis-dream!84
|
2024-11-14 19:57:18 +00:00 |
|
|
bottlefish
|
3890536622
|
引导加入
|
2024-11-15 03:55:20 +08:00 |
|
|
dingyuntian
|
4f5c74ad2c
|
Merge branch 'feature/bugfix_clueboard' into 'develop'
clueboardday2文本调整，让正常人更能看懂
See merge request aibis-dream/aibis-dream!83
|
2024-11-14 19:54:42 +00:00 |
|
|
dingyuntian
|
524ce54a7c
|
clueboardday2文本调整，让正常人更能看懂
|
2024-11-15 03:49:21 +08:00 |
|
|
bottlefish
|
74f9ebcc32
|
修复提示不出现的问题
|
2024-11-15 03:11:40 +08:00 |
|
|
bottlefish
|
88ad6bc706
|
Merge branch '春晖11.15.2.28' into 'develop'
春晖11.15.2.28
See merge request aibis-dream/aibis-dream!82
|
2024-11-14 19:01:33 +00:00 |
|
|
bottlefish
|
8638106346
|
优化clueboard（或许是优化）
|
2024-11-15 03:00:36 +08:00 |
|
|
bottlefish
|
d2cc447101
|
提交clueboard的清理
|
2024-11-15 02:30:52 +08:00 |
|
|
bottlefish
|
30a96dbbfe
|
Merge branch '春晖11.14.23.38' into 'develop'
Update PeipeiNew2.yarn
See merge request aibis-dream/aibis-dream!81
|
2024-11-14 17:21:50 +00:00 |
|
|
bottlefish
|
c01b55806f
|
修改了插头的功能，增加了插头触发对话，保险起见只触发一次
|
2024-11-15 01:20:32 +08:00 |
|
|
bottlefish
|
40bd8a7475
|
修改day2部分对话
|
2024-11-15 00:05:09 +08:00 |
|
|
bottlefish
|
859775b821
|
Update PeipeiNew2.yarn
处理day2的存档
添加人物和表情
|
2024-11-14 23:59:31 +08:00 |
|
|
bottlefish
|
1197c8179a
|
Merge branch '春晖11.14.18.00' into 'develop'
day2开头的图以及和后面node对应
See merge request aibis-dream/aibis-dream!80
|
2024-11-14 15:37:42 +00:00 |
|
|
bottlefish
|
a9618dafd3
|
Merge branch '春晖11.14.18.00' of http://114.67.212.218:8011/aibis-dream/aibis-dream into 春晖11.14.18.00
|
2024-11-14 23:31:31 +08:00 |
|
|
bottlefish
|
d886175ef8
|
Day1Day2”真“跑通
Day1基本Ok了
Day2分支还没测，Day2ClueBoard可以优化
插线功能还没改，插线对话还没接入
ClueBoard镜头功能还没加入
|
2024-11-14 23:29:19 +08:00 |
|
|
dingyuntian
|
6d2d6c887b
|
Merge branch '文字校对-11.14' into '春晖11.14.18.00'
文字校对
See merge request aibis-dream/aibis-dream!79
|
2024-11-14 15:16:16 +00:00 |
|
 NeologismWu
|
9240c13b5f
|
文字校对
文字校对
|
2024-11-14 23:13:01 +08:00 |
|
|
bottlefish
|
27d6c15a26
|
Day2的线的初始化，Day1的task
|
2024-11-14 21:05:40 +08:00 |
|
|
bottlefish
|
cd2c7fdc9d
|
day2开头的图以及和后面node对应
day2开头的图以及和后面node对应
|
2024-11-14 20:49:06 +08:00 |
|
|
bottlefish
|
58e338ce5b
|
打孔带变色，day1bug修复
|
2024-11-14 18:21:09 +08:00 |
|
|
bottlefish
|
21ef4b0dbd
|
Merge branch '春晖11.14.11.43' into 'develop'
修复线不消失的问题
See merge request aibis-dream/aibis-dream!78
|
2024-11-14 09:59:42 +00:00 |
|
|
bottlefish
|
b01a472389
|
修复线不消失的问题
|
2024-11-14 17:58:22 +08:00 |
|
|
bottlefish
|
0a9a3a332e
|
Merge branch '春晖11.14.11.43' into 'develop'
春晖11.14.11.43
See merge request aibis-dream/aibis-dream!77
|
2024-11-14 09:34:36 +00:00 |
|
|
bottlefish
|
0fb976edf3
|
修改day2眼睛上色模式
|
2024-11-14 17:32:53 +08:00 |
|
|
bottlefish
|
29ef472517
|
终于都再次通了
|
2024-11-14 17:30:47 +08:00 |
|
|
bottlefish
|
89c96baa06
|
至少跑通了
|
2024-11-14 15:49:52 +08:00 |
|
|
bottlefish
|
190e8642e1
|
Merge branch '春晖11.14.5.35' into 'develop'
春晖11.14.5.35
See merge request aibis-dream/aibis-dream!75
|
2024-11-14 03:42:29 +00:00 |
|
|
bottlefish
|
1c179752e6
|
Merge branch 'develop' into '春晖11.14.5.35'
# Conflicts:
# Assets/Resources/Yarn/PeipeiNew2/PeipeiNew2.yarn
|
2024-11-14 03:42:21 +00:00 |
|
|
bottlefish
|
2bb41f4649
|
不知道改了神秘先提交下
|
2024-11-14 11:40:57 +08:00 |
|
 chenziqin
|
895702fdbf
|
Merge branch 'peipeinew2' into 'develop'
text speedup
See merge request aibis-dream/aibis-dream!74
|
2024-11-14 01:58:26 +00:00 |
|
|
chenziqin
|
1399ff35ff
|
Merge branch 'peipeinew2' into 'develop'
Peipeinew2
See merge request aibis-dream/aibis-dream!73
|
2024-11-14 01:55:30 +00:00 |
|
|
Ovid
|
d793f7c2ad
|
text speedup
|
2024-11-14 09:55:23 +08:00 |
|
|
Ovid
|
0f870396bc
|
add task， 处理clueboard前后文本
|
2024-11-14 09:52:15 +08:00 |
|
|
bottlefish
|
ff1b00d37c
|
发热功能完成，试图给打孔带加状态
|
2024-11-14 07:44:14 +08:00 |
|
|
Ovid
|
d434fde9f0
|
Merge branch 'develop' into peipeinew2
|
2024-11-14 06:23:25 +08:00 |
|
|
Ovid
|
4895de20b0
|
new2
|
2024-11-14 06:09:55 +08:00 |
|
|
bottlefish
|
6d991e0fee
|
Merge branch '春晖11.13.20.08' into 'develop'
春晖11.13.20.08
See merge request aibis-dream/aibis-dream!71
|
2024-11-13 21:34:18 +00:00 |
|
|
bottlefish
|
6ac5ffb18b
|
Day1 Day2 ClueBoard完成
|
2024-11-14 05:31:06 +08:00 |
|