Go to file

$DESKTOP-DDTRVOR\asus$ DESKTOP-DDTRVOR\asus 2bee2c42b6 Merge branch 'main' into TT

# Conflicts:
#	.gitignore
#	Blacksmith/Assets/Editor/StarkBuilderSetting.asset
#	Blacksmith/Assets/Editor/StarkBuilderSetting.asset.meta
#	Blacksmith/Assets/Script/GameSystem.cs
#	Blacksmith/Assets/Script/UI/ForgePanel.cs
#	Blacksmith/UserSettings/Layouts/default-2022.dwlt
#	Blacksmith/project.config.json

2024-12-23 15:25:21 +08:00

Blacksmith

Merge branch 'main' into TT

2024-12-23 15:25:21 +08:00

box1

修改打点

2024-12-21 14:11:17 +08:00

基本逻辑完成

2024-10-23 17:55:55 +08:00

.gitignore

修改开店动画逻辑

2024-12-23 14:40:13 +08:00