Commit Graph

589 Commits

Author SHA1 Message Date
57f5392682 Merge remote-tracking branch 'origin/demo' 2025-08-06 13:59:06 +08:00
c69e2283d6 书架游戏交互优化 2025-08-06 13:58:28 +08:00
414828d061 Merge remote-tracking branch 'origin/demo' 2025-08-06 02:06:28 +08:00
6aca3bbac1 Merge remote-tracking branch 'origin/demo' 2025-08-06 02:06:21 +08:00
34c4531a6d pickable fix _visibility_changed 2025-08-06 02:06:03 +08:00
0fbda6ba19 update 2025-08-06 01:55:29 +08:00
bbd_pc
4e9a5b8ef3 hotfix 2025-08-06 01:37:15 +08:00
f1450a8a6c 胖子游戏吃肉 2025-08-05 23:07:35 +08:00
e4176f4e24 屠宰间胖子游戏结束时衔接演出 2025-08-05 22:33:14 +08:00
76a544eec1 更新第二章配音资源 2025-08-05 21:14:04 +08:00
df47ccd56b 完善第二章全流程 2025-08-05 17:38:56 +08:00
b38692ed58 院子排队优化 2025-08-05 00:24:58 +08:00
4c71cb01ca 棺材怪机制优化 2025-08-05 00:01:54 +08:00
87d999a809 Merge remote-tracking branch 'origin/demo' 2025-08-04 16:36:55 +08:00
88f3c75314 更新 ground 在 editor 表现 2025-08-04 16:12:08 +08:00
e79786dc23 棺材怪出场演出;胖子拖小蝉演出 2025-08-01 15:40:50 +08:00
d634d7a0b2 Merge remote-tracking branch 'origin/demo' 2025-08-01 15:08:11 +08:00
028464e743 camera shake 优化 2025-08-01 15:07:46 +08:00
e36c8671e2 胖子游戏怪物砍刀 2025-08-01 02:18:51 +08:00
3bed2fc3a4 胖子游戏棺材怪 2025-08-01 00:13:58 +08:00
78e87f35bc 胖子游戏基本流程 2025-07-31 05:24:11 +08:00
ea27b36e02 Merge remote-tracking branch 'origin/demo' 2025-07-31 05:07:38 +08:00
8b348970c9 hotfix prop_inventory 2025-07-31 05:07:26 +08:00
8c97510712 棺材怪演出 2025-07-31 04:48:16 +08:00
15bca41f12 Merge remote-tracking branch 'origin/demo' 2025-07-31 04:27:25 +08:00
521f250885 reset_temp_disabled_props 2025-07-31 04:27:08 +08:00
e9ead8a781 Merge remote-tracking branch 'origin/demo' 2025-07-31 04:20:43 +08:00
2c466c923b hotfix 2025-07-31 04:20:28 +08:00
377792c376 Merge remote-tracking branch 'origin/demo' 2025-07-31 04:16:39 +08:00
6db8621239 on_toggle_invalid_prop 增加 sfx 2025-07-31 04:16:30 +08:00
e829c28660 Merge remote-tracking branch 'origin/demo' 2025-07-31 04:01:02 +08:00
784d6937ed 优化猪头怪追击参数;增加 disable_prop_item_temp 2025-07-31 03:56:57 +08:00
408757cd01 Merge remote-tracking branch 'origin/demo' 2025-07-31 01:27:15 +08:00
715658c199 游戏开始增加键位提示 2025-07-31 01:25:19 +08:00
d01a58bb31 囚室与肉铺流程 2025-07-31 00:43:27 +08:00
87963405d4 第二章流程更新 2025-07-30 22:57:38 +08:00
3fb660dd1f Merge remote-tracking branch 'origin/demo' 2025-07-30 22:41:34 +08:00
f0e88f5d05 过道 left action key 2025-07-30 22:41:19 +08:00
e68f1e1f05 Merge remote-tracking branch 'origin/demo' 2025-07-30 21:24:25 +08:00
54383819d9 notification kill privous tween 2025-07-30 21:23:47 +08:00
bf9ca04975 Merge remote-tracking branch 'origin/demo' 2025-07-30 21:06:45 +08:00
4f684f812f show_center_notification 延长 2025-07-30 21:05:58 +08:00
0e1007fd49 Merge remote-tracking branch 'origin/demo' 2025-07-30 19:15:41 +08:00
4b939173d2 prop inspector prop_bg 逻辑 2025-07-30 19:13:50 +08:00
8a539c4c5e Merge remote-tracking branch 'origin/demo' 2025-07-30 18:58:18 +08:00
c3ca239518 优化 portal 表现: opened 效果,default 左右朝向 2025-07-30 18:57:49 +08:00
1ed9743c5c Merge remote-tracking branch 'origin/demo' 2025-07-30 18:20:50 +08:00
c0f7ba4915 footstep db 2025-07-30 18:18:49 +08:00
2e1f88359b 第二章胖子游戏动画优化 2025-07-29 22:14:54 +08:00
a164b27bd6 Merge remote-tracking branch 'origin/demo' 2025-07-29 16:44:54 +08:00
419625a496 配置 toggle_hud_display 2025-07-29 16:33:21 +08:00
4d5ceaadc9 Merge remote-tracking branch 'origin/demo' 2025-07-29 16:18:29 +08:00
89c339976e 使用 toggle_hud_display 方法 2025-07-29 16:18:16 +08:00
bfd510039d Merge remote-tracking branch 'origin/demo' 2025-07-29 16:13:38 +08:00
f9263862d2 增加 closeup 时隐藏 hud 的功能 2025-07-29 16:10:16 +08:00
b56d251f72 第二章绞肉机到结尾演出 2025-07-29 15:41:00 +08:00
d3f4e57a98 第二章结局特写素材 2025-07-28 22:15:57 +08:00
25d1a9e2d7 Merge remote-tracking branch 'origin/demo' 2025-07-28 19:48:08 +08:00
4519581dfd 第二章结局特写素材;胖子故事流程梳理 2025-07-28 19:40:35 +08:00
b6ede0c4e6 增加获得重要物品直接可检阅的功能 2025-07-28 19:36:36 +08:00
30ee263e90 绞肉机演出流程;第二章结尾井边演出;胖子游戏;李癞房间柜子 2025-07-28 01:37:38 +08:00
132adcc343 Merge remote-tracking branch 'origin/demo' 2025-07-27 23:35:05 +08:00
02d99ac811 记忆闪回音效音量优化 2025-07-27 23:31:43 +08:00
a07f78e1d0 使用 InspectorBalloon 展示 prop 信息,避免 dialog 冲突 2025-07-27 23:19:28 +08:00
5e5c52e6ae Merge remote-tracking branch 'origin/demo' 2025-07-27 14:53:38 +08:00
9697044e62 胖子游戏与第二章结局素材;场景粗铺设 2025-07-27 14:53:36 +08:00
637132f878 防止 player walk to 的 tween 空 step 2025-07-27 14:52:49 +08:00
e25c66ffee 胖子游戏资产 2025-07-25 21:25:15 +08:00
e5fba190f9 Merge remote-tracking branch 'origin/demo' 2025-07-25 17:23:05 +08:00
5be1b6cb97 update sfx2d tool button 2025-07-25 17:19:09 +08:00
28223ed890 书架与信件游戏 sfx 调整 2025-07-25 16:44:42 +08:00
d3868215d7 sfx/sfx2d 在 closeup 时可暂停; 删除【麻将1】 2025-07-25 16:18:13 +08:00
aa4a0ffd54 打麻将出千游戏高亮提示 2025-07-25 15:13:09 +08:00
832bd08443 棺材房棺材交互;第二章整体流程更新 2025-07-24 23:44:36 +08:00
533e373e6d Merge remote-tracking branch 'origin/demo' 2025-07-24 21:28:59 +08:00
b884cfb054 猫鼠游戏结束转场时,bgm ease 过度 2025-07-24 21:28:23 +08:00
c8fa757d28 Merge remote-tracking branch 'origin/demo' 2025-07-24 18:17:00 +08:00
e512d61e1f 增加过道怪声 2025-07-24 18:16:43 +08:00
b3cdeab737 Merge remote-tracking branch 'origin/demo' 2025-07-24 18:11:06 +08:00
15558d26c3 三楼楼道背景音更新 2025-07-24 18:10:46 +08:00
b61fd111ee Merge remote-tracking branch 'origin/demo' 2025-07-24 18:07:06 +08:00
94737d7cce 书店拼信件(以及书架)游戏使用 lock 而非 freeze,防止信件拼成功时,错误地交互到柜子 2025-07-24 18:06:38 +08:00
4d0b174266 Merge remote-tracking branch 'origin/demo' 2025-07-24 17:29:24 +08:00
ea85f8d739 完成囚室门锁 2025-07-24 17:28:41 +08:00
2726065aad enable item silently 不会马上展示条目 2025-07-24 17:28:22 +08:00
b9c051cef2 Merge remote-tracking branch 'origin/demo' 2025-07-24 16:04:39 +08:00
85392b08ea 八音盒提示;draggable 优化 2025-07-24 15:52:46 +08:00
a6b9012933 胖子房间墙洞拿东西被打晕 2025-07-24 14:41:25 +08:00
4bfe4e6da0 完善李氏纸人交互 2025-07-24 13:39:52 +08:00
eb4a1eed6a Merge remote-tracking branch 'origin/demo' 2025-07-23 22:10:24 +08:00
c5ad2e56c8 prop bag button 2025-07-23 22:09:39 +08:00
65f0cad19b 获得浆糊演出;药车演出 2025-07-23 21:48:47 +08:00
e83482ec6d 完善抓药游戏 2025-07-23 17:28:39 +08:00
ae702123bd 药车游戏;囚室鱼眼镜头 2025-07-22 19:59:08 +08:00
7fe990729c Merge remote-tracking branch 'origin/demo' 2025-07-22 14:10:40 +08:00
2a5254f7be 楼道白噪声音频更新 2025-07-22 14:01:05 +08:00
19f5f2683e Merge remote-tracking branch 'origin/demo' 2025-07-22 00:49:03 +08:00
c6e5942409 update 2025-07-22 00:48:33 +08:00
bbd_pc
520171f9ed demo 0.6.0 兼容模式启动;sfx音效控制面板 2025-07-22 00:42:58 +08:00
9b078d1a49 Merge remote-tracking branch 'origin/demo' 2025-07-22 00:11:47 +08:00
79c55df96b 优化:院长房间戴假发;书店掉落甩掉假发 2025-07-22 00:03:40 +08:00
3ef06dc1b3 第一次启动检测是否启用 opengl3 2025-07-21 23:32:06 +08:00
00aa9a1eeb 更新音效 2025-07-21 18:51:08 +08:00
56822c009c Merge remote-tracking branch 'origin/demo' 2025-07-21 18:21:53 +08:00
0dac449034 院长房间增加戴假发过程os 2025-07-21 18:19:55 +08:00
c2440b5272 Merge remote-tracking branch 'origin/demo' 2025-07-21 17:56:17 +08:00
187a86c915 sfx update 2025-07-21 17:55:48 +08:00
b42f6e510e Merge remote-tracking branch 'origin/demo' 2025-07-21 17:25:21 +08:00
6fc8efd46d sfx update 2025-07-21 17:25:04 +08:00
ab5b7ecf4f Merge remote-tracking branch 'origin/demo' 2025-07-20 20:13:12 +08:00
85475ff549 VibeSfx 替换为 Sfx 2025-07-20 20:05:59 +08:00
aaa7dc26bb 优化 sfx_config_panel 2025-07-19 15:02:32 +08:00
301ee98c0f 增加 sfx_config_panel 2025-07-18 19:52:49 +08:00
cce0a02fb8 Merge remote-tracking branch 'origin/demo' 2025-07-17 20:52:00 +08:00
86b6bc733b 优化院子纸钱z透视层级 2025-07-17 20:35:41 +08:00
658fd923d5 Merge remote-tracking branch 'origin/demo' 2025-07-17 16:53:49 +08:00
bbd_pc
350184821d hotfix 2025-07-17 16:51:04 +08:00
4d4ab68f70 Merge remote-tracking branch 'origin/demo' 2025-07-17 16:49:13 +08:00
644d8bcc39 理发店演出优化 2025-07-17 16:48:40 +08:00
d465857737 优化 npc hook speaking 表现 2025-07-17 16:43:30 +08:00
72f00c821f 理发店癞子理发演出 2025-07-17 05:44:00 +08:00
b4d34bccb2 更新 readme 代码说明 2025-07-17 00:27:43 +08:00
571c6ab74c index 无需章节入口(已有存档管理器) 2025-07-17 00:02:25 +08:00
850900ad5f Merge remote-tracking branch 'origin/demo' 2025-07-17 00:01:33 +08:00
4e3183b013 鸡毛掸子操作优化 2025-07-16 23:58:41 +08:00
2f431cff52 Merge remote-tracking branch 'origin/demo' 2025-07-16 23:26:58 +08:00
a60beeea1d 增加 debug panel(连按五次「`」开启debug,下次进入时重置) 2025-07-16 23:20:55 +08:00
87da4d2e73 Merge remote-tracking branch 'origin/demo' 2025-07-16 20:02:01 +08:00
e42b434bed archive、config、ground 等重要代码优化;trailer 读取本地化配置。 2025-07-16 19:56:21 +08:00
c720a78161 Merge remote-tracking branch 'origin/demo' 2025-07-16 18:12:56 +08:00
ffac8f61ef 刮刮乐贴图存储优化;麻绳 mesh 优化 2025-07-16 18:07:09 +08:00
7f8136784f Merge remote-tracking branch 'origin/demo' 2025-07-16 17:30:13 +08:00
f2c2af8c57 第二章部分进度 2025-07-16 17:20:45 +08:00
bbd_pc
10272f6e45 书店外监督小孩说话时,hold玩家操作 2025-07-16 16:54:55 +08:00
214918423d 优化balloon在游戏/回忆的不同layer 2025-07-16 16:42:59 +08:00
740620a1d4 优化 prop hud 逻辑 2025-07-16 16:32:40 +08:00
3be55f41e7 增加内侧反馈问卷链接 2025-07-16 16:05:22 +08:00
4063434c26 部分对话优化;书店摔倒后回忆效果 2025-07-16 16:01:09 +08:00
70f9d35d07 优化NPC2D,增加 hook_speaking&unhook_speaking;孤儿院第一次与大胖对话使用该功能 2025-07-16 15:23:00 +08:00
9c3c470f3e 院子判断 c02_ball_game_stage >= 3 2025-07-16 14:24:10 +08:00
f1d6a6c4fd 瞎子卧室小小小蝶与瞎子对话&灰姑出现 2025-07-16 03:57:51 +08:00
34489d1326 Merge remote-tracking branch 'origin/demo' 2025-07-16 01:53:24 +08:00
440b0a15d6 优化 print 2025-07-16 01:53:09 +08:00
63bacec2fa Merge remote-tracking branch 'origin/demo' 2025-07-15 20:12:13 +08:00
56874e60cf 优化中英文佩戴耳机提示界面;增加本地化 2025-07-15 20:06:08 +08:00
e3640cf715 Merge remote-tracking branch 'origin/demo' 2025-07-15 19:45:49 +08:00
fc126995b0 close up _holding_cancel_before_exit; 第二章 update 2025-07-15 19:44:55 +08:00
bbd_pc
dd289bd8cf 孤儿院桌椅碰撞拉宽;字幕默认上海话; 2025-07-15 19:25:15 +08:00
92cd04847a hot fix 2025-07-15 18:45:03 +08:00
254e8a15e0 trailer settings focus 2025-07-15 18:40:05 +08:00