diff --git a/Assets/ManagedResources/Atlas/YunYouManAtlas.meta b/Assets/ManagedResources/Atlas/YunYouManAtlas.meta new file mode 100644 index 0000000000..ad9ba24a15 --- /dev/null +++ b/Assets/ManagedResources/Atlas/YunYouManAtlas.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8635c3edcfcb80947bf01dc7fd4b26e2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_dui.png b/Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_dui.png new file mode 100644 index 0000000000..c9be4ce636 Binary files /dev/null and b/Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_dui.png differ diff --git a/Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_dui.png.meta b/Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_dui.png.meta new file mode 100644 index 0000000000..2b792a923f --- /dev/null +++ b/Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_dui.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 2250134424dc56e4ea36edd55dc6c1a9 +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: 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: 69ead9518a76f224bace995b4f5923b8 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: YunYouManAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_jiahao.png b/Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_jiahao.png new file mode 100644 index 0000000000..e70b502e0b Binary files /dev/null and b/Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_jiahao.png differ diff --git a/Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_jiahao.png.meta b/Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_jiahao.png.meta new file mode 100644 index 0000000000..7f285df973 --- /dev/null +++ b/Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_jiahao.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 91bd0f13615c325478f8d42feefe6118 +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: 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: d46d523bcc3c61449be51a8da54a1058 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: YunYouManAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_jiantou.png b/Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_jiantou.png new file mode 100644 index 0000000000..a7e65f1dd9 Binary files /dev/null and b/Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_jiantou.png differ diff --git a/Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_jiantou.png.meta b/Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_jiantou.png.meta new file mode 100644 index 0000000000..c9cb2d8799 --- /dev/null +++ b/Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_jiantou.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 9131c7e32e8611c4d8f4c64958f8be57 +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: 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: e4d937ffd24edda4882a07539f714005 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: YunYouManAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_wenhao.png b/Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_wenhao.png new file mode 100644 index 0000000000..36f63ebbd2 Binary files /dev/null and b/Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_wenhao.png differ diff --git a/Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_wenhao.png.meta b/Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_wenhao.png.meta new file mode 100644 index 0000000000..07a08b5e89 --- /dev/null +++ b/Assets/ManagedResources/Atlas/YunYouManAtlas/y_yosr_wenhao.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 7cdf60c52d9d51d48a06ea7cb4208f5a +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: 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: 706c0984cdfcdf140985ac4524789f8f + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: YunYouManAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/NewActivity/ItemUpstarPre.prefab b/Assets/ManagedResources/Prefabs/UI/NewActivity/ItemUpstarPre.prefab index 928757e840..0bb931793a 100644 --- a/Assets/ManagedResources/Prefabs/UI/NewActivity/ItemUpstarPre.prefab +++ b/Assets/ManagedResources/Prefabs/UI/NewActivity/ItemUpstarPre.prefab @@ -379,7 +379,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: 0d2b66e7bbcc1334b8016a408e012fc3, type: 3} + m_Sprite: {fileID: 21300000, guid: 91bd0f13615c325478f8d42feefe6118, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -885,6 +885,7 @@ RectTransform: m_Children: - {fileID: 6669198770587612397} - {fileID: 7109536443945642743} + - {fileID: 7997253878173143200} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4115,7 +4116,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: 3dcd99a173e1259419816bfb75eb3d1c, type: 3} + m_Sprite: {fileID: 21300000, guid: 7cdf60c52d9d51d48a06ea7cb4208f5a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4311,6 +4312,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &5408289240471606003 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1258725882805172207} + - component: {fileID: 4708442608581007944} + - component: {fileID: 519391943244419454} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1258725882805172207 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5408289240471606003} + 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: 422889395483537237} + m_RootOrder: 0 + 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: 44} + m_SizeDelta: {x: 51, y: 55} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4708442608581007944 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5408289240471606003} + m_CullTransparentMesh: 0 +--- !u!114 &519391943244419454 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5408289240471606003} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, 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_Sprite: {fileID: 21300000, guid: 2250134424dc56e4ea36edd55dc6c1a9, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &5410642344278624905 GameObject: m_ObjectHideFlags: 0 @@ -4555,7 +4630,7 @@ MonoBehaviour: m_PressedTrigger: Pressed m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 0} + m_TargetGraphic: {fileID: 7425939409031495607} m_OnClick: m_PersistentCalls: m_Calls: [] @@ -5048,17 +5123,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6005425581511468918} - m_LocalRotation: {x: 0, y: 0, z: -0.7071068, w: 0.7071068} + 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_Children: + - {fileID: 1258725882805172207} m_Father: {fileID: 4220807657340541074} m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} + 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: -33, y: 0} - m_SizeDelta: {x: 130, y: 150} + m_AnchoredPosition: {x: -33, y: -19} + m_SizeDelta: {x: 109, y: 41} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5394818939192951364 CanvasRenderer: @@ -5088,7 +5164,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: 2ecaf3be54bafc741b8cbd28c39251f2, type: 3} + m_Sprite: {fileID: 21300000, guid: 9131c7e32e8611c4d8f4c64958f8be57, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -7381,7 +7457,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: 101, y: 0} + m_AnchoredPosition: {x: 116, y: 0} m_SizeDelta: {x: 158, y: 158} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7563042448382964633 @@ -7392,3 +7468,133 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9159323774331604050} m_CullTransparentMesh: 0 +--- !u!1001 &5373497646832568517 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4714066090596083411} + m_Modifications: + - target: {fileID: 2623781795014531170, guid: ee9304e5f1d403d4ea55d2f19fafa324, + type: 3} + propertyPath: m_Name + value: UI_Effect_MianBan_LiBao_button_01 + objectReference: {fileID: 0} + - target: {fileID: 2623781795014531170, guid: ee9304e5f1d403d4ea55d2f19fafa324, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324, + type: 3} + propertyPath: m_SizeDelta.y + value: 48.27 + objectReference: {fileID: 0} + - target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ee9304e5f1d403d4ea55d2f19fafa324, type: 3} +--- !u!224 &7997253878173143200 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324, + type: 3} + m_PrefabInstance: {fileID: 5373497646832568517} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset index ff3f1994dd..b1114a5d33 100644 --- a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset +++ b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset @@ -4133,8 +4133,8 @@ MonoBehaviour: - lz4/prefabs/map/r_map_newevent_012 - lz4/prefabs/map/r_map_newevent_013 - lz4/prefabs/map/r_map_newevent_016 - - lz4/prefabs/map/ui_effect_ditu_agent - lz4/prefabs/map/ui_effect_ditu_huoguang + - lz4/prefabs/map/ui_effect_ditu_agent - lz4/prefabs/map/ui_effect_ditu_member - lz4/prefabs/map/ui_effect_endless_icon_01 - lz4/prefabs/map/ui_effect_endless_icon_02 @@ -52361,11 +52361,11 @@ MonoBehaviour: extension: .prefab resPathIndex: 450 resAbNameIndex: 3132 - - resName: UI_effect_DiTu_agent + - resName: SingleFightPlayerView extension: .prefab resPathIndex: 450 resAbNameIndex: 3133 - - resName: UI_effect_DiTu_huoguang + - resName: UI_effect_DiTu_agent extension: .prefab resPathIndex: 450 resAbNameIndex: 3134 @@ -52437,6 +52437,10 @@ MonoBehaviour: extension: .prefab resPathIndex: 450 resAbNameIndex: 3151 + - resName: UI_Map_XunBaoEffect_hit + extension: .prefab + resPathIndex: 450 + resAbNameIndex: 3151 - resName: AchievementPanel extension: .prefab resPathIndex: 451 @@ -73537,8 +73541,9 @@ MonoBehaviour: - lz4/publicartres/animations.unity3d - lz4/publicartres/materials.unity3d - lz4/publicartres/textures.unity3d - - assetBundleName: lz4/prefabs/map/ui_effect_ditu_agent.unity3d + - assetBundleName: lz4/prefabs/map/ui_effect_ditu_huoguang.unity3d dependences: + - lz4/atlas/adventurealtas.unity3d - lz4/atlas/mapatlas.unity3d - lz4/atlas/publicatlas.unity3d - lz4/fonts/fzjinls.unity3d @@ -73546,9 +73551,8 @@ MonoBehaviour: - lz4/publicartres/animations.unity3d - lz4/publicartres/materials.unity3d - lz4/publicartres/models.unity3d - - assetBundleName: lz4/prefabs/map/ui_effect_ditu_huoguang.unity3d + - assetBundleName: lz4/prefabs/map/ui_effect_ditu_agent.unity3d dependences: - - lz4/atlas/adventurealtas.unity3d - lz4/atlas/mapatlas.unity3d - lz4/atlas/publicatlas.unity3d - lz4/fonts/fzjinls.unity3d @@ -74121,6 +74125,7 @@ MonoBehaviour: - lz4/atlas/carbonatlas.unity3d - lz4/atlas/findfairyatlas.unity3d - lz4/atlas/popupatlas.unity3d + - lz4/atlas/prayatlas.unity3d - lz4/atlas/publicatlas.unity3d - lz4/atlas/resolveatlas.unity3d - lz4/atlas/shopatlas.unity3d @@ -75166,7 +75171,6 @@ MonoBehaviour: - lz4/atlas/publicatlas.unity3d - lz4/atlas/roleinfoatlas.unity3d - lz4/atlas/settingplayeratlas.unity3d - - lz4/atlas/tagatlas.unity3d - lz4/bg/c_zuoqi_bg.unity3d - lz4/bg/r_friend_beijing.unity3d - lz4/dynamicatlas/r_hero_di.unity3d diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index c43fc29a68..87cd369f24 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -801,6 +801,7 @@ RedPointType = { Expert_FastExplore=3110,--极速达人 Expert_AreaExper = 3111,--竞技达人 Expert_LimitExchange = 3108,--限时兑换 + LimitExchange_GoExchange = 31081,-- 限时兑换活动 Expert_UpStarExper = 3109,--进阶达人 Expert_EquipExper = 3112,--装备达人 Expert_GoldExper = 3113,--点金达人 @@ -818,6 +819,7 @@ RedPointType = { Expert_Expedition= 3126,--天宫达人 Expert_Slhj= 3127,--森罗幻境达人 Expert_WeekCard= 3150,--周卡 + Expert_YunYouMan = 3128,--云游商人 --战力排行 达标战力 WarPowerSort_Sort = 3151,--达标战力 ---招财猫子红点 ---- @@ -891,8 +893,6 @@ RedPointType = { HongMeng_UpTower = 8012, -- 升级鸿蒙塔 按钮 HongMeng_OpenBox = 8013, -- 格子开启 - -- 限时兑换活动 - LimitExchange_GoExchange = 31081, } RedPointStatus = { diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index 12603aa899..5ea7dc5aea 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -1162,4 +1162,15 @@ function this.SetExchangeRedStatus(isShow) this.isExchangeRedShow = isShow end +function this.CheckYunYouManRedPoint() + local id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.YunYouShangRen) + if id and id > 0 then + local str = PlayerPrefs.GetInt(PlayerManager.uid.."CommonActPage"..ActivityTypeDef.YunYouShangRen) + if str == 1 then + return false + else + return true + end + end +end return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua index f151628f4c..dfd54e91f3 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua @@ -54,6 +54,7 @@ function CommonActPage:OnOpen(_activityConfig,_index,parent) self.pageIndex = _index self.parent = parent self.gameObject.name = "CommonActPage"..self.actConfig.Id + PlayerPrefs.SetInt(PlayerManager.uid.."CommonActPage"..self.actConfig.ActiveType,1) end -- 打开,重新打开时回调 diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua index a0d87a0052..897e532303 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua @@ -93,14 +93,15 @@ function this.GetExpertData(indexType,actType) if curData.rewards[i].missionId == actRewardConfigs[j].Id then if indexType == 3 then -- 3 积天豪礼 curData.rewards[i].otherData.Values = actRewardConfigs[j].Values[1][2] + curData.rewards[i].otherData.info = string.format("%s/%s",curData.rewards[i].otherData.Values,curData.rewards[i].otherData.Values) if curData.rewards[i].state == 1 then curData.rewards[i].otherData.state = 2 elseif curData.rewards[i].progress == 1 then curData.rewards[i].otherData.state = 0 else curData.rewards[i].otherData.state = 1 + curData.rewards[i].otherData.info = string.format("%s/%s",curData.rewards[i].progress,curData.rewards[i].otherData.Values) end - curData.rewards[i].otherData.info = string.format("%s/%s",curData.rewards[i].progress,curData.rewards[i].otherData.Values) else --日累计充值 达人 if actType == ActivityTypeDef.AccumulativeRechargeExper then curData.rewards[i].otherData.Values = actRewardConfigs[j].Values[1][1] @@ -189,4 +190,26 @@ function this.UpdateSingleTypeData(actType) end end +function this.CheckSingleRed(data) + if data.state == 0 then + local list = BagManager.GetBagItemDataByItemType(ItemBaseType.Equip) + local EquipedEquipList = HeroManager.GetEquipedEquipList() + for i = 1, #data.otherData.needItems do + for j = 1, #list do + if data.otherData.needItems[i] == list[j].itemConfig.Id then + return true + end + end + end + for i = 1, #data.otherData.needItems do + for j = 1, #EquipedEquipList do + if data.otherData.needItems[i] == EquipedEquipList[j] then + return true + end + end + end + end + return false +end + return CommonActPageManager \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/ItemUpstarPre.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/ItemUpstarPre.lua index d7fe148e99..e689363de7 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/ItemUpstarPre.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/ItemUpstarPre.lua @@ -23,6 +23,7 @@ function ItemUpstarPre:InitComponent() self.btnMaskNeed = Util.GetGameObject(self.midLayout,"itemNeed/mask") self.btnMaskGet = Util.GetGameObject(self.midLayout,"itemGet/mask") self.btnMaskNeedAdd = Util.GetGameObject(self.midLayout,"itemNeed/mask/Image") + self.effect = Util.GetGameObject(self.gameObject,"UI_Effect_MianBan_LiBao_button_01") end --绑定事件(用于子类重写) @@ -83,6 +84,8 @@ function ItemUpstarPre:Refresh() end self:SetMask() self:SetButton() + Util.SetParticleSortLayer(self.effect, self.sortingOrder or 0) + self.effect:SetActive(CommonActPageManager.CheckSingleRed(self.data)) end function ItemUpstarPre:SetMask() diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index a4cf5489fd..8053dfffb6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -411,6 +411,7 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.Expert_WeekCard, ActivityGiftManager.WeedCardActivityIsShowRedPoint) RPData:AddCheckFunc(RedPointType.Expert_Expedition, ActivityGiftManager.ExpterActivityIsShowRedPoint) RPData:AddCheckFunc(RedPointType.Expert_Slhj, ActivityGiftManager.ExpterActivityIsShowRedPoint) + RPData:AddCheckFunc(RedPointType.Expert_YunYouMan, ActivityGiftManager.CheckYunYouManRedPoint) -- RPData:AddCheckFunc(RedPointType.HERO_STAR_GIFT, OperatingManager.IsHeroStarGiftActive) --战力排行 RPData:AddCheckFunc(RedPointType.WarPowerSort_Sort, ActivityGiftManager.WarPowerSortActivityIsShowRedPoint)