From b118ece3db250a5a257b60713da92234d8d5a57a Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 19 五月 2025 17:03:24 +0800
Subject: [PATCH] 报错冲突处理
---
Main/Config/Configs/IconConfig.cs.meta | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Main/Component/UI/Common/WaterWaveOnCamera.cs.meta b/Main/Config/Configs/IconConfig.cs.meta
similarity index 83%
copy from Main/Component/UI/Common/WaterWaveOnCamera.cs.meta
copy to Main/Config/Configs/IconConfig.cs.meta
index 04203d5..120cffe 100644
--- a/Main/Component/UI/Common/WaterWaveOnCamera.cs.meta
+++ b/Main/Config/Configs/IconConfig.cs.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 105914d4abcd80a48ba73c6d0ce4ac41
+guid: 9646706d576a196458de9ec0a6c47927
MonoImporter:
externalObjects: {}
serializedVersion: 2
--
Gitblit v1.8.0