diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-meiri_zh.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-meiri_zh.png index 66b464351e..0983a24326 100644 Binary files a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-meiri_zh.png and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-meiri_zh.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-qinlongmibao_zh.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-qinlongmibao_zh.png index b642b25ad6..e16aa1b9a5 100644 Binary files a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-qinlongmibao_zh.png and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-qinlongmibao_zh.png differ diff --git a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-xuanjimiaosuan2_zh.png b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-xuanjimiaosuan2_zh.png index 140fa9f127..a10df27dcc 100644 Binary files a/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-xuanjimiaosuan2_zh.png and b/Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-xuanjimiaosuan2_zh.png differ diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/r_zjm_chongzhitiao.png.meta b/Assets/ManagedResources/Atlas/PublicAtlas/r_zjm_chongzhitiao.png.meta index db558d0075..a9cdf9c2db 100644 --- a/Assets/ManagedResources/Atlas/PublicAtlas/r_zjm_chongzhitiao.png.meta +++ b/Assets/ManagedResources/Atlas/PublicAtlas/r_zjm_chongzhitiao.png.meta @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 12, y: 8, z: 12, w: 9} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -91,6 +91,17 @@ TextureImporter: 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: [] diff --git a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-gonghuixiuxing.png b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-gonghuixiuxing.png index d324713c4a..457e36fa72 100644 Binary files a/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-gonghuixiuxing.png and b/Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_zjm_icon-gonghuixiuxing.png differ diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab index 054655ef74..f678767790 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab @@ -23634,7 +23634,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 74, y: -63} + m_AnchoredPosition: {x: 63, y: -63} m_SizeDelta: {x: 148, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &600217400349962022 @@ -50945,12 +50945,13 @@ RectTransform: - {fileID: 2143439897358225204} - {fileID: 3476783521668318209} - {fileID: 1749422462585656995} + - {fileID: 4244862305403796563} m_Father: {fileID: 1612271237950830011} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -124.00003, y: -77.999954} + m_AnchoredPosition: {x: -113.00003, y: -77.999954} m_SizeDelta: {x: 126, y: 126} m_Pivot: {x: 0.49999973, y: 0.50000036} --- !u!222 &4883613866719607552 @@ -50997,7 +50998,7 @@ MonoBehaviour: m_PressedTrigger: Pressed m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 0} + m_TargetGraphic: {fileID: 6216721569093789271} m_OnClick: m_PersistentCalls: m_Calls: [] @@ -71064,6 +71065,122 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &6482266772587879501 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4244862305403796563} + - component: {fileID: 4508923158161261394} + - component: {fileID: 7320074890625200849} + - component: {fileID: 5264215755512183990} + - component: {fileID: 7248956369180704529} + m_Layer: 5 + m_Name: nameTxt + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4244862305403796563 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6482266772587879501} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 5034612710644007650} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 63, y: -101} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4508923158161261394 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6482266772587879501} + m_CullTransparentMesh: 0 +--- !u!114 &7320074890625200849 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6482266772587879501} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.990566, g: 0.9672036, b: 0.9672036, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 28 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: New Text +--- !u!114 &5264215755512183990 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6482266772587879501} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &7248956369180704529 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6482266772587879501} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0.14901961, g: 0.28627452, b: 0.38431376, a: 1} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &6511384738508279511 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/ResConfigs/r_zjm_huodongicon-linglongbaojing.png b/Assets/ManagedResources/ResConfigs/r_zjm_huodongicon-linglongbaojing.png index 29e496f5eb..4d334bd4d1 100644 Binary files a/Assets/ManagedResources/ResConfigs/r_zjm_huodongicon-linglongbaojing.png and b/Assets/ManagedResources/ResConfigs/r_zjm_huodongicon-linglongbaojing.png differ diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index a48bbd178e..bf4a7a1fbf 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -993,6 +993,7 @@ function this.CreatActivity() activityTabs[k].img = Util.GetGameObject(activityTabs[k].go, "icon"):GetComponent("Image") activityTabs[k].timeImg = Util.GetGameObject(activityTabs[k].go, "Image_1") activityTabs[k].timeText = Util.GetGameObject(activityTabs[k].timeImg, "time"):GetComponent("Text") + activityTabs[k].nameTxt = Util.GetGameObject(activityTabs[k].go, "nameTxt"):GetComponent("Text") activityTabs[k].redpot = Util.GetGameObject(activityTabs[k].go, "redPoint") -- 限时折扣显示特效 if v.Id == 13 then @@ -1031,7 +1032,7 @@ function this.CreatActivity() else activityTabs[k].img.sprite = this.spLoader:LoadSprite(v.Icon[1]) end - + activityTabs[k].nameTxt.text=v.Sesc activityTabs[k].img:SetNativeSize() Util.AddOnceClick(activityTabs[k].go,function() if v.ActiveType > 0 then