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

..

Art

Merge branch 'main' into TT

2024-12-25 16:35:48 +08:00

Editor

备份铁匠相关资源

2024-12-20 15:56:02 +08:00

Plugins

设置抖音配置

2024-12-16 17:53:28 +08:00

Prefab

备份铁匠相关资源

2024-12-20 15:56:02 +08:00

Resources

备份铁匠相关资源

2024-12-20 15:56:02 +08:00

Scenes

备份铁匠相关资源

2024-12-20 15:56:02 +08:00

Script

修改打点

2024-12-21 14:11:17 +08:00

SEExportedGame

备份热云打点

2024-12-20 10:42:48 +08:00

Settings

提交周末完整版本

2024-10-25 18:09:59 +08:00

Shader

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

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

Spine

备份铁匠

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

Spine Examples

备份铁匠

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

StreamingAssets

备份热云打点

2024-12-20 10:42:48 +08:00

TextMesh Pro

备份铁匠

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

Art.meta

基本逻辑完成

2024-10-23 17:55:55 +08:00

Editor.meta

基本逻辑完成

2024-10-23 17:55:55 +08:00

Plugins.meta

数据缺失版本

2024-11-08 18:21:41 +08:00

Prefab.meta

基本逻辑完成

2024-10-23 17:55:55 +08:00

Resources.meta

功能完成版本

2024-10-24 16:54:32 +08:00

Scenes.meta

铁匠项目

2024-10-23 09:14:01 +08:00

Script.meta

基本逻辑完成

2024-10-23 17:55:55 +08:00

SEExportedGame.meta

备份热云打点

2024-12-20 10:42:48 +08:00

Settings.meta

铁匠项目

2024-10-23 09:14:01 +08:00

Shader.meta

备份节点

2024-11-29 21:37:01 +08:00

Spine Examples.meta

提审版本

2024-10-29 15:22:32 +08:00

Spine.meta

基本逻辑完成

2024-10-23 17:55:55 +08:00

StreamingAssets.meta

备份热云打点

2024-12-20 10:42:48 +08:00

TextMesh Pro.meta

提交周末完整版本

2024-10-25 18:09:59 +08:00

UniversalRenderPipelineGlobalSettings.asset

铁匠项目

2024-10-23 09:14:01 +08:00

UniversalRenderPipelineGlobalSettings.asset.meta

铁匠项目

2024-10-23 09:14:01 +08:00