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 |
|
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 |
|
oldpeper
|
a63856c962
|
铁匠抖音接入
|
2024-12-18 11:12:52 +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 |
|