tinbird/aibis-dream
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,260 Commits 21 Branches 14 Tags
39e2c1dae44ae4dbdd47e4daab436bc2f3508a3a
Commit Graph
1260 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Ovid 39e2c1dae4 Merge branch 'develop' into FP_Prologue 2025-05-16 13:51:47 +08:00
Ovid d3f6094b3e 串通D0D1 2025-05-15 22:12:46 +08:00
dingyuntian 0915763ef6 Merge branch 'feature/open' into 'develop' 
Feature/open

See merge request aibis-dream/aibis-dream!385
 2025-05-15 13:32:34 +00:00
dingyuntian 720c6933b0 字体替换 2025-05-15 21:32:07 +08:00
Ovid 42f4216224 Merge branch 'develop' into FP_Prologue 2025-05-15 21:30:07 +08:00
dingyuntian 3a477eec75 字体更新 2025-05-15 21:27:13 +08:00
dingyuntian 89829f1c1a Merge branch 'feature/open' into 'develop' 
Feature/open

See merge request aibis-dream/aibis-dream!384
 2025-05-15 12:59:42 +00:00
dingyuntian 874b2d5ef2 酒吧 2025-05-15 20:51:47 +08:00
bottlefish ad73e96b21 Merge branch '情绪分支测试' into 'develop' 
情绪分支测试

See merge request aibis-dream/aibis-dream!383
 2025-05-15 09:53:37 +00:00
bottlefish 843bb4f0e9 Merge branch 'develop' into 情绪分支测试 2025-05-15 17:52:54 +08:00
bottlefish 5c13601fcb Merge branch 'develop' into 情绪分支测试 2025-05-15 17:51:09 +08:00
bottlefish 8d8aed74c2 Merge branch 'FP_Prologue' into 'develop' 
Fp prologue

See merge request aibis-dream/aibis-dream!382
 2025-05-15 09:49:34 +00:00
bottlefish 9ae7520a28 Merge branch 'develop' into FP_Prologue 2025-05-15 17:47:10 +08:00
bottlefish 4c84d6ef28 修复部分问题 2025-05-15 17:45:33 +08:00
dingyuntian 976517d7b9 Merge branch 'bugfix/tasl' into 'develop' 
Bugfix/tasl

See merge request aibis-dream/aibis-dream!381
 2025-05-15 09:22:54 +00:00
dingyuntian 362b4608bd Update ProjectSettings.asset 2025-05-15 17:20:10 +08:00
dingyuntian d1c1b25f27 task 2025-05-15 16:50:49 +08:00
dingyuntian 9815400bb0 Task 2025-05-15 16:37:10 +08:00
dingyuntian bc5bf8f411 Merge branch 'develop' into feature/open 2025-05-15 16:23:14 +08:00
dingyuntian 8abdd6d1f8 Playable 2025-05-15 16:22:22 +08:00
dingyuntian ff22df0ab3 Merge branch 'feature/open' into 'develop' 
Feature/open

See merge request aibis-dream/aibis-dream!380
 2025-05-15 07:39:11 +00:00
dingyuntian 650d1f3edd 临时对话条 2025-05-15 15:37:45 +08:00
dingyuntian 2d726f8c9d link 2025-05-15 13:09:42 +08:00
dingyuntian f0e02a04dd Merge branch 'bugfix/fix' into 'develop' 
奇怪问题

See merge request aibis-dream/aibis-dream!379
 2025-05-14 14:42:17 +00:00
dingyuntian 6d46818012 奇怪问题 2025-05-14 22:40:24 +08:00
dingyuntian 16c3dfcb04 Merge branch 'feature/open' into 'develop' 
Feature/open

See merge request aibis-dream/aibis-dream!378
 2025-05-14 13:28:20 +00:00
dingyuntian 569e29f261 文本问题 2025-05-14 21:27:31 +08:00
dingyuntian 0eb77750fb Merge branch 'develop' into feature/open 2025-05-14 21:21:10 +08:00
dingyuntian b68122f7d4 惊醒 2025-05-14 21:17:26 +08:00
bottlefish 42e106f756 Merge branch '本地化bug修复' into 'develop' 
修复本地化问题

See merge request aibis-dream/aibis-dream!377
 2025-05-14 13:13:52 +00:00
bottlefish 5f8af70d0a 本地化问题修复 2025-05-14 21:12:49 +08:00
Ovid 29b5e0a6f9 FP_PROLOGUE 2025-05-14 20:59:26 +08:00
bottlefish a9dabe26c7 修复本地化问题 
修复缺漏
 2025-05-14 20:28:56 +08:00
bottlefish f6ec90cfc9 完成接入 2025-05-14 17:03:19 +08:00
chenziqin d1482298cb Merge branch 'develop' into 'FP_Prologue' 
Develop

See merge request aibis-dream/aibis-dream!376
 2025-05-14 08:08:57 +00:00
Ovid 27e62dc6b4 上传一些东西 2025-05-14 15:52:33 +08:00
bottlefish 6dc1abc958 接入火山情绪模块深入 2025-05-14 15:35:28 +08:00
dingyuntian 5177527835 Merge branch 'feature/open' into 'develop' 
Feature/open

See merge request aibis-dream/aibis-dream!375
 2025-05-14 07:34:40 +00:00
dingyuntian b146acb1e8 拼起 2025-05-14 15:27:42 +08:00
dingyuntian 1a34865c75 结束事件 2025-05-14 14:54:36 +08:00
dingyuntian a8babd0faf 开头拼起 2025-05-14 14:51:54 +08:00
bottlefish 578171e884 增加yarn相关的配置，填充占位文本 2025-05-14 13:26:08 +08:00
dingyuntian d957bde000 Merge branch 'develop' into feature/open 2025-05-14 13:06:40 +08:00
dingyuntian 4120482e88 开头合并 2025-05-14 13:03:08 +08:00
bottlefish 28f43ac3fc 提交 2025-05-13 20:43:34 +08:00
bottlefish 10af7f2258 修复渲染问题 2025-05-13 19:01:52 +08:00
bottlefish 7faadd1b6b Merge branch 'develop' into 情绪分支测试 2025-05-13 18:35:24 +08:00
bottlefish 662f52614d Merge branch '火山表达模块交互优化' into 'develop' 
火山表达模块交互优化

See merge request aibis-dream/aibis-dream!374
 2025-05-13 10:07:16 +00:00
bottlefish 734c5c26ed 提交火山第一次维修的交互优化 2025-05-13 18:05:53 +08:00
dingyuntian 4d34b96154 把临时注释改回来 2025-05-13 17:30:04 +08:00