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

..

Art

Merge branch 'develop' into feature/screen

2025-02-15 15:29:43 +08:00

Audio

音频更新

2024-12-31 16:43:07 +08:00

Characters

Update 佩佩.prefab

2025-01-01 23:05:37 +08:00

Materials

美术替换

2025-02-20 01:40:04 +08:00

Prefabs

Merge branch 'develop' into '2.20春修改'

2025-02-20 07:21:34 +00:00

SceneSO

Merge branch 'develop' into feature/screen

2025-02-15 15:29:43 +08:00

Shader

变速箱修改

2025-01-25 19:08:00 +08:00

TimeLine

冷却器表现添加，进入手术室timeline添加，其他表现优化

2025-02-14 18:16:22 +08:00

Yarn

Merge branch 'develop' into '2.20春修改'

2025-02-20 07:21:34 +00:00

Art.meta

Initial commit

2024-08-11 14:32:14 +08:00

Audio.meta

音频内容

2024-09-19 01:12:10 +08:00

Characters.meta

更新表情功能并对yarn进行基础配置，修复之前字体遗失的问题

2024-09-18 13:42:42 +08:00

DOTweenSettings.asset

Initial commit

2024-08-11 14:32:14 +08:00

DOTweenSettings.asset.meta

Initial commit

2024-08-11 14:32:14 +08:00

Materials.meta

新增插模块和剪线

2024-08-21 22:13:57 +08:00

Prefabs.meta

额外功能添加

2024-08-20 00:24:29 +08:00

SceneSO.meta

Initial commit

2024-08-11 14:32:14 +08:00

Shader.meta

优化表现

2024-09-09 10:25:06 +08:00

TimeLine.meta

冷却器表现添加，进入手术室timeline添加，其他表现优化

2025-02-14 18:16:22 +08:00

Yarn.meta

Initial commit

2024-08-11 14:32:14 +08:00