DESKTOP-DDTRVOR\asus 5109d909d6 Merge branch 'main' into TT ...

# Conflicts:
#	Blacksmith/Assets/Scenes/SampleScene.unity
#	Blacksmith/Assets/Script/Battle/BattleManager.cs
#	Blacksmith/Assets/Script/GameSystem.cs
#	Blacksmith/Assets/Script/UI/ForgePanel.cs
#	Blacksmith/MiniTemplate/Datas/常量表.xlsx
#	Blacksmith/UserSettings/Layouts/default-2022.dwlt
#	box1/UserSettings/Layouts/default-2022.dwlt

2024-12-25 16:35:48 +08:00

..

Assets

Merge branch 'main' into TT

2024-12-25 16:35:48 +08:00

Luban

添加表数据

2024-11-05 18:15:49 +08:00

MiniTemplate

备份铁匠相关资源

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

Packages

备份铁匠

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

ProjectSettings

备份热云打点

2024-12-20 10:42:48 +08:00

TextToolDatas

添加美术资源

2024-12-18 21:00:32 +08:00

UserSettings

备份铁匠资源

2024-12-23 20:48:28 +08:00

.vsconfig

铁匠项目

2024-10-23 09:14:01 +08:00

game.json

数据缺失版本

2024-11-08 18:21:41 +08:00

gen.bat

备份box流程完成

2024-11-21 09:35:48 +08:00

project.config.json

备份脚本

2024-12-20 18:51:07 +08:00

replay_pid9684.log

打包相关设置

2024-12-18 15:31:01 +08:00

replay_pid24256.log

提交资源

2024-12-18 14:23:56 +08:00