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
|
84cecc83af
|
备份数据
|
2024-12-22 20:35:00 +08:00 |
|
oldpeper
|
fe95266db7
|
优化ui
|
2024-12-21 19:57:23 +08:00 |
|
oldpeper
|
54d365f8ac
|
备份代码
|
2024-12-21 14:05:40 +08:00 |
|
oldpeper
|
4710954de1
|
添加美术资源
|
2024-12-18 21:00:32 +08:00 |
|
oldpeper
|
caece7db62
|
备份完整功能
|
2024-12-16 17:25:10 +08:00 |
|
oldpeper
|
fb6ad2465f
|
备份节点
|
2024-12-13 20:38:15 +08:00 |
|
oldpeper
|
b6f7791ce2
|
备份节点
|
2024-12-11 23:46:58 +08:00 |
|
oldpeper
|
4de515333e
|
备份效果
|
2024-12-11 22:02:24 +08:00 |
|
oldpeper
|
c4294366e9
|
调整排版
|
2024-12-11 20:35:20 +08:00 |
|
oldpeper
|
766f0de49e
|
同步资源
|
2024-12-11 13:58:55 +08:00 |
|
oldpeper
|
ba9ac9501b
|
备份节点
|
2024-12-10 17:46:37 +08:00 |
|
oldpeper
|
6a9d101833
|
备份最新逻辑
|
2024-12-09 11:19:14 +08:00 |
|
oldpeper
|
e0f65e39fd
|
备份行李箱微信sdk，备份铁匠战斗逻辑
|
2024-12-07 22:30:19 +08:00 |
|
oldpeper
|
c42588c1e3
|
备份铁匠
|
2024-12-04 17:26:27 +08:00 |
|