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

# Conflicts:
#	Blacksmith/UserSettings/Layouts/default-2022.dwlt
#	box1/Assets/Scenes/SampleScene.unity
#	box1/Assets/Script/UI/MainPanel.cs
#	box1/UserSettings/Layouts/default-2022.dwlt

2024-12-28 15:19:33 +08:00

..

Data

Merge branch 'main' into TT

2024-12-28 15:19:33 +08:00

Icon

备份铁匠

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

Map

备份铁匠

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

Mat

备份节点

2024-11-29 21:37:01 +08:00

ArtIcon.spriteatlasv2

添加排行榜

2024-12-28 15:00:14 +08:00

ArtIcon.spriteatlasv2.meta

添加排行榜

2024-12-28 15:00:14 +08:00

AssetData.asset

备份节点

2024-11-26 15:44:50 +08:00

AssetData.asset.meta

备份节点

2024-11-26 15:44:50 +08:00

BoxUI_LevelUpUI.mat

备份行李箱微信sdk，备份铁匠战斗逻辑

2024-12-07 22:30:19 +08:00

BoxUI_LevelUpUI.mat.meta

备份行李箱微信sdk，备份铁匠战斗逻辑

2024-12-07 22:30:19 +08:00

BoxUI_Start.mat

备份行李箱微信sdk，备份铁匠战斗逻辑

2024-12-07 22:30:19 +08:00

BoxUI_Start.mat.meta

备份行李箱微信sdk，备份铁匠战斗逻辑

2024-12-07 22:30:19 +08:00

Data.meta

备份box流程完成

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

DOTweenSettings.asset

备份box流程完成

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

DOTweenSettings.asset.meta

功能完成版本

2024-10-24 16:54:32 +08:00

Icon.meta

备份节点

2024-11-26 15:44:50 +08:00

Map.meta

备份节点

2024-11-26 15:44:50 +08:00

Mat.meta

备份节点

2024-11-29 21:37:01 +08:00

NewShaderVariants.shadervariants

备份铁匠

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

NewShaderVariants.shadervariants.meta

备份铁匠

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

STHUPO SDF 外亮.asset

调整文字，组建预制体化

2024-12-18 16:12:31 +08:00

STHUPO SDF 外亮.asset.meta

提交周末完整版本

2024-10-25 18:09:59 +08:00

STHUPO SDF.asset

备份资源修改

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

STHUPO SDF.asset.meta

提交周末完整版本

2024-10-25 18:09:59 +08:00

STHUPO.TTF

提交周末完整版本

2024-10-25 18:09:59 +08:00

STHUPO.TTF.meta

提交周末完整版本

2024-10-25 18:09:59 +08:00