28 Commits

Author SHA1 Message Date
DESKTOP-DDTRVOR\asus
3e4e569f46 备份抖音 2024-12-31 14:45:10 +08:00
DESKTOP-DDTRVOR\asus
bc2b92a4bc Merge branch 'main' into TT
# Conflicts:
#	Blacksmith/UserSettings/Layouts/default-2022.dwlt
#	box1/Assets/Scenes/SampleScene.unity
#	box1/Assets/Script/UI/MainPanel.cs
#	box1/UserSettings/Layouts/default-2022.dwlt
2024-12-28 15:19:33 +08:00
DESKTOP-DDTRVOR\asus
603752a380 添加排行榜 2024-12-28 15:00:14 +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
oldpeper
e63e16aad5 备份铁匠相关资源 2024-12-20 15:56:02 +08:00
oldpeper
0aa17fd848 备份热云打点 2024-12-20 10:42:48 +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
24c8e69311 Merge branch 'main' into TT
# Conflicts:
#	box1/Assets/Scenes/SampleScene.unity
#	box1/Assets/Script/UI/PackPanel.cs
#	box1/Assets/WX-WASM-SDK-V2/Editor/MiniGameConfig.asset
#	box1/UserSettings/Layouts/default-2022.dwlt
2024-12-18 17:01:02 +08:00
oldpeper
9edcd67df1 提交资源 2024-12-18 14:23:56 +08:00
oldpeper
7cbe7e8af5 备份资源修改 2024-12-18 12:02:32 +08:00
oldpeper
a63856c962 铁匠抖音接入 2024-12-18 11:12:52 +08:00
oldpeper
9324f6ceab 提交预制体修改 2024-12-16 20:37:42 +08:00
oldpeper
5d79aac591 背包调整数据和解锁次数逻辑 2024-12-16 18:25:45 +08:00
oldpeper
fb6ad2465f 备份节点 2024-12-13 20:38:15 +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
f22dc9a374 备份节点 2024-11-26 15:44:50 +08:00
oldpeper
c4447a0b3f 备份box流程完成 2024-11-21 09:35:48 +08:00
oldpeper
d77cb48cc5 数据缺失版本 2024-11-08 18:21:41 +08:00
oldpeper
078fa0abe4 备份功能资源 2024-11-04 17:29:11 +08:00
oldpeper
b689982fc9 箱子整体流程完成,遗留测试解锁区块 2024-10-31 17:38:26 +08:00
oldpeper
9edf0c0202 提审版本 2024-10-29 15:22:32 +08:00
oldpeper
99b1cb56ef 提交周末完整版本 2024-10-25 18:09:59 +08:00
oldpeper
9746283040 功能完成版本 2024-10-24 16:54:32 +08:00
oldpeper
b6578ac43a 基本逻辑完成 2024-10-23 17:55:55 +08:00