dingyuntian 7897d8a9a7 Merge branch 'develop' into '卓亚0904' ...

# Conflicts:
#   Assets/Resources/Yarn/PeipeiTalk2/PeipeiTalk2.yarn

2024-09-05 17:37:27 +00:00

..

Art

修补缺漏

2024-09-06 01:14:15 +08:00

Materials

修补缺漏

2024-09-06 01:14:15 +08:00

Prefabs

Merge branch '佩佩功能流程分支' into develop

2024-09-02 23:16:15 +08:00

SceneSO

配置场景talkso

2024-09-05 11:12:52 +08:00

Yarn

Merge branch 'develop' into '卓亚0904'

2024-09-05 17:37:27 +00:00

Art.meta

Initial commit

2024-08-11 14:32:14 +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

Yarn.meta

Initial commit

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