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

..

Assets

Merge branch 'main' into TT

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

Bundles/WebGL/DefaultPackage/OutputCache

调整排版

2024-12-11 20:35:20 +08:00

Luban

备份铁匠

2024-12-04 17:26:27 +08:00

MiniTemplate

Merge branch 'main' into TT

2024-12-22 22:24:42 +08:00

Packages

备份节点

2024-12-13 20:38:15 +08:00

ProjectSettings

备份铁匠相关资源

2024-12-20 15:56:02 +08:00

TextToolDatas

修改等待页面

2024-12-22 21:47:36 +08:00

UserSettings

修改开店动画逻辑

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

.vsconfig

同步版本

2024-11-13 16:56:37 +08:00

game.json

铁匠抖音接入

2024-12-18 11:12:52 +08:00

gen.bat

备份铁匠

2024-12-04 17:26:27 +08:00

project.config.json

修改开店动画逻辑

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

replay_pid21832.log

优化ui

2024-12-21 19:57:23 +08:00