DESKTOP-DDTRVOR\asus
|
9c3a2645ac
|
Merge branch 'main' into TT
# Conflicts:
# Blacksmith/Assets/Script/GameSystem.cs
# Blacksmith/Assets/Script/UI/StorePanel/PrizeDrawItem.cs
|
2024-12-26 11:45:43 +08:00 |
|
DESKTOP-DDTRVOR\asus
|
36fa2e1e12
|
修改声音
|
2024-12-26 11:39:49 +08:00 |
|
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 |
|
DESKTOP-DDTRVOR\asus
|
caf6f78cd4
|
备份铁匠资源
|
2024-12-23 20:48:28 +08:00 |
|
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
|
d1462c4d8c
|
修改开店动画逻辑
|
2024-12-23 14:40:13 +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
|
afc4955136
|
修改等待页面
|
2024-12-22 21:47:36 +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 |
|
oldpeper
|
c42588c1e3
|
备份铁匠
|
2024-12-04 17:26:27 +08:00 |
|
oldpeper
|
ebad08fb93
|
同步版本
|
2024-11-13 16:56:37 +08:00 |
|