From 74daf5509be4fc140fd1bdb6d4df5f1c1002e368 Mon Sep 17 00:00:00 2001 From: wangguan <wangguan@kt007.com> Date: Thu, 22 Oct 2020 17:28:08 +0800 Subject: [PATCH] Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle --- Assets/Prefabs/UI/EnergyUI.prefab.meta | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Assets/Prefabs/UI/BuffIcon.prefab.meta b/Assets/Prefabs/UI/EnergyUI.prefab.meta similarity index 74% copy from Assets/Prefabs/UI/BuffIcon.prefab.meta copy to Assets/Prefabs/UI/EnergyUI.prefab.meta index 3b34d71..764967f 100644 --- a/Assets/Prefabs/UI/BuffIcon.prefab.meta +++ b/Assets/Prefabs/UI/EnergyUI.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e8b656b384ec06b47bb54c7fd04e1447 +guid: 0d97566feabc1d644862df3fb52071a3 PrefabImporter: externalObjects: {} userData: -- Gitblit v1.9.1