diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/g_gg_re_zh.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/g_gg_re_zh.png new file mode 100644 index 0000000000..735d1e9963 Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/g_gg_re_zh.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/g_gg_re_zh.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/g_gg_re_zh.png.meta new file mode 100644 index 0000000000..4d5b2a2fe3 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/g_gg_re_zh.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 2c4b4d8b320e89f46b71c76eb37c055e +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: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 2a9cecb69cef4124e952e4a404eafbb3 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/g_gg_xin_zh.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/g_gg_xin_zh.png new file mode 100644 index 0000000000..dd6741b744 Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/g_gg_xin_zh.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/g_gg_xin_zh.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/g_gg_xin_zh.png.meta new file mode 100644 index 0000000000..924c2b332e --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/g_gg_xin_zh.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: e8e97874b4536b14a94afc54e63f8a4c +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: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 60668b631b286c641908f556489badfe + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/g_gg_zhongyao_zh.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/g_gg_zhongyao_zh.png new file mode 100644 index 0000000000..973b173654 Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/g_gg_zhongyao_zh.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/g_gg_zhongyao_zh.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/g_gg_zhongyao_zh.png.meta new file mode 100644 index 0000000000..ee993e6eb5 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/g_gg_zhongyao_zh.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: bb32e0c1fd97abc4aa8e9b7d156301dd +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: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 0c325a509704dac40ac17d6df252fac2 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/GongGao.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/GongGao.meta new file mode 100644 index 0000000000..e28349184a --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/GongGao.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 78840c3fb7f9a99478fbc422a22da8d2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/GongGao/g_gg_sanjiao.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/GongGao/g_gg_sanjiao.png new file mode 100644 index 0000000000..19cf666028 Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/GongGao/g_gg_sanjiao.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/GongGao/g_gg_sanjiao.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/GongGao/g_gg_sanjiao.png.meta new file mode 100644 index 0000000000..b99cae45aa --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/GongGao/g_gg_sanjiao.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: 1aa44daf9c68bd546821257c8032e4e5 +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: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: e812c05406271014785a716cc1f22a4d + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/GongGao/g_gg_tiao.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/GongGao/g_gg_tiao.png new file mode 100644 index 0000000000..2c86302080 Binary files /dev/null and b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/GongGao/g_gg_tiao.png differ diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/GongGao/g_gg_tiao.png.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/GongGao/g_gg_tiao.png.meta new file mode 100644 index 0000000000..7ca1d727f2 --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/GongGao/g_gg_tiao.png.meta @@ -0,0 +1,99 @@ +fileFormatVersion: 2 +guid: c9e2d02da71f13547a2cda9643839489 +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: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: a76b8b299b3da1d4d83819add2cf9d43 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: DynamicActivityAtlas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/Login/NoticePopup.prefab b/Assets/ManagedResources/Prefabs/UI/Login/NoticePopup.prefab index 5d510f7999..450102abb3 100644 --- a/Assets/ManagedResources/Prefabs/UI/Login/NoticePopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Login/NoticePopup.prefab @@ -1,5 +1,316 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &542579953535481350 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5284945640825970945} + - component: {fileID: 8994941536712729} + - component: {fileID: 8179594012339736626} + m_Layer: 5 + m_Name: down + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5284945640825970945 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 542579953535481350} + 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: 3512058901700717611} + 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: 399.3, y: -7.200001} + m_SizeDelta: {x: 32, y: 28} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8994941536712729 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 542579953535481350} + m_CullTransparentMesh: 0 +--- !u!114 &8179594012339736626 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 542579953535481350} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, 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_Sprite: {fileID: 21300000, guid: 1aa44daf9c68bd546821257c8032e4e5, 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 +--- !u!1 &1501357947247341756 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3512058901700717611} + - component: {fileID: 1862353193318567179} + - component: {fileID: 7800718175362425230} + - component: {fileID: 2070078024764486022} + - component: {fileID: 734114654} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3512058901700717611 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1501357947247341756} + 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: 4391800219074165830} + - {fileID: 8271507603794321327} + - {fileID: 5284945640825970945} + - {fileID: 4470301037550164328} + m_Father: {fileID: 7502373276893439383} + 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: 889.71, y: 68} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &1862353193318567179 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1501357947247341756} + m_CullTransparentMesh: 0 +--- !u!114 &7800718175362425230 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1501357947247341756} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: c9e2d02da71f13547a2cda9643839489, 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 +--- !u!114 &2070078024764486022 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1501357947247341756} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 7800718175362425230} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &734114654 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1501357947247341756} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: 75 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!1 &4196482960477859818 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6383581922421020710} + - component: {fileID: 998464264278315995} + - component: {fileID: 3567889268871552476} + - component: {fileID: 2488096270660076576} + m_Layer: 5 + m_Name: content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6383581922421020710 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4196482960477859818} + 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: 7502373276893439383} + 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: 450.37, y: 0} + m_SizeDelta: {x: 779.4, y: 0} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &998464264278315995 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4196482960477859818} + m_CullTransparentMesh: 0 +--- !u!114 &3567889268871552476 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4196482960477859818} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.72156864, g: 0.69803923, b: 0.6039216, a: 1} + m_RaycastTarget: 1 + 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: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 35 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 1 + m_LineSpacing: 1.1 + m_Text: "1:\u4FEE\u590D\u5FC3\u613F\u7B2C\u4E8C\u5341\u6761\u89C4\u5B9A\u7136\u540E\u53D1\u4E8B\u6545\u7684\u53D1\u751F\u8BE5\u5982\u4F55\u5927\u6982\u591A\u5C11\u554A\u662F\u516C\u8BA4\u7684\u5341\u5206\u7F55\u89C1\u6492\u5676\u54C8\u80A1\u4EFD\u5408\u8BA1\u5927\u4F7F\u9986\u53CD\u5BF9\u548C\u89C4\u8303\u56DE\u5BB6\u7231\u56FD\u5927\u53A6\u89C4\u5212\u8FD8\u662F" + LanguageIndex: 0 +--- !u!114 &2488096270660076576 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4196482960477859818} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 --- !u!1 &4453122129546130772 GameObject: m_ObjectHideFlags: 0 @@ -10,8 +321,8 @@ GameObject: m_Component: - component: {fileID: 3189645566703996448} - component: {fileID: 759258889793061984} - - component: {fileID: 5151899281160064372} - - component: {fileID: 2248919630731250280} + - component: {fileID: 5573450262892769129} + - component: {fileID: 4340450231837533019} m_Layer: 5 m_Name: content m_TagString: Untagged @@ -35,8 +346,8 @@ RectTransform: 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.00032997, y: -0.000061035156} - m_SizeDelta: {x: 832.46, y: 0} + m_AnchoredPosition: {x: -3.7, y: -0.00012207031} + m_SizeDelta: {x: 898.6, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &759258889793061984 CanvasRenderer: @@ -46,7 +357,30 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4453122129546130772} m_CullTransparentMesh: 0 ---- !u!114 &5151899281160064372 +--- !u!114 &5573450262892769129 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4453122129546130772} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 10 + m_Right: 0 + m_Top: 10 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 10 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 1 +--- !u!114 &4340450231837533019 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -60,41 +394,80 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 ---- !u!114 &2248919630731250280 +--- !u!1 &5128081282947789005 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4470301037550164328} + - component: {fileID: 8490318822713034067} + - component: {fileID: 2485271281537785774} + m_Layer: 5 + m_Name: left + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4470301037550164328 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5128081282947789005} + m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: -0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3512058901700717611} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 270} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 401, y: -5.200001} + m_SizeDelta: {x: 32, y: 28} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8490318822713034067 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5128081282947789005} + m_CullTransparentMesh: 0 +--- !u!114 &2485271281537785774 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4453122129546130772} + m_GameObject: {fileID: 5128081282947789005} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.98039216, g: 0.8901961, b: 0.6862745, a: 1} - m_RaycastTarget: 1 + 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 36 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 56 - m_Alignment: 0 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1.55 - m_Text: - LanguageIndex: 0 + m_Sprite: {fileID: 21300000, guid: 1aa44daf9c68bd546821257c8032e4e5, 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 --- !u!1 &6118186219131728448 GameObject: m_ObjectHideFlags: 0 @@ -444,13 +817,14 @@ RectTransform: - {fileID: 6338192297091141402} - {fileID: 6336758629101027558} - {fileID: 8646968000391249409} + - {fileID: 7502373276893439383} m_Father: {fileID: 6337354432339345824} 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.018683, y: -35.07} - m_SizeDelta: {x: 900, y: 1351.06} + m_AnchoredPosition: {x: 0.3, y: -35.04} + m_SizeDelta: {x: 917.33, y: 1335.75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6338862112552816046 CanvasRenderer: @@ -525,7 +899,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -43.2, y: -33.4} + m_AnchoredPosition: {x: -34.5, y: -32.599976} m_SizeDelta: {x: 154, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6338984266485614554 @@ -712,6 +1086,235 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 +--- !u!1 &6590175801679842267 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8271507603794321327} + - component: {fileID: 1302631818058231670} + - component: {fileID: 356672063926695756} + m_Layer: 5 + m_Name: title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8271507603794321327 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6590175801679842267} + 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: 3512058901700717611} + 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: -251.6, y: 3.4899998} + m_SizeDelta: {x: 160, y: 36.82} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1302631818058231670 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6590175801679842267} + m_CullTransparentMesh: 0 +--- !u!114 &356672063926695756 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6590175801679842267} + 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: 0.97647065, g: 0.8941177, b: 0.654902, a: 1} + m_RaycastTarget: 1 + 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 42 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 4 + m_MaxSize: 42 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "4\u67087\u65E5\u7248\u672C" +--- !u!1 &6922355900859266028 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7502373276893439383} + - component: {fileID: 5052910604613908102} + - component: {fileID: 6491753634462296169} + m_Layer: 5 + m_Name: noticeItem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7502373276893439383 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6922355900859266028} + 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: 3512058901700717611} + - {fileID: 6383581922421020710} + m_Father: {fileID: 6336854609926423064} + m_RootOrder: 4 + 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: 2146, y: 456.1} + m_SizeDelta: {x: 900.74, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &5052910604613908102 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6922355900859266028} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, 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: 20 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 +--- !u!114 &6491753634462296169 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6922355900859266028} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!1 &7037195715108164636 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4391800219074165830} + - component: {fileID: 7369561492950484289} + - component: {fileID: 8328953994805257855} + m_Layer: 5 + m_Name: img + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4391800219074165830 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7037195715108164636} + 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: 3512058901700717611} + 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: -390, y: -5.0999985} + m_SizeDelta: {x: 94, y: 54} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7369561492950484289 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7037195715108164636} + m_CullTransparentMesh: 0 +--- !u!114 &8328953994805257855 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7037195715108164636} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: e8e97874b4536b14a94afc54e63f8a4c, 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 --- !u!1 &7086254525998538051 GameObject: m_ObjectHideFlags: 0 @@ -748,8 +1351,8 @@ RectTransform: 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: 8.000006, y: -52.4} - m_SizeDelta: {x: 832.4, y: 1135.7} + m_AnchoredPosition: {x: -0.0010185, y: -31.186} + m_SizeDelta: {x: 891.3, y: 1178.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &9190938559821024920 MonoBehaviour: @@ -804,13 +1407,15 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 11768032897548193} + - component: {fileID: 1122825243} + - component: {fileID: 1122825242} m_Layer: 5 m_Name: GameObject m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &11768032897548193 RectTransform: m_ObjectHideFlags: 0 @@ -830,3 +1435,46 @@ RectTransform: m_AnchoredPosition: {x: 18, y: -18} m_SizeDelta: {x: 36, y: 36} m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1122825243 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8379302466528388195} + m_CullTransparentMesh: 0 +--- !u!114 &1122825242 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8379302466528388195} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.72156864, g: 0.69803923, b: 0.6039216, a: 1} + m_RaycastTarget: 1 + 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 35 + 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: "\u6CA1\u6709\u516C\u544A" + LanguageIndex: 0 diff --git a/Assets/ManagedResources/chenghao.meta b/Assets/ManagedResources/chenghao.meta new file mode 100644 index 0000000000..12f53cd470 --- /dev/null +++ b/Assets/ManagedResources/chenghao.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 480ef461d0e5c7a40976d1ed12cdc034 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua b/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua index 09d0c8a3eb..5ec3028a4d 100644 --- a/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua +++ b/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua @@ -10,6 +10,8 @@ ServerConfigManager.SettingConfig = { UI_Layout_CanvasScaler = "UI_Layout_CanvasScaler", -- 屏幕适配 IS_PLAY_VOICE = "IS_PLAY_VOICE", -- 是否播放游戏内语音 IS_SHOW_HEALTH_TIP = "IS_SHOW_HEALTH_TIP", -- 是否显示健康提示 + NOTICE_CHANNEL = "NOTICE_CHANNEL", -- 公告号 + PACKAGE_CC_CODE = "PACKAGE_CC_CODE", -- CC号 } diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua index 17bc83fa37..e521bcca59 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua @@ -469,6 +469,24 @@ function this.GetActivityTableDataByPageInde(pageIndex) return activityGroupsData end +-- 判段跳转index活动是否开启 +function this.IsActivityOpenByJumpIndex(pageIndex, jumpIndex) + local tb = this.GetActivityTableDataByPageInde(pageIndex) + for i = 1, #tb do + if tb[i].Sort == jumpIndex then + if tb[i].ActiveType > 0 then + local id = ActivityGiftManager.IsActivityTypeOpen(tb[i].ActiveType) + return id and id > 0 and ActivityGiftManager.IsQualifiled(tb[i].ActiveType) + elseif tb[i].FunType > 0 then + return ActTimeCtrlManager.SingleFuncState(tb[i].FunType) + end + return true + end + end + return true +end + + -- 玩家是否有资格开启 function this.IsQualifiled(id) -- 相同类型活动解锁类型相同,所以只判断第一个 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua index aa7cbb6ad2..63ec76d74a 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua @@ -308,7 +308,7 @@ function TimeLimitedCall:RefreshNextLevelReward() self.sliderText.text="奖励可领取" self.sliderText.fontSize=26 Util.AddOnceClick(self.getBtn,function() - NetManager.GetActivityRewardRequest(mission.Id, self.actId, + NetManager.GetActivityRewardRequest(mission.missionId, self.actId, function(respond) UIManager.OpenPanel(UIName.RewardItemPopup, respond, 1) self:RefreshNextLevelReward() diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index 89e1dcfcba..555de111e0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -20,6 +20,7 @@ local LoginRoot_SubChannel = ServerConfigManager.GetVersionInfo("subChannel") local LoginRoot_Channel = ServerConfigManager.GetVersionInfo("channel") local LoginRoot_Version = ServerConfigManager.GetVersionInfo("version") local LoginRoot_PackageVersion = ServerConfigManager.GetVersionInfo("packageVersion") +local LoginRoot_NoticeChannel = ServerConfigManager.GetSettingValue(ServerConfigManager.SettingConfig.NOTICE_CHANNEL) or "" local orginLayer local timeStamp = Time.realtimeSinceStartup @@ -242,7 +243,8 @@ end -- 打开公告界面 function this.ShowNotice() RequestPanel.Show(Language[11137]) - networkMgr:SendGetHttp(LoginRoot_Url .. "jl_loginserver/getNotice?timestamp="..timeStamp.."&sign=".. timeSign,function (str) + --LogError("LoginRoot_NoticeChannel=="..LoginRoot_NoticeChannel) + networkMgr:SendGetHttp(LoginRoot_Url .. "jl_loginserver/getNotice?timestamp="..timeStamp.."&sign=".. timeSign.."&packageName="..LoginRoot_NoticeChannel,function (str) UIManager.OpenPanel(UIName.NoticePopup,str) end, nil, nil, nil) end diff --git a/Assets/ManagedResources/~Lua/Modules/Login/NoticePopup.lua b/Assets/ManagedResources/~Lua/Modules/Login/NoticePopup.lua index 2a00cf6a4a..6dd183fd4a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/NoticePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/NoticePopup.lua @@ -1,12 +1,15 @@ require("Base/BasePanel") NoticePopup = Inherit(BasePanel) local this = NoticePopup +local prelist={} --初始化组件(用于子类重写) function NoticePopup:InitComponent() this.BtnBack = Util.GetGameObject(self.transform, "bg/bg/btnBack") this.TitleText=Util.GetGameObject(self.transform,"bg/bg/title"):GetComponent("Text") - this.ContentText=Util.GetGameObject(self.transform,"bg/bg/rect/content"):GetComponent("Text") + this.ContentText=Util.GetGameObject(self.transform,"bg/bg/rect/GameObject"):GetComponent("Text") + this.content=Util.GetGameObject(self.transform,"bg/bg/rect/content") + this.go=Util.GetGameObject(self.transform,"bg/bg/noticeItem") end --绑定事件(用于子类重写) @@ -27,16 +30,18 @@ function NoticePopup:RemoveListener() end - +local str --界面打开时调用(用于子类重写) function NoticePopup:OnOpen(...) - this.GetNotice(...) + str=... + end --界面打开或者重新打开后,界面刷新时调用(用于子类重写) function NoticePopup:OnShow() - + this.GetNotice(str) + ForceRebuildLayout(this.content.transform) end --界面关闭时调用(用于子类重写) @@ -50,6 +55,7 @@ function NoticePopup:OnDestroy() end function this.GetNotice(str) + -- LogError(str) RequestPanel.Hide() if str == nil then return @@ -58,15 +64,62 @@ function this.GetNotice(str) local json = require 'cjson' local data = json.decode(str) - --Log("data.parms.title:"..data.parms.title) - --Log("data.parms.content:"..data.parms.content) - - if data.parms then - local titleStr = string.split(data.parms.title,"|") - this.TitleText.text =titleStr[GetCurLanguage()+1] or titleStr[1] - local contentStr = string.split(string.gsub(data.parms.content, "\\n", "\n"),"|") - this.ContentText.text = contentStr[GetCurLanguage()+1] or contentStr[1] + -- LogError("data.parms.title:".. tostring(data.list)) + -- for key, value in pairs(data.list) do + -- value.content="一群人在这里忙碌,嬉闹着搭帐篷建营地这是一个由公司同事私下组织的野营活动,当然,全都是年轻人,因为要背着帐篷等装备登山远足,年长一些的人体力不够原本大家是希望公司组织一次野营的,但公司每年都是组团旅游,有导游开大巴的那种,所以今年,很多同事干脆不跟随公司一起,反而是让几个有户外经验的同事领头自己组织,所以也有了这次登山野营。一群人在这里忙碌,嬉闹着搭帐篷建营地这是一个由公司同事私下组织的野营活动,当然,全都是年轻人,因为要背着帐篷等装备登山远足,年长一些的人体力不够原本大家是希望公司组织一次野营的,但公司每年都是组团旅游,有导游开大巴的那种,所以今年,很多同事干脆不跟随公司一起,反而是让几个有户外经验的同事领头自己组织,所以也有了这次登山野营。" + -- LogError("title:"..value.title.." content:"..value.content.." type:"..value.type) + -- end + if data.list and #data.list>0 then + this.ContentText.gameObject:SetActive(false) + table.sort(data.list, function(a, b) + return a.type < b.type + end) + for i = 1, math.max(#prelist,#data.list) do + local item=prelist[i] + if not item then + item=newObject(this.go) + item.transform:SetParent(this.content.transform) + item.transform.localScale=Vector3.one + item.transform.localPosition=Vector3.zero + prelist[i]=item + end + item.gameObject:SetActive(false) + end + for key, value in pairs(data.list) do + prelist[key]:SetActive(true) + local img=Util.GetGameObject(prelist[key],"Image/img"):GetComponent("Image") + if value.type==1 then + img.sprite=Util.LoadSprite("g_gg_zhongyao_zh") + elseif value.type==2 then + img.sprite=Util.LoadSprite("g_gg_xin_zh") + elseif value.type==3 then + img.sprite=Util.LoadSprite("g_gg_re_zh") + elseif value.type==4 then + img.gameObject:SetActive(false) + end + Util.GetGameObject(prelist[key],"Image/title"):GetComponent("Text").text=value.title + local content=Util.GetGameObject(prelist[key],"content"):GetComponent("Text") + content.text=value.content + local down=Util.GetGameObject(prelist[key],"Image/down") + local left=Util.GetGameObject(prelist[key],"Image/left") + local isOpen=true + down:SetActive(isOpen) + left:SetActive(not isOpen) + content.gameObject:SetActive(isOpen) + local btn=Util.GetGameObject(prelist[key],"Image") + Util.AddClick(btn,function() + isOpen=not isOpen + down:SetActive(isOpen) + left:SetActive(not isOpen) + content.gameObject:SetActive(isOpen) + end) + end + -- local titleStr = string.split(data.parms.title,"|") + -- this.TitleText.text =titleStr[GetCurLanguage()+1] or titleStr[1] + -- local contentStr = string.split(string.gsub(data.parms.content, "\\n", "\n"),"|") + -- this.ContentText.text = contentStr[GetCurLanguage()+1] or contentStr[1] else + this.ContentText.gameObject:SetActive(true) this.TitleText.text=Language[11147] this.ContentText.text=Language[11148] end diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index fbe521ad3a..258ba5e772 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -611,6 +611,11 @@ local jumpDic = { } function this.JumpActivity(data,skipfactor) + local isOpen = DynamicActivityManager.IsActivityOpenByJumpIndex(data, skipfactor) + if not isOpen then + PopupTipPanel.ShowTip("活动尚未开启") + return + end if UIManager.IsOpen(UIName.ActivityMainPanel) then UIManager.ClosePanel(UIName.ActivityMainPanel) end diff --git a/Assets/Scripts/Editor/GameEditor/FrameTool/BuildWindow.cs b/Assets/Scripts/Editor/GameEditor/FrameTool/BuildWindow.cs index 5792b0a51a..7e65257c9f 100644 --- a/Assets/Scripts/Editor/GameEditor/FrameTool/BuildWindow.cs +++ b/Assets/Scripts/Editor/GameEditor/FrameTool/BuildWindow.cs @@ -241,6 +241,7 @@ namespace GameEditor.FrameTool { public string packageVersion; public string version; public string serverUrl; + //public string noticeChannel; } @@ -338,6 +339,8 @@ namespace GameEditor.FrameTool { m_VersionTxt.packageVersion = EditorGUILayout.TextField("", m_VersionTxt.packageVersion); EditorGUILayout.LabelField("热更版本号:"); m_VersionTxt.version = EditorGUILayout.TextField("", m_VersionTxt.version); + //EditorGUILayout.LabelField("公告:"); + //m_VersionTxt.noticeChannel = EditorGUILayout.TextField("", m_VersionTxt.noticeChannel); EditorGUILayout.EndVertical(); if (GUILayout.Button("应用", GUILayout.Height(40f)))