diff --git a/meng_yao/Assets/Prefabs/Bullet/Fire.prefab b/meng_yao/Assets/Prefabs/Bullet/Fire.prefab index 216dfff2c..7a999cb34 100644 --- a/meng_yao/Assets/Prefabs/Bullet/Fire.prefab +++ b/meng_yao/Assets/Prefabs/Bullet/Fire.prefab @@ -71,7 +71,7 @@ BoxCollider2D: m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0.40839374, y: 0} + m_Offset: {x: 0.03456068, y: 0} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0, y: 0} @@ -82,7 +82,7 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 2.6800587, y: 1} + m_Size: {x: 3.0796733, y: 1} m_EdgeRadius: 0 --- !u!1 &492886037590634733 GameObject: diff --git a/meng_yao/Assets/Prefabs/charatar/laohu.prefab b/meng_yao/Assets/Prefabs/charatar/laohu.prefab index 5b6c072d9..9c6ab20e5 100644 --- a/meng_yao/Assets/Prefabs/charatar/laohu.prefab +++ b/meng_yao/Assets/Prefabs/charatar/laohu.prefab @@ -266,7 +266,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 7e06234bd5a219a49be5fa82426e5d74, type: 3} + m_Sprite: {fileID: 21300000, guid: 492e5984b518a80458cf575c0b57335c, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -506,6 +506,10 @@ MonoBehaviour: mySkillUp: {fileID: 1061754087244483355} enemyId: moveSpeed: 0 + MengyaoSprite: {fileID: 21300000, guid: 492e5984b518a80458cf575c0b57335c, type: 3} + SkillSprites: + - {fileID: 21300000, guid: fdd1af82c4a2e3b43adb1ef595ec34d0, type: 3} + - {fileID: 21300000, guid: 4043457f6fd1cda4eb486839f31d2806, type: 3} harmNumber: 0 --- !u!61 &-3836672401185760439 BoxCollider2D: diff --git a/meng_yao/Assets/Prefabs/charatar/mkl.prefab b/meng_yao/Assets/Prefabs/charatar/mkl.prefab index 6ca0da43a..d39afa4e8 100644 --- a/meng_yao/Assets/Prefabs/charatar/mkl.prefab +++ b/meng_yao/Assets/Prefabs/charatar/mkl.prefab @@ -358,7 +358,6 @@ MonoBehaviour: m_EditorClassIdentifier: bulletPrefab: {fileID: 900173028918561104, guid: 99830c598e775fb42b39abf253c5f084, type: 3} role: {fileID: 8433650274028726420} - attackScope: 3 damageTyp: 2 attackCooldown: 1 bulltes: [] @@ -370,6 +369,7 @@ MonoBehaviour: roleBulletSpeedAdd: 0.5 BulletNumber: 1 attackCollider: {fileID: 1338343970434073545} + attackColliderBox: {fileID: 0} attackRangeSprite: {fileID: 2211402838936384874} --- !u!58 &1338343970434073545 CircleCollider2D: @@ -495,6 +495,10 @@ MonoBehaviour: mySkillUp: {fileID: 3258498600701209889} enemyId: moveSpeed: 0 + MengyaoSprite: {fileID: 21300000, guid: 5e3fd295650deeb4fa3395de2d789b8a, type: 3} + SkillSprites: + - {fileID: 21300000, guid: 0adb087419dd674498495bad0175fc85, type: 3} + - {fileID: 21300000, guid: d899198e4c5678843aa5f2143bbc226f, type: 3} harmNumber: 0 --- !u!61 &-3836672401185760439 BoxCollider2D: diff --git a/meng_yao/Assets/Prefabs/charatar/qi_e.prefab b/meng_yao/Assets/Prefabs/charatar/qi_e.prefab index d8643666f..5a6ec6141 100644 --- a/meng_yao/Assets/Prefabs/charatar/qi_e.prefab +++ b/meng_yao/Assets/Prefabs/charatar/qi_e.prefab @@ -358,7 +358,6 @@ MonoBehaviour: m_EditorClassIdentifier: bulletPrefab: {fileID: 6998733212867311352, guid: 31d20ac9cf09bea42af60102f3dd8a0b, type: 3} role: {fileID: 8433650274028726420} - attackScope: 3 damageTyp: 2 attackCooldown: 3 bulltes: [] @@ -370,6 +369,7 @@ MonoBehaviour: roleBulletSpeedAdd: 0 BulletNumber: 1 attackCollider: {fileID: 1338343970434073545} + attackColliderBox: {fileID: 0} attackRangeSprite: {fileID: 202225011326617106} --- !u!58 &1338343970434073545 CircleCollider2D: @@ -495,6 +495,10 @@ MonoBehaviour: mySkillUp: {fileID: 206052671066122143} enemyId: moveSpeed: 0 + MengyaoSprite: {fileID: 21300000, guid: a95e23a2fb1de5b429b428575fc6d229, type: 3} + SkillSprites: + - {fileID: 21300000, guid: cfd21a22d56637e44b11ed37c12db481, type: 3} + - {fileID: 21300000, guid: 1ccc75d4e69b889498b2e30ca0e77bb1, type: 3} harmNumber: 0 --- !u!61 &-3836672401185760439 BoxCollider2D: diff --git a/meng_yao/Assets/Prefabs/ui/scene_main/skillItem.prefab b/meng_yao/Assets/Prefabs/ui/scene_main/skillItem.prefab index 1381710cd..b2268c1db 100644 --- a/meng_yao/Assets/Prefabs/ui/scene_main/skillItem.prefab +++ b/meng_yao/Assets/Prefabs/ui/scene_main/skillItem.prefab @@ -449,12 +449,15 @@ MonoBehaviour: SpendText: {fileID: 2105540891982116496} spendNumber: 1 musk: {fileID: 2105540892441329861} + SkillImage: {fileID: 2105540892435701415} UpgradeBtn: {fileID: 2105540892435701413} SkillID: 0 skillNumber: 0 infobox_skill_up: {fileID: 0} levelNumber: 0 Maxlevel: 5 + mengyao: {fileID: 0} + index: 0 --- !u!1 &2105540892973958151 GameObject: m_ObjectHideFlags: 0 diff --git a/meng_yao/Assets/Resources/animation/A_fightin/Ftest/bqe1.png b/meng_yao/Assets/Resources/animation/A_fightin/Ftest/bqe1.png new file mode 100644 index 000000000..f7b553f1d Binary files /dev/null and b/meng_yao/Assets/Resources/animation/A_fightin/Ftest/bqe1.png differ diff --git a/meng_yao/Assets/Resources/animation/A_fightin/Ftest/bqe1.png.meta b/meng_yao/Assets/Resources/animation/A_fightin/Ftest/bqe1.png.meta new file mode 100644 index 000000000..657b50b90 --- /dev/null +++ b/meng_yao/Assets/Resources/animation/A_fightin/Ftest/bqe1.png.meta @@ -0,0 +1,135 @@ +fileFormatVersion: 2 +guid: cfd21a22d56637e44b11ed37c12db481 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/meng_yao/Assets/Resources/animation/A_fightin/Ftest/bqe2.png b/meng_yao/Assets/Resources/animation/A_fightin/Ftest/bqe2.png new file mode 100644 index 000000000..d81536074 Binary files /dev/null and b/meng_yao/Assets/Resources/animation/A_fightin/Ftest/bqe2.png differ diff --git a/meng_yao/Assets/Resources/animation/A_fightin/Ftest/bqe2.png.meta b/meng_yao/Assets/Resources/animation/A_fightin/Ftest/bqe2.png.meta new file mode 100644 index 000000000..3fe1ca1a1 --- /dev/null +++ b/meng_yao/Assets/Resources/animation/A_fightin/Ftest/bqe2.png.meta @@ -0,0 +1,135 @@ +fileFormatVersion: 2 +guid: 1ccc75d4e69b889498b2e30ca0e77bb1 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/meng_yao/Assets/Resources/animation/A_fightin/Ftest/hll1.png b/meng_yao/Assets/Resources/animation/A_fightin/Ftest/hll1.png new file mode 100644 index 000000000..108f16259 Binary files /dev/null and b/meng_yao/Assets/Resources/animation/A_fightin/Ftest/hll1.png differ diff --git a/meng_yao/Assets/Resources/animation/A_fightin/Ftest/hll1.png.meta b/meng_yao/Assets/Resources/animation/A_fightin/Ftest/hll1.png.meta new file mode 100644 index 000000000..cdd564c61 --- /dev/null +++ b/meng_yao/Assets/Resources/animation/A_fightin/Ftest/hll1.png.meta @@ -0,0 +1,135 @@ +fileFormatVersion: 2 +guid: fdd1af82c4a2e3b43adb1ef595ec34d0 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/meng_yao/Assets/Resources/animation/A_fightin/Ftest/hll2.png b/meng_yao/Assets/Resources/animation/A_fightin/Ftest/hll2.png new file mode 100644 index 000000000..add743df5 Binary files /dev/null and b/meng_yao/Assets/Resources/animation/A_fightin/Ftest/hll2.png differ diff --git a/meng_yao/Assets/Resources/animation/A_fightin/Ftest/hll2.png.meta b/meng_yao/Assets/Resources/animation/A_fightin/Ftest/hll2.png.meta new file mode 100644 index 000000000..c2c1a3e04 --- /dev/null +++ b/meng_yao/Assets/Resources/animation/A_fightin/Ftest/hll2.png.meta @@ -0,0 +1,135 @@ +fileFormatVersion: 2 +guid: 4043457f6fd1cda4eb486839f31d2806 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/meng_yao/Assets/Resources/animation/A_fightin/Ftest/mtz1.png b/meng_yao/Assets/Resources/animation/A_fightin/Ftest/mtz1.png new file mode 100644 index 000000000..f6a4f3482 Binary files /dev/null and b/meng_yao/Assets/Resources/animation/A_fightin/Ftest/mtz1.png differ diff --git a/meng_yao/Assets/Resources/animation/A_fightin/Ftest/mtz1.png.meta b/meng_yao/Assets/Resources/animation/A_fightin/Ftest/mtz1.png.meta new file mode 100644 index 000000000..d96994cdb --- /dev/null +++ b/meng_yao/Assets/Resources/animation/A_fightin/Ftest/mtz1.png.meta @@ -0,0 +1,135 @@ +fileFormatVersion: 2 +guid: 0adb087419dd674498495bad0175fc85 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/meng_yao/Assets/Resources/animation/A_fightin/Ftest/mtz2.png b/meng_yao/Assets/Resources/animation/A_fightin/Ftest/mtz2.png new file mode 100644 index 000000000..ebb643a6e Binary files /dev/null and b/meng_yao/Assets/Resources/animation/A_fightin/Ftest/mtz2.png differ diff --git a/meng_yao/Assets/Resources/animation/A_fightin/Ftest/mtz2.png.meta b/meng_yao/Assets/Resources/animation/A_fightin/Ftest/mtz2.png.meta new file mode 100644 index 000000000..df5098b0a --- /dev/null +++ b/meng_yao/Assets/Resources/animation/A_fightin/Ftest/mtz2.png.meta @@ -0,0 +1,135 @@ +fileFormatVersion: 2 +guid: d899198e4c5678843aa5f2143bbc226f +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + 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 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/meng_yao/Assets/common b/meng_yao/Assets/common index 722bec67c..8632b3836 160000 --- a/meng_yao/Assets/common +++ b/meng_yao/Assets/common @@ -1 +1 @@ -Subproject commit 722bec67c7478be8445779d8de43ad4fc49e563c +Subproject commit 8632b38362f1ed4bed3247a2fbaa14993a745f6a diff --git a/meng_yao/Assets/script/A_Fight/Skill_Spend.cs b/meng_yao/Assets/script/A_Fight/Skill_Spend.cs index e41dcc982..828366c5a 100644 --- a/meng_yao/Assets/script/A_Fight/Skill_Spend.cs +++ b/meng_yao/Assets/script/A_Fight/Skill_Spend.cs @@ -21,7 +21,8 @@ public class Skill_Spend : MonoBehaviour }*/ [Header("战魂不足进行遮挡的musk")] public Image musk; - + [Header("技能图标")] + public Image SkillImage; public Button UpgradeBtn; public event Action OnItemsEnough; @@ -52,6 +53,7 @@ public class Skill_Spend : MonoBehaviour OnItemsAn += SpendAnClick; UpgradeBtn.onClick.AddListener(UpgradeClick); + SetSkillImage(); } void UpgradeClick() @@ -84,4 +86,9 @@ public class Skill_Spend : MonoBehaviour OnItemsAn?.Invoke(); } } + + public void SetSkillImage()//设置技能图标 + { + SkillImage.sprite = mengyao.GetComponent().SkillSprites[index - 1]; + } } diff --git a/meng_yao/Assets/script/A_Fight/enemy.cs b/meng_yao/Assets/script/A_Fight/enemy.cs index b984127fc..5200a262f 100644 --- a/meng_yao/Assets/script/A_Fight/enemy.cs +++ b/meng_yao/Assets/script/A_Fight/enemy.cs @@ -7,6 +7,8 @@ public class enemy : Role public string enemyId; [Header("移动速度")] public float moveSpeed; + [Header("萌妖头像")] public Sprite MengyaoSprite; + [Header("萌妖技能图标")] public List SkillSprites; [HideInInspector] public float harmNumber = 0; // 伤害 public float HarmNumber