From 8eb0d7369690fa3f1361d82658292b27c2605d3d Mon Sep 17 00:00:00 2001
From: hwj35 <691170510@qq.com>
Date: 星期二, 24 十二月 2024 19:10:37 +0800
Subject: [PATCH] Merge branch 'lang_en' of http://192.168.1.20:10010/r/snxxz_resourcesout into lang_en

---
 UI/Window/PhantasmPavilionWin.prefab                               |    2 +-
 UI/Window/BlessedLandCornucopiaWin.prefab                          |    2 +-
 UI/Window/CrossServerGodBattleFieldAssortInfoWin.prefab            |    4 ++--
 UI/Window/CrossServerGodBattleFieldAssortApplicationListWin.prefab |    2 +-
 UI/Window/BlessedLandOtherWin.prefab                               |    2 +-
 UI/Window/BlessedLandDetailsWin.prefab                             |    4 ++--
 UI/Window/ExclusiveBenefitWin.prefab                               |    2 +-
 UI/Window/CelestialPalaceNameListWin.prefab                        |    2 +-
 UI/Window/CrossServerGodBattleFieldAssortWin.prefab                |   10 +++++-----
 UI/Window/PushCoinWin.prefab                                       |    2 +-
 UI/Window/BlessedLandManageWin.prefab                              |    2 +-
 UI/Window/BlessedLandRecordWin.prefab                              |    2 +-
 UI/Window/CrossServerGodBattleFieldAssortSearchWin.prefab          |    6 +++---
 UI/Window/TreasureProbabilityWin.prefab                            |    2 +-
 UI/Window/TreasurePavilionTipWin.prefab                            |    2 +-
 UI/Window/BlessedLandSeekWin.prefab                                |    2 +-
 16 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/UI/Window/BlessedLandCornucopiaWin.prefab b/UI/Window/BlessedLandCornucopiaWin.prefab
index 41dffb0..0d62564 100644
--- a/UI/Window/BlessedLandCornucopiaWin.prefab
+++ b/UI/Window/BlessedLandCornucopiaWin.prefab
@@ -2361,7 +2361,7 @@
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 77c217b0db0919a4093dcdc16ddc6455, type: 3}
+  m_Sprite: {fileID: 21300000, guid: ea7870ff8b962f046802bad588d5cfd5, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
diff --git a/UI/Window/BlessedLandDetailsWin.prefab b/UI/Window/BlessedLandDetailsWin.prefab
index d3e02b9..18672dc 100644
--- a/UI/Window/BlessedLandDetailsWin.prefab
+++ b/UI/Window/BlessedLandDetailsWin.prefab
@@ -293,7 +293,7 @@
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 77c217b0db0919a4093dcdc16ddc6455, type: 3}
+  m_Sprite: {fileID: 21300000, guid: ea7870ff8b962f046802bad588d5cfd5, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -3008,7 +3008,7 @@
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 77c217b0db0919a4093dcdc16ddc6455, type: 3}
+  m_Sprite: {fileID: 21300000, guid: ea7870ff8b962f046802bad588d5cfd5, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
diff --git a/UI/Window/BlessedLandManageWin.prefab b/UI/Window/BlessedLandManageWin.prefab
index e795d0d..eb7f139 100644
--- a/UI/Window/BlessedLandManageWin.prefab
+++ b/UI/Window/BlessedLandManageWin.prefab
@@ -2590,7 +2590,7 @@
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 77c217b0db0919a4093dcdc16ddc6455, type: 3}
+  m_Sprite: {fileID: 21300000, guid: ea7870ff8b962f046802bad588d5cfd5, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
diff --git a/UI/Window/BlessedLandOtherWin.prefab b/UI/Window/BlessedLandOtherWin.prefab
index eebe9de..3edb558 100644
--- a/UI/Window/BlessedLandOtherWin.prefab
+++ b/UI/Window/BlessedLandOtherWin.prefab
@@ -1380,7 +1380,7 @@
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 77c217b0db0919a4093dcdc16ddc6455, type: 3}
+  m_Sprite: {fileID: 21300000, guid: ea7870ff8b962f046802bad588d5cfd5, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
diff --git a/UI/Window/BlessedLandRecordWin.prefab b/UI/Window/BlessedLandRecordWin.prefab
index a2bb2ca..2f7be5b 100644
--- a/UI/Window/BlessedLandRecordWin.prefab
+++ b/UI/Window/BlessedLandRecordWin.prefab
@@ -1048,7 +1048,7 @@
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 77c217b0db0919a4093dcdc16ddc6455, type: 3}
+  m_Sprite: {fileID: 21300000, guid: ea7870ff8b962f046802bad588d5cfd5, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
diff --git a/UI/Window/BlessedLandSeekWin.prefab b/UI/Window/BlessedLandSeekWin.prefab
index 1d7fe34..3d0faf9 100644
--- a/UI/Window/BlessedLandSeekWin.prefab
+++ b/UI/Window/BlessedLandSeekWin.prefab
@@ -1448,7 +1448,7 @@
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 77c217b0db0919a4093dcdc16ddc6455, type: 3}
+  m_Sprite: {fileID: 21300000, guid: ea7870ff8b962f046802bad588d5cfd5, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
diff --git a/UI/Window/CelestialPalaceNameListWin.prefab b/UI/Window/CelestialPalaceNameListWin.prefab
index 30d61b5..097957d 100644
--- a/UI/Window/CelestialPalaceNameListWin.prefab
+++ b/UI/Window/CelestialPalaceNameListWin.prefab
@@ -1243,7 +1243,7 @@
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: c222f5b742c1a3543bdb25081c7560da, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 0bf3591736356904fbf746e62d9a0645, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
diff --git a/UI/Window/CrossServerGodBattleFieldAssortApplicationListWin.prefab b/UI/Window/CrossServerGodBattleFieldAssortApplicationListWin.prefab
index dc69f30..43079ee 100644
--- a/UI/Window/CrossServerGodBattleFieldAssortApplicationListWin.prefab
+++ b/UI/Window/CrossServerGodBattleFieldAssortApplicationListWin.prefab
@@ -2821,7 +2821,7 @@
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 77c217b0db0919a4093dcdc16ddc6455, type: 3}
+  m_Sprite: {fileID: 21300000, guid: ea7870ff8b962f046802bad588d5cfd5, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
diff --git a/UI/Window/CrossServerGodBattleFieldAssortInfoWin.prefab b/UI/Window/CrossServerGodBattleFieldAssortInfoWin.prefab
index 988711f..2017bde 100644
--- a/UI/Window/CrossServerGodBattleFieldAssortInfoWin.prefab
+++ b/UI/Window/CrossServerGodBattleFieldAssortInfoWin.prefab
@@ -2340,7 +2340,7 @@
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 77c217b0db0919a4093dcdc16ddc6455, type: 3}
+  m_Sprite: {fileID: 21300000, guid: ea7870ff8b962f046802bad588d5cfd5, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2550,7 +2550,7 @@
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 77c217b0db0919a4093dcdc16ddc6455, type: 3}
+  m_Sprite: {fileID: 21300000, guid: ea7870ff8b962f046802bad588d5cfd5, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
diff --git a/UI/Window/CrossServerGodBattleFieldAssortSearchWin.prefab b/UI/Window/CrossServerGodBattleFieldAssortSearchWin.prefab
index 93f74a3..c8da0e1 100644
--- a/UI/Window/CrossServerGodBattleFieldAssortSearchWin.prefab
+++ b/UI/Window/CrossServerGodBattleFieldAssortSearchWin.prefab
@@ -441,7 +441,7 @@
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 77c217b0db0919a4093dcdc16ddc6455, type: 3}
+  m_Sprite: {fileID: 21300000, guid: ea7870ff8b962f046802bad588d5cfd5, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1328,7 +1328,7 @@
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 77c217b0db0919a4093dcdc16ddc6455, type: 3}
+  m_Sprite: {fileID: 21300000, guid: ea7870ff8b962f046802bad588d5cfd5, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2092,7 +2092,7 @@
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 77c217b0db0919a4093dcdc16ddc6455, type: 3}
+  m_Sprite: {fileID: 21300000, guid: ea7870ff8b962f046802bad588d5cfd5, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
diff --git a/UI/Window/CrossServerGodBattleFieldAssortWin.prefab b/UI/Window/CrossServerGodBattleFieldAssortWin.prefab
index 8bac0d9..1246b88 100644
--- a/UI/Window/CrossServerGodBattleFieldAssortWin.prefab
+++ b/UI/Window/CrossServerGodBattleFieldAssortWin.prefab
@@ -1160,7 +1160,7 @@
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 77c217b0db0919a4093dcdc16ddc6455, type: 3}
+  m_Sprite: {fileID: 21300000, guid: ea7870ff8b962f046802bad588d5cfd5, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2969,7 +2969,7 @@
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 77c217b0db0919a4093dcdc16ddc6455, type: 3}
+  m_Sprite: {fileID: 21300000, guid: ea7870ff8b962f046802bad588d5cfd5, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -3098,7 +3098,7 @@
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 77c217b0db0919a4093dcdc16ddc6455, type: 3}
+  m_Sprite: {fileID: 21300000, guid: ea7870ff8b962f046802bad588d5cfd5, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -3622,7 +3622,7 @@
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 77c217b0db0919a4093dcdc16ddc6455, type: 3}
+  m_Sprite: {fileID: 21300000, guid: ea7870ff8b962f046802bad588d5cfd5, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -4250,7 +4250,7 @@
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 77c217b0db0919a4093dcdc16ddc6455, type: 3}
+  m_Sprite: {fileID: 21300000, guid: ea7870ff8b962f046802bad588d5cfd5, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
diff --git a/UI/Window/ExclusiveBenefitWin.prefab b/UI/Window/ExclusiveBenefitWin.prefab
index 0d8a8e8..d67e5b1 100644
--- a/UI/Window/ExclusiveBenefitWin.prefab
+++ b/UI/Window/ExclusiveBenefitWin.prefab
@@ -804,7 +804,7 @@
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 77c217b0db0919a4093dcdc16ddc6455, type: 3}
+  m_Sprite: {fileID: 21300000, guid: ea7870ff8b962f046802bad588d5cfd5, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
diff --git a/UI/Window/PhantasmPavilionWin.prefab b/UI/Window/PhantasmPavilionWin.prefab
index 1b2c6af..7a7b82c 100644
--- a/UI/Window/PhantasmPavilionWin.prefab
+++ b/UI/Window/PhantasmPavilionWin.prefab
@@ -7048,7 +7048,7 @@
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: c058972f645e47e4d918d9836d00869a, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 4d3068bb670d5bb4fb0e523ea3f9e03c, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
diff --git a/UI/Window/PushCoinWin.prefab b/UI/Window/PushCoinWin.prefab
index 3904673..74bd4e6 100644
--- a/UI/Window/PushCoinWin.prefab
+++ b/UI/Window/PushCoinWin.prefab
@@ -1441,7 +1441,7 @@
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: b97cb389470e86a4497784c6f8ef25c7, type: 3}
+  m_Sprite: {fileID: 21300000, guid: e0f8f09eadce8184685242494d479fb6, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
diff --git a/UI/Window/TreasurePavilionTipWin.prefab b/UI/Window/TreasurePavilionTipWin.prefab
index 945bfd7..ca5b989 100644
--- a/UI/Window/TreasurePavilionTipWin.prefab
+++ b/UI/Window/TreasurePavilionTipWin.prefab
@@ -9149,7 +9149,7 @@
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 6c4c60fd04c133f4cbc513effdeea39d, type: 3}
+  m_Sprite: {fileID: 21300000, guid: cdc63554ce5e8234194f789ce0fd31b8, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
diff --git a/UI/Window/TreasureProbabilityWin.prefab b/UI/Window/TreasureProbabilityWin.prefab
index fd7101f..ed4f4cd 100644
--- a/UI/Window/TreasureProbabilityWin.prefab
+++ b/UI/Window/TreasureProbabilityWin.prefab
@@ -1561,7 +1561,7 @@
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 6c4c60fd04c133f4cbc513effdeea39d, type: 3}
+  m_Sprite: {fileID: 21300000, guid: cdc63554ce5e8234194f789ce0fd31b8, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1

--
Gitblit v1.8.0