diff --git a/Assets/Editor/XCodePostProcessBuild.cs b/Assets/Editor/XCodePostProcessBuild.cs index 7109c314..e475f7ec 100644 --- a/Assets/Editor/XCodePostProcessBuild.cs +++ b/Assets/Editor/XCodePostProcessBuild.cs @@ -79,6 +79,8 @@ public static class XCodePostProcessBuild plist.root.SetString("NSContactsUsageDescription", "contactsDesciption"); plist.root.SetString("NSMicrophoneUsageDescription", "microphoneDesciption"); plist.root.SetString("NSPhotoLibraryUsageDescription", "photoLibraryDesciption"); + plist.root.SetString("NSLocationWhenInUseUsageDescription", "locationWhenInUseUsageDescription"); + plist.root.SetBoolean("ITSAppUsesNonExemptEncryption", false); File.WriteAllText(listPath, plist.WriteToString()); } diff --git a/Assets/Plugins/Android/ImageSelector-release.aar b/Assets/Plugins/Android/ImageSelector-release.aar index 4cd17790..27d39f26 100644 Binary files a/Assets/Plugins/Android/ImageSelector-release.aar and b/Assets/Plugins/Android/ImageSelector-release.aar differ diff --git a/Assets/Resources/Images/Race/next-hover.png b/Assets/Resources/Images/Race/next-hover.png index aee04c50..fc393af2 100644 Binary files a/Assets/Resources/Images/Race/next-hover.png and b/Assets/Resources/Images/Race/next-hover.png differ diff --git a/Assets/Resources/Images/Race/next-hover.png.meta b/Assets/Resources/Images/Race/next-hover.png.meta index 3e5d6899..b3699d8c 100644 --- a/Assets/Resources/Images/Race/next-hover.png.meta +++ b/Assets/Resources/Images/Race/next-hover.png.meta @@ -83,6 +83,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + 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 diff --git a/Assets/Resources/Images/Race/next-normal.png b/Assets/Resources/Images/Race/next-normal.png index ecbd4c4f..d9bc1406 100644 Binary files a/Assets/Resources/Images/Race/next-normal.png and b/Assets/Resources/Images/Race/next-normal.png differ diff --git a/Assets/Resources/Images/Race/next-normal.png.meta b/Assets/Resources/Images/Race/next-normal.png.meta index 8fcf5e6c..532fa854 100644 --- a/Assets/Resources/Images/Race/next-normal.png.meta +++ b/Assets/Resources/Images/Race/next-normal.png.meta @@ -83,6 +83,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + 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 diff --git a/Assets/Resources/Images/Race/pre-hover.png b/Assets/Resources/Images/Race/pre-hover.png index c78f3ab1..9810e39d 100644 Binary files a/Assets/Resources/Images/Race/pre-hover.png and b/Assets/Resources/Images/Race/pre-hover.png differ diff --git a/Assets/Resources/Images/Race/pre-hover.png.meta b/Assets/Resources/Images/Race/pre-hover.png.meta index 792062f6..f10c0e9d 100644 --- a/Assets/Resources/Images/Race/pre-hover.png.meta +++ b/Assets/Resources/Images/Race/pre-hover.png.meta @@ -83,6 +83,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + 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 diff --git a/Assets/Resources/Images/Race/pre-normal.png b/Assets/Resources/Images/Race/pre-normal.png index 247194e2..2b1a3794 100644 Binary files a/Assets/Resources/Images/Race/pre-normal.png and b/Assets/Resources/Images/Race/pre-normal.png differ diff --git a/Assets/Resources/Images/Race/pre-normal.png.meta b/Assets/Resources/Images/Race/pre-normal.png.meta index 0b0f7f60..dcc93bd2 100644 --- a/Assets/Resources/Images/Race/pre-normal.png.meta +++ b/Assets/Resources/Images/Race/pre-normal.png.meta @@ -83,6 +83,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + 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 diff --git a/Assets/Resources/Mobile.meta b/Assets/Resources/Mobile.meta new file mode 100644 index 00000000..a76c7270 --- /dev/null +++ b/Assets/Resources/Mobile.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f134d222725933a4a8aa79fee0ebc10c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/UI/Prefab/Panel/Mobile/MapListPanel.prefab b/Assets/Resources/UI/Prefab/Panel/Mobile/MapListPanel.prefab index 01232e5b..01059311 100644 --- a/Assets/Resources/UI/Prefab/Panel/Mobile/MapListPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/Mobile/MapListPanel.prefab @@ -1238,9 +1238,9 @@ RectTransform: m_Father: {fileID: 1429559311419137021} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 109, y: -281} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -195, y: -281} m_SizeDelta: {x: 78, y: 20} m_Pivot: {x: 0, y: 1} --- !u!222 &3729561503460600226 @@ -1329,9 +1329,9 @@ RectTransform: m_Father: {fileID: 1429559311419137021} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 20, y: -281} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -284, y: -281} m_SizeDelta: {x: 50, y: 20} m_Pivot: {x: 0, y: 1} --- !u!222 &3729561503895154083 @@ -1689,9 +1689,9 @@ RectTransform: m_Father: {fileID: 1429559311419137021} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 138, y: -213} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -166, y: -213} m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0, y: 1} --- !u!222 &4077563585998376545 @@ -1820,9 +1820,9 @@ RectTransform: m_Father: {fileID: 1429559311419137021} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1203, y: -20} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 899, y: -20} m_SizeDelta: {x: 1, y: 40} m_Pivot: {x: 0, y: 1} --- !u!222 &4167844826616894164 @@ -3457,9 +3457,9 @@ RectTransform: m_Father: {fileID: 1429559311419137021} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 224, y: -20} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -80, y: -20} m_SizeDelta: {x: 1, y: 40} m_Pivot: {x: 0, y: 1} --- !u!222 &6653062727056844771 @@ -3786,9 +3786,9 @@ RectTransform: m_Father: {fileID: 1429559311419137021} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 683, y: -20} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 379, y: -20} m_SizeDelta: {x: 1, y: 40} m_Pivot: {x: 0, y: 1} --- !u!222 &6653062727249243963 @@ -3883,9 +3883,9 @@ RectTransform: m_Father: {fileID: 1429559311419137021} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 20, y: -103} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -284, y: -103} m_SizeDelta: {x: 264, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &6653062727310468537 @@ -4086,9 +4086,9 @@ RectTransform: m_Father: {fileID: 1429559311419137021} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 20, y: -31} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -284, y: -31} m_SizeDelta: {x: 60, y: 19} m_Pivot: {x: 0, y: 1} --- !u!222 &6653062728066858167 @@ -4419,9 +4419,9 @@ RectTransform: m_Father: {fileID: 1429559311419137021} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 20, y: -73} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -284, y: -73} m_SizeDelta: {x: 60, y: 19} m_Pivot: {x: 0, y: 1} --- !u!222 &6653062728799582122 @@ -5158,7 +5158,7 @@ PrefabInstance: - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -5168,7 +5168,7 @@ PrefabInstance: - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMin.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -5223,7 +5223,7 @@ PrefabInstance: - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchoredPosition.x - value: 156 + value: -148 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -5771,7 +5771,7 @@ PrefabInstance: - target: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} @@ -5781,7 +5781,7 @@ PrefabInstance: - target: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} propertyPath: m_AnchorMin.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} @@ -5851,7 +5851,7 @@ PrefabInstance: - target: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} propertyPath: m_AnchoredPosition.x - value: 90 + value: -214 objectReference: {fileID: 0} - target: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} @@ -5979,7 +5979,7 @@ PrefabInstance: - target: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} @@ -5989,7 +5989,7 @@ PrefabInstance: - target: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} propertyPath: m_AnchorMin.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} @@ -6059,7 +6059,7 @@ PrefabInstance: - target: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} propertyPath: m_AnchoredPosition.x - value: 20 + value: -284 objectReference: {fileID: 0} - target: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3} @@ -6162,7 +6162,7 @@ PrefabInstance: - target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} propertyPath: m_AnchorMax.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} @@ -6172,7 +6172,7 @@ PrefabInstance: - target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} propertyPath: m_AnchorMin.x - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} @@ -6227,7 +6227,7 @@ PrefabInstance: - target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} propertyPath: m_AnchoredPosition.x - value: 1224 + value: 920 objectReference: {fileID: 0} - target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} diff --git a/Assets/Resources/UI/Prefab/Panel/Mobile/RaceHomePanel.prefab b/Assets/Resources/UI/Prefab/Panel/Mobile/RaceHomePanel.prefab index cde59dae..ab9b73a3 100644 --- a/Assets/Resources/UI/Prefab/Panel/Mobile/RaceHomePanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/Mobile/RaceHomePanel.prefab @@ -1463,7 +1463,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Content: {fileID: 9215991904088383053} - m_Horizontal: 1 + m_Horizontal: 0 m_Vertical: 0 m_MovementType: 1 m_Elasticity: 0.1 diff --git a/Assets/Resources/UI/Prefab/Panel/Mobile/RaceListPanel.prefab b/Assets/Resources/UI/Prefab/Panel/Mobile/RaceListPanel.prefab index 8f1083bf..a64348dc 100644 --- a/Assets/Resources/UI/Prefab/Panel/Mobile/RaceListPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/Mobile/RaceListPanel.prefab @@ -544,9 +544,9 @@ RectTransform: m_Father: {fileID: 9114115754477968003} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 40, y: -20} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -264, y: -20} m_SizeDelta: {x: 60, y: 19} m_Pivot: {x: 0, y: 1} --- !u!222 &6312843494427679176 @@ -639,10 +639,10 @@ RectTransform: m_Father: {fileID: 19506897889085586} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} + m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: -43, y: -18} + m_SizeDelta: {x: 86, y: 36} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1454889704497082400 CanvasRenderer: @@ -1158,9 +1158,9 @@ RectTransform: m_Father: {fileID: 9114115754477968003} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 419.5, y: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 115.5, y: -100} m_SizeDelta: {x: 1, y: 40} m_Pivot: {x: 0, y: 0.5} --- !u!222 &1002401694468084519 @@ -1330,9 +1330,9 @@ RectTransform: m_Father: {fileID: 9114115754477968003} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 966, y: -19.5} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 662, y: -19.5} m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0, y: 1} --- !u!222 &1374583767318991556 @@ -1550,9 +1550,9 @@ RectTransform: m_Father: {fileID: 9114115754477968003} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 40, y: -140} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -264, y: -140} m_SizeDelta: {x: 82, y: 20} m_Pivot: {x: 0, y: 1} --- !u!222 &4393121095389363787 @@ -1658,8 +1658,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 102, y: -5} - m_SizeDelta: {x: -132, y: -10} + m_AnchoredPosition: {x: 102, y: -2.5} + m_SizeDelta: {x: -132, y: -5} m_Pivot: {x: 0, y: 0.5} --- !u!222 &4408462524766711654 CanvasRenderer: @@ -1711,7 +1711,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: r: {x: 20, y: 20, z: 0, w: 0} - rect2props: {x: 0.000030517578, y: -10, z: 241.12343, w: 241.12343} + rect2props: {x: 0.000030517578, y: -10, z: 242.89119, w: 242.89119} --- !u!1 &4605362255460975186 GameObject: m_ObjectHideFlags: 0 @@ -2051,7 +2051,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 324, y: 200} + m_SizeDelta: {x: 304, y: 200} m_Pivot: {x: 1, y: 0.5} --- !u!222 &8398349872535909533 CanvasRenderer: @@ -2103,7 +2103,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: r: {x: 0, y: 30, z: 30, w: 0} - rect2props: {x: -14.999985, y: -0.000015258789, z: 174.65538, w: 174.65538} + rect2props: {x: -14.999985, y: -0.000015258789, z: 167.58432, w: 167.58432} --- !u!1 &4876623757515401105 GameObject: m_ObjectHideFlags: 0 @@ -3298,9 +3298,9 @@ RectTransform: m_Father: {fileID: 9114115754477968003} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 40, y: -45} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -264, y: -45} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &172587720231943750 @@ -3593,7 +3593,7 @@ PrefabInstance: - target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} propertyPath: m_AnchoredPosition.x - value: -29 + value: -9 objectReference: {fileID: 0} - target: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3} diff --git a/Assets/Resources/UI/Prefab/ToastContainer-mobile.prefab b/Assets/Resources/UI/Prefab/ToastContainer-mobile.prefab new file mode 100644 index 00000000..f2cc026b --- /dev/null +++ b/Assets/Resources/UI/Prefab/ToastContainer-mobile.prefab @@ -0,0 +1,414 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2550272054721721287 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1673166913076064936} + - component: {fileID: 1964787418795620593} + - component: {fileID: 6632529772490108898} + - component: {fileID: 4799080841931904395} + - component: {fileID: 112077214919202944} + - component: {fileID: 1578934454411558168} + - component: {fileID: 8153319542030502509} + - component: {fileID: 3688729358500726461} + m_Layer: 5 + m_Name: ToastContainer-mobile + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1673166913076064936 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2550272054721721287} + 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: + - {fileID: 2903393643563272319} + - {fileID: 5008244665294165580} + m_Father: {fileID: 0} + 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: 0, y: 0} + m_SizeDelta: {x: 0, y: 96} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1964787418795620593 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2550272054721721287} + m_CullTransparentMesh: 0 +--- !u!114 &6632529772490108898 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2550272054721721287} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9764706, g: 0.1882353, b: 0.5254902, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 1 + 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 &4799080841931904395 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2550272054721721287} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6d1430f696af1114097da700a5dfe0ba, type: 3} + m_Name: + m_EditorClassIdentifier: + toast: {fileID: 2550272054721721287} + txt: {fileID: 3146539256596754620} +--- !u!114 &112077214919202944 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2550272054721721287} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} + m_Name: + m_EditorClassIdentifier: + radius: 48 +--- !u!225 &1578934454411558168 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2550272054721721287} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!114 &8153319542030502509 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2550272054721721287} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!114 &3688729358500726461 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2550272054721721287} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 20 + m_Right: 20 + m_Top: 12 + m_Bottom: 12 + m_ChildAlignment: 4 + m_Spacing: 10 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 1 + m_ChildScaleHeight: 0 +--- !u!1 &3711362548065282552 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5008244665294165580} + - component: {fileID: 5181308658082223272} + - component: {fileID: 5789125156700906347} + - component: {fileID: 8568980804807182099} + m_Layer: 5 + m_Name: Container + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5008244665294165580 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3711362548065282552} + 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: + - {fileID: 7121100143298194565} + m_Father: {fileID: 1673166913076064936} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 78, y: 0} + m_SizeDelta: {x: 0, y: 36} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &5181308658082223272 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3711362548065282552} + m_CullTransparentMesh: 0 +--- !u!114 &5789125156700906347 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3711362548065282552} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!114 &8568980804807182099 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3711362548065282552} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 +--- !u!1 &5551920471330652729 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2903393643563272319} + - component: {fileID: 7027635956731480168} + - component: {fileID: 6116684066069912979} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2903393643563272319 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5551920471330652729} + 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: 1673166913076064936} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 48, y: 48} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7027635956731480168 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5551920471330652729} + m_CullTransparentMesh: 0 +--- !u!114 &6116684066069912979 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5551920471330652729} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: ec2ddb0807723ff4e8d76f2e5a2855a3, 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!1 &6368655921577635968 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7121100143298194565} + - component: {fileID: 3132621560751603177} + - component: {fileID: 3146539256596754620} + - component: {fileID: 3279600142704954747} + m_Layer: 5 + m_Name: Toast + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7121100143298194565 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6368655921577635968} + 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: 5008244665294165580} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 36} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &3132621560751603177 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6368655921577635968} + m_CullTransparentMesh: 0 +--- !u!114 &3146539256596754620 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6368655921577635968} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} + m_FontSize: 28 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Toast +--- !u!114 &3279600142704954747 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6368655921577635968} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 diff --git a/Assets/Resources/UI/Prefab/ToastContainer-mobile.prefab.meta b/Assets/Resources/UI/Prefab/ToastContainer-mobile.prefab.meta new file mode 100644 index 00000000..58f802f0 --- /dev/null +++ b/Assets/Resources/UI/Prefab/ToastContainer-mobile.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 967acc65b59df574f8e75b1f34ea6976 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/App.cs b/Assets/Scripts/App.cs index 51554556..442ea7e4 100644 --- a/Assets/Scripts/App.cs +++ b/Assets/Scripts/App.cs @@ -85,13 +85,15 @@ public static class App public readonly static bool isFullScreen = width/height>1.8; static App() { -//#if !UNITY_EDITOR -// //Host = "http://pf.juze.pro/"; -// //UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21000); -// //TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21001); -// Host = "https://wx.powerfun.com.cn/"; -// UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11000); -// TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11001); -//#endif +#if !UNITY_EDITOR + //Host = "http://pf.juze.pro/"; + //UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21000); + //TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 21001); + Host = "https://wx.powerfun.com.cn/"; + UdpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11000); + TcpAddress = new IPEndPoint(IPAddress.Parse("47.97.84.8"), 11001); + +#endif + Screen.sleepTimeout = SleepTimeout.NeverSleep; } } diff --git a/Assets/Scripts/Scenes/LoginController.cs b/Assets/Scripts/Scenes/LoginController.cs index e13a0a78..18775dda 100644 --- a/Assets/Scripts/Scenes/LoginController.cs +++ b/Assets/Scripts/Scenes/LoginController.cs @@ -126,6 +126,8 @@ public class LoginController : BaseScene if (!Permission.HasUserAuthorizedPermission(Permission.ExternalStorageRead)) Permission.RequestUserPermission(Permission.ExternalStorageRead); +#elif UNITY_IOS + Input.location.Start(); #endif Init(); if (loginScrollView != null) diff --git a/Assets/Scripts/Scenes/MainController.cs b/Assets/Scripts/Scenes/MainController.cs index 10a37608..f171bcf6 100644 --- a/Assets/Scripts/Scenes/MainController.cs +++ b/Assets/Scripts/Scenes/MainController.cs @@ -65,7 +65,7 @@ public class MainController : BaseScene //}); if (App.MainSceneParam.ContainsKey("Name") && !string.IsNullOrEmpty(App.MainSceneParam["Name"])) { - UIManager.PushHome(); + UIManager.ShowHomePanel(); if (App.MainSceneParam["Name"] == "MapListPanel") { UIManager.ShowMapListPanel(); diff --git a/Assets/Scripts/UI/Prefab/Panel/MapListController.cs b/Assets/Scripts/UI/Prefab/Panel/MapListController.cs index 45c07f7c..64d7d15a 100644 --- a/Assets/Scripts/UI/Prefab/Panel/MapListController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/MapListController.cs @@ -65,7 +65,10 @@ public class MapListController : PFUIPanel { App.topRectStartX = topRect.localPosition.x; } - + if (App.isFullScreen) + { + topRect.sizeDelta = new Vector2(topRect.sizeDelta.x + 20, topRect.sizeDelta.y); + } var mc = transform.Find("MC"); UIManager.AddEvent(transform.Find("SwitchMode/BtnFilter").gameObject, EventTriggerType.PointerClick, b => { diff --git a/Assets/Scripts/UI/Prefab/Race/RaceListScript.cs b/Assets/Scripts/UI/Prefab/Race/RaceListScript.cs index 59b0f308..f4fabe74 100644 --- a/Assets/Scripts/UI/Prefab/Race/RaceListScript.cs +++ b/Assets/Scripts/UI/Prefab/Race/RaceListScript.cs @@ -217,6 +217,11 @@ public class RaceListScript : RaceScript { App.topRectStartX = topRect.localPosition.x; } + if (App.isFullScreen) + { + topRect.sizeDelta = new Vector2(topRect.sizeDelta.x + 20, topRect.sizeDelta.y); + } + var mc = transform.Find("MC"); UIManager.AddEvent(transform.Find("SwitchMode/BtnFilter").gameObject, EventTriggerType.PointerClick, b => diff --git a/Assets/Scripts/Utils/Utils.cs b/Assets/Scripts/Utils/Utils.cs index fc47692e..f64f4c48 100644 --- a/Assets/Scripts/Utils/Utils.cs +++ b/Assets/Scripts/Utils/Utils.cs @@ -132,7 +132,11 @@ namespace Assets.Scripts { MonoBehaviour.DestroyImmediate(toast.gameObject); } +#if UNITY_IOS || UNITY_ANDROID + var newToast = MonoBehaviour.Instantiate(Resources.Load("UI/Prefab/ToastContainer-mobile")); +#else var newToast = MonoBehaviour.Instantiate(Resources.Load("UI/Prefab/ToastContainer")); +#endif newToast.name = "ToastContainer"; newToast.GetComponent().position = new Vector3(Screen.width / 2, Screen.height / 2, 0); newToast.transform.parent = parent.transform; diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 9b996cb4..4706883c 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -38,7 +38,6 @@ GraphicsSettings: - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 1e9fa94a..63b67536 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -18,7 +18,7 @@ PlayerSettings: cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.20784314, g: 0.20784314, b: 0.2627451, a: 1} m_ShowUnitySplashScreen: 1 - m_ShowUnitySplashLogo: 1 + m_ShowUnitySplashLogo: 0 m_SplashScreenOverlayOpacity: 1 m_SplashScreenAnimation: 1 m_SplashScreenLogoStyle: 1