From c1d12cdfd23933a0db431a70ff5e145924864782 Mon Sep 17 00:00:00 2001
From: River Jiang <546213258@qq.com>
Date: Wed, 21 Oct 2020 15:08:29 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master

---
 Assets/GameAnalytics_SDK_Unity-master/TalkingDataScripts/TDGAVirtualCurrency.cs.meta |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Assets/Scripts/TowerDefense/UI/HUD/SelectBuff.cs.meta b/Assets/GameAnalytics_SDK_Unity-master/TalkingDataScripts/TDGAVirtualCurrency.cs.meta
similarity index 83%
copy from Assets/Scripts/TowerDefense/UI/HUD/SelectBuff.cs.meta
copy to Assets/GameAnalytics_SDK_Unity-master/TalkingDataScripts/TDGAVirtualCurrency.cs.meta
index 906d708..8f7115b 100644
--- a/Assets/Scripts/TowerDefense/UI/HUD/SelectBuff.cs.meta
+++ b/Assets/GameAnalytics_SDK_Unity-master/TalkingDataScripts/TDGAVirtualCurrency.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 77846cbd0fd353546b25fc2e0d6ad952
+guid: 9913481a77e21104ca128daed6e97a1c
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

--
Gitblit v1.9.1