报错冲突处理

yyl

2025-05-19 b118ece3db250a5a257b60713da92234d8d5a57a

 Main/System/SystemSetting/SystemSetting.cs.meta

copy from Main/Component/UI/Common/WaterWaveOnCamera.cs.meta
copy to Main/System/SystemSetting/SystemSetting.cs.meta
File was copied from Main/Component/UI/Common/WaterWaveOnCamera.cs.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 105914d4abcd80a48ba73c6d0ce4ac41
guid: c7d4719b75e19d248a0100f691671cdd
MonoImporter:
  externalObjects: {}
  serializedVersion: 2