diff --git a/Assets/arts/textures/background/act_pvp/act_pvp_bg_5.png b/Assets/arts/textures/background/act_pvp/act_pvp_bg_5.png new file mode 100644 index 000000000..69bf0c203 Binary files /dev/null and b/Assets/arts/textures/background/act_pvp/act_pvp_bg_5.png differ diff --git a/Assets/arts/textures/background/act_pvp/act_pvp_bg_5.png.meta b/Assets/arts/textures/background/act_pvp/act_pvp_bg_5.png.meta new file mode 100644 index 000000000..3b1b240e9 --- /dev/null +++ b/Assets/arts/textures/background/act_pvp/act_pvp_bg_5.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: d2f023e5f9eee174e85056abc17cc8da +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + vTOnly: 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: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 45 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + 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 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/background/act_pvp/act_pvp_bg_6.png b/Assets/arts/textures/background/act_pvp/act_pvp_bg_6.png new file mode 100644 index 000000000..69bf0c203 Binary files /dev/null and b/Assets/arts/textures/background/act_pvp/act_pvp_bg_6.png differ diff --git a/Assets/arts/textures/background/act_pvp/act_pvp_bg_6.png.meta b/Assets/arts/textures/background/act_pvp/act_pvp_bg_6.png.meta new file mode 100644 index 000000000..0ef24faeb --- /dev/null +++ b/Assets/arts/textures/background/act_pvp/act_pvp_bg_6.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 4208d5437cf151a4d9ca2faeeebdd87b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + vTOnly: 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: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 45 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + 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 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/background/act_pvp/act_pvp_bg_7.png b/Assets/arts/textures/background/act_pvp/act_pvp_bg_7.png new file mode 100644 index 000000000..69bf0c203 Binary files /dev/null and b/Assets/arts/textures/background/act_pvp/act_pvp_bg_7.png differ diff --git a/Assets/arts/textures/background/act_pvp/act_pvp_bg_7.png.meta b/Assets/arts/textures/background/act_pvp/act_pvp_bg_7.png.meta new file mode 100644 index 000000000..2a627e712 --- /dev/null +++ b/Assets/arts/textures/background/act_pvp/act_pvp_bg_7.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 80664c4b631d8594cb5b18eb9276cfd4 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + vTOnly: 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: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 45 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + 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 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/icon/hero/11.png b/Assets/arts/textures/icon/hero/11.png index 8c87ed33d..07dec830e 100644 Binary files a/Assets/arts/textures/icon/hero/11.png and b/Assets/arts/textures/icon/hero/11.png differ diff --git a/Assets/arts/textures/icon/hero/17.png b/Assets/arts/textures/icon/hero/17.png index 15b0dd2dc..1e733e263 100644 Binary files a/Assets/arts/textures/icon/hero/17.png and b/Assets/arts/textures/icon/hero/17.png differ diff --git a/Assets/arts/textures/icon/hero/19.png b/Assets/arts/textures/icon/hero/19.png index 7748d1edd..069b6ca8e 100644 Binary files a/Assets/arts/textures/icon/hero/19.png and b/Assets/arts/textures/icon/hero/19.png differ diff --git a/Assets/arts/textures/icon/hero/4.png b/Assets/arts/textures/icon/hero/4.png index 73737aff5..145587e42 100644 Binary files a/Assets/arts/textures/icon/hero/4.png and b/Assets/arts/textures/icon/hero/4.png differ diff --git a/Assets/arts/textures/icon/hero/6.png b/Assets/arts/textures/icon/hero/6.png index ae66519b4..b44a3a849 100644 Binary files a/Assets/arts/textures/icon/hero/6.png and b/Assets/arts/textures/icon/hero/6.png differ diff --git a/Assets/arts/textures/icon/hero/7.png b/Assets/arts/textures/icon/hero/7.png index 0a5011c9e..c13b825c3 100644 Binary files a/Assets/arts/textures/icon/hero/7.png and b/Assets/arts/textures/icon/hero/7.png differ diff --git a/Assets/arts/textures/icon/hero/8.png b/Assets/arts/textures/icon/hero/8.png index 15119eba4..67e934006 100644 Binary files a/Assets/arts/textures/icon/hero/8.png and b/Assets/arts/textures/icon/hero/8.png differ diff --git a/Assets/arts/textures/icon/hero_2/11.png b/Assets/arts/textures/icon/hero_2/11.png index f7b001a21..c34c4be49 100644 Binary files a/Assets/arts/textures/icon/hero_2/11.png and b/Assets/arts/textures/icon/hero_2/11.png differ diff --git a/Assets/arts/textures/icon/hero_2/17.png b/Assets/arts/textures/icon/hero_2/17.png index 612b7e93b..82d92945e 100644 Binary files a/Assets/arts/textures/icon/hero_2/17.png and b/Assets/arts/textures/icon/hero_2/17.png differ diff --git a/Assets/arts/textures/icon/hero_2/19.png b/Assets/arts/textures/icon/hero_2/19.png index d927b6688..1c5a5c1b6 100644 Binary files a/Assets/arts/textures/icon/hero_2/19.png and b/Assets/arts/textures/icon/hero_2/19.png differ diff --git a/Assets/arts/textures/icon/hero_2/4.png b/Assets/arts/textures/icon/hero_2/4.png index 05d1fc338..8f3c6f0eb 100644 Binary files a/Assets/arts/textures/icon/hero_2/4.png and b/Assets/arts/textures/icon/hero_2/4.png differ diff --git a/Assets/arts/textures/icon/hero_2/6.png b/Assets/arts/textures/icon/hero_2/6.png index b14ca9b3c..ab2fef7e0 100644 Binary files a/Assets/arts/textures/icon/hero_2/6.png and b/Assets/arts/textures/icon/hero_2/6.png differ diff --git a/Assets/arts/textures/icon/hero_2/7.png b/Assets/arts/textures/icon/hero_2/7.png index b6d8ce190..4d17f59aa 100644 Binary files a/Assets/arts/textures/icon/hero_2/7.png and b/Assets/arts/textures/icon/hero_2/7.png differ diff --git a/Assets/arts/textures/icon/hero_2/8.png b/Assets/arts/textures/icon/hero_2/8.png index 5f3fbdfe8..b1ddf51d3 100644 Binary files a/Assets/arts/textures/icon/hero_2/8.png and b/Assets/arts/textures/icon/hero_2/8.png differ diff --git a/Assets/lua/app/ui/activity/act_pvp/act_pvp_help_ui.lua.bytes b/Assets/lua/app/ui/activity/act_pvp/act_pvp_help_ui.lua.bytes index 5124810a6..befbdad52 100644 Binary files a/Assets/lua/app/ui/activity/act_pvp/act_pvp_help_ui.lua.bytes and b/Assets/lua/app/ui/activity/act_pvp/act_pvp_help_ui.lua.bytes differ diff --git a/Assets/prefabs/ui/activity/act_pvp/act_pvp_help_ui.prefab b/Assets/prefabs/ui/activity/act_pvp/act_pvp_help_ui.prefab index b053a77f6..e9dc3c05d 100644 --- a/Assets/prefabs/ui/activity/act_pvp/act_pvp_help_ui.prefab +++ b/Assets/prefabs/ui/activity/act_pvp/act_pvp_help_ui.prefab @@ -32,7 +32,7 @@ RectTransform: m_Children: - {fileID: 5841676959962843802} m_Father: {fileID: 4201750005051344089} - m_RootOrder: 6 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -122,7 +122,7 @@ RectTransform: m_Children: - {fileID: 1169321492090100802} m_Father: {fileID: 4201750005051344089} - m_RootOrder: 5 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -374,7 +374,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8905140842700805960} - - component: {fileID: 8665877534326798126} + - component: {fileID: 8133129017656527218} + - component: {fileID: 131628066181839629} m_Layer: 5 m_Name: pause_video_01 m_TagString: Untagged @@ -401,41 +402,41 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 589, y: 522} m_Pivot: {x: 0.5, y: 1} ---- !u!328 &8665877534326798126 -VideoPlayer: +--- !u!222 &8133129017656527218 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2698456617045073305} + m_CullTransparentMesh: 1 +--- !u!114 &131628066181839629 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2698456617045073305} m_Enabled: 1 - m_VideoClip: {fileID: 32900000, guid: 9dc81842e7d117c41a7b97632b66143e, type: 3} - m_TargetCameraAlpha: 1 - m_TargetCamera3DLayout: 0 - m_TargetCamera: {fileID: 0} - m_TargetTexture: {fileID: 0} - m_TimeReference: 0 - m_TargetMaterialRenderer: {fileID: 0} - m_TargetMaterialProperty: _MainTex - m_RenderMode: 2 - m_AspectRatio: 2 - m_DataSource: 0 - m_PlaybackSpeed: 1 - m_AudioOutputMode: 2 - m_TargetAudioSources: - - {fileID: 0} - m_DirectAudioVolumes: - - 1 - m_Url: - m_EnabledAudioTracks: 01 - m_DirectAudioMutes: 00 - m_ControlledAudioTrackCount: 1 - m_PlayOnAwake: 1 - m_SkipOnDrop: 0 - m_Looping: 1 - m_WaitForFirstFrame: 1 - m_FrameReadyEventEnabled: 0 - m_VideoShaders: [] + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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_Texture: {fileID: 2800000, guid: d2f023e5f9eee174e85056abc17cc8da, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!1 &2915618543632223237 GameObject: m_ObjectHideFlags: 0 @@ -445,7 +446,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1990160717587291054} - - component: {fileID: 4830675388656148588} + - component: {fileID: 6523584490956825341} + - component: {fileID: 7596988551875266533} m_Layer: 5 m_Name: pause_video_02 m_TagString: Untagged @@ -472,41 +474,41 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 589, y: 522} m_Pivot: {x: 0.5, y: 1} ---- !u!328 &4830675388656148588 -VideoPlayer: +--- !u!222 &6523584490956825341 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2915618543632223237} + m_CullTransparentMesh: 1 +--- !u!114 &7596988551875266533 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2915618543632223237} m_Enabled: 1 - m_VideoClip: {fileID: 32900000, guid: d7ec88b0ad856914abf297da9e131a95, type: 3} - m_TargetCameraAlpha: 1 - m_TargetCamera3DLayout: 0 - m_TargetCamera: {fileID: 0} - m_TargetTexture: {fileID: 0} - m_TimeReference: 0 - m_TargetMaterialRenderer: {fileID: 0} - m_TargetMaterialProperty: _MainTex - m_RenderMode: 2 - m_AspectRatio: 2 - m_DataSource: 0 - m_PlaybackSpeed: 1 - m_AudioOutputMode: 2 - m_TargetAudioSources: - - {fileID: 0} - m_DirectAudioVolumes: - - 1 - m_Url: - m_EnabledAudioTracks: 01 - m_DirectAudioMutes: 00 - m_ControlledAudioTrackCount: 1 - m_PlayOnAwake: 1 - m_SkipOnDrop: 0 - m_Looping: 1 - m_WaitForFirstFrame: 1 - m_FrameReadyEventEnabled: 0 - m_VideoShaders: [] + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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_Texture: {fileID: 2800000, guid: 4208d5437cf151a4d9ca2faeeebdd87b, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!1 &2952554683653564120 GameObject: m_ObjectHideFlags: 0 @@ -740,7 +742,6 @@ GameObject: m_Component: - component: {fileID: 8573532777235809205} - component: {fileID: 3185524028580493845} - - component: {fileID: 540133387215006975} m_Layer: 5 m_Name: video_node m_TagString: Untagged @@ -757,18 +758,18 @@ RectTransform: m_GameObject: {fileID: 3444821163582371671} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8905140842700805960} - {fileID: 1990160717587291054} - {fileID: 2051767952824234520} m_Father: {fileID: 4201750005051344089} - m_RootOrder: 3 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -35} - m_SizeDelta: {x: 589, y: 522} + m_SizeDelta: {x: 587, y: 522} m_Pivot: {x: 0.5, y: 1} --- !u!222 &3185524028580493845 CanvasRenderer: @@ -778,33 +779,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3444821163582371671} m_CullTransparentMesh: 1 ---- !u!114 &540133387215006975 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3444821163582371671} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Texture: {fileID: 0} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 --- !u!1 &4182307427987868391 GameObject: m_ObjectHideFlags: 0 @@ -895,6 +869,96 @@ MonoBehaviour: m_EditorClassIdentifier: m_Horizontal: 1 m_Veritical: 0 +--- !u!1 &4495993074588589701 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5232692157345574705} + - component: {fileID: 1205966413296819380} + - component: {fileID: 85940120087036581} + - component: {fileID: 779656509495371492} + m_Layer: 5 + m_Name: line + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5232692157345574705 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4495993074588589701} + 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: 4201750005051344089} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -558} + m_SizeDelta: {x: 589, y: 4} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1205966413296819380 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4495993074588589701} + m_CullTransparentMesh: 1 +--- !u!114 &85940120087036581 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4495993074588589701} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: 14da6211cc49d5a4a8c31d4e949b3135, 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!114 &779656509495371492 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4495993074588589701} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a825f0792e793476ba49ec4d8054a901, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Horizontal: 1 + m_Veritical: 0 --- !u!1 &5356092318084376832 GameObject: m_ObjectHideFlags: 0 @@ -1104,6 +1168,96 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7873199624127801701 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8320652203861617814} + - component: {fileID: 5351221801235167372} + - component: {fileID: 7212171408435289383} + - component: {fileID: 8921454925972291281} + m_Layer: 5 + m_Name: line + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8320652203861617814 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7873199624127801701} + 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: 4201750005051344089} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -31} + m_SizeDelta: {x: 589, y: 4} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5351221801235167372 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7873199624127801701} + m_CullTransparentMesh: 1 +--- !u!114 &7212171408435289383 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7873199624127801701} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: 14da6211cc49d5a4a8c31d4e949b3135, 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!114 &8921454925972291281 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7873199624127801701} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a825f0792e793476ba49ec4d8054a901, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Horizontal: 1 + m_Veritical: 0 --- !u!1 &8207902281664884900 GameObject: m_ObjectHideFlags: 0 @@ -1113,7 +1267,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2051767952824234520} - - component: {fileID: 2799073219839254508} + - component: {fileID: 4954449492939920063} + - component: {fileID: 7115979590882769198} m_Layer: 5 m_Name: pause_video_03 m_TagString: Untagged @@ -1140,41 +1295,41 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 589, y: 522} m_Pivot: {x: 0.5, y: 1} ---- !u!328 &2799073219839254508 -VideoPlayer: +--- !u!222 &4954449492939920063 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8207902281664884900} + m_CullTransparentMesh: 1 +--- !u!114 &7115979590882769198 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8207902281664884900} m_Enabled: 1 - m_VideoClip: {fileID: 32900000, guid: d3e11020fb6f31e48be6828f2142ddb8, type: 3} - m_TargetCameraAlpha: 1 - m_TargetCamera3DLayout: 0 - m_TargetCamera: {fileID: 0} - m_TargetTexture: {fileID: 0} - m_TimeReference: 0 - m_TargetMaterialRenderer: {fileID: 0} - m_TargetMaterialProperty: _MainTex - m_RenderMode: 2 - m_AspectRatio: 2 - m_DataSource: 0 - m_PlaybackSpeed: 1 - m_AudioOutputMode: 2 - m_TargetAudioSources: - - {fileID: 0} - m_DirectAudioVolumes: - - 1 - m_Url: - m_EnabledAudioTracks: 01 - m_DirectAudioMutes: 00 - m_ControlledAudioTrackCount: 1 - m_PlayOnAwake: 1 - m_SkipOnDrop: 0 - m_Looping: 1 - m_WaitForFirstFrame: 1 - m_FrameReadyEventEnabled: 0 - m_VideoShaders: [] + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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_Texture: {fileID: 2800000, guid: 80664c4b631d8594cb5b18eb9276cfd4, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!1 &8548085155292508248 GameObject: m_ObjectHideFlags: 0 @@ -1207,7 +1362,7 @@ RectTransform: m_Children: - {fileID: 1309167142472500923} m_Father: {fileID: 4201750005051344089} - m_RootOrder: 4 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -1438,6 +1593,8 @@ RectTransform: - {fileID: 8624896985186038724} - {fileID: 5689173462703679213} - {fileID: 926392088051768063} + - {fileID: 8320652203861617814} + - {fileID: 5232692157345574705} - {fileID: 8573532777235809205} - {fileID: 2293282550491031398} - {fileID: 2659394120789691220}