diff --git a/Assets/ManagedResources/Prefabs/UI/GoodFriend/GoodFriendMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/GoodFriend/GoodFriendMainPanel.prefab
index 71abb70abb..da45f122f5 100644
--- a/Assets/ManagedResources/Prefabs/UI/GoodFriend/GoodFriendMainPanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/GoodFriend/GoodFriendMainPanel.prefab
@@ -8927,7 +8927,6 @@ GameObject:
m_Component:
- component: {fileID: 6099205441504040598}
- component: {fileID: 6142383359161775238}
- - component: {fileID: 8534175419100251490}
- component: {fileID: 7403369593547960033}
m_Layer: 5
m_Name: Text
@@ -8952,8 +8951,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: -5.400017, y: 0.000015258789}
- m_SizeDelta: {x: -2.31, y: 2.01}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6142383359161775238
CanvasRenderer:
@@ -8963,19 +8962,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6259057470466155186}
m_CullTransparentMesh: 0
---- !u!114 &8534175419100251490
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6259057470466155186}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 72f543c75b355a741976183c1e74debc, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- _textSpacing: 11.9
--- !u!114 &7403369593547960033
MonoBehaviour:
m_ObjectHideFlags: 0
diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/Aid/GuildAidMainPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/Aid/GuildAidMainPopup.prefab
index 22df7c5c1c..d458a7324e 100644
--- a/Assets/ManagedResources/Prefabs/UI/Guild/Aid/GuildAidMainPopup.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Guild/Aid/GuildAidMainPopup.prefab
@@ -299,7 +299,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: c6b1e09760760ed428d5aee9f936e2d0, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 69daac0beb8a2124bb539554dc159885, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -1816,7 +1816,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: d91da9ccc604fdf4c9aa7108fd144dec, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 25caff38317ecd44d9aa5cd19b067483, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
diff --git a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampPanel.prefab b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampPanel.prefab
index 5d363417f7..6e5d834da7 100644
--- a/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampPanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/MonsterCamp/MonsterCampPanel.prefab
@@ -5555,7 +5555,7 @@ ParticleSystem:
--- !u!199 &1397471074226472267
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -10839,7 +10839,7 @@ ParticleSystem:
--- !u!199 &4134560543265343287
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -15932,7 +15932,7 @@ ParticleSystem:
--- !u!199 &497846283403455051
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -20965,7 +20965,7 @@ ParticleSystem:
--- !u!199 &1755391511871408359
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -25801,7 +25801,7 @@ ParticleSystem:
--- !u!199 &8187472554774414778
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -27923,7 +27923,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: 70a4c39dc3795d342822c1d4d984f73b, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 1cf452485b4782f49a32ff55020a4dfa, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
index 31e60e37a7..2c0a4e99d9 100644
--- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
@@ -1868,9 +1868,9 @@ RectTransform:
m_Father: {fileID: 7974999999455169579}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 151.84, y: -70.7}
m_SizeDelta: {x: 148.07, y: 148.07}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1707913170
@@ -10786,7 +10786,7 @@ MonoBehaviour:
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
- m_HorizontalOverflow: 0
+ m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u786E \u8BA4"
@@ -11584,9 +11584,9 @@ RectTransform:
m_Father: {fileID: 7974999999455169579}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 541.52, y: -70.7}
m_SizeDelta: {x: 148.07, y: 148.07}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3021529376402532869
@@ -14385,9 +14385,9 @@ RectTransform:
m_Father: {fileID: 7974999999455169579}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 736.36, y: -70.7}
m_SizeDelta: {x: 148.07, y: 148.07}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1261866771453240688
@@ -18666,7 +18666,7 @@ MonoBehaviour:
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
- m_HorizontalOverflow: 0
+ m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u53D6 \u6D88"
@@ -23448,9 +23448,9 @@ RectTransform:
m_Father: {fileID: 7974999999455169579}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 346.68, y: -70.7}
m_SizeDelta: {x: 148.07, y: 148.07}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8398721089673824485
diff --git a/Assets/ManagedResources/Prefabs/UI/Recruit/ElementDrawCardPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Recruit/ElementDrawCardPanel.prefab
index 2ce84c1e47..e611971c0b 100644
--- a/Assets/ManagedResources/Prefabs/UI/Recruit/ElementDrawCardPanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Recruit/ElementDrawCardPanel.prefab
@@ -204,7 +204,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: 636260143d871e44bb96d400e811f2e9, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 03ba10b8f366e924d8e0a48bbf9fa66e, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -5000,7 +5000,7 @@ ParticleSystem:
--- !u!199 &199737128564699664
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -9685,7 +9685,7 @@ ParticleSystem:
--- !u!199 &199374924954381556
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -14388,7 +14388,7 @@ ParticleSystem:
--- !u!199 &199968943646283500
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -14997,7 +14997,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: 5c126797610b6b5499650c048ebe7479, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 8ae8201a9e9d10c47a0297b4729c2c9c, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -17264,7 +17264,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 0, y: 603}
+ m_AnchoredPosition: {x: 0, y: 623}
m_SizeDelta: {x: 440.51, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &339990117607827247
@@ -17704,7 +17704,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: 14ea625fbee614d4481866253f3c1b80, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 759958ad228616442aeda06806a5f383, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -18595,7 +18595,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: 9517c0566f5e1014a8ba26f7fb0d7989, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 8e6e5a1b88d7d6b4287f41357a07a78a, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -19269,7 +19269,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: 9517c0566f5e1014a8ba26f7fb0d7989, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 8e6e5a1b88d7d6b4287f41357a07a78a, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -19574,7 +19574,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: 9517c0566f5e1014a8ba26f7fb0d7989, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 8e6e5a1b88d7d6b4287f41357a07a78a, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -19648,7 +19648,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: db1f5d63293365245b412f380eb9ed86, type: 3}
+ m_Sprite: {fileID: 21300000, guid: f20ad9c7b5e84a04ca6a3d9a725312e8, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -19722,7 +19722,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: db1f5d63293365245b412f380eb9ed86, type: 3}
+ m_Sprite: {fileID: 21300000, guid: f20ad9c7b5e84a04ca6a3d9a725312e8, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -21888,7 +21888,7 @@ MonoBehaviour:
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
- m_HorizontalOverflow: 0
+ m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1.24
m_Text: "\u5FC5\u5F97\u9053\u7CFB\u795E\u5C06\u788E\u7247"
@@ -22213,7 +22213,7 @@ MonoBehaviour:
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
- m_HorizontalOverflow: 0
+ m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1.24
m_Text: "\u5FC5\u5F97\u4EBA\u7CFB\u795E\u5C06\u788E\u7247"
@@ -24628,7 +24628,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: c688d6fedbe9cec4a938faffec16c96f, type: 3}
+ m_Sprite: {fileID: 21300000, guid: b69af25013cd42c4a91a72677b47356e, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -25427,7 +25427,7 @@ MonoBehaviour:
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
- m_HorizontalOverflow: 0
+ m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1.24
m_Text: "\u6709\u6982\u7387\u83B7\u5F97\u5B8C\u6574\u4E94\u661F\u795E\u5C06"
@@ -25581,7 +25581,7 @@ MonoBehaviour:
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
- m_HorizontalOverflow: 0
+ m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1.24
m_Text: "\u6709\u6982\u7387\u83B7\u5F97\u5B8C\u6574\u4E94\u661F\u795E\u5C06"
@@ -25805,7 +25805,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: 9517c0566f5e1014a8ba26f7fb0d7989, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 8e6e5a1b88d7d6b4287f41357a07a78a, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -25881,7 +25881,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: 27c646664214e524da74725fd278fba5, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 0a2c1b198288e6743bb342ef86cdb10e, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -26836,7 +26836,7 @@ MonoBehaviour:
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
- m_HorizontalOverflow: 0
+ m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1.24
m_Text: "\u5FC5\u5F97\u5996\u7CFB\u795E\u5C06\u788E\u7247"
@@ -27509,7 +27509,7 @@ MonoBehaviour:
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
- m_HorizontalOverflow: 0
+ m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1.24
m_Text: "\u6709\u6982\u7387\u83B7\u5F97\u5B8C\u6574\u4E94\u661F\u795E\u5C06"
@@ -28482,7 +28482,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: 14ea625fbee614d4481866253f3c1b80, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 759958ad228616442aeda06806a5f383, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -29875,7 +29875,7 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: c688d6fedbe9cec4a938faffec16c96f, type: 3}
+ m_Sprite: {fileID: 21300000, guid: b69af25013cd42c4a91a72677b47356e, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -30295,7 +30295,7 @@ MonoBehaviour:
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
- m_HorizontalOverflow: 0
+ m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1.24
m_Text: "\u5FC5\u5F97\u4F5B\u7CFB\u795E\u5C06\u788E\u7247"
@@ -31056,7 +31056,7 @@ MonoBehaviour:
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
- m_HorizontalOverflow: 0
+ m_HorizontalOverflow: 1
m_VerticalOverflow: 0
m_LineSpacing: 1.24
m_Text: "\u6709\u6982\u7387\u83B7\u5F97\u5B8C\u6574\u4E94\u661F\u795E\u5C06"
diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHalidomPanel.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHalidomPanel.lua
index 7169c49be3..5795600580 100644
--- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHalidomPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHalidomPanel.lua
@@ -82,7 +82,7 @@ function ExpeditionHalidomPanel:OnShowSingleHolyData(go,singleHoly)
Util.GetGameObject(go, "bg"):GetComponent("Image").sprite = Util.LoadSprite(_HalidomQualityConfig[configData.type].bg)
Util.GetGameObject(go, "quaImage"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(configData.type))
Util.GetGameObject(go, "iconImage"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(configData.Icon))
- Util.GetGameObject(go, "nameText"):GetComponent("Text").text = configData.Name
+ Util.GetGameObject(go, "nameText"):GetComponent("Text").text = GetLanguageStrById(configData.Name)
Util.GetGameObject(go, "infoText"):GetComponent("Text").text = GetLanguageStrById(configData.Describe)
local click = Util.GetGameObject(go, "click")
click:GetComponent("Button").enabled = false
diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua
index 982e9bcf7f..8c8a7cc245 100644
--- a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayMainPanel.lua
@@ -183,7 +183,7 @@ function this.ShowTitleAllData()
curMonsterId = GuildCarDelayManager.bossIndexId
curMonsterIdConFig = ConfigManager.GetConfigData(ConfigName.WorldBossConfig,curMonsterId)
Log("curMonsterId:"..curMonsterIdConFig.Boss)
- this.name.text = heroConfig[curMonsterIdConFig.Boss].ReadingName
+ this.name.text = GetLanguageStrById(heroConfig[curMonsterIdConFig.Boss].ReadingName)
this.proImage.sprite=Util.LoadSprite(GetProStrImageByProNum(heroConfig[curMonsterIdConFig.Boss].PropertyName))
curProgress = GuildCarDelayManager.progress
Util.SetGray(this.challengeBtn,curProgress ~= 1)
diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonInfoPanel.lua
index 24b9d9d5a0..c0f1c76845 100644
--- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonInfoPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonInfoPanel.lua
@@ -250,7 +250,7 @@ function this.TabAdapter(tab, index, status)
local tabLab = Util.GetGameObject(tab, "Text")
local tabImage = Util.GetGameObject(tab,"Image")
tabImage:GetComponent("Image").sprite = Util.LoadSprite(_TabData[index][status])
- tabImage:GetComponent("Image"):SetNativeSize()
+ -- tabImage:GetComponent("Image"):SetNativeSize()
tabLab:GetComponent("Text").text = _TabData[index].name
tabLab:GetComponent("Text").color = _TabFontColor[status]
-- tabImage.transform.localPosition = Vector3.New( tabImage.transform.localPosition.x, _TabImagePos[status], 0);