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

..

BattlePanel

修改声音

2024-12-26 11:39:49 +08:00

CombatPanel

添加新手引导

2024-12-24 17:05:51 +08:00

DrawingPanel

优化ui

2024-12-21 19:57:23 +08:00

EndPanel

备份节点

2024-12-13 20:38:15 +08:00

StorePanel

Merge branch 'main' into TT

2024-12-26 11:45:43 +08:00

ADSystem.cs

修复广告相关

2024-12-23 16:16:32 +08:00

ADSystem.cs.meta

备份数据

2024-12-22 20:35:00 +08:00

BattlePanel.cs

修改声音

2024-12-26 11:39:49 +08:00

BattlePanel.cs.meta

备份铁匠

2024-12-04 17:26:27 +08:00

BattlePanel.meta

备份铁匠

2024-12-04 17:26:27 +08:00

CombatPanel.cs

添加新手引导

2024-12-24 17:05:51 +08:00

CombatPanel.cs.meta

备份行李箱微信sdk，备份铁匠战斗逻辑

2024-12-07 22:30:19 +08:00

CombatPanel.meta

备份节点

2024-12-10 17:46:37 +08:00

CraftingPanel.cs

修改声音

2024-12-26 11:39:49 +08:00

CraftingPanel.cs.meta

同步版本

2024-11-13 16:56:37 +08:00

CraftingUI.cs

备份行李箱微信sdk，备份铁匠战斗逻辑

2024-12-07 22:30:19 +08:00

CraftingUI.cs.meta

同步版本

2024-11-13 16:56:37 +08:00

DrawingPanel.cs

修改声音

2024-12-26 11:39:49 +08:00

DrawingPanel.cs.meta

备份铁匠

2024-12-04 17:26:27 +08:00

DrawingPanel.meta

备份行李箱微信sdk，备份铁匠战斗逻辑

2024-12-07 22:30:19 +08:00

EndPanel.cs

修改声音

2024-12-26 11:39:49 +08:00

EndPanel.cs.meta

备份节点

2024-12-13 20:38:15 +08:00

EndPanel.meta

备份节点

2024-12-13 20:38:15 +08:00

ForgePanel.cs

Merge branch 'main' into TT

2024-12-26 11:45:43 +08:00

ForgePanel.cs.meta

同步版本

2024-11-13 16:56:37 +08:00

GuidePanel.cs

修改细节

2024-12-25 16:04:25 +08:00

GuidePanel.cs.meta

添加新手引导

2024-12-24 17:05:51 +08:00

ItemObj.cs

优化ui

2024-12-21 19:57:23 +08:00

ItemObj.cs.meta

备份完整功能

2024-12-16 17:25:10 +08:00

NPCTrigger.cs

同步版本

2024-11-13 16:56:37 +08:00

NPCTrigger.cs.meta

同步版本

2024-11-13 16:56:37 +08:00

ProgressTime.cs

优化ui

2024-12-21 19:57:23 +08:00

ProgressTime.cs.meta

同步版本

2024-11-13 16:56:37 +08:00

SettlementPanel.cs

铁匠备份

2024-11-21 10:26:47 +08:00

SettlementPanel.cs.meta

铁匠备份

2024-11-21 10:26:47 +08:00

SlotUI.cs

修改细节

2024-12-25 16:04:25 +08:00

SlotUI.cs.meta

同步版本

2024-11-13 16:56:37 +08:00

StorePanel.cs

修改细节

2024-12-25 16:04:25 +08:00

StorePanel.cs.meta

备份铁匠

2024-12-04 17:26:27 +08:00

StorePanel.meta

备份铁匠

2024-12-04 17:26:27 +08:00

SwithPanel.cs

修改声音

2024-12-26 11:39:49 +08:00

SwithPanel.cs.meta

备份铁匠

2024-12-04 17:26:27 +08:00

UIMgr.cs

Merge branch 'main' into TT

2024-12-26 11:45:43 +08:00

UIMgr.cs.meta

备份铁匠

2024-12-04 17:26:27 +08:00