From 85a92b4fc459b46a8f780ac31a9425f87f48821f Mon Sep 17 00:00:00 2001
From: liuzhiwei <liuzhiwei@qq.com>
Date: Wed, 18 Nov 2020 13:54:12 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master

---
 Assets/Scripts/TowerDefense/Level/EndlessBuff/CritProbabilityAdd.cs.meta |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Assets/Scripts/TowerDefense/Level/EndlessBuffManager.cs.meta b/Assets/Scripts/TowerDefense/Level/EndlessBuff/CritProbabilityAdd.cs.meta
similarity index 83%
copy from Assets/Scripts/TowerDefense/Level/EndlessBuffManager.cs.meta
copy to Assets/Scripts/TowerDefense/Level/EndlessBuff/CritProbabilityAdd.cs.meta
index d1524f2..cc6fa77 100644
--- a/Assets/Scripts/TowerDefense/Level/EndlessBuffManager.cs.meta
+++ b/Assets/Scripts/TowerDefense/Level/EndlessBuff/CritProbabilityAdd.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ae98f435720c34145a1b4019d3893885
+guid: 154074aa1285f0943ab31be023fd74c1
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

--
Gitblit v1.9.1