diff --git a/Assets/ManagedResources/Icon/Item/r_Material_patch_0001.png b/Assets/ManagedResources/Icon/Item/r_Material_patch_0001.png new file mode 100644 index 0000000000..8e40d90771 Binary files /dev/null and b/Assets/ManagedResources/Icon/Item/r_Material_patch_0001.png differ diff --git a/Assets/ManagedResources/Icon/Item/r_Material_patch_0001.png.meta b/Assets/ManagedResources/Icon/Item/r_Material_patch_0001.png.meta new file mode 100644 index 0000000000..4077948c4d --- /dev/null +++ b/Assets/ManagedResources/Icon/Item/r_Material_patch_0001.png.meta @@ -0,0 +1,142 @@ +fileFormatVersion: 2 +guid: 9500ae154457fbb408e6c1381631b4b4 +TextureImporter: + fileIDToRecycleName: + 21300000: r_Material_patch_0001 + 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: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + 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: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + 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 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: r_Material_patch_0001 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 150 + height: 150 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: ddd28a93d46ea02488079f034fba2064 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 0e474c70355663042a7652deb7f75608 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Icon/Item/r_RareItem_Specail_0010.png b/Assets/ManagedResources/Icon/Item/r_RareItem_Specail_0010.png new file mode 100644 index 0000000000..df5be9f950 Binary files /dev/null and b/Assets/ManagedResources/Icon/Item/r_RareItem_Specail_0010.png differ diff --git a/Assets/ManagedResources/Icons/r_RareItem_Specail_0010.png.meta b/Assets/ManagedResources/Icon/Item/r_RareItem_Specail_0010.png.meta similarity index 91% rename from Assets/ManagedResources/Icons/r_RareItem_Specail_0010.png.meta rename to Assets/ManagedResources/Icon/Item/r_RareItem_Specail_0010.png.meta index ad04bdc34d..29052eb27f 100644 --- a/Assets/ManagedResources/Icons/r_RareItem_Specail_0010.png.meta +++ b/Assets/ManagedResources/Icon/Item/r_RareItem_Specail_0010.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 570bffd854940a9498fe7b786fdf6060 +guid: d15f38599d93c364eb8ba030d17a08c3 TextureImporter: fileIDToRecycleName: 21300000: r_RareItem_Specail_0010 @@ -32,7 +32,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 2 + filterMode: -1 aniso: -1 mipBias: -100 wrapU: 1 @@ -43,12 +43,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 2 spriteExtrude: 1 - spriteMeshType: 0 + spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 0 + spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 @@ -59,39 +59,6 @@ TextureImporter: 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: 65 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 12 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 1 - androidETC2FallbackOverride: 0 - serializedVersion: 2 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 @@ -103,6 +70,39 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + 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 spriteSheet: serializedVersion: 2 sprites: @@ -121,7 +121,7 @@ TextureImporter: physicsShape: [] tessellationDetail: -1 bones: [] - spriteID: ecf3a7b09b6d0c84bad2c357445ab535 + spriteID: fbe92bbaf7f84a14b9abca4bdb04e9ad vertices: [] indices: edges: [] @@ -129,7 +129,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 541cd720acee9df4ba5de9506820a3af + spriteID: f9181ff39f8a17b469f06e778e39e9f9 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Icons/r_RareItem_Specail_0010.png b/Assets/ManagedResources/Icons/r_RareItem_Specail_0010.png deleted file mode 100644 index f83968c9c8..0000000000 Binary files a/Assets/ManagedResources/Icons/r_RareItem_Specail_0010.png and /dev/null differ diff --git a/Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelSingleChapterPanel.prefab b/Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelSingleChapterPanel.prefab index dd53330214..7503d8a83c 100644 --- a/Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelSingleChapterPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelSingleChapterPanel.prefab @@ -798,9 +798,9 @@ RectTransform: m_Father: {fileID: 7397389818723011487} 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: 382.05, y: -45.05} m_SizeDelta: {x: 88.1, y: 90.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8764021292826640633 @@ -1900,6 +1900,7 @@ RectTransform: - {fileID: 4730423253664528141} - {fileID: 4730423252881435849} - {fileID: 3457989415352141852} + - {fileID: 2297395697377060500} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1969,6 +1970,7 @@ MonoBehaviour: bgList: - {fileID: 4730423253146583237} - {fileID: 527046619266518829} + - {fileID: 7661218203001728108} --- !u!1 &3247638267202103121 GameObject: m_ObjectHideFlags: 0 @@ -7575,9 +7577,9 @@ RectTransform: m_Father: {fileID: 7397389818723011487} 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: 610.15, y: -45.05} m_SizeDelta: {x: 88.1, y: 90.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5725273977751880029 @@ -9021,6 +9023,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 3630680694302757113} + - {fileID: 7967068494741650751} + - {fileID: 6473444401280887429} m_Father: {fileID: 4653628614703019778} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -9439,9 +9443,9 @@ RectTransform: m_Father: {fileID: 7397389818723011487} 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: 153.95, y: -45.05} m_SizeDelta: {x: 88.1, y: 90.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5108727623760178301 @@ -9622,6 +9626,80 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u5DF2\u9886\u53D6" LanguageIndex: 10004 +--- !u!1 &7661218203001728108 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2297395697377060500} + - component: {fileID: 642314253417838548} + - component: {fileID: 2106474113538926910} + m_Layer: 5 + m_Name: mask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2297395697377060500 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7661218203001728108} + 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: 3458295202399734364} + m_RootOrder: 5 + 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: 0} + m_SizeDelta: {x: 1080, y: 1920} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &642314253417838548 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7661218203001728108} + m_CullTransparentMesh: 0 +--- !u!114 &2106474113538926910 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7661218203001728108} + 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: 0.003921569} + 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: 0} + 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 &7869799598452719157 GameObject: m_ObjectHideFlags: 0 @@ -14688,6 +14766,276 @@ MonoBehaviour: m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 m_ChildControlHeight: 0 +--- !u!1001 &790465716 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 6652967392251576276} + m_Modifications: + - target: {fileID: 6566384918123794312, guid: 59a87b7d74cdd0b4283a0afae394e6fd, + type: 3} + propertyPath: m_Name + value: UI_Effect_BaoXiang_KaiQi + objectReference: {fileID: 0} + - target: {fileID: 7967068494121775499, guid: 59a87b7d74cdd0b4283a0afae394e6fd, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7967068494121775499, guid: 59a87b7d74cdd0b4283a0afae394e6fd, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7967068494121775499, guid: 59a87b7d74cdd0b4283a0afae394e6fd, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7967068494121775499, guid: 59a87b7d74cdd0b4283a0afae394e6fd, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7967068494121775499, guid: 59a87b7d74cdd0b4283a0afae394e6fd, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7967068494121775499, guid: 59a87b7d74cdd0b4283a0afae394e6fd, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7967068494121775499, guid: 59a87b7d74cdd0b4283a0afae394e6fd, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7967068494121775499, guid: 59a87b7d74cdd0b4283a0afae394e6fd, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7967068494121775499, guid: 59a87b7d74cdd0b4283a0afae394e6fd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7967068494121775499, guid: 59a87b7d74cdd0b4283a0afae394e6fd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7967068494121775499, guid: 59a87b7d74cdd0b4283a0afae394e6fd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7967068494121775499, guid: 59a87b7d74cdd0b4283a0afae394e6fd, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7967068494121775499, guid: 59a87b7d74cdd0b4283a0afae394e6fd, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 33 + objectReference: {fileID: 0} + - target: {fileID: 7967068494121775499, guid: 59a87b7d74cdd0b4283a0afae394e6fd, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7967068494121775499, guid: 59a87b7d74cdd0b4283a0afae394e6fd, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7967068494121775499, guid: 59a87b7d74cdd0b4283a0afae394e6fd, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7967068494121775499, guid: 59a87b7d74cdd0b4283a0afae394e6fd, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7967068494121775499, guid: 59a87b7d74cdd0b4283a0afae394e6fd, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7967068494121775499, guid: 59a87b7d74cdd0b4283a0afae394e6fd, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7967068494121775499, guid: 59a87b7d74cdd0b4283a0afae394e6fd, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7967068494121775499, guid: 59a87b7d74cdd0b4283a0afae394e6fd, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7967068494121775499, guid: 59a87b7d74cdd0b4283a0afae394e6fd, + type: 3} + propertyPath: m_LocalScale.x + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 7967068494121775499, guid: 59a87b7d74cdd0b4283a0afae394e6fd, + type: 3} + propertyPath: m_LocalScale.y + value: 1.2 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 59a87b7d74cdd0b4283a0afae394e6fd, type: 3} +--- !u!224 &7967068494741650751 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7967068494121775499, guid: 59a87b7d74cdd0b4283a0afae394e6fd, + type: 3} + m_PrefabInstance: {fileID: 790465716} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1640104383 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 6652967392251576276} + m_Modifications: + - target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675, + type: 3} + propertyPath: m_Name + value: UI_Effect_BaoXiang_KeKaiQi + objectReference: {fileID: 0} + - target: {fileID: 6473444402870397754, guid: 5daa3a0ddb216d14093aa7cd11574675, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6473444402870397754, guid: 5daa3a0ddb216d14093aa7cd11574675, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6473444402870397754, guid: 5daa3a0ddb216d14093aa7cd11574675, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6473444402870397754, guid: 5daa3a0ddb216d14093aa7cd11574675, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6473444402870397754, guid: 5daa3a0ddb216d14093aa7cd11574675, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6473444402870397754, guid: 5daa3a0ddb216d14093aa7cd11574675, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6473444402870397754, guid: 5daa3a0ddb216d14093aa7cd11574675, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6473444402870397754, guid: 5daa3a0ddb216d14093aa7cd11574675, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6473444402870397754, guid: 5daa3a0ddb216d14093aa7cd11574675, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6473444402870397754, guid: 5daa3a0ddb216d14093aa7cd11574675, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6473444402870397754, guid: 5daa3a0ddb216d14093aa7cd11574675, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6473444402870397754, guid: 5daa3a0ddb216d14093aa7cd11574675, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6473444402870397754, guid: 5daa3a0ddb216d14093aa7cd11574675, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 33 + objectReference: {fileID: 0} + - target: {fileID: 6473444402870397754, guid: 5daa3a0ddb216d14093aa7cd11574675, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6473444402870397754, guid: 5daa3a0ddb216d14093aa7cd11574675, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6473444402870397754, guid: 5daa3a0ddb216d14093aa7cd11574675, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6473444402870397754, guid: 5daa3a0ddb216d14093aa7cd11574675, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6473444402870397754, guid: 5daa3a0ddb216d14093aa7cd11574675, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6473444402870397754, guid: 5daa3a0ddb216d14093aa7cd11574675, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6473444402870397754, guid: 5daa3a0ddb216d14093aa7cd11574675, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6473444402870397754, guid: 5daa3a0ddb216d14093aa7cd11574675, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6473444402870397754, guid: 5daa3a0ddb216d14093aa7cd11574675, + type: 3} + propertyPath: m_LocalScale.x + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 6473444402870397754, guid: 5daa3a0ddb216d14093aa7cd11574675, + type: 3} + propertyPath: m_LocalScale.y + value: 1.2 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5daa3a0ddb216d14093aa7cd11574675, type: 3} +--- !u!224 &6473444401280887429 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6473444402870397754, guid: 5daa3a0ddb216d14093aa7cd11574675, + type: 3} + m_PrefabInstance: {fileID: 1640104383} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2206951526822331305 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelSingleChapterPanel.lua b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelSingleChapterPanel.lua index 46b8b38488..b455faa569 100644 --- a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelSingleChapterPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelSingleChapterPanel.lua @@ -4,8 +4,6 @@ local this = FightLevelSingleChapterPanel local sortingOrder = 0 local boxList = {} local levelList = {} -local levelListEffect = {} -local starListEffect = {} local chapterId = 0 local chapterData = {} local allMissionDailyBoxItemPres = {} @@ -27,8 +25,6 @@ function FightLevelSingleChapterPanel:InitComponent() this.prb = Util.GetGameObject(self.gameObject, "middle/prb") this.rect = Util.GetGameObject(self.gameObject, "middle/rect") levelList = {} - levelListEffect = {} - starListEffect = {} this.rewardBoxParent = Util.GetGameObject(self.gameObject, "middle/rewardBg/btnList") this.progressBottom = Util.GetGameObject(self.gameObject, "middle/rewardBg/progressBottom/Image"):GetComponent("Image") for i = 1, 3 do @@ -50,6 +46,7 @@ function FightLevelSingleChapterPanel:InitComponent() this.pointPre = Util.GetGameObject(self.gameObject, "middle/pointPre") this.pointParent = Util.GetGameObject(self.gameObject, "middle/pointParent") this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform, { showType = UpViewOpenType.ShowLeft }) + this.mask = Util.GetGameObject(self.gameObject, "mask") end --绑定事件(用于子类重写) @@ -70,16 +67,9 @@ function FightLevelSingleChapterPanel:BindEvent() end function FightLevelSingleChapterPanel:OnSortingOrderChange() --特效层级重设 - if starListEffect and #starListEffect > 0 then - for i=1,#starListEffect do - -- Util.AddParticleSortLayer(starListEffect[i], self.sortingOrder - sortingOrder) - Util.SetParticleSortLayer(starListEffect[i], self.sortingOrder + 1) - end - end - if levelListEffect and #levelListEffect > 0 then - for i=1,#levelListEffect do - -- Util.AddParticleSortLayer(levelListEffect[i], self.sortingOrder - sortingOrder) - Util.SetParticleSortLayer(levelListEffect[i], self.sortingOrder + 1) + if levelList and #levelList > 0 then + for i=1,#levelList do + Util.SetParticleSortLayer(levelList[i], self.sortingOrder + 1) end sortingOrder = self.sortingOrder end @@ -87,6 +77,7 @@ end --界面打开时调用(用于子类重写) function FightLevelSingleChapterPanel:OnOpen(_chapterId) chapterId = _chapterId + this.mask:SetActive(false) -- SoundManager.PlaySound(SoundConfig.Sound_WorldMap) this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Main }) end @@ -168,10 +159,6 @@ function this.SetSingleLevel(levelDatas) go.transform.localScale = Vector3.one go.transform.localPosition = Vector3.zero levelList[i] = go - levelListEffect[i] = Util.GetGameObject(go, "UI_Effect_Kuang_JinSe") - for j = 1, 3 do - starListEffect[i] = Util.GetGameObject(go, "isFirst/Fx_star_looping (".. j ..")") - end end go.gameObject:SetActive(false) end @@ -191,10 +178,8 @@ function this.SetSingleLevel(levelDatas) UI_Effect_Kuang_JinSe:SetActive(isOpen == 0 and levelData.config.StageType == FIGHTLEVEL_STAGETYPE.MainLevel) isFarstEffect:SetActive(levelData.isFirst and levelData.config.StageType == FIGHTLEVEL_STAGETYPE.MainLevel) for j = 1, 3 do - -- Util.AddParticleSortLayer(Util.GetGameObject(isFarstEffect, "Fx_star_looping ("..j..")"),this.sortingOrder - (sortingOrder - 1)) Util.SetParticleSortLayer(Util.GetGameObject(isFarstEffect, "Fx_star_looping ("..j..")"),this.sortingOrder + 1) end - -- Util.AddParticleSortLayer(UI_Effect_Kuang_JinSe,this.sortingOrder - (sortingOrder - 1)) Util.SetParticleSortLayer(UI_Effect_Kuang_JinSe,this.sortingOrder + 1) if levelData.config.StageType == FIGHTLEVEL_STAGETYPE.MainLevel then --主关卡 prb1:SetActive(true) @@ -228,19 +213,38 @@ function this.SetSingleLevel(levelDatas) end) elseif levelData.config.StageType == FIGHTLEVEL_STAGETYPE.AssistantLevelReward then--副关卡奖励 prb2:SetActive(true) + local prb2Icon = Util.GetGameObject(prb2, "Icon") prb2:GetComponent("Image").sprite = this.spLoader:LoadSprite(isOpen == 0 and assistantLevleDiBg[1] or assistantLevleDiBg[2]) local icon = isOpen == 0 and assistantLevleReward[1] or assistantLevleReward[2] if levelData.state == 1 then icon = assistantLevleReward[3] end - Util.GetGameObject(prb2, "Icon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(icon) + if isOpen == 0 then + prb2Icon:SetActive(false) + else + prb2Icon:SetActive(true) + end + prb2Icon:GetComponent("Image").sprite = this.spLoader:LoadSprite(icon) + Util.GetGameObject(levelList[i], "prb2/UI_Effect_BaoXiang_KaiQi"):SetActive(levelData.state==1) + Util.GetGameObject(levelList[i], "prb2/UI_Effect_BaoXiang_KaiQi/MeiKaiQi"):SetActive(false) + Util.GetGameObject(levelList[i], "prb2/UI_Effect_BaoXiang_KaiQi"):GetComponent("Animator").enabled = false + Util.GetGameObject(levelList[i], "prb2/UI_Effect_BaoXiang_KaiQi/KaiQi"):SetActive(levelData.state==1) + Util.GetGameObject(levelList[i], "prb2/UI_Effect_BaoXiang_KeKaiQi"):SetActive(levelData.state==0 and isOpen == 0) Util.AddOnceClick(levelList[i], function() if isOpen == 0 then if levelData.state == 0 then - FightLevelManager.FightLevelFightBattle(levelData, function() - this.OnShowPanel() - this.LeftOrRightBtnClickEvent() - end) + this.mask:SetActive(true) + Util.GetGameObject(levelList[i], "prb2/UI_Effect_BaoXiang_KeKaiQi"):SetActive(false) + Util.GetGameObject(levelList[i], "prb2/UI_Effect_BaoXiang_KaiQi"):SetActive(true) + Util.GetGameObject(levelList[i], "prb2/UI_Effect_BaoXiang_KaiQi"):GetComponent("Animator").enabled = true + Util.GetGameObject(levelList[i], "prb2/UI_Effect_BaoXiang_KaiQi/MeiKaiQi"):SetActive(true) + Timer.New(function() + FightLevelManager.FightLevelFightBattle(levelData, function() + this.OnShowPanel() + this.LeftOrRightBtnClickEvent() + this.mask:SetActive(false) + end) + end, 1, 1, true):Start() elseif levelData.state == 1 then PopupTipPanel.ShowTip("奖励已领取!") end @@ -251,7 +255,8 @@ function this.SetSingleLevel(levelDatas) elseif isOpen == 2 then PopupTipPanel.ShowTip(string.format("到达%s级后解锁!",levelDatas[i].config.LevelLimit)) end - end) + end) + Util.SetParticleSortLayer(levelList[i], this.sortingOrder + 1) elseif levelData.config.StageType == FIGHTLEVEL_STAGETYPE.AssistantLevel then--副关卡战斗 prb3:SetActive(true) prb3:GetComponent("Image").sprite = this.spLoader:LoadSprite(isOpen == 0 and assistantLevleDiBg[1] or assistantLevleDiBg[2]) @@ -272,10 +277,6 @@ function this.SetSingleLevel(levelDatas) end end) end - - -- Util.SetGray(prb1, not (isOpen == 0)) - -- Util.SetGray(prb2, not (isOpen == 0)) - -- Util.SetGray(prb3, not (isOpen == 0)) end end function this.SetlevelBox(_rewardBoxDatas) @@ -306,7 +307,6 @@ function this.SetlevelBox(_rewardBoxDatas) -- Util.GetGameObject(boxList[i], "UI_Effect_BaoXiang_KeKaiQi"):SetActive(v.state==SingleDailyMissionState.Finish) Util.GetGameObject(boxList[i], "getFinish"):SetActive(false) Util.GetGameObject(boxList[i], "redPoint"):SetActive(false) - -- LogYellow("missionConfigData.state ".._rewardBoxDatas[i].state.." chapterData.stars "..chapterData.stars.." missionConfigData.Star "..missionConfigData.Star) if _rewardBoxDatas[i].state == 0 then if chapterData.stars >= missionConfigData.Star then Util.GetGameObject(boxList[i], "redPoint"):SetActive(true) @@ -331,7 +331,6 @@ function this.SetlevelBox(_rewardBoxDatas) elseif _rewardBoxDatas[i].state == 1 then Util.GetGameObject(boxList[i], "getFinish"):SetActive(true) Util.AddOnceClick(boxList[i], function() - -- PopupTipPanel.ShowTip("奖励已领取!") this.FindBoxRewardInfo(missionConfigData) end) end @@ -342,7 +341,6 @@ end --左右按钮 function this.LeftOrRightBtnClickEvent(index) --index 为空时 刷新下左右按钮的显示 下一章节未开启的时候不显示右按钮 相反 - -- chapterData = FightLevelManager.GetChapterData(chapterId) local upChapterId = chapterData.chapterId - 1 local upChapterData = FightLevelManager.GetChapterData(upChapterId) local canLeft = true diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 1916260aed..044d6a6ee6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -639,6 +639,7 @@ function this.ClearRedPoint() ClearRedPointObject(RedPointType.DiffMonster, this.rpYiYao) ClearRedPointObject(RedPointType.Vientiane, this.rpColorfulWorld) ClearRedPointObject(RedPointType.PokemonMainCity, this.rpPokemon) + ClearRedPointObject(RedPointType.HongMeng,this.HongMengRedPoint) ClearRedPointObject(RedPointType.TianShuMiJuan,this.rpbtnTianShuMiJuan) ClearRedPointObject(RedPointType.LuckyTurn,this.rpbtnXingYunTanBao) ClearRedPointObject(RedPointType.FifteenDayGift,this.rpFifteenDayGift)