diff --git a/Assets/ManagedResources/Icons/r_fb_90008.png b/Assets/ManagedResources/Icons/r_fb_90008.png new file mode 100644 index 0000000000..64d0b58816 Binary files /dev/null and b/Assets/ManagedResources/Icons/r_fb_90008.png differ diff --git a/Assets/ManagedResources/Icons/r_fb_90008.png.meta b/Assets/ManagedResources/Icons/r_fb_90008.png.meta new file mode 100644 index 0000000000..275d386bd9 --- /dev/null +++ b/Assets/ManagedResources/Icons/r_fb_90008.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 30cbe9508b099434ea66f3109f35936c +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: -1 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 34cba248b7013ef4a93935a3fe24b418 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Icons/r_fb_90020.png b/Assets/ManagedResources/Icons/r_fb_90020.png new file mode 100644 index 0000000000..1fa7faf90c Binary files /dev/null and b/Assets/ManagedResources/Icons/r_fb_90020.png differ diff --git a/Assets/ManagedResources/Icons/r_fb_90020.png.meta b/Assets/ManagedResources/Icons/r_fb_90020.png.meta new file mode 100644 index 0000000000..d0f7528508 --- /dev/null +++ b/Assets/ManagedResources/Icons/r_fb_90020.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: e8816da1696c9ba458bcbc8469b78edb +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: -1 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: a7b85a3e724d901468ccf1a7e536e3c8 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Icons/r_fb_90023.png b/Assets/ManagedResources/Icons/r_fb_90023.png new file mode 100644 index 0000000000..6454f95099 Binary files /dev/null and b/Assets/ManagedResources/Icons/r_fb_90023.png differ diff --git a/Assets/ManagedResources/Icons/r_fb_90023.png.meta b/Assets/ManagedResources/Icons/r_fb_90023.png.meta new file mode 100644 index 0000000000..28a50e2d8d --- /dev/null +++ b/Assets/ManagedResources/Icons/r_fb_90023.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 68042ef2808ad9b45841dd928f7d6532 +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: -1 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 8712df68641b95c4eb9f945f7fababdf + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Icons/r_fb_90027.png b/Assets/ManagedResources/Icons/r_fb_90027.png new file mode 100644 index 0000000000..e256571ef9 Binary files /dev/null and b/Assets/ManagedResources/Icons/r_fb_90027.png differ diff --git a/Assets/ManagedResources/Icons/r_fb_90027.png.meta b/Assets/ManagedResources/Icons/r_fb_90027.png.meta new file mode 100644 index 0000000000..7876580156 --- /dev/null +++ b/Assets/ManagedResources/Icons/r_fb_90027.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: d00483c2295d12e4794fa2dc1cf42edc +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: -1 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 767b5f524d4e4a74aacf5de7640d1b64 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Icons/r_fb_90029.png b/Assets/ManagedResources/Icons/r_fb_90029.png new file mode 100644 index 0000000000..7ba6b01406 Binary files /dev/null and b/Assets/ManagedResources/Icons/r_fb_90029.png differ diff --git a/Assets/ManagedResources/Icons/r_fb_90029.png.meta b/Assets/ManagedResources/Icons/r_fb_90029.png.meta new file mode 100644 index 0000000000..94eacec4f2 --- /dev/null +++ b/Assets/ManagedResources/Icons/r_fb_90029.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 6b0048fe8e7c27f4ca570f2f1b2484d7 +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: -1 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 69ee26e076bb5a44d99bd49440a17dc9 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Icons/r_fb_90037.png b/Assets/ManagedResources/Icons/r_fb_90037.png new file mode 100644 index 0000000000..ab35b9a7b5 Binary files /dev/null and b/Assets/ManagedResources/Icons/r_fb_90037.png differ diff --git a/Assets/ManagedResources/Icons/r_fb_90037.png.meta b/Assets/ManagedResources/Icons/r_fb_90037.png.meta new file mode 100644 index 0000000000..d358143c89 --- /dev/null +++ b/Assets/ManagedResources/Icons/r_fb_90037.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 77febab3369aa6b4ea1fc915f2d5b279 +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: -1 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 6755b0a51126ec24f974dcf833c54ea2 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Icons/r_fb_90048.png b/Assets/ManagedResources/Icons/r_fb_90048.png new file mode 100644 index 0000000000..f78170c4ec Binary files /dev/null and b/Assets/ManagedResources/Icons/r_fb_90048.png differ diff --git a/Assets/ManagedResources/Icons/r_fb_90048.png.meta b/Assets/ManagedResources/Icons/r_fb_90048.png.meta new file mode 100644 index 0000000000..583f5a7a76 --- /dev/null +++ b/Assets/ManagedResources/Icons/r_fb_90048.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 4b92a420713f3ee4bb007a8cc306f84d +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: -1 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: d67b6b9f1032aa14c8a215d39622b387 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Icons/r_fb_90049.png b/Assets/ManagedResources/Icons/r_fb_90049.png new file mode 100644 index 0000000000..d4ad267dea Binary files /dev/null and b/Assets/ManagedResources/Icons/r_fb_90049.png differ diff --git a/Assets/ManagedResources/Icons/r_fb_90049.png.meta b/Assets/ManagedResources/Icons/r_fb_90049.png.meta new file mode 100644 index 0000000000..a2c7c1f725 --- /dev/null +++ b/Assets/ManagedResources/Icons/r_fb_90049.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: d948b0cd2b6c85b4b807332d012376b9 +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: -1 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: a8e30fd97bf6e3c469dd0177feac5696 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 3a2a969f57..d9ee0681d2 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1043,6 +1043,7 @@ TaskTypeDef = { BloodyTask = 7, -- 血战任务 FindTreasure = 8, -- 迷宫寻宝任务 Achievement = 9, -- 所有成就任务 + PoZhenZhuXianTask = 10, -- 所有成就任务 } --商品类型 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 8aed6bad64..1e21e411b6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -1876,6 +1876,10 @@ local passivityList = { [108] = function(role, args) local f1 = args[1] local onBeHit = function(caster, damage, bCrit, finalDmg, damageType, skill) + --如果角色死亡就不会反弹伤害 + if role:IsDead() then + return + end if skill then --技能造成的直接伤害 local rDamage = f1 * damage @@ -4728,15 +4732,16 @@ local passivityList = { -- a[float]b[int] [242] = function(role, args) local f1 = args[1] - local f2 = args[2] + local f2 = args[2] + local f3=args[3] -- 释放技能后 local onSkillEnd = function(skill) if skill and skill.type == BattleSkillType.Special then BattleUtil.RandomAction(f1, function() - --BattleLogic.WaitForTrigger(0.1, function() + BattleLogic.WaitForTrigger(0.1, function() LogError("技能触发再次释放技能"..f2) - role:InsertExtraSkill(f2) - --end) + role:InsertExtraSkill(f2,f3) + end) end) end end @@ -4746,11 +4751,12 @@ local passivityList = { -- a[float] [243] = function(role, args) local f1 = args[1] + local f2=args[2] local onRoleHit = function(target) if target:IsDead() and BattleUtil.CheckIsNoDead(target) then -- local target = RoleManager.GetAliveAggro(role) --BattleUtil.CalDamage(nil, role, target, 1, f1) - role:InsertExtraSkill(f1) + role:InsertExtraSkill(f1,f2) LogError("击杀触发再次释放技能") end end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua index 114225335d..da529dcc08 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua @@ -208,7 +208,7 @@ ShieldTypeName = { ExtraReleaseSkill={ skill1={1012051,1,0,1,{200000,{1,0.41,2}}}, skill2={1132051,0.8,0,1,{200212,{1,0.89,2}}}, -skill3={1151111,0.05,0,1,{220000,1,0.86,2}}, +skill3={1151111,0.05,0,1,{220000,{1,0.86,2}}}, skill4={10000351,0.3,0.5,4,{400000,{1,1.75,1}}}, } diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/RoleLogic.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/RoleLogic.lua index c64e0fd174..f8f6abdd3a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/RoleLogic.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/RoleLogic.lua @@ -321,7 +321,7 @@ function RoleLogic:SkillCast(skill, func) skill:Cast(_CheckRage) -- 没有沉默,释放大技能 - elseif skill.type == BattleSkillType.Special and not self.ctrl_slient then + elseif (skill.type == BattleSkillType.Special or skill.type==BattleSkillType.Extra) and not self.ctrl_slient then -- 先消耗怒气 if skill.isRage then if self.Rage < self.SuperSkillRage then @@ -379,16 +379,21 @@ function RoleLogic:AddSkill(type, isRage, isAdd, targets) end --加入额外技能,用于额外释放技能 by:王振兴 -function RoleLogic:InsertExtraSkill(id) +function RoleLogic:InsertExtraSkill(id,type) local effectData=BattleUtil.GetExtraSkillbyId(id) if effectData then + local skillType=BattleSkillType.Extra + --如果type为1则按绝技处理,不为1的话按额外技能处理(额外技能因为被动判断会判断是否是绝技类型,所以不会触发) + if type==1 then + skillType=BattleSkillType.Special + end --和老史,佳琦确认果 附加技能算绝技 被沉默无法释放 可以套娃 递归触发 by:王振兴 - SkillManager.InsertSkill(self, effectData, BattleSkillType.Special, nil, true, false) + SkillManager.InsertSkill(self, effectData, skillType, nil, true, false) BattleLogManager.Log( "Add Skill", "camp", self.camp, "pos", self.position, - "type", BattleSkillType.Extra, + "type", skillType, "isRage", tostring(false), "isAdd", tostring(true), "targets", targets and #targets or "0" diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/PoZhenZhuXianPage.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/PoZhenZhuXianPage.lua index 5b68a4499b..9c0e731207 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/PoZhenZhuXianPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/PoZhenZhuXianPage.lua @@ -5,9 +5,6 @@ local singleTaskPre = {} local this=PoZhenZhuXianPage local parent local endtime = 0 -local activityType = { - [1] = {name = "破阵诛仙", bg = "p_pozhengzhuxian_tu",pre = "prefab1"} -} function PoZhenZhuXianPage:ctor(mainPanel, gameObject) self.mainPanel = mainPanel self.gameObject = gameObject @@ -16,7 +13,7 @@ function PoZhenZhuXianPage:ctor(mainPanel, gameObject) end function PoZhenZhuXianPage:InitComponent(gameObject) - this.time = Util.GetGameObject(gameObject, "content/tiao/time") + this.time = Util.GetGameObject(gameObject, "content/tiao/time"):GetComponent("Text") this.itemPre = Util.GetGameObject(gameObject, "content/itempre") this.scrollItem = Util.GetGameObject(gameObject, "content/grid") local rootHight = this.scrollItem.transform.rect.height @@ -48,10 +45,11 @@ end function PoZhenZhuXianPage:OnShow(_sortingOrder,_parent) sortingOrder = _sortingOrder parent = _parent - this:OnShowData() + this.Refresh() end function this.Refresh() + allData = OperatingManager:InitPoZhenZhuXianData() this:OnShowData() this:SetTime() end @@ -61,37 +59,51 @@ function PoZhenZhuXianPage:SetTime() self.timer:Stop() self.timer = nil end + local five_timeDown + local week_timeDown + five_timeDown = CalculateSecondsNowTo_N_OClock(5) + week_timeDown = endtime - GetTimeStamp() + for k,v in pairs(singleTaskPre) do + v.com.gameObject:SetActive(true) + if v and v.data.type == 1 then + v.com:GetComponent("Text").text = "剩余:"..TimeToHMS(five_timeDown) + else + v.com:GetComponent("Text").text = "剩余:"..TimeToHMS(week_timeDown) + end + end + this.time.text = "剩余时间:"..TimeToDHMS(week_timeDown) self.timer = Timer.New(function() - local timeDown - for i = 1,#allData do - if allData[i].type == 1 then - timeDown = CalculateSecondsNowTo_N_OClock(5) - singleTaskPre[allData[i].id].text = "剩余:"..TimeToHMS(timeDown) - else - timeDown = endtime - GetTimeStamp() - singleTaskPre[allData[i].id].text = "剩余:"..TimeToDHMS(timeDown) - end - if timeDown < 1 then - this.Refresh() - return - end + five_timeDown = five_timeDown - 1 + week_timeDown = week_timeDown - 1 + if five_timeDown <= 0 or week_timeDown <= 0 then + this.Refresh() + return end - timeDown = endtime - GetTimeStamp() - this.time.text = "剩余时间:"..TimeToDHMS(timeDown) + for k,v in pairs(singleTaskPre) do + v.com.gameObject:SetActive(true) + if v and v.data.type == 1 then + v.com:GetComponent("Text").text = "剩余:"..TimeToHMS(five_timeDown) + else + v.com:GetComponent("Text").text = "剩余:"..TimeToHMS(week_timeDown) + end + end + this.time.text = "剩余时间:"..TimeToDHMS(week_timeDown) end, 1, -1, true) self.timer:Start() end -function PoZhenZhuXianPage:OnShowData() - allData = OperatingManager:InitPoZhenZhuXianData() +function PoZhenZhuXianPage:OnShowData() if allData then endtime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.pozhenzhuxian_task) this.SortData(allData) this.ScrollView:SetData(allData, function (index, go) this.SingleDataShow(go, allData[index]) - singleTaskPre[allData[index].id] = Util.GetGameObject(go,"btn/Text"):GetComponent("Text") - end) - LogError(#allData) + if not singleTaskPre[go] then + singleTaskPre[go] = {} + end + singleTaskPre[go].com = Util.GetGameObject(go,"btn/Text") + singleTaskPre[go].data = allData[index] + end) else parent.OnPageTabChange(1) PopupTipPanel.ShowTip("活动已结束") @@ -99,22 +111,32 @@ function PoZhenZhuXianPage:OnShowData() end end +local typeIndex = { + [0] = 1, + [1] = 0, + [2] = 2, +} function PoZhenZhuXianPage:SortData() if allData==nil then return end table.sort(allData, function(a,b) - if a.type == b.type then - return a.id < b.id - else - return a.type < b.type - end + if typeIndex[a.state] == typeIndex[b.state] then + if a.type == b.type then + return a.id < b.id + else + return a.type < b.type + end + else + return typeIndex[a.state] < typeIndex[b.state] + end end) end local type={ - [0]={sprite = "s_slbz_1anniuhuangse",text = "前往"}, - [1]={sprite = "s_slbz_1anniuhuise",text = "已领取"}, - [2]={sprite = "s_slbz_1anniuongse",text = "领取"}, + [0]={sprite = "s_slbz_1anniuhuangse",text = "前往"}, + [1]={sprite = "s_slbz_1anniuongse",text = "领取"}, + [2]={sprite = "s_slbz_1anniuhuise",text = "已领取"}, + } --刷新每一条的显示数据 function this.SingleDataShow(pre,value) @@ -130,6 +152,7 @@ function this.SingleDataShow(pre,value) titleText.text = sConFigData.title local missionText = Util.GetGameObject(activityRewardGo, "mission"):GetComponent("Text") missionText.text = sConFigData.content.."("..(sConFigData.progress > sConFigData.value and sConFigData.value or sConFigData.progress) .."/"..sConFigData.value..")" + local timeText = Util.GetGameObject(activityRewardGo, "btn/Text") local reward = Util.GetGameObject(activityRewardGo.gameObject, "reward") if (not itemsGrid) then @@ -141,30 +164,31 @@ function this.SingleDataShow(pre,value) itemsGrid[pre]:OnOpen(false, sConFigData.reward, 0.9, false) local lingquButton = Util.GetGameObject(activityRewardGo.gameObject, "btn") - local state = sConFigData.state == 1 and sConFigData.state or (sConFigData.progress >= sConFigData.value and 2 or 0) -- 0 前往 1已领奖 2领奖 + --0-未完成,1-完成未领取 2-已领取 + local state = sConFigData.state + timeText:SetActive(state == 0) local red = Util.GetGameObject(lingquButton.gameObject, "redPoint") - red:SetActive(state == 2) + red:SetActive(state == 1) Util.GetGameObject(lingquButton.gameObject, "Button/Text"):GetComponent("Text").text = type[state].text Util.GetGameObject(lingquButton.gameObject, "Button"):GetComponent("Image").sprite = Util.LoadSprite(type[state].sprite) - Util.GetGameObject(lingquButton.gameObject, "Button").gameObject:SetActive(state ~= 1) - Util.GetGameObject(lingquButton.gameObject, "image").gameObject:SetActive(state == 1) + Util.GetGameObject(lingquButton.gameObject, "Button").gameObject:SetActive(state ~= 2) + Util.GetGameObject(lingquButton.gameObject, "image").gameObject:SetActive(state == 2) Util.AddOnceClick(Util.GetGameObject(lingquButton.gameObject, "Button"), function() - if state == 2 then - local curActivityId = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.pozhenzhuxian_task) - NetManager.GetActivityRewardRequest(sConFigData.id, curActivityId,function(respond) - UIManager.OpenPanel(UIName.RewardItemPopup, respond, 1) - this.Refresh() + if state == 1 then + NetManager.TakeMissionRewardRequest(TaskTypeDef.PoZhenZhuXianTask,sConFigData.id, function(respond) + UIManager.OpenPanel(UIName.RewardItemPopup, respond.drop, 1,function () + this.Refresh() + end) end) elseif state == 0 then if sConFigData.jump then - JumpManager.GoJump(sConFigData.jump[1]) + JumpManager.GoJump(sConFigData.jump) end end end) - end --界面打开时调用(用于子类重写) @@ -175,7 +199,7 @@ end function this.RechargeSuccessFunc(id) FirstRechargeManager.RefreshAccumRechargeValue(id) --OperatingManager.RefreshGiftGoodsBuyTimes(GoodsTypeDef.GiftBuy, id) - this.OnShowData() + this.Refresh() end function PoZhenZhuXianPage:OnClose() @@ -184,7 +208,16 @@ end --界面销毁时调用(用于子类重写) function PoZhenZhuXianPage:OnDestroy() + if self.timer then + self.timer:Stop() + self.timer = nil + end sortingOrder = 0 + if singleTaskPre then + singleTaskPre = {} + end + + itemsGrid = {} end function PoZhenZhuXianPage:OnHide() diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua index 3e41a324df..5c9e737b7f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua @@ -234,7 +234,7 @@ function FightPointPassMainPanel:BindEvent() -- 日常任务 Util.AddClick(this.btnDailyMission, function () FightPointPassManager.isBeginFight = true - UIManager.OpenPanel(UIName.MissionDailyPanel) + UIManager.OpenPanel(UIName.MissionDailyPanel,1) end) -- 关卡排行 diff --git a/Assets/ManagedResources/~Lua/Modules/Message/MissionDailyTipPanel.lua b/Assets/ManagedResources/~Lua/Modules/Message/MissionDailyTipPanel.lua index e97e668f8a..f619590422 100644 --- a/Assets/ManagedResources/~Lua/Modules/Message/MissionDailyTipPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Message/MissionDailyTipPanel.lua @@ -31,7 +31,11 @@ function MissionDailyTipPanel:BindEvent() PopupTipPanel.ShowTip(Language[11347]) return end - UIManager.OpenPanel(UIName.MissionDailyPanel,showType) + if showType == 4 then + UIManager.OpenPanel(UIName.MissionDailyPanel,2) + else + UIManager.OpenPanel(UIName.MissionDailyPanel,showType) + end self:ClosePanel() end) end diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua index fd130c36c1..0dca906b52 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua @@ -118,7 +118,7 @@ function this:SetTopBar() Util.GetGameObject(this.openExtra,"MeiKaiQi"):SetActive(true) this.openExtra:GetComponent("Animator").enabled = true Timer.New(function() - local id = ActivityGiftManager.GetActivityIdByType(8) + local id = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.TreasureOfSomeBody) NetManager.GetActivityRewardRequest(-2,id,function(msg) PrivilegeManager.RefreshPrivilegeUsedTimes(1007, 1) this.refresh(curType) diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 61f256e355..64133355e9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -485,7 +485,6 @@ function this.TakeMissionRewardRequest(type, taskId, func) local data = buffer:DataByte() local msg = PlayerInfoProto_pb.TakeMissionRewardResponse() msg:ParseFromString(data) - LogGreen("TakeMissionRewardResponse.treasureScore:"..msg.treasureScore) QinglongSerectTreasureManager.SetLevel(msg.treasureScore) if func then func(msg) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index da2b372d1c..60f486efb1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -733,9 +733,7 @@ function this.InitPoZhenZhuXianData() end this.allData = {} local allListData = ConfigManager.GetAllConfigsDataByKey(ConfigName.ThemeActivityTaskConfig, "ActivityId", id) - LogBlue("#allListData:"..#allListData) - local allMissionData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.pozhenzhuxian_task).mission - LogBlue("#allMissionData"..#allMissionData) + local allMissionData = TaskManager.GetTypeTaskList(TaskTypeDef.PoZhenZhuXianTask) for i=1,#allListData do for j=1,#allMissionData do if allListData[i].Id == allMissionData[j].missionId then