41 Commits

Author SHA1 Message Date
DESKTOP-DDTRVOR\asus
d19633e0a8 场景确实补充 2024-12-26 11:46:08 +08:00
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
31fe7d1838 修改细节 2024-12-25 16:04:25 +08:00
DESKTOP-DDTRVOR\asus
a00ecd193d 添加新手引导 2024-12-24 17:05:51 +08:00
DESKTOP-DDTRVOR\asus
caf6f78cd4 备份铁匠资源 2024-12-23 20:48:28 +08:00
DESKTOP-DDTRVOR\asus
336c1eb71b 修正玩家状态机 2024-12-23 17:17:43 +08:00
DESKTOP-DDTRVOR\asus
f62f8276ff 修改流程 2024-12-23 17:12:52 +08:00
DESKTOP-DDTRVOR\asus
63e96281eb 修复广告相关 2024-12-23 16:16:32 +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
66b616482b 组建预制体化 2024-12-23 15:07:08 +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
DESKTOP-DDTRVOR\asus
4073a1990b 同步抖音资源 2024-12-22 21:13:20 +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
fe95266db7 优化ui 2024-12-21 19:57:23 +08:00
oldpeper
54d365f8ac 备份代码 2024-12-21 14:05:40 +08:00
oldpeper
b60222c66a 备份脚本 2024-12-20 18:51:07 +08:00
oldpeper
e63e16aad5 备份铁匠相关资源 2024-12-20 15:56:02 +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
c4bddc8e21 修改胜利条件,修改时间戳 2024-12-17 13:37:43 +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
oldpeper
26f7187118 备份节点 2024-11-29 21:37:01 +08:00
oldpeper
d9906c468d 铁匠备份 2024-11-21 10:26:47 +08:00
oldpeper
ebad08fb93 同步版本 2024-11-13 16:56:37 +08:00