From 45d3d873a7740886fa09f35c9fea2830f4563072 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期三, 11 二月 2026 11:04:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into h5version

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

diff --git a/Main/Core/NetworkPackage/DTCFile/ServerPack/HA5_Family/DTCA521_tagMCFamilyChange.cs.meta b/Main/System/TimingGift/SettingDataManager.cs.meta
similarity index 83%
copy from Main/Core/NetworkPackage/DTCFile/ServerPack/HA5_Family/DTCA521_tagMCFamilyChange.cs.meta
copy to Main/System/TimingGift/SettingDataManager.cs.meta
index 4c9b26c..0d17e9d 100644
--- a/Main/Core/NetworkPackage/DTCFile/ServerPack/HA5_Family/DTCA521_tagMCFamilyChange.cs.meta
+++ b/Main/System/TimingGift/SettingDataManager.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 95872d70a4fcdaf47a7089e954db72fb
+guid: 11efe5307ce944149977d11036bcd76a
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

--
Gitblit v1.8.0