From b118ece3db250a5a257b60713da92234d8d5a57a Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 19 五月 2025 17:03:24 +0800
Subject: [PATCH] 报错冲突处理

---
 Main/System/SystemSetting/SystemSetting.cs.meta |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Main/Component/UI/Common/WaterWaveOnCamera.cs.meta b/Main/System/SystemSetting/SystemSetting.cs.meta
similarity index 83%
copy from Main/Component/UI/Common/WaterWaveOnCamera.cs.meta
copy to Main/System/SystemSetting/SystemSetting.cs.meta
index 04203d5..25a003e 100644
--- a/Main/Component/UI/Common/WaterWaveOnCamera.cs.meta
+++ b/Main/System/SystemSetting/SystemSetting.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 105914d4abcd80a48ba73c6d0ce4ac41
+guid: c7d4719b75e19d248a0100f691671cdd
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

--
Gitblit v1.8.0