diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/q_qiriqiandao_xinnianqiandao.png b/Assets/ManagedResources/Atlas/ActivityAltas/q_qiriqiandao_xinnianqiandao.png new file mode 100644 index 0000000000..baf5977ee7 Binary files /dev/null and b/Assets/ManagedResources/Atlas/ActivityAltas/q_qiriqiandao_xinnianqiandao.png differ diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/q_qiriqiandao_xinnianqiandao.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/q_qiriqiandao_xinnianqiandao.png.meta new file mode 100644 index 0000000000..a836da6249 --- /dev/null +++ b/Assets/ManagedResources/Atlas/ActivityAltas/q_qiriqiandao_xinnianqiandao.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 8f95acdc485f05640bdf15a1df5eadac +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: f30dc6cc6ac04d340b2492b07765fe9e + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ActivityAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/q_xinnianqiandao_jindu.png b/Assets/ManagedResources/Atlas/ActivityAltas/q_xinnianqiandao_jindu.png new file mode 100644 index 0000000000..3c26747e11 Binary files /dev/null and b/Assets/ManagedResources/Atlas/ActivityAltas/q_xinnianqiandao_jindu.png differ diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/q_xinnianqiandao_jindu.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/q_xinnianqiandao_jindu.png.meta new file mode 100644 index 0000000000..b405111368 --- /dev/null +++ b/Assets/ManagedResources/Atlas/ActivityAltas/q_xinnianqiandao_jindu.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: c2af889c2d3a3ba4f93b556a01604c2f +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: dcccbe2250dcf7a4885ebcb83e95e57a + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ActivityAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/q_xinnianqiandao_rukou.png b/Assets/ManagedResources/Atlas/ActivityAltas/q_xinnianqiandao_rukou.png new file mode 100644 index 0000000000..05a836630a Binary files /dev/null and b/Assets/ManagedResources/Atlas/ActivityAltas/q_xinnianqiandao_rukou.png differ diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/q_xinnianqiandao_rukou.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/q_xinnianqiandao_rukou.png.meta new file mode 100644 index 0000000000..f6b4177c32 --- /dev/null +++ b/Assets/ManagedResources/Atlas/ActivityAltas/q_xinnianqiandao_rukou.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 8b1bfb91dff02864fbcb566710989872 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 087491ca5897dbc4ea9dc08cef2923dd + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ActivityAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/q_xinnianqiandao_rukoutu.png b/Assets/ManagedResources/Atlas/ActivityAltas/q_xinnianqiandao_rukoutu.png new file mode 100644 index 0000000000..01f7461580 Binary files /dev/null and b/Assets/ManagedResources/Atlas/ActivityAltas/q_xinnianqiandao_rukoutu.png differ diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/q_xinnianqiandao_rukoutu.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/q_xinnianqiandao_rukoutu.png.meta new file mode 100644 index 0000000000..b05ea55fcd --- /dev/null +++ b/Assets/ManagedResources/Atlas/ActivityAltas/q_xinnianqiandao_rukoutu.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 97279313d07df14469f1624bff7bcb91 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: bd12327654ba1634d90c124f0520b1b5 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ActivityAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/ActivityGift/FestevalPanel.prefab b/Assets/ManagedResources/Prefabs/UI/ActivityGift/FestevalPanel.prefab index 7be826efd1..490a35c966 100644 --- a/Assets/ManagedResources/Prefabs/UI/ActivityGift/FestevalPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/ActivityGift/FestevalPanel.prefab @@ -2731,7 +2731,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u6D3B\u52A8\u671F\u95F4\uFF0C\u7D2F\u8BA1\u7B7E\u5230" + m_Text: --- !u!1 &6077852558007825340 GameObject: m_ObjectHideFlags: 0 @@ -2765,10 +2765,10 @@ RectTransform: m_Father: {fileID: 6077852559235952314} m_RootOrder: 1 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: -298.7} - m_SizeDelta: {x: 1080, y: 855.5} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 490.65} + m_SizeDelta: {x: 1080, y: 981.29} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6077852558007825338 MonoBehaviour: @@ -2848,7 +2848,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -0.000018549576} + m_AnchoredPosition: {x: 0, y: -0.000028258406} m_SizeDelta: {x: 1080, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6077852558156391130 @@ -2866,10 +2866,10 @@ MonoBehaviour: m_Padding: m_Left: 0 m_Right: 0 - m_Top: 0 + m_Top: -14 m_Bottom: 0 m_ChildAlignment: 1 - m_Spacing: -88.82 + m_Spacing: -110 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -2946,7 +2946,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.55, b: 0, a: 1} + m_Color: {r: 0.9882353, g: 0.7882353, b: 0.4, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -2954,11 +2954,11 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 47 + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 45 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 4 m_MaxSize: 71 m_Alignment: 4 m_AlignByGeometry: 0 @@ -3002,8 +3002,8 @@ 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: 183} - m_SizeDelta: {x: 1080, y: 100} + m_AnchoredPosition: {x: 1.9, y: 33.5} + m_SizeDelta: {x: 528, y: 14} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6077852558425806813 CanvasRenderer: @@ -3033,8 +3033,8 @@ 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: cfa9b278a8f85074f8ce0f9dbeaed49e, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: c2af889c2d3a3ba4f93b556a01604c2f, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -3293,7 +3293,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 4 - m_Spacing: 0 + m_Spacing: -10 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -3332,8 +3332,8 @@ 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: 294} - m_SizeDelta: {x: 470, y: 212} + m_AnchoredPosition: {x: 0, y: 432} + m_SizeDelta: {x: 1080, y: 1056} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6077852559619287936 CanvasRenderer: @@ -3363,7 +3363,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: b8826c511812d2d4380e6c8d15be077b, type: 3} + m_Sprite: {fileID: 21300000, guid: 8f95acdc485f05640bdf15a1df5eadac, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3969,11 +3969,11 @@ RectTransform: m_Father: {fileID: 6077852559235952314} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 230.5} - m_SizeDelta: {x: 0, y: 473.3} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1080, y: 385.2} + m_Pivot: {x: 0.5, y: 0} --- !u!222 &5757666542951819331 CanvasRenderer: m_ObjectHideFlags: 0 @@ -4002,7 +4002,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: 7f3d71298143be544a39cd214f175cc9, type: 3} + m_Sprite: {fileID: 21300000, guid: a6c15c388ab9c1c47b37cf6196d1a749, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab index 7d54648ef5..e92733a1af 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab @@ -14083,7 +14083,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -75} - m_SizeDelta: {x: 138, y: 52} + m_SizeDelta: {x: 138, y: 26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &924378422067556265 CanvasRenderer: @@ -14113,7 +14113,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: b39483e6286fbc34b9ba95f05e5f70d5, type: 3} + m_Sprite: {fileID: 21300000, guid: 8b1bfb91dff02864fbcb566710989872, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -14405,7 +14405,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &9134791686612385594 RectTransform: m_ObjectHideFlags: 0 @@ -14423,10 +14423,10 @@ RectTransform: m_Father: {fileID: 1080492301643067761} m_RootOrder: 4 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 64, y: -64} + m_SizeDelta: {x: 128, y: 128} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2653978791900620036 CanvasRenderer: @@ -14456,7 +14456,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: f426e035128fc0341b3e94dcb75b36b6, type: 3} + m_Sprite: {fileID: 21300000, guid: 97279313d07df14469f1624bff7bcb91, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/FestevalPanel.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/FestevalPanel.lua index da2f94e571..b7f86134ac 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/FestevalPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/FestevalPanel.lua @@ -8,7 +8,8 @@ function FestevalPanel:InitComponent() self.closePanel = Util.GetGameObject(self.gameObject,"mask") self.liveRoot = Util.GetGameObject(self.closePanel,"root") self.title = Util.GetGameObject(self.closePanel,"title"):GetComponent("Image") - self.tip = Util.GetGameObject(self.closePanel,"tipDi/tip"):GetComponent("Text") + self.tipDi = Util.GetGameObject(self.closePanel,"tipDi"):GetComponent("Image") + self.tip = Util.GetGameObject(self.tipDi.transform,"tip"):GetComponent("Text") self.grid = Util.GetGameObject(self.gameObject,"content/grid") self.singleLinePre = Util.GetGameObject(self.gameObject,"singleLinePre") self.singleLinePreHeight = self.singleLinePre:GetComponent("RectTransform").rect.height @@ -52,14 +53,28 @@ function FestevalPanel:OnShow() poolManager:UnLoadLive(self.live.gameObject.name, self.live) self.live = nil end + + if GlobalActivityConfig[self.actId].ShowArt and GlobalActivityConfig[self.actId].ShowArt > 0 then + local data = ConfigManager.GetConfigData(ConfigName.HeroConfig,GlobalActivityConfig[self.actId].ShowArt) + self.live = poolManager:LoadLive(GetResourcePath(data.Live), self.liveRoot.transform, + Vector3.one * data.Scale, Vector3.New(data.Position[1], data.Position[2], 0)) + local SkeletonGraphic = self.live:GetComponent("SkeletonGraphic") + SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true) + end + self.tempData = string.split(GlobalActivityConfig[self.actId].ExpertDec,"#") - local data = ConfigManager.GetConfigData(ConfigName.HeroConfig,GlobalActivityConfig[self.actId].ShowArt) - self.live = poolManager:LoadLive(GetResourcePath(data.Live), self.liveRoot.transform, - Vector3.one * data.Scale, Vector3.New(data.Position[1], data.Position[2], 0)) - local SkeletonGraphic = self.live:GetComponent("SkeletonGraphic") - SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true) - self.title.sprite = self.spLoader:LoadSprite(self.tempData[2]) - self.tip.text = self.tempData[1] + self.title.sprite = self.spLoader:LoadSprite(self.tempData[1]) + self.title:SetNativeSize() + self.title.transform.localPosition = Vector3.New(tonumber(self.tempData[2]),tonumber(self.tempData[3]),tonumber(self.tempData[4])) + LogGreen("self.tempData[5]:"..self.tempData[5]) + self.tipDi.sprite = self.spLoader:LoadSprite(self.tempData[5]) + self.tipDi:SetNativeSize() + self.tipDi.transform.localPosition = Vector3.New(tonumber(self.tempData[6]),tonumber(self.tempData[7]),tonumber(self.tempData[8])) + if self.tempData[9] then + self.tip.text = self.tempData[9] + else + self.tip.text = self.tempData[9] + end self.curDay = math.ceil((CalculateSecondsNowTo_N_OClock(0) + GetTimeStamp() - self.actData.startTime)/86400) self:RefreshData() self:RemainTimeDown()