From bae17c2fed4c4e6277e924a21d9b7e8614086bfd Mon Sep 17 00:00:00 2001 From: "WIN-IEQ8U88PPRB\\Administrator" <289563215@qq.com> Date: Tue, 28 Apr 2026 16:17:59 +0800 Subject: [PATCH] 111 --- .../Shop/Big/Packed/21Shop_dw_01.png | Bin 0 -> 3938 bytes .../Shop/Big/Packed/21Shop_dw_01.png.meta | 127 +++++++++++++ yyzl/01Mergeorder/MainMergePanel.prefab | 168 +++++++++++++++++- yyzl/01Mergeorder/MergeOrderItem.prefab | 6 +- 4 files changed, 290 insertions(+), 11 deletions(-) create mode 100644 GameMain/UI/UISprites/Shop/Big/Packed/21Shop_dw_01.png create mode 100644 GameMain/UI/UISprites/Shop/Big/Packed/21Shop_dw_01.png.meta diff --git a/GameMain/UI/UISprites/Shop/Big/Packed/21Shop_dw_01.png b/GameMain/UI/UISprites/Shop/Big/Packed/21Shop_dw_01.png new file mode 100644 index 0000000000000000000000000000000000000000..5d5f020386d439472f005a2a6d5529b827d39976 GIT binary patch literal 3938 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 literal 0 HcmV?d00001 diff --git a/GameMain/UI/UISprites/Shop/Big/Packed/21Shop_dw_01.png.meta b/GameMain/UI/UISprites/Shop/Big/Packed/21Shop_dw_01.png.meta new file mode 100644 index 00000000..dbda14ed --- /dev/null +++ b/GameMain/UI/UISprites/Shop/Big/Packed/21Shop_dw_01.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 20a5bcd90c58d7c4b98ae901ac7cc768 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/yyzl/01Mergeorder/MainMergePanel.prefab b/yyzl/01Mergeorder/MainMergePanel.prefab index ee76ed29..56c269a1 100644 --- a/yyzl/01Mergeorder/MainMergePanel.prefab +++ b/yyzl/01Mergeorder/MainMergePanel.prefab @@ -93111,8 +93111,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 216, y: 0} - m_SizeDelta: {x: 27, y: 0} + m_AnchoredPosition: {x: 90, y: 0} + m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8055633682255266686 CanvasRenderer: @@ -95905,6 +95905,8 @@ RectTransform: - {fileID: 492343743743426136} - {fileID: 2102756202488553808} - {fileID: 2222241177069898636} + - {fileID: 2869720310755875961} + - {fileID: 2332425150668320518} m_Father: {fileID: 318959986884134882} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -102404,8 +102406,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 648, y: 0} - m_SizeDelta: {x: 27, y: 1696} + m_AnchoredPosition: {x: 450, y: 0} + m_SizeDelta: {x: 20, y: 1696} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1161572687766386540 CanvasRenderer: @@ -110730,8 +110732,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 432, y: 0} - m_SizeDelta: {x: 27, y: 1696} + m_AnchoredPosition: {x: 270, y: 0} + m_SizeDelta: {x: 20, y: 1696} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3500311216129544805 CanvasRenderer: @@ -123261,8 +123263,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 864, y: 0} - m_SizeDelta: {x: 27, y: 1696} + m_AnchoredPosition: {x: 630, y: 0} + m_SizeDelta: {x: 20, y: 1696} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5758415346814538605 CanvasRenderer: @@ -128408,6 +128410,81 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &6466350657207031791 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2869720310755875961} + - component: {fileID: 4531327548205102457} + - component: {fileID: 1909942920599887306} + m_Layer: 5 + m_Name: lineS (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2869720310755875961 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6466350657207031791} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 357073646129736361} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 810, y: 0} + m_SizeDelta: {x: 20, y: 1696} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4531327548205102457 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6466350657207031791} + m_CullTransparentMesh: 1 +--- !u!114 &1909942920599887306 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6466350657207031791} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: cdc72c1a8fb4198488bbd01f371e6d6e, 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 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &6469456862454161621 GameObject: m_ObjectHideFlags: 0 @@ -156640,6 +156717,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8899195941135973783 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2332425150668320518} + - component: {fileID: 7160806882732994389} + - component: {fileID: 5041737124999455508} + m_Layer: 5 + m_Name: lineS (5) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2332425150668320518 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8899195941135973783} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 357073646129736361} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 990, y: 0} + m_SizeDelta: {x: 20, y: 1696} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7160806882732994389 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8899195941135973783} + m_CullTransparentMesh: 1 +--- !u!114 &5041737124999455508 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8899195941135973783} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: cdc72c1a8fb4198488bbd01f371e6d6e, 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 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &8918845060373572777 GameObject: m_ObjectHideFlags: 0 diff --git a/yyzl/01Mergeorder/MergeOrderItem.prefab b/yyzl/01Mergeorder/MergeOrderItem.prefab index c48d7dac..c07be3ff 100644 --- a/yyzl/01Mergeorder/MergeOrderItem.prefab +++ b/yyzl/01Mergeorder/MergeOrderItem.prefab @@ -1422,7 +1422,7 @@ MonoBehaviour: m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: 0 + m_TextStyleHashCode: -1183493901 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 @@ -3359,7 +3359,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8e18db77f491cbd45a7874ff0c328c0e, type: 3} + m_Sprite: {fileID: 21300000, guid: 21b6b2e6ab8b93f4b82c35ba0c2e44bc, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6271,7 +6271,7 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281486988 + rgba: 4281486476 m_fontColor: {r: 0.54901963, g: 0.29803923, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3