diff --git a/Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe05_112.png b/Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe05_112.png new file mode 100644 index 0000000000..71e66beb6f Binary files /dev/null and b/Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe05_112.png differ diff --git a/Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe05_112.png.meta b/Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe05_112.png.meta new file mode 100644 index 0000000000..55dc0ccf36 --- /dev/null +++ b/Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe05_112.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: db4730577b98ae44ebc390d14ff79203 +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: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 8a5a01912671c4741a33cd587f2abe27 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe05_86.png b/Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe05_86.png new file mode 100644 index 0000000000..28a0e16cfb Binary files /dev/null and b/Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe05_86.png differ diff --git a/Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe05_86.png.meta b/Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe05_86.png.meta new file mode 100644 index 0000000000..3a67c0a40b --- /dev/null +++ b/Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe05_86.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 559ec03556814654f84c43b8a5d01bbb +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: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 9d1d3b8309a2faa4cb4df86d2238b3a8 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe05_87.png b/Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe05_87.png new file mode 100644 index 0000000000..d2812e765b Binary files /dev/null and b/Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe05_87.png differ diff --git a/Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe05_87.png.meta b/Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe05_87.png.meta new file mode 100644 index 0000000000..600cc7b98d --- /dev/null +++ b/Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe05_87.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 10ba0e5fb3af421469e1c42e363bdc52 +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: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 1c9243c9e6ed56d47a6948b58eaeaf14 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe05_90.png b/Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe05_90.png new file mode 100644 index 0000000000..4e9d9f56dc Binary files /dev/null and b/Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe05_90.png differ diff --git a/Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe05_90.png.meta b/Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe05_90.png.meta new file mode 100644 index 0000000000..6492d03ad3 --- /dev/null +++ b/Assets/ManagedResources/BG/UI/Common/UI_hz_zhonghe05_90.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: c71ba32de8d332d42a1f5459fa75fce1 +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: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 57 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 0b89a123a6fb9dc47b54bf10785e8516 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/Guide/GuidePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Guide/GuidePanel.prefab index e9cf190024..01438c54f9 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guide/GuidePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guide/GuidePanel.prefab @@ -737,7 +737,7 @@ GameObject: m_Component: - component: {fileID: 3346553699503360265} - component: {fileID: 241999028642526116} - - component: {fileID: 4515166180607878117} + - component: {fileID: 2022584873926662103} m_Layer: 5 m_Name: Tip m_TagString: Untagged @@ -757,11 +757,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8353675116081232045} - m_RootOrder: 2 + m_RootOrder: 3 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: 242.05, y: -155} + m_AnchoredPosition: {x: 261.65, y: -149.6} m_SizeDelta: {x: 380, y: 48} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &241999028642526116 @@ -772,7 +772,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 48545425289937681} m_CullTransparentMesh: 0 ---- !u!114 &4515166180607878117 +--- !u!114 &2022584873926662103 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -781,6 +781,85 @@ MonoBehaviour: m_GameObject: {fileID: 48545425289937681} m_Enabled: 1 m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 36 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u70B9\u51FB\u4EFB\u610F\u4F4D\u7F6E\u7EE7\u7EED" +--- !u!1 &2497221900264563801 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9119838092894600212} + - component: {fileID: 3270835269351199744} + - component: {fileID: 8355270937173188240} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9119838092894600212 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2497221900264563801} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.7, y: 0.7, z: 1} + m_Children: [] + m_Father: {fileID: 8353675116081232045} + 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: -383, y: 239} + m_SizeDelta: {x: 466, y: 985} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3270835269351199744 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2497221900264563801} + m_CullTransparentMesh: 0 +--- !u!114 &8355270937173188240 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2497221900264563801} + m_Enabled: 1 + m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: @@ -792,7 +871,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: b532724b009a85a468348fd70baf8c7e, type: 3} + m_Sprite: {fileID: 21300000, guid: db4730577b98ae44ebc390d14ff79203, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -831,12 +910,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8353675116081232045} - m_RootOrder: 1 + m_RootOrder: 2 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: 135.8, y: -25} - m_SizeDelta: {x: 599, y: 211.9} + m_AnchoredPosition: {x: 101.82498, y: -5.800009} + m_SizeDelta: {x: 699.7, y: 159.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &379799289798725747 CanvasRenderer: @@ -859,7 +938,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 0.7607844, b: 0.5019608, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -867,8 +946,8 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 40 + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 36 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 3 @@ -877,7 +956,7 @@ MonoBehaviour: m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u505A\u5F97\u4E0D\u9519\uFF01\n\u7CBE\u5F69\u7684\u6218\u6597\u8BA9\u6211\u4E5F\u53D8\u5F97\u70ED\u8840\u6CB8\u817E\u4E86\uFF0C\n\u8D76\u5FEB\u624B\u4E0B\u8FD9\u5996\u517D\u8EAB\u4E0A\u6389\u843D\u7684\u6218\u5229\u54C1\u5427\uFF01" LanguageIndex: 0 @@ -911,12 +990,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8353675116081232045} - m_RootOrder: 0 + m_RootOrder: 1 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: -28, y: 0} - m_SizeDelta: {x: 1080, y: 344} + m_AnchoredPosition: {x: 110, y: 19} + m_SizeDelta: {x: 843.2, y: 368.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5179290475118330717 CanvasRenderer: @@ -946,7 +1025,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: 58e5904adb5fc84418c4ab5e0006d45f, type: 3} + m_Sprite: {fileID: 21300000, guid: 559ec03556814654f84c43b8a5d01bbb, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1317,6 +1396,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 9119838092894600212} - {fileID: 4001337657492407019} - {fileID: 1179859373587167299} - {fileID: 3346553699503360265} diff --git a/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua b/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua index 97aca8263f..891919a72a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guide/GuidePanel.lua @@ -6,8 +6,8 @@ local curId local args local audio local orginLayer -local live2d -local SkeletonGraphic +--local live2d +--local SkeletonGraphic local nextDelayTime=0 local nextDelayChange = false --初始化组件(用于子类重写) @@ -39,7 +39,7 @@ function this:InitComponent() self.handPoint = Util.GetGameObject(self.buttonIcon,"GameObject") - live2d = poolManager:LoadLive("live2d_sgtn", self.dialogRoot.transform, Vector3.one * 0.42, Vector3.New(-337, -170)) + --live2d = poolManager:LoadLive("live2d_sgtn", self.dialogRoot.transform, Vector3.one * 0.42, Vector3.New(-337, -170)) end @@ -136,6 +136,7 @@ function this.ExecuteBehavior(beType, beArgs) end _trigger.onPointerUp = _trigger.onPointerUp + endFunc elseif beType == 2 then --点击界面按钮 + LogRed("beArgs========================"..beArgs) local btn = Util.GetGameObject(UIManager.uiRoot, beArgs):GetComponent("Button") this.button:GetComponent("Button").onClick:RemoveAllListeners() Util.AddClick(this.button, function() @@ -678,9 +679,9 @@ function this:OnOpen(id, func, ...) this.ShowGuide(id) end - SkeletonGraphic = live2d:GetComponent("SkeletonGraphic") - SkeletonGraphic.AnimationState:SetAnimation(0, "touch", true) - Timer.New(function () SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true) end, 1.7):Start() + -- SkeletonGraphic = live2d:GetComponent("SkeletonGraphic") + -- SkeletonGraphic.AnimationState:SetAnimation(0, "touch", true) + -- Timer.New(function () SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true) end, 1.7):Start() end @@ -710,7 +711,7 @@ end --界面关闭时调用(用于子类重写) function this:OnClose() - SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true) + --SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true) if this.sortingOrder == 6300 then this:SetSortingOrder(6000)