修改

2024-12-27 21:00:53 +08:00 · 2024-12-27 21:00:53 +08:00 · 98b38d4621
commit 98b38d4621
parent c495842f85
12 changed files with 425 additions and 6 deletions
--- a/meng_yao/Assets/Prefabs/charatar/laohu.prefab
+++ b/meng_yao/Assets/Prefabs/charatar/laohu.prefab
@ -372,6 +372,7 @@ MonoBehaviour:
  attackColliderBox: {fileID: 7445357650989261112}
  attackRangeSprite: {fileID: 4735534361623519927}
  AttackStayTime: 2
+  Target: {fileID: 0}
  isAttack: 1
  flag: 0
  timer: 0
@ -489,6 +490,7 @@ MonoBehaviour:
  AttackCD: 0.3
  CritRate: 0.03
  CriticalHitRateBonus: 0.25
+  killNum: 0
  gold: 10
  MaxAttack: 5
  MinAttack: 4
@ -510,7 +512,7 @@ MonoBehaviour:
  mySkillUp: {fileID: 1061754087244483355}
  enemyId: 
  moveSpeed: 0
-  MengyaoSprite: {fileID: 21300000, guid: 492e5984b518a80458cf575c0b57335c, type: 3}
+  MengyaoSprite: {fileID: 21300000, guid: d3d3d16c3383ae1468c21c193ac1d2e8, type: 3}
  SkillSprites:
  - {fileID: 21300000, guid: fdd1af82c4a2e3b43adb1ef595ec34d0, type: 3}
  - {fileID: 21300000, guid: 4043457f6fd1cda4eb486839f31d2806, type: 3}
--- a/meng_yao/Assets/Prefabs/charatar/mkl.prefab
+++ b/meng_yao/Assets/Prefabs/charatar/mkl.prefab
@ -371,6 +371,11 @@ MonoBehaviour:
  attackCollider: {fileID: 1338343970434073545}
  attackColliderBox: {fileID: 0}
  attackRangeSprite: {fileID: 2211402838936384874}
+  AttackStayTime: 0
+  Target: {fileID: 0}
+  isAttack: 1
+  flag: 0
+  timer: 0
 --- !u!58 &1338343970434073545
 CircleCollider2D:
  m_ObjectHideFlags: 0
@ -474,6 +479,7 @@ MonoBehaviour:
  AttackCD: 0.6
  CritRate: 0.065
  CriticalHitRateBonus: 0
+  killNum: 0
  gold: 10
  MaxAttack: 6
  MinAttack: 4
@ -495,7 +501,7 @@ MonoBehaviour:
  mySkillUp: {fileID: 3258498600701209889}
  enemyId: 
  moveSpeed: 0
-  MengyaoSprite: {fileID: 21300000, guid: 5e3fd295650deeb4fa3395de2d789b8a, type: 3}
+  MengyaoSprite: {fileID: 21300000, guid: 602511914339bfa4896fd45f36054865, type: 3}
  SkillSprites:
  - {fileID: 21300000, guid: 0adb087419dd674498495bad0175fc85, type: 3}
  - {fileID: 21300000, guid: d899198e4c5678843aa5f2143bbc226f, type: 3}
--- a/meng_yao/Assets/Prefabs/charatar/qi_e.prefab
+++ b/meng_yao/Assets/Prefabs/charatar/qi_e.prefab
@ -371,6 +371,11 @@ MonoBehaviour:
  attackCollider: {fileID: 1338343970434073545}
  attackColliderBox: {fileID: 0}
  attackRangeSprite: {fileID: 202225011326617106}
+  AttackStayTime: 0
+  Target: {fileID: 0}
+  isAttack: 1
+  flag: 0
+  timer: 0
 --- !u!58 &1338343970434073545
 CircleCollider2D:
  m_ObjectHideFlags: 0
@ -474,6 +479,7 @@ MonoBehaviour:
  AttackCD: 1
  CritRate: 0.05
  CriticalHitRateBonus: 0
+  killNum: 0
  gold: 10
  MaxAttack: 10
  MinAttack: 7
@ -495,7 +501,7 @@ MonoBehaviour:
  mySkillUp: {fileID: 206052671066122143}
  enemyId: 
  moveSpeed: 0
-  MengyaoSprite: {fileID: 21300000, guid: a95e23a2fb1de5b429b428575fc6d229, type: 3}
+  MengyaoSprite: {fileID: 21300000, guid: e42ec8eaea1c0434d9151c05ab649b49, type: 3}
  SkillSprites:
  - {fileID: 21300000, guid: cfd21a22d56637e44b11ed37c12db481, type: 3}
  - {fileID: 21300000, guid: 1ccc75d4e69b889498b2e30ca0e77bb1, type: 3}
--- a/meng_yao/Assets/Prefabs/ui/Challeng_Evictory/shanghaiInfo.prefab
+++ b/meng_yao/Assets/Prefabs/ui/Challeng_Evictory/shanghaiInfo.prefab
@ -144,7 +144,7 @@ RectTransform:
  m_GameObject: {fileID: 1686852558062891918}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.7, y: 0.7, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 3737697091458713618}
--- a/meng_yao/Assets/Prefabs/ui/Challeng_Evictory/shanghaiInfo_black.prefab
+++ b/meng_yao/Assets/Prefabs/ui/Challeng_Evictory/shanghaiInfo_black.prefab
@ -144,7 +144,7 @@ RectTransform:
  m_GameObject: {fileID: 1686852558062891918}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.7, y: 0.7, z: 0.7}
  m_ConstrainProportionsScale: 1
  m_Children: []
  m_Father: {fileID: 3737697091458713618}
--- a/meng_yao/Assets/Resources/animation/A_fightin/Ftest/bqe.png
+++ b/meng_yao/Assets/Resources/animation/A_fightin/Ftest/bqe.png
--- a/meng_yao/Assets/Resources/animation/A_fightin/Ftest/bqe.png.meta
+++ b/meng_yao/Assets/Resources/animation/A_fightin/Ftest/bqe.png.meta
@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: e42ec8eaea1c0434d9151c05ab649b49
+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: 
--- a/meng_yao/Assets/Resources/animation/A_fightin/Ftest/hlh.png
+++ b/meng_yao/Assets/Resources/animation/A_fightin/Ftest/hlh.png
--- a/meng_yao/Assets/Resources/animation/A_fightin/Ftest/hlh.png.meta
+++ b/meng_yao/Assets/Resources/animation/A_fightin/Ftest/hlh.png.meta
@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: d3d3d16c3383ae1468c21c193ac1d2e8
+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: 
--- a/meng_yao/Assets/Resources/animation/A_fightin/Ftest/mkl.png
+++ b/meng_yao/Assets/Resources/animation/A_fightin/Ftest/mkl.png
--- a/meng_yao/Assets/Resources/animation/A_fightin/Ftest/mkl.png.meta
+++ b/meng_yao/Assets/Resources/animation/A_fightin/Ftest/mkl.png.meta
@ -0,0 +1,135 @@
+fileFormatVersion: 2
+guid: 602511914339bfa4896fd45f36054865
+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: 
--- a/meng_yao/Assets/common
+++ b/meng_yao/Assets/common
@ -1 +1 @@
-Subproject commit ec0eb5a29824632f5da26a2b1b9be200c5fff003
+Subproject commit 0d58228599c57ee91f4a2ac8924e53b2cd23dfe8