diff --git a/Assets/LuaFramework/Scenes/Logo_cn_youxin.unity b/Assets/LuaFramework/Scenes/Logo_cn_youxin.unity new file mode 100644 index 0000000000..cb30f99927 --- /dev/null +++ b/Assets/LuaFramework/Scenes/Logo_cn_youxin.unity @@ -0,0 +1,362 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!1 &2 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 16} + - component: {fileID: 42} + - component: {fileID: 44} + - component: {fileID: 43} + - component: {fileID: 5} + - component: {fileID: 3} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &3 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c7cbe2940276bfc4f946d442c07229d2, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!81 &5 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2} + m_Enabled: 1 +--- !u!4 &16 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2} + 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: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!104 &22 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 3 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &24 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 11 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 10 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 0 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 500 + m_PVRBounces: 2 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringMode: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ShowResolutionOverlay: 1 + m_LightingDataAsset: {fileID: 0} + m_UseShadowmask: 1 +--- !u!114 &42 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -619905303, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 50 +--- !u!114 &43 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1997211142, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ForceModuleActive: 0 +--- !u!114 &44 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1077351063, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!1 &1013149005 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1013149006} + - component: {fileID: 1013149007} + - component: {fileID: 1013149008} + m_Layer: 0 + m_Name: GameStart + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1013149006 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1013149005} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.26726648, y: 0.43754014, z: -0.046788022} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1013149007 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1013149005} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ae34f89576e17114c97f3cb81dba9ff6, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1013149008 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1013149005} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fa01058878b41024abbd731e7118c543, type: 3} + m_Name: + m_EditorClassIdentifier: + settingInfo: + logLevel: 4 + isDebug: 0 + bundleMode: 1 + luaBundleMode: 1 + isUpdate: 1 + isSDK: 1 + isSDKLogin: 1 + isGuide: 1 + isOpenGM: 0 +--- !u!4 &57277738265262265 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3471622135844523394} + 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: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1362306110787991495 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3471622135844523394} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d7df5c5e5307f460e917e72bf75ec567, type: 3} + m_Name: + m_EditorClassIdentifier: + enableLog: 1 + networkType: 3 + tokens: + - appid: 627a018199e84ae4a50ca3bc3dd12aef + serverUrl: https://thinkingdata.18183g.com + mode: 0 + timeZone: 0 + timeZoneId: +--- !u!1 &3471622135844523394 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 57277738265262265} + - component: {fileID: 1362306110787991495} + - component: {fileID: 3471622135844523395} + - component: {fileID: 3471622135844523396} + m_Layer: 0 + m_Name: SDKConfig + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &3471622135844523395 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3471622135844523394} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 54b4453692b964811aa1c221fd236d88, type: 3} + m_Name: + m_EditorClassIdentifier: + appid: 45u6xr9ch5dr0epw + channel: "\u5E7B\u7075\u5951\u7EA6" +--- !u!114 &3471622135844523396 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3471622135844523394} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d7bc9cc33d9f7284590ba57b9743fb33, type: 3} + m_Name: + m_EditorClassIdentifier: + appid: 1fc5a543ea diff --git a/Assets/LuaFramework/Scenes/Logo_cn_youxin.unity.meta b/Assets/LuaFramework/Scenes/Logo_cn_youxin.unity.meta new file mode 100644 index 0000000000..78b3330ac8 --- /dev/null +++ b/Assets/LuaFramework/Scenes/Logo_cn_youxin.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 69a0fd2b949938c4793995837f36166b +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_sanshibei_biaotizi.png b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_sanshibei_biaotizi.png new file mode 100644 index 0000000000..f0759dc74c Binary files /dev/null and b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_sanshibei_biaotizi.png differ diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_sanshibei_biaotizi.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_sanshibei_biaotizi.png.meta new file mode 100644 index 0000000000..852696920e --- /dev/null +++ b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_sanshibei_biaotizi.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 645b351aae8cc5c40810904977ee1301 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + 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: be06e3740ac1dc347a77f05cc666d9cc + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ActivityAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_sanshibei_wenzi.png b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_sanshibei_wenzi.png new file mode 100644 index 0000000000..dc73d616bc Binary files /dev/null and b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_sanshibei_wenzi.png differ diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_sanshibei_wenzi.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_sanshibei_wenzi.png.meta new file mode 100644 index 0000000000..a0e376b8d1 --- /dev/null +++ b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/s_sanshibei_wenzi.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: a23adc2d034ce0740826a4f4648fc33d +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + 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: 62fd778d63c6d1d4790c650d9bb7c88c + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ActivityAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/y_yjj_128kuang005.png b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/y_yjj_128kuang005.png new file mode 100644 index 0000000000..b9710c17dd Binary files /dev/null and b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/y_yjj_128kuang005.png differ diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/y_yjj_128kuang005.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/y_yjj_128kuang005.png.meta new file mode 100644 index 0000000000..52dcb4b2fd --- /dev/null +++ b/Assets/ManagedResources/Atlas/ActivityAltas/ArtFont/y_yjj_128kuang005.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: b53f4ee62b5787b47ac915da970e5aaf +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: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: a6d224b2b24bec34f8982ef3462cbfbb + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ActivityAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/s_sanshibei_beijingren.jpg b/Assets/ManagedResources/Atlas/ActivityAltas/s_sanshibei_beijingren.jpg new file mode 100644 index 0000000000..eae0d83c7b Binary files /dev/null and b/Assets/ManagedResources/Atlas/ActivityAltas/s_sanshibei_beijingren.jpg differ diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/s_sanshibei_beijingren.jpg.meta b/Assets/ManagedResources/Atlas/ActivityAltas/s_sanshibei_beijingren.jpg.meta new file mode 100644 index 0000000000..e403cdbb7e --- /dev/null +++ b/Assets/ManagedResources/Atlas/ActivityAltas/s_sanshibei_beijingren.jpg.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: cea0a32b4b01e554ebcf265c6839e6ea +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + 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: ff3fceebf8bdde44cb767ebce6a937a1 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ActivityAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/s_sanshibei_bg.png b/Assets/ManagedResources/Atlas/ActivityAltas/s_sanshibei_bg.png new file mode 100644 index 0000000000..0262667025 Binary files /dev/null and b/Assets/ManagedResources/Atlas/ActivityAltas/s_sanshibei_bg.png differ diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/s_sanshibei_bg.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/s_sanshibei_bg.png.meta new file mode 100644 index 0000000000..5fec537c61 --- /dev/null +++ b/Assets/ManagedResources/Atlas/ActivityAltas/s_sanshibei_bg.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 744a01d413e0caa4bb5c913ef5c884ad +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + 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: b45102c9db1ea9243a47c3619cb62e7f + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ActivityAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/s_sanshibei_kuang_01.png b/Assets/ManagedResources/Atlas/ActivityAltas/s_sanshibei_kuang_01.png new file mode 100644 index 0000000000..1534fe4665 Binary files /dev/null and b/Assets/ManagedResources/Atlas/ActivityAltas/s_sanshibei_kuang_01.png differ diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/s_sanshibei_kuang_01.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/s_sanshibei_kuang_01.png.meta new file mode 100644 index 0000000000..3fd00b7734 --- /dev/null +++ b/Assets/ManagedResources/Atlas/ActivityAltas/s_sanshibei_kuang_01.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: c215653e009e6cc45aa5817eb3272b0b +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + 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: dcb6fd282c0ff6441b23adb136ea3e8f + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ActivityAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/s_sanshibei_kuang_02.png b/Assets/ManagedResources/Atlas/ActivityAltas/s_sanshibei_kuang_02.png new file mode 100644 index 0000000000..76bb31de07 Binary files /dev/null and b/Assets/ManagedResources/Atlas/ActivityAltas/s_sanshibei_kuang_02.png differ diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/s_sanshibei_kuang_02.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/s_sanshibei_kuang_02.png.meta new file mode 100644 index 0000000000..ee575ec7c9 --- /dev/null +++ b/Assets/ManagedResources/Atlas/ActivityAltas/s_sanshibei_kuang_02.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 291a22653d521184b8b41c52471ef812 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + 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: 9534f198b982c80409c1042d4b0780c1 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ActivityAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/s_sanshibei_xiaobiaodi.png b/Assets/ManagedResources/Atlas/ActivityAltas/s_sanshibei_xiaobiaodi.png new file mode 100644 index 0000000000..cbaec73e62 Binary files /dev/null and b/Assets/ManagedResources/Atlas/ActivityAltas/s_sanshibei_xiaobiaodi.png differ diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/s_sanshibei_xiaobiaodi.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/s_sanshibei_xiaobiaodi.png.meta new file mode 100644 index 0000000000..818310e28c --- /dev/null +++ b/Assets/ManagedResources/Atlas/ActivityAltas/s_sanshibei_xiaobiaodi.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: dbf537639d9ae054ba45142aac5952d9 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + 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: 3d7feb9e8c2273543867fc65416b3eb8 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ActivityAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_1280.png b/Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_1280.png new file mode 100644 index 0000000000..f92e85c42d Binary files /dev/null and b/Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_1280.png differ diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_1280.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_1280.png.meta new file mode 100644 index 0000000000..4bedd0d356 --- /dev/null +++ b/Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_1280.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: e4a1ba017aac14a4d84c35656d081e7b +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: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 36ed93142f0acc04bb2913e0ebf02326 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ActivityAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_128kuang004.png b/Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_128kuang004.png new file mode 100644 index 0000000000..548fc6479a Binary files /dev/null and b/Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_128kuang004.png differ diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_128kuang004.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_128kuang004.png.meta new file mode 100644 index 0000000000..a8d6df7224 --- /dev/null +++ b/Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_128kuang004.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 6065d0c756ba9184f892c56cb5e26c77 +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: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: cf3cbc8f19bcde24d93e72d877f9a632 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ActivityAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_3280.png b/Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_3280.png new file mode 100644 index 0000000000..3f43dc0455 Binary files /dev/null and b/Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_3280.png differ diff --git a/Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_3280.png.meta b/Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_3280.png.meta new file mode 100644 index 0000000000..0efa64c189 --- /dev/null +++ b/Assets/ManagedResources/Atlas/ActivityAltas/y_yjj_3280.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 44bb972b166b76744b315a9b70e97937 +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: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 56 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 67b52df8b11ebeb4489f0b7c1f4795be + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: ActivityAltas + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/DynamicAtlas/y_yjj_128kuang001.png b/Assets/ManagedResources/DynamicAtlas/y_yjj_128kuang001.png index b4cbd4a002..ff42ba6b2a 100644 Binary files a/Assets/ManagedResources/DynamicAtlas/y_yjj_128kuang001.png and b/Assets/ManagedResources/DynamicAtlas/y_yjj_128kuang001.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/y_yjj_128kuang001.png.meta b/Assets/ManagedResources/DynamicAtlas/y_yjj_128kuang001.png.meta index 3ff17c1342..3fe3741c7d 100644 --- a/Assets/ManagedResources/DynamicAtlas/y_yjj_128kuang001.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/y_yjj_128kuang001.png.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: b53b525338e901c4f8ad5615d8f2759d +guid: b79be78328536364da56d196f3cfa320 TextureImporter: - fileIDToRecycleName: - 21300000: y_yjj_128kuang001 + fileIDToRecycleName: {} externalObjects: {} serializedVersion: 9 mipmaps: @@ -43,7 +42,7 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 0 + spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 @@ -59,6 +58,17 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 - serializedVersion: 2 buildTarget: Android maxTextureSize: 2048 @@ -94,31 +104,11 @@ TextureImporter: androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 - sprites: - - serializedVersion: 2 - name: y_yjj_128kuang001 - rect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1038 - height: 444 - alignment: 0 - pivot: {x: 0, y: 0} - border: {x: 0, y: 0, z: 0, w: 0} - outline: [] - physicsShape: [] - tessellationDetail: -1 - bones: [] - spriteID: af7f2bffe77f4334c853096293cf47ad - vertices: [] - indices: - edges: [] - weights: [] + sprites: [] outline: [] physicsShape: [] bones: [] - spriteID: 396b32e530b75634da06e1a355065d61 + spriteID: c54231a177968664d971fff3d914872a vertices: [] indices: edges: [] @@ -127,5 +117,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: lz4/dynamicatlas/y_yjj_128kuang001 - assetBundleVariant: unity3d + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/UppperMonthCardView/UppperMonthCard.prefab b/Assets/ManagedResources/Prefabs/UI/UppperMonthCardView/UppperMonthCard.prefab index ea3f5000c6..51427ed6ba 100644 --- a/Assets/ManagedResources/Prefabs/UI/UppperMonthCardView/UppperMonthCard.prefab +++ b/Assets/ManagedResources/Prefabs/UI/UppperMonthCardView/UppperMonthCard.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &22220677328511373 +--- !u!1 &19165097904338508 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,79 +8,73 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1879148265839340614} - - component: {fileID: 2590685776249801069} - - component: {fileID: 6483966316175790199} + - component: {fileID: 8336140701064760672} + - component: {fileID: 2626895028619679688} + - component: {fileID: 6908785597277218420} m_Layer: 5 - m_Name: totalDay + m_Name: icon m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1879148265839340614 +--- !u!224 &8336140701064760672 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 22220677328511373} + m_GameObject: {fileID: 19165097904338508} 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: 6939676685246443619} + m_Father: {fileID: 6006573902902831224} 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: -5.7, y: -203.5} - m_SizeDelta: {x: 361.66, y: 70.89} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2590685776249801069 + m_AnchoredPosition: {x: -107.549995, y: -158.10004} + m_SizeDelta: {x: 76.9, y: 76.897} + m_Pivot: {x: 0.50000006, y: 0.5} +--- !u!222 &2626895028619679688 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 22220677328511373} + m_GameObject: {fileID: 19165097904338508} m_CullTransparentMesh: 0 ---- !u!114 &6483966316175790199 +--- !u!114 &6908785597277218420 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 22220677328511373} + m_GameObject: {fileID: 19165097904338508} 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: 1, g: 0.8627451, b: 0.7294118, a: 1} + 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_FontData: - m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 40 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u5F53\u524D\u7D2F\u8BA1\uFF1A10\u5929" - LanguageIndex: 0 ---- !u!1 &528201714862005985 + m_Sprite: {fileID: 0} + 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 &181774338091266417 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -88,78 +82,154 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7071472370948526213} - - component: {fileID: 3613745244257052569} - - component: {fileID: 8427094876235382497} + - component: {fileID: 2932887958962627933} + - component: {fileID: 1370109979933842796} + - component: {fileID: 3790412993214586187} m_Layer: 5 - m_Name: tip + m_Name: scroller m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7071472370948526213 +--- !u!224 &2932887958962627933 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 528201714862005985} + m_GameObject: {fileID: 181774338091266417} 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: 6939676685246443619} - m_RootOrder: 2 + m_Children: + - {fileID: 1171539042498346582} + m_Father: {fileID: 2481339074999143791} + 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: 3.8, y: -287.1} - m_SizeDelta: {x: 870.67, y: 73.7} + m_AnchoredPosition: {x: 0, y: 4.3} + m_SizeDelta: {x: 1045, y: 645.5} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3613745244257052569 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 528201714862005985} - m_CullTransparentMesh: 0 ---- !u!114 &8427094876235382497 +--- !u!114 &1370109979933842796 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 528201714862005985} + m_GameObject: {fileID: 181774338091266417} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 1171539042498346582} + m_Horizontal: 0 + m_Vertical: 1 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 0} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 0} + m_HorizontalScrollbarVisibility: 0 + m_VerticalScrollbarVisibility: 0 + m_HorizontalScrollbarSpacing: 0 + m_VerticalScrollbarSpacing: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &3790412993214586187 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 181774338091266417} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &616022089734749750 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8502060274675274340} + - component: {fileID: 5655440297304059979} + - component: {fileID: 1137541503666934167} + m_Layer: 5 + m_Name: redPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8502060274675274340 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 616022089734749750} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.121, y: 1.121, z: 1.2} + m_Children: [] + m_Father: {fileID: 3026958449964278605} + 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: 82.8385, y: 30.382507} + m_SizeDelta: {x: 26, y: 26} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5655440297304059979 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 616022089734749750} + m_CullTransparentMesh: 0 +--- !u!114 &1137541503666934167 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 616022089734749750} + 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: 0.7254902, g: 0.62352943, b: 0.49411765, 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: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 25 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\uFF08\u5956\u52B1\u6BCF\u5929\u901A\u8FC7\u90AE\u4EF6\u53D1\u653E\uFF09" - LanguageIndex: 0 + m_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, 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 &935729246196295134 GameObject: m_ObjectHideFlags: 0 @@ -189,15 +259,15 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1171539042498346582} + - {fileID: 2932887958962627933} - {fileID: 3026958449964278605} m_Father: {fileID: 9193407636057667010} 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: 11.4, y: 59.57} - m_SizeDelta: {x: 1038, y: 465.46} + m_AnchoredPosition: {x: 0, y: 28.3} + m_SizeDelta: {x: 1045, y: 699} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1038159290025812082 CanvasRenderer: @@ -227,7 +297,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: b53b525338e901c4f8ad5615d8f2759d, type: 3} + m_Sprite: {fileID: 21300000, guid: c215653e009e6cc45aa5817eb3272b0b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -255,7 +325,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8653338172792289727 RectTransform: m_ObjectHideFlags: 0 @@ -268,12 +338,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 3605647418732112959} - m_Father: {fileID: 5798857158589374594} + - {fileID: 3618973258761224901} + m_Father: {fileID: 9193407636057667010} 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: -3.4, y: -299.8} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0.000024319, y: 87} m_SizeDelta: {x: 260, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8824517109316792247 @@ -374,179 +445,6 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!1 &1128723542437021517 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2787857164103187957} - - component: {fileID: 6042584463416474118} - - component: {fileID: 3751344375767800166} - - component: {fileID: 9081243050881762222} - m_Layer: 5 - m_Name: value - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2787857164103187957 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1128723542437021517} - 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: 4164092782649441729} - 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: 206.8, y: -0.000015259} - m_SizeDelta: {x: 401.08, y: 92.89} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6042584463416474118 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1128723542437021517} - m_CullTransparentMesh: 0 ---- !u!114 &3751344375767800166 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1128723542437021517} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 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: 634137158f07dff488d018d707aa403a, type: 2} - m_FontSize: 0 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 40 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 21000 ---- !u!114 &9081243050881762222 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1128723542437021517} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 72f543c75b355a741976183c1e74debc, type: 3} - m_Name: - m_EditorClassIdentifier: - _textSpacing: -29.45 ---- !u!1 &1183795546203151620 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4898123826092526526} - - component: {fileID: 8729641320952905815} - - component: {fileID: 4997551303334618701} - m_Layer: 5 - m_Name: time - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4898123826092526526 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1183795546203151620} - 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: 6939676685246443619} - 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: 3.8, y: -254} - m_SizeDelta: {x: 735.3, y: 70.2} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8729641320952905815 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1183795546203151620} - m_CullTransparentMesh: 0 ---- !u!114 &4997551303334618701 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1183795546203151620} - 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.7254902, g: 0.62352943, b: 0.49411765, 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: 30 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u9886\u53D6\u65F6\u95F4\uFF1A2019\u5E7411\u670809\u65E5 \u2014 2099\u5E7412\u670806\u65E5" - LanguageIndex: 0 --- !u!1 &1232012778584342037 GameObject: m_ObjectHideFlags: 0 @@ -576,17 +474,17 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1729225599862189344} + - {fileID: 3258438445955883517} - {fileID: 2481339074999143791} - - {fileID: 5798857158589374594} - - {fileID: 6939676685246443619} + - {fileID: 8653338172792289727} + - {fileID: 8900961059961251877} m_Father: {fileID: 8771955440447412165} 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: -375.1} - m_SizeDelta: {x: 1010, y: 724} + m_AnchoredPosition: {x: 0.000012159, y: -326.9} + m_SizeDelta: {x: 1010, y: 902} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3811832362725030788 CanvasRenderer: @@ -616,7 +514,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 4fb81c0f9891fbd478ecf66436af8164, type: 3} + m_Sprite: {fileID: 21300000, guid: 291a22653d521184b8b41c52471ef812, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -635,6 +533,7 @@ GameObject: m_Component: - component: {fileID: 1171539042498346582} - component: {fileID: 3184966851960719010} + - component: {fileID: 6846399584543095795} m_Layer: 5 m_Name: grid m_TagString: Untagged @@ -649,17 +548,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1551830787636578833} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 2481339074999143791} + m_Father: {fileID: 2932887958962627933} 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: -377.7515, y: 191.29962} - m_SizeDelta: {x: 728.7, y: 387.4} + m_AnchoredPosition: {x: -494.8, y: 322.74985} + m_SizeDelta: {x: 987.4, y: 0} m_Pivot: {x: -0.00000007683411, y: 0.9999999} --- !u!114 &3184966851960719010 MonoBehaviour: @@ -674,17 +573,31 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 37 + m_Left: 72 m_Right: 0 - m_Top: 5 + m_Top: 38 m_Bottom: 0 m_ChildAlignment: 0 m_StartCorner: 0 m_StartAxis: 0 m_CellSize: {x: 100, y: 100} - m_Spacing: {x: 70.41, y: 92} + m_Spacing: {x: 68, y: 93.25} m_Constraint: 1 - m_ConstraintCount: 4 + m_ConstraintCount: 5 +--- !u!114 &6846399584543095795 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1551830787636578833} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 --- !u!1 &2113223897408364641 GameObject: m_ObjectHideFlags: 0 @@ -702,7 +615,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8451588087794241115 RectTransform: m_ObjectHideFlags: 0 @@ -719,8 +632,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: 23.8, y: -126.3} - m_SizeDelta: {x: 184.4, y: 58.24} + m_AnchoredPosition: {x: 21.41, y: 66.38} + m_SizeDelta: {x: 151.73, y: 45.68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &542043527256496620 CanvasRenderer: @@ -790,17 +703,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3427507939642385967} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 9193407636057667010} + m_Father: {fileID: 3258438445955883517} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -7.100006} - m_SizeDelta: {x: 432, y: 102} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 3.1, y: 3.4} + m_SizeDelta: {x: 214, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8971931912077796197 CanvasRenderer: @@ -830,7 +743,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: d7f2035e6f2776d4795420f53fd90ddc, type: 3} + m_Sprite: {fileID: 21300000, guid: 645b351aae8cc5c40810904977ee1301, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -839,7 +752,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &4071922420479707236 +--- !u!1 &5102195846956253371 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -847,90 +760,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7092428357224790221} - - component: {fileID: 8487189314310343694} - - component: {fileID: 5407439437247697793} - m_Layer: 5 - m_Name: icon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7092428357224790221 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4071922420479707236} - 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: 5380481564575134646} - m_Father: {fileID: 63398874433271581} - 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: 231, y: -50} - m_SizeDelta: {x: 62, y: 101.07} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8487189314310343694 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4071922420479707236} - m_CullTransparentMesh: 0 ---- !u!114 &5407439437247697793 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4071922420479707236} - 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: 1, g: 0.8745098, b: 0.7529412, a: 0} - 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: 40 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u8D2Dff" - LanguageIndex: 0 ---- !u!1 &4138094381107220881 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 63398874433271581} - - component: {fileID: 5448780549318186748} - - component: {fileID: 4679390055084893863} + - component: {fileID: 8900961059961251877} + - component: {fileID: 706728126049573926} + - component: {fileID: 3943079612183574262} m_Layer: 5 m_Name: tip m_TagString: Untagged @@ -938,67 +770,68 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &63398874433271581 +--- !u!224 &8900961059961251877 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4138094381107220881} + m_GameObject: {fileID: 5102195846956253371} 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: 2446104904837739641} - - {fileID: 7092428357224790221} - - {fileID: 7228392228853546665} - - {fileID: 1670251285913227498} - m_Father: {fileID: 5798857158589374594} - m_RootOrder: 0 + m_Children: [] + m_Father: {fileID: 9193407636057667010} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -166, y: -190.9} - m_SizeDelta: {x: 367, y: 100} - m_Pivot: {x: -0.000000009313226, y: 0.50000006} ---- !u!114 &5448780549318186748 + m_AnchoredPosition: {x: 1.300061, y: -364.95} + m_SizeDelta: {x: 808, y: 72.1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &706728126049573926 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5102195846956253371} + m_CullTransparentMesh: 0 +--- !u!114 &3943079612183574262 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4138094381107220881} + m_GameObject: {fileID: 5102195846956253371} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 0 ---- !u!114 &4679390055084893863 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4138094381107220881} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 3 - m_Spacing: 0 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 1 - m_ChildControlHeight: 0 ---- !u!1 &4164092782649441734 + 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_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 44 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 44 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u6B21\u65E50\u70B9\u5237\u65B0\u540E\u53EF\u518D\u6B21\u8D2D\u4E70" +--- !u!1 &5292033522315147608 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1006,53 +839,51 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4164092782649441729} - - component: {fileID: 4164092782649441731} - - component: {fileID: 4164092782649441728} + - component: {fileID: 3258438445955883517} + - component: {fileID: 7835817736892176641} + - component: {fileID: 6024354260596866831} m_Layer: 5 - m_Name: Image + m_Name: titleDi m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &4164092782649441729 +--- !u!224 &3258438445955883517 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4164092782649441734} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 5292033522315147608} + 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: 1823764382510425994} - - {fileID: 4108100249495885538} - - {fileID: 2787857164103187957} - m_Father: {fileID: 6006573901455886131} - m_RootOrder: 1 + - {fileID: 1729225599862189344} + m_Father: {fileID: 9193407636057667010} + 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: 315.50003, y: 181.3} - m_SizeDelta: {x: 457, y: 56} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -5, y: -8.5} + m_SizeDelta: {x: 432, y: 102} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4164092782649441731 +--- !u!222 &7835817736892176641 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4164092782649441734} + m_GameObject: {fileID: 5292033522315147608} m_CullTransparentMesh: 0 ---- !u!114 &4164092782649441728 +--- !u!114 &6024354260596866831 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4164092782649441734} + m_GameObject: {fileID: 5292033522315147608} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -1066,7 +897,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: cc790d23fbd15134ea58184bd6b09bd9, type: 3} + m_Sprite: {fileID: 21300000, guid: dbf537639d9ae054ba45142aac5952d9, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1075,44 +906,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &4825290623248273158 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6939676685246443619} - m_Layer: 5 - m_Name: rewardPart - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &6939676685246443619 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4825290623248273158} - 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: 1879148265839340614} - - {fileID: 4898123826092526526} - - {fileID: 7071472370948526213} - m_Father: {fileID: 9193407636057667010} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5511838026540146219 GameObject: m_ObjectHideFlags: 0 @@ -1147,261 +940,8 @@ RectTransform: 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: 100, y: 100} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &5616106487545069338 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7228392228853546665} - - component: {fileID: 5814238623332039959} - - component: {fileID: 4949411919679758061} - m_Layer: 5 - m_Name: value - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7228392228853546665 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5616106487545069338} - 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: 63398874433271581} - 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: 314.5, y: -50} - m_SizeDelta: {x: 105, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5814238623332039959 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5616106487545069338} - m_CullTransparentMesh: 0 ---- !u!114 &4949411919679758061 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5616106487545069338} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 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: 44 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 58 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: '3280 ' ---- !u!1 &6006573901455886130 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6006573901455886131} - m_Layer: 5 - m_Name: previewRoot - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6006573901455886131 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6006573901455886130} - 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: 6006573901789977256} - - {fileID: 4164092782649441729} - m_Father: {fileID: 6006573902604327796} - 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: -44, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &6006573901789977259 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6006573901789977256} - - component: {fileID: 6006573901789977303} - - component: {fileID: 6006573901789977302} - - component: {fileID: 6006573901789977257} - - component: {fileID: 4381954159705805630} - m_Layer: 5 - m_Name: btnPreview - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6006573901789977256 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6006573901789977259} - 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: 6006573901455886131} - 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: 425, y: 277} - m_SizeDelta: {x: 128, y: 126} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6006573901789977303 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6006573901789977259} - m_CullTransparentMesh: 0 ---- !u!114 &6006573901789977302 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6006573901789977259} - 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: 5f739325320131c4d8c0286f2c89b26e, 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 &6006573901789977257 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6006573901789977259} - 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: 3 - 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: 6006573901789977302} - m_OnClick: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!95 &4381954159705805630 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6006573901789977259} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &6006573902300900882 GameObject: m_ObjectHideFlags: 0 @@ -1418,7 +958,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &6006573902300900883 RectTransform: m_ObjectHideFlags: 0 @@ -1430,15 +970,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 4597835908200080533} - {fileID: 6006573902604327796} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1188, y: 2112} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6006573902300900880 CanvasRenderer: @@ -1476,17 +1015,18 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 4597835908200080533} - {fileID: 5673358605124643480} - {fileID: 6006573902902831224} - - {fileID: 6006573901455886131} - {fileID: 8771955440447412165} + - {fileID: 285183680408798567} m_Father: {fileID: 6006573902300900883} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + 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: 0} + m_SizeDelta: {x: 1080, y: 1920} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6006573902604327794 CanvasRenderer: @@ -1506,7 +1046,7 @@ GameObject: m_Component: - component: {fileID: 6006573902792951272} - component: {fileID: 6006573902792950806} - - component: {fileID: 6006573902792951273} + - component: {fileID: 4159416680291512916} m_Layer: 5 m_Name: type m_TagString: Untagged @@ -1526,12 +1066,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6006573902902831224} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -30.5, y: -272.9} - m_SizeDelta: {x: 84, y: 58} + m_AnchoredPosition: {x: -33.8, y: -158.1} + m_SizeDelta: {x: 107, y: 57} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6006573902792950806 CanvasRenderer: @@ -1541,7 +1081,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6006573902792951275} m_CullTransparentMesh: 0 ---- !u!114 &6006573902792951273 +--- !u!114 &4159416680291512916 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1561,7 +1101,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: bd599ea5e7454a54b8614fc382f3b65a, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1599,15 +1139,16 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 8336140701064760672} - {fileID: 6006573902792951272} m_Father: {fileID: 6006573902604327796} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -229.79999, y: 472.7} - m_SizeDelta: {x: 294, y: 802} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -433, y: 517.5} + m_SizeDelta: {x: 292, y: 802} + m_Pivot: {x: 0.116448, y: 0.5137848} --- !u!222 &6006573902902831206 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1636,7 +1177,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 86e85918ce6e393468ead12ee2e199f2, type: 3} + m_Sprite: {fileID: 21300000, guid: a23adc2d034ce0740826a4f4648fc33d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1645,7 +1186,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &6285299702278991327 +--- !u!1 &6162683840497741042 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1653,50 +1194,51 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5380481564575134646} - - component: {fileID: 7245140428871035459} - - component: {fileID: 6825655533917357476} + - component: {fileID: 285183680408798567} + - component: {fileID: 4171163189949073120} + - component: {fileID: 7434993547386858690} + - component: {fileID: 2092691790760318943} m_Layer: 5 - m_Name: Image + m_Name: helpBtn m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &5380481564575134646 +--- !u!224 &285183680408798567 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6285299702278991327} + m_GameObject: {fileID: 6162683840497741042} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.5425, y: 0.5425, z: 0.5425} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 7092428357224790221} - m_RootOrder: 0 + m_Father: {fileID: 6006573902604327796} + 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: 10, y: 0} - m_SizeDelta: {x: 150, y: 150} + m_AnchoredPosition: {x: 260.2, y: 120.3} + m_SizeDelta: {x: 68, y: 68} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7245140428871035459 +--- !u!222 &4171163189949073120 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6285299702278991327} + m_GameObject: {fileID: 6162683840497741042} m_CullTransparentMesh: 0 ---- !u!114 &6825655533917357476 +--- !u!114 &7434993547386858690 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6285299702278991327} + m_GameObject: {fileID: 6162683840497741042} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -1710,7 +1252,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 47b0d71d3c8ef79468a5fb4d8ec5f365, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1719,6 +1261,83 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &2092691790760318943 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6162683840497741042} + 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: 7434993547386858690} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!1 &6628568597044577576 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8296427967819817445} + m_Layer: 5 + m_Name: itemPos + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8296427967819817445 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6628568597044577576} + 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: 3026958449964278605} + 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: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6760748432821755191 GameObject: m_ObjectHideFlags: 0 @@ -1749,12 +1368,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6006573902604327796} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -344.00003} - m_SizeDelta: {x: 1080, y: 1232} + m_AnchoredPosition: {x: 0, y: -279} + m_SizeDelta: {x: 1080, y: 1336} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7290960093775152271 CanvasRenderer: @@ -1793,7 +1412,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &7467592022061006248 +--- !u!1 &7068780587487006022 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1801,36 +1420,72 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5798857158589374594} + - component: {fileID: 4095337321497035801} + - component: {fileID: 2583225234602877354} + - component: {fileID: 570133163089678911} m_Layer: 5 - m_Name: buyPart + m_Name: yilingqu m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &5798857158589374594 + m_IsActive: 1 +--- !u!224 &4095337321497035801 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7467592022061006248} + m_GameObject: {fileID: 7068780587487006022} 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: 63398874433271581} - - {fileID: 5603197897341730889} - - {fileID: 8653338172792289727} - m_Father: {fileID: 9193407636057667010} - m_RootOrder: 2 + m_Children: [] + m_Father: {fileID: 3026958449964278605} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_AnchoredPosition: {x: 21.41, y: -29} + m_SizeDelta: {x: 190, y: 116} m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2583225234602877354 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7068780587487006022} + m_CullTransparentMesh: 0 +--- !u!114 &570133163089678911 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7068780587487006022} + 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: 9cb4aa53aa218974fa09913ff23f3fd5, 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 &7575804837319189379 GameObject: m_ObjectHideFlags: 0 @@ -1860,13 +1515,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 6006573902300900883} + m_Father: {fileID: 6006573902604327796} 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: 1188, y: 2112} + m_SizeDelta: {x: 1080, y: 1920} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4695514906608837364 CanvasRenderer: @@ -1905,86 +1560,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &7720696634026550333 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1670251285913227498} - - component: {fileID: 2529971645334222135} - - component: {fileID: 8580184818006843046} - m_Layer: 5 - m_Name: end - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &1670251285913227498 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7720696634026550333} - 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: 63398874433271581} - 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: 498, y: -50} - m_SizeDelta: {x: 262, y: 101.07} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2529971645334222135 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7720696634026550333} - m_CullTransparentMesh: 0 ---- !u!114 &8580184818006843046 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7720696634026550333} - 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: 1, g: 0.8745098, b: 0.7529412, 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: 40 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u53CA\u5BF9\u5E94VIP\u7ECF\u9A8C" - LanguageIndex: 0 --- !u!1 &7729548260525290362 GameObject: m_ObjectHideFlags: 0 @@ -2000,7 +1575,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &3026958449964278605 RectTransform: m_ObjectHideFlags: 0 @@ -2013,15 +1588,18 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8451588087794241115} + - {fileID: 8296427967819817445} + - {fileID: 8502060274675274340} + - {fileID: 4095337321497035801} m_Father: {fileID: 2481339074999143791} 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: 228.2486, y: -96.4303} + m_AnchoredPosition: {x: -1131, y: -186} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &7967169768317904228 +--- !u!1 &8233277016427264071 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2029,210 +1607,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2446104904837739641} - - component: {fileID: 3604864560480822491} - - component: {fileID: 3973559286324444974} + - component: {fileID: 3618973258761224901} + - component: {fileID: 6157732908609321309} + - component: {fileID: 8380737751850133299} m_Layer: 5 - m_Name: head + m_Name: red m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &2446104904837739641 +--- !u!224 &3618973258761224901 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7967169768317904228} + m_GameObject: {fileID: 8233277016427264071} 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: 63398874433271581} - 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: 100, y: -50} - m_SizeDelta: {x: 200, y: 101.07} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3604864560480822491 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7967169768317904228} - m_CullTransparentMesh: 0 ---- !u!114 &3973559286324444974 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7967169768317904228} - 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: 1, g: 0.8745098, b: 0.7529412, 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: 40 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u8D2D\u4E70\u540E\u7ACB\u5F97" - LanguageIndex: 0 ---- !u!1 &8099779444728792993 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5603197897341730889} - - component: {fileID: 5867185494203989815} - - component: {fileID: 2099527413791888245} - m_Layer: 5 - m_Name: leftTime - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5603197897341730889 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8099779444728792993} - 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: 5798857158589374594} + m_Father: {fileID: 8653338172792289727} 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: 0, y: -239.9} - m_SizeDelta: {x: 292.05, y: 85.42} + m_AnchoredPosition: {x: 115, y: 22} + m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5867185494203989815 +--- !u!222 &6157732908609321309 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8099779444728792993} + m_GameObject: {fileID: 8233277016427264071} m_CullTransparentMesh: 0 ---- !u!114 &2099527413791888245 +--- !u!114 &8380737751850133299 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8099779444728792993} - 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.85882354, g: 0.7372549, b: 0.5647059, 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: 26 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u5269\u4F59\u65F6\u95F4\uFF1A3\u592923\u5C0F\u65F6" - LanguageIndex: 0 ---- !u!1 &8599279248818237208 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1823764382510425994} - - component: {fileID: 6433532935763707307} - - component: {fileID: 1204536079106946670} - m_Layer: 5 - m_Name: head - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1823764382510425994 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8599279248818237208} - 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: 4164092782649441729} - 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: -105.1, y: 1.4} - m_SizeDelta: {x: 124, y: 44} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6433532935763707307 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8599279248818237208} - m_CullTransparentMesh: 0 ---- !u!114 &1204536079106946670 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8599279248818237208} + m_GameObject: {fileID: 8233277016427264071} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -2246,81 +1664,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: e6636563674ba2b46adc34e4ede5432d, 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 &8677235135816556633 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4108100249495885538} - - component: {fileID: 5270466448491324567} - - component: {fileID: 302597610788261571} - m_Layer: 5 - m_Name: icon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4108100249495885538 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8677235135816556633} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.52441, y: 0.52441, z: 0.52441} - m_Children: [] - m_Father: {fileID: 4164092782649441729} - 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: -4.3, y: 0} - m_SizeDelta: {x: 150, y: 150} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5270466448491324567 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8677235135816556633} - m_CullTransparentMesh: 0 ---- !u!114 &302597610788261571 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8677235135816556633} - 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: 0} + m_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2407,5 +1751,5 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u9886 \u53D6" + m_Text: "128\u5143" LanguageIndex: 0 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 214a3d4c68..92133d9f5e 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -921,6 +921,10 @@ RedPointType = { wujinTreasure = 8501, wujinBianDui = 8502, chaofanrushengRed = 8503, + + jijin128 = 78, + jijin328 = 79, + chaozhijijin = 80, } RedPointStatus = { @@ -2626,4 +2630,25 @@ NumToChinese = { [18] = "十八", [19] = "十九", [20] = "二十", + [21] = "二十一", + [22] = "二十二", + [23] = "二十三", + [24] = "二十四", + [25] = "二十五", + [26] = "二十六", + [27] = "二十七", + [28] = "二十八", + [29] = "二十九", + [30] = "三十", + [31] = "三十一", +} + +--抽卡配置 +PreConfigure={ + [1] = {type=RecruitType.NormalSingle,privilegeId=38}, + [2] = {type=RecruitType.NormalTen}, + [3] = {type=RecruitType.FriendSingle,privilegeId=0}, + [4] = {type=RecruitType.FriendTen}, + [5] = {type=RecruitType.Single,privilegeId=14}, + [6] = {type=RecruitType.Ten} } \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index 6a72c90e3a..456fe772ba 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -141,9 +141,9 @@ function this.InitActivityServerData(msg, isUpdate) this.CheckMoneyProgress(v) this.mission[v.activityId] = v - -- LogYellow("刷新活动数据activityId:" .. v.activityId .. " value:" .. v.value) + LogYellow("刷新活动数据activityId:" .. v.activityId .. " value:" .. v.value) for n, m in ipairs(v.mission) do - -- LogGreen(" 刷新活动数据missionId:" .. m.missionId .. " state:" .. m.state .. " progress:" .. m.progress) + LogGreen(" 刷新活动数据missionId:" .. m.missionId .. " state:" .. m.state .. " progress:" .. m.progress) if (v.activityId == ActivityTypeDef.OnlineGift) then this.onlineOpen = true this.onlineGetRewardState[m.missionId] = m.state @@ -183,7 +183,6 @@ function this.InitActivityServerData(msg, isUpdate) TreasureOfSomebodyManagerV2.SetTreasureLocalData() this.OnlineStartCountDown() FindFairyManager.SetActivityData() - end --倒计时逻辑处理 @@ -206,8 +205,6 @@ function this.OnlineStartCountDown() this.haveOnlineTime = nowStageTime - this.haveOnlineTime end - - --检测七日礼包红点 function this.CheckSevenDayRed() local sevenDayRed = this.CheckRedFunc(RedPointType.CourtesyDress_SevenDay) @@ -527,7 +524,7 @@ end function this.RefreshActivityProgressData(msg) -- 检测 this.CheckMoneyProgress(msg.activityInfo) - --Log("刷新活动数据activityId:" .. msg.activityInfo.activityId .. "value:" .. msg.activityInfo.value) + LogYellow("刷新活动数据activityId:" .. msg.activityInfo.activityId .. "value:" .. msg.activityInfo.value) if this.mission[msg.activityInfo.activityId] then this.mission[msg.activityInfo.activityId].value = msg.activityInfo.value @@ -536,7 +533,7 @@ function this.RefreshActivityProgressData(msg) if missionInfo.missionId == msg.activityInfo.mission[i].missionId then missionInfo.state = msg.activityInfo.mission[i].state missionInfo.progress = msg.activityInfo.mission[i].progress - --Log(msg.activityInfo.activityId.." 刷新活动数据missionId:" .. missionInfo.missionId .. "state:" .. missionInfo.state .. "progress:" .. missionInfo.progress) + LogYellow(msg.activityInfo.activityId.." 刷新活动数据missionId:" .. missionInfo.missionId .. "state:" .. missionInfo.state .. "progress:" .. missionInfo.progress) end end end @@ -1359,4 +1356,23 @@ function this.JourneyWithWindCurDayNoOpen() return false end +function this.CheckRedpointUpperMonthCard(red) + local actType + if red == RedPointType.jijin128 then + actType = 78 + elseif red == RedPointType.jijin328 then + actType = 79 + end + local actInfo = ActivityGiftManager.GetActivityInfoByType(actType) + if not actInfo then + return false + end + for i = 1,#actInfo.mission do + if actInfo.mission[i].state == 0 and actInfo.mission[i].progress == 1 then + return true + end + end + return false +end + return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua index 2d844f3ce9..244bde8b47 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua @@ -101,6 +101,7 @@ function this.BackDataRefreshEnerny(msgItemInfo) end end Game.GlobalEvent:DispatchEvent(GameEvent.Bag.BagGold) + RedpotManager.CheckRedPointStatus(RedPointType.LuckyTurn) CheckRedPointStatus(RedPointType.Recruit_Normal) end end @@ -765,6 +766,7 @@ function this.GetTableByBackDropData(drop) end end Game.GlobalEvent:DispatchEvent(GameEvent.Bag.BagGold) + RedpotManager.CheckRedPointStatus(RedPointType.LuckyTurn) return itemDataList end @@ -1094,6 +1096,7 @@ function this.BagIndicationRefresh(msg) end Game.GlobalEvent:DispatchEvent(GameEvent.Bag.OnTempBagChanged) end + RedpotManager.CheckRedPointStatus(RedPointType.LuckyTurn) Game.GlobalEvent:DispatchEvent(GameEvent.Bag.BagGold) --检测背包红点 CheckRedPointStatus(RedPointType.Bag_HeroDebris) diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralRankRewardPanel.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralRankRewardPanel.lua index 580b70adfe..550af0291d 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralRankRewardPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralRankRewardPanel.lua @@ -96,7 +96,7 @@ function this.OnTabChange(index) this.text.text = Language[10103]..rank end) if type == RANK_TYPE.GOLD_EXPER then - this.text2.text = string.format("前10名奖励需个人贡献值需达到%s分才能获取", 2500) + this.text2.text = string.format("前10名奖励需个人贡献值达到%s分才能获取", 2500) this.text2.color = UIColor.RED end elseif curRankType == 3 then diff --git a/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTableManager.lua b/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTableManager.lua index e60a1cfda0..d5f96f3052 100644 --- a/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTableManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTableManager.lua @@ -73,6 +73,8 @@ function this.Initialize() table.insert(this.boxReward_Two,v) end end + + LuckyTurnTableManager.InitTableData() end ---------------------------------------------------- @@ -333,14 +335,18 @@ end ---获取探宝1/多次按钮信息 1探宝类型 function this.GetTreasureBtnInfo(spLoader, treasureType) + local isShow = false if treasureType==TreasureType.Lucky then - local oneData={1,this.dialRewardSettingConfig[1].CostItem[2][4]}--1探宝次数 2消耗道具数量 - local moreData={this.dialRewardSettingConfig[1].ExtractingTime,this.dialRewardSettingConfig[1].MultipleCostItem[2][4]} + local oneData={1,this.dialRewardSettingConfig[1].CostItem[2][4],isShow}--1探宝次数 2消耗道具数量 + if BagManager.GetItemCountById(60) >= this.dialRewardSettingConfig[1].MultipleCostItem[2][4] then + isShow = true + end + local moreData={this.dialRewardSettingConfig[1].ExtractingTime,this.dialRewardSettingConfig[1].MultipleCostItem[2][4],isShow} local icon = SetIcon(spLoader, 60) return oneData,moreData,icon elseif treasureType==TreasureType.Advanced then - local oneData={1,this.dialRewardSettingConfig[2].CostItem[2][4]} - local moreData={this.dialRewardSettingConfig[2].ExtractingTime,this.dialRewardSettingConfig[2].MultipleCostItem[2][4]} + local oneData={1,this.dialRewardSettingConfig[2].CostItem[2][4],isShow} + local moreData={this.dialRewardSettingConfig[2].ExtractingTime,this.dialRewardSettingConfig[2].MultipleCostItem[2][4],isShow} local icon = SetIcon(spLoader, 61) return oneData,moreData,icon end @@ -393,7 +399,13 @@ end -------红点相关-------------- function this.ReturnRedPointState() if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.LuckyTurnTable_One) then - return this.ReturnRewardBoxRedPoint() + if BagManager.GetItemCountById(60) >= this.dialRewardSettingConfig[1].MultipleCostItem[2][4] then + return true + end + if this.ReturnRewardBoxRedPoint() then + return true + end + return false else --Log("红点返回False") return false diff --git a/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua b/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua index e3539d3f67..a754acb153 100644 --- a/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua @@ -24,7 +24,6 @@ local isPlayVideo = false ---初始化组件(用于子类重写) function LuckyTurnTablePanel:InitComponent(gameObject) this.spLoader = SpriteLoader.New() - LuckyTurnTableManager.InitTableData() LuckyTurnTableManager.GetLuckyTurnRequest() this.luckyTurnPanel=Util.GetGameObject(self.gameObject,"Panel") @@ -82,6 +81,7 @@ function LuckyTurnTablePanel:InitComponent(gameObject) this.treasureMultipleText=Util.GetGameObject(this.treasureMultipleBtn,"Text"):GetComponent("Text") this.treasureMultipleIcon=Util.GetGameObject(this.treasureMultipleBtn,"Icon"):GetComponent("Image") this.treasureMultipleNum=Util.GetGameObject(this.treasureMultipleBtn,"Num"):GetComponent("Text") + this.treasureMultipleRed=Util.GetGameObject(this.treasureMultipleBtn,"red") this.refreshBtn=Util.GetGameObject(this.bottom,"RefreshBtn") this.freeDetail=Util.GetGameObject(this.refreshBtn,"FreeDetail") this.detail=Util.GetGameObject(this.refreshBtn,"Detail") @@ -274,14 +274,14 @@ function this.SwitchTreasureType(treasureType) --设置需要材料显示 this.SetPropShow(60,treasureType) --探宝按钮显示 - local oneData,moreData,icon=LuckyTurnTableManager.GetTreasureBtnInfo(this.spLoader, treasureType) - this.SetTreasureBtnShow(oneData,moreData,icon) + this.SetTreasureBtnShow(treasureType) --探宝泉预览 Util.AddOnceClick(this.propBtn,function() UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,60) end) --探宝1次按钮 Util.AddOnceClick(this.treasureOnceBtn, function() + local oneData,moreData,icon=LuckyTurnTableManager.GetTreasureBtnInfo(this.spLoader, treasureType) if LuckyTurnTableManager.GetTreasureTicketNum(treasureType)-oneData[2]>=0 and LuckyTurnTableManager.luckyTimes + 1 <= maxTimesCount then LuckyTurnTableManager.GetLuckyTurnRankRequest(TreasureType.Lucky,false,function() @@ -292,6 +292,7 @@ function this.SwitchTreasureType(treasureType) LuckyTurnTableManager.SetTimes(LuckyTurnTableManager.luckyTimes + 1) this.maxTimes.text =string.format(Language[11156],LuckyTurnTableManager.luckyTimes,maxTimesCount) isPlayVideo = true + this.SetTreasureBtnShow(treasureType) end) else --PopupTipPanel.ShowTip("幸运探宝券不足!") @@ -305,6 +306,7 @@ function this.SwitchTreasureType(treasureType) end) --探宝10次按钮 Util.AddOnceClick(this.treasureMultipleBtn, function() + local oneData,moreData,icon=LuckyTurnTableManager.GetTreasureBtnInfo(this.spLoader, treasureType) if LuckyTurnTableManager.GetTreasureTicketNum(treasureType)-moreData[2]>=0 and LuckyTurnTableManager.luckyTimes + 15 <= maxTimesCount then LuckyTurnTableManager.GetLuckyTurnRankRequest(TreasureType.Lucky,true,function() @@ -315,6 +317,7 @@ function this.SwitchTreasureType(treasureType) LuckyTurnTableManager.SetTimes(LuckyTurnTableManager.luckyTimes + 15) this.maxTimes.text =string.format(Language[11156],LuckyTurnTableManager.luckyTimes,maxTimesCount) isPlayVideo = true + this.SetTreasureBtnShow(treasureType) end) else --PopupTipPanel.ShowTip("幸运探宝券不足!") @@ -388,8 +391,7 @@ function this.SwitchTreasureType(treasureType) this.SetPropShow(61,treasureType) --探宝按钮显示 - local oneData,moreData,icon=LuckyTurnTableManager.GetTreasureBtnInfo(this.spLoader, treasureType) - this.SetTreasureBtnShow(oneData,moreData,icon) + this.SetTreasureBtnShow(treasureType) --探宝泉预览 Util.AddOnceClick(this.propBtn,function() UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,61) @@ -448,7 +450,6 @@ function this.SwitchTreasureType(treasureType) end) --刷新按钮 Util.AddOnceClick(this.refreshBtn, function() - LogBlue("高级刷新券 "..BagManager.GetItemCountById(63)) if BagManager.GetItemCountById(63)>0 then this.PlayItemListAnim() LuckyTurnTableManager.GetLuckyTurnRefreshRequest(TreasureType.Advanced,true,function() @@ -458,9 +459,6 @@ function this.SwitchTreasureType(treasureType) this.RefreshBtnCountDown() end) else - LogBlue("高级刷新券 "..LuckyTurnTableManager.GetRefreshItemNum()) - LogBlue("高级刷新券 "..LuckyTurnTableManager.dialRewardSettingConfig[2].Cost[2][4]) - LogBlue("高级刷新券 ".. LuckyTurnTableManager.GetRefreshItemNum()-LuckyTurnTableManager.dialRewardSettingConfig[2].Cost[2][4]) if LuckyTurnTableManager.GetRefreshItemNum()-LuckyTurnTableManager.dialRewardSettingConfig[2].Cost[2][4]>=0 then this.PlayItemListAnim() LuckyTurnTableManager.GetLuckyTurnRefreshRequest(TreasureType.Advanced,false,function() @@ -629,13 +627,15 @@ function this.SetPropShow(itemId,treasureType) end ---探宝按钮显示 -function this.SetTreasureBtnShow(oneData,moreData,icon) +function this.SetTreasureBtnShow(treasureType) + local oneData,moreData,icon=LuckyTurnTableManager.GetTreasureBtnInfo(this.spLoader, treasureType) this.treasureOnceText.text=Language[11163]..oneData[1]..Language[10048] this.treasureOnceNum.text=oneData[2] this.treasureOnceIcon.sprite=icon this.treasureMultipleText.text=Language[11163]..moreData[1]..Language[10048] this.treasureMultipleNum.text=moreData[2] this.treasureMultipleIcon.sprite=icon + this.treasureMultipleRed.gameObject:SetActive(moreData[3]) end --------------------------------免费刷新-------------------------------- diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 756b52069c..440c628811 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -668,7 +668,7 @@ function this:AddListener() Game.GlobalEvent:AddEvent(GameEvent.EightDay.GetRewardSuccess, this.RefreshEightGiftPreview) Game.GlobalEvent:AddEvent(GameEvent.FiveAMRefresh.ServerNotifyRefresh, this.RefreshEightGiftPreview) Game.GlobalEvent:AddEvent(GameEvent.EightDay.FifteenDayGift, this.RefreshEightGiftPreview) - Game.GlobalEvent:AddEvent(GameEvent.FindFairy.RefreshBuyOpenState, this.RefreshGiftBtnShow) + Game.GlobalEvent:AddEvent(GameEvent.Activity.OnActivityProgressStateChange, this.RefreshGiftBtnShow) Game.GlobalEvent:AddEvent(GameEvent.Player.OnShowBattleUpLvTip, this.RefreshBattleUpLvTip) Game.GlobalEvent:AddEvent(GameEvent.Player.OnPlayerGetSuperManReward, this.GetSuperManReward) Game.GlobalEvent:AddEvent(GameEvent.PatFace.RefreshRightUp, this.SetRightBarSize)--刷新右上伸缩条 @@ -685,7 +685,7 @@ function this:RemoveListener() Game.GlobalEvent:RemoveEvent(GameEvent.EightDay.GetRewardSuccess, this.RefreshEightGiftPreview) Game.GlobalEvent:RemoveEvent(GameEvent.FiveAMRefresh.ServerNotifyRefresh, this.RefreshEightGiftPreview) Game.GlobalEvent:RemoveEvent(GameEvent.EightDay.FifteenDayGift, this.RefreshEightGiftPreview) - Game.GlobalEvent:RemoveEvent(GameEvent.FindFairy.RefreshBuyOpenState, this.RefreshGiftBtnShow) + Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityProgressStateChange, this.RefreshGiftBtnShow) Game.GlobalEvent:RemoveEvent(GameEvent.Player.OnShowBattleUpLvTip, this.RefreshBattleUpLvTip) Game.GlobalEvent:RemoveEvent(GameEvent.Player.OnPlayerGetSuperManReward, this.GetSuperManReward) Game.GlobalEvent:RemoveEvent(GameEvent.PatFace.RefreshRightUp, this.SetRightBarSize)--刷新右上伸缩条 @@ -933,6 +933,8 @@ function this:TabBtnAction(id,actType,data) UIManager.OpenPanel(UIName.ActivityMainPanel,id) elseif id == ActivityTypeDef.TeHuiShenZhuang then UIManager.OpenPanel(UIName.TeHuiShenZhuangPanel) + elseif id == 78 then + UIManager.OpenPanel(UIName.ActivityMainPanel,id ) end elseif actType == 2 then if id == FUNCTION_OPEN_TYPE.SERVER_START_GIFT then @@ -954,8 +956,6 @@ function this:TabBtnAction(id,actType,data) -- UIManager.OpenPanel(UIName.ArenaTopMatchPanel) elseif id == 93 then UIManager.OpenPanel(UIName.UpGradePackagePanel) - elseif id == 94 then - UIManager.OpenPanel(UIName.ActivityMainPanel,668) elseif id == 95 then UIManager.OpenPanel(UIName.TimeLimitSkinPanel) end @@ -1186,39 +1186,6 @@ function this.TimeFormat() else showTab = false end - elseif v.ActId == 668 then - -- 加入对月卡的判断 - -- local isMonthCardActive = OperatingManager.IsMonthCardActive() - local isOpen_128 = OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_128) - local isOpen_328 = OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328) - showTab = (isOpen_128 or isOpen_328)--isMonthCardActive and - -- if isMonthCardActive then - local cardType = nil - if isOpen_328 then - cardType = GoodsTypeDef.MONTHCARD_328 - end - if not cardType and isOpen_128 then - cardType = GoodsTypeDef.MONTHCARD_128 - end - if cardType then - local data = OperatingManager.GetGiftGoodsInfo(cardType) - if data then - local time = data.endTime - PlayerManager.serverTime - if time < 1 then - showTab = false - else - showTab = true - if OperatingManager.GetGoodsBuyTime(GoodsTypeDef.MONTHCARD_128) > 0 and OperatingManager.GetGoodsBuyTime(GoodsTypeDef.MONTHCARD_328) > 0 then - activityTabs[k].timeImg.gameObject:SetActive(false) - elseif time >= 86400 then - activityTabs[k].timeText.text = TimeToDH(time) - else - activityTabs[k].timeText.text = TimeToHMS(time) - end - end - end - end - -- end elseif v.ActId == 667 then local limitSkinGift = OperatingManager.GetTimeLimitSkinInfoList() if not limitSkinGift then @@ -1408,16 +1375,21 @@ end function this.RefreshGiftBtnShow() for k,v in pairs(activitys) do local ishow = DynamicActivityManager.IsQualifiled(v.Id) - if v.ActId == 668 and ishow then - -- 加入对月卡的判断 - -- local isMonthCardActive = OperatingManager.IsMonthCardActive() + if v.ActiveType == 78 and ishow then local showTab = activityTabs[k].go.gameObject.activeSelf - local isOpen_128 = OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_128) - local isOpen_328 = OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328) - showTab = (isOpen_128 or isOpen_328)--isMonthCardActive and + local actInfo = ActivityGiftManager.GetActivityInfoByType(v.ActiveType) + if actInfo and actInfo.value > 0 then + showTab = true + elseif OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_128) or OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328) then + showTab = true + else + showTab = false + end this.RefreshLayer(showTab,k,v) + break end end + end --后台推送 function this.RefreshActivityBtn(context) @@ -1440,6 +1412,15 @@ function this.RefreshActivityBtn(context) activityTabs[k].img.sprite = this.spLoader:LoadSprite(tempConfig.Icon[1]) end showTab = context.status == 1 + elseif v.ActiveType == 78 then + local actInfo = ActivityGiftManager.GetActivityInfoByType(v.ActiveType) + if actInfo and actInfo.value > 0 then + showTab = true + elseif OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_128) or OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328) then + showTab = true + else + showTab = false + end else showTab = context.status == 1 end @@ -1493,33 +1474,6 @@ function this.RefreshActivityShow() else showTab = false end - elseif v.ActId == 668 then - --超值基金 - -- 加入对月卡的判断 - -- local isMonthCardActive = OperatingManager.IsMonthCardActive() - local isOpen_128 = OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_128) - local isOpen_328 = OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328) - showTab = (isOpen_128 or isOpen_328)--isMonthCardActive and - -- if isMonthCardActive then - local cardType = nil - if isOpen_328 then - cardType = GoodsTypeDef.MONTHCARD_328 - end - if not cardType and isOpen_128 then - cardType = GoodsTypeDef.MONTHCARD_328 - end - if cardType then - local data = OperatingManager.GetGiftGoodsInfo(cardType) - if data then - local time = data.endTime - PlayerManager.serverTime - if time < 1 then - showTab = false - else - showTab = true - end - end - end - -- end end elseif v.ActiveType > 0 then local activityId = ActivityGiftManager.IsActivityTypeOpen(v.ActiveType) @@ -1537,6 +1491,8 @@ function this.RefreshActivityShow() end elseif v.FunType and v.FunType == 41 then showTab = DailyRechargeManager.GetDailyRechargeExist() + elseif v.ActiveType == 78 then + showTab = ActivityGiftManager.GetActivityValueInfo(v.ActiveType, activityId) > 0 or OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_128) or OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328) else showTab = true end diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index f40a04f579..1ba5956021 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -287,6 +287,9 @@ function this.GetActiveGoodsIDByType(goodsType) end end end + + + function this.GetGoodsEndTime(goodsType) local goodsId, endTime = this.GetActiveGoodsIDByType(goodsType) return endTime diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua b/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua index 0d605ff232..e5ff5e01e1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua @@ -2,29 +2,37 @@ local UpperMonthCard = {} local sortingOrder = 0 local chargeConfig = ConfigManager.GetConfig(ConfigName.RechargeCommodityConfig) +local globalActivity = ConfigManager.GetConfig(ConfigName.GlobalActivity) --- 本地枚举 local ImgType = { - [10002] = { + [78] = { bg = "y_yjj_128beijdi", mask = "y_yjj_128dikuang001", rewardBg = "y_yjj_128kuang", - moneyTag = "y_yjj_128", downBg = "y_yjj_128kuang001", - rewardPreview = "y_yjj_128kuang002_zh", - valueMask = "y_yjj_128jjz002", - chargerBaseType = GoodsTypeDef.MONTHCARD_128, + rewardPreview = "y_yjj_128kuang004", + rewardPreviewText = "y_yjj_128kuang005", + reward = "y_yjj_1280", + iconId = 16, }, - [10003] = { - bg = "y_yjj_328beijdi", - mask = "y_yjj_328dikuang001", - rewardBg = "y_yjj_328kuang", - moneyTag = "y_yjj_328", - downBg = "y_yjj_328kuang001", - rewardPreview = "y_yjj_328kuang002_zh", - valueMask = "y_yjj_328jjz002", - chargerBaseType = GoodsTypeDef.MONTHCARD_328, + [79] = { + bg = "s_sanshibei_beijingren", + mask = "s_sanshibei_bg", + rewardBg = "s_sanshibei_kuang_02", + downBg = "s_sanshibei_kuang_01", + rewardPreview = "s_sanshibei_xiaobiaodi", + rewardPreviewText = "s_sanshibei_biaotizi", + reward = "y_yjj_3280", + iconId = 16, }, } + +local state = { + [0] = {bg = "r_hero_button_001",text = "",red = false}, + [1] = {bg = "s_slbz_1anniuongse",text = "领取",red = true}, + [2] = {bg = "s_slbz_1anniuhuise",text = "已领取",red = false}, +} + function UpperMonthCard:New(gameObject) local b = {} b.gameObject = gameObject @@ -36,72 +44,67 @@ end --初始化组件(用于子类重写) function UpperMonthCard:InitComponent() self.spLoader = SpriteLoader.New() - self.Bg = Util.GetGameObject(self.gameObject, "bg"):GetComponent("Image") + self.Bg = Util.GetGameObject(self.gameObject, "Bg/bg"):GetComponent("Image") self.mask = Util.GetGameObject(self.gameObject, "Bg/mask"):GetComponent("Image") - + + self.chargeIconType = Util.GetGameObject(self.gameObject, "Bg/payBack/icon"):GetComponent("Image") self.chargeType = Util.GetGameObject(self.gameObject, "Bg/payBack/type"):GetComponent("Image") - self.btnPreview = Util.GetGameObject(self.gameObject, "Bg/previewRoot/btnPreview") - self.valueIcon = Util.GetGameObject(self.gameObject, "Bg/previewRoot/Image/icon"):GetComponent("Image") - self.totalValue = Util.GetGameObject(self.gameObject, "Bg/previewRoot/Image/value"):GetComponent("Text") - self.valueMask = Util.GetGameObject(self.gameObject, "Bg/previewRoot/Image"):GetComponent("Image") - + --- 不同的充值行为显示部分 - self.middlePart = Util.GetGameObject(self.gameObject, "Bg/partDown/Bg") - self.titleImg = Util.GetGameObject(self.middlePart, "title"):GetComponent("Image") - self.infoBg = Util.GetGameObject(self.middlePart, "middle"):GetComponent("Image") - self.grid = Util.GetGameObject( self.middlePart, "middle/grid") - self.itemPre = Util.GetGameObject(self.middlePart, "middle/itemPre") - + self.middlePart = Util.GetGameObject(self.gameObject, "Bg/partDown/Bg"):GetComponent("Image") + self.titleDi = Util.GetGameObject(self.middlePart.transform, "titleDi"):GetComponent("Image") + self.titleImg = Util.GetGameObject(self.titleDi.transform, "title"):GetComponent("Image") + self.infoBg = Util.GetGameObject(self.middlePart.transform, "middle"):GetComponent("Image") + self.grid = Util.GetGameObject( self.middlePart.transform, "middle/scroller/grid") + self.gridRect = self.grid:GetComponent("RectTransform") + self.itemPre = Util.GetGameObject(self.middlePart.transform, "middle/itemPre") + self.itemHeight = self.itemPre.transform.rect.height - --- 未购买 - self.buyPanel = Util.GetGameObject(self.middlePart, "buyPart") - self.tipIcon = Util.GetGameObject(self.buyPanel, "tip/icon/Image"):GetComponent("Image") -- 那啥图标 - self.charmyNum = Util.GetGameObject(self.buyPanel, "tip/value"):GetComponent("Text") -- 返利 - self.actLeftTime = Util.GetGameObject(self.buyPanel, "leftTime"):GetComponent("Text") -- 活动剩余天数 - self.btnBuy = Util.GetGameObject(self.buyPanel, "btnBuy") + self.btnBuy = Util.GetGameObject(self.middlePart.transform, "btnBuy") + self.btnBuyImage = self.btnBuy:GetComponent("Image") self.textBuy = Util.GetGameObject(self.btnBuy, "Text"):GetComponent("Text") + self.btnBuyRed = Util.GetGameObject(self.btnBuy, "red") + self.btnHelp = Util.GetGameObject(self.gameObject, "Bg/helpBtn") + self.helpPosition = self.btnHelp:GetComponent("RectTransform").localPosition - - -- 已经购买,你先可以享受这你觉得还可以的服务了 - self.boughtPanel = Util.GetGameObject(self.middlePart, "rewardPart") - self.totalLoginday = Util.GetGameObject(self.boughtPanel, "totalDay"):GetComponent("Text") - self.boughtLeftTime = Util.GetGameObject(self.boughtPanel, "time"):GetComponent("Text") - + self.tip = Util.GetGameObject(self.gameObject, "Bg/tip") ---- 奖励列表 - self.rewardList = {} + self.itemLst = {} +end + +--添加事件监听(用于子类重写) +function UpperMonthCard:AddListener() + Game.GlobalEvent:AddEvent(GameEvent.Activity.OnActivityProgressStateChange,self.RefreshPanel,self) +end + +--移除事件监听(用于子类重写) +function UpperMonthCard:RemoveListener() + Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityProgressStateChange,self.RefreshPanel,self) end --绑定事件(用于子类重写) function UpperMonthCard:BindEvent() - Util.AddOnceClick(self.btnPreview, function() - UIManager.OpenPanel(UIName.MonthRewardPreviewPopup, self.baseType, self.chargerBaseType) + Util.AddClick(self.btnHelp,function() + UIManager.OpenPanel(UIName.HelpPopup,self.actConfig.HelpId,self.helpPosition.x,self.helpPosition.y) end) - - Util.AddOnceClick(self.btnBuy, function() - -- local isActive = VipManager.GetMonthCardOpenState() - -- if not isActive then - -- MsgPanel.ShowTwo(Language[11387], function() - -- end, function(isShow) - -- JumpManager.GoJump(36004) - -- end, Language[10731], Language[10019],nil, false) - -- else + Util.AddOnceClick(self.btnBuy, function() + if self.actInfo.value < 2 then PayManager.Pay(self.baseType, function(id) self:RechargeSuccessFunc(id) end) - -- end + elseif self.isGet then + NetManager.GetActivityRewardRequest(0,self.actInfo.activityId,function(msg) + UIManager.OpenPanel(UIName.RewardItemPopup, msg, 1) + end) + end + if self.actType == 78 then + CheckRedPointStatus(RedPointType.jijin128) + else + CheckRedPointStatus(RedPointType.jijin328) + end end) end --- --添加事件监听(用于子类重写) --- function UpperMonthCard:AddListener() - --- end - --- --移除事件监听(用于子类重写) --- function UpperMonthCard:RemoveListener() - --- end - --界面打开时调用(用于子类重写) function UpperMonthCard:OnOpen(_activityConfig,_index,parent) self.actConfig = _activityConfig @@ -109,184 +112,152 @@ function UpperMonthCard:OnOpen(_activityConfig,_index,parent) self.parent = parent end -function UpperMonthCard:OnSortingOrderChange() +function UpperMonthCard:OnSortingOrderChange(_sortingOrder) + self.sortingOrder = _sortingOrder + for k,v in pairs(self.itemLst) do + v.itemView:SetEffectLayer(self.sortingOrder) + end end -- 打开,重新打开时回调 function UpperMonthCard:OnShow(_sortingOrder) self.gameObject:SetActive(true) - sortingOrder = _sortingOrder - self.actType = self.actConfig.ActId - --- 鸡精类型 - self.chargerBaseType = ImgType[self.actType].chargerBaseType - - --- 鸡精的商品ID - -- 判断我是否购买过该商品 - local goodsId = OperatingManager.GetActiveGoodsIDByType(self.chargerBaseType) - if not goodsId then - -- 没有购买过判断是否在活动期间 - local gift = OperatingManager.GetGiftGoodsInfo(self.chargerBaseType) - if not gift then - return - end - goodsId = gift.goodsId + self.sortingOrder = _sortingOrder + self.actType = self.actConfig.ActiveType + self.actInfo = ActivityGiftManager.GetActivityInfoByType(self.actType) + if not self.actInfo then + self.parent:ClosePanel() + return end - - self.baseType = goodsId - self.gameObject:SetActive(true) - OperatingManager.SetSerData(self.chargerBaseType) - self:SetPanelType(self.actType) - self:SetRewardInfo(self.actType) + self.baseType = globalActivity[self.actInfo.activityId].CanBuyRechargeId[1] + self:SetPanelType() + self:RefreshPanel() +end + +function UpperMonthCard:RefreshPanel() + self:SetRewardInfo() self:SetBuyState() end --- 设置不同的显示界面 -function UpperMonthCard:SetPanelType(type) - self.chargeType.sprite = self.spLoader:LoadSprite(ImgType[type].moneyTag) - self.valueIcon.sprite = SetIcon(self.spLoader, 16) - self.valueMask = self.spLoader:LoadSprite(ImgType[type].valueMask) - self.Bg.sprite = self.spLoader:LoadSprite(ImgType[type].bg) - self.mask.sprite = self.spLoader:LoadSprite(ImgType[type].mask) - self.titleImg.sprite = self.spLoader:LoadSprite(ImgType[type].rewardPreview) - self.middlePart:GetComponent("Image").sprite = self.spLoader:LoadSprite(ImgType[type].rewardBg) - self.infoBg.sprite = self.spLoader:LoadSprite(ImgType[type].downBg) - self.valueIcon.sprite = SetIcon(self.spLoader, chargeConfig[self.baseType].BaseReward[1][1]) - self.tipIcon.sprite = SetIcon(self.spLoader, chargeConfig[self.baseType].RewardShow[1][1]) - self.totalValue.text = chargeConfig[self.baseType].RewardShow[1][2] - self.charmyNum.text = " " .. chargeConfig[self.baseType].BaseReward[1][2] +function UpperMonthCard:SetPanelType() + self.Bg.sprite = self.spLoader:LoadSprite(ImgType[self.actType].bg) + self.mask.sprite = self.spLoader:LoadSprite(ImgType[self.actType].mask) + + self.chargeIconType.sprite = self.spLoader:LoadSprite(GetSpriteNameByItemId(ImgType[self.actType].iconId)) + self.chargeType.sprite = self.spLoader:LoadSprite(ImgType[self.actType].reward) + + self.middlePart.sprite = self.spLoader:LoadSprite(ImgType[self.actType].rewardBg) + self.titleDi.sprite = self.spLoader:LoadSprite(ImgType[self.actType].rewardPreview) + self.titleImg.sprite = self.spLoader:LoadSprite(ImgType[self.actType].rewardPreviewText) + self.infoBg.sprite = self.spLoader:LoadSprite(ImgType[self.actType].downBg) + + self.btnHelp.gameObject:SetActive(self.actConfig.HelpId and self.actConfig.HelpId > 0) end --- 设置不同界面的奖励信息 -function UpperMonthCard:SetRewardInfo(type) - local data = OperatingManager.GetPanelShowReward(self.baseType, false,true) - for i = 1, #data do - if not self.rewardList[i] then - self.rewardList[i] = {} - self.rewardList[i].go = newObjToParent(self.itemPre, self.grid) - self.rewardList[i].item = SubUIManager.Open(SubUIConfig.ItemView, self.rewardList[i].go.transform) - end - - local rewardData = data[i] - self.rewardList[i].item:OnOpen(false, {rewardData[1],rewardData[2]}, 1.12,true) +function UpperMonthCard:SetRewardInfo() + local mission = self.actInfo.mission + table.sort(mission,function(a,b) + return a.missionId < b.missionId + end) + if not self.itemLst then + self.itemLst = {} end + for i = 1,math.max(#mission,LengthOfTable(self.itemLst)) do + if not mission[i] then + self.itemLst[i].go.gameObject:SetActive(false) + else + if not self.itemLst[i] then + self.itemLst[i] = {} + self.itemLst[i].go = newObjToParent(self.itemPre,self.grid) + self.itemLst[i].name = Util.GetGameObject(self.itemLst[i].go, "name"):GetComponent("Text") + self.itemLst[i].itemPos = Util.GetGameObject(self.itemLst[i].go, "itemPos") + self.itemLst[i].itemView = SubUIManager.Open(SubUIConfig.ItemView,self.itemLst[i].itemPos.transform) + self.itemLst[i].yiGet = Util.GetGameObject(self.itemLst[i].go, "yilingqu") + self.itemLst[i].redPoint = Util.GetGameObject(self.itemLst[i].go, "redPoint") + end + self.itemLst[i].go.gameObject:SetActive(true) + self.itemLst[i].name.text = string.format("第%s天",NumToChinese[i]) + local reward = ConfigManager.GetConfigDataByDoubleKey(ConfigName.LuxuryFundConfig,"Type",self.baseType,"Day",i).reward[1] + self.itemLst[i].itemView:OnOpen(false, reward, 1.1, false, false, false, self.sortingOrder) + --1 已领取 0 未领 + if mission[i].state == 1 then + self.itemLst[i].yiGet.gameObject:SetActive(true) + self.itemLst[i].redPoint.gameObject:SetActive(false) + else + self.itemLst[i].yiGet.gameObject:SetActive(false) + if mission[i].progress == 1 then + self.itemLst[i].redPoint.gameObject:SetActive(true) + else + self.itemLst[i].redPoint.gameObject:SetActive(false) + end + end + end + end + local v = self.gridRect.sizeDelta + v.y = (math.ceil(#self.itemLst/5) * self.itemHeight) + ((math.ceil(#self.itemLst/5)) * 94) + self.gridRect.sizeDelta = v end --- 根据是否购买了显示信息 function UpperMonthCard:SetBuyState() - -- local isActive = VipManager.GetMonthCardOpenState() - -- local isBought = OperatingManager.IsBaseBuy(self.chargerBaseType) - local canBuyNum = OperatingManager.GetLeftBuyTime(self.chargerBaseType, self.baseType) - local isBought = canBuyNum and canBuyNum <= 0 - self.boughtPanel:SetActive(isBought) - self.buyPanel:SetActive(not isBought) - -- Util.SetGray(self.btnBuy, not isActive) - --isActive and - self.textBuy.text = (string.format(MoneyUtil.GetMoneyUnitName(),MoneyUtil.GetMoney(chargeConfig[self.baseType].Price))) or (string.format(MoneyUtil.GetMoneyUnitName(),MoneyUtil.GetMoney(chargeConfig[self.baseType].Price)))-- .. MoneyUtil.GetMoneyUnitName()) - - self.actLeftTime.gameObject:SetActive(false) - if not isBought then - -- self:SetBuyPanelInfo() + if self.actInfo.value < 2 then + self.btnBuy.gameObject:SetActive(true) + self.btnBuyImage.sprite = self.spLoader:LoadSprite(state[0].bg) + self.textBuy.text = MoneyUtil.GetMoneyUnitNameWithMoney(chargeConfig[self.baseType].Price) + self.btnBuyRed.gameObject:SetActive(false) + self.tip.gameObject:SetActive(false) else - self:SetBoughtPanelInfo() - end -end - -function UpperMonthCard:SetBuyPanelInfo() - --- 未激活,在活动时间内 - local isOpen = OperatingManager.IsBaseOpen(self.chargerBaseType, self.baseType) - self.buyTimer = nil - if isOpen then - --- 获取剩余时间,结束时间为0表示不限时 - local data = OperatingManager.GetGiftGoodsInfo(self.chargerBaseType, self.baseType) - local endTime = data.endTime - if endTime <= 0 then - self.actLeftTime.gameObject:SetActive(false) - else - self.actLeftTime.gameObject:SetActive(true) - - - self.buyTimer = Timer.New(function () - if endTime - GetTimeStamp() <= 0 then - Log("时间到,活动关闭") - self.buyTimer:Stop() - self:ClosePanel() - end - end, 1, -1, true) - self.buyTimer:Start() - self.actLeftTime.text = Language[10573] .. self:TimeFormat(endTime - PlayerManager.serverTime) + self.isGet = false + self.isAllGet = true + for i = 1,#self.actInfo.mission do + if self.actInfo.mission[i].state == 0 and self.actInfo.mission[i].progress == 1 then + self.isGet = true + end + if self.actInfo.mission[i].state == 0 then + self.isAllGet = false + end end - else - self.actLeftTime.gameObject:SetActive(false) - end - -end - -function UpperMonthCard:SetBoughtPanelInfo() - local endTime = OperatingManager.GetGoodsEndTime(self.chargerBaseType) - self.totalLoginday.text = Language[11388] .. OperatingManager.GetRewardDay(self.chargerBaseType) .. Language[10017] - local startStr, endStr = OperatingManager.GetShowTime(endTime) - self.boughtLeftTime.text = Language[11389] ..startStr .. " — ".. endStr - - --- 购买后倒计时显示 - self.timer = nil - self.timer = Timer.New(function() - if GetTimeStamp() > endTime then - --- 注销鸡精 - OperatingManager.RemoveEndTime(self.baseType) - self:SetBuyState() - self.timer:Stop() + if self.isGet then + self.btnBuy.gameObject:SetActive(true) + self.btnBuyImage.sprite = self.spLoader:LoadSprite(state[1].bg) + self.textBuy.text = state[1].text + self.btnBuyRed.gameObject:SetActive(true) + self.tip.gameObject:SetActive(false) else - OperatingManager.SetSerData(self.chargerBaseType) - self.totalLoginday.text = Language[11388] .. OperatingManager.GetRewardDay(self.chargerBaseType) .. Language[10017] + self.btnBuy.gameObject:SetActive(true) + self.btnBuyImage.sprite = self.spLoader:LoadSprite(state[2].bg) + self.textBuy.text = state[2].text + self.btnBuyRed.gameObject:SetActive(false) + self.tip.gameObject:SetActive(false) end - end, 1, -1, true) - self.timer:Start() + if self.isAllGet then + self.btnBuy.gameObject:SetActive(false) + self.tip.gameObject:SetActive(true) + end + end end -- 充值成功回调 function UpperMonthCard:RechargeSuccessFunc(id) FirstRechargeManager.RefreshAccumRechargeValue(id) OperatingManager.RefreshGiftGoodsBuyTimes(GoodsTypeDef.DemonCrystal, id) - --- 设置购买成功数据 - OperatingManager.SetSignRewarDay(self.chargerBaseType, 438) - local startTime = Today_N_OClockTimeStamp(0) - OperatingManager.SetGoodsEndTime(self.baseType, startTime + 30 * 24 * 60 * 60 - 1) - -- Today_N_OClockTimeStamp - - --- 刷新本地显示 - self:FreshBoughtShow() -end - ---- 购买成功刷新 -function UpperMonthCard:FreshBoughtShow() - self.boughtPanel:SetActive(true) - self.buyPanel:SetActive(false) - self.totalLoginday.text = Language[11388] .. OperatingManager.GetRewardDay(self.chargerBaseType) .. Language[10017] - local startStr, endStr = OperatingManager.GetShowTime(OperatingManager.GetGoodsEndTime(self.chargerBaseType)) - self.boughtLeftTime.text = Language[11389] ..startStr .. " — ".. endStr - -end - -function UpperMonthCard:TimeFormat(second) - local day = math.floor(second / (24 * 3600)) - local minute = math.floor(second / 60) % 60 - local sec = second % 60 - local hour = math.floor(math.floor(second - day * 24 * 3600 - sec - minute * 60) / 3600) - return string.format(Language[11390], day, hour, minute) end --界面关闭时调用(用于子类重写) function UpperMonthCard:OnClose() self.gameObject:SetActive(false) end + --界面销毁时调用(用于子类重写) function UpperMonthCard:OnDestroy() self.spLoader:Destroy() - for k,v in pairs(self.rewardList) do - SubUIManager.Close(v.item) + for k,v in pairs(self.itemLst) do + SubUIManager.Close(v.itemView) end Util.ClearChild(self.grid.transform) - self.rewardList = {} + self.itemLst = {} end return UpperMonthCard diff --git a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua index eb13078c1e..046a68efc0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua @@ -362,14 +362,14 @@ function this.SetPlayerRide(value) PlayerManager.ride = value end function this.GetPlayerDesignation() + --刷新所有时装 坐骑 称号 集合 检查是否有限时到时间的并删除 + this.RefreshAllSkinRideTitle() --加判断是否到时间 卸掉 local curTitleData = this.userTitleList[PlayerManager.designation] if curTitleData then if curTitleData.overTime > GetTimeStamp() or curTitleData.overTime == 0 then return PlayerManager.designation end - else - return PlayerManager.designation end NetManager.RequestChangeModifyDecoration(2,0) this.SetPlayerDesignation(0) @@ -386,8 +386,6 @@ function this.GetPlayerSkin() if curSkinData.overTime > GetTimeStamp() or curSkinData.overTime == 0 then return PlayerManager.skin end - else - return PlayerManager.skin end NetManager.RequestChangeModifyDecoration(4,0) this.SetPlayerSkin(0) @@ -402,8 +400,6 @@ function this.GetPlayerRide() if currideData.overTime > GetTimeStamp() or currideData.overTime == 0 then return PlayerManager.ride end - else - return PlayerManager.ride end NetManager.RequestChangeModifyDecoration(3,0) this.SetPlayerRide(0) diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index 42dd1c4172..8aa159b010 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -539,6 +539,9 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.Practice_upgrade,PracticeManager.PracticeCheckUpgrade,FUNCTION_OPEN_TYPE.PRACTICE) RPData:AddCheckFunc(RedPointType.Practice_imprint,PracticeManager.PracticeCheckImprint,FUNCTION_OPEN_TYPE.PRACTICE) RPData:AddCheckFunc(RedPointType.chaofanrushengRed,ActivityGiftManager.CheckRedPointChaofanRuSheng) + + RPData:AddCheckFunc(RedPointType.jijin128,ActivityGiftManager.CheckRedpointUpperMonthCard) + RPData:AddCheckFunc(RedPointType.jijin328,ActivityGiftManager.CheckRedpointUpperMonthCard) end diff --git a/Version/国内-游心.txt b/Version/国内-游心.txt new file mode 100644 index 0000000000..643797378a --- /dev/null +++ b/Version/国内-游心.txt @@ -0,0 +1 @@ +{"subChannel":"2000","buglyId":"261348dcd3","channel":"YX","resUrl":"http://jl.tyu89.wang/mht_china/youxin/","packageVersion":"0.1","version":"1.1.1","serverUrl":"http://60.1.1.163:8080/"} \ No newline at end of file