diff --git a/Assets/ManagedResources/Audio/Skill/monster/Audio_m_mh_0046__attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/monster/Audio_m_mh_0046__attack_01.mp3 deleted file mode 100644 index b5cd235989..0000000000 Binary files a/Assets/ManagedResources/Audio/Skill/monster/Audio_m_mh_0046__attack_01.mp3 and /dev/null differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_m_mh_0046__attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_m_mh_0046__attack_01.mp3 deleted file mode 100644 index 9fd8df7abb..0000000000 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_m_mh_0046__attack_01.mp3 and /dev/null differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audio_m_mh_0046__attack_01_mp3.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audio_m_mh_0046__attack_01_mp3.mp3 deleted file mode 100644 index 2af4d6abcf..0000000000 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audio_m_mh_0046__attack_01_mp3.mp3 and /dev/null differ diff --git a/Assets/ManagedResources/Audio/Skill/skill/Audioc_swk_00015_attack_01.mp3 b/Assets/ManagedResources/Audio/Skill/skill/Audioc_swk_00015_attack_01.mp3 index f829d10278..cb38fd2d96 100644 Binary files a/Assets/ManagedResources/Audio/Skill/skill/Audioc_swk_00015_attack_01.mp3 and b/Assets/ManagedResources/Audio/Skill/skill/Audioc_swk_00015_attack_01.mp3 differ diff --git a/Assets/ManagedResources/Effects/Textures/H_1298.tga.meta b/Assets/ManagedResources/Effects/Textures/H_1298.tga.meta deleted file mode 100644 index 11531f76a4..0000000000 --- a/Assets/ManagedResources/Effects/Textures/H_1298.tga.meta +++ /dev/null @@ -1,56 +0,0 @@ -fileFormatVersion: 2 -guid: 96c7ea5ce2a2fb748ac03d19fd227d44 -timeCreated: 1561594742 -licenseType: Pro -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 2048 - textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 - nPOTScale: 1 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - allowsAlphaSplitting: 0 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ManagedResources/Effects/Textures/H_1298.tga b/Assets/ManagedResources/Effects/Textures/H_1298_tga.tga similarity index 100% rename from Assets/ManagedResources/Effects/Textures/H_1298.tga rename to Assets/ManagedResources/Effects/Textures/H_1298_tga.tga diff --git a/Assets/ManagedResources/Effects/Textures/H_1298_tga.tga.meta b/Assets/ManagedResources/Effects/Textures/H_1298_tga.tga.meta new file mode 100644 index 0000000000..448f7aafe7 --- /dev/null +++ b/Assets/ManagedResources/Effects/Textures/H_1298_tga.tga.meta @@ -0,0 +1,110 @@ +fileFormatVersion: 2 +guid: 96c7ea5ce2a2fb748ac03d19fd227d44 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 9 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + 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: -1 + aniso: -1 + mipBias: -100 + wrapU: -1 + wrapV: -1 + wrapW: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + 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: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 65 + textureCompression: 1 + compressionQuality: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/PublicArtRes/Textures/glow_00119.png b/Assets/ManagedResources/PublicArtRes/Textures/glow_00119_png.png similarity index 100% rename from Assets/ManagedResources/PublicArtRes/Textures/glow_00119.png rename to Assets/ManagedResources/PublicArtRes/Textures/glow_00119_png.png diff --git a/Assets/ManagedResources/PublicArtRes/Textures/glow_00119.png.meta b/Assets/ManagedResources/PublicArtRes/Textures/glow_00119_png.png.meta similarity index 62% rename from Assets/ManagedResources/PublicArtRes/Textures/glow_00119.png.meta rename to Assets/ManagedResources/PublicArtRes/Textures/glow_00119_png.png.meta index 24ccfbe842..84ef07df4b 100644 --- a/Assets/ManagedResources/PublicArtRes/Textures/glow_00119.png.meta +++ b/Assets/ManagedResources/PublicArtRes/Textures/glow_00119_png.png.meta @@ -2,7 +2,8 @@ fileFormatVersion: 2 guid: 50c51cbce89995f4a80295be1e2456e1 TextureImporter: fileIDToRecycleName: {} - serializedVersion: 4 + externalObjects: {} + serializedVersion: 9 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -10,6 +11,8 @@ TextureImporter: linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -18,6 +21,8 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -25,10 +30,13 @@ TextureImporter: textureFormat: -1 maxTextureSize: 1024 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: -1 - mipBias: -1 - wrapMode: 1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -37,54 +45,77 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} 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: - - buildTarget: DefaultTexturePlatform + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform maxTextureSize: 1024 + resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 - - buildTarget: iPhone + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: iPhone maxTextureSize: 256 - textureFormat: 33 + resizeAlgorithm: 0 + textureFormat: 65 textureCompression: 1 - compressionQuality: 50 + compressionQuality: 100 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 1 - - buildTarget: Standalone + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone maxTextureSize: 1024 + resizeAlgorithm: 0 textureFormat: 12 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 1 - - buildTarget: Android + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Android maxTextureSize: 256 - textureFormat: 47 + resizeAlgorithm: 0 + textureFormat: 65 textureCompression: 1 - compressionQuality: 50 + compressionQuality: 100 crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 1 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] + bones: [] + spriteID: e4718ba57a0072b47ba64cd3070c6581 + vertices: [] + indices: + edges: [] + weights: [] spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/ManagedResources/RTexture/CardTexture10.renderTexture b/Assets/ManagedResources/RTexture/CardTexture10.renderTexture deleted file mode 100644 index 2083dfdc6c..0000000000 --- a/Assets/ManagedResources/RTexture/CardTexture10.renderTexture +++ /dev/null @@ -1,34 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!84 &8400000 -RenderTexture: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: CardTexture10 - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_ForcedFallbackFormat: 4 - m_DownscaleFallback: 0 - m_Width: 640 - m_Height: 960 - m_AntiAliasing: 1 - m_DepthFormat: 2 - m_ColorFormat: 0 - m_MipMap: 0 - m_GenerateMips: 1 - m_SRGB: 0 - m_UseDynamicScale: 0 - m_BindMS: 0 - m_TextureSettings: - serializedVersion: 2 - m_FilterMode: 1 - m_Aniso: 0 - m_MipBias: 0 - m_WrapU: 1 - m_WrapV: 1 - m_WrapW: 1 - m_Dimension: 2 - m_VolumeDepth: 1 diff --git a/Assets/ManagedResources/RTexture/CardTexture10.renderTexture.meta b/Assets/ManagedResources/RTexture/CardTexture10.renderTexture.meta deleted file mode 100644 index 30b268dcc4..0000000000 --- a/Assets/ManagedResources/RTexture/CardTexture10.renderTexture.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0cb7686b2cd52b34cafd5cb6cb530285 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 8400000 - userData: - assetBundleName: lz4/rtexture/cardtexture10 - assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/RTexture/CardTexture11.renderTexture b/Assets/ManagedResources/RTexture/CardTexture11.renderTexture deleted file mode 100644 index 610c103bfc..0000000000 --- a/Assets/ManagedResources/RTexture/CardTexture11.renderTexture +++ /dev/null @@ -1,34 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!84 &8400000 -RenderTexture: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: CardTexture11 - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_ForcedFallbackFormat: 4 - m_DownscaleFallback: 0 - m_Width: 640 - m_Height: 960 - m_AntiAliasing: 1 - m_DepthFormat: 2 - m_ColorFormat: 0 - m_MipMap: 0 - m_GenerateMips: 1 - m_SRGB: 0 - m_UseDynamicScale: 0 - m_BindMS: 0 - m_TextureSettings: - serializedVersion: 2 - m_FilterMode: 1 - m_Aniso: 0 - m_MipBias: 0 - m_WrapU: 1 - m_WrapV: 1 - m_WrapW: 1 - m_Dimension: 2 - m_VolumeDepth: 1 diff --git a/Assets/ManagedResources/RTexture/CardTexture11.renderTexture.meta b/Assets/ManagedResources/RTexture/CardTexture11.renderTexture.meta deleted file mode 100644 index 1fb676f5df..0000000000 --- a/Assets/ManagedResources/RTexture/CardTexture11.renderTexture.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e6ad25cb53a77df42a5e451bcae4e58b -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 8400000 - userData: - assetBundleName: lz4/rtexture/cardtexture11 - assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/RTexture/CardTexture12.renderTexture b/Assets/ManagedResources/RTexture/CardTexture12.renderTexture deleted file mode 100644 index 8dbceaa9d8..0000000000 --- a/Assets/ManagedResources/RTexture/CardTexture12.renderTexture +++ /dev/null @@ -1,34 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!84 &8400000 -RenderTexture: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: CardTexture12 - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_ForcedFallbackFormat: 4 - m_DownscaleFallback: 0 - m_Width: 640 - m_Height: 960 - m_AntiAliasing: 1 - m_DepthFormat: 2 - m_ColorFormat: 0 - m_MipMap: 0 - m_GenerateMips: 1 - m_SRGB: 0 - m_UseDynamicScale: 0 - m_BindMS: 0 - m_TextureSettings: - serializedVersion: 2 - m_FilterMode: 1 - m_Aniso: 0 - m_MipBias: 0 - m_WrapU: 1 - m_WrapV: 1 - m_WrapW: 1 - m_Dimension: 2 - m_VolumeDepth: 1 diff --git a/Assets/ManagedResources/RTexture/CardTexture12.renderTexture.meta b/Assets/ManagedResources/RTexture/CardTexture12.renderTexture.meta deleted file mode 100644 index 48038aaedf..0000000000 --- a/Assets/ManagedResources/RTexture/CardTexture12.renderTexture.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f0d1cce49f029d540844eca6d903d471 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 8400000 - userData: - assetBundleName: lz4/rtexture/cardtexture12 - assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/RTexture/CardTexture13.renderTexture b/Assets/ManagedResources/RTexture/CardTexture13.renderTexture deleted file mode 100644 index 28832a1ae6..0000000000 --- a/Assets/ManagedResources/RTexture/CardTexture13.renderTexture +++ /dev/null @@ -1,34 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!84 &8400000 -RenderTexture: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: CardTexture13 - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_ForcedFallbackFormat: 4 - m_DownscaleFallback: 0 - m_Width: 640 - m_Height: 960 - m_AntiAliasing: 1 - m_DepthFormat: 2 - m_ColorFormat: 0 - m_MipMap: 0 - m_GenerateMips: 1 - m_SRGB: 0 - m_UseDynamicScale: 0 - m_BindMS: 0 - m_TextureSettings: - serializedVersion: 2 - m_FilterMode: 1 - m_Aniso: 0 - m_MipBias: 0 - m_WrapU: 1 - m_WrapV: 1 - m_WrapW: 1 - m_Dimension: 2 - m_VolumeDepth: 1 diff --git a/Assets/ManagedResources/RTexture/CardTexture13.renderTexture.meta b/Assets/ManagedResources/RTexture/CardTexture13.renderTexture.meta deleted file mode 100644 index 0bd8f0022e..0000000000 --- a/Assets/ManagedResources/RTexture/CardTexture13.renderTexture.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f622d271dc0eac04eb63d0c61f0f1a92 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 8400000 - userData: - assetBundleName: lz4/rtexture/cardtexture13 - assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/RTexture/CardTexture14.renderTexture b/Assets/ManagedResources/RTexture/CardTexture14.renderTexture deleted file mode 100644 index 0b9d62f468..0000000000 --- a/Assets/ManagedResources/RTexture/CardTexture14.renderTexture +++ /dev/null @@ -1,34 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!84 &8400000 -RenderTexture: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: CardTexture14 - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_ForcedFallbackFormat: 4 - m_DownscaleFallback: 0 - m_Width: 640 - m_Height: 960 - m_AntiAliasing: 1 - m_DepthFormat: 2 - m_ColorFormat: 0 - m_MipMap: 0 - m_GenerateMips: 1 - m_SRGB: 0 - m_UseDynamicScale: 0 - m_BindMS: 0 - m_TextureSettings: - serializedVersion: 2 - m_FilterMode: 1 - m_Aniso: 0 - m_MipBias: 0 - m_WrapU: 1 - m_WrapV: 1 - m_WrapW: 1 - m_Dimension: 2 - m_VolumeDepth: 1 diff --git a/Assets/ManagedResources/RTexture/CardTexture14.renderTexture.meta b/Assets/ManagedResources/RTexture/CardTexture14.renderTexture.meta deleted file mode 100644 index 400a2e8387..0000000000 --- a/Assets/ManagedResources/RTexture/CardTexture14.renderTexture.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2dea714961236204b9b1cdc84d679e6b -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 8400000 - userData: - assetBundleName: lz4/rtexture/cardtexture14 - assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/RTexture/CardTexture15.renderTexture b/Assets/ManagedResources/RTexture/CardTexture15.renderTexture deleted file mode 100644 index 10af739aae..0000000000 --- a/Assets/ManagedResources/RTexture/CardTexture15.renderTexture +++ /dev/null @@ -1,34 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!84 &8400000 -RenderTexture: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: CardTexture15 - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_ForcedFallbackFormat: 4 - m_DownscaleFallback: 0 - m_Width: 640 - m_Height: 960 - m_AntiAliasing: 1 - m_DepthFormat: 2 - m_ColorFormat: 0 - m_MipMap: 0 - m_GenerateMips: 1 - m_SRGB: 0 - m_UseDynamicScale: 0 - m_BindMS: 0 - m_TextureSettings: - serializedVersion: 2 - m_FilterMode: 1 - m_Aniso: 0 - m_MipBias: 0 - m_WrapU: 1 - m_WrapV: 1 - m_WrapW: 1 - m_Dimension: 2 - m_VolumeDepth: 1 diff --git a/Assets/ManagedResources/RTexture/CardTexture15.renderTexture.meta b/Assets/ManagedResources/RTexture/CardTexture15.renderTexture.meta deleted file mode 100644 index a384c0af82..0000000000 --- a/Assets/ManagedResources/RTexture/CardTexture15.renderTexture.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6b0cb3f1e1d33964bbb81ebfd97906e5 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 8400000 - userData: - assetBundleName: lz4/rtexture/cardtexture15 - assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/RTexture/CardTexture16.renderTexture b/Assets/ManagedResources/RTexture/CardTexture16.renderTexture deleted file mode 100644 index d848826bc5..0000000000 --- a/Assets/ManagedResources/RTexture/CardTexture16.renderTexture +++ /dev/null @@ -1,34 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!84 &8400000 -RenderTexture: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: CardTexture16 - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_ForcedFallbackFormat: 4 - m_DownscaleFallback: 0 - m_Width: 640 - m_Height: 960 - m_AntiAliasing: 1 - m_DepthFormat: 2 - m_ColorFormat: 0 - m_MipMap: 0 - m_GenerateMips: 1 - m_SRGB: 0 - m_UseDynamicScale: 0 - m_BindMS: 0 - m_TextureSettings: - serializedVersion: 2 - m_FilterMode: 1 - m_Aniso: 0 - m_MipBias: 0 - m_WrapU: 1 - m_WrapV: 1 - m_WrapW: 1 - m_Dimension: 2 - m_VolumeDepth: 1 diff --git a/Assets/ManagedResources/RTexture/CardTexture16.renderTexture.meta b/Assets/ManagedResources/RTexture/CardTexture16.renderTexture.meta deleted file mode 100644 index 04a39e3e4a..0000000000 --- a/Assets/ManagedResources/RTexture/CardTexture16.renderTexture.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f3ec271f44382d645be324be9394a590 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 8400000 - userData: - assetBundleName: lz4/rtexture/cardtexture16 - assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/RTexture/CardTexture17.renderTexture b/Assets/ManagedResources/RTexture/CardTexture17.renderTexture deleted file mode 100644 index 585df94d73..0000000000 --- a/Assets/ManagedResources/RTexture/CardTexture17.renderTexture +++ /dev/null @@ -1,34 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!84 &8400000 -RenderTexture: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: CardTexture17 - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_ForcedFallbackFormat: 4 - m_DownscaleFallback: 0 - m_Width: 640 - m_Height: 960 - m_AntiAliasing: 1 - m_DepthFormat: 2 - m_ColorFormat: 0 - m_MipMap: 0 - m_GenerateMips: 1 - m_SRGB: 0 - m_UseDynamicScale: 0 - m_BindMS: 0 - m_TextureSettings: - serializedVersion: 2 - m_FilterMode: 1 - m_Aniso: 0 - m_MipBias: 0 - m_WrapU: 1 - m_WrapV: 1 - m_WrapW: 1 - m_Dimension: 2 - m_VolumeDepth: 1 diff --git a/Assets/ManagedResources/RTexture/CardTexture17.renderTexture.meta b/Assets/ManagedResources/RTexture/CardTexture17.renderTexture.meta deleted file mode 100644 index 0da2a7e3c5..0000000000 --- a/Assets/ManagedResources/RTexture/CardTexture17.renderTexture.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5b1f213505e990748a7bcb9cb04fdda1 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 8400000 - userData: - assetBundleName: lz4/rtexture/cardtexture17 - assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/RTexture/CardTexture18.renderTexture b/Assets/ManagedResources/RTexture/CardTexture18.renderTexture deleted file mode 100644 index 93b853e3ae..0000000000 --- a/Assets/ManagedResources/RTexture/CardTexture18.renderTexture +++ /dev/null @@ -1,34 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!84 &8400000 -RenderTexture: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: CardTexture18 - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_ForcedFallbackFormat: 4 - m_DownscaleFallback: 0 - m_Width: 640 - m_Height: 960 - m_AntiAliasing: 1 - m_DepthFormat: 2 - m_ColorFormat: 0 - m_MipMap: 0 - m_GenerateMips: 1 - m_SRGB: 0 - m_UseDynamicScale: 0 - m_BindMS: 0 - m_TextureSettings: - serializedVersion: 2 - m_FilterMode: 1 - m_Aniso: 0 - m_MipBias: 0 - m_WrapU: 1 - m_WrapV: 1 - m_WrapW: 1 - m_Dimension: 2 - m_VolumeDepth: 1 diff --git a/Assets/ManagedResources/RTexture/CardTexture18.renderTexture.meta b/Assets/ManagedResources/RTexture/CardTexture18.renderTexture.meta deleted file mode 100644 index 932c38cf50..0000000000 --- a/Assets/ManagedResources/RTexture/CardTexture18.renderTexture.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a90e20355aae16a479c5b4ad46b7ad02 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 8400000 - userData: - assetBundleName: lz4/rtexture/cardtexture18 - assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/RTexture/CardTexture19.renderTexture b/Assets/ManagedResources/RTexture/CardTexture19.renderTexture deleted file mode 100644 index db20edf91f..0000000000 --- a/Assets/ManagedResources/RTexture/CardTexture19.renderTexture +++ /dev/null @@ -1,34 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!84 &8400000 -RenderTexture: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: CardTexture19 - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_ForcedFallbackFormat: 4 - m_DownscaleFallback: 0 - m_Width: 640 - m_Height: 960 - m_AntiAliasing: 1 - m_DepthFormat: 2 - m_ColorFormat: 0 - m_MipMap: 0 - m_GenerateMips: 1 - m_SRGB: 0 - m_UseDynamicScale: 0 - m_BindMS: 0 - m_TextureSettings: - serializedVersion: 2 - m_FilterMode: 1 - m_Aniso: 0 - m_MipBias: 0 - m_WrapU: 1 - m_WrapV: 1 - m_WrapW: 1 - m_Dimension: 2 - m_VolumeDepth: 1 diff --git a/Assets/ManagedResources/RTexture/CardTexture19.renderTexture.meta b/Assets/ManagedResources/RTexture/CardTexture19.renderTexture.meta deleted file mode 100644 index 0deb2d9b1d..0000000000 --- a/Assets/ManagedResources/RTexture/CardTexture19.renderTexture.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4ddbd1749d6de2f46a8c267c582e874a -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 8400000 - userData: - assetBundleName: lz4/rtexture/cardtexture19 - assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/RTexture/CardTexture20.renderTexture b/Assets/ManagedResources/RTexture/CardTexture20.renderTexture deleted file mode 100644 index d64004b71a..0000000000 --- a/Assets/ManagedResources/RTexture/CardTexture20.renderTexture +++ /dev/null @@ -1,34 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!84 &8400000 -RenderTexture: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: CardTexture20 - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_ForcedFallbackFormat: 4 - m_DownscaleFallback: 0 - m_Width: 640 - m_Height: 960 - m_AntiAliasing: 1 - m_DepthFormat: 2 - m_ColorFormat: 0 - m_MipMap: 0 - m_GenerateMips: 1 - m_SRGB: 0 - m_UseDynamicScale: 0 - m_BindMS: 0 - m_TextureSettings: - serializedVersion: 2 - m_FilterMode: 1 - m_Aniso: 0 - m_MipBias: 0 - m_WrapU: 1 - m_WrapV: 1 - m_WrapW: 1 - m_Dimension: 2 - m_VolumeDepth: 1 diff --git a/Assets/ManagedResources/RTexture/CardTexture20.renderTexture.meta b/Assets/ManagedResources/RTexture/CardTexture20.renderTexture.meta deleted file mode 100644 index f166ec2104..0000000000 --- a/Assets/ManagedResources/RTexture/CardTexture20.renderTexture.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3a856c9c7c3d07c42ba5a16bd78ba925 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 8400000 - userData: - assetBundleName: lz4/rtexture/cardtexture20 - assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/RTexture/CardTexture7.renderTexture b/Assets/ManagedResources/RTexture/CardTexture7.renderTexture deleted file mode 100644 index 26d15b7971..0000000000 --- a/Assets/ManagedResources/RTexture/CardTexture7.renderTexture +++ /dev/null @@ -1,34 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!84 &8400000 -RenderTexture: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: CardTexture7 - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_ForcedFallbackFormat: 4 - m_DownscaleFallback: 0 - m_Width: 640 - m_Height: 960 - m_AntiAliasing: 1 - m_DepthFormat: 2 - m_ColorFormat: 0 - m_MipMap: 0 - m_GenerateMips: 1 - m_SRGB: 0 - m_UseDynamicScale: 0 - m_BindMS: 0 - m_TextureSettings: - serializedVersion: 2 - m_FilterMode: 1 - m_Aniso: 0 - m_MipBias: 0 - m_WrapU: 1 - m_WrapV: 1 - m_WrapW: 1 - m_Dimension: 2 - m_VolumeDepth: 1 diff --git a/Assets/ManagedResources/RTexture/CardTexture7.renderTexture.meta b/Assets/ManagedResources/RTexture/CardTexture7.renderTexture.meta deleted file mode 100644 index b07fdb4843..0000000000 --- a/Assets/ManagedResources/RTexture/CardTexture7.renderTexture.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 198d3fa5a6361914f929f3bb1091139f -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 8400000 - userData: - assetBundleName: lz4/rtexture/cardtexture7 - assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/RTexture/CardTexture8.renderTexture b/Assets/ManagedResources/RTexture/CardTexture8.renderTexture deleted file mode 100644 index cce92733ff..0000000000 --- a/Assets/ManagedResources/RTexture/CardTexture8.renderTexture +++ /dev/null @@ -1,34 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!84 &8400000 -RenderTexture: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: CardTexture8 - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_ForcedFallbackFormat: 4 - m_DownscaleFallback: 0 - m_Width: 640 - m_Height: 960 - m_AntiAliasing: 1 - m_DepthFormat: 2 - m_ColorFormat: 0 - m_MipMap: 0 - m_GenerateMips: 1 - m_SRGB: 0 - m_UseDynamicScale: 0 - m_BindMS: 0 - m_TextureSettings: - serializedVersion: 2 - m_FilterMode: 1 - m_Aniso: 0 - m_MipBias: 0 - m_WrapU: 1 - m_WrapV: 1 - m_WrapW: 1 - m_Dimension: 2 - m_VolumeDepth: 1 diff --git a/Assets/ManagedResources/RTexture/CardTexture8.renderTexture.meta b/Assets/ManagedResources/RTexture/CardTexture8.renderTexture.meta deleted file mode 100644 index 198bf347d7..0000000000 --- a/Assets/ManagedResources/RTexture/CardTexture8.renderTexture.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 837aa88fd2584d44698b2eb6bea69247 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 8400000 - userData: - assetBundleName: lz4/rtexture/cardtexture8 - assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/RTexture/CardTexture9.renderTexture b/Assets/ManagedResources/RTexture/CardTexture9.renderTexture deleted file mode 100644 index 9f6af52db5..0000000000 --- a/Assets/ManagedResources/RTexture/CardTexture9.renderTexture +++ /dev/null @@ -1,34 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!84 &8400000 -RenderTexture: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: CardTexture9 - m_ImageContentsHash: - serializedVersion: 2 - Hash: 00000000000000000000000000000000 - m_ForcedFallbackFormat: 4 - m_DownscaleFallback: 0 - m_Width: 640 - m_Height: 960 - m_AntiAliasing: 1 - m_DepthFormat: 2 - m_ColorFormat: 0 - m_MipMap: 0 - m_GenerateMips: 1 - m_SRGB: 0 - m_UseDynamicScale: 0 - m_BindMS: 0 - m_TextureSettings: - serializedVersion: 2 - m_FilterMode: 1 - m_Aniso: 0 - m_MipBias: 0 - m_WrapU: 1 - m_WrapV: 1 - m_WrapW: 1 - m_Dimension: 2 - m_VolumeDepth: 1 diff --git a/Assets/ManagedResources/RTexture/CardTexture9.renderTexture.meta b/Assets/ManagedResources/RTexture/CardTexture9.renderTexture.meta deleted file mode 100644 index 8b221e4b10..0000000000 --- a/Assets/ManagedResources/RTexture/CardTexture9.renderTexture.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7a9dc8fe2bfcd2d4d9b8aa9136427896 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 8400000 - userData: - assetBundleName: lz4/rtexture/cardtexture9 - assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index b4b4fd2cc7..5b06b452b2 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -597,7 +597,7 @@ RedPointType = { ContinuityRecharge = 204,--连续充值 VipPrivilege = 205,--特权 SevenDayCarnival = 206,--七日狂欢 - DynamicActivity = 207,--轮转活动 乾坤宝盒 限时召唤 + DynamicActivity = 208,--轮转活动 乾坤宝盒 限时召唤 GiftPage = 2011, -- 礼包 DailyGift = 2012, -- 每日礼包 HERO_STAR_GIFT = 2013, --- 星级礼包 diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua index 6d57bdc34e..f23ee6f011 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.lua @@ -109,8 +109,13 @@ function this.StateChange(isOpen) this.btnRecord:SetActive(isOpen and isJoin) this.btnTeamRank:SetActive(isOpen and isJoin) this.btnFightDetail:SetActive(isOpen and isJoin and baseData.battleState == TOP_MATCH_TIME_STATE.OPEN_IN_END) - this.orggroup:SetActive(not isOpen and not isOver) - this.Demons:SetActive(not isOpen and not isOver) + -- this.orggroup:SetActive(not isOpen and not isOver) + -- this.Demons:SetActive(not isOpen and not isOver) + this.orggroup:SetActive(not isOpen or (isOpen and isOver)) + this.Demons:SetActive(not isOpen or (isOpen and isOver)) + if not isOpen or (isOpen and isOver) then + this.FreshTeam() + end end diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassManager.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassManager.lua index 781f3d9556..92cb8e7f3c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassManager.lua @@ -286,7 +286,7 @@ end -- 挑战按钮的文字显示 function this.GetBtnText() -- 解锁新章节优先 - if PlayerPrefs.GetInt(PlayerManager.uid .. CHATER_STATE) < 1 then + if this.IsChapterClossState() then -- 先判断等级 local limitLevel = mainLevelConfig[this.curOpenFight].LevelLimit if PlayerManager.level < limitLevel then diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 278f43c23a..75de779b7d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1303,8 +1303,9 @@ function this.TimeFormat() end --轮转活动,乾坤宝盒 - local info= ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FindFairy) - if info then + local dynamicAct = not not ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FindFairy) + if dynamicAct then + local info = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FindFairy) info = info.endTime - PlayerManager.serverTime info = math.floor(info/86400) if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy) then diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/QianKunBoxBuyOnePanel.lua b/Assets/ManagedResources/~Lua/Modules/Operating/QianKunBoxBuyOnePanel.lua index 11233ed71d..eade55287e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/QianKunBoxBuyOnePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/QianKunBoxBuyOnePanel.lua @@ -45,7 +45,7 @@ function QianKunBoxBuyOnePanel:InitComponent() this.itemNum2=Util.GetGameObject(this.content2,"Num"):GetComponent("Text") -- 关于抽卡的LotterySetting数据 - local curActivityId=ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy) + local curActivityId=ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.QianKunBox) drawtType.FindFairySingle=ConfigManager.GetConfigDataByDoubleKey(ConfigName.LotterySetting,"PerCount",1,"ActivityId",curActivityId).Id end diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/QianKunBoxBuyTenPanel.lua b/Assets/ManagedResources/~Lua/Modules/Operating/QianKunBoxBuyTenPanel.lua index 6d33f52a1c..5214f3c85b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/QianKunBoxBuyTenPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/QianKunBoxBuyTenPanel.lua @@ -52,7 +52,7 @@ function QianKunBoxBuyTenPanel:InitComponent() end -- 关于抽卡的LotterySetting数据 - local curActivityId=ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy) + local curActivityId=ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.QianKunBox) drawtType.FindFairySingle=ConfigManager.GetConfigDataByDoubleKey(ConfigName.LotterySetting,"PerCount",1,"ActivityId",curActivityId).Id drawtType.FindFairyTen=ConfigManager.GetConfigDataByDoubleKey(ConfigName.LotterySetting,"PerCount",10,"ActivityId",curActivityId).Id end diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua index ac67ff831f..519cf65493 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua @@ -152,6 +152,10 @@ end --界面打开时调用(用于子类重写) function RoleListPanel:OnShow() + --检测成员红点 + LogRed(" 检测成员红点 ") + CheckRedPointStatus(RedPointType.Role) + tarHero=HeroManager.GetAllHeroDatas() teamHero=FormationManager.GetWuJinFormationHeroIds(FormationTypeDef.FORMATION_NORMAL) this.isFirstOpen=true diff --git a/Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyOnePanel.lua b/Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyOnePanel.lua index 8fd0a8b8ed..936965d3e5 100644 --- a/Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyOnePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyOnePanel.lua @@ -36,7 +36,9 @@ function SecretBoxBuyOnePanel:InitComponent() -- 关于抽卡的LotterySetting数据 local curActivityId=ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy) - drawtType.FindFairySingle=ConfigManager.GetConfigDataByDoubleKey(ConfigName.LotterySetting,"PerCount",1,"ActivityId",curActivityId).Id + if curActivityId then + drawtType.FindFairySingle=ConfigManager.GetConfigDataByDoubleKey(ConfigName.LotterySetting,"PerCount",1,"ActivityId",curActivityId).Id + end end --绑定事件(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/View/BtView.lua b/Assets/ManagedResources/~Lua/View/BtView.lua index a8b057fcb4..07aa86b342 100644 --- a/Assets/ManagedResources/~Lua/View/BtView.lua +++ b/Assets/ManagedResources/~Lua/View/BtView.lua @@ -133,7 +133,8 @@ function this:OnOpen(context) end -- 刷新显示状态 self:RefreshBtnState() - + --检测成员红点 + CheckRedPointStatus(RedPointType.Role) end function this:RefreshBtnState() diff --git a/Assets/Scripts/Editor/TextureSizeOptTools.cs b/Assets/Scripts/Editor/TextureSizeOptTools.cs index fe17600006..ebf28b85f1 100644 --- a/Assets/Scripts/Editor/TextureSizeOptTools.cs +++ b/Assets/Scripts/Editor/TextureSizeOptTools.cs @@ -59,7 +59,7 @@ namespace LJ_OptTools return ret; } - public static bool ExtendTexture( string path) + public static bool ExtendTexture(string path) { var tex = AssetDatabase.LoadAssetAtPath(path); var ti = AssetImporter.GetAtPath(path) as TextureImporter; @@ -199,9 +199,9 @@ namespace LJ_OptTools } - public static void SetTextureFormat( string path, bool useCrunched) + public static void SetTextureFormat(string path, bool useCrunched) { - if (string.IsNullOrEmpty(path)) return; + if (string.IsNullOrEmpty(path)) return; var ti = AssetImporter.GetAtPath(path) as TextureImporter; if (ti == null) { @@ -212,11 +212,24 @@ namespace LJ_OptTools { return; } + + if (ti.textureType == TextureImporterType.Sprite) + { + TextureImporterSettings tis = new TextureImporterSettings(); + ti.ReadTextureSettings(tis); + if (tis.spriteMeshType != SpriteMeshType.FullRect) + { + tis.spriteMeshType = SpriteMeshType.FullRect; + ti.SetTextureSettings(tis); + AssetDatabase.WriteImportSettingsIfDirty(path); + } + } + var pAndSetting = ti.GetPlatformTextureSettings("Android"); var piPSetting = ti.GetPlatformTextureSettings("iPhone"); var tex = AssetDatabase.LoadAssetAtPath(path); bool pot = Mathf.IsPowerOfTwo(tex.width) && Mathf.IsPowerOfTwo(tex.height); - SettingPlantformTex(ti, pAndSetting, useCrunched,pot); + SettingPlantformTex(ti, pAndSetting, useCrunched, pot); ti.SetPlatformTextureSettings(pAndSetting); SettingPlantformTex(ti, piPSetting, useCrunched, pot); ti.SetPlatformTextureSettings(piPSetting); @@ -271,7 +284,7 @@ namespace LJ_OptTools } } - if (filePaths.Count < 1) return; + if (filePaths.Count < 1) return; for (int i = 0; i < filePaths.Count; i++) { @@ -281,7 +294,7 @@ namespace LJ_OptTools , path , i * 1f / filePaths.Count ); - TextureSizeOptUtilities.ExtendTexture( path); + TextureSizeOptUtilities.ExtendTexture(path); TextureSizeOptUtilities.SetTextureFormat(path, useCrunched); } AssetDatabase.Refresh(); @@ -296,27 +309,29 @@ namespace LJ_OptTools var guid = AssetDatabase.FindAssets("t:Texture", new string[] { "Assets/ManagedResources" }); List floders = new List(); int errorTexCount = 0; + for (int i = 0; i < guid.Length; i++) { string id = guid[i]; var path = AssetDatabase.GUIDToAssetPath(id); - - if ( - path.StartsWith("Assets/ManagedResources/Atlas") - ) continue; - EditorUtility.DisplayProgressBar( - string.Format("Check Texture({0}/{1})", i, guid.Length) - , path - , i * 1f / guid.Length - ); - var floder = Path.GetDirectoryName(path); + string.Format("Check Texture({0}/{1})", i, guid.Length) + , path + , i * 1f / guid.Length + ); var ti = AssetImporter.GetAtPath(path) as TextureImporter; if (ti == null) { //Debug.LogError("No TextureImporter:" + path); continue; } + if ( + path.StartsWith("Assets/ManagedResources/Atlas") + ) continue; + + + var floder = Path.GetDirectoryName(path); + var tex = AssetDatabase.LoadAssetAtPath(path); var pAndSetting = ti.GetPlatformTextureSettings("Android"); @@ -356,6 +371,46 @@ namespace LJ_OptTools EditorUtility.ClearProgressBar(); } + + [MenuItem("Tools/图片优化/检查Material引用的图片", priority = 0)] + public static void OnMenuItem_CheckMat() + { + var guid = AssetDatabase.FindAssets("t:Material"); + StringBuilder info = new StringBuilder(); + for (int i = 0; i < guid.Length; i++) + { + var path = AssetDatabase.GUIDToAssetPath(guid[i]); + EditorUtility.DisplayProgressBar( + string.Format("检查Material引用的图片({0}/{1})", i, guid.Length) + , path + , i * 1f / guid.Length + ); + + var mat = AssetDatabase.LoadAssetAtPath(path); + var shader = mat.shader; + int pCount = ShaderUtil.GetPropertyCount(shader); + for (int j = 0; j < pCount; j++) + { + if (ShaderUtil.GetPropertyType(shader, j) != ShaderUtil.ShaderPropertyType.TexEnv) continue; + var pName = ShaderUtil.GetPropertyName(shader, j); + var tex = mat.GetTexture(pName); + var texPath = AssetDatabase.GetAssetPath(tex); + var ti = AssetImporter.GetAtPath(texPath) as TextureImporter; + if (ti == null) continue; + if( ti.textureType == TextureImporterType.Sprite) + { + info.AppendFormat("{0} : {1} ->> {2}\r\n",path,pName,texPath); + } + } + + } + if( info.Length > 0) + { + Debug.Log(info.ToString()); + } + + EditorUtility.ClearProgressBar(); + } } diff --git a/data_execl/base_data/MonsterConfig.xlsx b/data_execl/base_data/MonsterConfig.xlsx index e41570c34e..ba82453f5d 100644 Binary files a/data_execl/base_data/MonsterConfig.xlsx and b/data_execl/base_data/MonsterConfig.xlsx differ diff --git a/data_execl/base_data/SpecialConfig.xlsx b/data_execl/base_data/SpecialConfig.xlsx index 27357a9f40..3717308c0f 100644 Binary files a/data_execl/base_data/SpecialConfig.xlsx and b/data_execl/base_data/SpecialConfig.xlsx differ