diff --git a/Assets/GWConquest/Scenes/MainMenu.unity b/Assets/GWConquest/Scenes/MainMenu.unity index e719754..1c063d4 100644 --- a/Assets/GWConquest/Scenes/MainMenu.unity +++ b/Assets/GWConquest/Scenes/MainMenu.unity @@ -1943,7 +1943,7 @@ PrefabInstance: - target: {fileID: 3716205314425353621, guid: dabe742b93a0bc04eb893ae186d021c7, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3716205314464364293, guid: dabe742b93a0bc04eb893ae186d021c7, type: 3} @@ -6784,6 +6784,110 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1758790513} m_CullTransparentMesh: 0 +--- !u!1 &1798018172 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1798018173} + - component: {fileID: 1798018176} + - component: {fileID: 1798018175} + - component: {fileID: 1798018174} + m_Layer: 5 + m_Name: Character (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1798018173 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1798018172} + 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: 441014867} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 205, y: 433} + m_SizeDelta: {x: 832.2755, y: 935.98914} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!328 &1798018174 +VideoPlayer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1798018172} + m_Enabled: 1 + m_VideoClip: {fileID: 32900000, guid: c5bd83f4a6bc62a4c8c8dd4f0c228da1, type: 3} + m_TargetCameraAlpha: 1 + m_TargetCamera3DLayout: 0 + m_TargetCamera: {fileID: 0} + m_TargetTexture: {fileID: 8400000, guid: faade04c281439248a5b7adb043b1cb3, type: 2} + m_TimeReference: 0 + m_TargetMaterialRenderer: {fileID: 0} + m_TargetMaterialProperty: _MainTex + m_RenderMode: 2 + m_AspectRatio: 3 + m_DataSource: 0 + m_PlaybackSpeed: 0.78 + m_AudioOutputMode: 0 + m_TargetAudioSources: [] + m_DirectAudioVolumes: [] + m_Url: + m_EnabledAudioTracks: + m_DirectAudioMutes: + m_ControlledAudioTrackCount: 0 + m_PlayOnAwake: 1 + m_SkipOnDrop: 1 + m_Looping: 1 + m_WaitForFirstFrame: 1 + m_FrameReadyEventEnabled: 0 +--- !u!114 &1798018175 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1798018172} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 8400000, guid: faade04c281439248a5b7adb043b1cb3, type: 2} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &1798018176 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1798018172} + m_CullTransparentMesh: 0 --- !u!1 &1812249645 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/GWConquest/Textures/Art/FactionPreview.renderTexture b/Assets/GWConquest/Textures/Art/FactionPreviewDominion.renderTexture similarity index 95% rename from Assets/GWConquest/Textures/Art/FactionPreview.renderTexture rename to Assets/GWConquest/Textures/Art/FactionPreviewDominion.renderTexture index 6c67a7a..fc8cbe6 100644 --- a/Assets/GWConquest/Textures/Art/FactionPreview.renderTexture +++ b/Assets/GWConquest/Textures/Art/FactionPreviewDominion.renderTexture @@ -6,7 +6,7 @@ RenderTexture: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: FactionPreview + m_Name: FactionPreviewDominion m_ImageContentsHash: serializedVersion: 2 Hash: 00000000000000000000000000000000 diff --git a/Assets/GWConquest/Textures/Art/FactionPreviewDominion.renderTexture.meta b/Assets/GWConquest/Textures/Art/FactionPreviewDominion.renderTexture.meta new file mode 100644 index 0000000..f25c683 --- /dev/null +++ b/Assets/GWConquest/Textures/Art/FactionPreviewDominion.renderTexture.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: faade04c281439248a5b7adb043b1cb3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/GWConquest/Textures/Art/FactionPreviewRepublic.renderTexture b/Assets/GWConquest/Textures/Art/FactionPreviewRepublic.renderTexture new file mode 100644 index 0000000..78faa79 --- /dev/null +++ b/Assets/GWConquest/Textures/Art/FactionPreviewRepublic.renderTexture @@ -0,0 +1,37 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!84 &8400000 +RenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FactionPreviewRepublic + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + serializedVersion: 3 + m_Width: 2048 + m_Height: 2048 + m_AntiAliasing: 1 + m_MipCount: -1 + m_DepthFormat: 2 + m_ColorFormat: 8 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_EnableCompatibleFormat: 1 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 0 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 diff --git a/Assets/GWConquest/Textures/Art/FactionPreview.renderTexture.meta b/Assets/GWConquest/Textures/Art/FactionPreviewRepublic.renderTexture.meta similarity index 100% rename from Assets/GWConquest/Textures/Art/FactionPreview.renderTexture.meta rename to Assets/GWConquest/Textures/Art/FactionPreviewRepublic.renderTexture.meta diff --git a/Assets/GWConquest/Textures/Art/Wythler Anim.webm b/Assets/GWConquest/Textures/Art/Wythler Anim.webm new file mode 100644 index 0000000..919b8e3 Binary files /dev/null and b/Assets/GWConquest/Textures/Art/Wythler Anim.webm differ diff --git a/Assets/GWConquest/Textures/Art/Wythler Anim.webm.meta b/Assets/GWConquest/Textures/Art/Wythler Anim.webm.meta new file mode 100644 index 0000000..fe3245f --- /dev/null +++ b/Assets/GWConquest/Textures/Art/Wythler Anim.webm.meta @@ -0,0 +1,27 @@ +fileFormatVersion: 2 +guid: c5bd83f4a6bc62a4c8c8dd4f0c228da1 +VideoClipImporter: + externalObjects: {} + serializedVersion: 2 + frameRange: 0 + startFrame: -1 + endFrame: -1 + colorSpace: 0 + deinterlace: 0 + encodeAlpha: 1 + flipVertical: 0 + flipHorizontal: 0 + importAudio: 1 + targetSettings: + 0: + enableTranscoding: 1 + codec: 0 + resizeFormat: 0 + aspectRatio: 0 + customWidth: 1080 + customHeight: 1496 + bitrateMode: 2 + spatialQuality: 2 + userData: + assetBundleName: + assetBundleVariant: