diff --git a/Assets/ManagedResources/ArtFont_vi/l_lbqg_icon1_vi.png b/Assets/ManagedResources/ArtFont_vi/l_lbqg_icon1_vi.png index 093f052df6..f2e5347d68 100644 Binary files a/Assets/ManagedResources/ArtFont_vi/l_lbqg_icon1_vi.png and b/Assets/ManagedResources/ArtFont_vi/l_lbqg_icon1_vi.png differ diff --git a/Assets/ManagedResources/ArtFont_vi/l_lbqg_icon1_vi.png.meta b/Assets/ManagedResources/ArtFont_vi/l_lbqg_icon1_vi.png.meta index b0f32ae2e0..c3baefb82d 100644 --- a/Assets/ManagedResources/ArtFont_vi/l_lbqg_icon1_vi.png.meta +++ b/Assets/ManagedResources/ArtFont_vi/l_lbqg_icon1_vi.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c795e697fe1854c4bb15c67c8e48c4fc +guid: 43f1ead0a3010eb49a9f2ec49eb4f626 TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -75,7 +75,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 99286dc9d8179e5419f739e86f799cbd + spriteID: 9fca36384ee92b14287a50341e34328e vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/ArtFont_vi/l_lbqg_icon2_vi.png b/Assets/ManagedResources/ArtFont_vi/l_lbqg_icon2_vi.png index f2e5347d68..093f052df6 100644 Binary files a/Assets/ManagedResources/ArtFont_vi/l_lbqg_icon2_vi.png and b/Assets/ManagedResources/ArtFont_vi/l_lbqg_icon2_vi.png differ diff --git a/Assets/ManagedResources/ArtFont_vi/l_lbqg_icon2_vi.png.meta b/Assets/ManagedResources/ArtFont_vi/l_lbqg_icon2_vi.png.meta index c3baefb82d..b0f32ae2e0 100644 --- a/Assets/ManagedResources/ArtFont_vi/l_lbqg_icon2_vi.png.meta +++ b/Assets/ManagedResources/ArtFont_vi/l_lbqg_icon2_vi.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 43f1ead0a3010eb49a9f2ec49eb4f626 +guid: c795e697fe1854c4bb15c67c8e48c4fc TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -75,7 +75,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 9fca36384ee92b14287a50341e34328e + spriteID: 99286dc9d8179e5419f739e86f799cbd vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab index cccf147455..d5c43dacc7 100644 --- a/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Expert/ExpertPanel.prefab @@ -5011,7 +5011,7 @@ ParticleSystem: --- !u!199 &391347278 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -11513,7 +11513,7 @@ ParticleSystem: --- !u!199 &85288511972748413 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -16256,7 +16256,7 @@ ParticleSystem: --- !u!199 &85288512077974317 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -20954,7 +20954,7 @@ ParticleSystem: --- !u!199 &85288512168349841 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -25652,7 +25652,7 @@ ParticleSystem: --- !u!199 &85288512214742610 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -30515,7 +30515,7 @@ ParticleSystem: --- !u!199 &85288513168343927 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -35213,7 +35213,7 @@ ParticleSystem: --- !u!199 &85288513351305705 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -41327,7 +41327,7 @@ ParticleSystem: --- !u!199 &414691610813295580 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -46025,7 +46025,7 @@ ParticleSystem: --- !u!199 &414691611028988226 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -50723,7 +50723,7 @@ ParticleSystem: --- !u!199 &414691612045800100 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -55466,7 +55466,7 @@ ParticleSystem: --- !u!199 &414691612085578008 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -60164,7 +60164,7 @@ ParticleSystem: --- !u!199 &414691612257095240 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -64862,7 +64862,7 @@ ParticleSystem: --- !u!199 &5899601245091579705 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -70066,7 +70066,7 @@ ParticleSystem: --- !u!199 &5567085447044821671 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -70233,8 +70233,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: 63, y: 3.7299995} - m_SizeDelta: {x: -24.98, y: -7.46} + m_AnchoredPosition: {x: -14.8, y: 3.7299995} + m_SizeDelta: {x: -29.6, y: -7.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3449836187948142904 CanvasRenderer: @@ -70268,9 +70268,9 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 38 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 38 m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 @@ -74853,7 +74853,7 @@ ParticleSystem: --- !u!199 &5045489869960765571 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -81223,7 +81223,7 @@ ParticleSystem: --- !u!199 &7424551215614179344 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -82636,9 +82636,9 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 40 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 45 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -87935,7 +87935,7 @@ ParticleSystem: --- !u!199 &6924675644743089439 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -94342,7 +94342,7 @@ ParticleSystem: --- !u!199 &7275324880265961258 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -100091,7 +100091,7 @@ ParticleSystem: --- !u!199 &7918083443768115927 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -105136,7 +105136,7 @@ ParticleSystem: --- !u!199 &4249202741276730180 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -109962,7 +109962,7 @@ ParticleSystem: --- !u!199 &7446892149717719861 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -112519,8 +112519,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u539F\u4EF7\uFF1A150\u5143" LanguageIndex: 10469 @@ -117163,7 +117163,7 @@ ParticleSystem: --- !u!199 &7994448136678369462 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -122886,7 +122886,7 @@ ParticleSystem: --- !u!199 &6366831406703767530 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -127701,7 +127701,7 @@ ParticleSystem: --- !u!199 &7647035856671918723 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -133589,7 +133589,7 @@ ParticleSystem: --- !u!199 &3442100318452166299 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -138402,7 +138402,7 @@ ParticleSystem: --- !u!199 &6225703503371946647 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -145211,7 +145211,7 @@ ParticleSystem: --- !u!199 &3736263280892008042 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -149983,7 +149983,7 @@ ParticleSystem: --- !u!199 &3736263281027369366 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -154901,7 +154901,7 @@ ParticleSystem: --- !u!199 &3736263281144678159 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -159599,7 +159599,7 @@ ParticleSystem: --- !u!199 &3736263281160650038 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -164302,7 +164302,7 @@ ParticleSystem: --- !u!199 &3736263281325203082 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -169344,7 +169344,7 @@ ParticleSystem: --- !u!199 &3736263282101879313 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -174042,7 +174042,7 @@ ParticleSystem: --- !u!199 &3736263282140865173 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -178815,7 +178815,7 @@ ParticleSystem: --- !u!199 &3736263282223057855 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -183558,7 +183558,7 @@ ParticleSystem: --- !u!199 &3736263282260434226 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -189056,7 +189056,7 @@ ParticleSystem: --- !u!199 &8736007889913585379 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -194123,7 +194123,7 @@ ParticleSystem: --- !u!199 &6218818886541518366 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -200733,7 +200733,7 @@ ParticleSystem: --- !u!199 &3061375693970565652 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -206189,7 +206189,7 @@ ParticleSystem: --- !u!199 &6371239923318808130 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -214881,7 +214881,7 @@ ParticleSystem: --- !u!199 &1315029844154324974 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -219680,7 +219680,7 @@ ParticleSystem: --- !u!199 &8071948387418332622 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -226495,7 +226495,7 @@ ParticleSystem: --- !u!199 &3296716962752466389 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -232027,7 +232027,7 @@ ParticleSystem: --- !u!199 &5208671054231575281 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -236725,7 +236725,7 @@ ParticleSystem: --- !u!199 &6800295426981046828 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -247586,7 +247586,7 @@ ParticleSystem: --- !u!199 &7443524496537394543 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -253999,7 +253999,7 @@ ParticleSystem: --- !u!199 &3952339559707849751 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -254670,8 +254670,8 @@ MonoBehaviour: m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u539F\u4EF7\uFF1A150\u5143" LanguageIndex: 10469 @@ -260149,7 +260149,7 @@ ParticleSystem: --- !u!199 &2759699216698959261 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -267114,7 +267114,7 @@ ParticleSystem: --- !u!199 &4947693289891535506 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -276245,7 +276245,7 @@ ParticleSystem: --- !u!199 &2910122108993515360 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -281785,7 +281785,7 @@ ParticleSystem: --- !u!199 &2442695948598551547 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -289570,7 +289570,7 @@ ParticleSystem: --- !u!199 &2047885427326027412 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -294268,7 +294268,7 @@ ParticleSystem: --- !u!199 &7335579053258334880 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -294334,10 +294334,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 9088898359959315875} m_Modifications: - - target: {fileID: 1649368952783984, guid: 826d6dc6a2cd18045a32a9c278ee6fa1, type: 3} - propertyPath: m_Name - value: live2d_c_ywe_0078 - objectReference: {fileID: 0} - target: {fileID: 224916758397273458, guid: 826d6dc6a2cd18045a32a9c278ee6fa1, type: 3} propertyPath: m_LocalPosition.x @@ -294458,6 +294454,10 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0.665 objectReference: {fileID: 0} + - target: {fileID: 1649368952783984, guid: 826d6dc6a2cd18045a32a9c278ee6fa1, type: 3} + propertyPath: m_Name + value: live2d_c_ywe_0078 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 826d6dc6a2cd18045a32a9c278ee6fa1, type: 3} --- !u!224 &739268628792506020 stripped diff --git a/Assets/ManagedResources/Prefabs/UI/Recruit/HeroPreviewPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Recruit/HeroPreviewPanel.prefab index 0d0470295f..47122b41b8 100644 --- a/Assets/ManagedResources/Prefabs/UI/Recruit/HeroPreviewPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Recruit/HeroPreviewPanel.prefab @@ -5140,7 +5140,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6799911238574588945 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/GiftBuy.lua b/Assets/ManagedResources/~Lua/Modules/Expert/GiftBuy.lua index ec57ba6990..539bc70939 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/GiftBuy.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/GiftBuy.lua @@ -80,8 +80,14 @@ function this.SingleDataShow(go, data) local goodData = OperatingManager.GetGiftGoodsInfo(GoodsTypeDef.DirectPurchaseGift, data.Id) local boughtNum = OperatingManager.GetGoodsBuyTime(GoodsTypeDef.DirectPurchaseGift, data.Id) or 0 local shows = shopItemData.RewardShow - name.text = GetLanguageStrById(shopItemData.Name) + name.text = GetLanguageStrById(shopItemData.Name) + LimitText.text = shopItemData.Limit + if GetCurLanguage() == 2 then + LimitText.gameObject.transform.localPosition = Vector3.New(4.7,-5,0) + else + LimitText.gameObject.transform.localPosition = Vector3.New(-147,-5,0) + end buyInfo:SetActive( shopItemData.IsDiscount ~= 0 ) if shopItemData.IsDiscount and shopItemData.IsDiscount > 0 then buyInfo:GetComponent("Text").text = Language[10582]..string.format(MoneyUtil.GetMoneyUnitName(), MoneyUtil.GetMoney(shopItemData.Price) / (shopItemData.IsDiscount/10))--shopItemData.Price / (shopItemData.IsDiscount/10)..MoneyUtil.GetMoneyUnitName() diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/ContinuityRechargePage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/ContinuityRechargePage.lua index 71d4acf348..e37d48648c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/ContinuityRechargePage.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/ContinuityRechargePage.lua @@ -21,11 +21,16 @@ function ContinuityRechargePage:ctor(mainPanel, gameObject) self.continuityTaskContent = Util.GetGameObject(self.gameObject, "taskList/viewPort/content") self.continuityTaskItem = Util.GetGameObject(self.continuityTaskContent, "itemPro") self.effect = Util.GetGameObject(self.gameObject, "UI_effect_OperatingPanel_normal") - self.title1 = Util.GetGameObject(self.gameObject, "Image/title1"):GetComponent("Text") + local image = Util.GetGameObject(self.gameObject, "Image") + self.title1 = Util.GetGameObject(image, "title1"):GetComponent("Text") self.continuityTaskItem:SetActive(false) end function ContinuityRechargePage:OnShow(_sortingOrder) - SetTextVerTial(self.title1,Vector3.New(38.295,152,0)) + if GetCurLanguage() == 1 then + SetTextVerTial(self.title1,Vector3.New(38.295,152,0)) + elseif GetCurLanguage() == 2 then + SetTextVerTial(self.title1,Vector3.New(172.5,152,0)) + end isPlayAnim = true Util.AddParticleSortLayer( self.effect, _sortingOrder - sortingOrder) sortingOrder = _sortingOrder