diff --git a/Assets/arts/textures/icon/item/10.png b/Assets/arts/textures/icon/item/10.png index c35d5bb91..149bd7000 100644 Binary files a/Assets/arts/textures/icon/item/10.png and b/Assets/arts/textures/icon/item/10.png differ diff --git a/Assets/arts/textures/icon/item/11.png b/Assets/arts/textures/icon/item/11.png index 866664b42..88c39b9cb 100644 Binary files a/Assets/arts/textures/icon/item/11.png and b/Assets/arts/textures/icon/item/11.png differ diff --git a/Assets/arts/textures/icon/item/12.png b/Assets/arts/textures/icon/item/12.png index 20e39532f..614972650 100644 Binary files a/Assets/arts/textures/icon/item/12.png and b/Assets/arts/textures/icon/item/12.png differ diff --git a/Assets/arts/textures/icon/item/13.png b/Assets/arts/textures/icon/item/13.png index 2f48a07c0..370b60ab1 100644 Binary files a/Assets/arts/textures/icon/item/13.png and b/Assets/arts/textures/icon/item/13.png differ diff --git a/Assets/arts/textures/icon/item/14.png b/Assets/arts/textures/icon/item/14.png index 65f72013a..1fadd3504 100644 Binary files a/Assets/arts/textures/icon/item/14.png and b/Assets/arts/textures/icon/item/14.png differ diff --git a/Assets/arts/textures/icon/item/15.png b/Assets/arts/textures/icon/item/15.png index 9038fd9c2..941b8c889 100644 Binary files a/Assets/arts/textures/icon/item/15.png and b/Assets/arts/textures/icon/item/15.png differ diff --git a/Assets/arts/textures/icon/item/16.png b/Assets/arts/textures/icon/item/16.png index e354c850e..8bd43108c 100644 Binary files a/Assets/arts/textures/icon/item/16.png and b/Assets/arts/textures/icon/item/16.png differ diff --git a/Assets/arts/textures/icon/item/17.png b/Assets/arts/textures/icon/item/17.png index 5fec2a9dd..cab20d705 100644 Binary files a/Assets/arts/textures/icon/item/17.png and b/Assets/arts/textures/icon/item/17.png differ diff --git a/Assets/arts/textures/icon/item/18.png b/Assets/arts/textures/icon/item/18.png index fec32e8f0..9b9404040 100644 Binary files a/Assets/arts/textures/icon/item/18.png and b/Assets/arts/textures/icon/item/18.png differ diff --git a/Assets/arts/textures/icon/item/9.png b/Assets/arts/textures/icon/item/9.png index fec32e8f0..9b9404040 100644 Binary files a/Assets/arts/textures/icon/item/9.png and b/Assets/arts/textures/icon/item/9.png differ diff --git a/Assets/lua/app/config/localization/localization_global_const.lua.bytes b/Assets/lua/app/config/localization/localization_global_const.lua.bytes index 754df4127..e12103255 100644 Binary files a/Assets/lua/app/config/localization/localization_global_const.lua.bytes and b/Assets/lua/app/config/localization/localization_global_const.lua.bytes differ diff --git a/Assets/lua/app/config/strings/cn/global.lua.bytes b/Assets/lua/app/config/strings/cn/global.lua.bytes index 11e6a6980..b08d7ef28 100644 Binary files a/Assets/lua/app/config/strings/cn/global.lua.bytes and b/Assets/lua/app/config/strings/cn/global.lua.bytes differ diff --git a/Assets/lua/app/ui/idle/idle_drop_ui.lua.bytes b/Assets/lua/app/ui/idle/idle_drop_ui.lua.bytes index 56af39032..6412c8ae1 100644 Binary files a/Assets/lua/app/ui/idle/idle_drop_ui.lua.bytes and b/Assets/lua/app/ui/idle/idle_drop_ui.lua.bytes differ diff --git a/Assets/prefabs/ui/idle/idle_drop_ui.prefab b/Assets/prefabs/ui/idle/idle_drop_ui.prefab index 15ad3d1a0..5c61ad986 100644 --- a/Assets/prefabs/ui/idle/idle_drop_ui.prefab +++ b/Assets/prefabs/ui/idle/idle_drop_ui.prefab @@ -260,6 +260,8 @@ RectTransform: - {fileID: 7708722960109355659} - {fileID: 3132312611960739963} - {fileID: 9214872799056387215} + - {fileID: 8247381001471523994} + - {fileID: 7002103105090880883} m_Father: {fileID: 8461932745927490369} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -658,7 +660,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: 59, y: 0} + m_AnchoredPosition: {x: 59, y: 2} m_SizeDelta: {x: 54, y: 26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &371265009910155162 @@ -736,7 +738,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -170} - m_SizeDelta: {x: 530, y: 170} + m_SizeDelta: {x: 500, y: 170} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5130123506895133120 MonoBehaviour: @@ -787,9 +789,144 @@ MonoBehaviour: downRecoveryOffset: 0 direction: 0 reverse: 0 - cellWidth: 110 - cellHeight: 110 + cellWidth: 100 + cellHeight: 100 perLineNum: 5 +--- !u!1 &2025978366049346439 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7002103105090880883} + - component: {fileID: 1347359819858997780} + - component: {fileID: 1533464977154099203} + m_Layer: 5 + m_Name: quick_times_tx + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7002103105090880883 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2025978366049346439} + 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: 4656524465772686178} + m_RootOrder: 17 + 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: -15, y: -277} + m_SizeDelta: {x: 180, y: 22} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1347359819858997780 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2025978366049346439} + m_CullTransparentMesh: 1 +--- !u!114 &1533464977154099203 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2025978366049346439} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4279293947 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 18 + m_fontSizeBase: 18 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &2137899949611589764 GameObject: m_ObjectHideFlags: 0 @@ -1463,7 +1600,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: 0, y: 4} + m_AnchoredPosition: {x: 0, y: 2} m_SizeDelta: {x: 196, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7937977896418252309 @@ -1824,7 +1961,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: -34, y: 0} + m_AnchoredPosition: {x: -34, y: 2} m_SizeDelta: {x: 110, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &731374140219092802 @@ -2389,6 +2526,14 @@ MonoBehaviour: hashName: 3623806377 objectType: 0 gameObject: {fileID: 1044598243730993918} + - name: idle_drop_ui.bg.ad_times_tx + hashName: 824506533 + objectType: 0 + gameObject: {fileID: 8560523353381510598} + - name: idle_drop_ui.bg.quick_times_tx + hashName: 1154182851 + objectType: 0 + gameObject: {fileID: 2025978366049346439} --- !u!114 &95827517723427497 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3349,6 +3494,141 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &8560523353381510598 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8247381001471523994} + - component: {fileID: 1613840346406158233} + - component: {fileID: 5599029525901180336} + m_Layer: 5 + m_Name: ad_times_tx + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8247381001471523994 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8560523353381510598} + 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: 4656524465772686178} + m_RootOrder: 16 + 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: -202, y: -277} + m_SizeDelta: {x: 160, y: 22} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1613840346406158233 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8560523353381510598} + m_CullTransparentMesh: 1 +--- !u!114 &5599029525901180336 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8560523353381510598} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4279293947 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 18 + m_fontSizeBase: 18 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &8921724803619504526 GameObject: m_ObjectHideFlags: 0 @@ -3385,7 +3665,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 187, y: -277} - m_SizeDelta: {x: 200, y: 22} + m_SizeDelta: {x: 180, y: 22} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4548870878236080045 CanvasRenderer: @@ -3425,7 +3705,7 @@ MonoBehaviour: m_fontColor32: serializedVersion: 2 rgba: 4279293947 - m_fontColor: {r: 0, g: 0.9647059, b: 1, a: 1} + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -3605,15 +3885,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.x - value: 0.64 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.y - value: 0.64 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.z - value: 0.64 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalPosition.x