diff --git a/meng_yao/Assets/Prefabs/charatar/laohu.prefab b/meng_yao/Assets/Prefabs/charatar/laohu.prefab index 3172ffe22..5b6c072d9 100644 --- a/meng_yao/Assets/Prefabs/charatar/laohu.prefab +++ b/meng_yao/Assets/Prefabs/charatar/laohu.prefab @@ -132,8 +132,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7939695578342722628} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 2, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 0} + m_LocalPosition: {x: 2.199, y: 0.2, z: 0} + m_LocalScale: {x: 2.8898215, y: 1.7881608, z: 0} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8433650275485930555} @@ -180,8 +180,8 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: dcb3a731cfcc70c4ab418922d45ec4a4, type: 3} - m_Color: {r: 1, g: 0.53781515, b: 0, a: 0.6313726} + m_Sprite: {fileID: 21300000, guid: 5437a302a2f98684992c68de0f20ceab, type: 3} + m_Color: {r: 1, g: 0.05694356, b: 0, a: 0.6313726} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -321,7 +321,7 @@ GameObject: m_Component: - component: {fileID: 8433650274814453345} - component: {fileID: 7276635428522831207} - - component: {fileID: 1338343970434073545} + - component: {fileID: 7445357650989261112} m_Layer: 0 m_Name: attack m_TagString: Untagged @@ -368,10 +368,11 @@ MonoBehaviour: direction: {x: 0, y: 0} roleBulletSpeedAdd: 0 BulletNumber: 1 - attackCollider: {fileID: 1338343970434073545} + attackCollider: {fileID: 0} + attackColliderBox: {fileID: 7445357650989261112} attackRangeSprite: {fileID: 4735534361623519927} ---- !u!58 &1338343970434073545 -CircleCollider2D: +--- !u!61 &7445357650989261112 +BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -383,9 +384,19 @@ CircleCollider2D: m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 1.74, y: 0} + m_Offset: {x: 0, y: 0.2} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 serializedVersion: 2 - m_Radius: 1.2040089 + m_Size: {x: 3.1955504, y: 1.1528659} + m_EdgeRadius: 0 --- !u!1 &8433650275485930554 GameObject: m_ObjectHideFlags: 0 @@ -485,7 +496,7 @@ MonoBehaviour: spriteRenderer: {fileID: 8433650274046349755} image: {fileID: 0} isAnimationPlay: 0 - mycollider: {fileID: 1338343970434073545} + mycollider: {fileID: 0} attackClass: {fileID: 7276635428522831207} CurrentIndex: 0 hitIndex: 2 diff --git a/meng_yao/Assets/Resources/animation/A_fightin/Ftest/rectAttackRangeNew.png b/meng_yao/Assets/Resources/animation/A_fightin/Ftest/rectAttackRangeNew.png new file mode 100644 index 000000000..c65f4c367 Binary files /dev/null and b/meng_yao/Assets/Resources/animation/A_fightin/Ftest/rectAttackRangeNew.png differ diff --git a/meng_yao/Assets/Resources/animation/A_fightin/Ftest/rectAttackRangeNew.png.meta b/meng_yao/Assets/Resources/animation/A_fightin/Ftest/rectAttackRangeNew.png.meta new file mode 100644 index 000000000..a9430e163 --- /dev/null +++ b/meng_yao/Assets/Resources/animation/A_fightin/Ftest/rectAttackRangeNew.png.meta @@ -0,0 +1,135 @@ +fileFormatVersion: 2 +guid: 5437a302a2f98684992c68de0f20ceab +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 45c00a558..722bec67c 160000 --- a/meng_yao/Assets/common +++ b/meng_yao/Assets/common @@ -1 +1 @@ -Subproject commit 45c00a5584d32844d63fbf8ea7427c1a0270285f +Subproject commit 722bec67c7478be8445779d8de43ad4fc49e563c diff --git a/meng_yao/Assets/script/A_Fight/SkillUp/SkillUp.cs b/meng_yao/Assets/script/A_Fight/SkillUp/SkillUp.cs index 557d2e276..d07804d43 100644 --- a/meng_yao/Assets/script/A_Fight/SkillUp/SkillUp.cs +++ b/meng_yao/Assets/script/A_Fight/SkillUp/SkillUp.cs @@ -17,7 +17,7 @@ public class SkillUp : Fun set { attackRange=value; - role.AttackRange *=(1+ attackRange); + role.AttackRange +=attackRange; } } diff --git a/meng_yao/Assets/script/A_Fight/enemy.cs b/meng_yao/Assets/script/A_Fight/enemy.cs index e64949f07..b984127fc 100644 --- a/meng_yao/Assets/script/A_Fight/enemy.cs +++ b/meng_yao/Assets/script/A_Fight/enemy.cs @@ -80,7 +80,7 @@ public class enemy : Role { if (!isSlowed) { - Debug.Log("减速------------------------"); + //Debug.Log("减速------------------------"); // 临时设置减速后的速度 moveSpeed *= slowFactor;