diff --git a/Assets/arts/textures/background/company/bg_gs_3_dikuai.png.meta b/Assets/arts/textures/background/company/bg_gs_3_dikuai.png.meta index ea3229678..0e89e3e7e 100644 --- a/Assets/arts/textures/background/company/bg_gs_3_dikuai.png.meta +++ b/Assets/arts/textures/background/company/bg_gs_3_dikuai.png.meta @@ -51,7 +51,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 @@ -61,7 +61,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 - ignorePngGamma: 0 + ignorePngGamma: 1 applyGammaDecoding: 0 cookieLightType: 0 platformSettings: diff --git a/Assets/arts/textures/background/company/bg_gs_5_jianzhuqun01.png.meta b/Assets/arts/textures/background/company/bg_gs_5_jianzhuqun01.png.meta index 68aa26cf1..3b863bdc6 100644 --- a/Assets/arts/textures/background/company/bg_gs_5_jianzhuqun01.png.meta +++ b/Assets/arts/textures/background/company/bg_gs_5_jianzhuqun01.png.meta @@ -51,7 +51,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 @@ -61,7 +61,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 - ignorePngGamma: 0 + ignorePngGamma: 1 applyGammaDecoding: 0 cookieLightType: 0 platformSettings: diff --git a/Assets/arts/textures/background/company/bg_gs_6_jianzhuqun02.png.meta b/Assets/arts/textures/background/company/bg_gs_6_jianzhuqun02.png.meta index ba0c03c88..d7ff0e9f5 100644 --- a/Assets/arts/textures/background/company/bg_gs_6_jianzhuqun02.png.meta +++ b/Assets/arts/textures/background/company/bg_gs_6_jianzhuqun02.png.meta @@ -51,7 +51,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 @@ -61,7 +61,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 - ignorePngGamma: 0 + ignorePngGamma: 1 applyGammaDecoding: 0 cookieLightType: 0 platformSettings: diff --git a/Assets/arts/textures/background/company/bg_gs_7_jianzhuqun03.png.meta b/Assets/arts/textures/background/company/bg_gs_7_jianzhuqun03.png.meta index 3d00c0fdc..f38b99e2f 100644 --- a/Assets/arts/textures/background/company/bg_gs_7_jianzhuqun03.png.meta +++ b/Assets/arts/textures/background/company/bg_gs_7_jianzhuqun03.png.meta @@ -51,7 +51,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 @@ -61,7 +61,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 - ignorePngGamma: 0 + ignorePngGamma: 1 applyGammaDecoding: 0 cookieLightType: 0 platformSettings: diff --git a/Assets/arts/textures/background/company/bg_gs_8_jianzhuqun04.png.meta b/Assets/arts/textures/background/company/bg_gs_8_jianzhuqun04.png.meta index b594d72d8..fcde8d6b3 100644 --- a/Assets/arts/textures/background/company/bg_gs_8_jianzhuqun04.png.meta +++ b/Assets/arts/textures/background/company/bg_gs_8_jianzhuqun04.png.meta @@ -51,7 +51,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 @@ -61,7 +61,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 - ignorePngGamma: 0 + ignorePngGamma: 1 applyGammaDecoding: 0 cookieLightType: 0 platformSettings: diff --git a/Assets/arts/textures/background/company/bg_gs_9_jianzhuqun05.png.meta b/Assets/arts/textures/background/company/bg_gs_9_jianzhuqun05.png.meta index c225d3c27..e40b93563 100644 --- a/Assets/arts/textures/background/company/bg_gs_9_jianzhuqun05.png.meta +++ b/Assets/arts/textures/background/company/bg_gs_9_jianzhuqun05.png.meta @@ -51,7 +51,7 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 textureType: 0 textureShape: 1 @@ -61,7 +61,7 @@ TextureImporter: maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 - ignorePngGamma: 0 + ignorePngGamma: 1 applyGammaDecoding: 0 cookieLightType: 0 platformSettings: diff --git a/Assets/lua/app/module/equip/equip_manager.lua.bytes b/Assets/lua/app/module/equip/equip_manager.lua.bytes index cd6d679cb..10764e771 100644 Binary files a/Assets/lua/app/module/equip/equip_manager.lua.bytes and b/Assets/lua/app/module/equip/equip_manager.lua.bytes differ diff --git a/Assets/lua/app/ui/equip/equip_growth_ui.lua.bytes b/Assets/lua/app/ui/equip/equip_growth_ui.lua.bytes index 161c906ad..377ea2d4e 100644 Binary files a/Assets/lua/app/ui/equip/equip_growth_ui.lua.bytes and b/Assets/lua/app/ui/equip/equip_growth_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/hero/hero_detail_ui.lua.bytes b/Assets/lua/app/ui/hero/hero_detail_ui.lua.bytes index d557d3bac..c3cb489d4 100644 Binary files a/Assets/lua/app/ui/hero/hero_detail_ui.lua.bytes and b/Assets/lua/app/ui/hero/hero_detail_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/hero/hero_skill_info_ui.lua.bytes b/Assets/lua/app/ui/hero/hero_skill_info_ui.lua.bytes index 01175d11e..9e81fe80b 100644 Binary files a/Assets/lua/app/ui/hero/hero_skill_info_ui.lua.bytes and b/Assets/lua/app/ui/hero/hero_skill_info_ui.lua.bytes differ diff --git a/Assets/prefabs/ui/hero/hero_skill_info_ui.prefab b/Assets/prefabs/ui/hero/hero_skill_info_ui.prefab index 4f662e3d7..909a2b6bd 100644 --- a/Assets/prefabs/ui/hero/hero_skill_info_ui.prefab +++ b/Assets/prefabs/ui/hero/hero_skill_info_ui.prefab @@ -630,6 +630,142 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &1045065555268327161 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2469683069533620982} + - component: {fileID: 4277691156228412669} + - component: {fileID: 5988243988324235777} + m_Layer: 0 + m_Name: skill_desc_tx_3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2469683069533620982 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1045065555268327161} + 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: + - {fileID: 6071396385884033801} + m_Father: {fileID: 6560854294601134866} + m_RootOrder: 13 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 26, y: -324} + m_SizeDelta: {x: 568, y: 20} + m_Pivot: {x: 0, y: 1} +--- !u!222 &4277691156228412669 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1045065555268327161} + m_CullTransparentMesh: 1 +--- !u!114 &5988243988324235777 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1045065555268327161} + 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: 09210edd46ea1463596717e00ea9e8be, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + 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: 20 + m_fontSizeBase: 20 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + 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 &1080600177765127269 GameObject: m_ObjectHideFlags: 0 @@ -1662,6 +1798,14 @@ MonoBehaviour: hashName: 260408026 objectType: 2 gameObject: {fileID: 277148611500856293} + - name: hero_skill_info_ui.content.skill_desc_tx_3 + hashName: 2831236263 + objectType: 0 + gameObject: {fileID: 1045065555268327161} + - name: hero_skill_info_ui.content.skill_desc_tx_3.vfx_c1_ui_up_b03 + hashName: 3558302969 + objectType: 2 + gameObject: {fileID: 7951028083265247097} --- !u!114 &1614968076188277627 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1986,6 +2130,7 @@ RectTransform: - {fileID: 2364713537887130666} - {fileID: 5482610615730927060} - {fileID: 5964987142908019273} + - {fileID: 2469683069533620982} m_Father: {fileID: 8461932745927490369} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2871,6 +3016,117 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 318091542259595467, guid: 05e10b2d77b6c41fdbe17918326668c8, type: 3} m_PrefabInstance: {fileID: 5281688311793634052} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5679340744273472391 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2469683069533620982} + m_Modifications: + - target: {fileID: -4211220300589823284, guid: 91e56d81dcd7b8a448c41773e545f757, type: 3} + propertyPath: GroupOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1914307508649326734, guid: 91e56d81dcd7b8a448c41773e545f757, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1914307508649326734, guid: 91e56d81dcd7b8a448c41773e545f757, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1914307508649326734, guid: 91e56d81dcd7b8a448c41773e545f757, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1914307508649326734, guid: 91e56d81dcd7b8a448c41773e545f757, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1914307508649326734, guid: 91e56d81dcd7b8a448c41773e545f757, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1914307508649326734, guid: 91e56d81dcd7b8a448c41773e545f757, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1914307508649326734, guid: 91e56d81dcd7b8a448c41773e545f757, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1914307508649326734, guid: 91e56d81dcd7b8a448c41773e545f757, type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 1914307508649326734, guid: 91e56d81dcd7b8a448c41773e545f757, type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 1914307508649326734, guid: 91e56d81dcd7b8a448c41773e545f757, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1914307508649326734, guid: 91e56d81dcd7b8a448c41773e545f757, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1914307508649326734, guid: 91e56d81dcd7b8a448c41773e545f757, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1914307508649326734, guid: 91e56d81dcd7b8a448c41773e545f757, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1914307508649326734, guid: 91e56d81dcd7b8a448c41773e545f757, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1914307508649326734, guid: 91e56d81dcd7b8a448c41773e545f757, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1914307508649326734, guid: 91e56d81dcd7b8a448c41773e545f757, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1914307508649326734, guid: 91e56d81dcd7b8a448c41773e545f757, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1914307508649326734, guid: 91e56d81dcd7b8a448c41773e545f757, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1914307508649326734, guid: 91e56d81dcd7b8a448c41773e545f757, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1914307508649326734, guid: 91e56d81dcd7b8a448c41773e545f757, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1914307508649326734, guid: 91e56d81dcd7b8a448c41773e545f757, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2343749477132451070, guid: 91e56d81dcd7b8a448c41773e545f757, type: 3} + propertyPath: m_Name + value: vfx_c1_ui_up_b03 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 91e56d81dcd7b8a448c41773e545f757, type: 3} +--- !u!224 &6071396385884033801 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1914307508649326734, guid: 91e56d81dcd7b8a448c41773e545f757, type: 3} + m_PrefabInstance: {fileID: 5679340744273472391} + m_PrefabAsset: {fileID: 0} +--- !u!1 &7951028083265247097 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2343749477132451070, guid: 91e56d81dcd7b8a448c41773e545f757, type: 3} + m_PrefabInstance: {fileID: 5679340744273472391} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6082525625551306421 PrefabInstance: m_ObjectHideFlags: 0