diff --git a/Assets/ManagedResources/BG/Map/XiaoYao/x_xiaoyaoyou_cheng_2.png b/Assets/ManagedResources/BG/Map/XiaoYao/x_xiaoyaoyou_cheng_2.png new file mode 100644 index 0000000000..0c4262b361 Binary files /dev/null and b/Assets/ManagedResources/BG/Map/XiaoYao/x_xiaoyaoyou_cheng_2.png differ diff --git a/Assets/ManagedResources/BG/Map/XiaoYao/x_xiaoyaoyou_cheng_2.png.meta b/Assets/ManagedResources/BG/Map/XiaoYao/x_xiaoyaoyou_cheng_2.png.meta new file mode 100644 index 0000000000..28dc362075 --- /dev/null +++ b/Assets/ManagedResources/BG/Map/XiaoYao/x_xiaoyaoyou_cheng_2.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 22bac04e099113f47b8c50af9a87da54 +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: 58 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: b2dd67ca3d399ec46ad4ddb8192650a2 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/BG/Map/XiaoYao/x_xiaoyaoyou_cheng_3.png b/Assets/ManagedResources/BG/Map/XiaoYao/x_xiaoyaoyou_cheng_3.png new file mode 100644 index 0000000000..343032b262 Binary files /dev/null and b/Assets/ManagedResources/BG/Map/XiaoYao/x_xiaoyaoyou_cheng_3.png differ diff --git a/Assets/ManagedResources/BG/Map/XiaoYao/x_xiaoyaoyou_cheng_3.png.meta b/Assets/ManagedResources/BG/Map/XiaoYao/x_xiaoyaoyou_cheng_3.png.meta new file mode 100644 index 0000000000..25487bbb30 --- /dev/null +++ b/Assets/ManagedResources/BG/Map/XiaoYao/x_xiaoyaoyou_cheng_3.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 41e00c8583a88cc459d20aee3b95dde7 +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: 58 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: aae85dc2c4f5be94d889022ca4c24e8e + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/BG/Map/XiaoYao/x_xiaoyaoyou_cheng_4.png b/Assets/ManagedResources/BG/Map/XiaoYao/x_xiaoyaoyou_cheng_4.png new file mode 100644 index 0000000000..633ae76fde Binary files /dev/null and b/Assets/ManagedResources/BG/Map/XiaoYao/x_xiaoyaoyou_cheng_4.png differ diff --git a/Assets/ManagedResources/BG/Map/XiaoYao/x_xiaoyaoyou_cheng_4.png.meta b/Assets/ManagedResources/BG/Map/XiaoYao/x_xiaoyaoyou_cheng_4.png.meta new file mode 100644 index 0000000000..fada248420 --- /dev/null +++ b/Assets/ManagedResources/BG/Map/XiaoYao/x_xiaoyaoyou_cheng_4.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 966299d6ce152f341882b9fe84d43ff0 +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: 58 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5662fac518543c14588f41aeb889cc8c + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/BG/Map/XiaoYao/x_xiaoyaoyou_huanmoruqin.png b/Assets/ManagedResources/BG/Map/XiaoYao/x_xiaoyaoyou_huanmoruqin.png index 99fc92e106..9adb1315ac 100644 Binary files a/Assets/ManagedResources/BG/Map/XiaoYao/x_xiaoyaoyou_huanmoruqin.png and b/Assets/ManagedResources/BG/Map/XiaoYao/x_xiaoyaoyou_huanmoruqin.png differ diff --git a/Assets/ManagedResources/BG/Map/XiaoYao/x_xiaoyaoyou_hukong.png b/Assets/ManagedResources/BG/Map/XiaoYao/x_xiaoyaoyou_hukong.png new file mode 100644 index 0000000000..454a55d88f Binary files /dev/null and b/Assets/ManagedResources/BG/Map/XiaoYao/x_xiaoyaoyou_hukong.png differ diff --git a/Assets/ManagedResources/BG/Map/XiaoYao/x_xiaoyaoyou_hukong.png.meta b/Assets/ManagedResources/BG/Map/XiaoYao/x_xiaoyaoyou_hukong.png.meta new file mode 100644 index 0000000000..ecb4ef1781 --- /dev/null +++ b/Assets/ManagedResources/BG/Map/XiaoYao/x_xiaoyaoyou_hukong.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: aa0e17ef89ef07243a9f0c8107cff2a4 +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: 58 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 0ecb78c816815d04b9bd6e17fcdfce42 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/BG/Map/XiaoYao/x_xiaoyaoyou_saizi.png b/Assets/ManagedResources/BG/Map/XiaoYao/x_xiaoyaoyou_saizi.png new file mode 100644 index 0000000000..ac666679b5 Binary files /dev/null and b/Assets/ManagedResources/BG/Map/XiaoYao/x_xiaoyaoyou_saizi.png differ diff --git a/Assets/ManagedResources/BG/Map/XiaoYao/x_xiaoyaoyou_saizi.png.meta b/Assets/ManagedResources/BG/Map/XiaoYao/x_xiaoyaoyou_saizi.png.meta new file mode 100644 index 0000000000..0ab21e6c7b --- /dev/null +++ b/Assets/ManagedResources/BG/Map/XiaoYao/x_xiaoyaoyou_saizi.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 822b705f132d2fe46b548ff2a7d8ff57 +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: 58 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 721817ee58a9e4840ba29f42e0692d45 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/BG/Map/XiaoYao/x_xiaoyaoyou_xiaozidi.png b/Assets/ManagedResources/BG/Map/XiaoYao/x_xiaoyaoyou_xiaozidi.png new file mode 100644 index 0000000000..bf34083296 Binary files /dev/null and b/Assets/ManagedResources/BG/Map/XiaoYao/x_xiaoyaoyou_xiaozidi.png differ diff --git a/Assets/ManagedResources/BG/Map/XiaoYao/x_xiaoyaoyou_xiaozidi.png.meta b/Assets/ManagedResources/BG/Map/XiaoYao/x_xiaoyaoyou_xiaozidi.png.meta new file mode 100644 index 0000000000..35288806e9 --- /dev/null +++ b/Assets/ManagedResources/BG/Map/XiaoYao/x_xiaoyaoyou_xiaozidi.png.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 974f29e827072824092a5ffa4037adc8 +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: 58 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: ac17295547c8d6744b2c8d4b53a7730d + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/BG/Map/XiaoYao/x_xiaoyaoyou_zhuanpan.png b/Assets/ManagedResources/BG/Map/XiaoYao/x_xiaoyaoyou_zhuanpan.png index fa15fb0fd6..3bf3d18f1a 100644 Binary files a/Assets/ManagedResources/BG/Map/XiaoYao/x_xiaoyaoyou_zhuanpan.png and b/Assets/ManagedResources/BG/Map/XiaoYao/x_xiaoyaoyou_zhuanpan.png differ diff --git a/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab b/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab index 04561d9aa1..2d9ae37707 100644 --- a/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/XiaoYao/XiaoYaoMapPanel.prefab @@ -81,7 +81,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 9.44} - m_SizeDelta: {x: 88.86, y: 78} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &604031030 CanvasRenderer: @@ -215,6 +215,101 @@ MonoBehaviour: m_EffectColor: {r: 0, g: 0, b: 0.03137255, a: 1} m_EffectDistance: {x: 1, y: -1} m_UseGraphicAlpha: 1 +--- !u!1 &22301737676765346 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9198196378565562289} + - component: {fileID: 4594675922995098586} + - component: {fileID: 4877966255532542326} + - component: {fileID: 6680965959588859915} + m_Layer: 5 + m_Name: time + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9198196378565562289 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 22301737676765346} + 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: 91866266988071576} + 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: -85.3} + m_SizeDelta: {x: 126.55, y: 47.74} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4594675922995098586 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 22301737676765346} + m_CullTransparentMesh: 0 +--- !u!114 &4877966255532542326 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 22301737676765346} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.41960788, g: 0.95294124, b: 0.32156864, 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: 24 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 59:10 +--- !u!114 &6680965959588859915 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 22301737676765346} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 1} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &189707783699318590 GameObject: m_ObjectHideFlags: 0 @@ -246,6 +341,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 471220334488304630} + - {fileID: 798232544032123905} m_Father: {fileID: 913146193029197762} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -988,7 +1084,6 @@ GameObject: m_Component: - component: {fileID: 6416988820339968832} - component: {fileID: 5095862970881978625} - - component: {fileID: 5696886586217555136} m_Layer: 5 m_Name: TT m_TagString: Untagged @@ -1024,35 +1119,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2265498480570670205} m_CullTransparentMesh: 0 ---- !u!114 &5696886586217555136 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2265498480570670205} - 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: 29db8d479ab345240a98163f210d0387, 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 &2453265568338818917 GameObject: m_ObjectHideFlags: 0 @@ -1389,12 +1455,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 120838204554284271} + - {fileID: 5281754449960765727} m_Father: {fileID: 913146193029197762} 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: 92.5, y: -96.5} + m_AnchoredPosition: {x: 92.5, y: -315.43} m_SizeDelta: {x: 185, y: 193} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8809899214388357845 @@ -1510,8 +1577,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: 0, y: 63.9} - m_SizeDelta: {x: 119, y: 151} + m_AnchoredPosition: {x: 0, y: 53.8} + m_SizeDelta: {x: 138.27, y: 138.27} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8162398967560234576 CanvasRenderer: @@ -1550,6 +1617,101 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &4684442356887754691 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 798232544032123905} + - component: {fileID: 5889654525072862446} + - component: {fileID: 7789132171130451734} + - component: {fileID: 6615633316597382904} + m_Layer: 5 + m_Name: time + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &798232544032123905 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4684442356887754691} + 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: 636454027232682164} + 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: -85.3} + m_SizeDelta: {x: 126.55, y: 47.74} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5889654525072862446 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4684442356887754691} + m_CullTransparentMesh: 0 +--- !u!114 &7789132171130451734 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4684442356887754691} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.41960788, g: 0.95294124, b: 0.32156864, 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: 24 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 59:10 +--- !u!114 &6615633316597382904 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4684442356887754691} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 1} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &4709521480864294814 GameObject: m_ObjectHideFlags: 0 @@ -1797,8 +1959,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: 0, y: 63.9} - m_SizeDelta: {x: 119, y: 151} + m_AnchoredPosition: {x: 0, y: 58.499977} + m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8477823113637739355 CanvasRenderer: @@ -1828,7 +1990,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: 516b8e833b710484ca01ffa4a27bf096, type: 3} + m_Sprite: {fileID: 21300000, guid: d090a211e2b853746b5d2662d8f4b3ae, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2143,8 +2305,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: 0, y: 63.9} - m_SizeDelta: {x: 119, y: 151} + m_AnchoredPosition: {x: 0, y: 42.999977} + m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6901291718702421079 CanvasRenderer: @@ -2174,7 +2336,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: 3114a81e43b30f7459047f1da27b33d0, type: 3} + m_Sprite: {fileID: 21300000, guid: aa0e17ef89ef07243a9f0c8107cff2a4, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2370,7 +2532,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 96.29999, y: -337} + m_AnchoredPosition: {x: 96.29999, y: -341.90002} m_SizeDelta: {x: 185, y: 275.90002} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3086147087352123288 @@ -2402,7 +2564,7 @@ MonoBehaviour: m_StartCorner: 0 m_StartAxis: 1 m_CellSize: {x: 185, y: 193} - m_Spacing: {x: 0, y: 46.5} + m_Spacing: {x: 0, y: 25.93} m_Constraint: 1 m_ConstraintCount: 1 --- !u!1 &6877960608244094855 @@ -2524,6 +2686,101 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6928390308494556382} m_CullTransparentMesh: 0 +--- !u!1 &6973211072785825039 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5281754449960765727} + - component: {fileID: 8817974279936620258} + - component: {fileID: 9167923774107382800} + - component: {fileID: 5492246566377086564} + m_Layer: 5 + m_Name: time + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5281754449960765727 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6973211072785825039} + 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: 8951745513582367480} + 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: -85.3} + m_SizeDelta: {x: 126.55, y: 47.74} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8817974279936620258 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6973211072785825039} + m_CullTransparentMesh: 0 +--- !u!114 &9167923774107382800 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6973211072785825039} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.41960788, g: 0.95294124, b: 0.32156864, 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: 24 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 59:10 +--- !u!114 &5492246566377086564 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6973211072785825039} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 1} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &7248017425188273480 GameObject: m_ObjectHideFlags: 0 @@ -3426,12 +3683,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 7892887258064875542} + - {fileID: 9198196378565562289} m_Father: {fileID: 913146193029197762} 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: 92.5, y: -575.5} + m_AnchoredPosition: {x: 92.5, y: -534.36} m_SizeDelta: {x: 185, y: 193} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &497349341869745824 diff --git a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua index e3b570b590..082c0a25ec 100644 --- a/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoMapPanel.lua @@ -9,6 +9,10 @@ local isAuto=false local priThread = nil local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) local saiNum=1 --骰子数量 +local eventTimer +local shopLeftTime=0 +local rouleLeftTime=0 +local bossLeftTime=0 --初始化组件(用于子类重写) function this:InitComponent() @@ -17,8 +21,11 @@ function this:InitComponent() this.mapProcess=Util.GetGameObject(self.gameObject,"mapTitle/mapProcess"):GetComponent("Text") this.btnBack = Util.GetGameObject(self.gameObject, "btnBack") this.shopBtn = Util.GetGameObject(self.gameObject, "btnGrid/shopBtn") + this.shopTime=Util.GetGameObject(self.gameObject, "btnGrid/shopBtn/time"):GetComponent("Text") this.rouleBtn = Util.GetGameObject(self.gameObject, "btnGrid/rouleBtn") + this.rouleTime=Util.GetGameObject(self.gameObject, "btnGrid/rouleBtn/time"):GetComponent("Text") this.bossBtn = Util.GetGameObject(self.gameObject, "btnGrid/bossBtn") + this.bossTime=Util.GetGameObject(self.gameObject, "btnGrid/bossBtn/time"):GetComponent("Text") this.previewBtn=Util.GetGameObject(self.gameObject, "previewBtn") this.autoBtn=Util.GetGameObject(self.gameObject, "auto")--自动游历按钮 this.toggle=Util.GetGameObject(self.gameObject, "auto/toggle")--自动游历开关显示 @@ -148,6 +155,7 @@ end function this.EventTrigger(_data) Util.GetGameObject(this.gridParent.transform:GetChild(curGridIndex-1).gameObject,"eventPoint"):SetActive(false) Log("触发事件类型为:".._data.pathType) + Log("触发事件时间为:".._data.overTime) if _data.pathType==0 then --普通节点 elseif _data.pathType==1 then --宝箱 @@ -157,33 +165,23 @@ function this.EventTrigger(_data) elseif _data.pathType==3 then --额外骰子节点 PopupTipPanel.ShowTip("骰子x2") saiNum=2 - elseif _data.pathType==4 then --招募英雄节点 - local temp = XiaoYaoManager.GetHeroDatas() - if temp and #temp > 0 then - this.shopBtn:SetActive(true) - else - this.shopBtn:SetActive(false) - end + elseif _data.pathType==4 then --东海寻仙节点 + this.shopBtn:SetActive(true) + shopLeftTime=_data.overTime UIManager.OpenPanel(UIName.XiaoYaoEventPanel,_data.pathType,allGridData[curGridIndex].eventData) elseif _data.pathType==5 then --怪物节点 - local temp = XiaoYaoManager.GetMonsterDatas() - if temp and #temp > 0 then - this.bossBtn:SetActive(true) - else - this.bossBtn:SetActive(false) - end + this.bossBtn:SetActive(true) + bossLeftTime=_data.overTime UIManager.OpenPanel(UIName.XiaoYaoEventPanel,_data.pathType,allGridData[curGridIndex].eventData) elseif _data.pathType==6 then --转盘 - if XiaoYaoManager.luckyluckyTurnTableTimes > 0 and (XiaoYaoManager.luckyluckyTurnTableRemainTime - PlayerManager.serverTime > 0) then - this.rouleBtn:SetActive(true) - else - this.rouleBtn:SetActive(false) - end + this.rouleBtn:SetActive(true) + rouleLeftTime=_data.overTime UIManager.OpenPanel(UIName.XiaoYaoEventPanel,_data.pathType,allGridData[curGridIndex].eventData) end if _data.drop.itemlist ~= nil and #_data.drop.itemlist > 0 then local content = {} for i = 1, #_data.drop.itemlist do + Log("这是基础奖励") local itemdata = {} itemdata.configData = itemConfig[_data.drop.itemlist[i].itemId] itemdata.name = itemdata.configData.Name @@ -206,6 +204,7 @@ end function this:OnOpen(_mapData) mapData=_mapData this.InitShowEvent() + this.LoadTT() --初始化地图 for i = 1, #mapData.cell do local x, y=Map_Pos2UV(mapData.cell[i].cellId) @@ -270,30 +269,52 @@ function this:OnOpen(_mapData) this.mapParent.transform:GetChild(i-1):GetComponent("Image").sprite=Util.LoadSprite(mapBg[i]) end end +---加载跑图角色 +function this.LoadTT() + local mapNpc = "live2d_npc_map" + local mapNpc2 = "live2d_npc_map_nv" + npc = NameManager.roleSex == ROLE_SEX.BOY and mapNpc or mapNpc2 + scale = NameManager.roleSex == ROLE_SEX.BOY and Vector3.one * 0.25 or Vector3.one * 0.12 + if not this.liveNode then + this.liveNode = poolManager:LoadLive(npc, this.TT.transform, scale, Vector3.New(0,-42.4,0)) + end + local SkeletonGraphic = this.liveNode:GetComponent("SkeletonGraphic") + if SkeletonGraphic then + SkeletonGraphic.AnimationState:SetAnimation(0, "move2", true) + SkeletonGraphic.transform.localEulerAngles = Vector3.New(0, 0, 0) + end +end --初始化地图事件显示 function this.InitShowEvent() + if mapData.diceNum>1 then --骰子x2 saiNum=mapData.diceNum end - if XiaoYaoManager.luckyluckyTurnTableTimes > 0 and (XiaoYaoManager.luckyluckyTurnTableRemainTime - PlayerManager.serverTime > 0) then - this.rouleBtn:SetActive(true) - else - this.rouleBtn:SetActive(false) - end - local temp = XiaoYaoManager.GetMonsterDatas() - if temp and #temp > 0 then - this.bossBtn:SetActive(true) - else - this.bossBtn:SetActive(false) - end - local temp = XiaoYaoManager.GetHeroDatas() - if temp and #temp > 0 then - this.shopBtn:SetActive(true) - else - this.shopBtn:SetActive(false) - end + if XiaoYaoManager.luckyluckyTurnTableTimes > 0 and (XiaoYaoManager.luckyluckyTurnTableRemainTime - PlayerManager.serverTime > 0) then + this.rouleBtn:SetActive(true) + else + this.rouleBtn:SetActive(false) + end + local temp = XiaoYaoManager.GetMonsterDatas() + if temp and #temp > 0 then + this.bossBtn:SetActive(true) + else + this.bossBtn:SetActive(false) + end + local temp = XiaoYaoManager.GetHeroDatas() + if temp and #temp > 0 then + this.shopBtn:SetActive(true) + else + this.shopBtn:SetActive(false) + end + shopLeftTime=XiaoYaoManager.GetHeroDataTime() + rouleLeftTime=XiaoYaoManager.luckyluckyTurnTableRemainTime + bossLeftTime=XiaoYaoManager.GetMonsterDataReMainTimesAndTime() + if not eventTimer then + eventTimer=this.DownTime() + end end - +--控制地图移动 function this.MapMove(curX,moveTime) if curX>2700 and this.mapParent:GetComponent("RectTransform").localPosition.x<=-2200 then return @@ -331,6 +352,40 @@ function this.ShowCountTime() end end +function this.DownTime() + local _timer + _timer = Timer.New(function () + local couTime =shopLeftTime- PlayerManager.serverTime + if couTime<=0 then + -- 倒计时结束 + this.shopBtn:SetActive(false) + else + this.shopTime.text = TimeToHMS(math.floor(couTime)) + end + + + couTime =rouleLeftTime- PlayerManager.serverTime + if couTime<=0 then + -- 倒计时结束 + this.rouleBtn:SetActive(false) + else + this.rouleTime.text = TimeToHMS(math.floor(couTime)) + end + + + couTime =bossLeftTime- PlayerManager.serverTime + if couTime<=0 then + -- 倒计时结束 + this.bossBtn:SetActive(false) + else + this.bossTime.text = TimeToHMS(math.floor(couTime)) + end + + end, 1, -1, true) + _timer:Start() + return _timer +end + function this:OnShow() --显示资源条 this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.MonsterCamp }) @@ -358,6 +413,9 @@ end --界面销毁时调用(用于子类重写) function this:OnDestroy() - + if eventTimer then + eventTimer:Stop() + eventTimer = nil + end end return XiaoYaoMapPanel \ No newline at end of file