DESKTOP-DDTRVOR\asus
|
cda0c4a34f
|
Merge branch 'main' into TT
# Conflicts:
# Blacksmith/Assets/Pack/Icon/changbinglei.png.meta
# Blacksmith/Assets/Pack/Icon/feibiaolei.png.meta
# Blacksmith/Assets/Pack/Icon/gonglei.png.meta
# Blacksmith/Assets/Pack/Icon/jianlei.png.meta
# Blacksmith/Assets/Pack/Icon/nujianlei.png.meta
# Blacksmith/Assets/Pack/Icon/qingjialei.png.meta
# Blacksmith/Assets/Pack/Icon/zhanglei.png.meta
# Blacksmith/Assets/Pack/Icon/zhongjialei.png.meta
# Blacksmith/Assets/Resources/Prefab/player/player.prefab
# Blacksmith/Assets/Scenes/SampleScene.unity
# Blacksmith/Assets/Script/Battle/BattleManager.cs
# Blacksmith/Assets/Script/Battle/Player/PlayerItem.cs
# Blacksmith/Assets/Script/DataManager.cs
# Blacksmith/Assets/WX-WASM-SDK-V2/Editor/MiniGameConfig.asset
# Blacksmith/UserSettings/Layouts/default-2022.dwlt
# box1/UserSettings/Layouts/default-2022.dwlt
# box1/project.config.json
|
2024-12-22 22:24:42 +08:00 |
|
DESKTOP-DDTRVOR\asus
|
34cb342fd2
|
提交人物
|
2024-12-22 20:56:03 +08:00 |
|
DESKTOP-DDTRVOR\asus
|
84cecc83af
|
备份数据
|
2024-12-22 20:35:00 +08:00 |
|
oldpeper
|
b0f9446036
|
Merge branch 'main' into TT
|
2024-12-18 21:34:14 +08:00 |
|
oldpeper
|
4710954de1
|
添加美术资源
|
2024-12-18 21:00:32 +08:00 |
|
oldpeper
|
5bda0fdcfe
|
Merge branch 'main' into TT
|
2024-12-18 18:47:27 +08:00 |
|
oldpeper
|
85bd034288
|
添加美术资源
|
2024-12-18 18:47:00 +08:00 |
|
oldpeper
|
a63856c962
|
铁匠抖音接入
|
2024-12-18 11:12:52 +08:00 |
|
oldpeper
|
b6f7791ce2
|
备份节点
|
2024-12-11 23:46:58 +08:00 |
|
oldpeper
|
c4294366e9
|
调整排版
|
2024-12-11 20:35:20 +08:00 |
|